diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 35 |
2 files changed, 10 insertions, 31 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3131c4d7882..6ebefb74a36d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3331,6 +3331,8 @@ with pkgs; openmvg = callPackage ../applications/science/misc/openmvg { }; + openmvs = callPackage ../applications/science/misc/openmvs { }; + openntpd = callPackage ../tools/networking/openntpd { }; openntpd_nixos = openntpd.override { @@ -12749,6 +12751,8 @@ with pkgs; inherit (callPackages ../data/fonts/noto-fonts {}) noto-fonts noto-fonts-cjk noto-fonts-emoji; + nullmailer = callPackage ../servers/mail/nullmailer { }; + numix-icon-theme = callPackage ../data/icons/numix-icon-theme { }; numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { }; @@ -15134,7 +15138,7 @@ with pkgs; openbox-menu = callPackage ../applications/misc/openbox-menu { }; - openbrf = callPackage ../applications/misc/openbrf { }; + openbrf = libsForQt5.callPackage ../applications/misc/openbrf { }; opencpn = callPackage ../applications/misc/opencpn { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 110ce6b84116..07bb85632cce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -677,15 +677,15 @@ in { aniso8601 = buildPythonPackage rec { name = "aniso8601-${version}"; version = "1.2.0"; - + meta = { description = "Parses ISO 8601 strings."; homepage = "https://bitbucket.org/nielsenb/aniso8601"; license = licenses.bsd3; }; - + propagatedBuildInputs = with self; [ dateutil ]; - + src = pkgs.fetchurl { url = "mirror://pypi/a/aniso8601/${name}.tar.gz"; sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4"; @@ -22087,7 +22087,7 @@ in { homepage = "https://github.com/goinnn/django-multiselectfield"; }; }; - + reviewboard = buildPythonPackage rec { name = "ReviewBoard-2.5.1.1"; @@ -31070,32 +31070,7 @@ EOF }; }; - whoosh = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "Whoosh"; - version = "2.7.4"; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684/${name}.tar.gz"; - sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; - }; - buildInputs = with self; [ pytest ]; - - # Wrong encoding - postPatch = '' - rm tests/test_reading.py - ''; - checkPhase = '' - py.test -k "not test_timelimit" - ''; - - meta = { - description = "Fast, pure-Python full text indexing, search, and spell checking library."; - homepage = "http://bitbucket.org/mchaput/whoosh"; - license = licenses.bsd2; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - }; + whoosh = callPackage ../development/python-modules/whoosh { }; packet-python = buildPythonPackage rec { name = "${pname}-${version}"; |