diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-06-23 21:05:42 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-06-23 21:06:35 +0200 |
| commit | af3aeef298d176c4f01ef341bf9662dd362834e5 (patch) | |
| tree | eaf589074e09a67bc2fcb32c9b6519738462ccd6 | |
| parent | 641efb7d7320412da92a70f7415e8ebdd4e324c8 (diff) | |
| download | Nix-af3aeef298d176c4f01ef341bf9662dd362834e5.tar.gz Nix-af3aeef298d176c4f01ef341bf9662dd362834e5.tar.zst Nix-af3aeef298d176c4f01ef341bf9662dd362834e5.zip | |
Use nix-instantiate to get nixpkgs location
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | nixops/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
| @@ -23,7 +23,7 @@ nix-info: | |||
| 23 | @version=$$(nix eval --raw nixpkgs.lib.version) && \ | 23 | @version=$$(nix eval --raw nixpkgs.lib.version) && \ |
| 24 | mainversion=$$(echo $$version | cut -d"." -f -2) && \ | 24 | mainversion=$$(echo $$version | cut -d"." -f -2) && \ |
| 25 | echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \ | 25 | echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \ |
| 26 | nix eval --raw nixpkgs.bc.meta.position | cut -d"/" -f-4 | 26 | nix-instantiate --find-file nixpkgs |
| 27 | 27 | ||
| 28 | nix-info-nixops: | 28 | nix-info-nixops: |
| 29 | @$(MAKE) --no-print-directory -C nixops/ nix-info | 29 | @$(MAKE) --no-print-directory -C nixops/ nix-info |
diff --git a/nixops/Makefile b/nixops/Makefile index 6adc6e7..6087402 100644 --- a/nixops/Makefile +++ b/nixops/Makefile | |||
| @@ -16,7 +16,7 @@ nix-info: | |||
| 16 | @version=$$(nix eval --raw nixpkgs.lib.version) && \ | 16 | @version=$$(nix eval --raw nixpkgs.lib.version) && \ |
| 17 | mainversion=$$(echo $$version | cut -d"." -f -2) && \ | 17 | mainversion=$$(echo $$version | cut -d"." -f -2) && \ |
| 18 | echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \ | 18 | echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \ |
| 19 | nix eval --raw nixpkgs.bc.meta.position | cut -d"/" -f-4 | 19 | nix-instantiate --find-file nixpkgs |
| 20 | .PHONY: nix-info | 20 | .PHONY: nix-info |
| 21 | 21 | ||
| 22 | ###### Initial setup | 22 | ###### Initial setup |