public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging

Browse Source 
There are larger-rebuild changes: gnutls and samba.
This commit is contained in:
Vladimír Čunát
2015-07-17 06:38:04 +02:00
parent cf8309ef34 967abfc786
commit 9f37e91ec5
46 changed files with 791 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gnutls/3.3.nix
+2 -2
View File
@@ -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";
};
})
pkgs/development/libraries/gnutls/3.4.nix
+2 -2
View File
@@ -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";
};
})