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

Commits on Mar 23, 2017

  1. electrum: 2.8.1 -> 2.8.2 

    Release 2.8.2
  * show paid invoices in history tab
  * improve CPFP dialog
  * fixes for trezor, keepkey
  * other minor bugfixes
https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES
    @joachifm
    joachifm committed Mar 23, 2017
    Copy the full SHA
    c6322a2 View commit details

  2. linux_4_9: 4.9.16 -> 4.9.17

    @joachifm
    joachifm committed Mar 23, 2017
    Copy the full SHA
    a2fdf72 View commit details

  3. grsecurity: 4.9.16-201703180820 -> 4.9.17-201703221829

    @joachifm
    joachifm committed Mar 23, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    politas Myk
    GPG key ID: 47938AAEAD85818F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    94ab493 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/electrum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

python2Packages.buildPythonApplication rec {
name = "electrum-${version}";
version = "2.8.1";
version = "2.8.2";

src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "1398s9d8j04is24il2xjb6xkj666pj21bsr90xglpsmfa1js9z7g";
sha256 = "01xphbi7lx64s9380zjfakz5h8blqmxp0ryqlll7px66qpmjn5fq";
};

propagatedBuildInputs = with python2Packages; [
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,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:

import ./generic.nix (args // rec {
version = "4.9.16";
version = "4.9.17";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1r5spbinz8g3iclm9039cddaamj8q5vy455nnr3pvrmxbj8l9d23";
sha256 = "0zxcz7h8sy58qibqh1n1f39diywmdl8hd9vr16z9rbpba1jw35ch";
};

kernelPatches = args.kernelPatches;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-grsecurity.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:

import ./generic.nix (args // rec {
version = "4.9.16";
version = "4.9.17";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha512 = "3fhzfdiziad5blzcqfbrxjphcygmhd7jzrricpkn7mvg069csrq0yvlbsxksqii0ahk77wzs1nmkfx138y21v4745dk6rf0438jv7md";
sha512 = "35mcvjl686xjgnbxrz2z84gg4q1m9y7wp541sg9k3jadlgsdyqrynz09j3lx3f5v40a83xmr5j3clavjaij16bl4imi716z7vjkfryx";
};

kernelPatches = args.kernelPatches;
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/patches.nix
View file
Original file line number Diff line number Diff line change
@@ -95,9 +95,9 @@ rec {
};

grsecurity_testing = grsecPatch
{ kver = "4.9.16";
grrev = "201703180820";
sha512 = "114yqjffxnf412ypaq91r732mi4im2qakj07g0nbqx1qyg319qag5ckc5438kcny3qhzb9wyrwr6mhza51cq7js40ps2aw7alwjfgql";
{ kver = "4.9.17";
grrev = "201703221829";
sha512 = "3br0xdjj95k8qnri83jj67s1lb4q6ws6irhdlr9kcyxj1384kipkfz8ciafs7zd3vqyfgsmdc56lmfpiyq5cx4dggy95qykx86ip787";
};

# This patch relaxes grsec constraints on the location of usermode helpers,