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

Commits on Jul 23, 2020

  1. linux/hardened/patches/4.14: 4.14.188.a -> 4.14.189.a

    @NeQuissimus
    NeQuissimus committed Jul 23, 2020
    Copy the full SHA
    6808fbf View commit details

  2. linux/hardened/patches/4.19: 4.19.133.a -> 4.19.134.a

    @NeQuissimus
    NeQuissimus committed Jul 23, 2020
    Copy the full SHA
    ac0cc4c View commit details

  3. linux/hardened/patches/5.4: 5.4.52.a -> 5.4.53.a

    @NeQuissimus
    NeQuissimus committed Jul 23, 2020
    Copy the full SHA
    534ea8d View commit details

  4. linux/hardened/patches/5.7: 5.7.9.a -> 5.7.10.a

    @NeQuissimus
    NeQuissimus committed Jul 23, 2020
    Copy the full SHA
    e3973f7 View commit details

  5. oh-my-zsh: 2020-07-18 -> 2020-07-23

    @NeQuissimus
    NeQuissimus committed Jul 23, 2020
    Copy the full SHA
    d5e90de View commit details
Showing with 15 additions and 15 deletions.
  1. +12 −12 pkgs/os-specific/linux/kernel/hardened/patches.json
  2. +3 −3 pkgs/shells/zsh/oh-my-zsh/default.nix
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.188.a.patch",
"sha256": "1fqd51ns2hbph57bhpcilcbjbaif55ya3h4cfzbfqwq71jlyij0c",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.188.a/linux-hardened-4.14.188.a.patch"
"name": "linux-hardened-4.14.189.a.patch",
"sha256": "1i6lhw1mb2hqqg5b7cpsc6i2nffh0hgfv16i2d6lgjhgw8h6w26v",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.189.a/linux-hardened-4.14.189.a.patch"
},
"4.19": {
"name": "linux-hardened-4.19.133.a.patch",
"sha256": "0zlns3k60fxbilvfyqay8v5vd5gx9cyvr6dw8b4mg3zccnprqz0n",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.133.a/linux-hardened-4.19.133.a.patch"
"name": "linux-hardened-4.19.134.a.patch",
"sha256": "0yq7s0lf79ijdsa64yr2869fwlij8jy167mbqh6mj356wyybxcg2",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.134.a/linux-hardened-4.19.134.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.52.a.patch",
"sha256": "17lgwhwxafzkjwr47dj2vwy3wzbsacdw8rrg6qlwn49ixayx26m4",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.52.a/linux-hardened-5.4.52.a.patch"
"name": "linux-hardened-5.4.53.a.patch",
"sha256": "0fmcym3r280a8adyqicix6ri622k02sqf16ic3myldfic2qs4syv",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.53.a/linux-hardened-5.4.53.a.patch"
},
"5.6": {
"name": "linux-hardened-5.6.19.a.patch",
"sha256": "0gxdbcig6hpjxj6qr4lrj773gb76s0xlkrk3hclxk4ms6p82y4mm",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.19.a/linux-hardened-5.6.19.a.patch"
},
"5.7": {
"name": "linux-hardened-5.7.9.a.patch",
"sha256": "0r5qcy09h8fklmkkfsm2i69rqz36qppfbcfx0hg0knf5dmcjpl89",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.9.a/linux-hardened-5.7.9.a.patch"
"name": "linux-hardened-5.7.10.a.patch",
"sha256": "04a1sxdmh7r22vk5xkfj70rd4qjshvyx6w9zjryl9h4ffd338340",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.10.a/linux-hardened-5.7.10.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
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:

stdenv.mkDerivation rec {
version = "2020-07-18";
version = "2020-07-23";
pname = "oh-my-zsh";
rev = "db3d05fe7184a523fe4aba120bea962114424573";
rev = "95218372402afc9aeafc89c0984310387ce79599";

src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
sha256 = "1yicc8vwcp15p1g9rg9d6isnx4vv0w0wb8vw8hh6wpn20xf3rpji";
sha256 = "0fgxq2d6lajk5fjbr9vwhhnw58gbk6yhbc49pcj563lwk2kc4d9f";
};

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