diff --git a/Makefile b/Makefile index 96fe736c..28049781 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,6 @@ help: @echo @echo " * 'install' - Install binaries and documents to system locations" @echo " * 'binary' - Build skopeo with a container" - @echo " * 'static' - Build statically linked binary" @echo " * 'bin/skopeo' - Build skopeo locally" @echo " * 'test-unit' - Execute unit tests" @echo " * 'test-integration' - Execute integration tests" @@ -132,22 +131,6 @@ help: binary: cmd/skopeo $(CONTAINER_RUN) make bin/skopeo $(if $(DEBUG),DEBUG=$(DEBUG)) BUILDTAGS='$(BUILDTAGS)' -# Update nix/nixpkgs.json its latest stable commit -.PHONY: nixpkgs -nixpkgs: - @nix run \ - -f channel:nixos-21.05 nix-prefetch-git \ - -c nix-prefetch-git \ - --no-deepClone \ - https://github.com/nixos/nixpkgs refs/heads/nixos-21.05 > nix/nixpkgs.json - -# Build statically linked binary -.PHONY: static -static: - @nix build -f nix/ - mkdir -p ./bin - cp -rfp ./result/bin/* ./bin/ - # Build w/o using containers .PHONY: bin/skopeo bin/skopeo: diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index efcfe202..e69de29b 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,10 +0,0 @@ -{ - "url": "https://github.com/nixos/nixpkgs", - "rev": "2a96414d7e350160a33ed0978449c9ff5b5a6eb3", - "date": "2021-07-13T18:21:47+02:00", - "path": "/nix/store/2ai9q8ac6vxb2rrngdz82y8jxnk15cvm-nixpkgs", - "sha256": "1dzrfqdjq3yq5jjskiqflzy58l2xx6059gay9p1k07zrlm1wigy5", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -}