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

svn merge ^/nixpkgs/trunk

Browse Source 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
This commit is contained in:
Yury G. Kudryashov
2012-02-06 23:03:12 +00:00
parent b31c67e24d 4e3dcd9254
commit 215a07c1a9
208 changed files with 2222 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/openssh/default.nix
+4 -4
View File
@@ -6,18 +6,18 @@
let
hpnSrc = fetchurl {
url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v11.diff.gz;
sha256 = "1xwx2m2sihpy57mwdnc9km3c72hxfdjyp5mmr1vcx2c8kp901db2";
url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v12.diff.gz;
sha256 = "0h1h45vic4zks5bc5mvkc50rlgy2c219vn3rmpmalgm5hws9qjbl";
};
in
stdenv.mkDerivation rec {
name = "openssh-5.8p2";
name = "openssh-5.9p1";
src = fetchurl {
url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
sha1 = "64798328d310e4f06c9f01228107520adbc8b3e5";
sha256 = "1mbpfyq3kjc4p8pc631iqgvcqhwhm6vdwvzsdmd54jzhdxmqngld";
};
prePatch = stdenv.lib.optionalString hpnSupport