diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 67 | ||||
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/lua-packages.nix | 56 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 39 |
4 files changed, 133 insertions, 30 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce2e8b9e3bce..1769d5a133cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1350,6 +1350,8 @@ in fd = callPackage ../tools/misc/fd { }; + fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; + filebench = callPackage ../tools/misc/filebench { }; fileshelter = callPackage ../servers/web-apps/fileshelter { }; @@ -1761,7 +1763,9 @@ in burp = callPackage ../tools/backup/burp { }; - buku = callPackage ../applications/misc/buku { }; + buku = callPackage ../applications/misc/buku { + python3 = python36; # due to #52766 + }; byzanz = callPackage ../applications/video/byzanz {}; @@ -1817,7 +1821,8 @@ in }; ceph-dev = ceph; - certmgr = callPackage ../tools/security/certmgr { }; + inherit (callPackages ../tools/security/certmgr { }) + certmgr certmgr-selfsigned; cfdg = callPackage ../tools/graphics/cfdg { }; @@ -3714,6 +3719,8 @@ in matrix-synapse = callPackage ../servers/matrix-synapse { }; + mautrix-telegram = callPackage ../servers/mautrix-telegram { }; + mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -7748,28 +7755,43 @@ in wabt = callPackage ../development/tools/wabt { }; ### LUA MODULES - - lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { }; - lua5_2 = callPackage ../development/interpreters/lua-5/5.2.nix { }; + lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { + self = lua5_1; + }; + lua5_2 = callPackage ../development/interpreters/lua-5/5.2.nix { + self = lua5_2; + }; lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix { compat = true; + self = lua5_2_compat; + }; + lua5_3 = callPackage ../development/interpreters/lua-5/5.3.nix { + self = lua5_3; }; - lua5_3 = callPackage ../development/interpreters/lua-5/5.3.nix { }; lua5_3_compat = callPackage ../development/interpreters/lua-5/5.3.nix { compat = true; + self = lua5_3_compat; }; lua5 = lua5_2_compat; lua = lua5; - lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); - lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); - lua53Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_3; }); - luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; }); + lua51Packages = recurseIntoAttrs lua5_1.pkgs; + lua52Packages = recurseIntoAttrs lua5_2.pkgs; + lua53Packages = recurseIntoAttrs lua5_3.pkgs; + luajitPackages = recurseIntoAttrs luajit.pkgs; luaPackages = lua52Packages; - inherit (callPackages ../development/interpreters/luajit {}) - luajit luajit_2_0 luajit_2_1; + # override instead ? + luajit_2_0 = callPackage ../development/interpreters/luajit/2.0.nix { + self = luajit_2_0; + }; + + luajit_2_1 = callPackage ../development/interpreters/luajit/2.1.nix { + self = luajit_2_1; + }; + + luajit = luajit_2_1; luarocks = luaPackages.luarocks; luarocks-nix = luaPackages.luarocks-nix; @@ -8284,6 +8306,8 @@ in bazel = callPackage ../development/tools/build-managers/bazel { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk8; + buildJdkName = "jdk8"; runJdk = jdk11; }; @@ -13570,9 +13594,7 @@ in meteor = callPackage ../servers/meteor { }; - minio = callPackage ../servers/minio { - buildGoPackage = buildGo110Package; - }; + minio = callPackage ../servers/minio { }; # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; @@ -13742,6 +13764,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + nginx-sso = callPackage ../servers/nginx-sso { }; + percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { }; percona-server = percona-server56; @@ -14030,6 +14054,8 @@ in systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; + syncserver = callPackage ../servers/syncserver { }; + inherit (callPackages ../servers/http/tomcat { }) tomcat7 tomcat8 @@ -14531,7 +14557,6 @@ in [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long kernelPatches.revert-vfs-dont-open-real - kernelPatches.raspberry_pi_wifi_fix ]; }; @@ -16013,6 +16038,8 @@ in inherit (python3Packages) arelle; + argo = callPackage ../applications/networking/cluster/argo { }; + ario = callPackage ../applications/audio/ario { }; arora = callPackage ../applications/networking/browsers/arora { }; @@ -17128,7 +17155,7 @@ in libpng = libpng_apng; python = python2; gnused = gnused_422; - icu = icu59; + icu = icu63; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation AddressBook; @@ -21530,6 +21557,8 @@ in flintqs = callPackage ../development/libraries/science/math/flintqs { }; + getdp = callPackage ../applications/science/math/getdp { }; + gurobi = callPackage ../applications/science/math/gurobi { }; jags = callPackage ../applications/science/math/jags { }; @@ -22306,9 +22335,9 @@ in foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - gajim = python3.pkgs.callPackage ../applications/networking/instant-messengers/gajim { + gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly; - inherit (gnome3) gspell; + inherit (gnome3) gspell defaultIconTheme; }; gammu = callPackage ../applications/misc/gammu { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 591c9db9d122..a624211f79f8 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -17,6 +17,7 @@ let Cheerios = callPackage ../development/coq-modules/Cheerios {}; CoLoR = callPackage ../development/coq-modules/CoLoR {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + coq-extensible-records = callPackage ../development/coq-modules/coq-extensible-records {}; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; coqprime = callPackage ../development/coq-modules/coqprime {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 628a3f6aa45c..50dd4d1fcd9a 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -10,13 +10,45 @@ , glib, gobject-introspection, libevent, zlib, autoreconfHook, gnum4 , mysql, postgresql, cyrus_sasl , fetchFromGitHub, libmpack, which, fetchpatch, writeText +, pkgs +, fetchgit +, overrides ? (self: super: {}) +, lib }: let - isLua52 = lua.luaversion == "5.2"; + packages = ( self: + +let + luaAtLeast = lib.versionAtLeast lua.luaversion; + luaOlder = lib.versionOlder lua.luaversion; + isLua51 = (lib.versions.majorMinor lua.version) == "5.1"; + isLua52 = (lib.versions.majorMinor lua.version) == "5.2"; isLua53 = lua.luaversion == "5.3"; isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit"; + lua-setup-hook = callPackage ../development/interpreters/lua-5/setup-hook.nix { }; + + # Check whether a derivation provides a lua module. + hasLuaModule = drv: drv ? luaModule ; + + callPackage = pkgs.newScope self; + + requiredLuaModules = drvs: with stdenv.lib; let + modules = filter hasLuaModule drvs; + in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); + + # Convert derivation to a lua module. + toLuaModule = drv: + drv.overrideAttrs( oldAttrs: { + # Use passthru in order to prevent rebuilds when possible. + passthru = (oldAttrs.passthru or {})// { + luaModule = lua; + requiredLuaModules = requiredLuaModules drv.propagatedBuildInputs; + }; + }); + + platformString = if stdenv.isDarwin then "macosx" else if stdenv.isFreeBSD then "freebsd" @@ -24,10 +56,16 @@ let else if stdenv.isSunOS then "solaris" else throw "unsupported platform"; - self = _self; - _self = with self; { - inherit lua; - inherit (stdenv.lib) maintainers; +in +with self; { + + getLuaPathList = majorVersion: [ + "lib/lua/${majorVersion}/?.lua" "share/lua/${majorVersion}/?.lua" + "share/lua/${majorVersion}/?/init.lua" "lib/lua/${majorVersion}/?/init.lua" + ]; + getLuaCPathList = majorVersion: [ + "lib/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?/init.so" + ]; # helper functions for dealing with LUA_PATH and LUA_CPATH getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}"; @@ -39,6 +77,11 @@ let inherit lua writeText; }; + + inherit toLuaModule lua-setup-hook; + inherit requiredLuaModules luaOlder luaAtLeast + isLua51 isLua52 isLuaJIT lua callPackage; + luarocks = callPackage ../development/tools/misc/luarocks { inherit lua; }; @@ -1078,4 +1121,5 @@ let }; }; -}; in self +}); +in (lib.extends overrides packages) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e5a3c65a284..94253962ba15 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -158,6 +158,8 @@ in { alerta-server = callPackage ../development/python-modules/alerta-server { }; + androguard = callPackage ../development/python-modules/androguard { }; + phonenumbers = callPackage ../development/python-modules/phonenumbers { }; agate-excel = callPackage ../development/python-modules/agate-excel { }; @@ -274,6 +276,8 @@ in { braintree = callPackage ../development/python-modules/braintree { }; + django-sesame = callPackage ../development/python-modules/django-sesame { }; + breathe = callPackage ../development/python-modules/breathe { }; brotli = callPackage ../development/python-modules/brotli { }; @@ -366,6 +370,8 @@ in { fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + favicon = callPackage ../development/python-modules/favicon { }; + fido2 = callPackage ../development/python-modules/fido2 { }; filterpy = callPackage ../development/python-modules/filterpy { }; @@ -778,12 +784,12 @@ in { supervise_api = callPackage ../development/python-modules/supervise_api { }; - syncserver = callPackage ../development/python-modules/syncserver {}; - tables = callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; + trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme {}; @@ -1642,6 +1648,8 @@ in { docker = callPackage ../development/python-modules/docker {}; + docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py {}); + dockerpty = callPackage ../development/python-modules/dockerpty {}; docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; @@ -1765,6 +1773,8 @@ in { functools32 = callPackage ../development/python-modules/functools32 { }; + future-fstrings = callPackage ../development/python-modules/future-fstrings { }; + gateone = callPackage ../development/python-modules/gateone { }; # TODO: Remove after 19.03 is branched off: @@ -2385,8 +2395,6 @@ in { pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; - fdroidserver = callPackage ../development/python-modules/fdroidserver { }; - filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; pycodestyle = callPackage ../development/python-modules/pycodestyle { }; @@ -3008,6 +3016,8 @@ in { matrix-client = callPackage ../development/python-modules/matrix-client { }; + mautrix-appservice = callPackage ../development/python-modules/mautrix-appservice { }; + maya = callPackage ../development/python-modules/maya { }; mccabe = callPackage ../development/python-modules/mccabe { }; @@ -3459,6 +3469,8 @@ in { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; }); + precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + pvlib = callPackage ../development/python-modules/pvlib { }; pybase64 = callPackage ../development/python-modules/pybase64 { }; @@ -3725,6 +3737,8 @@ in { pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; + pyu2f = callPackage ../development/python-modules/pyu2f { }; + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; }; @@ -3857,7 +3871,14 @@ in { # alias for an older package which did not support Python 3 Quandl = callPackage ../development/python-modules/quandl { }; - qscintilla = callPackage ../development/python-modules/qscintilla { }; + qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; + + qscintilla-qt5 = callPackage ../development/python-modules/qscintilla-qt5 { + qscintillaCpp = pkgs.libsForQt5.qscintilla; + lndir = pkgs.xorg.lndir; + }; + + qscintilla = self.qscintilla-qt4; qserve = callPackage ../development/python-modules/qserve { }; @@ -4033,6 +4054,8 @@ in { sphinx = callPackage ../development/python-modules/sphinx { }; + sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; + sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; hieroglyph = callPackage ../development/python-modules/hieroglyph { }; @@ -4326,6 +4349,8 @@ in { python-daemon = callPackage ../development/python-modules/python-daemon { }; + python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + sympy = callPackage ../development/python-modules/sympy { }; pilkit = callPackage ../development/python-modules/pilkit { }; @@ -4408,6 +4433,10 @@ in { taskw = callPackage ../development/python-modules/taskw { }; + telethon = callPackage ../development/python-modules/telethon { }; + + telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; + terminaltables = callPackage ../development/python-modules/terminaltables { }; testpath = callPackage ../development/python-modules/testpath { }; |