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

Commits on Oct 9, 2020

  1. linux/hardened/patches/4.14: 4.14.199.a -> 4.14.200.a

    @NeQuissimus
    NeQuissimus committed Oct 9, 2020
    Copy the full SHA
    84c56e0 View commit details

  2. linux/hardened/patches/4.19: 4.19.148.a -> 4.19.150.a

    @NeQuissimus
    NeQuissimus committed Oct 9, 2020
    Copy the full SHA
    6f4d132 View commit details

  3. linux/hardened/patches/5.4: 5.4.68.a -> 5.4.70.a

    @NeQuissimus
    NeQuissimus committed Oct 9, 2020
    Copy the full SHA
    edf1745 View commit details

  4. linux/hardened/patches/5.8: 5.8.12.a -> 5.8.14.a

    @NeQuissimus
    NeQuissimus committed Oct 9, 2020
    Copy the full SHA
    8293f95 View commit details

  5. oh-my-zsh: 2020-10-08 -> 2020-10-09

    @NeQuissimus
    NeQuissimus committed Oct 9, 2020
    Copy the full SHA
    2216b87 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.199.a.patch",
"sha256": "0y0cc6kmacr7w7mdhb5m55f67fmaq75iznjif4i5aqx970kr47wf",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.199.a/linux-hardened-4.14.199.a.patch"
"name": "linux-hardened-4.14.200.a.patch",
"sha256": "0z38nm0m97d8m0q34fbnlz7l0rjbf76qrvbc6kljjg7gang3cby8",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.200.a/linux-hardened-4.14.200.a.patch"
},
"4.19": {
"name": "linux-hardened-4.19.148.a.patch",
"sha256": "03rxw4wx0hdg1r14b9h2fmvqlhzi6hfc9jic5ml01wzazphzzm62",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.148.a/linux-hardened-4.19.148.a.patch"
"name": "linux-hardened-4.19.150.a.patch",
"sha256": "1gx09a6rm7r7ggg9ikkzj2fh22qbr2jnlfkphkq27l4fx8241lig",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.150.a/linux-hardened-4.19.150.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.68.a.patch",
"sha256": "0rfzs7hfh8y5dawpf6gndwwqml4g2pmbbfcakd325bx0qkqf9bhh",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.68.a/linux-hardened-5.4.68.a.patch"
"name": "linux-hardened-5.4.70.a.patch",
"sha256": "19g7yp4dip92bh54vd8vbn7cd4p691yvb52nz76p74fdksfa71m5",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.70.a/linux-hardened-5.4.70.a.patch"
},
"5.7": {
"name": "linux-hardened-5.7.19.a.patch",
"sha256": "1lydlh499aj3ck5cnv8q2271y4klvp17zm7j7qni16am14bld936",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch"
},
"5.8": {
"name": "linux-hardened-5.8.12.a.patch",
"sha256": "0hyb9gw40ybb6k8liamcxcsps5rv647i4aha1rcnwri6xhw9dhcy",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.12.a/linux-hardened-5.8.12.a.patch"
"name": "linux-hardened-5.8.14.a.patch",
"sha256": "08w3w0w5sw7lgm6zpsy55fz1h42s2aqcznfgxi31yv9qski31lbz",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.14.a/linux-hardened-5.8.14.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,15 +4,15 @@
{ stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {
version = "2020-10-08";
version = "2020-10-09";
pname = "oh-my-zsh";
rev = "58ff4e1d2e6a81ea97a05b142c28a931a9924b70";
rev = "1bb402190d53c118f47a0851f5714dd4faa52809";

src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "096pkq91njg7pvlxar5r39slkzyfky6wcm7p6kfwrlbwh6wx46kz";
sha256 = "0alm6253mz8yq5l17q7hj89aa0c0nfknds9vqx8pd619bsa6kf4g";
};

installPhase = ''