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: 1a27482a6ce3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b16998f51e7b
Choose a head ref
  • 7 commits
  • 7 files changed
  • 1 contributor

Commits on Oct 5, 2019

  1. linux: 4.14.146 -> 4.14.147

    @NeQuissimus
    NeQuissimus committed Oct 5, 2019
    Copy the full SHA
    eb4da7a View commit details

  2. linux: 4.19.76 -> 4.19.77

    @NeQuissimus
    NeQuissimus committed Oct 5, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f47dd4a View commit details

  3. linux: 4.4.194 -> 4.4.195

    @NeQuissimus
    NeQuissimus committed Oct 5, 2019
    Copy the full SHA
    63ec681 View commit details

  4. linux: 4.9.194 -> 4.9.195

    @NeQuissimus
    NeQuissimus committed Oct 5, 2019
    Copy the full SHA
    808633d View commit details

  5. linux: 5.2.18 -> 5.2.19

    @NeQuissimus
    NeQuissimus committed Oct 5, 2019
    Copy the full SHA
    e0907d2 View commit details

  6. linux: 5.3.2 -> 5.3.4

    @NeQuissimus
    NeQuissimus committed Oct 5, 2019
    Copy the full SHA
    d5832fb View commit details

  7. oh-my-zsh: 2019-10-02 -> 2019-10-03

    @NeQuissimus
    NeQuissimus committed Oct 5, 2019
    Copy the full SHA
    b16998f View commit details
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.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.14.146";
version = "4.14.147";

# 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/v4.x/linux-${version}.tar.xz";
sha256 = "1x9343pvlxdgx0zbsn12mcfhf6r8d9p57h6l5cw7krm3gs44pid3";
sha256 = "04jvp05spszcxmkdsl21dylbcf76ns9bwxf1zlk4x7cxiil97mwg";
};
} // (args.argsOverride or {}))
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.76";
version = "4.19.77";

# 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/v4.x/linux-${version}.tar.xz";
sha256 = "0rhyjw5r3xdnj37dd6wrpihdqc3zn5ih6hcpa4x2cjvk0acx4kds";
sha256 = "1agksl35amjzc6g6d9zjwz6p5qir2cligb5c1d9s2bag9766jav1";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.194";
version = "4.4.195";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0kvlp2v4nvkilaanhpgwf8dkyfj24msaw0m38rbc4y51y69yhqvz";
sha256 = "1dilaz0ghmkml10cvzzpz7ivcx9d8d6fpb76vmixcg634w2jx962";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.194";
version = "4.9.195";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1qy20vw5bhnsfbh95sdhjbk6y94js8m4ryd3m7xg2qg4hisvpx6m";
sha256 = "0s4xj8f1dpnz3fbrqmgwq02smhcrq1ni8hgn2bbfqvm15lm5dgjl";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.2.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.2.18";
version = "5.2.19";

# 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 = "0q6akmhcdj52lhvs5fjxrr25r0hyklh7115hg0zl0fcpdj30y2bd";
sha256 = "12mi857lyd5vj8qhj2f505hqnwzsnd829hxd78n9kk88iv1f966y";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.3.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.3.2";
version = "5.3.4";

# 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 = "0szw21mpp94gp3zn2fgllbv6fdjjf20njgrcjay7vjmm7farq7rn";
sha256 = "0vi4bgcr921z5l6fbcrcgmhaji5gl2avpmp7njna6v0f7sxism0r";
};
} // (args.argsOverride or {}))
6 changes: 3 additions & 3 deletions pkgs/shells/zsh/oh-my-zsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:

stdenv.mkDerivation rec {
version = "2019-10-02";
version = "2019-10-03";
pname = "oh-my-zsh";
rev = "ae0de1135dc96cfabe31d70f65112cbeadbfa3bf";
rev = "3848102a5ec8534cef935d594c6abcbfc0f419c8";

src = fetchgit { inherit rev;
url = "https://github.com/robbyrussell/oh-my-zsh";
sha256 = "1xr3xxmhqz2x2v9w15jmxb1pql8fal1smw1j59irmzvnq8zisz2y";
sha256 = "07bkw0517sghgfvjnahiscyjj15zalarprwh6gn380z4czqhfcp4";
};

pathsToLink = [ "/share/oh-my-zsh" ];