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/top-level/all-packages.nix
This commit is contained in:
Peter Simons
2013-10-26 18:28:05 +02:00
parent f7bec094e6 e1c9c133b0
commit 91f2c362de
156 changed files with 2797 additions and 844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
{stdenv, fetchurl, zlib, lzo, bzip2, nasm, perl}:
stdenv.mkDerivation rec {
version = "0.614";
version = "0.616";
name = "lrzip-${version}";
src = fetchurl {
url = "http://ck.kolivas.org/apps/lrzip/${name}.tar.bz2";
sha256 = "16i6mz2z6gx8xiva7zb0j78yvkwq1bjbdkl7w3i10195ll097ad8";
sha256 = "1bimlbsfzjvippbma08ifm1grcy9i7avryrkdvnvrfyqnj6mlbcq";
};
buildInputs = [ zlib lzo bzip2 nasm perl ];