Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 812d5babfb66
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9e4a60cb2562
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 28, 2021

  1. nixUnstable: pre20210308_1c0e3e4 -> pre20210317_8a5203d 

    (cherry picked from commit 370a401)
    @cole-h @Ma27
    cole-h authored and Ma27 committed Mar 28, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kalbasit Wael Nasreddine
    GPG key ID: FD437548E0BF0F5F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    01b4290 View commit details

  2. nixUnstable: pre20210317_8a5203d -> pre20210326_dd77f71 

    The flakey test was fixed.

(cherry picked from commit 30050ab)
    @cole-h @Ma27
    cole-h authored and Ma27 committed Mar 28, 2021
    Copy the full SHA
    9e4a60c View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/tools/package-management/nix/default.nix
6 changes: 3 additions & 3 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -208,13 +208,13 @@ in rec {

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

src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411";
sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd";
rev = "dd77f71afe6733e9790dd001125c423cb648b7ce";
sha256 = "rVHzrsCtdiWjyLuHnDplG2mx+7dw5VyzZ9ReXxuCvHY=";
};

inherit storeDir stateDir confDir boehmgc;