Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Mar 19, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
370a401
nixUnstable: pre20210308_1c0e3e4 -> pre20210317_8a5203d
cole-h Mar 19, 2021
85f5d9a
nixos-rebuild: nix flake info -> nix flake metadata
cole-h Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View file
Open in desktop
Expand Up @@ -295,7 +295,7 @@ fi

# Resolve the flake.
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

# Find configuration.nix and open editor instead of building.
Expand Down
6 changes: 3 additions & 3 deletions pkgs/tools/package-management/nix/default.nix
View file
Open in desktop
Expand Up @@ -213,13 +213,13 @@ in rec {

nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
suffix = "pre20210308_1c0e3e4";
suffix = "pre20210317_8a5203d";

src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411";
sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd";
rev = "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2";
sha256 = "IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk=";
};

inherit storeDir stateDir confDir boehmgc;
Expand Down