diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 53 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 344 |
5 files changed, 76 insertions, 331 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8dbf7622665e..06da21813ae3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -66,6 +66,7 @@ mapAliases (rec { firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 + font-awesome-ttf = font-awesome_4; # 2018-02-25 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 gettextWithExpat = gettext; # 2016-02-19 @@ -131,6 +132,7 @@ mapAliases (rec { m3d-linux = m33-linux; # added 2016-08-13 manpages = man-pages; # added 2015-12-06 man_db = man-db; # added 2016-05 + piwik = matomo; # added 2018-01-16 midoriWrapper = midori; # added 2015-01 minc_tools = minc-tools; # 2017-12 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4da70b518b1c..adb69dab7b69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -121,7 +121,8 @@ with pkgs; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - dockerTools = callPackage ../build-support/docker { }; + # go 1.9 pin until https://github.com/moby/moby/pull/35739 + dockerTools = callPackage ../build-support/docker { go = go_1_9; }; docker_compose = pythonPackages.docker_compose; @@ -644,6 +645,8 @@ with pkgs; glyr = callPackage ../tools/audio/glyr { }; + imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; @@ -723,6 +726,8 @@ with pkgs; qt4Support = config.avahi.qt4Support or false; }; + avro-c = callPackage ../development/libraries/avro-c { }; + avro-cpp = callPackage ../development/libraries/avro-c++ { boost = boost160; }; aws = callPackage ../tools/virtualization/aws { }; @@ -3702,9 +3707,11 @@ with pkgs; nbd = callPackage ../tools/networking/nbd { }; - nccl = callPackage ../development/libraries/science/math/nccl { - cudatoolkit = cudatoolkit8; - }; + inherit (callPackages ../development/libraries/science/math/nccl { }) + nccl_cudatoolkit8 + nccl_cudatoolkit9; + + nccl = nccl_cudatoolkit9; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -4622,6 +4629,8 @@ with pkgs; qtbase = qt4; qmake = qmake4Hook; }; + scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; + scrot = callPackage ../tools/graphics/scrot { }; scrypt = callPackage ../tools/security/scrypt { }; @@ -6817,7 +6826,7 @@ with pkgs; clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - dhall = haskell.lib.justStaticExecutables haskellPackages.dhall; + dhall = callPackage ../development/interpreters/dhall { }; dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; @@ -8878,9 +8887,7 @@ with pkgs; glibc32 = pkgsi686Linux.glibc; }; - glm = callPackage ../development/libraries/glm - (lib.optionalAttrs stdenv.cc.isGNU { stdenv = overrideCC stdenv gcc6;/*maybe a hack*/ }); - + glm = callPackage ../development/libraries/glm { }; glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; globalplatform = callPackage ../development/libraries/globalplatform { }; @@ -8934,6 +8941,7 @@ with pkgs; }; goocanvas = callPackage ../development/libraries/goocanvas { }; + goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; google-gflags = callPackage ../development/libraries/google-gflags { }; @@ -10621,10 +10629,13 @@ with pkgs; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { enableCuda = config.cudaSupport or false; - cudatoolkit = cudatoolkit8; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; + opencv3WithoutCuda = opencv3.override { + enableCuda = false; + }; + # this ctl version is needed by openexr_viewers openexr_ctl = ctl; @@ -12508,6 +12519,8 @@ with pkgs; pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; + pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; + qpid-cpp = callPackage ../servers/amqp/qpid-cpp { boost = boost155; }; @@ -12660,7 +12673,7 @@ with pkgs; shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - piwik = callPackage ../servers/web-apps/piwik { }; + matomo = callPackage ../servers/web-apps/matomo { }; axis2 = callPackage ../servers/http/tomcat/axis2 { }; @@ -14009,7 +14022,6 @@ with pkgs; emojione = callPackage ../data/fonts/emojione { inherit (nodePackages) svgo; - inherit (pythonPackages) scfbuild; }; encode-sans = callPackage ../data/fonts/encode-sans { }; @@ -14025,7 +14037,8 @@ with pkgs; fira-mono = callPackage ../data/fonts/fira-mono { }; - font-awesome-ttf = callPackage ../data/fonts/font-awesome-ttf { }; + font-awesome_4 = callPackage ../data/fonts/font-awesome-4 { }; + font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; @@ -14323,7 +14336,6 @@ with pkgs; twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { inherit (nodePackages) svgo; - inherit (pythonPackages) scfbuild; }; tzdata = callPackage ../data/misc/tzdata { }; @@ -14932,7 +14944,8 @@ with pkgs; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - inherit (callPackage ../applications/virtualization/docker { }) + # go 1.9 pin until https://github.com/moby/moby/pull/35739 + inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) docker_17_12 docker_18_02; @@ -17553,8 +17566,6 @@ with pkgs; syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { }; - syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { }; - syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; # linux only by now @@ -18571,7 +18582,7 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) kcalcore; - opencv3 = opencv3.override { enableContrib = true; }; + opencv3 = opencv3WithoutCuda; }; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; @@ -19734,6 +19745,8 @@ with pkgs; caffe = callPackage ../applications/science/math/caffe rec { cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false; cudnnSupport = cudaSupport; + # Used only for image loading. + opencv3 = opencv3WithoutCuda; }; caffe2 = callPackage ../development/libraries/science/math/caffe2 { @@ -19741,14 +19754,16 @@ with pkgs; inherit (python3Packages) python future six numpy pydot; protobuf = protobuf3_1; python-protobuf = python3Packages.protobuf3_1; + # Used only for image loading. + opencv3 = opencv3WithoutCuda; }; cntk = callPackage ../applications/science/math/cntk rec { cudaSupport = pkgs.config.cudaSupport or false; cudnnSupport = cudaSupport; inherit (linuxPackages) nvidia_x11; - cudatoolkit = cudatoolkit8; - cudnn = cudnn6_cudatoolkit8; + # Used only for image loading. + opencv3 = opencv3WithoutCuda; }; ecm = callPackage ../applications/science/math/ecm { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index d80c43b03f52..a589ceb7e0c9 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -9,7 +9,7 @@ , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , mysql, postgresql, cyrus_sasl -, fetchFromGitHub, libmpack, which, fetchpatch +, fetchFromGitHub, libmpack, which, fetchpatch, writeText }: let @@ -35,7 +35,9 @@ let getLuaCPath = lib : getPath lib "so"; #define build lua package function - buildLuaPackage = callPackage ../development/lua-modules/generic lua; + buildLuaPackage = callPackage ../development/lua-modules/generic { + inherit lua writeText; + }; luarocks = callPackage ../development/tools/misc/luarocks { inherit lua; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4beb076667cc..fb5b46fa6600 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11035,7 +11035,7 @@ let self = _self // overrides; _self = with self; { # tests fail; look unfinished doCheck = false; meta = { - homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; + homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-perl/; description = "Communicate with a smart card using PC/SC"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 274719e599c8..54cc7c810152 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -279,6 +279,8 @@ in { Pmw = callPackage ../development/python-modules/Pmw { }; + py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; + pyaes = callPackage ../development/python-modules/pyaes { }; pyamf = callPackage ../development/python-modules/pyamf { }; @@ -2225,6 +2227,7 @@ in { postPatch = '' cd bindings/python + sed -i 's,"libmpi.so.12","${pkgs.openmpi}/lib/libmpi.so",g' cntk/train/distributed.py ''; postInstall = '' @@ -2233,6 +2236,12 @@ in { # It's not installed for some reason. cp cntk/cntk_py.py $out/${python.sitePackages}/cntk ''; + + # Actual tests are broken. + checkPhase = '' + cd $NIX_BUILD_TOP + ${python.interpreter} -c "import cntk" + ''; }; celery = callPackage ../development/python-modules/celery { pytest = self.pytest_32; }; @@ -2771,6 +2780,16 @@ in { curtsies = callPackage ../development/python-modules/curtsies { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; + + jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; + + jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; + + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; + + pyunifi = callPackage ../development/python-modules/pyunifi { }; + tablib = buildPythonPackage rec { name = "tablib-${version}"; version = "0.12.1"; @@ -2788,6 +2807,7 @@ in { }; }; + wakeonlan = callPackage ../development/python-modules/wakeonlan { }; openant = buildPythonPackage rec { name = "openant-unstable-2017-02-11"; @@ -6119,74 +6139,12 @@ in { }; }; - python-axolotl = buildPythonPackage rec { - name = "python-axolotl-${version}"; - version = "0.1.39"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-axolotl/${name}.tar.gz"; - sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; - }; - - propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ]; - # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in) - doCheck = false; - - meta = { - homepage = "https://github.com/tgalal/python-axolotl"; - description = "Python port of libaxolotl-android"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.gpl3; - platforms = platforms.all; - }; - }; - - python-axolotl-curve25519 = buildPythonPackage rec { - name = "python-axolotl-curve25519-${version}"; - version = "0.1"; + python-axolotl = callPackage ../development/python-modules/python-axolotl { }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz"; - sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5"; - }; - - meta = { - homepage = "https://github.com/tgalal/python-axolotl-curve25519"; - description = "Curve25519 with ed25519 signatures"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.gpl3; - platforms = platforms.all; - }; - }; + python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { }); - pypolicyd-spf = buildPythonPackage rec { - name = "pypolicyd-spf-${version}"; - majorVersion = "2.0"; - version = "${majorVersion}.1"; - disabled = !isPy3k; - - src = pkgs.fetchurl { - url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz"; - sha256 = "09yi8y7pij5vzzrkc9sdw01x8w5n758d0qg7wv5hxd1l6if8c94i"; - }; - - propagatedBuildInputs = with self; [ pyspf ]; - - preBuild = '' - substituteInPlace setup.py --replace "'/etc'" "'$out/etc'" - ''; - - meta = { - homepage = "https://launchpad.net/pypolicyd-spf/"; - description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.asl20; - platforms = platforms.all; - }; - }; - pyramid = buildPythonPackage rec { pname = "pyramid"; version = "1.9.1"; @@ -6333,25 +6291,7 @@ in { pyroute2 = callPackage ../development/python-modules/pyroute2 { }; - pyspf = buildPythonPackage rec { - name = "pyspf-${version}"; - version = "2.0.12"; - - src = pkgs.fetchurl { - url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz"; - sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; - }; - - propagatedBuildInputs = with self; [ pydns ]; - - meta = { - homepage = "http://bmsi.com/python/milter.html"; - description = "Python API for Sendmail Milters (SPF)"; - maintainers = with maintainers; [ abbradar ]; - license = licenses.gpl2; - platforms = platforms.all; - }; - }; + pyspf = callPackage ../development/python-modules/pyspf { }; pysrt = callPackage ../development/python-modules/pysrt { }; @@ -6487,23 +6427,7 @@ in { doCheck = false; }; - sarge = buildPythonPackage rec { - name = "sarge-${version}"; - version = "0.1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sarge/${name}.tar.gz"; - sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar"; - }; - - meta = { - homepage = "http://sarge.readthedocs.org/"; - description = "A wrapper for subprocess which provides command pipeline functionality"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + sarge = callPackage ../development/python-modules/sarge { }; subliminal = callPackage ../development/python-modules/subliminal {}; @@ -6611,53 +6535,7 @@ in { }; }; - scandir = self.buildPythonPackage rec { - name = "scandir-${version}"; - version = "1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/scandir/${name}.tar.gz"; - sha256 = "0yjrgp0mxp3d8bjkq2m1ac2ys8n76wykksvgyjrnil9gr3fx7a5d"; - }; - - meta = with stdenv.lib; { - description = "A better directory iterator and faster os.walk()"; - homepage = "https://github.com/benhoyt/scandir"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - scfbuild = self.buildPythonPackage rec { - name = "scfbuild-${version}"; - version = "1.0.3"; - - disabled = isPy3k; - - src = pkgs.fetchFromGitHub { - owner = "eosrei"; - repo = "scfbuild"; - rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318"; - sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46"; - }; - - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - - propagatedBuildInputs = with self; [ pyyaml fonttools fontforge ]; - - installPhase = '' - mkdir -p $out/${python.sitePackages} - cp -r scfbuild $out/${python.sitePackages} - cp -r bin $out - ''; - - meta = with stdenv.lib; { - description = "SVGinOT color font builder"; - homepage = "https://github.com/eosrei/scfbuild"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; + scandir = callPackage ../development/python-modules/scandir { }; schedule = buildPythonPackage rec { name = "schedule-0.3.2"; @@ -7502,25 +7380,7 @@ in { }; }; - enum-compat = buildPythonPackage rec { - pname = "enum-compat"; - version = "0.0.2"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k"; - }; - - propagatedBuildInputs = with self; [ enum34 ]; - - meta = { - homepage = "https://github.com/jstasiak/enum-compat"; - description = "enum/enum34 compatibility package"; - license = licenses.mit; - maintainers = with maintainers; [ abbradar ]; - }; - }; + enum-compat = callPackage ../development/python-modules/enum-compat { }; enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec { pname = "enum34"; @@ -7789,24 +7649,7 @@ in { flask = callPackage ../development/python-modules/flask { }; - flask_assets = buildPythonPackage rec { - name = "Flask-Assets-${version}"; - version = "0.12"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz"; - sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; - }; - - propagatedBuildInputs = with self; [ flask webassets flask_script nose ]; - - meta = { - homepage = "http://github.com/miracle2k/flask-assets"; - description = "Asset management for Flask, to compress and merge CSS and Javascript files"; - license = licenses.bsd2; - maintainers = with maintainers; [ abbradar ]; - }; - }; + flask_assets = callPackage ../development/python-modules/flask-assets { }; flask_cache = buildPythonPackage rec { name = "Flask-Cache-0.13.1"; @@ -7847,25 +7690,7 @@ in { flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; - flask_principal = buildPythonPackage rec { - name = "Flask-Principal-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz"; - sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm"; - }; - - propagatedBuildInputs = with self; [ flask blinker nose ]; - - meta = { - homepage = "http://packages.python.org/Flask-Principal/"; - description = "Identity management for flask"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + flask_principal = callPackage ../development/python-modules/flask-principal { }; flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; @@ -7873,26 +7698,7 @@ in { flask-restplus = callPackage ../development/python-modules/flask-restplus { }; - flask_script = buildPythonPackage rec { - name = "Flask-Script-${version}"; - version = "2.0.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Script/${name}.tar.gz"; - sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf"; - }; - - nativeBuildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ flask ]; - - meta = { - homepage = "http://github.com/smurfix/flask-script"; - description = "Scripting support for Flask"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + flask_script = callPackage ../development/python-modules/flask-script { }; flask_sqlalchemy = buildPythonPackage rec { name = "Flask-SQLAlchemy-${version}"; @@ -9303,6 +9109,8 @@ in { jupyterhub = callPackage ../development/python-modules/jupyterhub { }; + jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; + jsonpath_rw = buildPythonPackage rec { name = "jsonpath-rw-${version}"; version = "1.4.0"; @@ -9462,23 +9270,7 @@ in { pylast = callPackage ../development/python-modules/pylast/default.nix { }; - pylru = buildPythonPackage rec { - name = "pylru-${version}"; - version = "1.0.9"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pylru/${name}.tar.gz"; - sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi"; - }; - - meta = { - homepage = "https://github.com/jlhutch/pylru"; - description = "A least recently used (LRU) cache implementation"; - license = licenses.gpl2; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + pylru = callPackage ../development/python-modules/pylru/default.nix { }; lark-parser = callPackage ../development/python-modules/lark-parser { }; @@ -16447,24 +16239,7 @@ in { }; }; - sockjs-tornado = buildPythonPackage rec { - name = "sockjs-tornado-${version}"; - version = "1.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; - sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; - }; - - propagatedBuildInputs = with self; [ tornado ]; - - meta = { - homepage = "http://github.com/mrjoes/sockjs-tornado/"; - description = "SockJS python server implementation on top of Tornado framework"; - license = licenses.mit; - maintainers = with maintainers; [ abbradar ]; - }; - }; + sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; sorl_thumbnail = buildPythonPackage rec { name = "sorl-thumbnail-11.12"; @@ -17800,31 +17575,7 @@ in { }; }; - virtkey = buildPythonPackage rec { - name = "virtkey-${version}"; - majorVersion = "0.63"; - version = "${majorVersion}.0"; - - src = pkgs.fetchurl { - url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; - sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; - }; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - - buildInputs = - [ pkgs.gtk2 ] - ++ (with pkgs.xorg; [ libX11 libXtst libXi libxkbfile xextproto xproto ]); - - meta = { - description = "Extension to emulate keypresses and to get the layout information from the X server"; - homepage = "https://launchpad.net/virtkey"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - + virtkey = callPackage ../development/python-modules/virtkey { }; virtual-display = buildPythonPackage rec { name = "PyVirtualDisplay-0.1.5"; @@ -17999,32 +17750,7 @@ EOF waitress-django = callPackage ../development/python-modules/waitress-django { }; - webassets = buildPythonPackage rec { - name = "webassets-${version}"; - version = "0.12.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/webassets/${name}.tar.gz"; - sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7"; - }; - - buildInputs = with self; [ nose jinja2 mock pytest ]; - propagatedBuildInputs = with self; [ pyyaml ]; - - doCheck = false; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = "http://github.com/miracle2k/webassets/"; - license = licenses.bsd2; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; + webassets = callPackage ../development/python-modules/webassets { }; webcolors = callPackage ../development/python-modules/webcolors { }; |