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

Commits on Nov 11, 2020

  1. oh-my-zsh: 2020-11-10 → 2020-11-11

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    d768890 View commit details

  2. linux: 4.14.205 -> 4.14.206

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    399acdc View commit details

  3. linux: 4.19.156 -> 4.19.157

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    08a59ef View commit details

  4. linux: 4.4.242 -> 4.4.243

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    f4ce75d View commit details

  5. linux: 4.9.242 -> 4.9.243

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    3b27759 View commit details

  6. linux: 5.4.76 -> 5.4.77

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    193f7a4 View commit details

  7. linux: 5.9.7 -> 5.9.8

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    470f86b View commit details

  8. linux/hardened/patches/4.14: 4.14.205.a -> 4.14.206.a

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    6322425 View commit details

  9. linux/hardened/patches/4.19: 4.19.156.a -> 4.19.157.a

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    7bfbd07 View commit details

  10. linux/hardened/patches/5.4: 5.4.76.a -> 5.4.77.a

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    feab199 View commit details

  11. linux/hardened/patches/5.9: 5.9.7.a -> 5.9.8.a

    @NeQuissimus
    NeQuissimus committed Nov 11, 2020
    Copy the full SHA
    413237b View commit details
20 changes: 10 additions & 10 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"4.14": {
"name": "linux-hardened-4.14.205.a.patch",
"sha256": "0a9llmpkz4rs1xr574iiyjvll1i9fd6y5k0gxqniz2x2m2nl1mkz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.205.a/linux-hardened-4.14.205.a.patch"
"name": "linux-hardened-4.14.206.a.patch",
"sha256": "17pd23lvhkpa923nw24g5b0gv0kmzj9jkkmc8366k86r0zxk6z53",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.206.a/linux-hardened-4.14.206.a.patch"
},
"4.19": {
"name": "linux-hardened-4.19.156.a.patch",
"sha256": "1f3di0fvsfs9p549nna67i108v3730hc5mjyh8lk07s2bbigi09z",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.156.a/linux-hardened-4.19.156.a.patch"
"name": "linux-hardened-4.19.157.a.patch",
"sha256": "159v7z1a55b5kcmkrdna18hvcnscxf79r00kvr0kl8flvsnhf1p0",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.157.a/linux-hardened-4.19.157.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.76.a.patch",
"name": "linux-hardened-5.4.77.a.patch",
"sha256": "0b47id64vi55s7lmyasmvhwbfcv9cjwfhw9g4lf220g0rnl6h8jm",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.76.a/linux-hardened-5.4.76.a.patch"
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.77.a/linux-hardened-5.4.77.a.patch"
},
"5.8": {
"name": "linux-hardened-5.8.18.a.patch",
"sha256": "1r2n74nbyi3dp5zql9sk504xkpil6ylbyd99zqqva4nd3qg17c99",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
},
"5.9": {
"name": "linux-hardened-5.9.7.a.patch",
"name": "linux-hardened-5.9.8.a.patch",
"sha256": "1sb4rsd3yfh49aqg5j24zav9x38c44q7d9pyx6pb8pl368rd26l4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.7.a/linux-hardened-5.9.7.a.patch"
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.8.a/linux-hardened-5.9.8.a.patch"
}
}
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.205";
version = "4.14.206";

# 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 = "0m6ajw3iypxwvym8hmymd0dlcm9gdczpa6y6id4b447r774aqmcc";
sha256 = "1b46f0s15xnlam43cmw8w41rrvcwrhm6km0278lq6f86lpx3w8qw";
};
} // (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.156";
version = "4.19.157";

# 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 = "0b9g2v8dvlhq0kbns2z62v93pnaprk7xbjzzx8rk0b522x42nq08";
sha256 = "0mgpgv2ny49bb7kgaygy2ay6ckjgw7mg091viivi66jw4mjs7p3n";
};
} // (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.242";
version = "4.4.243";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "089gigqali5q8izac82ybigxyi1bnw0xhm1cc590h4v7lkmk0mm1";
sha256 = "1daqbmj9ka9wdkkym625hqwqaxq5n11y7c4yc9ln3xkjpnv4dplm";
};
} // (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.242";
version = "4.9.243";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1r1myvxkhnsz419i5y6zjdkz177q3d19jk7748vv1v505gi3k1g4";
sha256 = "111rlzx6z4kf8zwxncib96d9wy6qmkbs0cq3dhnybipwlyf1iank";
};
} // (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.76";
version = "5.4.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/v5.x/linux-${version}.tar.xz";
sha256 = "1lpppqjsrcmpr6vawxycsy7lpwdh3pb3d3f841sxzqgm3b9mymkg";
sha256 = "1xyvml0mps7bsa11bgpa4l0w8x6pasdz9yab2z4ds394f1lkxq53";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.9.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.9.7";
version = "5.9.8";

# 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 = "1dv933lnkcfrpjbq1hdc3b5r210f6vn5y04jp87pij4mmkn47a6y";
sha256 = "19l67gzk97higd2cbggipcb0wi21pv0ag0mc4qh6cqk564xp6mkn";
};
} // (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
@@ -5,15 +5,15 @@
, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:

stdenv.mkDerivation rec {
version = "2020-11-10";
version = "2020-11-11";
pname = "oh-my-zsh";
rev = "dc4692b53e4a1dc512d405f36f2d2af30c66304b";
rev = "1beac5958ede29855ef2ac4313ada83ed37f5ea8";

src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "00jm6vvjq265injnrd6mbmq2dm3w8wmw3g7ibhv9spi2r3zb6400";
sha256 = "01pm1g4dhdg05fd9jqp148xi4aw9fkd6kyrvmxizbvsbbz8m751h";
};

installPhase = ''