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/default.nix | |
| parent | 473ba2212d3b8cc16b5ffb2f5a6367425614357c (diff) | |
| parent | 9ada368ef842d5bc52d0db0b92ee0217cc213a83 (diff) | |
| download | nixpkgs-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar nixpkgs-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.gz nixpkgs-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.bz2 nixpkgs-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.lz nixpkgs-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.xz nixpkgs-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.zst nixpkgs-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.zip | |
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/default.nix')
| -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 4e62462b8b3..d7e88ec1a8c 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"; |