diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-21 23:51:55 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-21 23:51:55 +0200 |
commit | 74720a36c75ce74dbafb86a147aecbbdd0c1f6a7 (patch) | |
tree | 19e0db68b876d7127d083c3733fe40c7016809ce /pkgs/top-level | |
parent | c7b337385140762b16cb30c0442919a040182185 (diff) | |
parent | 5d4d4df8c0899af2342bfbb4f5c898c2cd3241ce (diff) | |
download | nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.gz nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.bz2 nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.lz nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.xz nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.tar.zst nixpkgs-74720a36c75ce74dbafb86a147aecbbdd0c1f6a7.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 39 | ||||
-rw-r--r-- | pkgs/top-level/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/lua-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 166 |
4 files changed, 43 insertions, 170 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63a74435a77..c313bda5fca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1298,7 +1298,9 @@ with pkgs; mathics = pythonPackages.mathics; - masscan = callPackage ../tools/security/masscan { }; + masscan = callPackage ../tools/security/masscan { + stdenv = gccStdenv; + }; massren = callPackage ../tools/misc/massren { }; @@ -2769,6 +2771,11 @@ with pkgs; h2 = callPackage ../servers/h2 { }; + h5utils = callPackage ../tools/misc/h5utils { + libmatheval = null; + hdf4 = null; + }; + haproxy = callPackage ../tools/networking/haproxy { }; haveged = callPackage ../tools/security/haveged { }; @@ -4924,6 +4931,8 @@ with pkgs; ssss = callPackage ../tools/security/ssss { }; + stabber = callPackage ../misc/stabber { }; + stress = callPackage ../tools/system/stress { }; stress-ng = callPackage ../tools/system/stress-ng { }; @@ -8204,6 +8213,8 @@ with pkgs; texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; + todolist = callPackage ../applications/misc/todolist { }; + travis = callPackage ../development/tools/misc/travis { }; tweak = callPackage ../applications/editors/tweak { }; @@ -9919,7 +9930,9 @@ with pkgs; libplist = callPackage ../development/libraries/libplist { }; - libqglviewer = callPackage ../development/libraries/libqglviewer { }; + libqglviewer = callPackage ../development/libraries/libqglviewer { + inherit (darwin.apple_sdk.frameworks) AGL; + }; libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; @@ -12578,9 +12591,9 @@ with pkgs; qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; - OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; }; - OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; }; - #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; }; + OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; + OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl = null; }; + #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios = null; secureBoot = true; }; seabios = callPackage ../applications/virtualization/seabios { }; @@ -16603,7 +16616,9 @@ with pkgs; mod-distortion = callPackage ../applications/audio/mod-distortion { }; - monero = callPackage ../applications/altcoins/monero { }; + monero = callPackage ../applications/altcoins/monero { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { }; @@ -17016,9 +17031,7 @@ with pkgs; ncpamixer = callPackage ../applications/audio/ncpamixer { }; - pan = callPackage ../applications/networking/newsreaders/pan { - spellChecking = false; - }; + pan = callPackage ../applications/networking/newsreaders/pan { }; panotools = callPackage ../applications/graphics/panotools { }; @@ -19469,7 +19482,10 @@ with pkgs; }; xfce = xfce4-12; + xfceUnstable = xfce4-13; + xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); + xfce4-13 = recurseIntoAttrs (callPackage ../desktops/xfce4-13 { }); xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; @@ -20286,7 +20302,10 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - gajim = callPackage ../applications/networking/instant-messengers/gajim { }; + gajim = python3.pkgs.callPackage ../applications/networking/instant-messengers/gajim { + inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly; + inherit (gnome3) gspell; + }; gammu = callPackage ../applications/misc/gammu { }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 9cf9eb4db65..da7fc1bed34 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -22,9 +22,9 @@ # `*Platform`s. localSystem - # The system packages will ultimately be run on. Null if the two should be the +, # The system packages will ultimately be run on. Null if the two should be the # same. -, crossSystem ? null + crossSystem ? null , # Allow a configuration attribute set to be passed in as an argument. config ? {} diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 75f2ab9e582..0cc4482f402 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -696,13 +696,13 @@ let lgi = stdenv.mkDerivation rec { name = "lgi-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "pavouk"; repo = "lgi"; rev = version; - sha256 = "09pbapjhyc3sn0jgx747shqr9286wqfzw02h43p4pk8fv2b766b9"; + sha256 = "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64c92056c5f..b0beece2982 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3657,32 +3657,7 @@ in { decorator = callPackage ../development/python-modules/decorator { }; - deform = buildPythonPackage rec { - name = "deform-2.0a2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/deform/${name}.tar.gz"; - sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd"; - }; - - buildInputs = with self; [] ++ optional isPy26 unittest2; - - propagatedBuildInputs = - [ self.beautifulsoup4 - self.peppercorn - self.colander - self.translationstring - self.chameleon - self.zope_deprecation - self.coverage - self.nose - ]; - - meta = { - maintainers = with maintainers; [ garbas domenkozar ]; - platforms = platforms.all; - }; - }; + deform = callPackage ../development/python-modules/deform { }; demjson = callPackage ../development/python-modules/demjson { }; @@ -5027,6 +5002,8 @@ in { JPype1 = callPackage ../development/python-modules/JPype1 {}; + josepy = callPackage ../development/python-modules/josepy {}; + jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; jug = callPackage ../development/python-modules/jug {}; @@ -6330,23 +6307,7 @@ in { schema = callPackage ../development/python-modules/schema {}; - stem = buildPythonPackage rec { - name = "stem-${version}"; - version = "1.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/stem/${name}.tar.gz"; - sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp"; - }; - - meta = { - description = "Controller library that allows applications to interact with Tor (https://www.torproject.org/"; - homepage = https://stem.torproject.org/; - license = licenses.gpl3; - maintainers = with maintainers; [ phreedom ]; - }; - - }; + stem = callPackage ../development/python-modules/stem { }; svg-path = callPackage ../development/python-modules/svg-path { }; @@ -6874,52 +6835,7 @@ in { }; }; - django_pipeline = buildPythonPackage rec { - name = "django-pipeline-${version}"; - version = "1.5.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-pipeline/${name}.tar.gz"; - sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha"; - }; - - propagatedBuildInputs = with self; [ django futures ]; - - meta = with stdenv.lib; { - description = "Pipeline is an asset packaging library for Django"; - homepage = https://github.com/cyberdelia/django-pipeline; - license = stdenv.lib.licenses.mit; - }; - }; - - django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec { - name = "django-pipeline-1.3.27"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-pipeline/${name}.tar.gz"; - sha256 = "0iva3cmnh5jw54c7w83nx9nqv523hjvkbjchzd2pb6vzilxf557k"; - }; - }); - - - djblets = if (versionOlder self.django.version "1.6.11") || - (versionAtLeast self.django.version "1.9") - then throw "djblets only suported for Django<1.8.999,>=1.6.11" - else buildPythonPackage rec { - name = "Djblets-0.9"; - - src = pkgs.fetchurl { - url = "http://downloads.reviewboard.org/releases/Djblets/0.9/${name}.tar.gz"; - sha256 = "1rr5vjwiiw3kih4k9nawislf701l838dbk5xgizadvwp6lpbpdpl"; - }; - - propagatedBuildInputs = with self; [ - django feedparser django_pipeline_1_3 pillowfight pytz ]; - - meta = { - description = "A collection of useful extensions for Django"; - homepage = https://github.com/djblets/djblets; - }; - }; + django_pipeline = callPackage ../development/python-modules/django-pipeline { }; dj-database-url = callPackage ../development/python-modules/dj-database-url { }; @@ -8895,24 +8811,8 @@ in { keyutils = callPackage ../development/python-modules/keyutils { }; - klein = buildPythonPackage rec { - name = "klein-15.3.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/k/klein/${name}.tar.gz"; - sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9"; - }; - - disabled = isPy3k; - - propagatedBuildInputs = with self; [ werkzeug twisted ]; - - meta = { - description = "Klein Web Micro-Framework"; - homepage = "https://github.com/twisted/klein"; - license = licenses.mit; - }; - }; - + klein = callPackage ../development/python-modules/klein { }; + koji = callPackage ../development/python-modules/koji { }; kombu = buildPythonPackage rec { @@ -11245,34 +11145,7 @@ in { }; }; - WSME = buildPythonPackage rec { - name = "WSME-${version}"; - version = "0.8.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/W/WSME/${name}.tar.gz"; - sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900"; - }; - - checkPhase = '' - # remove turbogears tests as we don't have it packaged - rm tests/test_tg* - # remove flask since we don't have flask-restful - rm tests/test_flask* - # https://bugs.launchpad.net/wsme/+bug/1510823 - ${if isPy3k then "rm tests/test_cornice.py" else ""} - - nosetests tests/ - ''; - - propagatedBuildInputs = with self; [ - pbr six simplegeneric netaddr pytz webob - ]; - buildInputs = with self; [ - cornice nose webtest pecan transaction cherrypy sphinx - ]; - }; - + WSME = callPackage ../development/python-modules/WSME { }; zake = buildPythonPackage rec { name = "zake-${version}"; @@ -14402,27 +14275,6 @@ in { django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; - reviewboard = buildPythonPackage rec { - name = "ReviewBoard-2.5.1.1"; - - src = pkgs.fetchurl { - url = "http://downloads.reviewboard.org/releases/ReviewBoard/2.5/${name}.tar.gz"; - sha256 = "14m8yy2aqxnnzi822b797wc9nmkfkp2fqmq24asdnm66bxhyzjwn"; - }; - - patchPhase = '' - sed -i 's/mimeparse/python-mimeparse/' setup.py - sed -i 's/markdown>=2.4.0,<2.4.999/markdown/' setup.py - ''; - - propagatedBuildInputs = with self; - [ django recaptcha_client pytz memcached dateutil_1_5 paramiko flup - pygments djblets django_evolution pycrypto pysvn pillow - psycopg2 django-haystack python_mimeparse markdown django-multiselectfield - ]; - }; - - rdflib = callPackage ../development/python-modules/rdflib { }; isodate = buildPythonPackage rec { @@ -15019,6 +14871,8 @@ in { }; }; + slimit = callPackage ../development/python-modules/slimit { }; + slob = buildPythonPackage rec { name = "slob-unstable-2016-11-03"; |