diff options
| author | lethalman <lucabru@src.gnome.org> | 2015-06-03 12:50:02 +0200 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2015-06-03 12:50:02 +0200 |
| commit | d144ece04ea8897cf140775a02f518887f04a7b3 (patch) | |
| tree | 1dd59b549e819d78717ec1c471b1ca2341a6a489 | |
| parent | 3467aa462a47548f7db76ef641bf950e1420449f (diff) | |
| parent | 95c6b835cb064cfdbf06bcfed7341e54e6cd31ee (diff) | |
| download | nixlib-d144ece04ea8897cf140775a02f518887f04a7b3.tar nixlib-d144ece04ea8897cf140775a02f518887f04a7b3.tar.gz nixlib-d144ece04ea8897cf140775a02f518887f04a7b3.tar.bz2 nixlib-d144ece04ea8897cf140775a02f518887f04a7b3.tar.lz nixlib-d144ece04ea8897cf140775a02f518887f04a7b3.tar.xz nixlib-d144ece04ea8897cf140775a02f518887f04a7b3.tar.zst nixlib-d144ece04ea8897cf140775a02f518887f04a7b3.zip | |
Merge pull request #8127 from ip1981/mwlib
Add more dependencies for mwlib
| -rw-r--r-- | nixos/modules/services/misc/mwlib.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix index fb4a24253df4..d02e1e021a70 100644 --- a/nixos/modules/services/misc/mwlib.nix +++ b/nixos/modules/services/misc/mwlib.nix @@ -226,10 +226,11 @@ in chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}' ''; + path = with pkgs; [ imagemagick ]; environment = { PYTHONPATH = concatMapStringsSep ":" (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages") - [ "mwlib-rl" "mwlib-ext" "pygments" ]; + [ "mwlib-rl" "mwlib-ext" "pygments" "pyfribidi" ]; }; serviceConfig = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab452a562d96..ac800873860b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5011,6 +5011,22 @@ let }; }); + pyfribidi = buildPythonPackage rec { + version = "0.11.0"; + name = "pyfribidi-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip"; + md5 = "a3fc1f9d34571305782d1a54ee36f904"; + }; + + meta = { + description = "simple wrapper around fribidi."; + homepage = "https://github.com/pediapress/pyfribidi"; + license = stdenv.lib.licenses.gpl2; + }; + }; + docker_compose = buildPythonPackage rec { name = "docker-compose-1.2.0rc2"; disabled = isPy3k || isPyPy; |