Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7a17c1aa17d4
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e13ec4a275f9
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Feb 24, 2020

  1. nix: 2.3.2 -> 2.3.3 

    (cherry picked from commit 3c47f78)
    @edolstra
    edolstra committed Feb 24, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    82e1346 View commit details

  2. nix-fallback-paths.nix: Fix x86_64-linux path 

    NixOS/nix#3370
(cherry picked from commit 21a3b14)
    @edolstra
    edolstra committed Feb 24, 2020
    Copy the full SHA
    790970f View commit details

  3. linux: 4.19.105 -> 4.19.106

    @NeQuissimus
    NeQuissimus committed Feb 24, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    346c008 View commit details

  4. linux: 5.4.21 -> 5.4.22

    @NeQuissimus
    NeQuissimus committed Feb 24, 2020
    Copy the full SHA
    e13ec4a View commit details
8 changes: 4 additions & 4 deletions nixos/modules/installer/tools/nix-fallback-paths.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/0q5qnh10m2sfrriszc1ysmggw659q6qm-nix-2.3.2";
i686-linux = "/nix/store/i7ad7r5d8a5b3l22hg4a1im2qq05y6vd-nix-2.3.2";
aarch64-linux = "/nix/store/bv06pavfw0dbqzr8w3l7s71nx27gnxa0-nix-2.3.2";
x86_64-darwin = "/nix/store/x6mnl1nij7y4v5ihlplr4k937ayr403r-nix-2.3.2";
x86_64-linux = "/nix/store/ddmmzn4ggz1f66lwxjy64n89864yj9w9-nix-2.3.3";
i686-linux = "/nix/store/5axys7hsggb4282dsbps5k5p0v59yv13-nix-2.3.3";
aarch64-linux = "/nix/store/k80nwvi19hxwbz3c9cxgp24f1jjxwmcc-nix-2.3.3";
x86_64-darwin = "/nix/store/lrnvapsqmf0ja6zfyx4cpxr7ahdr7f9b-nix-2.3.3";
}
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.19.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.19.105";
version = "4.19.106";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "04mz4amafbhia0lwyh7wc9mxiqg2kw4gz2y0wvfb7zh4nj57fb7q";
sha256 = "1nlwgs15mc3hlfhqw95pz7wisg8yshzrxzzq2a0y30mjm5vbvj33";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.21";
version = "5.4.22";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1yjv8qg47kb4j4jkcpi9z7v07p0vz3gszpmhrfji5866j97748vd";
sha256 = "06kx9bmrrk1brici8wvvd6dxqawgcig4i59pwllcq39rgs6wn6v6";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -173,10 +173,10 @@ in rec {
};

nixStable = callPackage common (rec {
name = "nix-2.3.2";
name = "nix-2.3.3";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8";
sha256 = "332fffb8dfc33eab854c136ef162a88cec15b701def71fa63714d160831ba224";
};

inherit storeDir stateDir confDir boehmgc;