public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116807 from cole-h/nix 

nixUnstable: pre20210308_1c0e3e4 -> pre20210317_8a5203d, nixos-rebuild: nix flake info -> nix flake metadata
This commit is contained in:
Eelco Dolstra 2021-03-19 17:24:21 +01:00 committed by GitHub
parent 537732b5a5 85f5d9a6ed
commit 883c55748f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

@ -295,7 +295,7 @@ fi
# Resolve the flake. # Resolve the flake.
if [[ -n $flake ]]; then if [[ -n $flake ]]; then
flake=$(nix "${flakeFlags[@]}" flake info --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url) flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
fi fi
# Find configuration.nix and open editor instead of building. # Find configuration.nix and open editor instead of building.

6
pkgs/tools/package-management/nix/default.nix
View File

@ -213,13 +213,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}"; name = "nix-2.4${suffix}";
suffix = "pre20210308_1c0e3e4"; suffix = "pre20210317_8a5203d";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411"; rev = "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2";
sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd"; sha256 = "IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk=";
}; };
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;