git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #116807 from cole-h/nix

nixUnstable: pre20210308_1c0e3e4 -> pre20210317_8a5203d, nixos-rebuild: nix flake info -> nix flake metadata

commit883c55748fa03834d182aeef5336b0627095e074 authorEelco Dolstra <edolstra@gmail.com> dateFri 19 Mar 2021, 17:24 (6 years ago) parent537732b85f5d9a
2 files changed+4−4
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh+1−1 pkgs/tools/package-management/nix/default.nix+3−3
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh+1−1
@@ -295,7 +295,7 @@ fi
295295
296296# Resolve the flake.
297297if [[ -n $flake ]]; then
298− flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
298+ flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
299299fi
300300
301301# Find configuration.nix and open editor instead of building.
pkgs/tools/package-management/nix/default.nix+3−3
@@ -213,13 +213,13 @@ in rec {
213213
214214 nixUnstable = lib.lowPrio (callPackage common rec {
215215 name = "nix-2.4${suffix}";
216− suffix = "pre20210308_1c0e3e4";
216+ suffix = "pre20210317_8a5203d";
217217
218218 src = fetchFromGitHub {
219219 owner = "NixOS";
220220 repo = "nix";
221− rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411";
222− sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd";
221+ rev = "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2";
222+ sha256 = "IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk=";
223223 };
224224
225225 inherit storeDir stateDir confDir boehmgc;