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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
This commit is contained in:
Eelco Dolstra
2014-10-16 15:16:50 +02:00
parent 3c6efec2c0 e39bf7a704
commit 09dc132e04
826 changed files with 8930 additions and 7226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/compression/gzip/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, less }:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "gzip-1.6";

4
pkgs/tools/compression/lzip/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, texinfo }:
stdenv.mkDerivation rec {
name = "lzip-1.15";
name = "lzip-1.16";
buildInputs = [ texinfo ];
src = fetchurl {
url = "mirror://savannah/lzip/${name}.tar.gz";
sha256 = "1dh5vmj5apizfawnsm50y7z064yx7cz3313przph16gwd3dgrlvw";
sha256 = "0l9724rw1l3hg2ldr3n7ihqich4m9nc6y7l302bvdj4jmxdw530j";
};
configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";

2
pkgs/tools/compression/zdelta/default.nix
View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
builder = ./builder.sh;
src = fetchurl {
url = "${meta.homepage}/downloads/${name}.tar.gz";
md5 = "c69583a64f42f69a39e297d0d27d77e5";
sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3";
};
meta = {