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

Commits on Nov 20, 2020

  1. oh-my-zsh: 2020-11-12 → 2020-11-20

    @NeQuissimus
    NeQuissimus committed Nov 20, 2020
    Copy the full SHA
    a57bf2d View commit details

  2. scala: 2.13.3 → 2.13.4

    @NeQuissimus
    NeQuissimus committed Nov 20, 2020
    Copy the full SHA
    be0c84f View commit details

  3. sbt-extras: 2020-11-17 → 2020-11-20

    @NeQuissimus
    NeQuissimus committed Nov 20, 2020
    Copy the full SHA
    f944184 View commit details

  4. linux/hardened/patches/4.14: 4.14.206.a -> 4.14.207.a

    @NeQuissimus
    NeQuissimus committed Nov 20, 2020
    Copy the full SHA
    c9737f0 View commit details

  5. linux/hardened/patches/4.19: 4.19.157.a -> 4.19.158.a

    @NeQuissimus
    NeQuissimus committed Nov 20, 2020
    Copy the full SHA
    674e6d9 View commit details

  6. linux/hardened/patches/5.4: 5.4.77.a -> 5.4.78.a

    @NeQuissimus
    NeQuissimus committed Nov 20, 2020
    Copy the full SHA
    1c6f19b View commit details

  7. linux/hardened/patches/5.9: 5.9.8.a -> 5.9.9.a

    @NeQuissimus
    NeQuissimus committed Nov 20, 2020
    Copy the full SHA
    b5fdfc2 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/compilers/scala/2.x.nix
View file
Original file line number Diff line number Diff line change
@@ -109,8 +109,8 @@ in {
};

scala_2_13 = common {
version = "2.13.3";
sha256 = "yfNzG8zybPOaxUExcvtBZGyxn2O4ort1846JZ1ziaX8=";
version = "2.13.4";
sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw";
test = { inherit (nixosTests) scala_2_13; };
pname = "scala_2_13";
};
6 changes: 3 additions & 3 deletions pkgs/development/tools/build-managers/sbt-extras/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,14 +4,14 @@

stdenv.mkDerivation rec {
pname = "sbt-extras";
rev = "b3ecc86936d005dc3327ebd6b61a33d625d60ee6";
version = "2020-11-17";
rev = "42d33338e52cee115cebc3e4ee2acc1ca766f319";
version = "2020-11-20";

src = fetchFromGitHub {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "0cnwvjqs81ca0ssj02x41fq6fn1drqwzpbc7v006vgbard8ww9xb";
sha256 = "0k0n8q8695rdy1vas9n9m9819rpmf38d3bbkffnn7mf7qa01mxq1";
};

dontBuild = true;
24 changes: 12 additions & 12 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.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"
"name": "linux-hardened-4.14.207.a.patch",
"sha256": "0rkpsp3hs8wypg8pgz804hgrncdchv2xmzy5ji7mkkjnasa6nr4w",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.207.a/linux-hardened-4.14.207.a.patch"
},
"4.19": {
"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"
"name": "linux-hardened-4.19.158.a.patch",
"sha256": "0qjqnw3i6i6q80clfyrpid2gxg4r7vgskpxf1wk7x5wmfz9qahyn",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.158.a/linux-hardened-4.19.158.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.77.a.patch",
"sha256": "0b47id64vi55s7lmyasmvhwbfcv9cjwfhw9g4lf220g0rnl6h8jm",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.77.a/linux-hardened-5.4.77.a.patch"
"name": "linux-hardened-5.4.78.a.patch",
"sha256": "1k98c9ija8s1ggs7jq1r02l7y1g276hrqdvx6sn66ldkspkx4vmr",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.78.a/linux-hardened-5.4.78.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.8.a.patch",
"sha256": "1sb4rsd3yfh49aqg5j24zav9x38c44q7d9pyx6pb8pl368rd26l4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.8.a/linux-hardened-5.9.8.a.patch"
"name": "linux-hardened-5.9.9.a.patch",
"sha256": "0qm4rs22rcclhcw691adwy939ch28ibq4ncngzp2x0wlvb2zggy2",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.9.a/linux-hardened-5.9.9.a.patch"
}
}
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-12";
version = "2020-11-20";
pname = "oh-my-zsh";
rev = "9b119866dd0e2d5054abd992f4dfbf346ac81b0d";
rev = "d57131dc49500a056c5b78b0fb444c7cb1ca83cd";

src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "0m65ii79lp8mhl4adicg4qqzj93321gxpg6s91h0wbpkdgd53qxw";
sha256 = "073c6ni7a74gvb98y9z7xsc4x0i6p1r2sxp6bwdv3z8lsj8mfbd7";
};

installPhase = ''