summary refs log tree commit diff
path: root/pkgs/development/libraries/gnutls
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-07-17 06:37:13 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-07-17 06:38:04 +0200
commit9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c (patch)
tree946e5c7626f668079bcf35caf203a52c5d33f3c7 /pkgs/development/libraries/gnutls
parentcf8309ef34b9ec18bc9aeca9e63f984e1be19b56 (diff)
parent967abfc78660d0e49a32eac8fe19cec4b6b79d5c (diff)
downloadnixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar
nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.gz
nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.bz2
nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.lz
nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.xz
nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.zst
nixpkgs-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.zip
Merge master into staging
There are larger-rebuild changes: gnutls and samba.
Diffstat (limited to 'pkgs/development/libraries/gnutls')
-rw-r--r--pkgs/development/libraries/gnutls/3.3.nix4
-rw-r--r--pkgs/development/libraries/gnutls/3.4.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix
index a2c04506a6c..bd95ce07254 100644
--- a/pkgs/development/libraries/gnutls/3.3.nix
+++ b/pkgs/development/libraries/gnutls/3.3.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.3.15";
+  version = "3.3.16";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz";
-    sha256 = "166nynb055vlh6dm1gaqwpcnf4mp7ks8lz2yvm7dlsrkbh3swj5m";
+    sha256 = "1jl5n02mh83ygrrk7rq8vwylv5gdr3wccqs1ynvzr749fd2wq637";
   };
 })
diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
index 614834252fa..0558e4127c4 100644
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
-    sha256 = "1wzasbrs4ncq4yisqyvifl7mzlyyg1pb0idr4fhjmcfpi13sxlaw";
+    sha256 = "1q4adb1xi9pl00iy3cqs4r1qmwllv1g1r44p6xsg6n65dpyf53q2";
   };
 })