Author: eelco
Date: Wed Dec 29 19:19:56 2010
New Revision: 25322
URL: https://svn.nixos.org/websvn/nix/?rev=25322&sc=1
Log:
* Replace the Python "magic" module with the (apparently) more
common one from the "file" package.
Modified:
nixpkgs/trunk/pkgs/tools/misc/file/default.nix
nixpkgs/trunk/pkgs/top-level/python-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/misc/file/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/misc/file/default.nix Wed Dec 29 18:04:17
2010 (r25321)
+++ nixpkgs/trunk/pkgs/tools/misc/file/default.nix Wed Dec 29 19:19:56
2010 (r25322)
@@ -2,6 +2,7 @@
stdenv.mkDerivation {
name = "file-5.03";
+
src = fetchurl {
url = ftp://ftp.astron.com/pub/file/file-5.03.tar.gz;
sha256 = "1fwmpplwc6h2g89ribq7w8x2np0yn5k7bw042815rv7jkrzv9nhy";
Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/python-packages.nix Wed Dec 29 18:04:17
2010 (r25321)
+++ nixpkgs/trunk/pkgs/top-level/python-packages.nix Wed Dec 29 19:19:56
2010 (r25322)
@@ -899,26 +899,22 @@
};
};
- magic = buildPythonPackage rec {
- name = "magic-0.3.1";
+ magic = pkgs.stdenv.mkDerivation rec {
+ name = "python-${pkgs.file.name}";
- src = fetchurl {
- url =
"http://pypi.python.org/packages/source/p/python-magic/python-${name}.tar.gz";;
- md5 = "397cff81d2502e81fd3830a61ca2ad2c";
- };
+ src = pkgs.file.src;
+
+ buildInputs = [ python pkgs.file ];
+
+ configurePhase = "cd python";
+
+ buildPhase = "python setup.py build";
- preConfigure =
- ''
- # Ensure that the module can find libmagic by hard-coding the
- # path to libmagic.so. Maybe there is a nicer way.
- substituteInPlace magic.py --replace \
- "ctypes.util.find_library('magic')" \
- "'${pkgs.file}/lib/libmagic.so'"
- '';
+ installPhase = "python setup.py install --prefix=$out";
meta = {
description = "A Python wrapper around libmagic";
- homepage = https://github.com/ahupp/python-magic;
+ homepage = http://www.darwinsys.com/file/;
};
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
