diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 40 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 16 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 42 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 149 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/unix-tools.nix | 4 |
7 files changed, 98 insertions, 162 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f310fd156c33..b653dfc7db69 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1,4 +1,4 @@ -self: +lib: self: super: with self; @@ -19,7 +19,7 @@ let # Make sure that we are not shadowing something from # all-packages.nix. - checkInPkgs = n: alias: if builtins.hasAttr n self + checkInPkgs = n: alias: if builtins.hasAttr n super then throw "Alias ${n} is still in all-packages.nix" else alias; @@ -32,7 +32,7 @@ in ### Deprecated aliases - for backward compatibility -mapAliases (rec { +mapAliases ({ PPSSPP = ppsspp; # added 2017-10-01 QmidiNet = qmidinet; # added 2016-05-22 accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 @@ -219,7 +219,6 @@ mapAliases (rec { pltScheme = racket; # just to be sure polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postage = pgmanage; # added 2017-11-03 procps = procps-ng; # added 2018-04-25 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 184a925c48ee..2c1efa08db16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -502,6 +502,8 @@ with pkgs; buildTools = androidenv.buildTools; }; + appimage-run = callPackage ../tools/package-management/appimage-run {}; + apt-cacher-ng = callPackage ../servers/http/apt-cacher-ng { }; apt-offline = callPackage ../tools/misc/apt-offline { }; @@ -2660,6 +2662,8 @@ with pkgs; stdenv = overrideCC stdenv gcc49; }; + gnirehtet = callPackage ../tools/networking/gnirehtet { }; + gnome15 = callPackage ../applications/misc/gnome15 { inherit (gnome2) gnome_python gnome_python_desktop; }; @@ -5056,6 +5060,8 @@ with pkgs; snabb = callPackage ../tools/networking/snabb { } ; + snapcast = callPackage ../applications/audio/snapcast { }; + sng = callPackage ../tools/graphics/sng { libpng = libpng12; }; @@ -7410,6 +7416,7 @@ with pkgs; python34Full = python34.override{x11Support=true;}; python35Full = python35.override{x11Support=true;}; python36Full = python36.override{x11Support=true;}; + python37Full = python37.override{x11Support=true;}; # pythonPackages further below, but assigned here because they need to be in sync pythonPackages = python.pkgs; @@ -7432,6 +7439,10 @@ with pkgs; inherit (darwin) CF configd; self = python36; }; + python37 = callPackage ../development/interpreters/python/cpython/3.7 { + inherit (darwin) CF configd; + self = python37; + }; pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; @@ -7444,6 +7455,7 @@ with pkgs; python34Packages = python34.pkgs; python35Packages = python35.pkgs; python36Packages = recurseIntoAttrs python36.pkgs; + python37Packages = python37.pkgs; pypyPackages = pypy.pkgs; # Should eventually be moved inside Python interpreters. @@ -8701,7 +8713,7 @@ with pkgs; # TODO(@Ericson2314): Build bionic libc from source bionic = assert hostPlatform.useAndroidPrebuilt; - androidenv.androidndkPkgs.libraries; + androidenv."androidndkPkgs_${hostPlatform.ndkVer}".libraries; bobcat = callPackage ../development/libraries/bobcat { }; @@ -10141,8 +10153,6 @@ with pkgs; libgssglue = callPackage ../development/libraries/libgssglue { }; - libgsystem = callPackage ../development/libraries/libgsystem { }; - libgudev = callPackage ../development/libraries/libgudev { }; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; @@ -15009,6 +15019,8 @@ with pkgs; audio-recorder = callPackage ../applications/audio/audio-recorder { }; + autokey = callPackage ../applications/office/autokey { }; + autotrace = callPackage ../applications/graphics/autotrace {}; avocode = callPackage ../applications/graphics/avocode {}; @@ -16563,6 +16575,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }); + inherit (nodePackages) imapnotify; + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -16793,7 +16807,7 @@ with pkgs; libreoffice = hiPrio libreoffice-still; - libreoffice-unwrapped =callPackage ../applications/office/libreoffice { + libreoffice-args = { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; @@ -16816,12 +16830,20 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; }); + libreoffice-unwrapped =callPackage ../applications/office/libreoffice + (libreoffice-args // { + }); + libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix + (libreoffice-args // { + poppler = poppler_0_61; + }); + + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + libreoffice = libreoffice-unwrapped; + }); libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libreoffice-unwrapped.override { - poppler = poppler_0_61; - }; + libreoffice = libreoffice-still-unwrapped; }); liferea = callPackage ../applications/networking/newsreaders/liferea { @@ -19747,8 +19769,6 @@ with pkgs; unnethack = callPackage ../games/unnethack { }; - unvanquished = callPackage ../games/unvanquished { }; - uqm = callPackage ../games/uqm { }; urbanterror = callPackage ../games/urbanterror { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c2b726a06b9..00689e1f5b2e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1464,21 +1464,7 @@ let self = _self // overrides; _self = with self; { }; }; - CatalystPluginUnicodeEncoding = buildPerlPackage { - name = "Catalyst-Plugin-Unicode-Encoding-1.9"; - src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Unicode-Encoding-1.9.tar.gz; - sha256 = "1glxkh79zz71bmgk44hnhsi37z2mgxcwf7bkmwlnwv3jh1iaz0ah"; - }; - buildInputs = [ HTTPMessage IOStringy ]; - propagatedBuildInputs = [ CatalystRuntime ClassDataInheritable LWP TryTiny URI ]; - meta = { - description = "Unicode aware Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; - }; - }; + CatalystPluginUnicodeEncoding = CatalystRuntime; CatalystPluginHTMLWidget = buildPerlPackage rec { name = "Catalyst-Plugin-HTML-Widget-1.1"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a1015c780241..7861b2a231d0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -12,14 +12,14 @@ let apcu = if isPhp7 then apcu51 else apcu40; apcu40 = assert !isPhp7; buildPecl { - name = "apcu-4.0.7"; - sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp"; + name = "apcu-4.0.11"; + sha256 = "002d1gklkf0z170wkbhmm2z1p9p5ghhq3q1r9k54fq1sq4p30ks5"; buildInputs = [ pkgs.pcre ]; }; apcu51 = assert isPhp7; buildPecl { - name = "apcu-5.1.8"; - sha256 = "01dfbf0245d8cc0f51ba16467a60b5fad08e30b28df7846e0dd213da1143ecce"; + name = "apcu-5.1.11"; + sha256 = "0nz9m3fbxgyc2ij63yqmxm06a1f51g8rkxk85f85ziqdin66q2f1"; buildInputs = [ pkgs.pcre ]; doCheck = true; checkTarget = "test"; @@ -107,8 +107,8 @@ let }; imagick = buildPecl { - name = "imagick-3.4.3RC1"; - sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh"; + name = "imagick-3.4.3"; + sha256 = "0z2nc92xfc5axa9f2dy95rmsd2c81q8cs1pm4anh0a50x9g5ng0z"; configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.pcre ]; @@ -328,11 +328,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.6.3"; + version = "1.6.5"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1dna9ng77nw002l7hq60b6vz0f1snmnsxj1l7cg4f877msxppjsj"; + sha256 = "0d1lpvq8wylh5qgxhbqb5r7j3c6qk0bz4b5vg187jsl6z6fvxgk7"; }; unpackPhase = ":"; @@ -494,4 +494,30 @@ let maintainers = with maintainers; [ cmcdragonkai etu ]; }; }; + + psysh = pkgs.stdenv.mkDerivation rec { + name = "psysh-${version}"; + version = "0.9.6"; + + src = pkgs.fetchurl { + url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; + sha256 = "06icmyn7v229mpfplqj76kjnp1gh4ns0nrxa7bsckyqhzi425kc6"; + }; + + phases = [ "installPhase" ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + tar -xzf $src -C $out/bin + wrapProgram $out/bin/psysh + ''; + + meta = with pkgs.lib; { + description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; + license = licenses.mit; + homepage = https://psysh.org/; + maintainers = with maintainers; [ caugner ]; + }; + }; }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d057cebf9f57..5b8eb59422f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26,6 +26,7 @@ let isPy34 = python.pythonVersion == "3.4"; isPy35 = python.pythonVersion == "3.5"; isPy36 = python.pythonVersion == "3.6"; + isPy37 = python.pythonVersion == "3.7"; isPyPy = python.executable == "pypy"; isPy3k = strings.substring 0 1 python.pythonVersion == "3"; @@ -132,7 +133,7 @@ let in { - inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPyPy isPy3k buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication; @@ -233,6 +234,8 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; + clustershell = callPackage ../development/python-modules/clustershell { }; + dendropy = callPackage ../development/python-modules/dendropy { }; dbf = callPackage ../development/python-modules/dbf { }; @@ -291,7 +294,9 @@ in { logster = callPackage ../development/python-modules/logster { }; - mail-parser = callPackage ../development/python-modules/mail-parser { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; + + monty = callPackage ../development/python-modules/monty { }; mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; @@ -434,6 +439,8 @@ in { then ../development/python-modules/python3-openid else ../development/python-modules/python-openid) { }; + python-periphery = callPackage ../development/python-modules/python-periphery { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -458,6 +465,8 @@ in { salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + seekpath = callPackage ../development/python-modules/seekpath { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; simpleeval = callPackage ../development/python-modules/simpleeval { }; @@ -1566,6 +1575,8 @@ in { cherrypy = callPackage ../development/python-modules/cherrypy {}; + cftime = callPackage ../development/python-modules/cftime {}; + cjson = callPackage ../development/python-modules/cjson { }; cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; @@ -1925,9 +1936,9 @@ in { }; }; - pytest = self.pytest_35; + pytest = self.pytest_36; - pytest_35 = callPackage ../development/python-modules/pytest { + pytest_36 = callPackage ../development/python-modules/pytest { hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; @@ -1936,7 +1947,7 @@ in { }; # Needed for celery - pytest_32 = self.pytest_35.overrideAttrs( oldAttrs: rec { + pytest_32 = self.pytest_36.overrideAttrs( oldAttrs: rec { version = "3.2.5"; src = oldAttrs.src.override { inherit version; @@ -2118,9 +2129,6 @@ in { # Alias that we should deprecate dateutil = self.python-dateutil; - # Buildbot 0.8.7p1 needs dateutil==1.5 - dateutil_1_5 = callPackage ../development/python-modules/dateutil/1_5.nix { }; - decorator = callPackage ../development/python-modules/decorator { }; deform = callPackage ../development/python-modules/deform { }; @@ -2286,7 +2294,7 @@ in { ''; meta = { - homepage = "http://editorconfig.org"; + homepage = https://editorconfig.org; description = "EditorConfig File Locator and Interpreter for Python"; license = stdenv.lib.licenses.psfl; }; @@ -6194,6 +6202,8 @@ in { googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; + google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; + google_api_core = callPackage ../development/python-modules/google_api_core { }; google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; @@ -6236,30 +6246,7 @@ in { grammalecte = callPackage ../development/python-modules/grammalecte { }; - greenlet = buildPythonPackage rec { - name = "greenlet-${version}"; - version = "0.4.10"; - disabled = isPyPy; # builtin for pypy - - src = pkgs.fetchurl { - url = "mirror://pypi/g/greenlet/${name}.tar.gz"; - sha256 = "c4417624aa88380cdf0fe110a8a6e0dbcc26f80887197fe5df0427dfa348ae62"; - }; - - propagatedBuildInputs = with self; [ six ]; - - # see https://github.com/python-greenlet/greenlet/issues/85 - preCheck = '' - rm tests/test_leaks.py - ''; - - meta = { - homepage = https://pypi.python.org/pypi/greenlet; - description = "Module for lightweight in-process concurrent programming"; - license = licenses.lgpl2; - platforms = platforms.all; - }; - }; + greenlet = callPackage ../development/python-modules/greenlet { }; grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { @@ -7794,7 +7781,7 @@ in { meta = { description = "EditorConfig File Locator and Interpreter for Python"; - homepage = "http://editorconfig.org/"; + homepage = https://editorconfig.org/; license = licenses.psfl; }; }; @@ -9169,7 +9156,7 @@ in { ]; meta = with stdenv.lib; { - homepage = "http://github.com/bcwaldon/warlock"; + homepage = https://github.com/bcwaldon/warlock; }; }; @@ -9992,35 +9979,8 @@ in { inherit (pkgs.xorg) libX11; }; - pkgconfig = buildPythonPackage rec { - name = "pkgconfig-${version}"; - version = "1.1.0"; - - # pypy: SyntaxError: __future__ statements must appear at beginning of file - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pkgconfig/${name}.tar.gz"; - sha256 = "709daaf077aa2b33bedac12706373412c3683576a43013bbaa529fc2769d80df"; - }; - - buildInputs = with self; [ nose ]; - - propagatedBuildInputs = with self; [pkgs.pkgconfig]; - - meta = { - description = "Interface Python with pkg-config"; - homepage = https://github.com/matze/pkgconfig; - license = licenses.mit; - }; - - # nosetests needs to be run explicitly. - # Note that the distributed archive does not actually contain any tests. - # https://github.com/matze/pkgconfig/issues/9 - checkPhase = '' - nosetests - ''; - + pkgconfig = callPackage ../development/python-modules/pkgconfig { + inherit (pkgs) pkgconfig; }; plumbum = callPackage ../development/python-modules/plumbum { }; @@ -10142,15 +10102,6 @@ in { psutil = callPackage ../development/python-modules/psutil { }; - psutil_1 = self.psutil.overrideAttrs (oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "1.2.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0ibclqy6a4qmkjhlk3g8jhpvnk0v9aywknc61xm3hfi5r124m3jh"; - }; - }); - psycopg2 = buildPythonPackage rec { name = "psycopg2-2.7.1"; disabled = isPyPy; @@ -11640,7 +11591,7 @@ in { doCheck = false; meta = { - homepage = "http://github.com/mongodb/mongo-python-driver"; + homepage = https://github.com/mongodb/mongo-python-driver; license = licenses.asl20; description = "Python driver for MongoDB "; }; @@ -12142,53 +12093,9 @@ in { rjsmin = callPackage ../development/python-modules/rjsmin { }; - pysolr = buildPythonPackage rec { - name = "pysolr-${version}"; - version = "3.3.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pysolr/pysolr-${version}.tar.gz"; - sha256 = "1wapg9n7myn7c82r3nzs2gisfzx52nip8w2mrfy0yih1zn02mnd6"; - }; - - propagatedBuildInputs = with self; [ - requests - ]; - buildInputs = with self; [ - - ]; - - meta = with stdenv.lib; { - homepage = "http://github.com/toastdriven/pysolr/"; - }; - }; - - - django-haystack = buildPythonPackage rec { - name = "django-haystack-${version}"; - version = "2.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-haystack/django-haystack-${version}.tar.gz"; - sha256 = "04cva8qg79xig4zqhb4dwkpm7734dvhzqclzvrdz70fh59ki5b4f"; - }; - - doCheck = false; # no tests in source + pysolr = callPackage ../development/python-modules/pysolr { }; - buildInputs = with self; [ coverage mock nose geopy ]; - propagatedBuildInputs = with self; [ - django dateutil_1_5 whoosh pysolr elasticsearch - ]; - - patchPhase = '' - sed -i 's/geopy==/geopy>=/' setup.py - sed -i 's/whoosh==/Whoosh>=/' setup.py - ''; - - meta = with stdenv.lib; { - homepage = "http://haystacksearch.org/"; - }; - }; + django-haystack = callPackage ../development/python-modules/django-haystack { }; geoalchemy2 = buildPythonPackage rec { name = "GeoAlchemy2-${version}"; @@ -12890,7 +12797,7 @@ in { meta = { description = "sqlite-backed dictionary"; - homepage = "http://github.com/Yelp/sqlite3dbm"; + homepage = https://github.com/Yelp/sqlite3dbm; license = licenses.asl20; }; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index e38f5442d3aa..f9941a1c500d 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -98,7 +98,7 @@ let in res; aliases = self: super: if config.skipAliases or false then {} - else import ./aliases.nix super; + else import ./aliases.nix lib self super; # stdenvOverrides is used to avoid having multiple of versions # of certain dependencies that were used in bootstrapping the diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 362715e82623..c1bd46ad68dc 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -19,14 +19,12 @@ let in runCommand "${cmd}-${version}" { meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); } '' - mkdir -p $out/bin - if ! [ -x "${provider}" ]; then echo "Cannot find command ${cmd}" exit 1 fi - ln -s "${provider}" "$out/bin/${cmd}" + install -D "${provider}" "$out/bin/${cmd}" ''; # more is unavailable in darwin |