Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 979b8410dbc4
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3fdb468b4790
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 30, 2019

  1. python: ecdsa: 0.13.2 -> 0.13.3 

    Resolving CVE-2019-14853 & CVE-2019-14859

(cherry picked from commit 6b125ad)
    @FRidh
    FRidh committed Dec 30, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5ff4ee5 View commit details

  2. wireguard: 0.0.20191219 -> 0.0.20191226 

    the wireguard kernel module has been pulled out into it's own repo as
announced in this mailing list post:

https://lists.zx2c4.com/pipermail/wireguard/2019-December/004796.html
(cherry picked from commit 9681bc7)
    @d-xo @Ma27
    d-xo authored and Ma27 committed Dec 30, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    143b2ff View commit details

  3. wireguard-tools: 0.0.20191219 -> 1.0.20191226 

    the userspace wireguard tools have been pulled out into their own repo as
announced in this mailing list post:

https://lists.zx2c4.com/pipermail/wireguard/2019-December/004787.html
(cherry picked from commit d6be252)
    @d-xo @Ma27
    d-xo authored and Ma27 committed Dec 30, 2019
    Copy the full SHA
    3fdb468 View commit details
Showing with 19 additions and 11 deletions.
  1. +2 −2 pkgs/development/python-modules/ecdsa/default.nix
  2. +11 −3 pkgs/os-specific/linux/wireguard/default.nix
  3. +6 −6 pkgs/tools/networking/wireguard-tools/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/ecdsa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

buildPythonPackage rec {
pname = "ecdsa";
version = "0.13.2";
version = "0.13.3";

src = fetchPypi {
inherit pname version;
sha256 = "5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884";
sha256 = "163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d";
};

# Only needed for tests
14 changes: 11 additions & 3 deletions pkgs/os-specific/linux/wireguard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
{ stdenv, kernel, wireguard-tools, perl }:
{ stdenv, fetchzip, kernel, perl, wireguard-tools }:

# module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
assert stdenv.lib.versionAtLeast kernel.version "3.10";
# wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html
assert stdenv.lib.versionOlder kernel.version "5.6";

stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "wireguard";
inherit (wireguard-tools) src version;
version = "0.0.20191226";

src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
sha256 = "1q618h385kqnzxa8xswnw9i1yqrlnl3fglkhbzc8w1181qr4fhra";
};

preConfigure = ''
cd src
@@ -27,6 +34,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
inherit (wireguard-tools.meta) homepage license maintainers;
description = "Kernel module for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/";
platforms = platforms.linux;
};
}
12 changes: 6 additions & 6 deletions pkgs/tools/networking/wireguard-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "wireguard-tools";
version = "0.0.20191219";
version = "1.0.20191226";

src = fetchzip {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "1qxpjvj3927xdly022rp2sndbifmr0c2y6ik77v43k95ch94716d";
url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
sha256 = "14v5asdjazz0p3bhg8na9w6y66i3jhnn8imxhq8xlix1k4n93l4z";
};

sourceRoot = "source/src/tools";
sourceRoot = "source/src";

nativeBuildInputs = [ makeWrapper ];
buildInputs = optional stdenv.isLinux libmnl;
@@ -51,10 +51,10 @@ stdenv.mkDerivation rec {

meta = {
description = "Tools for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/WireGuard/refs/";
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
homepage = "https://www.wireguard.com/";
license = licenses.gpl2;
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 ];
maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ];
platforms = platforms.unix;
};
}