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 | 377 | ||||
| -rw-r--r-- | pkgs/top-level/beam-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/darwin-packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 22 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 38 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 174 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 47 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 5 |
10 files changed, 275 insertions, 399 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b56640049d87..90136f86acaf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -171,6 +171,7 @@ mapAliases ({ libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = liblapack; # added 2018-11-05 libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient + libqrencode = qrencode; # added 2019-01-01 librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 @@ -234,7 +235,6 @@ mapAliases ({ pltScheme = racket; # just to be sure pmtools = acpica-tools; # added 2018-11-01 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postgresql93 = postgresql_9_3; postgresql94 = postgresql_9_4; postgresql95 = postgresql_9_5; postgresql96 = postgresql_9_6; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cefe5f0ef22c..7961a049a9a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -398,8 +398,6 @@ in releaseTools = callPackage ../build-support/release { }; - composableDerivation = callPackage ../../lib/composable-derivation.nix { }; - inherit (lib.systems) platforms; setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; @@ -528,6 +526,8 @@ in inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL; }; + amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; + amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { }; ammonite = callPackage ../development/tools/ammonite {}; @@ -667,7 +667,6 @@ in apg = callPackage ../tools/security/apg { }; apt = callPackage ../tools/package-management/apt { - inherit (perlPackages) Po4a; # include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory stdenv = overrideCC stdenv gcc5; }; @@ -1006,9 +1005,7 @@ in blockdiag = with python3Packages; toPythonApplication blockdiag; - blsd = callPackage ../tools/misc/blsd { - libgit2 = libgit2_0_27; - }; + blsd = callPackage ../tools/misc/blsd { }; bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; @@ -1449,6 +1446,8 @@ in gh-ost = callPackage ../tools/misc/gh-ost { }; + gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; + gist = callPackage ../tools/text/gist { }; gixy = callPackage ../tools/admin/gixy { }; @@ -1984,7 +1983,7 @@ in libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - inherit (gnome3) gnome-common libgee; + inherit (gnome3) gnome-common; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -2002,9 +2001,7 @@ in inherit (pythonPackages) marisa; }; - libkkc = callPackage ../tools/inputmethods/libkkc { - inherit (gnome3) libgee; - }; + libkkc = callPackage ../tools/inputmethods/libkkc { }; ibus = callPackage ../tools/inputmethods/ibus { gconf = gnome2.GConf; @@ -2081,9 +2078,7 @@ in client-ip-echo = callPackage ../servers/misc/client-ip-echo { }; - cloc = callPackage ../tools/misc/cloc { - inherit (perlPackages) perl AlgorithmDiff ParallelForkManager RegexpCommon; - }; + cloc = callPackage ../tools/misc/cloc { }; cloog = callPackage ../development/libraries/cloog { isl = isl_0_14; @@ -2212,9 +2207,7 @@ in debianutils = callPackage ../tools/misc/debianutils { }; - debian-devscripts = callPackage ../tools/misc/debian-devscripts { - inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry; - }; + debian-devscripts = callPackage ../tools/misc/debian-devscripts { }; debootstrap = callPackage ../tools/misc/debootstrap { }; @@ -2316,15 +2309,11 @@ in dmg2img = callPackage ../tools/misc/dmg2img { }; - docbook2odf = callPackage ../tools/typesetting/docbook2odf { - inherit (perlPackages) PerlMagick; - }; + docbook2odf = callPackage ../tools/typesetting/docbook2odf { }; doas = callPackage ../tools/security/doas { }; - docbook2x = callPackage ../tools/typesetting/docbook2x { - inherit (perlPackages) XMLSAX XMLSAXBase XMLParser XMLNamespaceSupport; - }; + docbook2x = callPackage ../tools/typesetting/docbook2x { }; docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; @@ -2560,9 +2549,7 @@ in ext4magic = callPackage ../tools/filesystems/ext4magic { }; - extract_url = callPackage ../applications/misc/extract_url { - inherit (perlPackages) MIMEtools HTMLParser CursesUI URIFind; - }; + extract_url = callPackage ../applications/misc/extract_url { }; extundelete = callPackage ../tools/filesystems/extundelete { }; @@ -2644,9 +2631,7 @@ in ferm = callPackage ../tools/networking/ferm { }; - fgallery = callPackage ../tools/graphics/fgallery { - inherit (perlPackages) ImageExifTool CpanelJSONXS; - }; + fgallery = callPackage ../tools/graphics/fgallery { }; flannel = callPackage ../tools/networking/flannel { }; @@ -2892,8 +2877,12 @@ in getopt = callPackage ../tools/misc/getopt { }; + gexiv2 = callPackage ../development/libraries/gexiv2 { }; + gftp = callPackage ../tools/networking/gftp { }; + gfbgraph = callPackage ../development/libraries/gfbgraph { }; + ggobi = callPackage ../tools/graphics/ggobi { }; gibo = callPackage ../tools/misc/gibo { }; @@ -3165,7 +3154,6 @@ in gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest { }; - gtest_static = callPackage ../development/libraries/gtest { static = true; }; gmock = gtest; # TODO: move to aliases.nix gbenchmark = callPackage ../development/libraries/gbenchmark {}; @@ -3728,6 +3716,8 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; + libcroco = callPackage ../development/libraries/libcroco { }; + libsmi = callPackage ../development/libraries/libsmi { }; lesspipe = callPackage ../tools/misc/lesspipe { }; @@ -3995,8 +3985,6 @@ in libqmi = callPackage ../development/libraries/libqmi { }; - libqrencode = callPackage ../development/libraries/libqrencode { }; - libmbim = callPackage ../development/libraries/libmbim { }; libmongo-client = callPackage ../development/libraries/libmongo-client { }; @@ -4029,6 +4017,8 @@ in libreswan = callPackage ../tools/networking/libreswan { }; + librest = callPackage ../development/libraries/librest { }; + libwebsockets = callPackage ../development/libraries/libwebsockets { }; lidarr = callPackage ../servers/lidarr { }; @@ -4041,9 +4031,7 @@ in localtime = callPackage ../tools/system/localtime { }; - logcheck = callPackage ../tools/system/logcheck { - inherit (perlPackages) mimeConstruct; - }; + logcheck = callPackage ../tools/system/logcheck { }; logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { }; @@ -4280,13 +4268,10 @@ in monit = callPackage ../tools/system/monit { }; moreutils = callPackage ../tools/misc/moreutils { - inherit (perlPackages) IPCRun TimeDate TimeDuration; docbook-xsl = docbook_xsl; }; - mosh = callPackage ../tools/networking/mosh { - inherit (perlPackages) IOTty; - }; + mosh = callPackage ../tools/networking/mosh { }; motuclient = callPackage ../applications/science/misc/motu-client { }; @@ -4436,7 +4421,9 @@ in networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { }; - newsboat = callPackage ../applications/networking/feedreaders/newsboat { }; + newsboat = callPackage ../applications/networking/feedreaders/newsboat { + inherit (darwin.apple_sdk.frameworks) Security; + }; nextcloud = callPackage ../servers/nextcloud { }; @@ -4787,9 +4774,7 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - pcsctools = callPackage ../tools/security/pcsctools { - inherit (perlPackages) pcscperl Glib Gtk2 Pango Cairo; - }; + pcsctools = callPackage ../tools/security/pcsctools { }; pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; @@ -4868,7 +4853,7 @@ in }; pinentry_gnome = res.pinentry.override { - gcr = gnome3.gcr; + inherit gcr; }; pinentry_qt4 = res.pinentry.override { @@ -5361,6 +5346,8 @@ in scrypt = callPackage ../tools/security/scrypt { }; + sdate = callPackage ../tools/misc/sdate { }; + sdcv = callPackage ../applications/misc/sdcv { }; sdl-jstest = callPackage ../tools/misc/sdl-jstest { }; @@ -5468,9 +5455,7 @@ in sleepyhead = callPackage ../applications/misc/sleepyhead {}; - slimrat = callPackage ../tools/networking/slimrat { - inherit (perlPackages) WWWMechanize LWP; - }; + slimrat = callPackage ../tools/networking/slimrat { }; slsnif = callPackage ../tools/misc/slsnif { }; @@ -5649,9 +5634,7 @@ in swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; - swec = callPackage ../tools/networking/swec { - inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent; - }; + swec = callPackage ../tools/networking/swec { }; swfdec = callPackage ../tools/graphics/swfdec {}; @@ -5876,8 +5859,12 @@ in triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; + trilium = callPackage ../applications/office/trilium { }; + trousers = callPackage ../tools/security/trousers { }; + trx = callPackage ../tools/audio/trx { }; + tryton = callPackage ../applications/office/tryton { }; trytond = callPackage ../applications/office/trytond { }; @@ -5992,10 +5979,7 @@ in vcftools = callPackage ../applications/science/biology/vcftools { }; - vcsh = callPackage ../applications/version-management/vcsh { - inherit (perlPackages) ShellCommand TestMost TestDifferences TestDeep - TestException TestWarn; - }; + vcsh = callPackage ../applications/version-management/vcsh { }; vcstool = callPackage ../development/tools/vcstool { }; @@ -6009,7 +5993,6 @@ in viking = callPackage ../applications/misc/viking { inherit (gnome2) scrollkeeper; - inherit (gnome3) gexiv2; }; vim-vint = callPackage ../development/tools/vim-vint { }; @@ -6250,9 +6233,7 @@ in urlwatch = callPackage ../tools/networking/urlwatch { }; - valum = callPackage ../development/web/valum { - inherit (gnome3) libgee; - }; + valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) varnish4 varnish5 varnish6; @@ -6301,7 +6282,6 @@ in weighttp = callPackage ../tools/networking/weighttp { }; wget = callPackage ../tools/networking/wget { - inherit (perlPackages) IOSocketSSL LWP; libpsl = null; }; @@ -6543,7 +6523,9 @@ in fish-foreign-env = callPackage ../shells/fish/fish-foreign-env { }; ion = callPackage ../shells/ion { }; - + + ksh = callPackage ../shells/ksh { }; + mksh = callPackage ../shells/mksh { }; oh = callPackage ../shells/oh { }; @@ -6624,17 +6606,15 @@ in colm = callPackage ../development/compilers/colm { }; - fetchegg = callPackage ../build-support/fetchegg { }; + chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; + chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; + chickenPackages = chickenPackages_5; - eggDerivation = callPackage ../development/compilers/chicken/eggDerivation.nix { }; - - chicken = callPackage ../development/compilers/chicken { - bootstrap-chicken = chicken.override { bootstrap-chicken = null; }; - }; - - egg2nix = callPackage ../development/tools/egg2nix { - chickenEggs = callPackage ../development/tools/egg2nix/chicken-eggs.nix { }; - }; + inherit (chickenPackages) + fetchegg + eggDerivation + chicken + egg2nix; ccl = callPackage ../development/compilers/ccl { inherit (buildPackages.darwin) bootstrap_cmds; @@ -6665,7 +6645,9 @@ in clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; - clang-tools = callPackage ../development/tools/clang-tools { }; + clang-tools = callPackage ../development/tools/clang-tools { + llvmPackages = llvmPackages_latest; + }; clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { }; @@ -7348,6 +7330,8 @@ in stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); + llvmPackages_latest = llvmPackages_7; + manticore = callPackage ../development/compilers/manticore { }; mercury = callPackage ../development/compilers/mercury { }; @@ -7696,7 +7680,7 @@ in inherit (beam.interpreters) erlang erlangR18 erlangR19 erlangR20 erlangR21 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3 + elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 lfe lfe_1_2; inherit (beam.packages.erlang) @@ -7861,7 +7845,7 @@ in ocropus = callPackage ../applications/misc/ocropus { }; - inherit (callPackages ../development/interpreters/perl {}) perl526 perl528 perldevel; + inherit (callPackages ../development/interpreters/perl {}) perl528 perldevel; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; @@ -8512,16 +8496,12 @@ in credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { - inherit (perlPackages) perl - ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey; inherit (llvmPackages_6) llvm clang-unwrapped; }; cscope = callPackage ../development/tools/misc/cscope { }; - csmith = callPackage ../development/tools/misc/csmith { - inherit (perlPackages) perl SysCPU; - }; + csmith = callPackage ../development/tools/misc/csmith { }; csslint = callPackage ../development/web/csslint { }; @@ -8737,9 +8717,7 @@ in hcloud = callPackage ../development/tools/hcloud { }; - help2man = callPackage ../development/tools/misc/help2man { - inherit (perlPackages) LocaleGettext; - }; + help2man = callPackage ../development/tools/misc/help2man { }; heroku = callPackage ../development/tools/heroku { nodejs = nodejs-10_x; @@ -8757,9 +8735,7 @@ in icmake = callPackage ../development/tools/build-managers/icmake { }; - iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { - inherit (perlPackages) XMLSimple; - }; + iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { }; ikos = callPackage ../development/tools/analysis/ikos { inherit (llvmPackages_7) stdenv clang llvm; @@ -8865,6 +8841,7 @@ in minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; + minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; mk = callPackage ../development/tools/build-managers/mk { }; @@ -9055,7 +9032,7 @@ in selendroid = callPackage ../development/tools/selenium/selendroid { }; sconsPackages = callPackage ../development/tools/build-managers/scons { }; - scons = sconsPackages.scons_3_0_1; + scons = sconsPackages.scons_3_0_2; scons_2_5_1 = sconsPackages.scons_2_5_1; mill = callPackage ../development/tools/build-managers/mill { }; @@ -9312,7 +9289,9 @@ in armadillo = callPackage ../development/libraries/armadillo {}; - arrow-cpp = callPackage ../development/libraries/arrow-cpp {}; + arrow-cpp = callPackage ../development/libraries/arrow-cpp { + gtest = gtest.override { static = true; }; + }; assimp = callPackage ../development/libraries/assimp { }; @@ -9658,8 +9637,6 @@ in epoxy = callPackage ../development/libraries/epoxy {}; - esdl = callPackage ../development/libraries/esdl { }; - libesmtp = callPackage ../development/libraries/libesmtp { }; exiv2 = callPackage ../development/libraries/exiv2 { }; @@ -9810,6 +9787,8 @@ in folly = callPackage ../development/libraries/folly { }; + folks = callPackage ../development/libraries/folks { }; + makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { inherit fontconfig fontDirectories; @@ -9843,6 +9822,8 @@ in gcab = callPackage ../development/libraries/gcab { }; + gcr = callPackage ../development/libraries/gcr { }; + gdome2 = callPackage ../development/libraries/gdome2 { inherit (gnome2) gtkdoc; }; @@ -9869,6 +9850,8 @@ in geoclue2 = callPackage ../development/libraries/geoclue {}; + geocode-glib = callPackage ../development/libraries/geocode-glib {}; + geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; @@ -9917,9 +9900,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_27 = callPackage ../development/libraries/git2/0.27.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; glbinding = callPackage ../development/libraries/glbinding { }; @@ -10143,6 +10124,8 @@ in gsoap = callPackage ../development/libraries/gsoap { }; + gsound = callPackage ../development/libraries/gsound { }; + gss = callPackage ../development/libraries/gss { }; gtkimageview = callPackage ../development/libraries/gtkimageview { }; @@ -10197,6 +10180,8 @@ in gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; + gnome-menus = callPackage ../development/libraries/gnome-menus { }; + granite = callPackage ../development/libraries/granite { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; @@ -10304,9 +10289,7 @@ in hiredis = callPackage ../development/libraries/hiredis { }; - hivex = callPackage ../development/libraries/hivex { - inherit (perlPackages) IOStringy; - }; + hivex = callPackage ../development/libraries/hivex { }; hound = callPackage ../development/tools/misc/hound { }; @@ -10676,8 +10659,6 @@ in libconfuse = callPackage ../development/libraries/libconfuse { }; - inherit (gnome3) libcroco; - libcangjie = callPackage ../development/libraries/libcangjie { }; libcollectdclient = callPackage ../development/libraries/libcollectdclient { }; @@ -10837,13 +10818,19 @@ in libgdamm = callPackage ../development/libraries/libgdamm { }; - libgdata = gnome3.libgdata; + libgdata = callPackage ../development/libraries/libgdata { }; + + libgee = callPackage ../development/libraries/libgee { }; + + libgepub = callPackage ../development/libraries/libgepub { }; libgig = callPackage ../development/libraries/libgig { }; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome-keyring3 = gnome3.libgnome-keyring; + libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; + libglvnd = callPackage ../development/libraries/libglvnd { }; libgnurl = callPackage ../development/libraries/libgnurl { }; @@ -10854,6 +10841,10 @@ in libgrss = callPackage ../development/libraries/libgrss { }; + libgweather = callPackage ../development/libraries/libgweather { }; + + libgxps = callPackage ../development/libraries/libgxps { }; + libiio = callPackage ../development/libraries/libiio { }; libseccomp = callPackage ../development/libraries/libseccomp { }; @@ -10952,7 +10943,6 @@ in libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; libguestfs = callPackage ../development/libraries/libguestfs { - inherit (perlPackages) libintl_perl GetoptLong SysVirt; appliance = libguestfs-appliance; }; @@ -11015,6 +11005,8 @@ in libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmediaart = callPackage ../development/libraries/libmediaart { }; + libmediainfo = callPackage ../development/libraries/libmediainfo { }; libmhash = callPackage ../development/libraries/libmhash {}; @@ -11285,6 +11277,8 @@ in libpcap = callPackage ../development/libraries/libpcap { }; + libpeas = callPackage ../development/libraries/libpeas { }; + libpipeline = callPackage ../development/libraries/libpipeline { }; libpgf = callPackage ../development/libraries/libpgf { }; @@ -11562,6 +11556,8 @@ in libyubikey = callPackage ../development/libraries/libyubikey { }; + libzapojit = callPackage ../development/libraries/libzapojit { }; + libzen = callPackage ../development/libraries/libzen { }; libzip = callPackage ../development/libraries/libzip { }; @@ -12183,8 +12179,24 @@ in libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5); - qt5 = qt511; - libsForQt5 = libsForQt511; + qt512 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.12) { + inherit newScope; + inherit stdenv fetchurl fetchFromGitHub makeSetupHook; + bison = bison2; # error: too few arguments to function 'int yylex(... + inherit cups; + harfbuzz = harfbuzzFull; + inherit libGL; + inherit perl; + inherit (darwin) cf-private; + inherit (gnome3) gtk3 dconf; + inherit (gst_all_1) gstreamer gst-plugins-base; + }); + + libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); + + qt5 = qt512; + libsForQt5 = libsForQt512; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -12495,6 +12507,7 @@ in sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; + inherit (darwin) cf-private; }; csfml = callPackage ../development/libraries/csfml { }; @@ -12743,9 +12756,7 @@ in python = python2; }; - tdb = callPackage ../development/libraries/tdb { - python = python2; - }; + tdb = callPackage ../development/libraries/tdb {}; tecla = callPackage ../development/libraries/tecla { }; @@ -12812,6 +12823,8 @@ in torch-hdf5 = callPackage ../development/libraries/torch-hdf5 {}; + totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; + tremor = callPackage ../development/libraries/tremor { }; twolame = callPackage ../development/libraries/twolame { }; @@ -12917,6 +12930,12 @@ in vsqlite = callPackage ../development/libraries/vsqlite { }; + vte = callPackage ../development/libraries/vte { }; + + vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; + + vte-ng = callPackage ../development/libraries/vte/ng.nix { }; + vtk = callPackage ../development/libraries/vtk { inherit (darwin) cf-private libobjc; inherit (darwin.apple_sdk.libs) xpc; @@ -13313,10 +13332,6 @@ in ### DEVELOPMENT / PERL MODULES - perl526Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { - perl = perl526; - overrides = (config.perlPackageOverrides or (p: {})) pkgs; - }); # the latest Maint version perl528Packages = recurseIntoAttrs (callPackage ./perl-packages.nix { perl = perl528; @@ -13465,7 +13480,7 @@ in clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - inherit (llvmPackages_6) clang-unwrapped lld llvm; + inherit (llvmPackages_latest) clang-unwrapped lld llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -13500,16 +13515,12 @@ in diod = callPackage ../servers/diod { lua = lua5_1; }; - dkimproxy = callPackage ../servers/mail/dkimproxy { - inherit (perlPackages) Error MailDKIM MIMETools NetServer; - }; + dkimproxy = callPackage ../servers/mail/dkimproxy { }; dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; - dspam = callPackage ../servers/mail/dspam { - inherit (perlPackages) libnet; - }; + dspam = callPackage ../servers/mail/dspam { }; etcd = callPackage ../servers/etcd { }; @@ -13845,7 +13856,7 @@ in monitoring-plugins = callPackage ../servers/monitoring/plugins { }; - inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) DBDsybase NetSNMP; }) + inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { }) check-mssql-health check-nwc-health check-ups-health; @@ -13892,7 +13903,6 @@ in pgbouncer = callPackage ../servers/sql/pgbouncer { }; - pgpool93 = pgpool.override { postgresql = postgresql_9_3; }; pgpool94 = pgpool.override { postgresql = postgresql_9_4; }; pgpool = callPackage ../servers/sql/pgpool { @@ -13905,7 +13915,6 @@ in postgresql = postgresql_9_6; inherit (callPackages ../servers/sql/postgresql { }) - postgresql_9_3 postgresql_9_4 postgresql_9_5 postgresql_9_6 @@ -14006,10 +14015,7 @@ in supervise = callPackage ../tools/system/supervise { }; - spamassassin = callPackage ../servers/mail/spamassassin { - inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile - HTTPDate MailDKIM LWP IOSocketSSL; - }; + spamassassin = callPackage ../servers/mail/spamassassin { }; deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; deadpixi-sam = deadpixi-sam-unstable; @@ -15468,6 +15474,8 @@ in conway_polynomials = callPackage ../data/misc/conway_polynomials { }; + cooper-hewitt = callPackage ../data/fonts/cooper-hewitt { }; + dosis = callPackage ../data/fonts/dosis { }; dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; @@ -15516,8 +15524,6 @@ in freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; - font-droid = callPackage ../data/fonts/droid { }; - freepats = callPackage ../data/misc/freepats { }; gentium = callPackage ../data/fonts/gentium {}; @@ -15654,12 +15660,14 @@ in mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; + mojave-gtk-theme = callPackage ../data/themes/mojave { }; + + moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; + monoid = callPackage ../data/fonts/monoid { }; mononoki = callPackage ../data/fonts/mononoki { }; - moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; - montserrat = callPackage ../data/fonts/montserrat { }; mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; @@ -15944,7 +15952,6 @@ in aacgain = callPackage ../applications/audio/aacgain { }; abcde = callPackage ../applications/audio/abcde { - inherit (perlPackages) MusicBrainz MusicBrainzDiscID; inherit (pythonPackages) eyeD3; }; @@ -16081,6 +16088,8 @@ in bitcoin-xt = altcoins.bitcoin-xt; cryptop = altcoins.cryptop; + jnetmap = callPackage ../applications/networking/jnetmap {}; + libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { secp256k1 = secp256k1.override { enableECDH = true; }; }; @@ -16988,6 +16997,8 @@ in fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; + fsv = callPackage ../applications/misc/fsv { }; + fvwm = callPackage ../applications/window-managers/fvwm { }; ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; @@ -17231,6 +17242,8 @@ in fomp = callPackage ../applications/audio/fomp { }; + fractal = callPackage ../applications/networking/instant-messengers/fractal { }; + freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; }; freemind = callPackage ../applications/misc/freemind { }; @@ -17278,7 +17291,6 @@ in gimp = callPackage ../applications/graphics/gimp { gegl = gegl_0_4; lcms = lcms2; - inherit (gnome3) gexiv2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; inherit (darwin) cf-private; }; @@ -17321,33 +17333,8 @@ in inherit (gnome3) dconf; }; - gnucash24 = callPackage ../applications/office/gnucash/2.4.nix { - inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl; - gconf = gnome2.GConf; - guile = guile_1_8; - slibGuile = slibGuile.override { scheme = guile_1_8; }; - goffice = goffice_0_8; - }; - - gnucash26 = lowPrio (callPackage ../applications/office/gnucash/2.6.nix { - inherit (gnome2) libgnomecanvas; - inherit (gnome3) dconf; - gconf = gnome2.GConf; - goffice = goffice_0_8; - webkit = webkitgtk24x-gtk2; - guile = guile_1_8; - slibGuile = slibGuile.override { scheme = guile_1_8; }; - glib = glib; - }); - goffice = callPackage ../development/libraries/goffice { }; - goffice_0_8 = callPackage ../development/libraries/goffice/0.8.nix { - inherit (pkgs.gnome2) libglade libgnomeui; - gconf = pkgs.gnome2.GConf; - libart = pkgs.gnome2.libart_lgpl; - }; - jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { jdk = jetbrains.jdk; }) // { @@ -17428,7 +17415,7 @@ in java = if stdenv.isLinux then jre else jdk; }; - qrencode = callPackage ../tools/graphics/qrencode { }; + qrencode = callPackage ../development/libraries/qrencode { }; geeqie = callPackage ../applications/graphics/geeqie { }; @@ -17486,9 +17473,7 @@ in inherit (gnome2) gtk; }; - guake = callPackage ../applications/misc/guake { - inherit (gnome3) vte; - }; + guake = callPackage ../applications/misc/guake { }; guitone = callPackage ../applications/version-management/guitone { graphviz = graphviz_2_32; @@ -17661,10 +17646,6 @@ in ike = callPackage ../applications/networking/ike { }; ikiwiki = callPackage ../applications/misc/ikiwiki { - inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber - HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple YAML YAMLLibYAML HTMLTree Filechdir - AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; @@ -17838,9 +17819,9 @@ in inherit (kdeApplications) akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b - kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks - kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kpkpass kitinerary - kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; + kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog + keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + kpkpass kitinerary kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; @@ -18007,7 +17988,7 @@ in libvmi = callPackage ../development/libraries/libvmi { }; liferea = callPackage ../applications/networking/newsreaders/liferea { - inherit (gnome3) libpeas gsettings-desktop-schemas dconf; + inherit (gnome3) gsettings-desktop-schemas dconf; }; lightworks = callPackage ../applications/video/lightworks { @@ -18480,9 +18461,7 @@ in ruby = ruby_2_3.override { cursesSupport = true; }; }; - synapse = callPackage ../applications/misc/synapse { - inherit (gnome3) libgee; - }; + synapse = callPackage ../applications/misc/synapse { }; synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { inherit (darwin.apple_sdk.frameworks) Security; @@ -18729,7 +18708,6 @@ in pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { - inherit (gnome3) libgee; inherit (gst_all_1) gstreamer gst-plugins-base; }; @@ -19169,9 +19147,7 @@ in udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; - sakura = callPackage ../applications/misc/sakura { - vte = gnome3.vte; - }; + sakura = callPackage ../applications/misc/sakura { }; sayonara = callPackage ../applications/audio/sayonara { }; @@ -19256,7 +19232,6 @@ in ssvnc = callPackage ../applications/networking/remote/ssvnc { }; stupidterm = callPackage ../applications/misc/stupidterm { - vte = gnome3.vte; gtk = gtk3; }; @@ -19315,7 +19290,6 @@ in lightdm_qt = lightdm.override { withQt5 = true; }; lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { - inherit (gnome3) libgee; inherit (xorg) libX11 libXdmcp libpthreadstubs; }; @@ -19560,18 +19534,14 @@ in terminus = callPackage ../applications/misc/terminus { }; - lxterminal = callPackage ../applications/misc/lxterminal { - vte = gnome3.vte; - }; + lxterminal = callPackage ../applications/misc/lxterminal { }; aminal = callPackage ../applications/misc/aminal { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; inherit (darwin) cf-private; }; - termite-unwrapped = callPackage ../applications/misc/termite { - vte = gnome3.vte-ng; - }; + termite-unwrapped = callPackage ../applications/misc/termite { }; termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; }; @@ -19607,7 +19577,6 @@ in tig = gitAndTools.tig; tilda = callPackage ../applications/misc/tilda { - vte = gnome3.vte; gtk = gtk3; }; @@ -19815,7 +19784,6 @@ in virt-what = callPackage ../applications/virtualization/virt-what { }; virtmanager = callPackage ../applications/virtualization/virt-manager { - vte = gnome3.vte; dconf = gnome3.dconf; system-libvirt = libvirt; }; @@ -19992,8 +19960,7 @@ in winswitch = callPackage ../tools/X11/winswitch { }; wings = callPackage ../applications/graphics/wings { - esdl = esdl.override { erlang = erlangR18; }; - erlang = erlangR18; + erlang = erlangR21; }; write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; @@ -20261,7 +20228,7 @@ in xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {}; - xkb_switch = callPackage ../tools/X11/xkb-switch { }; + xkb-switch = callPackage ../tools/X11/xkb-switch { }; xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; @@ -20317,13 +20284,12 @@ in xterm = callPackage ../applications/misc/xterm { }; mlterm = callPackage ../applications/misc/mlterm { - vte = gnome3.vte; libssh2 = null; openssl = null; }; roxterm = callPackage ../applications/misc/roxterm { - inherit (gnome3) gsettings-desktop-schemas vte; + inherit (gnome3) gsettings-desktop-schemas; }; termonad-with-packages = callPackage ../applications/misc/termonad { @@ -20443,7 +20409,9 @@ in angband = callPackage ../games/angband { }; - anki = python3Packages.callPackage ../games/anki { }; + anki = python3Packages.callPackage ../games/anki { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; armagetronad = callPackage ../games/armagetronad { }; @@ -20653,6 +20621,8 @@ in frotz = callPackage ../games/frotz { }; + frogatto = callPackage ../games/frogatto { }; + fsg = callPackage ../games/fsg { wxGTK = wxGTK28.override { unicode = false; }; }; @@ -21437,9 +21407,7 @@ in bcftools = callPackage ../applications/science/biology/bcftools { }; - conglomerate = callPackage ../applications/science/biology/conglomerate { - inherit (perlPackages) GetoptTabular MNI-Perllib; - }; + conglomerate = callPackage ../applications/science/biology/conglomerate { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; @@ -21457,9 +21425,7 @@ in igv = callPackage ../applications/science/biology/igv { }; - inormalize = callPackage ../applications/science/biology/inormalize { - inherit (perlPackages) GetoptTabular MNI-Perllib; - }; + inormalize = callPackage ../applications/science/biology/inormalize { }; iv = callPackage ../applications/science/biology/iv { neuron-version = neuron.version; @@ -21471,9 +21437,7 @@ in muscle = callPackage ../applications/science/biology/muscle { }; - n3 = callPackage ../applications/science/biology/N3 { - inherit (perlPackages) perl GetoptTabular MNI-Perllib; - }; + n3 = callPackage ../applications/science/biology/N3 { }; neuron = callPackage ../applications/science/biology/neuron { python = null; @@ -21487,17 +21451,11 @@ in mrbayes = callPackage ../applications/science/biology/mrbayes { }; - minc_tools = callPackage ../applications/science/biology/minc-tools { - inherit (perlPackages) TextFormat; - }; + minc_tools = callPackage ../applications/science/biology/minc-tools { }; - minc_widgets = callPackage ../applications/science/biology/minc-widgets { - inherit (perlPackages) GetoptTabular MNI-Perllib; - }; + minc_widgets = callPackage ../applications/science/biology/minc-widgets { }; - mni_autoreg = callPackage ../applications/science/biology/mni_autoreg { - inherit (perlPackages) GetoptTabular MNI-Perllib; - }; + mni_autoreg = callPackage ../applications/science/biology/mni_autoreg { }; minimap2 = callPackage ../applications/science/biology/minimap2 { }; @@ -22847,12 +22805,7 @@ in conf = config.slock.conf or null; }; - smokeping = callPackage ../tools/networking/smokeping { - inherit fping rrdtool; - inherit (perlPackages) - FCGI CGI CGIFast ConfigGrammar DigestHMAC NetTelnet - NetOpenSSH NetSNMP LWP IOTty perl NetDNS perlldap; - }; + smokeping = callPackage ../tools/networking/smokeping { }; snapraid = callPackage ../tools/filesystems/snapraid { }; @@ -22986,6 +22939,8 @@ in webfs = callPackage ../servers/http/webfs { }; + websocketd = callPackage ../applications/networking/websocketd { }; + wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; }; @@ -23172,7 +23127,7 @@ in iterm2 = callPackage ../applications/misc/iterm2 {}; sequeler = callPackage ../applications/misc/sequeler { - inherit (gnome3) gtksourceview libgda libgee; + inherit (gnome3) gtksourceview libgda; }; sequelpro = callPackage ../applications/misc/sequelpro {}; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 85bdc59e6dbd..f05cf3d9290e 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -61,7 +61,7 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR19.elixir`. - inherit (packages.erlang) elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; + inherit (packages.erlang) elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4; inherit (packages.erlang) lfe lfe_1_2; }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index b52afe98f7fa..1fc36139ac07 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -15,6 +15,7 @@ in binutils-unwrapped = callPackage ../os-specific/darwin/binutils { inherit (darwin) cctools; inherit (pkgs) binutils-unwrapped; + inherit (pkgs.llvmPackages_5) llvm; }; binutils = pkgs.wrapBintoolsWith { diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index a83c3baaa4a0..9cd38e066d38 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -361,28 +361,6 @@ let tramp = callPackage ../applications/editors/emacs-modes/tramp { }; - weechat = melpaBuild rec { - pname = "weechat.el"; - version = "0.2.2"; - src = fetchFromGitHub { - owner = "the-kenny"; - repo = pname; - rev = version; - sha256 = "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl"; - }; - postPatch = lib.optionalString (!stdenv.isLinux) '' - rm weechat-sauron.el weechat-secrets.el - ''; - packageRequires = [ s ]; - recipe = writeText "recipe" '' - (weechat :repo "the-kenny/weechat" :fetcher github) - ''; - meta = { - description = "A weechat IRC client frontend for Emacs"; - license = gpl3Plus; - }; - }; - yaoddmuse = callPackage ../applications/editors/emacs-modes/yaoddmuse { }; zeitgeist = callPackage ../applications/editors/emacs-modes/zeitgeist { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 749a7e156119..ec2ced52eb4c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -380,18 +380,18 @@ let luadbi = buildLuaPackage rec { name = "luadbi-${version}"; - version = "0.6"; + version = "0.7.1"; src = fetchFromGitHub { owner = "mwild1"; repo = "luadbi"; rev = "v${version}"; - sha256 = "1cpl84pl75wqd9zph3w4srd5lxij359p8xmmf7xpdbxz67695vah"; + sha256 = "01i8018zb7w2bhaqglm7cnvbiirgd95b9d07irgz3sci91p08cwp"; }; MYSQL_INC="-I${mysql.connector-c}/include/mysql"; - buildInputs = [ mysql postgresql sqlite ]; + buildInputs = [ mysql.client mysql.connector-c postgresql sqlite ]; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c670db817728..a80aec268b9a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1,16 +1,13 @@ -{ lib, callPackage, newScope, pkgs, config }: +{ lib, newScope, pkgs, config }: let inherit (pkgs.stdenv.hostPlatform) system; - mkOcamlPackages = ocaml: overrides: - let - packageSet = self: - with self; let inherit (self) callPackage; in - let ocamlPackages = - { - callPackage = newScope self; + liftJaneStreet = self: super: super.janeStreet // super; + mkOcamlPackages = ocaml: + (lib.makeScope newScope (self: with self; + { inherit ocaml; # Libs @@ -1062,29 +1059,26 @@ let camlp5 = callPackage ../development/tools/ocaml/camlp5 { legacy = true; }; }; - }; - in (ocamlPackages.janeStreet // ocamlPackages); - in lib.fix' (lib.extends overrides packageSet); -in rec -{ + })).overrideScope' liftJaneStreet; - inherit mkOcamlPackages; +in let inherit (pkgs) callPackage; in rec +{ - ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }) (self: super: { }); + ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }); - ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { }) (self: super: { }); + ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { }); - ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { }) (self: super: { }); + ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { }); - ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }) (self: super: { }); + ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }); - ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }) (self: super: { }); + ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }); - ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { }) (self: super: { }); + ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { }); - ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { }); + ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }); - ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { }); + ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }); ocamlPackages_latest = ocamlPackages_4_07; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e3f02fa97287..3c80eac6a3b1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7,8 +7,8 @@ {config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}: -# cpan2nix assumes that perl-packages.nix will be used only with perl 5.26 or above -assert stdenv.lib.versionAtLeast perl.version "5.26"; +# cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.1 or above +assert stdenv.lib.versionAtLeast perl.version "5.28.1"; let inherit (stdenv.lib) maintainers; self = _self // overrides; @@ -30,6 +30,24 @@ let checkPhase = "./Build test"; }); + /* Construct a perl search path (such as $PERL5LIB) + + Example: + pkgs = import <nixpkgs> { } + makePerlPath [ pkgs.perlPackages.libnet ] + => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" + */ + makePerlPath = stdenv.lib.makeSearchPathOutput "lib" perl.libPrefix; + + /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB) + + Example: + pkgs = import <nixpkgs> { } + makeFullPerlPath [ pkgs.perlPackages.CGI ] + => "/nix/store/fddivfrdc1xql02h9q500fpnqy12c74n-perl-CGI-4.38/lib/perl5/site_perl:/nix/store/8hsvdalmsxqkjg0c5ifigpf31vc4vsy2-perl-HTML-Parser-3.72/lib/perl5/site_perl:/nix/store/zhc7wh0xl8hz3y3f71nhlw1559iyvzld-perl-HTML-Tagset-3.20/lib/perl5/site_perl" + */ + makeFullPerlPath = deps: makePerlPath (stdenv.lib.misc.closePropagation deps); + ack = buildPerlPackage rec { name = "ack-2.24"; @@ -1088,18 +1106,6 @@ let }; }; - Carp = buildPerlPackage rec { - name = "Carp-1.50"; - src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Carp-1.50.tar.gz; - sha256 = "1ngbpjyd9qi7n4h5r3q3qibd8by7rfiv7364jqlv4lbd3973n9zm"; - }; - meta = with stdenv.lib; { - description = "Alternative warn and die for modules"; - license = with licenses; [ artistic1 gpl1Plus ]; - }; - }; - CarpAlways = buildPerlPackage rec { name = "Carp-Always-0.16"; src = fetchurl { @@ -4026,8 +4032,8 @@ let sha256 = "5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' - mkdir -p $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI - cat > $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI.pm <<EOF + mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI + cat > $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI.pm <<EOF package DBI; BEGIN { our \$VERSION = "$version"; @@ -4035,8 +4041,8 @@ let 1; EOF - autodir=$(echo $out/lib/perl5/site_perl/${perl.version}/*/auto/DBI) - cat > $out/lib/perl5/site_perl/cross_perl/${perl.version}/DBI/DBD.pm <<EOF + autodir=$(echo $out/${perl.libPrefix}/${perl.version}/*/auto/DBI) + cat > $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI/DBD.pm <<EOF package DBI::DBD; use Exporter (); use vars qw (@ISA @EXPORT); @@ -5318,14 +5324,6 @@ let }; }; - ExtUtilsCBuilder = buildPerlPackage rec { - name = "ExtUtils-CBuilder-0.280230"; - src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280230.tar.gz; - sha256 = "1mcwvic01x0flcz3jsny5j8j5zz96r63qjwq75hs42cpf3by3ahx"; - }; - }; - ExtUtilsCChecker = buildPerlModule rec { name = "ExtUtils-CChecker-0.10"; src = fetchurl { @@ -5466,14 +5464,6 @@ let }; }; - ExtUtilsParseXS = buildPerlPackage rec { - name = "ExtUtils-ParseXS-3.35"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz"; - sha256 = "077fqiyabydm8j34wxzxwxskyidh8nmwq9gskaxai8kq298z1pj1"; - }; - }; - ExtUtilsPkgConfig = buildPerlPackage rec { name = "ExtUtils-PkgConfig-1.16"; src = fetchurl { @@ -6198,18 +6188,6 @@ let }; }; - FilterSimple = buildPerlPackage { - name = "Filter-Simple-0.94"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Filter-Simple-0.94.tar.gz; - sha256 = "1lkrgsqaxf595ha1y29gxqqf4kf8cpm5yzr4gg7zngbq1nb0pz6g"; - }; - meta = { - description = "Simplified source filtering"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - FinanceQuote = buildPerlPackage rec { name = "Finance-Quote-1.47"; src = fetchurl { @@ -7716,18 +7694,6 @@ let }; }; - IOSocketIP = buildPerlModule { - name = "IO-Socket-IP-0.39"; - src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Socket-IP-0.39.tar.gz; - sha256 = "11950da7636cb786efd3bfb5891da4c820975276bce43175214391e5c32b7b96"; - }; - meta = { - description = "Family-neutral IP socket supporting both IPv4 and IPv6"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - IOSocketInet6 = buildPerlModule rec { name = "IO-Socket-INET6-2.72"; src = fetchurl { @@ -9162,7 +9128,7 @@ let buildInputs = [ ModuleBuild NetDNSResolverProgrammable ]; propagatedBuildInputs = [ Error NetAddrIP NetDNS URI ]; - buildPhase = "perl Build.PL --install_base=$out --install_path=\"sbin=$out/bin\" --install_path=\"lib=$out/lib/perl5/site_perl\"; ./Build build "; + buildPhase = "perl Build.PL --install_base=$out --install_path=\"sbin=$out/bin\" --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build "; doCheck = false; # The main test performs network access meta = { @@ -12101,7 +12067,7 @@ let sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y"; }; outputs = [ "out" ]; - buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey TimeHiRes ]; + buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; meta = { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; homepage = http://www.percona.com/software/percona-toolkit; @@ -13391,18 +13357,6 @@ let }; }; - SelfLoader = buildPerlPackage { - name = "SelfLoader-1.24"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/SelfLoader-1.24.tar.gz; - sha256 = "4c7cd20fd82aa10520ac14b05fa003f60c72bb4c95527bd12aec8bf3c4546098"; - }; - meta = { - description = "Load functions only on demand"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - SerealDecoder = buildPerlPackage rec { name = "Sereal-Decoder-4.005"; src = fetchurl { @@ -13573,22 +13527,6 @@ let buildInputs = [ TestWarn XMLParserLite ]; }; - Socket = buildPerlPackage { - name = "Socket-2.027"; - src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Socket-2.027.tar.gz; - sha256 = "1a725fbqx6bjzjf63bgs5wvzd20kffz1f94pbmv1670p9m4i270l"; - }; - postPatch = '' - # requires network access - rm t/getnameinfo.t t/getaddrinfo.t - ''; - meta = { - description = "Networking constants and support functions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - Socket6 = buildPerlPackage rec { name = "Socket6-0.29"; src = fetchurl { @@ -15215,20 +15153,6 @@ let }; }; - TestHarness = buildPerlPackage { - name = "Test-Harness-3.42"; - src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Test-Harness-3.42.tar.gz; - sha256 = "0fd90d4efea82d6e262e6933759e85d27cbcfa4091b14bf4042ae20bab528e53"; - }; - doCheck = false; # makes assumptions about path to Perl - meta = { - homepage = http://testanything.org/; - description = "Run Perl standard test scripts with statistics"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - TestHarnessStraps = buildPerlModule { name = "Test-Harness-Straps-0.30"; src = fetchurl { @@ -16175,7 +16099,7 @@ let install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" - install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/${perl.version}/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" + install_name_tool -change "$oldPath" "$newPath" "$out/${perl.libPrefix}/${perl.version}/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" ''; meta = { description = "Interface to read and parse BibTeX files"; @@ -16653,18 +16577,6 @@ let buildInputs = [ TestDifferences ]; }; - threads = buildPerlPackage rec { - name = "threads-2.21"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "047i22mdnf7fa0h9w5jhqrjbg561l5jxk8xqzwh6zbmwlac4qf98"; - }; - meta = { - description = "Perl interpreter-based threads"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - threadsshared = buildPerlPackage rec { name = "threads-shared-1.58"; src = fetchurl { @@ -16851,14 +16763,6 @@ let }; }; - TimeHiRes = buildPerlPackage rec { - name = "Time-HiRes-1.9758"; - src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/Time-HiRes-1.9758.tar.gz; - sha256 = "07jbydcdzpjm6i4nidci0rlklx4kla210fsl6zishw0yq5di9yjv"; - }; - }; - TimeLocal = buildPerlPackage { name = "Time-Local-1.28"; src = fetchurl { @@ -17047,18 +16951,6 @@ let }; }; - UnicodeCollate = buildPerlPackage rec { - name = "Unicode-Collate-1.25"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SA/SADAHIRO/${name}.tar.gz"; - sha256 = "1dpvck4saah8hqb9c82i25yimy9x2hkr1k3a2f1ly0k0ifhbiyyx"; - }; - meta = { - description = "Unicode Collation Algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - UnicodeLineBreak = buildPerlPackage rec { name = "Unicode-LineBreak-2018.003"; src = fetchurl { @@ -17944,6 +17836,18 @@ let UnicodeNormalize = null; # part of Perl 5.26 XSLoader = null; # part of Perl 5.26 + Carp = null; # part of Perl 5.28 + ExtUtilsCBuilder = null; # part of Perl 5.28 + ExtUtilsParseXS = null; # part of Perl 5.28 + FilterSimple = null; # part of Perl 5.28 + IOSocketIP = null; # part of Perl 5.28 + SelfLoader = null; # part of Perl 5.28 + Socket = null; # part of Perl 5.28 + TestHarness = null; # part of Perl 5.28 + threads = null; # part of Perl 5.28 + TimeHiRes = null; # part of Perl 5.28 + UnicodeCollate = null; # part of Perl 5.28 + ArchiveZip_1_53 = self.ArchiveZip; Autobox = self.autobox; CommonSense = self.commonsense; # For backwards compatibility. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec86a570c7cb..d0d12d2ca729 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -615,6 +615,13 @@ in { pythonPackages = self; }; + /* + `pyqt5_with_qtwebkit` should not be used by python libraries in + pkgs/development/python-modules/*. Putting this attribute in + `propagatedBuildInputs` may cause collisions. + */ + pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + pysc2 = callPackage ../development/python-modules/pysc2 { }; pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; @@ -1122,6 +1129,8 @@ in { blockdiag = callPackage ../development/python-modules/blockdiag { }; + blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; + bpython = callPackage ../development/python-modules/bpython {}; bsddb3 = callPackage ../development/python-modules/bsddb3 { }; @@ -1185,6 +1194,8 @@ in { case = callPackage ../development/python-modules/case {}; + cbor = callPackage ../development/python-modules/cbor {}; + cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; cccolutils = callPackage ../development/python-modules/cccolutils {}; @@ -1679,10 +1690,10 @@ in { then callPackage ../development/python-modules/faulthandler {} else throw "faulthandler is built into ${python.executable}"; - flexmock = callPackage ../development/python-modules/flexmock { }; - fb-re2 = callPackage ../development/python-modules/fb-re2 { }; + flexmock = callPackage ../development/python-modules/flexmock { }; + flit = callPackage ../development/python-modules/flit { }; flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; @@ -1721,7 +1732,11 @@ in { gateone = callPackage ../development/python-modules/gateone { }; - gcutil = callPackage ../development/python-modules/gcutil { }; + # TODO: Remove after 19.03 is branched off: + gcutil = throw '' + pythonPackages.gcutil is deprecated and can be replaced with "gcloud + compute" from the package google-cloud-sdk. + ''; GeoIP = callPackage ../development/python-modules/GeoIP { }; @@ -2087,6 +2102,8 @@ in { svg-path = callPackage ../development/python-modules/svg-path { }; + r2pipe = callPackage ../development/python-modules/r2pipe { }; + regex = callPackage ../development/python-modules/regex { }; ratelimiter = callPackage ../development/python-modules/ratelimiter { }; @@ -2284,6 +2301,8 @@ in { dtopt = callPackage ../development/python-modules/dtopt { }; + easywatch = callPackage ../development/python-modules/easywatch { }; + ecdsa = callPackage ../development/python-modules/ecdsa { }; effect = callPackage ../development/python-modules/effect {}; @@ -2416,6 +2435,10 @@ in { cudaSupport = pkgs.config.cudaSupport or false; }; + pyro-ppl = callPackage ../development/python-modules/pyro-ppl {}; + + opt-einsum = callPackage ../development/python-modules/opt-einsum {}; + pytorchWithCuda = self.pytorch.override { cudaSupport = true; }; @@ -3226,6 +3249,8 @@ in { ordereddict = callPackage ../development/python-modules/ordereddict { }; + od = callPackage ../development/python-modules/od { }; + orderedset = callPackage ../development/python-modules/orderedset { }; python-otr = callPackage ../development/python-modules/python-otr { }; @@ -3983,6 +4008,8 @@ in { sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; + statsmodels = callPackage ../development/python-modules/statsmodels { }; structlog = callPackage ../development/python-modules/structlog { }; @@ -5094,6 +5121,8 @@ in { simpy = callPackage ../development/python-modules/simpy { }; + x256 = callPackage ../development/python-modules/x256 { }; + yattag = callPackage ../development/python-modules/yattag { }; z3 = (toPythonModule (pkgs.z3.override { @@ -5124,6 +5153,18 @@ in { importlib-resources = callPackage ../development/python-modules/importlib-resources {}; + srptools = callPackage ../development/python-modules/srptools { }; + + curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; + + pyatv = callPackage ../development/python-modules/pyatv { }; + + pybotvac = callPackage ../development/python-modules/pybotvac { }; + + pytado = callPackage ../development/python-modules/pytado { }; + + casttube = callPackage ../development/python-modules/casttube { }; + }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9bdad5473d4e..6c2159f9befd 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -51,6 +51,7 @@ let jobs.nix-info-tested.x86_64-darwin jobs.openssh.x86_64-darwin jobs.openssl.x86_64-darwin + jobs.pandoc.x86_64-darwin jobs.postgresql.x86_64-darwin jobs.python.x86_64-darwin jobs.python3.x86_64-darwin @@ -64,7 +65,7 @@ let jobs.firefox-unwrapped.x86_64-darwin jobs.qt5.qtmultimedia.x86_64-darwin jobs.inkscape.x86_64-darwin - # jobs.gimp.x86_64-darwin + jobs.gimp.x86_64-darwin jobs.emacs.x86_64-darwin jobs.wireshark.x86_64-darwin jobs.transmission-gtk.x86_64-darwin @@ -91,6 +92,7 @@ let jobs.lib-tests jobs.stdenv.x86_64-linux jobs.linux.x86_64-linux + jobs.pandoc.x86_64-linux jobs.python.x86_64-linux jobs.python3.x86_64-linux # Needed by travis-ci to test PRs @@ -100,6 +102,7 @@ let jobs.nix-info-tested.x86_64-linux # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux + jobs.unar.x86_64-linux jobs.tests.cc-wrapper.x86_64-linux jobs.tests.cc-wrapper-gcc7.x86_64-linux |