diff options
| author | Shea Levy <shea@shealevy.com> | 2013-05-04 18:28:48 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-05-04 18:28:48 -0400 |
| commit | fde3526e7d0c941f138f3b4906bd48359567da3a (patch) | |
| tree | e86a3b8b722db5c5d063c7c1520f745271aaacb5 /pkgs/tools/archivers | |
| parent | 3e3f70713ffe68a6ee63a8d4a8bd2552e32916d7 (diff) | |
| parent | f8f9f3b1ccafc5778bd0fbdd746ba04d55f62fa2 (diff) | |
| download | nixlib-fde3526e7d0c941f138f3b4906bd48359567da3a.tar nixlib-fde3526e7d0c941f138f3b4906bd48359567da3a.tar.gz nixlib-fde3526e7d0c941f138f3b4906bd48359567da3a.tar.bz2 nixlib-fde3526e7d0c941f138f3b4906bd48359567da3a.tar.lz nixlib-fde3526e7d0c941f138f3b4906bd48359567da3a.tar.xz nixlib-fde3526e7d0c941f138f3b4906bd48359567da3a.tar.zst nixlib-fde3526e7d0c941f138f3b4906bd48359567da3a.zip | |
Merge branch 'master' into stdenv-updates
Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/zpaq/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 2188668d3bf1..6b04fe172687 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="622"; + version="625"; name="${baseName}-${version}"; - hash="19avac9spq5kgcgbixd9kvjhy9j0ga75izwqhif44h3jlzdydsmc"; - url="http://mattmahoney.net/dc/zpaq622.zip"; - sha256="19avac9spq5kgcgbixd9kvjhy9j0ga75izwqhif44h3jlzdydsmc"; + hash="0d3ly8l6mzbqxkg68yz7mid3dr056fgr5n49rlkjwcfg533c5gwx"; + url="http://mattmahoney.net/dc/zpaq625.zip"; + sha256="0d3ly8l6mzbqxkg68yz7mid3dr056fgr5n49rlkjwcfg533c5gwx"; }; buildInputs = [ unzip |