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

Commits on Jan 11, 2017

  1. gnutls33: 3.3.25 -> 3.3.26 

    Fixes the following security issues:

  * CVE-2017-5334
  * CVE-2017-5335
  * CVE-2017-5336
  * CVE-2017-5337

See https://www.gnutls.org/news.html#2017-01-09 for more information.
    @fpletz
    fpletz committed Jan 11, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0e963d2 View commit details

  2. libtasn1: 4.8 -> 4.9

    @fpletz
    fpletz committed Jan 11, 2017
    4
    Copy the full SHA
    7165b38 View commit details

  3. gnutls35: 3.5.5 -> 3.5.8 

    Fixes the following security issues:

  * CVE-2017-5334
  * CVE-2017-5335
  * CVE-2017-5336
  * CVE-2017-5337

See https://www.gnutls.org/news.html#2017-01-09 for more information.
    @fpletz
    fpletz committed Jan 11, 2017
    Copy the full SHA
    85ac790 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gnutls/3.3.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // rec {
version = "3.3.25";
version = "3.3.26";

src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz";
sha256 = "0bhzkzpzwg3lhbhpas7m4rcj4mrnyq76zmic9z42wpa68d76r78q";
sha256 = "1n90qyz54hhnmf4fmap6zdyv7nihz6mrbqgxhd46h7aqdcmqhzba";
};
})
8 changes: 5 additions & 3 deletions pkgs/development/libraries/gnutls/3.5.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{ callPackage, fetchurl, autoreconfHook, ... } @ args:
{ callPackage, fetchurl, libunistring, ... } @ args:

callPackage ./generic.nix (args // rec {
version = "3.5.5";
version = "3.5.8";

src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
sha256 = "0ag5q3dfxzv0dmqy7q0a8y74yc3m5yzvjrp324l6vqafh3klz6c6";
sha256 = "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf";
};

buildInputs = [ libunistring ];
})
6 changes: 4 additions & 2 deletions pkgs/development/libraries/gnutls/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@

# Version dependent args
, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
, buildInputs ? []
, ...}:

assert guileBindings -> guile != null;
@@ -41,7 +42,8 @@ stdenv.mkDerivation {
++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ [ unbound ]
++ lib.optional guileBindings guile;
++ lib.optional guileBindings guile
++ buildInputs;

nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;

@@ -75,7 +77,7 @@ stdenv.mkDerivation {

homepage = http://www.gnu.org/software/gnutls/;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ eelco wkennington ];
maintainers = with maintainers; [ eelco wkennington fpletz ];
platforms = platforms.all;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libtasn1/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, texinfo }:

stdenv.mkDerivation rec {
name = "libtasn1-4.8";
name = "libtasn1-4.9";

src = fetchurl {
url = "mirror://gnu/libtasn1/${name}.tar.gz";
sha256 = "04y5m29pqmvkfdbppmsdifyx89v8xclxzklpfc7a1fkr9p4jz07s";
sha256 = "0869cp6jx7cajgv6cnddsh3vc7bimmdkdjn80y1jpb4iss7plvsg";
};

outputs = [ "out" "dev" "devdoc" ];