diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 553 | ||||
| -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 | 40 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/metrics.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 40 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 590 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 115 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 5 |
12 files changed, 695 insertions, 715 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b56640049d8..186260c0f68 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 @@ -222,6 +223,7 @@ mapAliases ({ perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 pgp-tools = signing-party; # added 2017-03-26 + pg_tmp = ephemeralpg; # added 2018-01-16 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatex = pidgin-latex; # added 2018-01-08 pidginlatexSF = pidgin-latex; # added 2014-11-02 @@ -234,7 +236,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 d3c7b03fe5f..25c0457c247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -197,6 +197,7 @@ in fetchgit = callPackage ../build-support/fetchgit { git = buildPackages.gitMinimal; + cacert = buildPackages.cacert; }; fetchgitPrivate = callPackage ../build-support/fetchgit/private.nix { }; @@ -398,8 +399,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 +527,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 +668,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; }; @@ -686,6 +686,8 @@ in bunny = callPackage ../tools/package-management/bunny { }; + clair = callPackage ../tools/admin/clair { }; + cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; @@ -1169,6 +1171,8 @@ in cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; + cht-sh = callPackage ../tools/misc/cht.sh { }; + ckbcomp = callPackage ../tools/X11/ckbcomp { }; clac = callPackage ../tools/misc/clac {}; @@ -1375,11 +1379,13 @@ in eschalot = callPackage ../tools/security/eschalot { }; + esphome = callPackage ../servers/home-assistant/esphome.nix { }; + esptool = callPackage ../tools/misc/esptool { }; esptool-ck = callPackage ../tools/misc/esptool-ck { }; - ephemeralpg = callPackage ../applications/misc/ephemeralpg {}; + ephemeralpg = callPackage ../development/tools/database/ephemeralpg {}; et = callPackage ../applications/misc/et {}; @@ -1449,6 +1455,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 { }; @@ -1483,7 +1491,7 @@ in pythonPackages = python3Packages; }; - gringo = callPackage ../tools/misc/gringo { scons = scons_2_5_1; }; + gringo = callPackage ../tools/misc/gringo { }; grobi = callPackage ../tools/X11/grobi { }; @@ -1497,6 +1505,8 @@ in hexio = callPackage ../development/tools/hexio { }; + hexyl = callPackage ../tools/misc/hexyl { }; + hid-listen = callPackage ../tools/misc/hid-listen { }; home-manager = callPackage ../tools/package-management/home-manager {}; @@ -1984,7 +1994,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 +2012,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 +2089,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 +2218,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 +2320,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 +2560,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 +2642,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 { }; @@ -2813,6 +2809,8 @@ in fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; + fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs {}; + fusee-launcher = callPackage ../development/tools/fusee-launcher { }; fwknop = callPackage ../tools/security/fwknop { }; @@ -2890,8 +2888,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 { }; @@ -3163,7 +3165,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 {}; @@ -3251,6 +3252,8 @@ in hardlink = callPackage ../tools/system/hardlink { }; + hashcash = callPackage ../tools/security/hashcash { }; + hashcat = callPackage ../tools/security/hashcat { }; hash_extender = callPackage ../tools/security/hash_extender { }; @@ -3485,6 +3488,8 @@ in invoice2data = callPackage ../tools/text/invoice2data { }; + inxi = callPackage ../tools/system/inxi { }; + iodine = callPackage ../tools/networking/iodine { }; ioping = callPackage ../tools/system/ioping { }; @@ -3726,6 +3731,8 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; + libcroco = callPackage ../development/libraries/libcroco { }; + libsmi = callPackage ../development/libraries/libsmi { }; lesspipe = callPackage ../tools/misc/lesspipe { }; @@ -3993,8 +4000,6 @@ in libqmi = callPackage ../development/libraries/libqmi { }; - libqrencode = callPackage ../development/libraries/libqrencode { }; - libmbim = callPackage ../development/libraries/libmbim { }; libmongo-client = callPackage ../development/libraries/libmongo-client { }; @@ -4027,6 +4032,8 @@ in libreswan = callPackage ../tools/networking/libreswan { }; + librest = callPackage ../development/libraries/librest { }; + libwebsockets = callPackage ../development/libraries/libwebsockets { }; lidarr = callPackage ../servers/lidarr { }; @@ -4039,9 +4046,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 { }; @@ -4278,13 +4283,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 { }; @@ -4434,7 +4436,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 { }; @@ -4585,6 +4589,8 @@ in ola = callPackage ../applications/misc/ola { }; + omping = callPackage ../applications/networking/omping { }; + onioncircuits = callPackage ../tools/security/onioncircuits { inherit (gnome3) defaultIconTheme; }; @@ -4709,7 +4715,9 @@ in pagmo2 = callPackage ../development/libraries/pagmo2 { }; - pakcs = callPackage ../development/compilers/pakcs {}; + pakcs = callPackage ../development/compilers/pakcs { + haskellPackages = haskell.packages.ghc844; + }; pal = callPackage ../tools/misc/pal { }; @@ -4785,9 +4793,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 { }; @@ -4866,7 +4872,7 @@ in }; pinentry_gnome = res.pinentry.override { - gcr = gnome3.gcr; + inherit gcr; }; pinentry_qt4 = res.pinentry.override { @@ -4886,6 +4892,8 @@ in pirate-get = callPackage ../tools/networking/pirate-get { }; + pipreqs = callPackage ../tools/misc/pipreqs { }; + pius = callPackage ../tools/security/pius { }; pixiewps = callPackage ../tools/networking/pixiewps {}; @@ -5359,6 +5367,8 @@ in scrypt = callPackage ../tools/security/scrypt { }; + sdate = callPackage ../tools/misc/sdate { }; + sdcv = callPackage ../applications/misc/sdcv { }; sdl-jstest = callPackage ../tools/misc/sdl-jstest { }; @@ -5431,7 +5441,7 @@ in silc_server = callPackage ../servers/silc-server { }; sile = callPackage ../tools/typesetting/sile { - inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg; + inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg luasocket luasec; }; silver-searcher = callPackage ../tools/text/silver-searcher { }; @@ -5466,9 +5476,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 { }; @@ -5647,9 +5655,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 {}; @@ -5812,6 +5818,8 @@ in tokei = callPackage ../development/tools/misc/tokei { }; + toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; + tor = callPackage ../tools/security/tor { openssl = openssl_1_1; # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. @@ -5874,8 +5882,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 { }; @@ -5916,6 +5928,8 @@ in ua = callPackage ../tools/networking/ua { }; + ubridge = callPackage ../tools/networking/ubridge { }; + ucl = callPackage ../development/libraries/ucl { }; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; @@ -5990,10 +6004,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 { }; @@ -6007,7 +6018,6 @@ in viking = callPackage ../applications/misc/viking { inherit (gnome2) scrollkeeper; - inherit (gnome3) gexiv2; }; vim-vint = callPackage ../development/tools/vim-vint { }; @@ -6029,6 +6039,8 @@ in vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { }; + void = callPackage ../tools/misc/void { }; + volume_key = callPackage ../development/libraries/volume-key { }; vorbisgain = callPackage ../tools/misc/vorbisgain { }; @@ -6248,9 +6260,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; @@ -6299,7 +6309,6 @@ in weighttp = callPackage ../tools/networking/weighttp { }; wget = callPackage ../tools/networking/wget { - inherit (perlPackages) IOSocketSSL LWP; libpsl = null; }; @@ -6517,6 +6526,11 @@ in any-nix-shell = callPackage ../shells/any-nix-shell { }; bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); + bash_5 = lowPrio (callPackage ../shells/bash/5.0.nix { }); + bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.0.nix { + interactive = true; + withDocs = true; + }); # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed bashInteractive = callPackage ../shells/bash/4.4.nix { @@ -6542,6 +6556,8 @@ in ion = callPackage ../shells/ion { }; + ksh = callPackage ../shells/ksh { }; + mksh = callPackage ../shells/mksh { }; oh = callPackage ../shells/oh { }; @@ -6622,17 +6638,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; @@ -6663,7 +6677,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 { }; @@ -6672,7 +6688,10 @@ in clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; - clasp-common-lisp = callPackage ../development/compilers/clasp {}; + clasp-common-lisp = callPackage ../development/compilers/clasp { + llvmPackages = llvmPackages_6; + stdenv = llvmPackages_6.stdenv; + }; clean = callPackage ../development/compilers/clean { }; @@ -6722,7 +6741,7 @@ in eql = callPackage ../development/compilers/eql {}; - elm2nix = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/tools/elm2nix {}); + elm2nix = haskell.lib.justStaticExecutables haskellPackages.elm2nix; elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { }); @@ -6808,7 +6827,7 @@ in # built with, and use, that cross-compiled libc. gccCrossStageStatic = assert stdenv.targetPlatform != stdenv.hostPlatform; let libcCross1 = - if stdenv.targetPlatform.libc == "msvcrt" then targetPackages.windows.mingw_w64_headers + if stdenv.targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers else if stdenv.targetPlatform.libc == "libSystem" then darwin.xcode else null; binutils1 = wrapBintoolsWith { @@ -7016,7 +7035,8 @@ in }; gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; - gcc-arm-embedded = gcc-arm-embedded-7; + gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; + gcc-arm-embedded = gcc-arm-embedded-8; gforth = callPackage ../development/compilers/gforth {}; @@ -7212,11 +7232,17 @@ in oraclejdk8distro = installjdk: pluginSupport: (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk pluginSupport; }); + (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { + inherit installjdk pluginSupport; + licenseAccepted = config.oraclejdk.accept_license or false; + }); oraclejdk8psu_distro = installjdk: pluginSupport: (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); + (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { + inherit installjdk pluginSupport; + licenseAccepted = config.oraclejdk.accept_license or false; + }); javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; @@ -7346,6 +7372,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 { }; @@ -7400,7 +7428,11 @@ in neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { }; + nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + # QT 5.12 has a weird regression involving the floorplanning window having + # a 'blank' or 'transparent' background, so fall back to 5.11 for now. + qtbase = qt511.qtbase; + }; nasm = callPackage ../development/compilers/nasm { }; @@ -7580,6 +7612,8 @@ in tinycc = callPackage ../development/compilers/tinycc { }; + tinyscheme = callPackage ../development/interpreters/tinyscheme { }; + inherit (ocaml-ng.ocamlPackages_4_02) trv; bupc = callPackage ../development/compilers/bupc { }; @@ -7694,7 +7728,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) @@ -7859,7 +7893,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 { }; @@ -7963,6 +7997,7 @@ in python3 = python37; pypy = pypy2; pypy2 = pypy27; + pypy3 = pypy35; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -7979,33 +8014,8 @@ in python2Packages = python2.pkgs; python3Packages = python3.pkgs; - python27 = callPackage ../development/interpreters/python/cpython/2.7 { - self = python27; - inherit (darwin) CF configd; - }; - python35 = callPackage ../development/interpreters/python/cpython/3.5 { - inherit (darwin) CF configd; - self = python35; - }; - python36 = callPackage ../development/interpreters/python/cpython/3.6 { - 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; - python = python27.override{x11Support=true;}; - db = db.override { dbmSupport = true; }; - }; - pypy3 = callPackage ../development/interpreters/python/pypy/3 { - self = pypy3; - python = python27; - db = db.override { dbmSupport = true; }; - }; + pythonInterpreters = callPackage ./../development/interpreters/python {}; + inherit (pythonInterpreters) python27 python35 python36 python37 pypy27 pypy35; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -8300,6 +8310,8 @@ in electron = callPackage ../development/tools/electron { }; + electron_3 = callPackage ../development/tools/electron/3.x.nix { }; + autobuild = callPackage ../development/tools/misc/autobuild { }; autoconf = callPackage ../development/tools/misc/autoconf { }; @@ -8504,22 +8516,22 @@ in cpplint = callPackage ../development/tools/analysis/cpplint { }; cquery = callPackage ../development/tools/misc/cquery { - llvmPackages = llvmPackages_7; + llvmPackages = llvmPackages_latest; + }; + + ccls = callPackage ../development/tools/misc/ccls { + llvmPackages = llvmPackages_latest; }; 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 { }; @@ -8735,9 +8747,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; @@ -8755,9 +8765,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; @@ -8860,9 +8868,12 @@ in mage = callPackage ../development/tools/build-managers/mage { }; + mbed-cli = callPackage ../development/tools/mbed-cli { }; + 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 { }; @@ -8944,6 +8955,8 @@ in patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); + pax-rs = callPackage ../development/tools/pax-rs { }; + peg = callPackage ../development/tools/parsing/peg { }; pgcli = callPackage ../development/tools/database/pgcli {}; @@ -9053,8 +9066,7 @@ in selendroid = callPackage ../development/tools/selenium/selendroid { }; sconsPackages = callPackage ../development/tools/build-managers/scons { }; - scons = sconsPackages.scons_3_0_1; - scons_2_5_1 = sconsPackages.scons_2_5_1; + scons = sconsPackages.scons_3_0_3; mill = callPackage ../development/tools/build-managers/mill { }; @@ -9310,7 +9322,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 { }; @@ -9656,8 +9670,6 @@ in epoxy = callPackage ../development/libraries/epoxy {}; - esdl = callPackage ../development/libraries/esdl { }; - libesmtp = callPackage ../development/libraries/libesmtp { }; exiv2 = callPackage ../development/libraries/exiv2 { }; @@ -9808,6 +9820,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; @@ -9841,6 +9855,8 @@ in gcab = callPackage ../development/libraries/gcab { }; + gcr = callPackage ../development/libraries/gcr { }; + gdome2 = callPackage ../development/libraries/gdome2 { inherit (gnome2) gtkdoc; }; @@ -9867,6 +9883,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; @@ -9919,6 +9937,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; + glbinding = callPackage ../development/libraries/glbinding { }; gle = callPackage ../development/libraries/gle { }; @@ -10141,6 +10161,8 @@ in gsoap = callPackage ../development/libraries/gsoap { }; + gsound = callPackage ../development/libraries/gsound { }; + gss = callPackage ../development/libraries/gss { }; gtkimageview = callPackage ../development/libraries/gtkimageview { }; @@ -10195,6 +10217,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 { }; @@ -10302,9 +10326,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 { }; @@ -10674,8 +10696,6 @@ in libconfuse = callPackage ../development/libraries/libconfuse { }; - inherit (gnome3) libcroco; - libcangjie = callPackage ../development/libraries/libcangjie { }; libcollectdclient = callPackage ../development/libraries/libcollectdclient { }; @@ -10804,44 +10824,23 @@ in libgadu = callPackage ../development/libraries/libgadu { }; - gap-libgap-compatible = let - version = "4r8p6"; - pkgVer = "2016_11_12-14_25"; - in - (gap.override { keepAllPackages = false; }).overrideAttrs (oldAttrs: { - name = "libgap-${oldAttrs.pname}-${version}"; - inherit version; - src = fetchurl { - url = "https://www.gap-system.org/pub/gap/gap48/tar.bz2/gap${version}_${pkgVer}.tar.bz2"; - sha256 = "19n2p1mdg33s2x9rs51iak7rgndc1cwr56jyqnah0g1ydgg1yh6b"; - }; - patches = [ - # don't install any packages by default (needed for interop with libgap, probably obsolete with 4r10 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/nodefaultpackages.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1xwj766m3axrxbkyx13hy3q8s2wkqxy3m6mgpwq3c3n4vk3v416v"; - }) - - # fix infinite loop in writeandcheck() when writing an error message fails. - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gap/patches/writeandcheck.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1r1511x4kc2i2mbdq1b61rb6p3misvkf1v5qy3z6fmn6vqwziaz1"; - }) - ]; - }); - libgap = callPackage ../development/libraries/libgap { }; - libgda = callPackage ../development/libraries/libgda { }; 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 { }; @@ -10852,6 +10851,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 { }; @@ -10950,7 +10953,6 @@ in libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; libguestfs = callPackage ../development/libraries/libguestfs { - inherit (perlPackages) libintl_perl GetoptLong SysVirt; appliance = libguestfs-appliance; }; @@ -11013,6 +11015,8 @@ in libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmediaart = callPackage ../development/libraries/libmediaart { }; + libmediainfo = callPackage ../development/libraries/libmediainfo { }; libmhash = callPackage ../development/libraries/libmhash {}; @@ -11283,6 +11287,8 @@ in libpcap = callPackage ../development/libraries/libpcap { }; + libpeas = callPackage ../development/libraries/libpeas { }; + libpipeline = callPackage ../development/libraries/libpipeline { }; libpgf = callPackage ../development/libraries/libpgf { }; @@ -11560,6 +11566,8 @@ in libyubikey = callPackage ../development/libraries/libyubikey { }; + libzapojit = callPackage ../development/libraries/libzapojit { }; + libzen = callPackage ../development/libraries/libzen { }; libzip = callPackage ../development/libraries/libzip { }; @@ -11801,6 +11809,8 @@ in ntrack = callPackage ../development/libraries/ntrack { }; + nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; + nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { }; nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { }; @@ -11976,8 +11986,6 @@ in pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; - pg_tmp = callPackage ../development/tools/database/pg_tmp { }; - pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; plv8 = callPackage ../servers/sql/postgresql/plv8 { @@ -12090,6 +12098,8 @@ in qtxmlpatterns = qt59.qtxmlpatterns; }; + pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; + re2 = callPackage ../development/libraries/re2 { }; qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; @@ -12181,8 +12191,25 @@ 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); + + # TODO bump to 5.12 on darwin once it's not broken + qt5 = if stdenv.isDarwin then qt511 else qt512; + libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -12350,6 +12377,8 @@ in readline70 = callPackage ../development/libraries/readline/7.0.nix { }; + readline80 = callPackage ../development/libraries/readline/8.0.nix { }; + readosm = callPackage ../development/libraries/readosm { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { @@ -12493,6 +12522,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 { }; @@ -12741,9 +12771,7 @@ in python = python2; }; - tdb = callPackage ../development/libraries/tdb { - python = python2; - }; + tdb = callPackage ../development/libraries/tdb {}; tecla = callPackage ../development/libraries/tecla { }; @@ -12810,6 +12838,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 { }; @@ -12915,6 +12945,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; @@ -13058,9 +13094,8 @@ in # Avoid using this. It isn't really a wrapper anymore, but we keep the name. xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { packages = [ - freetype fontconfig xorg.xproto xorg.libX11 xorg.libXt + freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt xorg.libXft xorg.libXext xorg.libSM xorg.libICE - xorg.xextproto ]; }; @@ -13084,7 +13119,7 @@ in yojimbo = callPackage ../development/libraries/yojimbo { }; - yubioath-desktop = callPackage ../applications/misc/yubioath-desktop { }; + yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; @@ -13311,10 +13346,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; @@ -13463,7 +13494,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 { @@ -13498,16 +13529,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 { }; @@ -13843,7 +13870,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; @@ -13890,7 +13917,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 { @@ -13903,7 +13929,6 @@ in postgresql = postgresql_9_6; inherit (callPackages ../servers/sql/postgresql { }) - postgresql_9_3 postgresql_9_4 postgresql_9_5 postgresql_9_6 @@ -14004,10 +14029,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; @@ -14595,6 +14617,7 @@ in [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long kernelPatches.revert-vfs-dont-open-real + kernelPatches.raspberry_pi_wifi_fix ]; }; @@ -15466,6 +15489,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 { }; @@ -15514,8 +15539,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 {}; @@ -15632,6 +15655,8 @@ in materia-theme = callPackage ../data/themes/materia-theme { }; + material-design-icons = callPackage ../data/fonts/material-design-icons { }; + material-icons = callPackage ../data/fonts/material-icons { }; meslo-lg = callPackage ../data/fonts/meslo-lg {}; @@ -15650,12 +15675,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 { }; @@ -15940,7 +15967,6 @@ in aacgain = callPackage ../applications/audio/aacgain { }; abcde = callPackage ../applications/audio/abcde { - inherit (perlPackages) MusicBrainz MusicBrainzDiscID; inherit (pythonPackages) eyeD3; }; @@ -16004,7 +16030,7 @@ in androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { }); android-studio = androidStudioPackages.stable; - android-studio-preview = androidStudioPackages.beta; + android-studio-preview = androidStudioPackages.preview; animbar = callPackage ../applications/graphics/animbar { }; @@ -16077,6 +16103,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; }; }; @@ -16984,6 +17012,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 { }; @@ -17227,6 +17257,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 { }; @@ -17274,7 +17306,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; }; @@ -17317,33 +17348,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; }) // { @@ -17424,7 +17430,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 { }; @@ -17482,9 +17488,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; @@ -17598,6 +17602,8 @@ in sway = callPackage ../applications/window-managers/sway { }; sway-beta = callPackage ../applications/window-managers/sway/beta.nix { }; + swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; + swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; velox = callPackage ../applications/window-managers/velox { stConf = config.st.conf or null; @@ -17657,10 +17663,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; }; @@ -17834,9 +17836,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 { }; @@ -18003,7 +18005,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 { @@ -18476,9 +18478,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; @@ -18725,7 +18725,6 @@ in pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { - inherit (gnome3) libgee; inherit (gst_all_1) gstreamer gst-plugins-base; }; @@ -19165,9 +19164,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 { }; @@ -19252,7 +19249,6 @@ in ssvnc = callPackage ../applications/networking/remote/ssvnc { }; stupidterm = callPackage ../applications/misc/stupidterm { - vte = gnome3.vte; gtk = gtk3; }; @@ -19311,7 +19307,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; }; @@ -19556,18 +19551,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; }; @@ -19603,7 +19594,6 @@ in tig = gitAndTools.tig; tilda = callPackage ../applications/misc/tilda { - vte = gnome3.vte; gtk = gtk3; }; @@ -19811,7 +19801,6 @@ in virt-what = callPackage ../applications/virtualization/virt-what { }; virtmanager = callPackage ../applications/virtualization/virt-manager { - vte = gnome3.vte; dconf = gnome3.dconf; system-libvirt = libvirt; }; @@ -19988,8 +19977,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 { }; @@ -20257,7 +20245,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 { }; @@ -20313,13 +20301,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 { @@ -20439,7 +20426,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 { }; @@ -20649,6 +20638,8 @@ in frotz = callPackage ../games/frotz { }; + frogatto = callPackage ../games/frogatto { }; + fsg = callPackage ../games/fsg { wxGTK = wxGTK28.override { unicode = false; }; }; @@ -20772,9 +20763,11 @@ in multimc = libsForQt5.callPackage ../games/multimc { }; - minetest = callPackage ../games/minetest { - libpng = libpng12; - }; + inherit (callPackages ../games/minetest { }) + minetestclient_4 minetestserver_4 + minetestclient_5 minetestserver_5; + + minetest = minetestclient_4; mnemosyne = callPackage ../games/mnemosyne { python = python3; @@ -20826,7 +20819,9 @@ in openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; - openra = callPackage ../games/openra { lua = lua5_1; }; + openraPackages = import ../games/openra pkgs; + + openra = openraPackages.engines.release; openrw = callPackage ../games/openrw { }; @@ -21259,6 +21254,7 @@ in clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; + gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { }; mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; @@ -21433,9 +21429,9 @@ in bcftools = callPackage ../applications/science/biology/bcftools { }; - conglomerate = callPackage ../applications/science/biology/conglomerate { - inherit (perlPackages) GetoptTabular MNI-Perllib; - }; + bftools = callPackage ../applications/science/biology/bftools { }; + + conglomerate = callPackage ../applications/science/biology/conglomerate { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; @@ -21453,9 +21449,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; @@ -21467,9 +21461,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; @@ -21483,17 +21475,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 { }; @@ -21998,7 +21984,9 @@ in gap = callPackage ../applications/science/math/gap { }; - gap-minimal = lowPrio (gap.override { keepAllPackages = false; }); + gap-minimal = lowPrio (gap.override { packageSet = "minimal"; }); + + gap-full = lowPrio (gap.override { packageSet = "full"; }); geogebra = callPackage ../applications/science/math/geogebra { }; @@ -22096,10 +22084,12 @@ in ns-3 = callPackage ../development/libraries/science/networking/ns3 { }; root = callPackage ../applications/science/misc/root { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { + inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }); @@ -22242,6 +22232,8 @@ in epson_201207w = callPackage ../misc/drivers/epson_201207w { }; + epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { }; + gutenprint = callPackage ../misc/drivers/gutenprint { }; gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; @@ -22843,12 +22835,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 { }; @@ -22982,6 +22969,8 @@ in webfs = callPackage ../servers/http/webfs { }; + websocketd = callPackage ../applications/networking/websocketd { }; + wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; }; @@ -23170,7 +23159,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 85bdc59e6db..f05cf3d9290 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 b52afe98f7f..1fc36139ac0 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 a83c3baaa4a..d7c196376cb 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -73,27 +73,13 @@ let pdf-tools = melpaBuild rec { pname = "pdf-tools"; - version = "0.80"; + version = "0.90"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; rev = "v${version}"; - sha256 = "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s"; + sha256 = "0iv2g5kd14zk3r5dzdw7b7hk4b5w7qpbilcqkja46jgxbb6xnpl9"; }; - patches = [ - (fetchpatch { - url = https://github.com/politza/pdf-tools/commit/6505a0e817495b85897c9380161034ae611ddd90.patch; - sha256 = "122ycbja8ckaysp58xqfcv11sgpbcp78pll5mywf9hgr0qap9jsy"; - }) - (fetchpatch { - url = https://github.com/politza/pdf-tools/commit/ded6341b0e3ad97e8b14f68c1796ba66dc155fd1.patch; - sha256 = "0hd2v4c6xq2jzg2m6s5kzs0fldgygf1pnfqd11v6x4w05zvxn6a2"; - }) - (fetchpatch { - url = https://github.com/politza/pdf-tools/commit/50a5297b82e26cfd52f6c00645ddc1057099d6a7.patch; - sha256 = "107rqzldg06h8k3pmdinkl78dr4xycm570sp2an4ihjmpmph0z39"; - }) - ]; nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; @@ -361,28 +347,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 749a7e15611..ec2ced52eb4 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/metrics.nix b/pkgs/top-level/metrics.nix index a199f61020c..c4253973cbb 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -3,7 +3,7 @@ with pkgs; runCommand "nixpkgs-metrics" - { buildInputs = [ nix time ]; + { nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ]; requiredSystemFeatures = [ "benchmark" ]; } '' @@ -19,23 +19,26 @@ runCommand "nixpkgs-metrics" shift echo "running $@" - NIX_SHOW_STATS=1 time "$@" 2>&1 > /dev/null | tee stats + NIX_SHOW_STATS=1 time -o stats-time "$@" 2>stats-nix + sed '/^warning:/d' -i stats-nix - cat stats + cat stats-nix; echo; cat stats-time; echo - x=$(sed -e 's/.*time elapsed: \([0-9\.]\+\).*/\1/ ; t ; d' stats) + x=$(jq '.cpuTime' < stats-nix) [[ -n $x ]] || exit 1 echo "$name.time $x s" >> $out/nix-support/hydra-metrics - x=$(sed -e 's/.* \([0-9]\+\)maxresident.*/\1/ ; t ; d' stats) + x=$(sed -e 's/.* \([0-9]\+\)maxresident.*/\1/ ; t ; d' < stats-time) [[ -n $x ]] || exit 1 echo "$name.maxresident $x KiB" >> $out/nix-support/hydra-metrics - x=$(sed -e 's/.*total allocations: \([0-9]\+\) bytes.*/\1/ ; t ; d' stats) + # nix-2.2 also outputs .symbols.bytes but that wasn't summed originally + # https://github.com/NixOS/nix/pull/2392/files#diff-8e6ba8c21672fc1a5f6f606e1e101c74L1762 + x=$(jq '[.envs,.list,.values,.sets] | map(.bytes) | add' < stats-nix) [[ -n $x ]] || exit 1 echo "$name.allocations $x B" >> $out/nix-support/hydra-metrics - x=$(sed -e 's/.*values allocated count: \([0-9]\+\).*/\1/ ; t ; d' stats) + x=$(jq '.values.number' < stats-nix) [[ -n $x ]] || exit 1 echo "$name.values $x" >> $out/nix-support/hydra-metrics } @@ -52,7 +55,9 @@ runCommand "nixpkgs-metrics" num=$(nix-env -f ${nixpkgs} -qa | wc -l) echo "nix-env.qaCount $num" >> $out/nix-support/hydra-metrics - export GC_INITIAL_HEAP_SIZE=128k + # TODO: this has been ignored for some time + # GC Warning: Bad initial heap size 128k - ignoring it. + #export GC_INITIAL_HEAP_SIZE=128k run nix-env.qaAggressive nix-env -f ${nixpkgs} -qa run nix-env.qaDrvAggressive nix-env -f ${nixpkgs} -qa --drv-path --meta --xml diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c670db81772..8df57e8d710 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 @@ -592,6 +589,8 @@ let re2_p4 = callPackage ../development/ocaml-modules/re2 { }; + resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; + result = callPackage ../development/ocaml-modules/ocaml-result { }; seq = callPackage ../development/ocaml-modules/seq { }; @@ -1062,29 +1061,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 b6a4934c819..fd0cc917954 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"; @@ -96,13 +114,13 @@ let }; AlienBuild = buildPerlPackage { - name = "Alien-Build-1.48"; + name = "Alien-Build-1.49"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.48.tar.gz; - sha256 = "1sv4544g2qhwigpj1x2qycafab04p2b0vdr2x07wzriq5fqgsspp"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.49.tar.gz; + sha256 = "1wsg794pbqgywyfqdrwrsjcj5qgas3h72j4w2iph9ir6b93rb11p"; }; - propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny Test2Suite ]; - buildInputs = [ DevelHide PkgConfig ]; + propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny ]; + buildInputs = [ DevelHide PkgConfig Test2Suite ]; meta = { description = "Build external dependencies for use in CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -116,7 +134,7 @@ let sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a"; }; propagatedBuildInputs = [ AlienBuild ]; - buildInputs = [ pkgs.gmp DevelChecklib ]; + buildInputs = [ pkgs.gmp DevelChecklib Test2Suite ]; meta = { description = "Alien package for the GNU Multiple Precision library."; license = with stdenv.lib.licenses; [ lgpl3Plus ]; @@ -368,12 +386,12 @@ let }; Appperlbrew = buildPerlModule rec { - name = "App-perlbrew-0.84"; + name = "App-perlbrew-0.85"; src = fetchurl { url = "mirror://cpan/authors/id/G/GU/GUGOD/${name}.tar.gz"; - sha256 = "0j21pcd82q9raz2hnh1qmsk7hsfzz9pzadvql6skdmhwshs9a5la"; + sha256 = "0i3d2csihn5x27lfykwgjpq60ij21s19fzbjsacqq93x46qyim9y"; }; - buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass PodMarkdown TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; + buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl locallib ]; preConfigure = '' @@ -453,10 +471,10 @@ let }; ArrayCompare = buildPerlModule rec { - name = "Array-Compare-3.0.1"; + name = "Array-Compare-3.0.2"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.1.tar.gz; - sha256 = "0fyj6jdfshga4kj4567529a1aiqy49awxg62lslx54166j4mhkzb"; + url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.2.tar.gz; + sha256 = "0ci8pb6nh73rmmwd8fvg6n2064v8nbraqyg1axsncfi28nfz522s"; }; buildInputs = [ TestNoWarnings ]; @@ -477,10 +495,10 @@ let }; ArrayFIFO = buildPerlPackage rec { - name = "Array-FIFO-0.10"; + name = "Array-FIFO-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/D/DB/DBURKE/${name}.tar.gz"; - sha256 = "8082b7ca456d02c7c862ba409cbd62a9cafdb8c5832f5d7fb1d37ba8698ee5b1"; + sha256 = "806a931d5a953255a0416978c39987a75e5cbe592a88d44a7b909f4f86888d5d"; }; buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; @@ -626,10 +644,10 @@ let }; AuthenRadius = buildPerlPackage rec { - name = "Authen-Radius-0.27"; + name = "Authen-Radius-0.29"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.27.tar.gz; - sha256 = "e5a3052fe46dc38424c1947da92e623e8996216f97bd7be72221eb6c5f7c09f8"; + url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.29.tar.gz; + sha256 = "7fb3425546b2f518e4a07edb3bcb55672454fe8e13bece58de2dc43885afb079"; }; buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ DataHexDump NetIP ]; @@ -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 { @@ -1137,16 +1143,15 @@ let }; CarpClan = buildPerlPackage { - name = "Carp-Clan-6.06"; + name = "Carp-Clan-6.07"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/Carp-Clan-6.06.tar.gz; - sha256 = "1m6902n6s627nsvyn2vyrk29q7lh6808hsdk7ka5cirm27vchjpa"; + url = mirror://cpan/authors/id/E/ET/ETHER/Carp-Clan-6.07.tar.gz; + sha256 = "0gaa4ygd9q8lp2fn5d9s7miiwxz92a2lqs7j6smwmifq6w3mc20a"; }; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ TestException ]; }; CatalystActionRenderView = buildPerlPackage rec { @@ -1317,13 +1322,13 @@ let }; CatalystRuntime = buildPerlPackage rec { - name = "Catalyst-Runtime-5.90120"; + name = "Catalyst-Runtime-5.90123"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Runtime-5.90120.tar.gz; - sha256 = "e3f791b75dfec668cb52fbe1c1596c051cc44de6c16eb333c79982d5e4822584"; + url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Runtime-5.90123.tar.gz; + sha256 = "f4484409ee2f7e9dddf148e7509e7a3eaf4df0c22b97a94dddc2171909485f3b"; }; buildInputs = [ TestFatal TypeTiny ]; - propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; + propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; @@ -1477,10 +1482,10 @@ let }; CatalystPluginSession = buildPerlPackage rec { - name = "Catalyst-Plugin-Session-0.40"; + name = "Catalyst-Plugin-Session-0.41"; src = fetchurl { url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/${name}.tar.gz"; - sha256 = "171vi9xcl775scjaw4fcfdmqvz0rb1nr0xxg2gb3ng6bjzpslhgv"; + sha256 = "0a451997zc2vjx7rvndgx1ldbrpic8sfbddyvncynh0zr8bhlqc5"; }; buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; propagatedBuildInputs = [ CatalystRuntime ObjectSignature ]; @@ -2280,10 +2285,10 @@ let Clone = buildPerlPackage rec { - name = "Clone-0.39"; + name = "Clone-0.41"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GARU/${name}.tar.gz"; - sha256 = "0bgsidb96gxzf3zhy6v1ksj1c200vxbwykk32fqm1mj97rl4dc5c"; + sha256 = "060mlm31lacirpnp5fl9jqk4m9cl07vjlh89k83qk25wykf5dh78"; }; meta = { description = "Recursively copy Perl datatypes"; @@ -2316,10 +2321,10 @@ let }; CodeTidyAll = buildPerlPackage rec { - name = "Code-TidyAll-0.71"; + name = "Code-TidyAll-0.72"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.71.tar.gz; - sha256 = "043s0fkg8y9g38m9p87jh9p1kkznz7yq96x2rnjj221hpl3zysdr"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.72.tar.gz; + sha256 = "0py9z3f7ld93a7qibrc917qkwjh7pcl0r9khzg7dlr4rra0xq9fn"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; @@ -2700,10 +2705,10 @@ let }; Coro = buildPerlPackage rec { - name = "Coro-6.52"; + name = "Coro-6.54"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.52.tar.gz; - sha256 = "1q744smw6m676v8n0ww8jvmh1zg1iw7f7clzblwbfgmhy03h5ja9"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.54.tar.gz; + sha256 = "0a00b351m7fxm39vfk726wpva2xx8qxlx5nv4yjgkbqap502ld2m"; }; propagatedBuildInputs = [ AnyEvent Guard commonsense ]; buildInputs = [ CanaryStability ]; @@ -2726,24 +2731,23 @@ let }; CPAN = buildPerlPackage rec { - name = "CPAN-2.16"; + name = "CPAN-2.22"; src = fetchurl { url = "mirror://cpan/authors/id/A/AN/ANDK/${name}.tar.gz"; - sha256 = "7dbd61c172b99b05c16a2fce790140489494c744190f6c4f80c162d5ae3ccc2c"; + sha256 = "c6f2a44cd95ef5989ef0abc83dca38ae645bd5ea09de67461251f2d782989990"; }; - propagatedBuildInputs = [ Expect FileWhich LWP ModuleBuild ModuleSignature TermReadKey TextGlob YAML ]; + propagatedBuildInputs = [ ArchiveZip CPANChecksums Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { description = "Query, download and build perl modules from CPAN sites"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ ArchiveZip ]; }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-4.06"; + name = "Cpanel-JSON-XS-4.08"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "63481d9d2d6251cf520bb6a62147faf6e8f35b9fe6b3ddd81c5bfd71e31ec9ba"; + sha256 = "2bc1475b698b5a419bb55127b07732794b495e2a6e0f4ed39bdcbd39a64e7c2d"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -2763,6 +2767,18 @@ let }; }; + CPANChecksums = buildPerlPackage { + name = "CPAN-Checksums-2.12"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz; + sha256 = "0f1dbpp4638jfdfwrywjmz88na5wzw4fdsmm2r7gh1x0s6r0yq4r"; + }; + propagatedBuildInputs = [ CompressBzip2 DataCompare ModuleSignature ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CPANDistnameInfo = buildPerlPackage rec { name = "CPAN-DistnameInfo-0.12"; src = fetchurl { @@ -2789,10 +2805,10 @@ let }; CPANPerlReleases = buildPerlPackage rec { - name = "CPAN-Perl-Releases-3.76"; + name = "CPAN-Perl-Releases-3.86"; src = fetchurl { url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; - sha256 = "0p9anb92sfi6cfr3ia8yvd3scn0bzwh2r6z8f6jrawjr8lilgahj"; + sha256 = "0g90xm43pydfjq794ay4dvgvhjdr4xrjgmravj8wb2kqc65pm2za"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -2924,10 +2940,10 @@ let }; CryptPKCS10 = buildPerlModule { - name = "Crypt-PKCS10-1.9"; + name = "Crypt-PKCS10-2.001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-1.9.tar.gz; - sha256 = "ee0ce58cc17e9a8d7a6f33f3f26aca5be7edfc054204f7946370b3a8d291f0fd"; + url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.001.tar.gz; + sha256 = "f7945b76a2d8f4d8ecf627b2eb8ea4f41d001e6a915efe82e71d6b97fea3ffa9"; }; buildInputs = [ pkgs.unzip ModuleBuildTiny ]; propagatedBuildInputs = [ ConvertASN1 ]; @@ -3154,10 +3170,10 @@ let }; CryptX = buildPerlPackage rec { - name = "CryptX-0.061"; + name = "CryptX-0.063"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "26729d8d4f711fd83f9b728ad8227e8986343e23fa37cbe58564645ce5d3f8c2"; + sha256 = "6cfc672e0e56d56cf849caf0b929ed94f87cb4e6be5c20757ca3d3dbe5569595"; }; meta = { description = "Crypto toolkit"; @@ -3215,10 +3231,10 @@ let }; DataDumper = buildPerlPackage rec { - name = "Data-Dumper-2.172"; + name = "Data-Dumper-2.173"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.172.tar.gz; - sha256 = "a95a3037163817221021ac145500968be44dc155c261f4097136392c0a9fecd9"; + url = mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.173.tar.gz; + sha256 = "697608b39330988e519131be667ff47168aaaaf99f06bd2095d5b46ad05d76fa"; }; outputs = [ "out" ]; meta = { @@ -3580,10 +3596,10 @@ let }; DateManip = buildPerlPackage rec { - name = "Date-Manip-6.73"; + name = "Date-Manip-6.75"; src = fetchurl { url = "mirror://cpan/authors/id/S/SB/SBECK/${name}.tar.gz"; - sha256 = "0md25ik7pwbwgidiprcq20db8jdniknxs0qj1m3l76ziqg3rb4nk"; + sha256 = "0zdnrdm7bj4qwnmd2r3gj80dm1brr63px04iy5blxa5i5azczyy1"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -3622,16 +3638,16 @@ let }; DateTimeCalendarJulian = buildPerlPackage rec { - name = "DateTime-Calendar-Julian-0.04"; + name = "DateTime-Calendar-Julian-0.100"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PI/PIJLL/${name}.tar.gz"; - sha256 = "03h0llkwsiw2d2ci1ah5x9sp8xrvnbgd471i5hnpgl5w32nnhndv"; + url = mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.100.tar.gz; + sha256 = "0gbw7rh706qk5jlmmz3yzsm0ilzp39kyar28g4j6d57my8cwaipx"; }; meta = { description = "Dates in the Julian calendar"; license = stdenv.lib.licenses.artistic2; }; - buildInputs = [ DateTime ]; + propagatedBuildInputs = [ DateTime ]; }; DateTimeEventICal = buildPerlPackage rec { @@ -3751,10 +3767,10 @@ let }; DateTimeFormatNatural = buildPerlModule { - name = "DateTime-Format-Natural-1.05"; + name = "DateTime-Format-Natural-1.06"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.05.tar.gz; - sha256 = "10ldrhz5rnpsd8qmqn1a4s0w5hhfbjrr13a93yx7kpp89g85pxqv"; + url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.06.tar.gz; + sha256 = "1n68b5hnw4n55q554v7y4ffwiypz6rk40mh0r550fxwv69bvyky0"; }; buildInputs = [ ModuleUtil TestMockTime ]; propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; @@ -3861,10 +3877,10 @@ let }; DateTimeTimeZone = buildPerlPackage rec { - name = "DateTime-TimeZone-2.20"; + name = "DateTime-TimeZone-2.21"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "6b69cb9406f7fd2f9ef452996de62686f0b8563469a7e7438fd2bf37735a2829"; + sha256 = "54d685f79df1033c259502cd9c22b1a9d37b627bf815faecebaa27f8e1079e1e"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; @@ -4020,14 +4036,14 @@ let DBI = buildPerlPackage rec { name = "DBI-${version}"; - version = "1.641"; + version = "1.642"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "5509e532cdd0e3d91eda550578deaac29e2f008a12b64576e8c261bb92e8c2c1"; + sha256 = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d"; }; 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 +4051,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); @@ -4838,10 +4854,10 @@ let }; EmailAddress = buildPerlPackage { - name = "Email-Address-1.909"; + name = "Email-Address-1.911"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.909.tar.gz; - sha256 = "0l7x6sl06j9ffgfz5f9vgms2b5axd4cgp5fj03ivb3kia4km6b3g"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.911.tar.gz; + sha256 = "10qfc2va6dhshjgw6xvxk88cd88s44kbxp47xmixx297wv3l69zl"; }; meta = { description = "RFC 2822 Address Parsing"; @@ -5181,18 +5197,18 @@ let }; Error = buildPerlModule rec { - name = "Error-0.17026"; + name = "Error-0.17027"; src = fetchurl { url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz"; - sha256 = "1nam651w5ffsh64nnqjpzirm5g3ck92idzz1f0sf0fnp5jb0ln9p"; + sha256 = "1gnkxf12dq2w1jmjpllp5f30ya4nll01jv2sfi24386zfn1arch7"; }; }; EV = buildPerlPackage rec { - name = "EV-4.22"; + name = "EV-4.25"; src = fetchurl { url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; - sha256 = "2ae7f8734e2e4945510252152c3bea4be35f4aa58aad3db0504c38844b08a991"; + sha256 = "2e65c8e8f2358599f9a48f766cc1b3ad0eaf2e6cef416adc8ad9cddc3f329c6a"; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; @@ -5318,14 +5334,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 +5474,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 { @@ -5582,10 +5582,10 @@ let }; FFICheckLib = buildPerlPackage { - name = "FFI-CheckLib-0.20"; + name = "FFI-CheckLib-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.20.tar.gz; - sha256 = "1pggqj5cs77myp4g62jzkld95a286vwkygi7i0hbqjgwf3w3f5gl"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.23.tar.gz; + sha256 = "0rjivas0rsp7d5599cjcxss80zfj7a5b8did771dlw7h2p5apisf"; }; buildInputs = [ Test2Suite ]; meta = { @@ -5913,10 +5913,10 @@ let }; FileNFSLock = buildPerlPackage { - name = "File-NFSLock-1.27"; + name = "File-NFSLock-1.29"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.27.tar.gz; - sha256 = "0hhh3cmbby98b1xh64dvj31wqcr9hsk1zqrq3ci8fjd4xb7xch8g"; + url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.29.tar.gz; + sha256 = "0dzssj15faz9cn1w3xi7jwm64gyjyazapv4bkgglw5l1njcibm31"; }; meta = { maintainers = with maintainers; [ ]; @@ -6042,10 +6042,10 @@ let }; FilesysDiskUsage = buildPerlPackage rec { - name = "Filesys-DiskUsage-0.11"; + name = "Filesys-DiskUsage-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; - sha256 = "e69237c035e18a6ed69e36e058d7b3491d54a803a308f756e62a8e7f48b2a281"; + sha256 = "e8afee07014df5868f9a2784e041c82c3c8c38550f4cd48bec56d0d6c4997273"; }; buildInputs = [ TestWarn ]; meta = { @@ -6055,12 +6055,12 @@ let }; FileSlurp = buildPerlPackage { - name = "File-Slurp-9999.22"; + name = "File-Slurp-9999.25"; # WARNING: check on next update if deprecation warning is gone patches = [ ../development/perl-modules/File-Slurp/silence-deprecation.patch ]; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.22.tar.gz; - sha256 = "0sgi53jin36sqvvj8fsqxddb8vprrv99inbs2bmgjdpqhs0a0vmf"; + url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.25.tar.gz; + sha256 = "1hg3bhf5m78d77p4174cnldd75ppyrvr5rkc8w289ihvwsx9gsn7"; }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; @@ -6198,18 +6198,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 { @@ -6326,11 +6314,11 @@ let }; }; - GDSecurityImage = buildPerlModule { - name = "GD-SecurityImage-1.73"; + GDSecurityImage = buildPerlPackage { + name = "GD-SecurityImage-1.75"; src = fetchurl { - url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.73.tar.gz; - sha256 = "1kaxs67rfd4w46lxgcg3pa05a596l0h1k8n4zk2gwrrar4022wpx"; + url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.75.tar.gz; + sha256 = "19lf1kzdavrkkx3f900jnpynr55d5kjd2sdmwpfir5dsmkcj9pix"; }; propagatedBuildInputs = [ GD ]; meta = { @@ -6751,6 +6739,7 @@ let license = with stdenv.lib.licenses; [ artistic1 ]; description = "Return difference between two hashes as a hash"; }; + buildInputs = [ TestSimple13 ]; }; HashFlatten = buildPerlPackage rec { @@ -6952,10 +6941,10 @@ let }; HTMLFormFu = buildPerlPackage rec { - name = "HTML-FormFu-2.06"; + name = "HTML-FormFu-2.07"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.06.tar.gz; - sha256 = "1g9zi7cg53527hlqb9h73i75vfzm52dwjrm8784vykn4kw4kklsv"; + url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.07.tar.gz; + sha256 = "0cpbcrip95rvihc7i8dywca6lx9ws67ch1hjx6vgnm47g9zh2bsg"; }; buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle TestRequiresInternet ]; propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HTTPMessage HashFlatten JSONMaybeXS MooseXAliases MooseXAttributeChained NumberFormat PathClass Readonly RegexpCommon YAMLLibYAML ]; @@ -7077,10 +7066,10 @@ let }; HTMLSelectorXPath = buildPerlPackage { - name = "HTML-Selector-XPath-0.23"; + name = "HTML-Selector-XPath-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.23.tar.gz; - sha256 = "0vvvdrccypwv3qpf9hq5h2b6k0p5qrmz60p2swjh009dvr601h7j"; + url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.25.tar.gz; + sha256 = "1qbad8ayffpx7wj76ip05p6rh9p1lkir6qknpl76zy679ghlsp8s"; }; buildInputs = [ TestBase ]; meta = { @@ -7269,10 +7258,10 @@ let }; HTTPDAV = buildPerlPackage rec { - name = "HTTP-DAV-0.48"; + name = "HTTP-DAV-0.49"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.48.tar.gz; - sha256 = "1fnw3wd9zrkxq54jqgi4iw48ndysgy73glva4129s8243pn05a86"; + url = mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.49.tar.gz; + sha256 = "0z4mgb8mc6l5nfsm3ihndjqgpk43q39x1kq9hryy6v8hxkwrscrk"; }; meta = { description = "WebDAV client library."; @@ -7463,12 +7452,12 @@ let }; Imager = buildPerlPackage rec { - name = "Imager-1.006"; + name = "Imager-1.007"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TONYC/${name}.tar.gz"; - sha256 = "c1e434a4de6250e3b229aa74aa653e56c38f981864f71a975366c50559c9d52b"; + sha256 = "adc12651e53e9226eb05482bf5f6faf77703af036fb922bc8c3f077f25b98d63"; }; - buildInputs = [ ExtUtilsPkgConfig pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; + buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; meta = { homepage = http://imager.perl.org/; @@ -7716,18 +7705,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 { @@ -8003,7 +7980,6 @@ let maintainers = [ ]; }; - buildInputs = [ ExtUtilsMakeMaker ]; }; IPCSignal = buildPerlPackage rec { @@ -8040,10 +8016,10 @@ let }; JSON = buildPerlPackage { - name = "JSON-2.97001"; + name = "JSON-4.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-2.97001.tar.gz; - sha256 = "0nlgdzy40q26z8qhwngsd461glyai8dpwaccyhiljmrkaqwdjxz2"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.00.tar.gz; + sha256 = "0s0h3a1y74851fgvrhq3qv8kw1z1ccwzz1ghn6vh91l7fl81znn4"; }; # Do not abort cross-compilation on failure to load native JSON module into host perl preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' @@ -8082,10 +8058,10 @@ let }; JSONPP = buildPerlPackage rec { - name = "JSON-PP-2.97001"; + name = "JSON-PP-4.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-2.97001.tar.gz; - sha256 = "1d1731yqv2py039qxcr0j9r4jb8m9kq387pj1q6gxawbfwvlmxb7"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.00.tar.gz; + sha256 = "0g0g6qxcic5p34n51dlpq2s9f23qzlxxqsgprv7x962k894qxx5y"; }; meta = { description = "JSON::XS compatible pure-Perl module"; @@ -8121,10 +8097,10 @@ let }; JSONXS = buildPerlPackage { - name = "JSON-XS-3.04"; + name = "JSON-XS-4.0"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-3.04.tar.gz; - sha256 = "0b3w14zqjxnm93jjfzjqz8pkxp3a2l9242y7zxxhnvzav1mq7n35"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.0.tar.gz; + sha256 = "0118yrzagwlcfj5yldn3h23zzqs2rx282jlm068nf7fjlvy4m7s7"; }; propagatedBuildInputs = [ TypesSerialiser ]; meta = { @@ -8185,10 +8161,10 @@ let }; libintl_perl = buildPerlPackage rec { - name = "libintl-perl-1.29"; + name = "libintl-perl-1.31"; src = fetchurl { - url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.29.tar.gz; - sha256 = "1cgvrgh4axd8jlr6497ndgphgvgnqc1axd306460hskdvc85z4vq"; + url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz; + sha256 = "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a"; }; meta = { maintainers = with maintainers; [ ]; @@ -8442,19 +8418,19 @@ let }; LinuxInotify2 = buildPerlPackage rec { - name = "Linux-Inotify2-1.22"; + name = "Linux-Inotify2-2.1"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-1.22.tar.gz; - sha256 = "1l916p8xak6c51x4x1vrzd8wpi55bld74wf0p5w5m4vr80zjb7dw"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.1.tar.gz; + sha256 = "0w7jyq5pjy28s0ck34gy1vfbr069lhcn579bz0fh29h071sbcrbj"; }; propagatedBuildInputs = [ commonsense ]; }; ListAllUtils = buildPerlPackage { - name = "List-AllUtils-0.14"; + name = "List-AllUtils-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.14.tar.gz; - sha256 = "e45aa65927ae1975a000cc2fed14274627fa5e2bd09bab826a5f2c41d17ef6cd"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz; + sha256 = "3711fac729321d3aad8356a756fd9272094f227aa048866a3751f9d8ea6cc95d"; }; propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { @@ -8543,10 +8519,10 @@ let }; LocaleCodes = buildPerlPackage { - name = "Locale-Codes-3.58"; + name = "Locale-Codes-3.59"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.58.tar.gz; - sha256 = "345c0b0170288d74a147fbe218b7c78147aa2baf4e839fe8680a2b0a2d8e505b"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.59.tar.gz; + sha256 = "388dea3d088aa0513f21091e0fe4a9c61ab2c173c83052b3120a52b103592c03"; }; meta = { description = "A distribution of modules to handle locale codes"; @@ -8565,10 +8541,10 @@ let }; LocaleMOFile = buildPerlPackage rec { - name = "Locale-MO-File-0.08"; + name = "Locale-MO-File-0.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.08.tar.gz; - sha256 = "1flpk7jdn5cp7pld3f0vi3v5527p76jp1fqp4pzrhhqjlhyp3im4"; + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.09.tar.gz; + sha256 = "0gsaaqimsh5bdhns2v67j1nvb178hx2536lxmr971cwxy31ns0wp"; }; propagatedBuildInputs = [ ConstFast MooXStrictConstructor MooXTypesMooseLike ParamsValidate namespaceautoclean ]; buildInputs = [ TestDifferences TestException TestHexDifferences TestNoWarnings ]; @@ -8630,10 +8606,10 @@ let }; LocaleTextDomainOO = buildPerlPackage rec { - name = "Locale-TextDomain-OO-1.033"; + name = "Locale-TextDomain-OO-1.035"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.033.tar.gz; - sha256 = "1nkjncwa5kg7avrly0ldfxijgkrjgwj3rggb2r6mi72h427xwjic"; + url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.035.tar.gz; + sha256 = "1nvg0lggrd15j394fkxwsgi6w228pld5zpgb3zfd7im4r4mm50qy"; }; propagatedBuildInputs = [ ClassLoad Clone JSON LocaleMOFile LocalePO LocaleTextDomainOOUtil LocaleUtilsPlaceholderBabelFish LocaleUtilsPlaceholderMaketext LocaleUtilsPlaceholderNamed MooXSingleton PathTiny TieSub ]; buildInputs = [ TestDifferences TestException TestNoWarnings ]; @@ -9089,10 +9065,10 @@ let }; MailIMAPClient = buildPerlPackage { - name = "Mail-IMAPClient-3.39"; + name = "Mail-IMAPClient-3.40"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.39.tar.gz; - sha256 = "18sf8fd093qxvflscysm6pv6mj9cmm19zrnfic297jjvgnsgshdm"; + url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.40.tar.gz; + sha256 = "1n8fq6j8nxs85v5qwmrr3ain900rvj9i8n7in4r5bw7kiihdv3xz"; }; propagatedBuildInputs = [ ParseRecDescent ]; }; @@ -9162,7 +9138,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 = { @@ -9219,10 +9195,10 @@ let }; MathBigInt = buildPerlPackage rec { - name = "Math-BigInt-1.999814"; + name = "Math-BigInt-1.999816"; src = fetchurl { url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/${name}.tar.gz"; - sha256 = "19fbabee89e4d3a5c4775cc07006b7488ebb4f70ea79d915f1a5f0130e0d3e22"; + sha256 = "95a5a1f636a23f66d400d40bffb0d24ad50df00e6e3c7359c9e645c375f40a89"; }; meta = { description = "Arbitrary size integer/float math package"; @@ -9335,10 +9311,10 @@ let }; MathRandomMTAuto = buildPerlPackage { - name = "Math-Random-MT-Auto-6.22"; + name = "Math-Random-MT-Auto-6.23"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.22.tar.gz; - sha256 = "07zha5zjxyvqwnycb1vzk4hk2m46n9yc5lrbvhkc22595dsyjahz"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.23.tar.gz; + sha256 = "04v3fxbqg6bs7dpljw64v62jqb10l2xdrln4l3slz5k266nvbg2q"; }; propagatedBuildInputs = [ ObjectInsideOut ]; meta = { @@ -9403,10 +9379,10 @@ let }; MetaBuilder = buildPerlModule { - name = "Meta-Builder-0.003"; + name = "Meta-Builder-0.004"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.003.tar.gz; - sha256 = "e7ac289b88d1662e87708d716877ac66a1a8414660996fe58c1db96d834a5375"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.004.tar.gz; + sha256 = "acb499aa7206eb9db21eb85357a74521bfe3bdae4a6416d50a7c75b939cf56fe"; }; buildInputs = [ FennecLite TestException ]; meta = { @@ -9566,12 +9542,12 @@ let }; }; - ModernPerl = buildPerlModule { - name = "Modern-Perl-1.20180928"; + ModernPerl = buildPerlPackage { + name = "Modern-Perl-1.20181021"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20180928.tar.gz; - sha256 = "377b4f16b27ca3b38fdb148468111e3463eff148beb7a00826353268f240f577"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20181021.tar.gz; + sha256 = "1d482b528f7c6c60f868d7d0bf0fcc9c3668250dc44fcb39a95b7c63e092c9c5"; }; meta = { homepage = https://github.com/chromatic/Modern-Perl; @@ -9702,10 +9678,10 @@ let }; ModuleCoreList = buildPerlPackage { - name = "Module-CoreList-5.20180920"; + name = "Module-CoreList-5.20181218"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180920.tar.gz; - sha256 = "00gkfkajvamb207xslqakwpzyjdhbyf14l0bs9ywcw8q44n7ghaf"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20181218.tar.gz; + sha256 = "1rq8i4wsd9k38djv18j6rpyiya7d6z67ac8gwvsp2yqs1hqqvpfi"; }; meta = { homepage = http://dev.perl.org/; @@ -9905,11 +9881,11 @@ let }; }; - ModuleScanDeps = let version = "1.25"; in buildPerlPackage { + ModuleScanDeps = let version = "1.26"; in buildPerlPackage { name = "Module-ScanDeps-${version}"; src = fetchurl { url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-${version}.tar.gz"; - sha256 = "13280nq0d6zc58mcz3kvs2m85a741czq0fabk69ks1nr4j1w2nl4"; + sha256 = "1awin0lfliskrw86mhks6qszxrwbwhr66fc79cv00598mrjzn223"; }; buildInputs = [ TestRequires ]; meta = { @@ -9985,10 +9961,10 @@ let }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-8.03"; + name = "Mojolicious-8.10"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "0jx1zra1c8qlljbihqv9snlr0jz77w7my1hg9qk13kns8by21cpy"; + sha256 = "0rfzfc2iy42qnxlzv6rndc3vwfm2nlqdipqfmbpjr42wrf4x3g4v"; }; meta = { homepage = https://mojolicious.org; @@ -11184,10 +11160,10 @@ let }; NetDNS = buildPerlPackage rec { - name = "Net-DNS-1.18"; + name = "Net-DNS-1.19"; src = fetchurl { url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; - sha256 = "52ce1494fc9707fd5a60ed71db5cde727157b7f2363787d730d4d1bd9800a9d3"; + sha256 = "206278bdd9a538bec3e45b50e80cc5a9d7dc6e70ebf0889ef78254f0f710ccd7"; }; propagatedBuildInputs = [ DigestHMAC ]; makeMakerFlags = "--noonline-tests"; @@ -11350,6 +11326,7 @@ let description = "Simple wrappers around ssh and scp commands."; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ NetSSH StringShellQuote ]; }; NetServer = buildPerlPackage { @@ -11600,10 +11577,10 @@ let }; ObjectInsideOut = buildPerlModule { - name = "Object-InsideOut-4.04"; + name = "Object-InsideOut-4.05"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.04.tar.gz; - sha256 = "01pncagr3k7yj0rn22xap08s17nw2p2ffcg6j00gs9fg4jv9pfmj"; + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.05.tar.gz; + sha256 = "1i6aif37ji91nsyncp5d0d3q29clf009sxdn1rz38917hai6rzcx"; }; propagatedBuildInputs = [ ExceptionClass ]; meta = { @@ -12087,10 +12064,10 @@ let }; Pegex = buildPerlPackage rec { - name = "Pegex-0.67"; + name = "Pegex-0.70"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "3cb9df73aece2a5fa769a89bd74daaac302cc077e2489b3b552f3aa172092091"; + sha256 = "fd3521321026048f493a88d43ce4b8e054f5d7acfec6a1db32fcaabe4dfda0fd"; }; buildInputs = [ FileShareDirInstall YAMLLibYAML ]; meta = { @@ -12109,7 +12086,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; @@ -12578,10 +12555,10 @@ let }; PPIxRegexp = buildPerlModule rec { - name = "PPIx-Regexp-0.062"; + name = "PPIx-Regexp-0.063"; src = fetchurl { url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; - sha256 = "1218fe4c94b3cb9d894c6cd8a69bb4172eac54ce083b70f7a8bf13868a5a0733"; + sha256 = "23950e68df05bce869766e81dd6b01471e27fb70980737ea1c2286a7ecf948bc"; }; propagatedBuildInputs = [ PPI ]; meta = { @@ -12919,10 +12896,10 @@ let }; prefork = buildPerlPackage { - name = "prefork-1.04"; + name = "prefork-1.05"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/prefork-1.04.tar.gz; - sha256 = "1xzxx9wgrrfl1ys05yglp2q3bwscvdzlnsiybqk8drbvwlzj5kz3"; + url = mirror://cpan/authors/id/E/ET/ETHER/prefork-1.05.tar.gz; + sha256 = "01ckn45ij3nbrsc0yc4wl4z0wndn36jh6247zbycwa1vlvgvr1vd"; }; meta = { description = "Optimized module loading for forking or non-forking processes"; @@ -13320,11 +13297,11 @@ let doCheck = false; /* creates files in HOME */ }; - RTClientREST = buildPerlPackage { - name = "RT-Client-REST-0.52"; + RTClientREST = buildPerlModule { + name = "RT-Client-REST-0.56"; src = fetchurl { - url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.52.tar.gz; - sha256 = "d058b8aa0db21aa1734ac50ae557297f603c2be60fa95a1d85278dbd11e19500"; + url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz; + sha256 = "798baccf11eaecbb7d2d27be0b5e4fa9cb80b34cc51cab12eb7b88facf39fd4b"; }; buildInputs = [ CGI HTTPServerSimple TestException ]; meta = { @@ -13399,18 +13376,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 { @@ -13581,22 +13546,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 { @@ -13613,10 +13562,10 @@ let }; SoftwareLicense = buildPerlPackage rec { - name = "Software-License-0.103013"; + name = "Software-License-0.103014"; src = fetchurl { url = "mirror://cpan/authors/id/L/LE/LEONT/${name}.tar.gz"; - sha256 = "2641d937390f43b08fa31c419713cd96a2f0bf160be04cab322631daf6810ff3"; + sha256 = "eb45ea602d75006683789fbba57a01c0a1f7037371de95ea54b91577535d1789"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ DataSection TextTemplate ]; @@ -13663,10 +13612,10 @@ let }; Specio = buildPerlPackage rec { - name = "Specio-0.42"; + name = "Specio-0.43"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz; - sha256 = "1xjfa9g4vc6x3f0bzzbac8dwgpc4in4za1l1sp0y6ykdla9qna93"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.43.tar.gz; + sha256 = "07gsm4fssn9v27bnlgcxa7igb7ggrxwgpdqbbryi4134gfzxxl1w"; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; buildInputs = [ TestFatal TestNeeds ]; @@ -13864,10 +13813,10 @@ let }; StatisticsDescriptive = buildPerlModule { - name = "Statistics-Descriptive-3.0701"; + name = "Statistics-Descriptive-3.0702"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0701.tar.gz; - sha256 = "35b09ed91b8660a6095c272a36ed2c61b3c660aa535fc23a20beadf7769e1919"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0702.tar.gz; + sha256 = "f98a10c625640170cdda408cccc72bdd7f66f8ebe5f59dec1b96185171ef11d0"; }; meta = { #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement @@ -14464,10 +14413,10 @@ let }; TAPParserSourceHandlerpgTAP = buildPerlModule rec { - name = "TAP-Parser-SourceHandler-pgTAP-3.33"; + name = "TAP-Parser-SourceHandler-pgTAP-3.34"; src = fetchurl { url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; - sha256 = "15q46y2hbp2ij5n9ir76lmspqj3n8gb0z9l5ipb5g7q90l160m4k"; + sha256 = "1q9h5h3m31vfch17djjacnjqvfkyw0b8ndwv1kk8a09bp8sbsh8v"; }; meta = { description = "Stream TAP from pgTAP test scripts"; @@ -14798,12 +14747,11 @@ let }; TermTable = buildPerlPackage rec { - name = "Term-Table-0.012"; + name = "Term-Table-0.013"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "4db6118fbf862bd32a8402e1ee28ce2044d0e0887ef29b726e917ab4258a063a"; + sha256 = "ffeb36dcb25c575b9f63657d1591a14af22cd10ba23cc76de9d976b426f4fc40"; }; - buildInputs = [ TestSimple13 ]; propagatedBuildInputs = [ Importer ]; meta = { description = "Format a header and rows into a table"; @@ -14873,10 +14821,10 @@ let }; Test2Suite = buildPerlPackage rec { - name = "Test2-Suite-0.000115"; + name = "Test2-Suite-0.000117"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "02be3428a0965aeb21245d44bbadda69b94dc76cd68d5695352c996ac7fc3638"; + sha256 = "e8877a90655ace2e8302104e0de27faf777397194738b085b209749c091ef154"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -14891,7 +14839,7 @@ let url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz; sha256 = "0v97y31j56f4mxw0vxyjbdprq4951h4wcdh4acnfm63np7wvg44p"; }; - propagatedBuildInputs = [ SubExporter TestSimple13 ]; + propagatedBuildInputs = [ SubExporter ]; buildInputs = [ TestNeeds ]; meta = { description = "subtests that you can die your way out of ... but survive"; @@ -14989,10 +14937,10 @@ let }; TestCleanNamespaces = buildPerlPackage { - name = "Test-CleanNamespaces-0.23"; + name = "Test-CleanNamespaces-0.24"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.23.tar.gz; - sha256 = "c7bf97f3c786b75f84341135904b492a1a36646aa65db3e0fd15a3cbe0864872"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.24.tar.gz; + sha256 = "338d5569e8e89a654935f843ec0bc84aaa486fe8dd1898fb9cab3eccecd5327a"; }; buildInputs = [ Filepushd Moo Mouse RoleTiny SubExporter TestDeep TestNeeds TestWarnings namespaceclean ]; propagatedBuildInputs = [ PackageStash SubIdentify ]; @@ -15236,20 +15184,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 { @@ -15872,10 +15806,10 @@ let }; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302140"; + name = "Test-Simple-1.302141"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302140.tar.gz; - sha256 = "73f5440c7ae55e13706e9ebeaa7247df973226470f028344ea3cd21e1642bd1d"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302141.tar.gz; + sha256 = "d7045bc814cba0426684a32c44d90ced5b83075659f0fcefed88c32f8fd395b7"; }; meta = { description = "Basic utilities for writing tests"; @@ -16052,10 +15986,10 @@ let }; TestWWWMechanize = buildPerlPackage { - name = "Test-WWW-Mechanize-1.50"; + name = "Test-WWW-Mechanize-1.52"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.50.tar.gz; - sha256 = "097pl87vdbxbb56vawzvs6ikrlb8nz3dx223kjjbdn3jlli3jjhg"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.52.tar.gz; + sha256 = "1jsywlbxhqw39ij7s8vmgff5vys58vlfaq27072awacnxc65aal4"; }; buildInputs = [ TestLongString ]; propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; @@ -16196,7 +16130,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"; @@ -16674,23 +16608,11 @@ 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"; + name = "threads-shared-1.59"; src = fetchurl { url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; - sha256 = "04qbypzgp49sq1wq5kip0m95lffv0pc8xj2wplrdpyqz87y105xd"; + sha256 = "1krz69ks3siz0fhc9waf817nnlmxsgq7rc5rq99xvqg1f1g9iz6i"; }; meta = { description = "Perl extension for sharing data structures between threads"; @@ -16872,14 +16794,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 { @@ -17068,18 +16982,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 { @@ -17348,10 +17250,10 @@ let }; WWWMechanize = buildPerlPackage { - name = "WWW-Mechanize-1.89"; + name = "WWW-Mechanize-1.90"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.89.tar.gz; - sha256 = "1mxx362vqiniw8vi6k3j7v9b1s7012irhfcblcz1p6jz9cjqi7mh"; + url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.90.tar.gz; + sha256 = "038i9nh643cmi4y4r8fsp0xvzz4zfh5srh8sw3w5kzxjq126pr44"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; doCheck = false; @@ -17360,7 +17262,7 @@ let description = "Handy web browsing in a Perl object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ CGI HTTPServerSimple TestDeep TestFatal TestOutput TestWarnings ]; + buildInputs = [ CGI HTTPServerSimple PerlCritic PerlTidy TestDeep TestFatal TestOutput TestWarnings ]; }; WWWMechanizeCGI = buildPerlPackage { @@ -17868,10 +17770,10 @@ let }; YAML = buildPerlPackage rec { - name = "YAML-1.26"; + name = "YAML-1.27"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.26.tar.gz; - sha256 = "1g3zjm145zsackgnzkkb1chd15xns84jccm6knpwbysa9karjbzs"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.27.tar.gz; + sha256 = "1yc2yqjyrcdlhp209f3a63f9xx6v5klisli25fv221yy43la34n9"; }; buildInputs = [ TestBase TestDeep TestYAML ]; @@ -17884,10 +17786,10 @@ let }; YAMLSyck = buildPerlPackage rec { - name = "YAML-Syck-1.30"; + name = "YAML-Syck-1.31"; src = fetchurl { url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz"; - sha256 = "1iwd4pbwg7m1vwc74s3f3hk9yyqmhn1ssrbh9466lmbnc4hl9cv2"; + sha256 = "14420hp7vxhrs0hgsmrfc9s9dassw1bns4jbmdq55b735xrwbbfp"; }; meta = { description = "Fast, lightweight YAML loader and dumper"; @@ -17904,10 +17806,10 @@ let }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.74"; + name = "YAML-LibYAML-0.75"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/YAML-LibYAML-0.74.tar.gz; - sha256 = "021l0gf6z93xd6vd604vpvb9d4b714zph17g6hg47fpawdq0xpd0"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.75.tar.gz; + sha256 = "1jlj6yrh3kv6f6q2x253lds664916fgps0praih5gwxagnld9k32"; }; }; @@ -17965,6 +17867,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/php-packages.nix b/pkgs/top-level/php-packages.nix index cb425b14e1d..3cfa8f6e6d6 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -409,6 +409,40 @@ let }; }; + phpstan = pkgs.stdenv.mkDerivation rec { + name = "phpstan-${version}"; + version = "0.11"; + + src = pkgs.fetchurl { + url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; + sha256 = "09p3cg5ii862p2l44fcv7hh400nsmxvwn1jjr929y21p01wsjhkp"; + }; + + phases = [ "installPhase" ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phpstan/phpstan.phar + makeWrapper ${php}/bin/php $out/bin/phpstan \ + --add-flags "$out/libexec/phpstan/phpstan.phar" + ''; + + meta = with pkgs.lib; { + description = "PHP Static Analysis Tool"; + longDescription = '' + PHPStan focuses on finding errors in your code without actually running + it. It catches whole classes of bugs even before you write tests for the + code. It moves PHP closer to compiled languages in the sense that the + correctness of each line of the code can be checked before you run the + actual line. + ''; + license = licenses.mit; + homepage = https://github.com/phpstan/phpstan; + maintainers = with maintainers; [ etu ]; + }; + }; + psysh = pkgs.stdenv.mkDerivation rec { name = "psysh-${version}"; version = "0.9.8"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec86a570c7c..657e1cb4330 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,16 +18,7 @@ let packages = ( self: let - pythonAtLeast = versionAtLeast python.pythonVersion; - pythonOlder = versionOlder python.pythonVersion; - isPy27 = python.pythonVersion == "2.7"; - isPy33 = python.pythonVersion == "3.3"; - isPy34 = python.pythonVersion == "3.4"; - isPy35 = python.pythonVersion == "3.5"; - isPy36 = python.pythonVersion == "3.6"; - isPy37 = python.pythonVersion == "3.7"; - isPyPy = strings.substring 0 4 python.executable == "pypy"; - isPy3k = strings.substring 0 1 python.pythonVersion == "3"; + inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; @@ -52,7 +43,6 @@ let else ff; buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { - inherit bootstrapped-pip; flit = self.flit; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit namePrefix; @@ -60,7 +50,6 @@ let })); buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { - inherit bootstrapped-pip; flit = self.flit; namePrefix = ""; toPythonModule = x: x; # Application does not provide modules. @@ -130,7 +119,8 @@ let in { - inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPyPy isPy3k buildPythonPackage buildPythonApplication; + inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; inherit toPythonModule toPythonApplication; @@ -270,6 +260,8 @@ in { blivet = callPackage ../development/python-modules/blivet { }; + boltons = callPackage ../development/python-modules/boltons { }; + breathe = callPackage ../development/python-modules/breathe { }; brotli = callPackage ../development/python-modules/brotli { }; @@ -286,10 +278,16 @@ in { cachecontrol = callPackage ../development/python-modules/cachecontrol { }; + cachy = callPackage ../development/python-modules/cachy { }; + cdecimal = callPackage ../development/python-modules/cdecimal { }; chalice = callPackage ../development/python-modules/chalice { }; + cleo = callPackage ../development/python-modules/cleo { }; + + clikit = callPackage ../development/python-modules/clikit { }; + clustershell = callPackage ../development/python-modules/clustershell { }; cozy = callPackage ../development/python-modules/cozy { }; @@ -352,6 +350,8 @@ in { eradicate = callPackage ../development/python-modules/eradicate { }; + face = callPackage ../development/python-modules/face { }; + fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; fido2 = callPackage ../development/python-modules/fido2 { }; @@ -374,6 +374,8 @@ in { globus-sdk = callPackage ../development/python-modules/globus-sdk { }; + glom = callPackage ../development/python-modules/glom { }; + goocalendar = callPackage ../development/python-modules/goocalendar { }; gsd = callPackage ../development/python-modules/gsd { }; @@ -488,6 +490,8 @@ in { palettable = callPackage ../development/python-modules/palettable { }; + pastel = callPackage ../development/python-modules/pastel { }; + pathlib = callPackage ../development/python-modules/pathlib { }; pdf2image = callPackage ../development/python-modules/pdf2image { }; @@ -504,6 +508,8 @@ in { plantuml = callPackage ../tools/misc/plantuml { }; + poetry = callPackage ../development/python-modules/poetry { }; + progress = callPackage ../development/python-modules/progress { }; pymysql = callPackage ../development/python-modules/pymysql { }; @@ -595,6 +601,8 @@ in { pykeepass = callPackage ../development/python-modules/pykeepass { }; + pylev = callPackage ../development/python-modules/pylev { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; @@ -615,6 +623,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; }; @@ -683,6 +698,8 @@ in { pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); + pyvcd = callPackage ../development/python-modules/pyvcd { }; + pyvoro = callPackage ../development/python-modules/pyvoro { }; relatorio = callPackage ../development/python-modules/relatorio { }; @@ -757,6 +774,8 @@ in { toml = callPackage ../development/python-modules/toml { }; + tomlkit = callPackage ../development/python-modules/tomlkit { }; + unifi = callPackage ../development/python-modules/unifi { }; vidstab = callPackage ../development/python-modules/vidstab { }; @@ -767,6 +786,8 @@ in { WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; + yarg = callPackage ../development/python-modules/yarg { }; + # packages defined here aafigure = callPackage ../development/python-modules/aafigure { }; @@ -1122,6 +1143,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 +1208,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 {}; @@ -1498,6 +1523,8 @@ in { cssutils = callPackage ../development/python-modules/cssutils { }; + css-parser = callPackage ../development/python-modules/css-parser { }; + darcsver = callPackage ../development/python-modules/darcsver { }; dask = callPackage ../development/python-modules/dask { }; @@ -1679,10 +1706,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 +1748,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 +2118,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 +2317,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 +2451,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; }; @@ -2592,6 +2631,8 @@ in { google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { }; + google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; + google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; gpgme = toPythonModule (pkgs.gpgme.override { @@ -3078,7 +3119,9 @@ in { pyte = callPackage ../development/python-modules/pyte { }; - graphviz = callPackage ../development/python-modules/graphviz { }; + graphviz = callPackage ../development/python-modules/graphviz { + inherit (pkgs) graphviz; + }; pygraphviz = callPackage ../development/python-modules/pygraphviz { graphviz = pkgs.graphviz; # not the python package @@ -3114,7 +3157,9 @@ in { sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; - slixmpp = callPackage ../development/python-modules/slixmpp { }; + slixmpp = callPackage ../development/python-modules/slixmpp { + inherit (pkgs) gnupg; + }; netaddr = callPackage ../development/python-modules/netaddr { }; @@ -3214,7 +3259,9 @@ in { obfsproxy = callPackage ../development/python-modules/obfsproxy { }; - objgraph = callPackage ../development/python-modules/objgraph { }; + objgraph = callPackage ../development/python-modules/objgraph { + graphvizPkg = pkgs.graphviz; + }; odo = callPackage ../development/python-modules/odo { }; @@ -3226,6 +3273,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 { }; @@ -3363,6 +3412,8 @@ in { pg8000 = callPackage ../development/python-modules/pg8000 { }; + pgsanity = callPackage ../development/python-modules/pgsanity { }; + pgspecial = callPackage ../development/python-modules/pgspecial { }; pickleshare = callPackage ../development/python-modules/pickleshare { }; @@ -3475,7 +3526,9 @@ in { pysam = callPackage ../development/python-modules/pysam { }; - pysaml2 = callPackage ../development/python-modules/pysaml2 { }; + pysaml2 = callPackage ../development/python-modules/pysaml2 { + inherit (pkgs) xmlsec; + }; python-pushover = callPackage ../development/python-modules/pushover {}; @@ -3519,7 +3572,9 @@ in { pydispatcher = callPackage ../development/python-modules/pydispatcher { }; - pydot = callPackage ../development/python-modules/pydot { }; + pydot = callPackage ../development/python-modules/pydot { + inherit (pkgs) graphviz; + }; pydot_ng = callPackage ../development/python-modules/pydot_ng { }; @@ -3553,6 +3608,8 @@ in { pygpgme = callPackage ../development/python-modules/pygpgme { }; + pyment = callPackage ../development/python-modules/pyment { }; + pylint = if isPy3k then callPackage ../development/python-modules/pylint { } else callPackage ../development/python-modules/pylint/1.9.nix { }; @@ -3983,6 +4040,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 +5153,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 +5185,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 9bdad5473d4..6c2159f9bef 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 |