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

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
This commit is contained in:
Peter Simons
2013-12-04 18:33:52 +01:00
parent 88c7b4c7fe 41f0e6ad92
commit c32bf83301
765 changed files with 14556 additions and 11365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/kerberos/heimdal.nix
+2 -2
View File
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl, sqlite} :
stdenv.mkDerivation rec {
name = "heimdal-1.5.2";
name = "heimdal-1.5.3";
src = fetchurl {
urls = [
"http://www.h5l.org/dist/src/${name}.tar.gz"
"http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
];
sha256 = "22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec";
sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
};
## ugly, X should be made an option