diff options
author | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
commit | f67d5a9a39c658ba38ce4efd3968fb76ed97ac70 (patch) | |
tree | fb0a753dab894f13519ea969ad7edcfc19e3b56f /pkgs/tools/misc/file | |
parent | 473ba2212d3b8cc16b5ffb2f5a6367425614357c (diff) | |
parent | 9ada368ef842d5bc52d0db0b92ee0217cc213a83 (diff) |
Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix
Diffstat (limited to 'pkgs/tools/misc/file')
-rw-r--r-- | pkgs/tools/misc/file/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 4e62462b8b35d..d7e88ec1a8cd9 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, zlib}: - + stdenv.mkDerivation rec { name = "file-5.11"; |