summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 4a7c727de..3e40881f3 100644
--- a/Makefile
+++ b/Makefile
@@ -389,10 +389,10 @@ cross: local-cross
.PHONY: nixpkgs
nixpkgs:
@nix run \
- -f channel:nixos-20.09 nix-prefetch-git \
+ -f channel:nixos-21.05 nix-prefetch-git \
-c nix-prefetch-git \
--no-deepClone \
- https://github.com/nixos/nixpkgs refs/heads/nixos-20.09 > nix/nixpkgs.json
+ https://github.com/nixos/nixpkgs refs/heads/nixos-21.05 > nix/nixpkgs.json
# Build statically linked binary
.PHONY: static
@@ -437,7 +437,7 @@ $(MANPAGES): %: %.md .install.md2man docdir
-e 's/\[\(podman[^]]*\)\]/\1/g' \
-e 's/\[\([^]]*\)](http[^)]\+)/\1/g' \
-e 's;<\(/\)\?\(a\|a\s\+[^>]*\|sup\)>;;g' \
- -e 's/\\$// /g' $< | \
+ -e 's/\\$$/ /g' $< | \
$(GOMD2MAN) -in /dev/stdin -out $(subst source/markdown,build/man,$@)
.PHONY: docdir