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

Merge master into stdenv-updates

Browse Source 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
This commit is contained in:
Vladimír Čunát
2013-12-28 23:28:30 +01:00
parent cb639302df 9f735bdf57
commit e740b565cf
395 changed files with 5580 additions and 3281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/compression/upx/default.nix
View File

@@ -1,10 +1,10 @@
{stdenv, fetchurl, ucl, zlib}:
stdenv.mkDerivation {
name = "upx-3.07";
name = "upx-3.09";
src = fetchurl {
url = mirror://sourceforge/upx/upx-3.07-src.tar.bz2;
sha256 = "07pcgjn7x0a734mvhgqwz24qkm1rzqrkcp67pmagzz6i765cp7bs";
url = mirror://sourceforge/upx/upx-3.09-src.tar.bz2;
sha256 = "16jwynharr1silfd6vlxl9i94fs8mg79qp72dr48r3wv9mlra6pn";
};
buildInputs = [ ucl zlib ];