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

Commits on Jul 3, 2020

  1. linux/hardened/patches/4.14: 4.14.185.a -> 4.14.187.a

    @NeQuissimus
    NeQuissimus committed Jul 3, 2020
    Copy the full SHA
    0ff4f80 View commit details

  2. linux/hardened/patches/4.19: 4.19.129.a -> 4.19.131.a

    @NeQuissimus
    NeQuissimus committed Jul 3, 2020
    Copy the full SHA
    760c9b1 View commit details

  3. linux/hardened/patches/5.7: init at 5.7.7.a

    @NeQuissimus
    NeQuissimus committed Jul 3, 2020
    Copy the full SHA
    4de40fa View commit details

  4. oh-my-zsh: 2020-07-01 -> 2020-07-03

    @NeQuissimus
    NeQuissimus committed Jul 3, 2020
    Copy the full SHA
    67557df View commit details

  5. linux_hardened_latest: 5.6 -> 5.7

    @NeQuissimus
    NeQuissimus committed Jul 3, 2020
    Copy the full SHA
    5252a22 View commit details
Showing with 15 additions and 10 deletions.
  1. +11 −6 pkgs/os-specific/linux/kernel/hardened/patches.json
  2. +3 −3 pkgs/shells/zsh/oh-my-zsh/default.nix
  3. +1 −1 pkgs/top-level/all-packages.nix
17 changes: 11 additions & 6 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"4.14": {
"name": "linux-hardened-4.14.185.a.patch",
"sha256": "0kj18z2mbffnc0zksg7bfyy3hljiga0gzk0s3axvbxlp41vpvwp3",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.185.a/linux-hardened-4.14.185.a.patch"
"name": "linux-hardened-4.14.187.a.patch",
"sha256": "1mg2pmld8g2vrphf2hk2ndhr2m503z3yv0l9hgvrc1gqwdhsdcp2",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.187.a/linux-hardened-4.14.187.a.patch"
},
"4.19": {
"name": "linux-hardened-4.19.129.a.patch",
"sha256": "0fyz4m2ih8biadziiqbyq4ddx8asn65z94wwrhi7krjqxlbdzgvs",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.129.a/linux-hardened-4.19.129.a.patch"
"name": "linux-hardened-4.19.131.a.patch",
"sha256": "0f8ql5d5r5drhv70glmq3dlpvnz63k7fl0rib6wakhdj4988jjkh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.131.a/linux-hardened-4.19.131.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.48.a.patch",
@@ -18,5 +18,10 @@
"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.7.a.patch",
"sha256": "0273g98vax3x2l2hc39d53m86xm4k8r99vnksm5vmg6i2xc4ir74",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.7.a/linux-hardened-5.7.7.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-01";
version = "2020-07-03";
pname = "oh-my-zsh";
rev = "62648d71bb05116287206d83181f9daa5a59ba67";
rev = "a15f0f0e9ff17c1ca5c6d694d732e72c7c03a62b";

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

pathsToLink = [ "/share/oh-my-zsh" ];
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17345,7 +17345,7 @@ in
# Hardened Linux
hardenedLinuxPackagesFor = kernel': overrides:
let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
linux_latest_for_hardened = pkgs.linux_5_6; # TODO: Update to linux_latest
linux_latest_for_hardened = pkgs.linux_latest;
kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
in linuxPackagesFor (kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {