diff options
author | Rob Vermaas <rob.vermaas@gmail.com> | 2012-04-30 14:28:08 +0000 |
---|---|---|
committer | Rob Vermaas <rob.vermaas@gmail.com> | 2012-04-30 14:28:08 +0000 |
commit | 0823167b43f149b2ac2bc39efe44cdc3a39c573d (patch) | |
tree | 5811021d96ddfab9992e1f9511bc3e26b0d5a7f9 /pkgs/tools/misc/file | |
parent | 0362f55a222a1b857451b29da2c63bdc6cbdba5a (diff) | |
download | nixlib-0823167b43f149b2ac2bc39efe44cdc3a39c573d.tar nixlib-0823167b43f149b2ac2bc39efe44cdc3a39c573d.tar.gz nixlib-0823167b43f149b2ac2bc39efe44cdc3a39c573d.tar.bz2 nixlib-0823167b43f149b2ac2bc39efe44cdc3a39c573d.tar.lz nixlib-0823167b43f149b2ac2bc39efe44cdc3a39c573d.tar.xz nixlib-0823167b43f149b2ac2bc39efe44cdc3a39c573d.tar.zst nixlib-0823167b43f149b2ac2bc39efe44cdc3a39c573d.zip |
Revert my previous 2 commits.
svn path=/nixpkgs/trunk/; revision=33951
Diffstat (limited to 'pkgs/tools/misc/file')
-rw-r--r-- | pkgs/tools/misc/file/511.nix | 17 | ||||
-rw-r--r-- | pkgs/tools/misc/file/python.patch | 11 |
2 files changed, 0 insertions, 28 deletions
diff --git a/pkgs/tools/misc/file/511.nix b/pkgs/tools/misc/file/511.nix deleted file mode 100644 index 4e62462b8b35..000000000000 --- a/pkgs/tools/misc/file/511.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, zlib}: - -stdenv.mkDerivation rec { - name = "file-5.11"; - - buildInputs = [ zlib ]; - - src = fetchurl { - url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz"; - sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7"; - }; - - meta = { - description = "A program that shows the type of files"; - homepage = "http://darwinsys.com/file"; - }; -} diff --git a/pkgs/tools/misc/file/python.patch b/pkgs/tools/misc/file/python.patch deleted file mode 100644 index 8ecbc9a81fdc..000000000000 --- a/pkgs/tools/misc/file/python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- file-5.11/python/magic.py 2011-09-22 18:57:41.000000000 +0200 -+++ file-5.11/python/magic.py.1 2012-04-30 15:00:31.750213810 +0200 -@@ -13,7 +13,7 @@ - Loads the shared library through ctypes and returns a library - L{ctypes.CDLL} instance - """ -- return ctypes.cdll.LoadLibrary(find_library('magic')) -+ return ctypes.CDLL('libmagic.so') - - _libraries = {} - _libraries['magic'] = _init() |