diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 39 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1548 | ||||
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 105 | ||||
-rw-r--r-- | pkgs/top-level/dhall-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 81 | ||||
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/emscripten-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/haxe-packages.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/lua-packages.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 87 | ||||
-rw-r--r-- | pkgs/top-level/packages-config.nix | 38 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 2917 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 44 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 531 | ||||
-rw-r--r-- | pkgs/top-level/release-alternatives.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release-lib.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/static.nix | 199 |
20 files changed, 3445 insertions, 2210 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b7cc30677615f..f95c6e8bc515b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -41,15 +41,27 @@ mapAliases ({ ag = silver-searcher; # added 2018-04-25 aircrackng = aircrack-ng; # added 2016-01-14 alienfx = throw "alienfx has been removed."; # added 2019-12-08 + aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30 amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30 ammonite-repl = ammonite; # added 2017-05-02 + amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 + apacheKafka_0_9 = throw "kafka 0.9 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_0_10 = throw "kafka 0.10 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_0_11 = throw "kafka 0.11 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_1_0 = throw "kafka 1.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_1_1 = throw "kafka 1.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_0 = throw "kafka 2.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_1 = throw "kafka 2.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_2 = throw "kafka 2.2 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_3 = throw "kafka 2.3 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 arduino_core = arduino-core; # added 2015-02-04 arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 + aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26 avldrums-lv2 = x42-avldrums; # added 2020-03-29 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 @@ -61,10 +73,12 @@ mapAliases ({ bridge_utils = bridge-utils; # added 2015-02-20 bro = zeek; # added 2019-09-29 bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10 + bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10 btrfsProgs = btrfs-progs; # added 2016-01-03 bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 + bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 @@ -85,6 +99,7 @@ mapAliases ({ clangAnalyzer = clang-analyzer; # added 2015-02-20 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 + codimd = hedgedoc; # added 2020-11-29 compton = picom; # added 2019-12-02 compton-git = compton; # added 2019-05-20 conntrack_tools = conntrack-tools; # added 2018-05 @@ -92,6 +107,7 @@ mapAliases ({ coprthr = throw "coprthr has been removed."; # added 2019-12-08 corebird = throw "corebird was deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement."; coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16 + cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30 cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21 cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 @@ -142,6 +158,7 @@ mapAliases ({ firefoxWrapper = firefox; # 2015-09 firestr = throw "firestr has been removed."; # added 2019-12-08 + fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # added 2020-12-29, modified 2021-01-10 flameGraph = flamegraph; # added 2018-04-25 flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 foldingathome = fahclient; # added 2020-09-03 @@ -187,6 +204,10 @@ mapAliases ({ gnuradio-limesdr = gr-limesdr; # added 2019-05-27 gnuradio-rds = gr-rds; # added 2019-05-27 gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 + # added 20-10-2020 + gnuradio-with-packages = gnuradio3_7.override { + extraPackages = [ gr-nacl gr-gsm gr-ais gr-limesdr gr-rds gr-osmosdr ]; + }; gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 @@ -218,6 +239,7 @@ mapAliases ({ icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 idea = jetbrains; # added 2017-04-03 + inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; infiniband-diags = rdma-core; # added 2019-08-09 inotifyTools = inotify-tools; jasper = throw "jasper has been removed: abandoned upstream with many vulnerabilities"; @@ -262,7 +284,7 @@ mapAliases ({ libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 libGL_driver = mesa.drivers; # added 2019-05-28 - libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 + libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 @@ -363,6 +385,7 @@ mapAliases ({ openjpeg_2_1 = openjpeg_2; # added 2018-10-25 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 + onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 osquery = throw "osquery has been removed."; # added 2019-11-24 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 owncloudclient = owncloud-client; # added 2016-08 @@ -473,12 +496,14 @@ mapAliases ({ pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 + qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtcurve = libsForQt5.qtcurve; # added 2020-11-07 qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 + raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24 rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 @@ -550,6 +575,7 @@ mapAliases ({ smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 + spectral = neochat; # added 2020-12-27 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; # added 2020-02-10 @@ -597,6 +623,7 @@ mapAliases ({ systool = sysfsutils; # added 2018-04-25 tahoelafs = tahoe-lafs; # added 2018-03-26 tangogps = foxtrotgps; # added 2020-01-26 + tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead."; telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25 telepathy_glib = telepathy-glib; # added 2018-02-25 @@ -641,6 +668,7 @@ mapAliases ({ ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 + unifiStable = unifi6; # added 2020-12-28 usb_modeswitch = usb-modeswitch; # added 2016-05-10 usbguard-nox = usbguard; # added 2019-09-04 utillinux = util-linux; # added 2020-11-24 @@ -689,6 +717,10 @@ mapAliases ({ gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # added 2020-10-09 + libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20 + libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20 + libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20 + libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off @@ -768,6 +800,9 @@ mapAliases ({ ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula."; + /* Added 2021-01-02 */ + ttyrec = ovh-ttyrec; + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ @@ -812,7 +847,7 @@ mapAliases ({ kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings user-manager xdg-desktop-portal-kde + systemsettings xdg-desktop-portal-kde ; inherit (plasma5.thirdParty) plasma-applet-caffeine-plus diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 040fef0fbbc15..e201a9ff1b6ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -120,6 +120,10 @@ in { deps = [ autoconf264 automake111x gettext libtool ]; } ../build-support/setup-hooks/autoreconf.sh; + autoreconfHook269 = makeSetupHook + { deps = [ autoconf269 automake gettext libtool ]; } + ../build-support/setup-hooks/autoreconf.sh; + autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; @@ -178,16 +182,22 @@ in cereal = callPackage ../development/libraries/cereal { }; + chrysalis = callPackage ../applications/misc/chrysalis { }; + clj-kondo = callPackage ../development/tools/clj-kondo { }; cmark = callPackage ../development/libraries/cmark { }; + cmark-gfm = callPackage ../development/libraries/cmark-gfm { }; + cm256cc = callPackage ../development/libraries/cm256cc { }; conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; + colobot = callPackage ../games/colobot {}; + colorz = callPackage ../tools/misc/colorz { }; colorpicker = callPackage ../tools/misc/colorpicker { }; @@ -220,6 +230,8 @@ in ptags = callPackage ../development/tools/misc/ptags { }; + ptouch-print = callPackage ../misc/ptouch-print { }; + demoit = callPackage ../servers/demoit { }; deviceTree = callPackage ../os-specific/linux/device-tree {}; @@ -240,7 +252,10 @@ in archiver = callPackage ../applications/misc/archiver { }; - digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; + # It segfaults if it uses qt5.15 + digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { + autoreconfHook = buildPackages.autoreconfHook269; + }; gretl = callPackage ../applications/science/math/gretl { }; @@ -367,6 +382,8 @@ in fetchhg = callPackage ../build-support/fetchhg { }; + fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon {}; + # `fetchurl' downloads a file from the network. fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform then buildPackages.fetchurl # No need to do special overrides twice, @@ -465,6 +482,8 @@ in madonctl = callPackage ../applications/misc/madonctl { }; + copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; + makeDesktopItem = callPackage ../build-support/make-desktopitem { }; makeAutostartItem = callPackage ../build-support/make-startupitem { }; @@ -544,6 +563,8 @@ in wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; + wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; + separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh; @@ -701,6 +722,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; }; + archi = callPackage ../tools/misc/archi { }; + cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; eterm = callPackage ../applications/terminal-emulators/eterm { }; @@ -709,6 +732,8 @@ in foot = callPackage ../applications/terminal-emulators/foot { }; + germinal = callPackage ../applications/terminal-emulators/germinal { }; + guake = callPackage ../applications/terminal-emulators/guake { }; havoc = callPackage ../applications/terminal-emulators/havoc { }; @@ -790,6 +815,10 @@ in wayst = callPackage ../applications/terminal-emulators/wayst { }; + wezterm = callPackage ../applications/terminal-emulators/wezterm { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; + }; + x3270 = callPackage ../applications/terminal-emulators/x3270 { }; xterm = callPackage ../applications/terminal-emulators/xterm { }; @@ -804,6 +833,8 @@ in alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { }; + amazon-ec2-utils = callPackage ../tools/admin/amazon-ec2-utils { }; + amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; amber = callPackage ../tools/text/amber { @@ -853,6 +884,8 @@ in archivemount = callPackage ../tools/filesystems/archivemount { }; + archivy = python3Packages.callPackage ../applications/misc/archivy { }; + arandr = callPackage ../tools/X11/arandr { }; inherit (callPackages ../servers/nosql/arangodb { @@ -864,6 +897,8 @@ in arduino = arduino-core.override { withGui = true; }; + arduino-ci = callPackage ../development/arduino/arduino-ci { }; + arduino-cli = callPackage ../development/arduino/arduino-cli { }; arduino-core = callPackage ../development/arduino/arduino-core { }; @@ -872,14 +907,14 @@ in apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; + argtable = callPackage ../development/libraries/argtable { }; + arguments = callPackage ../development/libraries/arguments { }; argus = callPackage ../tools/networking/argus {}; argus-clients = callPackage ../tools/networking/argus-clients {}; - argtable = callPackage ../tools/misc/argtable {}; - argyllcms = callPackage ../tools/graphics/argyllcms {}; arp-scan = callPackage ../tools/misc/arp-scan { }; @@ -918,6 +953,8 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; + audiowaveform = callPackage ../tools/audio/audiowaveform { }; + autoflake = callPackage ../development/tools/analysis/autoflake { }; autospotting = callPackage ../applications/misc/autospotting { }; @@ -938,6 +975,8 @@ in aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; + aws-nuke = callPackage ../tools/admin/aws-nuke { }; + aws-okta = callPackage ../tools/security/aws-okta { }; aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; @@ -958,6 +997,8 @@ in berglas = callPackage ../tools/admin/berglas/default.nix { }; + betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; + brakeman = callPackage ../development/tools/analysis/brakeman { }; brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; @@ -998,7 +1039,9 @@ in apg = callPackage ../tools/security/apg { }; - apt-dater = callPackage ../tools/package-management/apt-dater { }; + apt-dater = callPackage ../tools/package-management/apt-dater { + autoreconfHook = buildPackages.autoreconfHook269; + }; autorevision = callPackage ../tools/misc/autorevision { }; @@ -1140,6 +1183,8 @@ in doona = callPackage ../tools/security/doona { }; + droidcam = callPackage ../applications/video/droidcam { }; + ecdsautils = callPackage ../tools/security/ecdsautils { }; sedutil = callPackage ../tools/security/sedutil { }; @@ -1170,8 +1215,12 @@ in fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + flood = nodePackages.flood; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; + genann = callPackage ../development/libraries/genann { }; + genpass = callPackage ../tools/security/genpass { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -1214,6 +1263,8 @@ in goimapnotify = callPackage ../tools/networking/goimapnotify { }; + gojsontoyaml = callPackage ../development/tools/gojsontoyaml { }; + gomatrix = callPackage ../applications/misc/gomatrix { }; gopacked = callPackage ../applications/misc/gopacked { }; @@ -1280,6 +1331,8 @@ in gopass = callPackage ../tools/security/gopass { }; + gospider = callPackage ../tools/security/gospider { }; + browserpass = callPackage ../tools/security/browserpass { }; passff-host = callPackage ../tools/security/passff-host { }; @@ -1322,6 +1375,8 @@ in wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; + waypoint = callPackage ../applications/networking/cluster/waypoint { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; @@ -1359,6 +1414,8 @@ in novacomd = callPackage ../development/mobile/webos/novacomd.nix { }; }; + apprise = with python3Packages; toPythonApplication apprise; + aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; inherit (python3Packages) sphinx; @@ -1441,6 +1498,8 @@ in babeld = callPackage ../tools/networking/babeld { }; + badchars = python3Packages.callPackage ../tools/security/badchars { }; + badvpn = callPackage ../tools/networking/badvpn {}; barcode = callPackage ../tools/graphics/barcode {}; @@ -1574,12 +1633,15 @@ in boringtun = callPackage ../tools/networking/boringtun { }; + # Upstream recommends qt5.12 and it doesn't build with qt5.15 boomerang = libsForQt512.callPackage ../development/tools/boomerang { }; boost-build = callPackage ../development/tools/boost-build { }; boot = callPackage ../development/tools/build-managers/boot { }; + bowtie = callPackage ../applications/science/biology/bowtie { }; + bowtie2 = callPackage ../applications/science/biology/bowtie2 { }; boxfs = callPackage ../tools/filesystems/boxfs { }; @@ -1722,6 +1784,8 @@ in gflags = null; # only required for examples/tests }; + craftos-pc = callPackage ../misc/emulators/craftos-pc { }; + gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; @@ -1768,6 +1832,8 @@ in cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { }; + cloudbrute = callPackage ../tools/security/cloudbrute { }; + cloudflared = callPackage ../applications/networking/cloudflared { }; cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { }; @@ -1830,6 +1896,8 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; + code-minimap = callPackage ../tools/misc/code-minimap { }; + codesearch = callPackage ../tools/text/codesearch { }; codec2 = callPackage ../development/libraries/codec2 { }; @@ -1855,6 +1923,10 @@ in cppclean = callPackage ../development/tools/cppclean {}; + credhub-cli = callPackage ../tools/admin/credhub-cli { + buildGoModule = buildGo114Module; + }; + crex = callPackage ../tools/misc/crex { }; cri-tools = callPackage ../tools/virtualization/cri-tools {}; @@ -1964,6 +2036,8 @@ in discocss = callPackage ../tools/misc/discocss { }; + disfetch = callPackage ../tools/misc/disfetch { }; + disk-filltest = callPackage ../tools/system/disk-filltest { }; diskscan = callPackage ../tools/misc/diskscan { }; @@ -1984,6 +2058,8 @@ in dlx = callPackage ../misc/emulators/dlx { }; + dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; + doitlive = callPackage ../tools/misc/doitlive { }; dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; @@ -2031,6 +2107,8 @@ in dyncall = callPackage ../development/libraries/dyncall { }; + dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { }; + earlyoom = callPackage ../os-specific/linux/earlyoom { }; EBTKS = callPackage ../development/libraries/science/biology/EBTKS { }; @@ -2173,6 +2251,8 @@ in gdrive = callPackage ../applications/networking/gdrive { }; + gdu = callPackage ../tools/system/gdu { }; + go-chromecast = callPackage ../applications/video/go-chromecast { }; go-rice = callPackage ../tools/misc/go.rice {}; @@ -2294,8 +2374,14 @@ in icdiff = callPackage ../tools/text/icdiff {}; + inchi = callPackage ../development/libraries/inchi {}; + + icon-slicer = callPackage ../tools/X11/icon-slicer { }; + ifm = callPackage ../tools/graphics/ifm {}; + ink = callPackage ../tools/misc/ink { }; + interlock = callPackage ../servers/interlock {}; jellyfin = callPackage ../servers/jellyfin { }; @@ -2312,6 +2398,8 @@ in kapacitor = callPackage ../servers/monitoring/kapacitor { }; + kaldi = callPackage ../tools/audio/kaldi { }; + kisslicer = callPackage ../tools/misc/kisslicer { }; klaus = with python3Packages; toPythonApplication klaus; @@ -2364,6 +2452,8 @@ in mapproxy = callPackage ../applications/misc/mapproxy { }; + marl = callPackage ../development/libraries/marl {}; + marlin-calc = callPackage ../tools/misc/marlin-calc {}; masscan = callPackage ../tools/security/masscan { @@ -2412,8 +2502,14 @@ in monetdb = callPackage ../servers/sql/monetdb { }; + monado = callPackage ../applications/graphics/monado { + inherit (gst_all_1) gstreamer gst-plugins-base; + }; + mons = callPackage ../tools/misc/mons {}; + monsoon = callPackage ../tools/security/monsoon {}; + mousetweaks = callPackage ../applications/accessibility/mousetweaks { inherit (pkgs.xorg) libX11 libXtst libXfixes; }; @@ -2432,6 +2528,8 @@ in mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; + mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { }; + mq-cli = callPackage ../tools/system/mq-cli { }; nextdns = callPackage ../applications/networking/nextdns { }; @@ -2464,12 +2562,12 @@ in ocrmypdf = callPackage ../tools/text/ocrmypdf { }; + ocrfeeder = callPackage ../applications/graphics/ocrfeeder { }; + onboard = callPackage ../applications/misc/onboard { }; oneshot = callPackage ../tools/networking/oneshot { }; - onnxruntime = callPackage ../development/libraries/onnxruntime { }; - xkbd = callPackage ../applications/misc/xkbd { }; libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; @@ -2488,6 +2586,8 @@ in patool = with python3Packages; toPythonApplication patool; + pbgopy = callPackage ../tools/text/pbgopy { }; + pbpst = callPackage ../applications/misc/pbpst { }; pbzx = callPackage ../tools/compression/pbzx { }; @@ -2546,6 +2646,12 @@ in shell-hist = callPackage ../tools/misc/shell-hist { }; + shellhub-agent = callPackage ../applications/networking/shellhub-agent { }; + + simdjson = callPackage ../development/libraries/simdjson { }; + + shipyard = callPackage ../tools/virtualization/shipyard { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; simplenes = callPackage ../misc/emulators/simplenes { }; @@ -2556,6 +2662,8 @@ in socklog = callPackage ../tools/system/socklog { }; + spacevim = callPackage ../applications/editors/spacevim { }; + ssmsh = callPackage ../tools/admin/ssmsh { }; stagit = callPackage ../development/tools/stagit { }; @@ -2564,7 +2672,9 @@ in statserial = callPackage ../tools/misc/statserial { }; - step-ca = callPackage ../tools/security/step-ca { }; + step-ca = callPackage ../tools/security/step-ca { + inherit (darwin.apple_sdk.frameworks) PCSC; + }; step-cli = callPackage ../tools/security/step-cli { }; @@ -2584,6 +2694,8 @@ in syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; + svt-av1 = callPackage ../tools/video/svt-av1 { }; + inherit (callPackages ../servers/rainloop { }) rainloop-community rainloop-standard; @@ -2780,8 +2892,12 @@ in inherit (pythonPackages) gyp; }; + bumpver = callPackage ../applications/version-management/bumpver { }; + bup = callPackage ../tools/backup/bup { }; + bupstash = callPackage ../tools/backup/bupstash { }; + burp = callPackage ../tools/backup/burp { }; buku = callPackage ../applications/misc/buku { }; @@ -2900,13 +3016,14 @@ in circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_20_10_0; + citrix_workspace = citrix_workspace_20_12_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_20_04_0 citrix_workspace_20_06_0 citrix_workspace_20_09_0 citrix_workspace_20_10_0 + citrix_workspace_20_12_0 ; citra = libsForQt5.callPackage ../misc/emulators/citra { }; @@ -2917,9 +3034,9 @@ in cmt = callPackage ../applications/audio/cmt {}; - codimd = callPackage ../servers/web-apps/codimd { - nodejs = nodejs-12_x; - }; + crlfuzz = callPackage ../tools/security/crlfuzz {}; + + hedgedoc = callPackage ../servers/web-apps/hedgedoc { }; colord = callPackage ../tools/misc/colord { }; @@ -2979,10 +3096,14 @@ in usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { }; + usbsdmux = callPackage ../development/tools/misc/usbsdmux { }; + anthy = callPackage ../tools/inputmethods/anthy { }; evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; + evscript = callPackage ../tools/inputmethods/evscript { }; + gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { }; libpinyin = callPackage ../development/libraries/libpinyin { }; @@ -2999,6 +3120,8 @@ in inherit (xorg) libXaw; }; + netevent = callPackage ../tools/inputmethods/netevent { }; + skktools = callPackage ../tools/inputmethods/skk/skktools { }; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; @@ -3028,11 +3151,12 @@ in m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { - python = python2; - inherit (python2Packages) gyp; + stdenv = clangStdenv; protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; + rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; + table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese { @@ -3284,13 +3408,13 @@ in ddrutility = callPackage ../tools/system/ddrutility { }; - deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 { + deluge-2_x = callPackage ../applications/networking/p2p/deluge { pythonPackages = python3Packages; - libtorrentRasterbar = libtorrentRasterbar.override { python = python3; }; + libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; }; }; - deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 { + deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix { pythonPackages = python2Packages; - libtorrentRasterbar = libtorrentRasterbar-1_1_x; + libtorrent-rasterbar = libtorrent-rasterbar-1_1_x; }; deluge = deluge-2_x; @@ -3322,6 +3446,8 @@ in dnstop = callPackage ../tools/networking/dnstop { }; + dnsx = callPackage ../tools/security/dnsx { }; + dhcp = callPackage ../tools/networking/dhcp { }; dhcpdump = callPackage ../tools/networking/dhcpdump { }; @@ -3446,7 +3572,9 @@ in duc = callPackage ../tools/misc/duc { }; - duff = callPackage ../tools/filesystems/duff { }; + duff = callPackage ../tools/filesystems/duff { + autoreconfHook = buildPackages.autoreconfHook269; + }; dumptorrent = callPackage ../tools/misc/dumptorrent { }; @@ -3510,7 +3638,9 @@ in eflite = callPackage ../applications/audio/eflite {}; - eid-mw = callPackage ../tools/security/eid-mw { }; + eid-mw = callPackage ../tools/security/eid-mw { + autoreconfHook = buildPackages.autoreconfHook269; + }; epubcheck = callPackage ../tools/text/epubcheck { }; @@ -3528,7 +3658,11 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - rage = callPackage ../tools/security/rage { }; + pax = callPackage ../tools/archivers/pax { }; + + rage = callPackage ../tools/security/rage { + inherit (darwin.apple_sdk.frameworks) Foundation Security; + }; rar2fs = callPackage ../tools/filesystems/rar2fs { }; @@ -3600,6 +3734,8 @@ in wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + wsl-open = callPackage ../tools/misc/wsl-open { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; xob = callPackage ../tools/X11/xob { }; @@ -3685,6 +3821,10 @@ in emem = callPackage ../applications/misc/emem { }; + emulsion = callPackage ../applications/graphics/emulsion { + inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL; + }; + emv = callPackage ../tools/misc/emv { }; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; @@ -3818,6 +3958,24 @@ in chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; + fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { }; + + fcitx5-with-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; + + fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; + + fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + + fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { }; + + fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { }; + + fcitx5-rime = callPackage ../tools/inputmethods/fcitx5/fcitx5-rime.nix { }; + + fcitx5-table-extra = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-extra.nix { }; + + fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { }; + fcppt = callPackage ../development/libraries/fcppt { }; fcrackzip = callPackage ../tools/security/fcrackzip { }; @@ -3832,6 +3990,8 @@ in feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; + feeds = callPackage ../applications/networking/feedreaders/feeds {}; + fend = callPackage ../tools/misc/fend { }; ferm = callPackage ../tools/networking/ferm { }; @@ -3930,6 +4090,8 @@ in feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; + fbcat = callPackage ../tools/misc/fbcat { }; + fbv = callPackage ../tools/graphics/fbv { }; fbvnc = callPackage ../tools/admin/fbvnc {}; @@ -3996,6 +4158,8 @@ in freedroidrpg = callPackage ../games/freedroidrpg { }; + freenukum = callPackage ../games/freenukum { }; + freebind = callPackage ../tools/networking/freebind { }; freeipmi = callPackage ../tools/system/freeipmi {}; @@ -4070,7 +4234,7 @@ in galen = callPackage ../development/tools/galen {}; - gallery-dl = callPackage ../applications/misc/gallery-dl { }; + gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; gandi-cli = callPackage ../tools/networking/gandi-cli { }; @@ -4080,6 +4244,8 @@ in garmintools = callPackage ../development/libraries/garmintools {}; + gau = callPackage ../tools/security/gau { }; + gauge = callPackage ../development/tools/gauge { }; gawk = callPackage ../tools/text/gawk { @@ -4210,7 +4376,9 @@ in gmvault = callPackage ../tools/networking/gmvault { }; - gnash = callPackage ../misc/gnash { }; + gnash = callPackage ../misc/gnash { + autoreconfHook = buildPackages.autoreconfHook269; + }; gnirehtet = callPackage ../tools/networking/gnirehtet { }; @@ -4383,6 +4551,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + ucg = callPackage ../tools/text/ucg { }; + grive2 = callPackage ../tools/filesystems/grive2 { }; groff = callPackage ../tools/text/groff { @@ -4444,10 +4614,14 @@ in gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; - gsmlib = callPackage ../development/libraries/gsmlib { }; + gsmlib = callPackage ../development/libraries/gsmlib { + autoreconfHook = buildPackages.autoreconfHook269; + }; gssdp = callPackage ../development/libraries/gssdp { }; + grype = callPackage ../tools/security/grype { }; + gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest { }; @@ -4556,7 +4730,7 @@ in hal-flash = callPackage ../os-specific/linux/hal-flash { }; - hal-hardware-analyzer = libsForQt514.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; + hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; @@ -4683,6 +4857,8 @@ in httptunnel = callPackage ../tools/networking/httptunnel { }; + httpx = callPackage ../tools/security/httpx { }; + hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; humanfriendly = with python3Packages; toPythonApplication humanfriendly; @@ -4720,6 +4896,8 @@ in icecast = callPackage ../servers/icecast { }; + icemon = libsForQt5.callPackage ../applications/networking/icemon { }; + icepeak = haskell.lib.justStaticExecutables haskellPackages.icepeak; iceshelf = callPackage ../tools/backup/iceshelf { }; @@ -4738,7 +4916,9 @@ in ifuse = callPackage ../tools/filesystems/ifuse { }; ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { }; - idevicerestore = callPackage ../tools/misc/idevicerestore { }; + idevicerestore = callPackage ../tools/misc/idevicerestore { + inherit (darwin) IOKit; + }; inherit (callPackages ../tools/filesystems/irods rec { stdenv = llvmPackages.libcxxStdenv; @@ -4773,8 +4953,6 @@ in inadyn = callPackage ../tools/networking/inadyn { }; - inboxer = callPackage ../applications/networking/mailreaders/inboxer { }; - incron = callPackage ../tools/system/incron { }; industrializer = callPackage ../applications/audio/industrializer { }; @@ -4829,9 +5007,7 @@ in ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { - buildGoModule = buildGo114Module; - }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; ipget = callPackage ../applications/networking/ipget { }; @@ -4960,6 +5136,8 @@ in jsduck = callPackage ../development/tools/jsduck { }; + json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans; + jtc = callPackage ../development/tools/jtc { }; jumpapp = callPackage ../tools/X11/jumpapp {}; @@ -5032,6 +5210,8 @@ in keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; + keystore-explorer = callPackage ../applications/misc/keystore-explorer { }; + kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { enableUnfree = false; @@ -5077,9 +5257,9 @@ in peruse = libsForQt5.callPackage ../tools/misc/peruse { }; - ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { }; + ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; - kstars = libsForQt514.callPackage ../applications/science/astronomy/kstars { }; + kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; kytea = callPackage ../tools/text/kytea { }; @@ -5089,6 +5269,8 @@ in ldc = callPackage ../development/compilers/ldc { }; + ldgallery = callPackage ../tools/graphics/ldgallery { }; + lbreakout2 = callPackage ../games/lbreakout2 { }; lefthook = gitAndTools.lefthook; @@ -5111,9 +5293,15 @@ in libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; - libcoap = callPackage ../applications/networking/libcoap {}; + libcoap = callPackage ../applications/networking/libcoap { + autoconf = buildPackages.autoconf269; + }; + + libcryptui = callPackage ../development/libraries/libcryptui { + autoreconfHook = buildPackages.autoreconfHook269; + }; - libcryptui = callPackage ../development/libraries/libcryptui { }; + libsmartcols = callPackage ../development/libraries/libsmartcols { }; libsmi = callPackage ../development/libraries/libsmi { }; @@ -5171,6 +5359,8 @@ in lvmsync = callPackage ../tools/backup/lvmsync { }; + kapp = callPackage ../tools/networking/kapp {}; + kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; kippo = callPackage ../servers/kippo { }; @@ -5195,6 +5385,8 @@ in matrix-synapse-plugins = recurseIntoAttrs matrix-synapse.plugins; + matrix-synapse-tools = recurseIntoAttrs matrix-synapse.tools; + matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {}; matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; @@ -5211,7 +5403,7 @@ in mdcat = callPackage ../tools/text/mdcat { inherit (darwin.apple_sdk.frameworks) Security; - inherit (pythonPackages) ansi2html; + inherit (python3Packages) ansi2html; }; medfile = callPackage ../development/libraries/medfile { }; @@ -5242,6 +5434,8 @@ in mmv-go = callPackage ../tools/misc/mmv-go { }; + mob = callPackage ../applications/misc/mob { }; + most = callPackage ../tools/misc/most { }; motion = callPackage ../applications/video/motion { }; @@ -5254,6 +5448,8 @@ in mxisd = callPackage ../servers/mxisd { }; + naabu = callPackage ../tools/security/naabu { }; + nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; }; @@ -5262,6 +5458,8 @@ in ncrack = callPackage ../tools/security/ncrack { }; + nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; + netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; @@ -5322,6 +5520,8 @@ in file-rename = callPackage ../tools/filesystems/file-rename { }; + kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {}; + kea = callPackage ../tools/networking/kea { }; keysmith = libsForQt5.callPackage ../tools/security/keysmith { }; @@ -5342,6 +5542,8 @@ in ldapvi = callPackage ../tools/misc/ldapvi { }; + ldeep = python3Packages.callPackage ../tools/security/ldeep { }; + ldns = callPackage ../development/libraries/ldns { }; leafpad = callPackage ../applications/editors/leafpad { }; @@ -5356,6 +5558,8 @@ in libck = callPackage ../development/libraries/libck { }; + libcork = callPackage ../development/libraries/libcork { }; + libconfig = callPackage ../development/libraries/libconfig { }; libcmis = callPackage ../development/libraries/libcmis { }; @@ -5487,6 +5691,8 @@ in linuxquota = callPackage ../tools/misc/linuxquota { }; + liquidctl = with python3Packages; toPythonApplication liquidctl; + localtime = callPackage ../tools/system/localtime { }; logcheck = callPackage ../tools/system/logcheck { }; @@ -5523,7 +5729,9 @@ in lv = callPackage ../tools/text/lv { }; - lxc = callPackage ../os-specific/linux/lxc { }; + lxc = callPackage ../os-specific/linux/lxc { + autoreconfHook = buildPackages.autoreconfHook269; + }; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; @@ -5670,6 +5878,10 @@ in mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + microdnf = callPackage ../tools/package-management/microdnf { }; + + microplane = callPackage ../tools/misc/microplane { }; + microserver = callPackage ../servers/microserver { }; midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; @@ -5860,6 +6072,8 @@ in neo-cowsay = callPackage ../tools/misc/neo-cowsay { }; + neochat = libsForQt5.callPackage ../applications/networking/instant-messengers/neochat { }; + neofetch = callPackage ../tools/misc/neofetch { }; nerdfonts = callPackage ../data/fonts/nerdfonts { }; @@ -5950,7 +6164,7 @@ in inherit (callPackage ../servers/nextcloud {}) nextcloud17 nextcloud18 nextcloud19 nextcloud20; - nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { }; + nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -5979,9 +6193,18 @@ in # with different versions we pin Go for all versions. nomad_0_11 = callPackage ../applications/networking/cluster/nomad/0.11.nix { buildGoPackage = buildGo114Package; + inherit (linuxPackages) nvidia_x11; + nvidiaGpuSupport = config.cudaSupport or false; }; nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; + inherit (linuxPackages) nvidia_x11; + nvidiaGpuSupport = config.cudaSupport or false; + }; + nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix { + buildGoPackage = buildGo115Package; + inherit (linuxPackages) nvidia_x11; + nvidiaGpuSupport = config.cudaSupport or false; }; notable = callPackage ../applications/misc/notable { }; @@ -6094,6 +6317,8 @@ in nssmdns = callPackage ../tools/networking/nss-mdns { }; + nvimpager = callPackage ../tools/misc/nvimpager { }; + nwdiag = with python3Packages; toPythonApplication nwdiag; nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { }; @@ -6108,8 +6333,12 @@ in nzbget = callPackage ../tools/networking/nzbget { }; + nzbhydra2 = callPackage ../servers/nzbhydra2 { }; + oathToolkit = callPackage ../tools/security/oath-toolkit { }; + oatpp = callPackage ../development/libraries/oatpp { }; + obex_data_server = callPackage ../tools/bluetooth/obex-data-server { }; obexd = callPackage ../tools/bluetooth/obexd { }; @@ -6163,6 +6392,8 @@ in onioncircuits = callPackage ../tools/security/onioncircuits { }; + onlykey-cli = callPackage ../tools/security/onlykey-cli { }; + openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { }; @@ -6283,7 +6514,9 @@ in opn2bankeditor = callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { }; - orangefs = callPackage ../tools/filesystems/orangefs { }; + orangefs = callPackage ../tools/filesystems/orangefs { + autoreconfHook = buildPackages.autoreconfHook269; + }; os-prober = callPackage ../tools/misc/os-prober {}; @@ -6305,6 +6538,8 @@ in overmind = callPackage ../applications/misc/overmind { }; + ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; + owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -6337,6 +6572,8 @@ in pandoc = callPackage ../development/tools/pandoc { }; + pandoc-lua-filters = callPackage ../tools/misc/pandoc-lua-filters { }; + pamtester = callPackage ../tools/security/pamtester { }; paperless = callPackage ../applications/office/paperless { }; @@ -6345,6 +6582,8 @@ in papertrail = callPackage ../tools/text/papertrail { }; + pappl = callPackage ../applications/printing/pappl { }; + par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { }; @@ -6353,7 +6592,9 @@ in parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { }; - parcellite = callPackage ../tools/misc/parcellite { }; + parcellite = callPackage ../tools/misc/parcellite { + autoreconfHook = buildPackages.autoreconfHook269; + }; patchutils = callPackage ../tools/text/patchutils { }; @@ -6406,6 +6647,8 @@ in pbzip2 = callPackage ../tools/compression/pbzip2 { }; + pcimem = callPackage ../os-specific/linux/pcimem { }; + pciutils = callPackage ../tools/system/pciutils { }; pcsclite = callPackage ../tools/security/pcsclite { @@ -6492,11 +6735,11 @@ in libcap = if stdenv.isDarwin then null else libcap; }; - pinentry-curses = (stdenv.lib.getOutput "curses" pinentry); - pinentry-emacs = (stdenv.lib.getOutput "emacs" pinentry); - pinentry-gtk2 = (stdenv.lib.getOutput "gtk2" pinentry); - pinentry-qt = (stdenv.lib.getOutput "qt" pinentry); - pinentry-gnome = (stdenv.lib.getOutput "gnome3" pinentry); + pinentry-curses = (lib.getOutput "curses" pinentry); + pinentry-emacs = (lib.getOutput "emacs" pinentry); + pinentry-gtk2 = (lib.getOutput "gtk2" pinentry); + pinentry-qt = (lib.getOutput "qt" pinentry); + pinentry-gnome = (lib.getOutput "gnome3" pinentry); pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -6525,6 +6768,8 @@ in graphviz = graphviz_2_32; }; + plantuml-server = callPackage ../tools/misc/plantuml-server { }; + plan9port = callPackage ../tools/system/plan9port { }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { }); @@ -6534,6 +6779,8 @@ in playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { }; + plujain-ramp = callPackage ../applications/audio/plujain-ramp { }; + plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; @@ -6639,6 +6886,8 @@ in proxychains = callPackage ../tools/networking/proxychains { }; + proxify = callPackage ../tools/networking/proxify { }; + proxytunnel = callPackage ../tools/misc/proxytunnel { openssl = openssl_1_0_2; }; @@ -6703,6 +6952,8 @@ in pythonPackages = python27Packages; }; + py-spy = callPackage ../development/tools/py-spy { }; + pytrainer = callPackage ../applications/misc/pytrainer { }; pywal = with python3Packages; toPythonApplication pywal; @@ -6713,6 +6964,8 @@ in remarshal = callPackage ../development/tools/remarshal { }; + rehex = callPackage ../applications/editors/rehex { }; + rig = callPackage ../tools/misc/rig { stdenv = gccStdenv; }; @@ -6767,9 +7020,9 @@ in qshowdiff = callPackage ../tools/text/qshowdiff { }; - qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; + qrcp = callPackage ../tools/networking/qrcp { }; - qtikz = libsForQt514.callPackage ../applications/graphics/ktikz { }; + qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; quickjs = callPackage ../development/interpreters/quickjs { }; @@ -6823,6 +7076,7 @@ in rdma-core = callPackage ../os-specific/linux/rdma-core { }; + rdrview = callPackage ../tools/networking/rdrview {}; real_time_config_quick_scan = callPackage ../applications/audio/real_time_config_quick_scan { }; @@ -6839,6 +7093,8 @@ in rep = callPackage ../development/tools/rep { }; + reicast = callPackage ../misc/emulators/reicast { }; + reredirect = callPackage ../tools/misc/reredirect { }; retext = libsForQt5.callPackage ../applications/editors/retext { }; @@ -6856,6 +7112,8 @@ in rtptools = callPackage ../tools/networking/rtptools { }; + rtss = callPackage ../development/tools/misc/rtss { }; + reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; @@ -6906,6 +7164,9 @@ in rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { }; + inherit (callPackage ../development/misc/resholve { }) + resholve resholvePackage; + reuse = callPackage ../tools/package-management/reuse { }; rewritefs = callPackage ../os-specific/linux/rewritefs { }; @@ -6995,6 +7256,8 @@ in rubocop = callPackage ../development/tools/rubocop { }; + ruffle = callPackage ../misc/emulators/ruffle { }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; @@ -7220,6 +7483,8 @@ in # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; + signumone-ks = callPackage ../applications/misc/signumone-ks { }; + silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; silc_server = callPackage ../servers/silc-server { }; @@ -7234,6 +7499,8 @@ in sipsak = callPackage ../tools/networking/sipsak { }; + siril = callPackage ../applications/science/astronomy/siril { }; + sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { }; sit = callPackage ../applications/version-management/sit { @@ -7256,6 +7523,7 @@ in sleuthkit = callPackage ../tools/system/sleuthkit {}; + # Not updated upstream since 2018, doesn't support qt newer than 5.12 sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; @@ -7281,7 +7549,9 @@ in smenu = callPackage ../tools/misc/smenu { }; - smesh = callPackage ../development/libraries/smesh {}; + smesh = callPackage ../development/libraries/smesh { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; smu = callPackage ../tools/text/smu { }; @@ -7372,6 +7642,8 @@ in solaar = callPackage ../applications/misc/solaar {}; + solanum = callPackage ../servers/irc/solanum {}; + sourceHighlight = callPackage ../tools/text/source-highlight { }; spacebar = callPackage ../os-specific/darwin/spacebar { @@ -7465,6 +7737,8 @@ in stabber = callPackage ../misc/stabber { }; + staticjinja = with python3.pkgs; toPythonApplication staticjinja; + stress = callPackage ../tools/system/stress { }; stress-ng = callPackage ../tools/system/stress-ng { }; @@ -7491,6 +7765,8 @@ in su = shadow.su; + subjs = callPackage ../tools/security/subjs { }; + subsonic = callPackage ../servers/misc/subsonic { }; subfinder = callPackage ../tools/networking/subfinder { }; @@ -7514,8 +7790,9 @@ in sysbench = callPackage ../development/tools/misc/sysbench {}; system-config-printer = callPackage ../tools/misc/system-config-printer { + autoreconfHook = buildPackages.autoreconfHook269; libxml2 = libxml2Python; - }; + }; systembus-notify = callPackage ../applications/misc/systembus-notify { }; @@ -7541,6 +7818,10 @@ in tabnine = callPackage ../development/tools/tabnine { }; + tab-rs = callPackage ../tools/misc/tab-rs { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + t1utils = callPackage ../tools/misc/t1utils { }; talkfilters = callPackage ../misc/talkfilters {}; @@ -7591,6 +7872,8 @@ in pythonPackages = python3Packages; }; + teler = callPackage ../tools/security/teler { }; + termius = callPackage ../applications/networking/termius { }; termplay = callPackage ../tools/misc/termplay { }; @@ -7657,7 +7940,7 @@ in tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; + tinc_pre = callPackage ../tools/networking/tinc/pre.nix { }; tinycbor = callPackage ../development/libraries/tinycbor { }; @@ -7665,11 +7948,13 @@ in tinyemu = callPackage ../applications/virtualization/tinyemu { }; - tinyfecvpn = callPackage ../tools/networking/tinyfecvpn {}; + tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; + + tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; tinyprog = callPackage ../development/tools/misc/tinyprog { }; - tinyproxy = callPackage ../tools/networking/tinyproxy {}; + tinyproxy = callPackage ../tools/networking/tinyproxy { }; tio = callPackage ../tools/misc/tio { }; @@ -7796,14 +8081,16 @@ in ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; - ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { }; + ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { + autoreconfHook = buildPackages.autoreconfHook269; + }; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; tty-clock = callPackage ../tools/misc/tty-clock { }; - ttyplot = callPackage ../tools/misc/ttyplot { }; + tty-share = callPackage ../applications/misc/tty-share { }; - ttyrec = callPackage ../tools/misc/ttyrec { }; + ttyplot = callPackage ../tools/misc/ttyplot { }; ttygif = callPackage ../tools/misc/ttygif { }; @@ -7821,6 +8108,8 @@ in turses = callPackage ../applications/networking/instant-messengers/turses { }; + tvm = callPackage ../development/compilers/tvm { }; + oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; twilight = callPackage ../tools/graphics/twilight { @@ -7829,6 +8118,8 @@ in twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twtxt = callPackage ../applications/networking/twtxt { }; + txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; txt2man = callPackage ../tools/misc/txt2man { }; @@ -7951,7 +8242,9 @@ in verilator = callPackage ../applications/science/electronics/verilator {}; - verilog = callPackage ../applications/science/electronics/verilog {}; + verilog = callPackage ../applications/science/electronics/verilog { + autoconf = buildPackages.autoconf269; + }; versus = callPackage ../applications/networking/versus { }; @@ -8060,6 +8353,7 @@ in watchman = callPackage ../development/tools/watchman { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoconf = buildPackages.autoconf269; }; wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; @@ -8088,6 +8382,8 @@ in wimboot = callPackage ../tools/misc/wimboot { }; + wire = callPackage ../development/tools/wire { }; + wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; woff2 = callPackage ../development/web/woff2 { }; @@ -8182,7 +8478,9 @@ in uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = callPackage ../tools/inputmethods/uim { }; + uim = callPackage ../tools/inputmethods/uim { + autoconf = buildPackages.autoconf269; + }; uhub = callPackage ../servers/uhub { }; @@ -8219,6 +8517,8 @@ in xbrightness = callPackage ../tools/X11/xbrightness { }; + xdg-launch = callPackage ../applications/misc/xdg-launch { }; + xkbvalidate = callPackage ../tools/X11/xkbvalidate { }; xfstests = callPackage ../tools/misc/xfstests { }; @@ -8263,6 +8563,8 @@ in urjtag = callPackage ../tools/misc/urjtag { }; + urlhunter = callPackage ../tools/security/urlhunter { }; + urlwatch = callPackage ../tools/networking/urlwatch { }; valum = callPackage ../development/web/valum { }; @@ -8291,7 +8593,7 @@ in vmtouch = callPackage ../tools/misc/vmtouch { }; - vncdo = callPackage ../tools/admin/vncdo { }; + vncdo = with python3Packages; toPythonApplication vncdo; volumeicon = callPackage ../tools/audio/volumeicon { }; @@ -8374,6 +8676,7 @@ in # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; + autoconf = buildPackages.autoconf269; }; clipnotify = callPackage ../tools/misc/clipnotify { }; @@ -8501,7 +8804,9 @@ in zbackup = callPackage ../tools/backup/zbackup {}; - zbar = libsForQt5.callPackage ../tools/graphics/zbar { }; + zbar = libsForQt5.callPackage ../tools/graphics/zbar { + autoreconfHook = buildPackages.autoreconfHook269; + }; zdelta = callPackage ../tools/compression/zdelta { }; @@ -8590,8 +8895,8 @@ 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 { + bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { }); + bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix { interactive = true; withDocs = true; }); @@ -8618,9 +8923,11 @@ in fish = callPackage ../shells/fish { }; - fish-foreign-env = callPackage ../shells/fish/fish-foreign-env { }; + fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); - ion = callPackage ../shells/ion { }; + ion = callPackage ../shells/ion { + inherit (darwin) Security; + }; jush = callPackage ../shells/jush { }; @@ -8634,6 +8941,8 @@ in oil = callPackage ../shells/oil { }; + oksh = callPackage ../shells/oksh { }; + pash = callPackage ../shells/pash { }; tcsh = callPackage ../shells/tcsh { }; @@ -8663,6 +8972,42 @@ in jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; + adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix; + adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; + + adoptopenjdk-hotspot-bin-15 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-15-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-15 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-15-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-15-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-15 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-15-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-15-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-15 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-15-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-15-packages-darwin.jre-openj9 {}; + + adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix; + adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix; + + adoptopenjdk-hotspot-bin-14 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-14-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-14 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-14-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-14-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-14 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-14-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-14-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-14 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-14-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-14-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; @@ -8754,12 +9099,14 @@ in gmp-static = gmp.override { withStatic = true; }; }; + cakelisp = callPackage ../development/compilers/cakelisp { }; + ciao = callPackage ../development/compilers/ciao { }; colm = callPackage ../development/compilers/colm { }; colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; - colmapWithCuda = colmap.override { cudaSupport = true; }; + colmapWithCuda = colmap.override { cudaSupport = true; cudatoolkit = cudatoolkit_11; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; chickenPackages_5 = callPackage ../development/compilers/chicken/5 { }; @@ -8815,7 +9162,10 @@ in llvmPackages = llvmPackages_latest; }; - clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { }; + clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { + llvmPackages = llvmPackages_latest; + inherit (llvmPackages_latest) clang; + }; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; @@ -8853,7 +9203,7 @@ in mkdir -p "$rsrc/lib" ln -s "${cc}/lib" "$rsrc/include" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' + '' + lib.optionalString (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags ''; }; @@ -8868,8 +9218,9 @@ in crystal_0_33 crystal_0_34 crystal_0_35 - crystal - crystal2nix; + crystal; + + crystal2nix = callPackage ../development/compilers/crystal2nix { }; icr = callPackage ../development/tools/icr { }; @@ -8905,6 +9256,8 @@ in fasmg = callPackage ../development/compilers/fasmg { }; + flasm = callPackage ../development/compilers/flasm { }; + flyctl = callPackage ../development/web/flyctl { }; flutterPackages = @@ -8925,10 +9278,10 @@ in gccFun = callPackage (if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then ../development/compilers/gcc/6 - else ../development/compilers/gcc/9); + else ../development/compilers/gcc/10); gcc = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") - then gcc6 else gcc9; - + then gcc6 else + if stdenv.targetPlatform.isAarch64 then gcc9 else gcc10; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -9266,7 +9619,8 @@ in gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; - gcc-arm-embedded = gcc-arm-embedded-9; + gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 {}; + gcc-arm-embedded = gcc-arm-embedded-10; gdc = gdc9; gdc9 = wrapCC (gcc9.cc.override { @@ -9291,7 +9645,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8102; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103; inherit (haskellPackages) ghc; @@ -9300,6 +9654,8 @@ in stack = haskell.lib.justStaticExecutables haskellPackages.stack; hlint = haskell.lib.justStaticExecutables haskellPackages.hlint; + krank = haskell.lib.justStaticExecutables haskellPackages.krank; + # We use a version built with an older compiler because of https://github.com/pikajude/stylish-cabal/issues/12. stylish-cabal = haskell.lib.justStaticExecutables haskell.packages.ghc865.stylish-cabal; @@ -9380,6 +9736,13 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); + go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); + go = go_1_15; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -9418,7 +9781,7 @@ in openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx14 = callPackage ../development/compilers/openjdk/openjfx/14.nix { }; + openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; openjdk8-bootstrap = if adoptopenjdk-hotspot-bin-8.meta.available then @@ -9468,21 +9831,27 @@ in else openjdk11.override { headless = true; }; - openjdk14-bootstrap = - if adoptopenjdk-hotspot-bin-13.meta.available then - adoptopenjdk-hotspot-bin-13 + openjdk15-bootstrap = + if adoptopenjdk-hotspot-bin-14.meta.available then + adoptopenjdk-hotspot-bin-14 else - /* adoptopenjdk not available for i686, so fall back to our old builds of 12 & 13 for bootstrapping */ - callPackage ../development/compilers/openjdk/13.nix { + /* adoptopenjdk not available for i686, so fall back to our old builds of 12, 13, & 14 for bootstrapping */ + callPackage ../development/compilers/openjdk/14.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; - openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; + openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + inherit (gnome2) GConf gnome_vfs; + }; }; }; @@ -9490,27 +9859,27 @@ in jdk11_headless = openjdk11_headless; /* Latest JDK */ - openjdk14 = + openjdk15 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } else callPackage ../development/compilers/openjdk { - openjfx = openjfx14; + openjfx = openjfx15; inherit (gnome2) GConf gnome_vfs; }; - openjdk14_headless = + openjdk15_headless = if stdenv.isDarwin then - openjdk14 + openjdk15 else - openjdk14.override { headless = true; }; + openjdk15.override { headless = true; }; - jdk14 = openjdk14; - jdk14_headless = openjdk14_headless; + jdk15 = openjdk15; + jdk15_headless = openjdk15_headless; /* default JDK */ - jdk = jdk14; + jdk = jdk15; # Since the introduction of the Java Platform Module System in Java 9, Java # no longer ships a separate JRE package. @@ -9519,13 +9888,13 @@ in # 'jre_minimal' to build a bespoke JRE containing only the modules you need. # # For a general-purpose system, 'jre' defaults to the full JDK: - jre = jdk14; - jre_headless = jdk14_headless; + jre = jdk15; + jre_headless = jdk15_headless; jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { }; - openjdk = openjdk14; - openjdk_headless = openjdk14_headless; + openjdk = openjdk15; + openjdk_headless = openjdk15_headless; inherit (callPackages ../development/compilers/graalvm { gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; @@ -9543,15 +9912,7 @@ in graalvm8-ee graalvm11-ee; - # Cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - openshot-qt = (pkgs.extend (final: prev: rec { - qt5 = if stdenv.isDarwin then prev.qt5 else prev.qt514; - libsForQt5 = if stdenv.isDarwin then prev.libsForQt5 else prev.libsForQt514; - pythonInterpreters = prev.pythonInterpreters.override { - pkgs = final; - }; - })).libsForQt5.callPackage ../applications/video/openshot-qt { }; + openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; @@ -9615,7 +9976,6 @@ in knightos-kimg = callPackage ../development/tools/knightos/kimg { asciidoc = asciidoc-full; - imagemagick = imagemagick7Big; }; knightos-kpack = callPackage ../development/tools/knightos/kpack { }; @@ -9728,7 +10088,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_11.tools; targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; }); @@ -9814,9 +10174,14 @@ in nrpl = callPackage ../development/tools/nrpl { }; + nimlsp = callPackage ../development/tools/misc/nimlsp { }; + neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + nextpnr = callPackage ../development/compilers/nextpnr { }; + + nextpnrWithGui = libsForQt5.callPackage ../development/compilers/nextpnr { + enableGui = true; inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -9931,17 +10296,15 @@ in # So this commit doesn't remove the 1.45.2 release. rust_1_45 = callPackage ../development/compilers/rust/1_45.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10; }; - rust_1_47 = callPackage ../development/compilers/rust/1_47.nix { + rust_1_48 = callPackage ../development/compilers/rust/1_48.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11; }; - rust = rust_1_47; + rust = rust_1_48; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_47 = rust_1_47.packages.stable; - rustPackages = rustPackages_1_47; + rustPackages_1_48 = rust_1_48.packages.stable; + rustPackages = rustPackages_1_48; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -9949,7 +10312,6 @@ in buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; - buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }); cratesIO = callPackage ../build-support/rust/crates-io.nix { }; cargo-web = callPackage ../development/tools/cargo-web { @@ -10034,6 +10396,7 @@ in cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) CoreServices; }; + cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { }; cargo-generate = callPackage ../development/tools/rust/cargo-generate { inherit (darwin.apple_sdk.frameworks) Security; @@ -10066,11 +10429,10 @@ in sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; - inherit (callPackage ../development/compilers/scala/2.x.nix { jre = jre8; }) - scala_2_10 - scala_2_11 - scala_2_12 - scala_2_13; + scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; }; + scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; }; + scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; jre = jdk8; }; + scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; }; scala = scala_2_13; @@ -10097,7 +10459,9 @@ in solc = callPackage ../development/compilers/solc { }; - souffle = callPackage ../development/compilers/souffle { }; + souffle = callPackage ../development/compilers/souffle { + autoreconfHook = buildPackages.autoreconfHook269; + }; spasm-ng = callPackage ../development/compilers/spasm-ng { }; @@ -10173,6 +10537,8 @@ in vala_0_48 vala; + vyper = with python3Packages; toPythonApplication vyper; + wcc = callPackage ../development/compilers/wcc { }; wla-dx = callPackage ../development/compilers/wla-dx { }; @@ -10189,7 +10555,7 @@ in # want the C++ library to be explicitly chosen by the caller, and null by # default. libcxx ? null - , extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross + , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross , ... } @ extraArgs: callPackage ../build-support/cc-wrapper (let self = { @@ -10268,7 +10634,10 @@ in clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; - clojure = callPackage ../development/interpreters/clojure { }; + clojure = callPackage ../development/interpreters/clojure { + # set this to an LTS version of java + jdk = jdk11; + }; clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; @@ -10276,17 +10645,19 @@ in dhall = haskell.lib.justStaticExecutables haskellPackages.dhall; - dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; - dhall-bash = haskell.lib.justStaticExecutables haskellPackages.dhall-bash; - dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; + dhall-docs = haskell.lib.justStaticExecutables haskellPackages.dhall-docs; dhall-lsp-server = haskell.lib.justStaticExecutables haskellPackages.dhall-lsp-server; + dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; + + dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; + dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; - dhallPackages = callPackages ./dhall-packages.nix { }; + dhallPackages = callPackage ./dhall-packages.nix { }; duktape = callPackage ../development/interpreters/duktape { }; @@ -10385,7 +10756,7 @@ in ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; @@ -10431,19 +10802,16 @@ in octave = callPackage ../development/interpreters/octave { python = python3; mkDerivation = stdenv.mkDerivation; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octave-jit = callPackage ../development/interpreters/octave { python = python3; enableJIT = true; mkDerivation = stdenv.mkDerivation; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octaveFull = libsForQt5.callPackage ../development/interpreters/octave { python = python3; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; ocropus = callPackage ../applications/misc/ocropus { }; @@ -10458,6 +10826,12 @@ in phpExtensions = php74Extensions; phpPackages = php74Packages; + php80 = callPackage ../development/interpreters/php/8.0.nix { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; + php80Extensions = recurseIntoAttrs php80.extensions; + php80Packages = recurseIntoAttrs php80.packages; + # Import PHP74 interpreter, extensions and packages php74 = callPackage ../development/interpreters/php/7.4.nix { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; @@ -10541,20 +10915,15 @@ in python2Packages = python2.pkgs; python3Packages = python3.pkgs; - pythonInterpreters = callPackage ./../development/interpreters/python { - # Overrides that apply to all Python interpreters and their packages - # Generally, this should be avoided. - pkgs = pkgs.extend (final: _: { - }); - }; + pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy36; # Python package sets. - python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); + python27Packages = python27.pkgs; python36Packages = python36.pkgs; python37Packages = recurseIntoAttrs python37.pkgs; python38Packages = recurseIntoAttrs python38.pkgs; - python39Packages = python39.pkgs; + python39Packages = recurseIntoAttrs python39.pkgs; python310Packages = python310.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; @@ -10648,9 +11017,12 @@ in solargraph = callPackage ../development/ruby-modules/solargraph { }; + rbenv = callPackage ../development/ruby-modules/rbenv { }; + inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; + autoreconfHook = buildPackages.autoreconfHook269; bison = buildPackages.bison_3_5; }) ruby_2_5 @@ -10679,7 +11051,7 @@ in spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; @@ -10701,6 +11073,8 @@ in tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; + tclreadline = callPackage ../development/interpreters/tclreadline { }; + wasm = ocamlPackages.wasm; proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; @@ -10846,15 +11220,6 @@ in ant = apacheAnt; apacheKafka = apacheKafka_2_5; - apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; - apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; - apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; - apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; - apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; }; - apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; }; - apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; }; - apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; }; - apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; }; apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; }; @@ -10877,12 +11242,14 @@ in autobuild = callPackage ../development/tools/misc/autobuild { }; - autoconf = callPackage ../development/tools/misc/autoconf { }; + autoconf = autoconf270; autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { }; + autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { }; + autoconf270 = callPackage ../development/tools/misc/autoconf { }; autocutsel = callPackage ../tools/X11/autocutsel{ }; @@ -11352,6 +11719,8 @@ in fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); + ffuf = callPackage ../tools/security/ffuf { }; + flow = callPackage ../development/tools/analysis/flow { ocamlPackages = ocaml-ng.ocamlPackages_4_07; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -11372,6 +11741,7 @@ in fswatch = callPackage ../development/tools/misc/fswatch { inherit (darwin.apple_sdk.frameworks) CoreServices; + autoreconfHook = buildPackages.autoreconfHook269; }; fujprog = callPackage ../development/tools/misc/fujprog { @@ -11570,6 +11940,9 @@ in khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; + + krew = callPackage ../development/tools/krew { }; + kube-aws = callPackage ../development/tools/kube-aws { }; kubectx = callPackage ../development/tools/kubectx { }; @@ -11728,7 +12101,9 @@ in opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { }; + openocd = callPackage ../development/tools/misc/openocd { + autoreconfHook = buildPackages.autoreconfHook269; + }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; @@ -11751,6 +12126,8 @@ in pax-rs = callPackage ../development/tools/pax-rs { }; + perfect-hash = callPackage ../development/tools/misc/perfect-hash { }; + peg = callPackage ../development/tools/parsing/peg { }; pgcli = pkgs.python3Packages.pgcli; @@ -12069,6 +12446,8 @@ in ttyd = callPackage ../servers/ttyd { }; + turbogit = callPackage ../development/tools/turbogit { }; + tweak = callPackage ../applications/editors/tweak { }; tychus = callPackage ../development/tools/tychus { @@ -12087,6 +12466,8 @@ in universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; + unused = callPackage ../development/tools/misc/unused { }; + vagrant = callPackage ../development/tools/vagrant {}; vala-language-server = callPackage ../development/tools/vala-language-server {}; @@ -12131,6 +12512,8 @@ in xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; + xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; + xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; @@ -12172,6 +12555,8 @@ in yq-go = callPackage ../development/tools/yq-go { }; + ytt = callPackage ../development/tools/ytt {}; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -12253,7 +12638,7 @@ in arrayfire = callPackage ../development/libraries/arrayfire {}; arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ - } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' }); @@ -12286,10 +12671,16 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; + aws-c-cal = callPackage ../development/libraries/aws-c-cal { + inherit (darwin.apple_sdk.frameworks) Security; + }; + aws-c-common = callPackage ../development/libraries/aws-c-common { }; aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; + aws-c-io = callPackage ../development/libraries/aws-c-io { }; + aws-checksums = callPackage ../development/libraries/aws-checksums { }; aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { @@ -12318,14 +12709,15 @@ in inherit (llvmPackages_6) llvm clang-unwrapped; }; - belle-sip = callPackage ../development/libraries/belle-sip { - stdenv = gcc8Stdenv; - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + belle-sip = callPackage ../development/libraries/belle-sip { }; - libbfd = callPackage ../development/libraries/libbfd { }; + libbfd = callPackage ../development/libraries/libbfd { + autoreconfHook = buildPackages.autoreconfHook269; + }; - libopcodes = callPackage ../development/libraries/libopcodes { }; + libopcodes = callPackage ../development/libraries/libopcodes { + autoreconfHook = buildPackages.autoreconfHook269; + }; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; @@ -12357,7 +12749,8 @@ in boost172 = callPackage ../development/libraries/boost/1.72.nix { }; boost173 = callPackage ../development/libraries/boost/1.73.nix { }; boost174 = callPackage ../development/libraries/boost/1.74.nix { }; - boost17x = boost174; + boost175 = callPackage ../development/libraries/boost/1.75.nix { }; + boost17x = boost175; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -12386,7 +12779,7 @@ in hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; - niv = haskellPackages.niv.bin; + niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv); ormolu = haskellPackages.ormolu.bin; @@ -12585,7 +12978,9 @@ in inherit suidHelper serviceDirectories apparmor; }; - dee = callPackage ../development/libraries/dee { }; + dee = callPackage ../development/libraries/dee { + autoreconfHook = buildPackages.autoreconfHook269; + }; dhex = callPackage ../applications/editors/dhex { }; @@ -12609,6 +13004,8 @@ in docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; + docopts = callPackage ../development/tools/misc/docopts { }; + dotconf = callPackage ../development/libraries/dotconf { }; draco = callPackage ../development/libraries/draco { }; @@ -12630,6 +13027,8 @@ in duckdb = callPackage ../development/libraries/duckdb {}; + duckstation = libsForQt5.callPackage ../misc/emulators/duckstation {}; + easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; eccodes = callPackage ../development/libraries/eccodes { @@ -12661,6 +13060,8 @@ in enet = callPackage ../development/libraries/enet { }; + entt = callPackage ../development/libraries/entt { }; + epoxy = callPackage ../development/libraries/epoxy {}; libesmtp = callPackage ../development/libraries/libesmtp { }; @@ -12689,6 +13090,7 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; + autoreconfHook = buildPackages.autoreconfHook269; }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -12719,19 +13121,14 @@ in ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { + svt-av1 = if stdenv.isAarch64 then null else svt-av1; # The following need to be fixed on Darwin - frei0r = if stdenv.isDarwin then null else frei0r; - game-music-emu = if stdenv.isDarwin then null else game-music-emu; libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; - openal = if stdenv.isDarwin then null else openal; libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; - rav1e = if stdenv.isDarwin then null else rav1e; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; - x265 = if stdenv.isDarwin then null else x265; - xavs = if stdenv.isDarwin then null else xavs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; @@ -12889,6 +13286,7 @@ in gdal = callPackage ../development/libraries/gdal { pythonPackages = python3Packages; + autoreconfHook = buildPackages.autoreconfHook269; }; gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; @@ -12935,9 +13333,11 @@ in gle = callPackage ../development/libraries/gle { }; - glew = callPackage ../development/libraries/glew { }; + glew = callPackage ../development/libraries/glew { + inherit (darwin.apple_sdk.frameworks) OpenGL; + }; glew110 = callPackage ../development/libraries/glew/1.10.nix { - inherit (darwin.apple_sdk.frameworks) AGL; + inherit (darwin.apple_sdk.frameworks) AGL OpenGL; }; glfw = glfw3; @@ -13107,6 +13507,7 @@ in gnutls = callPackage ../development/libraries/gnutls/default.nix { inherit (darwin.apple_sdk.frameworks) Security; util-linux = util-linuxMinimal; # break the cyclic dependency + autoconf = buildPackages.autoconf269; }; gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix { @@ -13289,6 +13690,7 @@ in heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; + autoreconfHook = buildPackages.autoreconfHook269; }; libheimdal = heimdal; @@ -13308,11 +13710,12 @@ in hdt = callPackage ../misc/hdt {}; - herqq = libsForQt514.callPackage ../development/libraries/herqq { }; + herqq = libsForQt5.callPackage ../development/libraries/herqq { }; hidapi = callPackage ../development/libraries/hidapi { # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; + autoreconfHook = buildPackages.autoreconfHook269; }; highfive = callPackage ../development/libraries/highfive { }; @@ -13325,7 +13728,9 @@ in hiredis-vip = callPackage ../development/libraries/hiredis-vip { }; - hivex = callPackage ../development/libraries/hivex { }; + hivex = callPackage ../development/libraries/hivex { + autoreconfHook = buildPackages.autoreconfHook269; + }; hound = callPackage ../development/tools/misc/hound { }; @@ -13372,42 +13777,42 @@ in icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; } // - (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu59 = callPackage ../development/libraries/icu/59.nix ({ nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu60 = callPackage ../development/libraries/icu/60.nix ({ nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu63 = callPackage ../development/libraries/icu/63.nix ({ nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu64 = callPackage ../development/libraries/icu/64.nix ({ nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu65 = callPackage ../development/libraries/icu/65.nix ({ nativeBuildRoot = buildPackages.icu65.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu66 = callPackage ../development/libraries/icu/66.nix ({ nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu67 = callPackage ../development/libraries/icu/67.nix ({ nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); @@ -13450,6 +13855,8 @@ in indilib = callPackage ../development/libraries/indilib { }; + inih = callPackage ../development/libraries/inih { }; + iniparser = callPackage ../development/libraries/iniparser { }; intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { }; @@ -13600,6 +14007,8 @@ in lib3mf = callPackage ../development/libraries/lib3mf { }; + libAfterImage = callPackage ../development/libraries/libAfterImage { }; + libaacs = callPackage ../development/libraries/libaacs { }; libaal = callPackage ../development/libraries/libaal { }; @@ -13638,7 +14047,9 @@ in libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; - libarchive = callPackage ../development/libraries/libarchive { }; + libarchive = callPackage ../development/libraries/libarchive { + autoreconfHook = buildPackages.autoreconfHook269; + }; libasr = callPackage ../development/libraries/libasr { }; @@ -13845,6 +14256,8 @@ in libdnet = callPackage ../development/libraries/libdnet { }; + libdnf = callPackage ../tools/package-management/libdnf { }; + libdrm = callPackage ../development/libraries/libdrm { }; libdv = callPackage ../development/libraries/libdv { }; @@ -13870,7 +14283,9 @@ in libe57format = callPackage ../development/libraries/libe57format { }; - libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { + autoreconfHook = buildPackages.autoreconfHook269; + }; libeb = callPackage ../development/libraries/libeb { }; @@ -13950,6 +14365,8 @@ in libinjection = callPackage ../development/libraries/libinjection { }; + libinklevel = callPackage ../development/libraries/libinklevel { }; + libnats-c = callPackage ../development/libraries/libnats-c { openssl = openssl_1_0_2; }; @@ -14012,6 +14429,8 @@ in libfixposix = callPackage ../development/libraries/libfixposix {}; + libff = callPackage ../development/libraries/libff { }; + libffcall = callPackage ../development/libraries/libffcall { }; libffi = callPackage ../development/libraries/libffi { }; @@ -14047,15 +14466,22 @@ in libgpiod = callPackage ../development/libraries/libgpiod { }; - libgpod = callPackage ../development/libraries/libgpod { }; + libgpod = callPackage ../development/libraries/libgpod { + autoreconfHook = buildPackages.autoreconfHook269; + }; libgssglue = callPackage ../development/libraries/libgssglue { }; libgudev = callPackage ../development/libraries/libgudev { }; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; - libguestfs = callPackage ../development/libraries/libguestfs { }; - libguestfs-with-appliance = libguestfs.override { appliance = libguestfs-appliance; }; + libguestfs = callPackage ../development/libraries/libguestfs { + autoreconfHook = buildPackages.autoreconfHook264; + }; + libguestfs-with-appliance = libguestfs.override { + appliance = libguestfs-appliance; + autoreconfHook = buildPackages.autoreconfHook264; + }; libhangul = callPackage ../development/libraries/libhangul { }; @@ -14174,6 +14600,8 @@ in librime = callPackage ../development/libraries/librime {}; + librtprocess = callPackage ../development/libraries/librtprocess { }; + libsamplerate = callPackage ../development/libraries/libsamplerate { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices; }; @@ -14230,6 +14658,8 @@ in libimagequant = callPackage ../development/libraries/libimagequant {}; + libime = callPackage ../development/libraries/libime { }; + libinfinity = callPackage ../development/libraries/libinfinity { }; libinput = callPackage ../development/libraries/libinput { @@ -14257,7 +14687,9 @@ in libjreen = callPackage ../development/libraries/libjreen { }; - libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; + libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { + libmicrohttpd = libmicrohttpd_0_9_72; + }; libkate = callPackage ../development/libraries/libkate { }; @@ -14280,6 +14712,7 @@ in libmatchbox = callPackage ../development/libraries/libmatchbox { }; libmatheval = callPackage ../development/libraries/libmatheval { + autoconf = buildPackages.autoconf269; guile = guile_2_0; }; @@ -14293,7 +14726,10 @@ in libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; + libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { }; + libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { }; + libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { }; + libmicrohttpd = libmicrohttpd_0_9_71; libmikmod = callPackage ../development/libraries/libmikmod { inherit (darwin.apple_sdk.frameworks) CoreAudio; @@ -14339,6 +14775,8 @@ in libndctl = callPackage ../development/libraries/libndctl { }; + libnest2d = callPackage ../development/libraries/libnest2d { }; + libnet = callPackage ../development/libraries/libnet { }; libnetfilter_acct = callPackage ../development/libraries/libnetfilter_acct { }; @@ -14459,6 +14897,8 @@ in libs3 = callPackage ../development/libraries/libs3 { }; + libschrift = callPackage ../development/libraries/libschrift { }; + libsearpc = callPackage ../development/libraries/libsearpc { }; libsigcxx = callPackage ../development/libraries/libsigcxx { }; @@ -14525,11 +14965,18 @@ in libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { }; + libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + python = python3; + }; - libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { }; + libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; + + libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { }; - libtorrentRasterbar = libtorrentRasterbar-1_2_x; + libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; # this is still the new version of the old API libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; @@ -14603,6 +15050,8 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; + libuvc = callPackage ../development/libraries/libuvc { }; + libv4l = lowPrio (v4l-utils.override { withUtils = false; }); @@ -14796,6 +15245,8 @@ in mbedtls = callPackage ../development/libraries/mbedtls { }; + mdctags = callPackage ../development/tools/misc/mdctags { }; + mdds = callPackage ../development/libraries/mdds { }; mediastreamer = callPackage ../development/libraries/mediastreamer { }; @@ -14822,7 +15273,7 @@ in libGLU = mesa_glu; mesa = callPackage ../development/libraries/mesa { - llvmPackages = llvmPackages_9; + llvmPackages = llvmPackages_latest; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; @@ -14849,6 +15300,8 @@ in minizip = callPackage ../development/libraries/minizip { }; + minizip2 = callPackage ../development/libraries/minizip2 { }; + mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { @@ -14933,6 +15386,8 @@ in notify-sharp = callPackage ../development/libraries/notify-sharp { }; + notcurses = callPackage ../development/libraries/notcurses { }; + ncurses5 = ncurses.override { abiVersion = "5"; }; @@ -15286,6 +15741,8 @@ in gnupth = callPackage ../development/libraries/pth { }; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; + pslib = callPackage ../development/libraries/pslib { }; + pstreams = callPackage ../development/libraries/pstreams {}; pugixml = callPackage ../development/libraries/pugixml { }; @@ -15309,7 +15766,7 @@ in qjson = callPackage ../development/libraries/qjson { }; - qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; + qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { libpng = libpng12; @@ -15429,7 +15886,7 @@ in kwin kwrited milou oxygen plasma-browser-integration plasma-desktop plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings user-manager xdg-desktop-portal-kde + systemsettings xdg-desktop-portal-kde ; inherit ((plasma5.override { libsForQt5 = self; }).thirdParty) @@ -15440,9 +15897,9 @@ in inherit (kdeApplications.override { libsForQt5 = self; }) libkdcraw libkexiv2 libkipi libkomparediff2 libksane libkcddb akonadi-contacts - akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface - kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight - granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic + akonadi-calendar akonadi-notes akonadi-search kaccounts-integration kidentitymanagement + kontactinterface kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs + filelight granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kitinerary kleopatra klettres klines kmag kmail kmines kmix kmplot @@ -15465,6 +15922,8 @@ in fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; + fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; + qgpgme = callPackage ../development/libraries/gpgme { }; grantlee = callPackage ../development/libraries/grantlee/5 { }; @@ -15489,6 +15948,8 @@ in kreport = callPackage ../development/libraries/kreport { }; + kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; + ldutils = callPackage ../development/libraries/ldutils { }; libcommuni = callPackage ../development/libraries/libcommuni { }; @@ -15537,6 +15998,12 @@ in suffix = "qt5"; }; + poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { + lcms = lcms2; + qt5Support = true; + suffix = "qt5"; + }; + pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; @@ -15582,6 +16049,8 @@ in # Not a library, but we do want it to be built for every qt version there # is, to allow users to choose the right build if needed. sddm = callPackage ../applications/display-managers/sddm { }; + + signond = callPackage ../development/libraries/signond {}; }; qtEnv = qt5.env; @@ -15673,7 +16142,13 @@ in qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; - qradiolink = callPackage ../applications/radio/qradiolink { }; + qradiolink = callPackage ../applications/radio/qradiolink { + # 3.8 support is not ready yet: + # https://github.com/qradiolink/qradiolink/issues/67#issuecomment-703222573 + # The non minimal build is used because the 'qtgui' component is needed. + # gr-osmosdr is using the same gnuradio as of now. + gnuradio = gnuradio3_7-unwrapped; + }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -15722,7 +16197,9 @@ in sbc = callPackage ../development/libraries/sbc { }; - schroedinger = callPackage ../development/libraries/schroedinger { }; + schroedinger = callPackage ../development/libraries/schroedinger { + autoreconfHook = buildPackages.autoreconfHook269; + }; SDL = callPackage ../development/libraries/SDL ({ inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa; @@ -15789,6 +16266,8 @@ in graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; + s2n = callPackage ../development/libraries/s2n { }; + simavr = callPackage ../development/tools/simavr { avrgcc = pkgsCross.avr.buildPackages.gcc; avrlibc = pkgsCross.avr.libcCross; @@ -15856,6 +16335,8 @@ in soapyairspy = callPackage ../applications/radio/soapyairspy { }; + soapyaudio = callPackage ../applications/radio/soapyaudio { }; + soapybladerf = callPackage ../applications/radio/soapybladerf { }; soapyhackrf = callPackage ../applications/radio/soapyhackrf { }; @@ -15868,6 +16349,7 @@ in extraPackages = [ limesuite soapyairspy + soapyaudio soapybladerf soapyhackrf soapyremote @@ -15999,6 +16481,8 @@ in steghide = callPackage ../tools/security/steghide {}; + stegseek = callPackage ../tools/security/stegseek {}; + stlport = callPackage ../development/libraries/stlport { }; streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; @@ -16023,10 +16507,6 @@ in python = python3; }; - sundials_2 = callPackage ../development/libraries/sundials/2.x.nix { - python = python3; - }; - sutils = callPackage ../tools/misc/sutils { }; svrcore = callPackage ../development/libraries/svrcore { }; @@ -16053,9 +16533,7 @@ in taglib-sharp = callPackage ../development/libraries/taglib-sharp { }; - talloc = callPackage ../development/libraries/talloc { - python = buildPackages.python3; - }; + talloc = callPackage ../development/libraries/talloc { }; tclap = callPackage ../development/libraries/tclap {}; @@ -16138,7 +16616,9 @@ in totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; - tpm2-tss = callPackage ../development/libraries/tpm2-tss { }; + tpm2-tss = callPackage ../development/libraries/tpm2-tss { + autoreconfHook = buildPackages.autoreconfHook269; + }; tremor = callPackage ../development/libraries/tremor { }; @@ -16239,16 +16719,16 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; - vtk = callPackage ../development/libraries/vtk { + vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix { + stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT; }; - - vtk_7 = callPackage ../development/libraries/vtk/7.x.nix { - stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; + vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { + stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -16256,7 +16736,7 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; - vtk_9 = libsForQt514.callPackage ../development/libraries/vtk/9.x.nix { + vtk_9 = libsForQt515.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -16264,6 +16744,9 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; + vtk = vtk_8; + vtkWithQt5 = vtk.override { enableQt = true; }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; @@ -16271,8 +16754,6 @@ in vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; - vtkWithQt5 = vtk.override { qtLib = qt514; }; - vxl = callPackage ../development/libraries/vxl { libpng = libpng12; stdenv = gcc6Stdenv; # upstream code incompatible with gcc7 @@ -16281,6 +16762,7 @@ in waffle = callPackage ../development/libraries/waffle { }; wally-cli = callPackage ../development/tools/wally-cli { }; + zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { }; wavpack = callPackage ../development/libraries/wavpack { }; @@ -16386,6 +16868,8 @@ in xdo = callPackage ../tools/misc/xdo { }; + xed = callPackage ../development/libraries/xed { }; + xineLib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; @@ -16471,8 +16955,10 @@ in zmqpp = callPackage ../development/libraries/zmqpp { }; + libzra = callPackage ../development/libraries/libzra { }; + zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_10; + llvmPackages = llvmPackages_11; }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -16658,11 +17144,13 @@ in perlcritic = perlPackages.PerlCritic; - sqitchPg = callPackage ../development/tools/misc/sqitch { - name = "sqitch-pg"; - databaseModule = perlPackages.DBDPg; - sqitchModule = perlPackages.AppSqitch; - }; + sqitchMysql = (callPackage ../development/tools/misc/sqitch { + mysqlSupport = true; + }).overrideAttrs (oldAttrs: { pname = "sqitch-mysql"; }); + + sqitchPg = (callPackage ../development/tools/misc/sqitch { + postgresqlSupport = true; + }).overrideAttrs (oldAttrs: { pname = "sqitch-pg"; }); ### DEVELOPMENT / R MODULES @@ -16803,13 +17291,15 @@ in cayley = callPackage ../servers/cayley { }; - charybdis = callPackage ../servers/irc/charybdis { }; + charybdis = callPackage ../servers/irc/charybdis { + autoreconfHook = buildPackages.autoreconfHook269; + }; clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { - # clickhouse doesn't build on llvm8. - inherit (llvmPackages_9) clang-unwrapped lld lldClang llvm; + # upstream requires llvm10 as of v20.11.4.13 + inherit (llvmPackages_10) clang-unwrapped lld lldClang llvm; }; couchdb = callPackage ../servers/http/couchdb { @@ -16849,6 +17339,8 @@ in diod = callPackage ../servers/diod { lua = lua5_1; }; + directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {}; + dkimproxy = callPackage ../servers/mail/dkimproxy { }; do-agent = callPackage ../servers/monitoring/do-agent { }; @@ -16907,8 +17399,6 @@ in firebird = callPackage ../servers/firebird { icu = null; /*stdenv = gcc5Stdenv;*/ }; firebirdSuper = firebird.override { icu = icu58; superServer = true; /*stdenv = gcc5Stdenv;*/ }; - frab = callPackage ../servers/web-apps/frab { }; - freeradius = callPackage ../servers/freeradius { }; freeswitch = callPackage ../servers/sip/freeswitch { @@ -16928,11 +17418,14 @@ in gofish = callPackage ../servers/gopher/gofish { }; grafana = callPackage ../servers/monitoring/grafana { }; + grafanaPlugins = dontRecurseIntoAttrs (callPackage ../servers/monitoring/grafana/plugins { }); grafana-loki = callPackage ../servers/monitoring/loki { }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; + grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; + gerbera = callPackage ../servers/gerbera {}; gobetween = callPackage ../servers/gobetween { }; @@ -16963,6 +17456,8 @@ in hydron = callPackage ../servers/hydron { }; + icecream = callPackage ../servers/icecream { }; + icingaweb2 = callPackage ../servers/icingaweb2 { }; icingaweb2Modules = { theme-april = callPackage ../servers/icingaweb2/theme-april { }; @@ -17088,9 +17583,7 @@ in unit = callPackage ../servers/http/unit { }; - ncdns = callPackage ../servers/dns/ncdns { - buildGoPackage = buildGo114Package; - }; + ncdns = callPackage ../servers/dns/ncdns { }; nginx = nginxStable; @@ -17184,9 +17677,13 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - pulseaudio = callPackage ../servers/pulseaudio { + pulseaudio = callPackage ../servers/pulseaudio ({ inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; - }; + } // lib.optionalAttrs stdenv.isDarwin { + # Default autoreconfHook (2.70) fails on darwin, + # with "configure: error: *** Compiler does not support -std=gnu11" + autoreconfHook = buildPackages.autoreconfHook269; + }); qpaeq = libsForQt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; @@ -17405,6 +17902,7 @@ in prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; + prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { }; @@ -17435,6 +17933,7 @@ in prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; + prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; @@ -17485,6 +17984,8 @@ in radicale = radicale3; + radicle-upstream = callPackage ../applications/version-management/git-and-tools/radicle-upstream {}; + rake = callPackage ../development/tools/build-managers/rake { }; redis = callPackage ../servers/nosql/redis { }; @@ -17619,7 +18120,9 @@ in tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; - torque = callPackage ../servers/computing/torque { }; + torque = callPackage ../servers/computing/torque { + autoreconfHook = buildPackages.autoreconfHook269; + }; tt-rss = callPackage ../servers/tt-rss { }; tt-rss-plugin-ff-instagram = callPackage ../servers/tt-rss/plugin-ff-instagram { }; @@ -17645,9 +18148,9 @@ in inherit (callPackages ../servers/unifi { }) unifiLTS - unifiStable - unifiBeta; - unifi = unifiStable; + unifi5 + unifi6; + unifi = unifi6; urserver = callPackage ../servers/urserver { }; @@ -17864,7 +18367,9 @@ in cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; - cpuset = callPackage ../os-specific/linux/cpuset { }; + cpuset = callPackage ../os-specific/linux/cpuset { + pythonPackages = python3Packages; + }; criu = callPackage ../os-specific/linux/criu { }; @@ -17907,6 +18412,8 @@ in dstat = callPackage ../os-specific/linux/dstat { }; + erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; + # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl { }; @@ -18021,7 +18528,8 @@ in iotop = callPackage ../os-specific/linux/iotop { }; - iproute = callPackage ../os-specific/linux/iproute { }; + iproute2 = callPackage ../os-specific/linux/iproute { }; + iproute = iproute2; # Alias added 2020-11-15 (TODO: deprecate and move to pkgs/top-level/aliases.nix) iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; @@ -18089,6 +18597,10 @@ in openisns = callPackage ../os-specific/linux/open-isns { }; + osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp { + inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; + }; + osxfuse = callPackage ../os-specific/darwin/osxfuse { }; osxsnarf = callPackage ../os-specific/darwin/osxsnarf { }; @@ -18202,6 +18714,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.rtl8761b_support kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18222,7 +18735,7 @@ in ]; }; - linux_5_8 = callPackage ../os-specific/linux/kernel/linux-5.8.nix { + linux_5_9 = callPackage ../os-specific/linux/kernel/linux-5.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper @@ -18230,11 +18743,20 @@ in ]; }; - linux_5_9 = callPackage ../os-specific/linux/kernel/linux-5.9.nix { + linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.export_kernel_fpu_functions."5.3" + kernelPatches.export-rt-sched-migrate ]; }; @@ -18242,6 +18764,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.wireless_syntax_error ]; }; @@ -18268,6 +18791,14 @@ in ]; }; + linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -18330,11 +18861,13 @@ in fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; + gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; - e1000e = if stdenv.lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; + e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; - intel-speed-select = if stdenv.lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; + intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; @@ -18415,14 +18948,14 @@ in netatop = callPackage ../os-specific/linux/netatop { }; - oci-seccomp-bpf-hook = if stdenv.lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; + oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; perf = callPackage ../os-specific/linux/kernel/perf.nix { }; - phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; + phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; # Disable for kernels 4.15 and above due to compatibility issues - prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; + prl-tools = if lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; sch_cake = callPackage ../os-specific/linux/sch_cake { }; @@ -18480,15 +19013,16 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_9; + linuxPackages_latest = linuxPackages_5_10; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; + linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; + linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10; linuxPackages-rt = linuxPackages-rt_5_4; + linuxPackages-rt_latest = linuxPackages-rt_5_10; linux-rt = linuxPackages-rt.kernel; - linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; - linuxPackages-rt_latest = linuxPackages-rt_5_6; linux-rt_latest = linuxPackages-rt_latest.kernel; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; @@ -18502,8 +19036,8 @@ in linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8); linuxPackages_5_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_9); + linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); # When adding to the list above: # - Update linuxPackages_latest to the latest version @@ -18541,7 +19075,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_9; + linux_latest_for_hardened = pkgs.linux_5_10; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -18552,7 +19086,7 @@ in kernelPatches.tag_hardened kernelPatches.hardened.${kernel.meta.branch} ]; - modDirVersionArg = kernel.modDirVersion + "-hardened"; + modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra + "-hardened"; isHardened = true; }); @@ -18579,6 +19113,7 @@ in # zen-kernel linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); + linuxPackages_lqx = recurseIntoAttrs (linuxPackagesFor pkgs.linux_lqx); # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); @@ -18615,9 +19150,7 @@ in keyutils = callPackage ../os-specific/linux/keyutils { }; - libselinux = callPackage ../os-specific/linux/libselinux { - python = python37; - }; + libselinux = callPackage ../os-specific/linux/libselinux { }; libsemanage = callPackage ../os-specific/linux/libsemanage { python = python3; @@ -18643,6 +19176,8 @@ in libsmbios = callPackage ../os-specific/linux/libsmbios { }; + libsurvive = callPackage ../development/libraries/libsurvive { }; + lm_sensors = callPackage ../os-specific/linux/lm-sensors { }; lockdep = callPackage ../os-specific/linux/lockdep { }; @@ -18751,6 +19286,8 @@ in go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; + go-minimock = callPackage ../development/tools/go-minimock { }; + go-protobuf = callPackage ../development/tools/go-protobuf { }; go-symbols = callPackage ../development/tools/go-symbols { }; @@ -18928,7 +19465,7 @@ in raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {}; - raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {}; + raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix {}; regionset = callPackage ../os-specific/linux/regionset { }; @@ -18948,6 +19485,8 @@ in rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { }; + rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { }; + rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { }; s3ql = callPackage ../tools/backup/s3ql { }; @@ -18962,7 +19501,7 @@ in sdparm = callPackage ../os-specific/linux/sdparm { }; - sdrangel = libsForQt512.callPackage ../applications/radio/sdrangel { }; + sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; sepolgen = callPackage ../os-specific/linux/sepolgen { }; @@ -19043,6 +19582,7 @@ in withMachined = false; withNetworkd = false; withNss = false; + withOomd = false; withPCRE2 = false; withPolkit = false; withRemote = false; @@ -19112,6 +19652,8 @@ in ubootRaspberryPi2 ubootRaspberryPi3_32bit ubootRaspberryPi3_64bit + ubootRaspberryPi4_32bit + ubootRaspberryPi4_64bit ubootRaspberryPiZero ubootRock64 ubootRockPi4 @@ -19123,6 +19665,11 @@ in ubootWandboard ; + # Upstream Barebox: + inherit (callPackage ../misc/barebox {}) + buildBarebox + bareboxTools; + uclibc = callPackage ../os-specific/linux/uclibc { }; uclibcCross = callPackage ../os-specific/linux/uclibc { @@ -19550,6 +20097,10 @@ in kopia = callPackage ../tools/backup/kopia { }; + kora-icon-theme = callPackage ../data/icons/kora-icon-theme { + inherit (kdeFrameworks) breeze-icons; + }; + koreader = callPackage ../applications/misc/koreader {}; lato = callPackage ../data/fonts/lato {}; @@ -19640,6 +20191,8 @@ in meslo-lg = callPackage ../data/fonts/meslo-lg {}; + meslo-lgs-nf = callPackage ../data/fonts/meslo-lgs-nf {}; + migmix = callPackage ../data/fonts/migmix {}; migu = callPackage ../data/fonts/migu {}; @@ -19684,6 +20237,8 @@ in national-park-typeface = callPackage ../data/fonts/national-park { }; + netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; + nordic = callPackage ../data/themes/nordic { }; nordic-polar = callPackage ../data/themes/nordic-polar { }; @@ -19693,6 +20248,8 @@ in nuclear = callPackage ../applications/audio/nuclear { }; + nuclei = callPackage ../tools/security/nuclei { }; + nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; }; @@ -19723,6 +20280,8 @@ in open-sans = callPackage ../data/fonts/open-sans { }; + openzone-cursors = callPackage ../data/themes/openzone { }; + orbitron = callPackage ../data/fonts/orbitron { }; orion = callPackage ../data/themes/orion {}; @@ -20136,8 +20695,6 @@ in ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; - amsn = callPackage ../applications/networking/instant-messengers/amsn { }; - androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { buildFHSUserEnv = buildFHSUserEnvBubblewrap; @@ -20161,6 +20718,8 @@ in appeditor = callPackage ../applications/misc/appeditor { }; + appgate-sdp = callPackage ../applications/networking/appgate-sdp { }; + apostrophe = callPackage ../applications/editors/apostrophe { pythonPackages = python3Packages; }; @@ -20225,17 +20784,7 @@ in bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - cadence = let - # Use Qt 5.14 consistently - pkgs_ = pkgs.extend(_: prev: { - pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { - pkgs = oldAttrs.pkgs.extend(_: _: { - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }); - }); - }); - in pkgs_.libsForQt514.callPackage ../applications/audio/cadence { }; + cadence = libsForQt5.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; @@ -20315,7 +20864,7 @@ in bevelbar = callPackage ../applications/window-managers/bevelbar { }; - bibletime = libsForQt514.callPackage ../applications/misc/bibletime { }; + bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { glew = glew110; @@ -20348,9 +20897,8 @@ in bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { inherit (pkgs) bitwig-studio1; }; - bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { - inherit (pkgs) bitwig-studio1; - }; + bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { }; + bitwig-studio = bitwig-studio3; bgpdump = callPackage ../tools/networking/bgpdump { }; @@ -20385,10 +20933,6 @@ in bombono = callPackage ../applications/video/bombono {}; - bomi = libsForQt5.callPackage ../applications/video/bomi { - ffmpeg = ffmpeg_2; - }; - bonzomatic = callPackage ../applications/editors/bonzomatic { }; brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; }; @@ -20405,8 +20949,6 @@ in bristol = callPackage ../applications/audio/bristol { }; - bs1770gain = callPackage ../applications/audio/bs1770gain { }; - bjumblr = callPackage ../applications/audio/bjumblr { }; bschaffl = callPackage ../applications/audio/bschaffl { }; @@ -20441,13 +20983,10 @@ in calibre = calibre-py3; - calligra = libsForQt514.callPackage ../applications/office/calligra { + calligra = libsForQt5.callPackage ../applications/office/calligra { openjpeg = openjpeg_1; - poppler = poppler_0_61.override { - qt5Support = true; - # Must be using the same qt version as calligra itself. - qtbase = qt514.qtbase; - }; + # Must use the same Qt version as Calligra itself: + poppler = libsForQt5.poppler_0_61; }; perkeep = callPackage ../applications/misc/perkeep { }; @@ -20615,8 +21154,6 @@ in python3Packages = python37Packages; }; - cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; - crun = callPackage ../applications/virtualization/crun {}; csdp = callPackage ../applications/science/math/csdp { }; @@ -20648,7 +21185,7 @@ in dablin = callPackage ../applications/radio/dablin { }; darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { - configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; + configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); darktable = callPackage ../applications/graphics/darktable { @@ -20685,7 +21222,7 @@ in dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt514.callPackage ../applications/misc/dfilemanager { }; + dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome2) libart_lgpl libgnomeui; @@ -20833,7 +21370,11 @@ in elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; - elinks = callPackage ../applications/networking/browsers/elinks { }; + elfx86exts = callPackage ../applications/misc/elfx86exts { }; + + elinks = callPackage ../applications/networking/browsers/elinks { + autoreconfHook = buildPackages.autoreconfHook269; + }; elvis = callPackage ../applications/editors/elvis { }; @@ -20907,7 +21448,7 @@ in inherit autoconf automake editorconfig-core-c git libffi libpng pkgconfig poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages - libtool zeromq openssl; + libtool zeromq openssl ott; }; }; @@ -20959,7 +21500,7 @@ in etherape = callPackage ../applications/networking/sniffers/etherape { }; - evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; + evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; exercism = callPackage ../applications/misc/exercism { }; @@ -20969,6 +21510,10 @@ in gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; + greenfoot = callPackage ../applications/editors/greenfoot/default.nix { + jdk = jetbrains.jdk; + }; + gspeech = callPackage ../applications/audio/gspeech { }; icesl = callPackage ../applications/misc/icesl { }; @@ -21073,14 +21618,20 @@ in fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; - fsv = callPackage ../applications/misc/fsv { }; + fsv = callPackage ../applications/misc/fsv { + autoreconfHook = buildPackages.autoreconfHook269; + }; - ft2-clone = callPackage ../applications/audio/ft2-clone { }; + ft2-clone = callPackage ../applications/audio/ft2-clone { + inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa; + }; fvwm = callPackage ../applications/window-managers/fvwm { }; ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; + gaucheBootstrap = callPackage ../development/interpreters/gauche/boot.nix { }; + gauche = callPackage ../development/interpreters/gauche { }; gcal = callPackage ../applications/misc/gcal { }; @@ -21094,42 +21645,88 @@ in geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; - ghostwriter = libsForQt514.callPackage ../applications/editors/ghostwriter { }; + ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/radio/gnss-sdr { boost=boost166; }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { + boost = boost166; + gnuradio = gnuradio3_7-unwrapped; + }; - gnuradio = callPackage ../applications/radio/gnuradio { - inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; + gnuradio-unwrapped = callPackage ../applications/radio/gnuradio { inherit (darwin.apple_sdk.frameworks) CoreAudio; - fftw = fftwFloat; - qwt = qwt6_qt4; + python = python3; }; - - gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix { - inherit (python2Packages) python; - extraPackages = [ gr-nacl gr-osmosdr gr-ais gr-rds ] - ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ]; + # A build without gui components and other utilites not needed for end user + # libraries + gnuradioMinimal = gnuradio-unwrapped.override { + features = { + gnuradio-companion = false; + python-support = false; + gr-ctrlport = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + sphinx = false; + doxygen = false; + }; + }; + gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = gnuradio-unwrapped; + }; + gnuradio3_7-unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python2; + }; + # A build without gui components and other utilites not needed if gnuradio is + # used as a c++ library. + gnuradio3_7Minimal = gnuradio3_7-unwrapped.override { + features = { + gnuradio-companion = false; + python-support = false; + gr-ctrlport = false; + gr-qtgui = false; + gr-utils = false; + sphinx = false; + doxygen = false; + gr-wxgui = false; + }; + }; + gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = gnuradio3_7-unwrapped; }; grandorgue = callPackage ../applications/audio/grandorgue { }; - gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; + gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; + gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; + gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; + gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; + gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; + gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - goldendict = libsForQt514.callPackage ../applications/misc/goldendict { + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; @@ -21166,7 +21763,14 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = libsForQt514.callPackage ../applications/radio/gqrx { }; + gqrx = libsForQt514.callPackage ../applications/radio/gqrx { + gnuradio = gnuradio3_7Minimal; + # Use the same gnuradio for gr-osmosdr as well + gr-osmosdr = gr-osmosdr.override { + gnuradio = gnuradio3_7Minimal; + pythonSupport = false; + }; + }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -21214,12 +21818,16 @@ in wireshark = callPackage ../applications/networking/sniffers/wireshark { inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; + libpcap = libpcap.override { withBluez = stdenv.isLinux; }; }; wireshark-qt = wireshark; # The GTK UI is deprecated by upstream. You probably want the QT version. wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; - wireshark-cli = wireshark.override { withQt = false; }; + wireshark-cli = wireshark.override { + withQt = false; + libpcap = libpcap.override { withBluez = stdenv.isLinux; }; + }; sngrep = callPackage ../applications/networking/sniffers/sngrep {}; @@ -21366,6 +21974,7 @@ in getxbook = callPackage ../applications/misc/getxbook { }; gimp = callPackage ../applications/graphics/gimp { + autoreconfHook = buildPackages.autoreconfHook269; gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; @@ -21401,7 +22010,9 @@ in gitolite = callPackage ../applications/version-management/gitolite { }; - gitoxide = callPackage ../applications/version-management/gitoxide { }; + gitoxide = callPackage ../applications/version-management/gitoxide { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (gnome3) gitg; @@ -21417,6 +22028,7 @@ in }; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { + vmopts = config.jetbrains.vmopts or null; jdk = jetbrains.jdk; }) // { jdk = callPackage ../development/compilers/jetbrains-jdk { }; @@ -21432,6 +22044,8 @@ in linssid = libsForQt5.callPackage ../applications/networking/linssid { }; + deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { }; + lollypop = callPackage ../applications/audio/lollypop { }; m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; @@ -21444,7 +22058,7 @@ in manul = callPackage ../development/tools/manul { }; - mindforger = libsForQt514.callPackage ../applications/editors/mindforger { }; + mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly {}; @@ -21514,6 +22128,8 @@ in java = if stdenv.isLinux then jre else jdk; }; + qrcodegen = callPackage ../development/libraries/qrcodegen { }; + qrencode = callPackage ../development/libraries/qrencode { }; geeqie = callPackage ../applications/graphics/geeqie { }; @@ -21552,11 +22168,11 @@ in gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt514.callPackage ../applications/misc/gpsbabel { + gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; }; - gpsbabel-gui = libsForQt514.callPackage ../applications/misc/gpsbabel/gui.nix { }; + gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; @@ -21613,12 +22229,17 @@ in heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; + + hello-wayland = callPackage ../applications/graphics/hello-wayland { }; + hello-unfree = callPackage ../applications/misc/hello-unfree { }; helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { }; heme = callPackage ../applications/editors/heme { }; + herbe = callPackage ../applications/misc/herbe { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { asciidoc = asciidoc-full; }; @@ -21645,10 +22266,14 @@ in gtk = gtk3; }; + hover = callPackage ../development/tools/hover { }; + hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; howl = callPackage ../applications/editors/howl { }; + hdl-dump = callPackage ../tools/misc/hdl-dump { }; + hpcg = callPackage ../tools/misc/hpcg/default.nix { }; hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; @@ -21731,8 +22356,6 @@ in spectrwm = callPackage ../applications/window-managers/spectrwm { }; - spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; - spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; spotifyd = callPackage ../applications/audio/spotifyd { @@ -21758,6 +22381,10 @@ in swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; + tiramisu = callPackage ../applications/misc/tiramisu { }; + + rootbar = callPackage ../applications/misc/rootbar {}; + waybar = callPackage ../applications/misc/waybar {}; hikari = callPackage ../applications/window-managers/hikari { }; @@ -21770,10 +22397,14 @@ in i3altlayout = callPackage ../applications/window-managers/i3/altlayout.nix { }; + i3-balance-workspace = python3Packages.callPackage ../applications/window-managers/i3/balance-workspace.nix { }; + i3-easyfocus = callPackage ../applications/window-managers/i3/easyfocus.nix { }; i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; + i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { }; + i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { }; @@ -21822,6 +22453,8 @@ in id3v2 = callPackage ../applications/audio/id3v2 { }; + ideamaker = callPackage ../applications/misc/ideamaker { }; + ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { @@ -21913,6 +22546,8 @@ in imgcat = callPackage ../applications/graphics/imgcat { }; + img-cat = callPackage ../applications/graphics/img-cat { }; + imgp = python3Packages.callPackage ../applications/graphics/imgp { }; # Impressive, formerly known as "KeyJNote". @@ -21928,7 +22563,9 @@ in inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); - inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { }; + inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { + gnuradio = gnuradioMinimal; + }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; @@ -22049,14 +22686,14 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_10; }; - kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { python = python3; }; @@ -22101,14 +22738,13 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - # Pinned to qt5.14 due to kdewebkit (depends on qtwebkit) which is currently broken with qt5.15 - kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { }; + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { }; kodestudio = callPackage ../applications/editors/kodestudio { }; kondo = callPackage ../applications/misc/kondo { }; - konversation = libsForQt514.callPackage ../applications/networking/irc/konversation { }; + konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; @@ -22118,7 +22754,7 @@ in openjpeg = openjpeg_1; }; - krusader = libsForQt514.callPackage ../applications/misc/krusader { }; + krusader = libsForQt5.callPackage ../applications/misc/krusader { }; ksuperkey = callPackage ../tools/X11/ksuperkey { }; @@ -22150,6 +22786,8 @@ in fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; + fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; + linkerd = callPackage ../applications/networking/cluster/linkerd { }; kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; @@ -22164,6 +22802,8 @@ in kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; + lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lame = callPackage ../development/libraries/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; @@ -22196,6 +22836,8 @@ in legit = gitAndTools.legit; + lens = callPackage ../applications/networking/cluster/lens { }; + leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; @@ -22244,6 +22886,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + stdenv = gcc9Stdenv; # Fails in multiple ways with gcc10 icu = icu64; variant = "still"; jdk = jdk8; @@ -22361,7 +23004,7 @@ in mac = callPackage ../development/libraries/mac { }; - macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { }; + macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; }; magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; @@ -22386,7 +23029,7 @@ in mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; - mapmap = libsForQt514.callPackage ../applications/video/mapmap { }; + mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; marathonctl = callPackage ../tools/virtualization/marathonctl { } ; @@ -22418,6 +23061,8 @@ in mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; + mediaelch = libsForQt5.callPackage ../applications/misc/mediaelch { }; + mediainfo = callPackage ../applications/misc/mediainfo { }; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; @@ -22430,7 +23075,9 @@ in meli = callPackage ../applications/networking/mailreaders/meli { }; - melonDS = callPackage ../misc/emulators/melonDS { }; + melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; + + melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { }; meme = callPackage ../applications/graphics/meme { }; @@ -22450,14 +23097,15 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - # Needs qtwebkit which is broken on qt5.15 - merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; metersLv2 = callPackage ../applications/audio/meters_lv2 { }; - mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; + mhwaveedit = callPackage ../applications/audio/mhwaveedit { + autoreconfHook = buildPackages.autoreconfHook269; + }; michabo = libsForQt5.callPackage ../applications/misc/michabo { }; @@ -22560,6 +23208,7 @@ in mopidy-mpd mopidy-mpris mopidy-musicbox-webclient + mopidy-scrobbler mopidy-somafm mopidy-soundcloud mopidy-spotify @@ -22609,6 +23258,9 @@ in ympd = callPackage ../applications/audio/ympd { }; + # a somewhat more maintained fork of ympd + mympd = callPackage ../applications/audio/mympd { }; + nload = callPackage ../applications/networking/nload { }; normalize = callPackage ../applications/audio/normalize { }; @@ -22677,14 +23329,16 @@ in else null; }; - mup = callPackage ../applications/audio/mup { }; + mup = callPackage ../applications/audio/mup { + autoreconfHook = buildPackages.autoreconfHook269; + }; # TODO: we should probably merge these 2 musescore = if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt5.callPackage ../applications/audio/musescore { }; + libsForQt514.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -22696,6 +23350,8 @@ in pythonPackages = python3Packages; }; + n8n = callPackage ../applications/networking/n8n {}; + neap = callPackage ../applications/misc/neap { }; neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; @@ -22710,6 +23366,8 @@ in geoip = geoipWithDatabase; }; + nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; + nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; noaa-apt = callPackage ../applications/radio/noaa-apt { }; @@ -22759,9 +23417,7 @@ in pig = callPackage ../applications/networking/cluster/pig { }; - pijul = callPackage ../applications/version-management/pijul { - inherit (llvmPackages) clang libclang; - }; + pijul = callPackage ../applications/version-management/pijul { }; ping = callPackage ../applications/networking/ping { }; @@ -22837,6 +23493,8 @@ in station = callPackage ../applications/networking/station { }; + stochas = callPackage ../applications/audio/stochas { }; + synapse = callPackage ../applications/misc/synapse { }; synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { @@ -22857,6 +23515,8 @@ in sawfish = callPackage ../applications/window-managers/sawfish { }; + sc68 = callPackage ../applications/audio/sc68 { }; + sidplayfp = callPackage ../applications/audio/sidplayfp { }; sndpeek = callPackage ../applications/audio/sndpeek { }; @@ -22869,6 +23529,7 @@ in msmtp = callPackage ../applications/networking/msmtp { inherit (darwin.apple_sdk.frameworks) Security; + autoreconfHook = buildPackages.autoreconfHook269; }; imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix { @@ -22960,6 +23621,12 @@ in muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; + nufraw = callPackage ../applications/graphics/nufraw/default.nix { }; + + nufraw-thumbnailer = callPackage ../applications/graphics/nufraw/default.nix { + addThumbnailer = true; + }; + notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { }; nova-filters = callPackage ../applications/audio/nova-filters { }; @@ -22972,6 +23639,8 @@ in inherit (gnome2) libglade; }; + oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; @@ -23030,6 +23699,11 @@ in libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; })).callPackage ../applications/graphics/opentoonz { }; + opentabletdriver = callPackage ../tools/X11/opentabletdriver { + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-netcore = dotnetCorePackages.net_5_0; + }; + opentx = libsForQt5.callPackage ../applications/misc/opentx { }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -23055,6 +23729,10 @@ in owamp = callPackage ../applications/networking/owamp { }; + vieb = callPackage ../applications/networking/browsers/vieb { + electron = electron_11; + }; + vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; @@ -23146,6 +23824,8 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; + peach = callPackage ../servers/peach { }; + peaclock = callPackage ../applications/misc/peaclock { stdenv = gccStdenv; }; @@ -23154,6 +23834,8 @@ in pflask = callPackage ../os-specific/linux/pflask {}; + pfsshell = callPackage ../tools/misc/pfsshell { }; + photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; @@ -23254,6 +23936,7 @@ in plexamp = callPackage ../applications/audio/plexamp { }; + # Upstream says it supports only qt5.9 which is not packaged, and building with qt newer than 5.12 fails plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; @@ -23355,19 +24038,8 @@ in qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - qgis-unwrapped = let - pkgs_ = pkgs.extend(_: prev: { - pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { - pkgs = oldAttrs.pkgs.extend(_: _: { - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }); - }); - }); - in pkgs_.libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { - withGrass = false; + qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { + withGrass = false; }; qgis = callPackage ../applications/gis/qgis { }; @@ -23388,6 +24060,8 @@ in boost = boost17x; }; + qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { }; + qmetro = callPackage ../applications/misc/qmetro { }; qmidiarp = callPackage ../applications/audio/qmidiarp {}; @@ -23411,7 +24085,7 @@ in qsstv = qt5.callPackage ../applications/radio/qsstv { }; - qsyncthingtray = libsForQt514.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { guvcview = guvcview.override { @@ -23430,7 +24104,9 @@ in qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; - qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { + inherit (darwin.apple_sdk.frameworks) AVFoundation; + }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; @@ -23568,7 +24244,9 @@ in rkdeveloptool = callPackage ../misc/rkdeveloptool { }; - rofi-unwrapped = callPackage ../applications/misc/rofi { }; + rofi-unwrapped = callPackage ../applications/misc/rofi { + autoreconfHook = buildPackages.autoreconfHook269; + }; rofi = callPackage ../applications/misc/rofi/wrapper.nix { }; rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; @@ -23634,9 +24312,9 @@ in inherit (gnome2) libart_lgpl; }; - scribusUnstable = libsForQt514.callPackage ../applications/office/scribus/unstable.nix { }; + scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; - seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; + seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; sent = callPackage ../applications/misc/sent { }; @@ -23842,7 +24520,9 @@ in soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { }; + spek = callPackage ../applications/audio/spek { + autoreconfHook = buildPackages.autoreconfHook269; + }; spotify-unwrapped = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; @@ -23874,7 +24554,9 @@ in sslyze = with python3Packages; toPythonApplication sslyze; - ssr = callPackage ../applications/audio/soundscape-renderer {}; + ssr = callPackage ../applications/audio/soundscape-renderer { + autoreconfHook = buildPackages.autoreconfHook269; + }; ssrc = callPackage ../applications/audio/ssrc { }; @@ -24017,6 +24699,8 @@ in taskwarrior = callPackage ../applications/misc/taskwarrior { }; + taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { }; + dstask = callPackage ../applications/misc/dstask { }; tasksh = callPackage ../applications/misc/tasksh { }; @@ -24195,7 +24879,7 @@ in tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; tudu = callPackage ../applications/office/tudu { }; @@ -24217,6 +24901,10 @@ in twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; + terminal-typeracer = callPackage ../applications/misc/terminal-typeracer { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ueberzug = with python3Packages; toPythonApplication ueberzug; uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; @@ -24228,7 +24916,10 @@ in uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; - ungoogled-chromium = callPackage ../applications/networking/browsers/ungoogled-chromium (config.chromium or {}); + ungoogled-chromium = callPackage ../applications/networking/browsers/chromium ((config.chromium or {}) // { + ungoogled = true; + channel = "ungoogled-chromium"; + }); unigine-valley = callPackage ../applications/graphics/unigine-valley { }; @@ -24257,7 +24948,9 @@ in vbindiff = callPackage ../applications/editors/vbindiff { }; - vcprompt = callPackage ../applications/version-management/vcprompt { }; + vcprompt = callPackage ../applications/version-management/vcprompt { + autoconf = buildPackages.autoconf269; + }; vcs = callPackage ../applications/video/vcs { }; @@ -24411,7 +25104,7 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt514.callPackage ../applications/video/vlc {}; + vlc = libsForQt5.callPackage ../applications/video/vlc {}; vlc_qt5 = vlc; @@ -24465,6 +25158,8 @@ in vym = qt5.callPackage ../applications/misc/vym { }; + wad = python3Packages.callPackage ../tools/security/wad { }; + waon = callPackage ../applications/audio/waon { }; w3m = callPackage ../applications/networking/browsers/w3m { }; @@ -24499,6 +25194,14 @@ in way-cooler = throw ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"); + wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); + inherit (wayfireApplications) wayfire wcm; + wayfireApplications-unwrapped = callPackage ../applications/window-managers/wayfire/applications.nix { }; + wayfirePlugins = callPackage ../applications/window-managers/wayfire/plugins.nix { + inherit (wayfireApplications-unwrapped) wayfire; + }; + wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; + waypipe = callPackage ../applications/networking/remote/waypipe { }; wayv = callPackage ../tools/X11/wayv {}; @@ -24538,6 +25241,8 @@ in weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; + wio = callPackage ../applications/window-managers/wio { }; + whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -24712,7 +25417,9 @@ in gtk = gtk2; }; - x11basic = callPackage ../development/compilers/x11basic { }; + x11basic = callPackage ../development/compilers/x11basic { + autoconf = buildPackages.autoconf269; + }; x11vnc = callPackage ../tools/X11/x11vnc { }; @@ -24885,6 +25592,8 @@ in xkb-switch = callPackage ../tools/X11/xkb-switch { }; + xkb-switch-i3 = callPackage ../tools/X11/xkb-switch-i3 { }; + xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; xlife = callPackage ../applications/graphics/xlife { }; @@ -24921,6 +25630,8 @@ in xrestop = callPackage ../tools/X11/xrestop { }; + xrgears = callPackage ../applications/graphics/xrgears { }; + xsd = callPackage ../development/libraries/xsd { }; xscope = callPackage ../applications/misc/xscope { }; @@ -24999,7 +25710,7 @@ in zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt514.callPackage ../applications/office/zanshin { + zanshin = libsForQt5.callPackage ../applications/office/zanshin { boost = boost160; }; @@ -25017,7 +25728,9 @@ in zeronet = callPackage ../applications/networking/p2p/zeronet { }; - zexy = callPackage ../applications/audio/pd-plugins/zexy { }; + zexy = callPackage ../applications/audio/pd-plugins/zexy { + autoconf = buildPackages.autoconf269; + }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; @@ -25040,7 +25753,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { }; + zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; @@ -25048,7 +25761,19 @@ in zscroll = callPackage ../applications/misc/zscroll {}; - zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; + zynaddsubfx = zyn-fusion; + + zynaddsubfx-fltk = callPackage ../applications/audio/zynaddsubfx { + guiModule = "fltk"; + }; + + zynaddsubfx-ntk = callPackage ../applications/audio/zynaddsubfx { + guiModule = "ntk"; + }; + + zyn-fusion = callPackage ../applications/audio/zynaddsubfx { + guiModule = "zest"; + }; ### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS @@ -25122,6 +25847,8 @@ in lnd = callPackage ../applications/blockchains/lnd.nix { }; + lndconnect = callPackage ../applications/blockchains/lndconnect { }; + monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; boost = boost17x; @@ -25141,7 +25868,10 @@ in nbxplorer = callPackage ../applications/blockchains/nbxplorer { }; pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; - pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; + pivxd = callPackage ../applications/blockchains/pivx.nix { + withGui = false; + autoreconfHook = buildPackages.autoreconfHook269; + }; ethabi = callPackage ../applications/blockchains/ethabi.nix { }; @@ -25216,6 +25946,7 @@ in anki = python3Packages.callPackage ../games/anki { inherit (darwin.apple_sdk.frameworks) CoreAudio; }; + anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; armagetronad = callPackage ../games/armagetronad { }; @@ -25289,6 +26020,10 @@ in chocolateDoom = callPackage ../games/chocolate-doom { }; + clonehero-unwrapped = pkgs.callPackage ../games/clonehero { }; + + clonehero = pkgs.callPackage ../games/clonehero/fhs-wrapper.nix { }; + crispyDoom = callPackage ../games/crispy-doom { }; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; @@ -25337,7 +26072,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt514.callPackage ../applications/graphics/digikam {}; + digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; displaycal = callPackage ../applications/graphics/displaycal {}; @@ -25419,7 +26154,10 @@ in freecell-solver = callPackage ../games/freecell-solver { }; - freeciv = callPackage ../games/freeciv { qt5 = qt514; }; + freeciv = callPackage ../games/freeciv { + autoreconfHook = buildPackages.autoreconfHook269; + qt5 = qt514; + }; freeciv_gtk = freeciv.override { gtkClient = true; @@ -25595,6 +26333,8 @@ in mari0 = callPackage ../games/mari0 { }; + manaplus = callPackage ../games/manaplus { }; + mars = callPackage ../games/mars { }; megaglest = callPackage ../games/megaglest {}; @@ -25777,6 +26517,8 @@ in quantumminigolf = callPackage ../games/quantumminigolf {}; + r2mod_cli = callPackage ../games/r2mod_cli { }; + racer = callPackage ../games/racer { }; redeclipse = callPackage ../games/redeclipse { }; @@ -25871,13 +26613,14 @@ in }; # solarus and solarus-quest-editor must use the same version of Qt. - solarus = libsForQt514.callPackage ../games/solarus { }; - solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; + solarus = libsForQt5.callPackage ../games/solarus { }; + solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; spring = callPackage ../games/spring { + asciidoc = asciidoc-full; boost = boost155; }; @@ -25902,13 +26645,10 @@ in steamcmd = steamPackages.steamcmd; - protontricks = callPackage ../tools/package-management/protontricks { - inherit (python3Packages) buildPythonApplication pytest setuptools_scm vdf; + protontricks = python3Packages.callPackage ../tools/package-management/protontricks { + inherit steam-run; + inherit winetricks; inherit (gnome3) zenity; - wine = wineWowPackages.minimal; - winetricks = winetricks.override { - wine = wineWowPackages.minimal; - }; }; stepmania = callPackage ../games/stepmania { @@ -25974,6 +26714,8 @@ in tremulous = callPackage ../games/tremulous { }; + tts = callPackage ../tools/audio/tts { }; + tuxpaint = callPackage ../games/tuxpaint { }; tuxtype = callPackage ../games/tuxtype { }; @@ -26177,6 +26919,7 @@ in dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; + easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; freon = callPackage ../desktops/gnome-3/extensions/freon { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; @@ -26216,12 +26959,9 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - # TODO: Update these to qt515 at some point. When doing it, please remove - # the choice of libsForQt5*.sddm in sddm's module. - qt5 = qt514; - libsForQt5 = libsForQt514; inherit pkgs; inherit (lib) makeScope; + inherit qt5 libsForQt5; }); mate = recurseIntoAttrs (callPackage ../desktops/mate { }); @@ -26256,6 +26996,8 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { + # ATTN: The Qt version used in the NixOS Plasma module must be updated + # whenever this changes! inherit libsForQt5; inherit lib fetchurl; gconf = gnome2.GConf; @@ -26322,7 +27064,9 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { }; + ants = callPackage ../applications/science/biology/ants { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; aragorn = callPackage ../applications/science/biology/aragorn { }; @@ -26362,6 +27106,8 @@ in dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; + deepsea = callPackage ../tools/security/deepsea { }; + deeptools = callPackage ../applications/science/biology/deeptools { python = python3; }; delly = callPackage ../applications/science/biology/delly { }; @@ -26380,6 +27126,8 @@ in exonerate = callPackage ../applications/science/biology/exonerate { }; + fastp = callPackage ../applications/science/biology/fastp { }; + hisat2 = callPackage ../applications/science/biology/hisat2 { }; htslib = callPackage ../development/libraries/science/biology/htslib { }; @@ -26394,7 +27142,9 @@ in neuron-version = neuron.version; }; - kallisto = callPackage ../applications/science/biology/kallisto { }; + kallisto = callPackage ../applications/science/biology/kallisto { + autoconf = buildPackages.autoconf269; + }; kssd = callPackage ../applications/science/biology/kssd { }; @@ -26752,7 +27502,7 @@ in cadical = callPackage ../applications/science/logic/cadical {}; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09; + inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; }) mkCoqPackages coqPackages_8_5 coq_8_5 coqPackages_8_6 coq_8_6 @@ -26762,6 +27512,7 @@ in coqPackages_8_10 coq_8_10 coqPackages_8_11 coq_8_11 coqPackages_8_12 coq_8_12 + coqPackages_8_13 coq_8_13 coqPackages coq ; @@ -26816,7 +27567,7 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = stdenv.lib.overrideDerivation polyml (attrs: { + polyml = lib.overrideDerivation polyml (attrs: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); @@ -26963,6 +27714,8 @@ in csxcad = callPackage ../applications/science/electronics/csxcad { }; + diylc = callPackage ../applications/science/electronics/diylc { }; + flatcam = callPackage ../applications/science/electronics/flatcam { }; fparser = callPackage ../applications/science/electronics/fparser { }; @@ -27055,7 +27808,7 @@ in ecl = null; }; maxima-ecl = maxima.override { - ecl = ecl_16_1_2; + inherit ecl; ecl-fasl = true; sbcl = null; }; @@ -27110,6 +27863,7 @@ in boinc = callPackage ../applications/science/misc/boinc { }; celestia = callPackage ../applications/science/astronomy/celestia { + autoreconfHook = buildPackages.autoreconfHook269; lua = lua5_1; inherit (pkgs.gnome2) gtkglext; }; @@ -27166,6 +27920,8 @@ in stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; + stellarsolver = libsForQt5.callPackage ../development/libraries/stellarsolver { }; + astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; tulip = callPackage ../applications/science/misc/tulip { @@ -27237,6 +27993,8 @@ in betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; + mission-planner = callPackage ../applications/science/robotics/mission-planner { }; + ### MISC acpilight = callPackage ../misc/acpilight { }; @@ -27419,6 +28177,8 @@ in fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix {}; fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix {}; + foma = callPackage ../tools/misc/foma { }; + foo2zjs = callPackage ../misc/drivers/foo2zjs {}; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; @@ -28058,6 +28818,8 @@ in snscrape = with python3Packages; toPythonApplication snscrape; + soundmodem = callPackage ../applications/radio/soundmodem {}; + soundOfSorting = callPackage ../misc/sound-of-sorting { }; sourceAndTags = callPackage ../misc/source-and-tags { @@ -28082,15 +28844,16 @@ in prow = callPackage ../applications/networking/cluster/prow { }; + tagref = callPackage ../tools/misc/tagref { }; + tellico = libsForQt5.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; inherit (callPackage ../applications/networking/cluster/terraform { }) - terraform_0_11 - terraform_0_11-full terraform_0_12 terraform_0_13 + terraform_0_14 terraform_plugins_test ; @@ -28137,6 +28900,8 @@ in ssh-audit = callPackage ../tools/security/ssh-audit { }; + autocpu-freq = callPackage ../tools/system/autocpu-freq { }; + thermald = callPackage ../tools/system/thermald { }; throttled = callPackage ../tools/system/throttled { }; @@ -28187,6 +28952,8 @@ in giflib = giflib_4_1; }; + ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; + viewnior = callPackage ../applications/graphics/viewnior { }; vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; @@ -28215,7 +28982,7 @@ in vttest = callPackage ../tools/misc/vttest { }; - wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { }; + wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; wasmer = callPackage ../development/interpreters/wasmer { }; @@ -28368,6 +29135,10 @@ in yaxg = callPackage ../tools/graphics/yaxg {}; + yuzu = libsForQt5.callPackage ../misc/emulators/yuzu { + stdenv = gcc10Stdenv; + }; + zap = callPackage ../tools/networking/zap { }; zigbee2mqtt = callPackage ../servers/zigbee2mqtt { }; @@ -28429,8 +29200,6 @@ in mpvc = callPackage ../applications/misc/mpvc { }; - aucdtect = callPackage ../tools/audio/aucdtect { }; - togglesg-download = callPackage ../tools/misc/togglesg-download { }; discord = import ../applications/networking/instant-messengers/discord { @@ -28498,7 +29267,7 @@ in ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; vdr = callPackage ../applications/video/vdr { }; - vdrPlugins = recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }); + vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { }); wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {}; chrome-export = callPackage ../tools/misc/chrome-export {}; @@ -28595,7 +29364,7 @@ in gcc-armhf-embedded = pkgsCross.armhf-embedded.buildPackages.gcc; }; - tdm = callPackage ../games/tdm { }; + new-session-manager = callPackage ../applications/audio/new-session-manager { }; newlib = callPackage ../development/misc/newlib { }; newlibCross = callPackage ../development/misc/newlib { @@ -28676,6 +29445,8 @@ in navidrome = callPackage ../servers/misc/navidrome {}; + zalgo = callPackage ../tools/misc/zalgo { }; + zettlr = callPackage ../applications/misc/zettlr { }; unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; @@ -28688,4 +29459,7 @@ in psftools = callPackage ../os-specific/linux/psftools {}; + lc3tools = callPackage ../development/tools/lc3tools {}; + + zktree = callPackage ../applications/misc/zktree {}; } diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 14399d7ac954b..52268276a0336 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,4 @@ -{ callPackage, wxGTK30, openssl_1_0_2 }: +{ callPackage, wxGTK30, openssl_1_0_2, buildPackages }: rec { lib = callPackage ../development/beam-modules/lib.nix {}; @@ -20,6 +20,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; + autoconf = buildPackages.autoconf269; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; @@ -33,6 +34,7 @@ rec { wxGTK = wxGTK30; # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; + autoconf = buildPackages.autoconf269; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; @@ -44,6 +46,7 @@ rec { # R21 erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; + autoconf = buildPackages.autoconf269; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; }; @@ -55,6 +58,7 @@ rec { # R20 erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { wxGTK = wxGTK30; + autoconf = buildPackages.autoconf269; }; erlangR20_odbc = erlangR20.override { odbcSupport = true; }; erlangR20_javac = erlangR20.override { javacSupport = true; }; @@ -67,6 +71,7 @@ rec { erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; + autoconf = buildPackages.autoconf269; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; }; @@ -79,6 +84,7 @@ rec { erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { wxGTK = wxGTK30; openssl = openssl_1_0_2; + autoconf = buildPackages.autoconf269; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; }; @@ -89,6 +95,7 @@ rec { # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { + autoconf = buildPackages.autoconf269; }; erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { odbcSupport = true; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 605db554363b4..c67d489de628c 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,11 +1,15 @@ -{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 }: - +{ lib, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 +, ocamlPackages_4_10, compcert +}@args: +let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let mkCoqPackages' = self: coq: let callPackage = self.callPackage; in { - inherit coq; + inherit coq lib; coqPackages = self; + mkCoqDerivation = callPackage ../build-support/coq {}; + contribs = recurseIntoAttrs (callPackage ../development/coq-modules/contribs {}); @@ -20,6 +24,7 @@ let coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; + coqeal = callPackage ../development/coq-modules/coqeal {}; coqhammer = callPackage ../development/coq-modules/coqhammer {}; coqprime = callPackage ../development/coq-modules/coqprime {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; @@ -37,19 +42,20 @@ let iris = callPackage ../development/coq-modules/iris {}; ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; - inherit (callPackage ../development/coq-modules/mathcomp {}) - mathcomp_ mathcomp-config - mathcomp ssreflect - mathcomp-ssreflect mathcomp-fingroup mathcomp-algebra - mathcomp-solvable mathcomp-field mathcomp-character - ; - inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) - mathcomp-extra-override mathcomp-extra-config mathcomp-extra - current-mathcomp-extra mathcomp-extra-fast mathcomp-extra-all - mathcomp-finmap mathcomp-bigenough mathcomp-real-closed - mathcomp-analysis multinomials coqeal - ; + mathcomp = callPackage ../development/coq-modules/mathcomp {}; + ssreflect = self.mathcomp.ssreflect; + mathcomp-ssreflect = self.mathcomp.ssreflect; + mathcomp-fingroup = self.mathcomp.fingroup; + mathcomp-algebra = self.mathcomp.algebra; + mathcomp-solvable = self.mathcomp.solvable; + mathcomp-field = self.mathcomp.field; + mathcomp-character = self.mathcomp.character; + mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {}; + mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {}; + mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; + mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {}; metalib = callPackage ../development/coq-modules/metalib { }; + multinomials = callPackage ../development/coq-modules/multinomials {}; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; @@ -59,24 +65,25 @@ let tlc = callPackage ../development/coq-modules/tlc {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; - VST = callPackage ../development/coq-modules/VST {}; - - filterPackages = filterCoqPackages; + VST = callPackage ../development/coq-modules/VST { + compcert = compcert.override { version = "3.7"; }; + }; + filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self; }; - filterCoqPackages = coq: set: + filterCoqPackages = set: lib.listToAttrs ( - lib.concatMap (name: - let v = set.${name}; in - let p = v.compatibleCoqVersions or (_: true); in - lib.optional (p coq.coq-version) - (lib.nameValuePair name ( - if lib.isAttrs v && v.recurseForDerivations or false - then filterCoqPackages coq v - else v)) + lib.concatMap (name: let v = set.${name} or null; in + lib.optional (! v.meta.coqFilter or false) + (lib.nameValuePair name ( + if lib.isAttrs v && v.recurseForDerivations or false + then filterCoqPackages v + else v)) ) (lib.attrNames set) ); - + mkCoq = version: callPackage ../applications/science/logic/coq { + inherit version ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; + }; in rec { /* The function `mkCoqPackages` takes as input a derivation for Coq and produces @@ -89,38 +96,17 @@ in rec { */ mkCoqPackages = coq: let self = lib.makeScope newScope (lib.flip mkCoqPackages' coq); in - if coq.dontFilter or false then self else filterCoqPackages coq self; + self.filterPackages (! coq.dontFilter or false); - coq_8_5 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_05; - version = "8.5pl3"; - }; - coq_8_6 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_05; - version = "8.6.1"; - }; - coq_8_7 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_09; - version = "8.7.2"; - }; - coq_8_8 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_09; - version = "8.8.2"; - }; - coq_8_9 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_09; - version = "8.9.1"; - }; - coq_8_10 = callPackage ../applications/science/logic/coq { - ocamlPackages = ocamlPackages_4_09; - version = "8.10.2"; - }; - coq_8_11 = callPackage ../applications/science/logic/coq { - version = "8.11.2"; - }; - coq_8_12 = callPackage ../applications/science/logic/coq { - version = "8.12.1"; - }; + coq_8_5 = mkCoq "8.5"; + coq_8_6 = mkCoq "8.6"; + coq_8_7 = mkCoq "8.7"; + coq_8_8 = mkCoq "8.8"; + coq_8_9 = mkCoq "8.9"; + coq_8_10 = mkCoq "8.10"; + coq_8_11 = mkCoq "8.11"; + coq_8_12 = mkCoq "8.12"; + coq_8_13 = mkCoq "8.13"; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; @@ -130,6 +116,7 @@ in rec { coqPackages_8_10 = mkCoqPackages coq_8_10; coqPackages_8_11 = mkCoqPackages coq_8_11; coqPackages_8_12 = mkCoqPackages coq_8_12; + coqPackages_8_13 = mkCoqPackages coq_8_13; coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute coqPackages_8_11 ); diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index c1c2c5f0e3bbc..5a3fb04748d09 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -19,6 +19,7 @@ let in { inherit + callPackage buildDhallPackage buildDhallGitHubPackage buildDhallDirectoryPackage diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 9c659e655e93b..91c1549a3b0f4 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -1,4 +1,5 @@ { stdenv +, lib , pkgs , buildDotnetPackage , fetchurl @@ -363,7 +364,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An intermediate verification language"; homepage = "https://github.com/boogie-org/boogie"; longDescription = '' @@ -437,7 +438,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { rm -f $out/lib/dotnet/${baseName}/dafny{,-server} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A programming language with built-in specification constructs"; homepage = "https://research.microsoft.com/dafny"; maintainers = with maintainers; [ layus ]; @@ -477,9 +478,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Excel-DNA is an independent project to integrate .NET into Excel"; homepage = "https://excel-dna.net/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -506,9 +507,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "This library implements helper functions to assist and modify the Excel-DNA function registration"; homepage = "https://github.com/Excel-DNA/Registration"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -540,9 +541,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "ExtCore is an extended core library for F#"; homepage = "https://github.com/jack-pappas/ExtCore"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; broken = true; }; }; @@ -576,9 +577,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { service for rich editing or 'intellisense' features for editors. ''; homepage = "https://github.com/fsharp/FSharp.AutoComplete"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -603,9 +604,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "The F# compiler services package is a component derived from the F# compiler source code that exposes additional functionality for implementing F# language bindings"; homepage = "https://fsharp.github.io/FSharp.Compiler.Service/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -647,9 +648,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "F# Data: Library for Data Access"; homepage = "https://fsharp.github.io/FSharp.Data/"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -679,9 +680,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # meta = { # description = "FSharpx.Extras is a collection of libraries and tools for use with F#"; # homepage = "https://fsprojects.github.io/FSharpx.Extras/"; - # license = stdenv.lib.licenses.asl20; - # maintainers = with stdenv.lib.maintainers; [ obadz ]; - # platforms = with stdenv.lib.platforms; linux; + # license = lib.licenses.asl20; + # maintainers = with lib.maintainers; [ obadz ]; + # platforms = with lib.platforms; linux; # }; # }; @@ -724,7 +725,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "GitVersionTree/bin/Release/*" ]; exeFiles = [ "GitVersionTree.exe" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to help visualize git revisions and branches"; homepage = "https://github.com/crc8/GitVersionTree"; license = licenses.gpl2; @@ -751,9 +752,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; homepage = "https://numerics.mathdotnet.com/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -785,7 +786,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { A generic framework for creating extensible applications, and for creating libraries which extend those applications. ''; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -840,9 +841,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # meta = { # description = "F# addin for MonoDevelop 5.9"; # homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9"; - # license = stdenv.lib.licenses.asl20; - # maintainers = with stdenv.lib.maintainers; [ obadz ]; - # platforms = with stdenv.lib.platforms; linux; + # license = lib.licenses.asl20; + # maintainers = with lib.maintainers; [ obadz ]; + # platforms = with lib.platforms; linux; # }; # }; @@ -872,9 +873,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A callback-based program option parser for C#"; homepage = "http://www.ndesk.org/Options"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -939,9 +940,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A command-line tool for manipulating F# project files"; homepage = "https://github.com/kjnilsson/projekt"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; @@ -967,9 +968,9 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A declarative CLI argument/XML configuration parser for F# applications"; homepage = "https://nessos.github.io/UnionArgParser/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ obadz ]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ obadz ]; + platforms = with lib.platforms; linux; }; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d044ed8004858..8075b7da4f5c4 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -4,7 +4,7 @@ # # Recommended: simply use `emacsWithPackages` with the packages you want. # -# Alterative: use `emacs`, install everything to a system or user profile +# Alternative: use `emacs`, install everything to a system or user profile # and then add this at the start your `init.el`: /* (require 'package) diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index ceb2d5e16f706..ff6360970043f 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -178,7 +178,7 @@ rec { echo "================= /testing zlib using node =================" ''; - postPatch = pkgs.stdenv.lib.optionalString pkgs.stdenv.isDarwin '' + postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' 'ar' \ --replace 'AR="libtool"' 'AR="ar"' \ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2d25ea149a921..46e222261fc8e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -104,6 +104,16 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc8103 = callPackage ../development/compilers/ghc/8.10.3.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { bootPkgs = packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; @@ -206,6 +216,11 @@ in { ghc = bh.compiler.ghc8102; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc8103 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8103; + ghc = bh.compiler.ghc8103; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghc901 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc901; ghc = bh.compiler.ghc901; diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 06b82a478a872..66faa6f7cdbcc 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: +{ stdenv, lib, fetchzip, fetchFromGitHub, haxe, neko, jdk, mono }: let self = haxePackages; haxePackages = with self; { - withCommas = stdenv.lib.replaceChars ["."] [","]; + withCommas = lib.replaceChars ["."] [","]; # simulate "haxelib dev $libname ." simulateHaxelibDev = libname: '' @@ -53,21 +53,21 @@ let meta = { homepage = "http://lib.haxe.org/p/${libname}"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; description = throw "please write meta.description"; } // attrs.meta; }); hxcpp = buildHaxeLib rec { libname = "hxcpp"; - version = "3.4.64"; - sha256 = "04gyjm6wqmsm0ifcfkxmq1yv8xrfzys3z5ajqnvvjrnks807mw8q"; + version = "4.1.15"; + sha256 = "1ybxcvwi4655563fjjgy6xv5c78grjxzadmi3l1ghds48k1rh50p"; postFixup = '' for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do chmod +w "$f" patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true + patchelf --set-rpath ${ lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true done ''; meta.description = "Runtime support library for the Haxe C++ backend"; @@ -110,8 +110,8 @@ let installPhase = installLibHaxe { inherit libname version; }; meta = { homepage = "http://lib.haxe.org/p/${libname}"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; description = "Extern definitions for node.js 6.9"; }; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index d120e9f7a7f27..550c5bbd63b50 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -32,7 +32,7 @@ let callPackage = pkgs.newScope self; - requiredLuaModules = drvs: with stdenv.lib; let + requiredLuaModules = drvs: with lib; let modules = filter hasLuaModule drvs; in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); @@ -123,7 +123,7 @@ with self; { ); ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight UNIX I/O and POSIX binding for Lua"; homepage = "https://www.gitano.org.uk/luxio/"; license = licenses.mit; @@ -134,13 +134,13 @@ with self; { vicious = toLuaModule(stdenv.mkDerivation rec { pname = "vicious"; - version = "2.3.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "vicious"; rev = "v${version}"; - sha256 = "1yzhjn8rsvjjsfycdc993ms6jy2j5jh7x3r2ax6g02z5n0anvnbx"; + sha256 = "0lb90334mz0my8ydsmnsnkki0xr58kinsg0hf9d6k4b0vjfi0r0a"; }; buildInputs = [ lua ]; @@ -151,7 +151,7 @@ with self; { printf "package.path = '$out/lib/lua/${lua.luaversion}/?/init.lua;' .. package.path\nreturn require((...) .. '.init')\n" > $out/lib/lua/${lua.luaversion}/vicious.lua ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A modular widget library for the awesome window manager"; homepage = "https://github.com/Mic92/vicious"; license = licenses.gpl2; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c7d805d4c7423..b123658a3ffb5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -34,6 +34,8 @@ let apron = callPackage ../development/ocaml-modules/apron { }; + arp = callPackage ../development/ocaml-modules/arp { }; + asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; astring = callPackage ../development/ocaml-modules/astring { }; @@ -115,7 +117,6 @@ let bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; - bisect_ppx-ocamlbuild = callPackage ../development/ocaml-modules/bisect_ppx-ocamlbuild { }; ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; @@ -159,6 +160,8 @@ let cppo = callPackage ../development/tools/ocaml/cppo { }; + cppo_ocamlbuild = callPackage ../development/tools/ocaml/cppo/ocamlbuild.nix { }; + cpu = callPackage ../development/ocaml-modules/cpu { }; cpuid = callPackage ../development/ocaml-modules/cpuid { }; @@ -199,14 +202,30 @@ let decompress = callPackage ../development/ocaml-modules/decompress { }; + diet = callPackage ../development/ocaml-modules/diet { }; + digestif = callPackage ../development/ocaml-modules/digestif { }; dispatch = callPackage ../development/ocaml-modules/dispatch { }; dns = callPackage ../development/ocaml-modules/dns { }; + dns-certify = callPackage ../development/ocaml-modules/dns/certify.nix { }; + + dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { }; + dns-client = callPackage ../development/ocaml-modules/dns/client.nix { }; + dns-mirage = callPackage ../development/ocaml-modules/dns/mirage.nix { }; + + dns-resolver = callPackage ../development/ocaml-modules/dns/resolver.nix { }; + + dns-server = callPackage ../development/ocaml-modules/dns/server.nix { }; + + dns-stub = callPackage ../development/ocaml-modules/dns/stub.nix { }; + + dns-tsig = callPackage ../development/ocaml-modules/dns/tsig.nix { }; + dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { }; @@ -270,6 +289,8 @@ let estring = callPackage ../development/ocaml-modules/estring { }; + ethernet = callPackage ../development/ocaml-modules/ethernet { }; + ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { }; ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { }; @@ -407,6 +428,8 @@ let irmin = callPackage ../development/ocaml-modules/irmin { }; + irmin-chunk = callPackage ../development/ocaml-modules/irmin/chunk.nix { }; + irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { }; irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { }; @@ -501,6 +524,8 @@ let lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; + lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { }; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { }; lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { }; @@ -543,6 +568,10 @@ let inherit (pkgs) gnuplot; }; + mew = callPackage ../development/ocaml-modules/mew { }; + + mew_vi = callPackage ../development/ocaml-modules/mew_vi { }; + mezzo = callPackage ../development/compilers/mezzo { }; minisat = callPackage ../development/ocaml-modules/minisat { }; @@ -551,6 +580,12 @@ let mirage-block = callPackage ../development/ocaml-modules/mirage-block { }; + mirage-block-combinators = callPackage ../development/ocaml-modules/mirage-block/combinators.nix { }; + + mirage-block-ramdisk = callPackage ../development/ocaml-modules/mirage-block-ramdisk { }; + + mirage-block-unix = callPackage ../development/ocaml-modules/mirage-block-unix { }; + mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { }; mirage-channel = callPackage ../development/ocaml-modules/mirage-channel { }; @@ -561,12 +596,16 @@ let mirage-console = callPackage ../development/ocaml-modules/mirage-console { }; + mirage-console-unix = callPackage ../development/ocaml-modules/mirage-console/unix.nix { }; + mirage-crypto = callPackage ../development/ocaml-modules/mirage-crypto { }; mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { }; mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { }; + mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; + mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; mirage-device = callPackage ../development/ocaml-modules/mirage-device { }; @@ -583,6 +622,8 @@ let mirage-logs = callPackage ../development/ocaml-modules/mirage-logs { }; + mirage-nat = callPackage ../development/ocaml-modules/mirage-nat { }; + mirage-net = callPackage ../development/ocaml-modules/mirage-net { }; mirage-profile = callPackage ../development/ocaml-modules/mirage-profile { }; @@ -591,6 +632,8 @@ let mirage-random = callPackage ../development/ocaml-modules/mirage-random { }; + mirage-random-test = callPackage ../development/ocaml-modules/mirage-random-test { }; + mirage-runtime = callPackage ../development/ocaml-modules/mirage/runtime.nix { }; mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { }; @@ -599,8 +642,14 @@ let mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; + mirage-types = callPackage ../development/ocaml-modules/mirage/types.nix { }; + + mirage-types-lwt = callPackage ../development/ocaml-modules/mirage/types-lwt.nix { }; + mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { }; + mirage-vnetif = callPackage ../development/ocaml-modules/mirage-vnetif { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; @@ -704,6 +753,8 @@ let syslog = callPackage ../development/ocaml-modules/syslog { }; + syslog-message = callPackage ../development/ocaml-modules/syslog-message { }; + ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { }; @@ -736,6 +787,8 @@ let octavius = callPackage ../development/ocaml-modules/octavius { }; + odate = callPackage ../development/ocaml-modules/odate { }; + odoc = callPackage ../development/ocaml-modules/odoc { }; omd = callPackage ../development/ocaml-modules/omd { }; @@ -782,6 +835,8 @@ let parse-argv = callPackage ../development/ocaml-modules/parse-argv { }; + pcap-format = callPackage ../development/ocaml-modules/pcap-format { }; + pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; @@ -796,6 +851,8 @@ let posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; + ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; + ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; @@ -820,9 +877,7 @@ let spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; - sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; - }; + tcpip = callPackage ../development/ocaml-modules/tcpip { }; tsort = callPackage ../development/ocaml-modules/tsort { }; @@ -868,10 +923,7 @@ let pprint = callPackage ../development/ocaml-modules/pprint { }; - ppx_blob = - if lib.versionAtLeast ocaml.version "4.02" - then callPackage ../development/ocaml-modules/ppx_blob {} - else null; + ppx_blob = callPackage ../development/ocaml-modules/ppx_blob { }; ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix {}; @@ -895,8 +947,6 @@ let ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; - ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; - ppx_tools = if lib.versionAtLeast ocaml.version "4.02" then callPackage ../development/ocaml-modules/ppx_tools {} @@ -976,6 +1026,8 @@ let topkg = callPackage ../development/ocaml-modules/topkg { }; + trie = callPackage ../development/ocaml-modules/trie { }; + tsdl = callPackage ../development/ocaml-modules/tsdl { }; twt = callPackage ../development/ocaml-modules/twt { }; @@ -1049,29 +1101,32 @@ let janePackage = if lib.versionOlder "4.08" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/janePackage_0_13.nix {} + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {} else if lib.versionOlder "4.07" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {} else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = if lib.versionOlder "4.08" ocaml.version - then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes dune-configurator janePackage num octavius ppxlib re zarith; - inherit (pkgs) openssl; + then import ../development/ocaml-modules/janestreet/0.14.nix { + inherit alcotest angstrom angstrom-async base64 cryptokit ctypes + dune-configurator faraday inotify janePackage js_of_ocaml + js_of_ocaml-ppx lambdasoup magic-mime num octavius ounit + ppxlib re tyxml uri-sexp zarith; + inherit (pkgs) openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { inherit ctypes janePackage num octavius re; inherit (pkgs) openssl; - ppxlib = ppxlib.override { legacy = true; }; + ppxlib = ppxlib.override { version = "0.8.1"; }; } else import ../development/ocaml-modules/janestreet { inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; inherit ppx_deriving re; inherit (pkgs) openssl; - ppxlib = ppxlib.override { legacy = true; }; + ppxlib = ppxlib.override { version = "0.8.1"; }; }; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 8ce855780cf96..52ad7aecd2848 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -6,8 +6,38 @@ # Enable recursion into attribute sets that nix-env normally doesn't look into # so that we can get a more complete picture of the available packages for the # purposes of the index. - packageOverrides = super: { - haskellPackages = super.recurseIntoAttrs super.haskellPackages; - rPackages = super.recurseIntoAttrs super.rPackages; - }; + packageOverrides = super: + let + recurseIntoAttrs = sets: + super.lib.genAttrs + (builtins.filter (set: builtins.hasAttr set super) sets) + (set: super.recurseIntoAttrs (builtins.getAttr set super)); + in recurseIntoAttrs [ + "roundcubePlugins" + "emscriptenfastcompPackages" + "fdbPackages" + "nodePackages_latest" + "nodePackages" + "platformioPackages" + "haskellPackages" + "idrisPackages" + "sconsPackages" + "gns3Packages" + "quicklispPackagesClisp" + "quicklispPackagesSBCL" + "rPackages" + "apacheHttpdPackages_2_4" + "zabbix50" + "zabbix40" + "zabbix30" + "fusePackages" + "nvidiaPackages" + "sourceHanPackages" + "atomPackages" + "emacs26Packages" + "emacs27Packages" + "steamPackages" + "ut2004Packages" + "zeroadPackages" + ]; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 274c56665ab4a..e54ed17f3d0ad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6,15 +6,15 @@ be almost as much code as the function itself. */ { config -, stdenv, buildPackages, pkgs +, stdenv, lib, buildPackages, pkgs , fetchurl, fetchgit, fetchpatch, fetchFromGitHub , perl, overrides, buildPerl, shortenPerlShebang }: # cpan2nix assumes that perl-packages.nix will be used only with perl 5.30.3 or above -assert stdenv.lib.versionAtLeast perl.version "5.30.3"; +assert lib.versionAtLeast perl.version "5.30.3"; let - inherit (stdenv.lib) maintainers; + inherit (lib) maintainers teams; self = _self // (overrides pkgs); _self = with self; { @@ -27,8 +27,8 @@ let hasPerlModule = drv: drv ? perlModule ; requiredPerlModules = drvs: let - modules = stdenv.lib.filter hasPerlModule drvs; - in stdenv.lib.unique ([perl] ++ modules ++ stdenv.lib.concatLists (stdenv.lib.catAttrs "requiredPerlModules" modules)); + modules = lib.filter hasPerlModule drvs; + in lib.unique ([perl] ++ modules ++ lib.concatLists (lib.catAttrs "requiredPerlModules" modules)); # Convert derivation to a perl module. toPerlModule = drv: @@ -77,7 +77,7 @@ let makePerlPath [ pkgs.perlPackages.libnet ] => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" */ - makePerlPath = stdenv.lib.makeSearchPathOutput "lib" perl.libPrefix; + makePerlPath = lib.makeSearchPathOutput "lib" perl.libPrefix; /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB) @@ -86,7 +86,7 @@ let 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); + makeFullPerlPath = deps: makePerlPath (lib.misc.closePropagation deps); ack = buildPerlPackage { @@ -100,16 +100,16 @@ let outputs = ["out" "man"]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileNext ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/ack ''; # tests fails on nixos and hydra because of different purity issues doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A grep-like tool tailored to working with large trees of source code"; homepage = "https://beyondgrep.com"; license = licenses.artistic2; @@ -136,7 +136,7 @@ let }; meta = { description = "A module for merging hierarchies using the C3 algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -150,6 +150,20 @@ let buildInputs = [ pkgs.unzip ]; }; + AlgorithmLCSS = buildPerlPackage { + pname = "Algorithm-LCSS"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JF/JFREEMAN/Algorithm-LCSS-0.01.tar.gz"; + sha256 = "0y0zc3sq283zpv67vy7a3h3dyvjn5svjxwknanmp38a2g36fyz3i"; + }; + propagatedBuildInputs = [ AlgorithmDiff ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + AlgorithmMerge = buildPerlPackage { pname = "Algorithm-Merge"; version = "0.08"; @@ -171,7 +185,7 @@ let buildInputs = [ DevelHide Test2Suite ]; meta = { description = "Build external dependencies for use in CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -186,7 +200,7 @@ let buildInputs = [ pkgs.gmp Alienm4 DevelChecklib IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; meta = { description = "Alien package for the GNU Multiple Precision library."; - license = with stdenv.lib.licenses; [ lgpl3Plus ]; + license = with lib.licenses; [ lgpl3Plus ]; }; }; @@ -201,7 +215,7 @@ let buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ]; meta = { description = "Install the C libxml2 library on your system"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -224,7 +238,7 @@ let }; meta = { description = "Lets your class/object say it works like something else"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -245,7 +259,7 @@ let meta = { description = "Get, Build and Use SDL libraries"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -284,7 +298,7 @@ let buildInputs = [ pkgs.gnum4 Alienpatch IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; meta = { description = "Find or build GNU m4"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -299,7 +313,7 @@ let buildInputs = [ IOSocketSSL MojoDOM58 NetSSLeay SortVersions Test2Suite URI ]; meta = { description = "Find or build patch"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -314,7 +328,7 @@ let meta = { homepage = "https://github.com/danaj/Alt-Crypt-RSA-BigInt"; description = "RSA public-key cryptosystem, using Math::BigInt"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -328,7 +342,7 @@ let }; buildInputs = [ CanaryStability ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -342,7 +356,7 @@ let propagatedBuildInputs = [ AnyEvent IOAIO ]; meta = { description = "Truly asynchronous file and directory I/O"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -358,7 +372,7 @@ let meta = { homepage = "https://github.com/potyl/perl-AnyEvent-CacheDNS"; description = "Simple DNS resolver with caching"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -394,7 +408,7 @@ let propagatedBuildInputs = [ AnyEvent JSONXS ]; meta = { description = "Communicate with the i3 window manager"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -409,7 +423,7 @@ let propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { description = "An asynchronous and multi channel Perl AMQP client"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -453,7 +467,7 @@ let meta = { homepage = "https://github.com/mschout/apache-authcookie"; description = "Perl Authentication and Authorization via cookies"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -471,7 +485,7 @@ let meta = { homepage = "https://github.com/kazeburo/Apache-LogFormat-Compiler"; description = "Compile a log format string to perl-code"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -485,7 +499,7 @@ let buildInputs = [ TestDeep TestException ]; meta = { description = "A persistence framework for session data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -499,7 +513,7 @@ let doCheck = false; meta = { description = "Test.pm wrapper with helpers for testing Apache"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -535,7 +549,7 @@ let ''; meta = { description = "A container for functions of the ClusterSSH programs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/duncs/clusterssh/wiki"; }; }; @@ -552,7 +566,7 @@ let meta = { homepage = "https://github.com/rjbs/App-Cmd"; description = "Write command line apps with less suffering"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -578,7 +592,7 @@ let }; meta = { description = "pack your dependencies onto your script file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -592,27 +606,27 @@ let meta = { homepage = "https://github.com/miyagawa/cpanminus"; description = "Get, unpack, build and install modules from CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; Appcpm = buildPerlModule { pname = "App-cpm"; - version = "0.994"; + version = "0.996"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.994.tar.gz"; - sha256 = "4242ecb64aaae09034eddb1b338e005567ace29f2ac2d1bca4d4bcf4e15d21c4"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.996.tar.gz"; + sha256 = "5684535511e5abc0aa8eb6105b13f5759b5d03b6808f30149508358b0a11f595"; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/cpm ''; meta = { homepage = "https://github.com/skaji/cpm"; description = "A fast CPAN module installer"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -627,7 +641,7 @@ let meta = { homepage = "https://github.com/jhthorsen/applify"; description = "Write object oriented scripts with ease"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -641,16 +655,16 @@ let }; buildInputs = [ PodParser ]; propagatedBuildInputs = [ AppPackager FileLoadLines IOString ImageInfo PDFAPI2 StringInterpolateNamed TextLayout ] - ++ stdenv.lib.optional (!stdenv.isDarwin) [ Wx ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + ++ lib.optional (!stdenv.isDarwin) [ Wx ]; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/chordpro rm $out/bin/wxchordpro # Wx not supported on darwin ''; meta = { homepage = "http://www.chordpro.org"; description = "A lyrics and chords formatting program"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -663,7 +677,7 @@ let }; meta = { description = "Abstraction for Packagers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -681,7 +695,7 @@ let meta = { description = "Manage perl installations in your $HOME"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -696,7 +710,7 @@ let buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; meta = { description = "simple CPAN package extractor"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -713,7 +727,7 @@ let meta = { homepage = "https://sqitch.org/"; description = "Sane database change management"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -730,7 +744,7 @@ let ''; meta = { description = "A command that computes simple statistics"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/nferraz/st"; maintainers = [ maintainers.eelco ]; }; @@ -748,7 +762,7 @@ let doCheck = false; meta = { description = "Define validation through subroutine attributes"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -774,7 +788,7 @@ let propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; meta = { description = "Find the differences between two arrays"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -790,7 +804,7 @@ let meta = { homepage = "https://github.com/dwburke/perl-Array-FIFO"; description = "A Simple limitable FIFO array, with sum and average methods"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -803,7 +817,7 @@ let }; meta = { description = "ping a huge number of servers in several seconds"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -817,7 +831,7 @@ let meta = { description = "Module for manipulations of cpio archives"; # See https://rt.cpan.org/Public/Bug/Display.html?id=43597#txn-569710 - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -830,7 +844,7 @@ let }; meta = { description = "Generic archive extracting mechanism"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -843,7 +857,7 @@ let }; meta = { description = "Manipulates TAR archives"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -870,7 +884,7 @@ let buildInputs = [ TestMockModule ]; meta = { description = "Provide an interface to ZIP archive files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -884,7 +898,7 @@ let meta = { homepage = "https://github.com/timj/perl-Astro-FITS-Header/tree/master"; description = "Object-oriented interface to FITS HDUs"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; }; @@ -900,7 +914,7 @@ let NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz"; meta = { description = "Fast C metadata and tag reader for all common audio file formats"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; }; @@ -911,11 +925,11 @@ let url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz"; sha256 = "f43a93bb02b41f7327d92f9e963b69505f67350a52e8f50796f98afc4fb3f177"; }; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' propagatedBuildInputs = [ DataInteger DigestCRC ScalarString ]; meta = { description = "DEC VMS password hashing"; - license = stdenv.lib.licenses.gpl1Plus; + license = lib.licenses.gpl1Plus; }; }; @@ -929,7 +943,7 @@ let propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; meta = { description = "Interface to read and modify Apache .htpasswd files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -944,7 +958,7 @@ let propagatedBuildInputs = [ pkgs.libkrb5 ]; meta = { description = "XS bindings for Kerberos 5"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ DevelChecklib FileWhich PkgConfig ]; }; @@ -973,7 +987,7 @@ let ''; meta = { description = "Perl extension for MIT Kerberos 5 admin interface"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -992,7 +1006,7 @@ let ''; meta = { description = "Generate Tickets (Signed HTTP Cookies) for mod_auth_pubtkt protected websites"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1008,7 +1022,7 @@ let meta = { homepage = "https://github.com/oalders/authen-oath"; description = "OATH One Time Passwords"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -1023,7 +1037,7 @@ let propagatedBuildInputs = [ AuthenDecHpwd CryptDES CryptEksblowfish CryptMySQL CryptPasswdMD5 CryptUnixCryptXS DataEntropy DigestMD4 ModuleRuntime ]; meta = { description = "Hashed passwords/passphrases as objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1038,7 +1052,7 @@ let propagatedBuildInputs = [ DataHexDump NetIP ]; meta = { description = "Provide simple Radius client facilities "; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -1052,7 +1066,7 @@ let propagatedBuildInputs = [ DigestHMAC ]; meta = { description = "SASL Authentication framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1067,7 +1081,7 @@ let propagatedBuildInputs = [ UnicodeStringprep ]; meta = { description = "A Stringprep Profile for User Names and Passwords (RFC 4013)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -1084,7 +1098,7 @@ let meta = { homepage = "https://github.com/dagolden/Authen-SCRAM"; description = "Salted Challenge Response Authentication Mechanism (RFC 5802)"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; maintainers = [ maintainers.sgo ]; }; }; @@ -1099,7 +1113,7 @@ let propagatedBuildInputs = [ ClassAccessor ClassDataInheritable CryptPasswdMD5 ParamsValidate ]; meta = { description = "Simple Authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1113,7 +1127,7 @@ let propagatedBuildInputs = [ AuthenSimple ]; meta = { description = "Simple Passwd authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1127,7 +1141,7 @@ let propagatedBuildInputs = [ ScopeGuard ]; meta = { description = "Call methods on native types"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ IPCSystemSimple TestFatal ]; }; @@ -1157,7 +1171,7 @@ let ''; homepage = "http://www.aarontrevena.co.uk/opensource/autodia/"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; buildInputs = [ DBI ]; }; @@ -1171,7 +1185,7 @@ let }; meta = { description = "Lexically disable autovivification"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1186,7 +1200,7 @@ let meta = { homepage = "https://github.com/rurban/perl-compiler"; description = "Perl compiler"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; /* test fails */ }; @@ -1200,7 +1214,7 @@ let }; meta = { description = "B::COW additional B helpers to check COW status"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1226,7 +1240,7 @@ let propagatedBuildInputs = [ ClassAccessor YAMLSyck ]; meta = { description = "Client to communicate with beanstalkd server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1255,7 +1269,7 @@ let propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; meta = { description = "Execute code after a scope finished compilation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1269,7 +1283,7 @@ let buildInputs = [ ExtUtilsDepends ]; meta = { description = "Wrap OP check callbacks"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1292,7 +1306,7 @@ let }; meta = { description = "Lists of reserved barewords and symbol names"; - license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + license = with lib.licenses; [ artistic1 gpl2 ]; }; }; @@ -1306,7 +1320,7 @@ let meta = { homepage = "https://github.com/ingydotnet/boolean-pm"; description = "Boolean support for Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1337,7 +1351,7 @@ let meta = { homepage = "https://metacpan.org/release/Bot-Training"; description = "Plain text training material for bots like Hailo and AI::MegaHAL"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1353,7 +1367,7 @@ let meta = { homepage = "https://metacpan.org/release/Bot-Training-MegaHAL"; description = "Provide megahal.trn via Bot::Training"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1369,7 +1383,7 @@ let meta = { homepage = "https://metacpan.org/release/Bot-Training-StarCraft"; description = "Provide starcraft.trn via Bot::Training"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1381,9 +1395,9 @@ let sha256 = "0g8c7825ng2m0yz5sy6838rvfdl8j3vm29524wjgf66ccfhgn74x"; }; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; description = "BSD process resource limit and priority functions"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -1398,7 +1412,7 @@ let buildInputs = [ ExtUtilsDepends ]; meta = { description = "Helper functions for op tree manipulation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1425,7 +1439,7 @@ let propagatedBuildInputs = [ BusinessISBNData ]; meta = { description = "Parse and validate ISBNs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1438,7 +1452,7 @@ let }; meta = { description = "Data pack for Business::ISBN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1452,7 +1466,7 @@ let propagatedBuildInputs = [ TieCycle ]; meta = { description = "Work with International Standard Music Numbers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1465,7 +1479,7 @@ let }; meta = { description = "Work with International Standard Serial Numbers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1479,7 +1493,21 @@ let propagatedBuildInputs = [ CryptRandomSeed MathRandomISAAC ]; meta = { description = "Perl extension to generate cryptographically-secure random bytes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + BytesRandomSecureTiny = buildPerlPackage { + pname = "Bytes-Random-Secure-Tiny"; + version = "1.011"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAVIDO/Bytes-Random-Secure-Tiny-1.011.tar.gz"; + sha256 = "03d967b5f82846909137d5ab9984ac570ac10a4401e0c602f3d2208c465ac982"; + }; + meta = { + description = "A tiny Perl extension to generate cryptographically-secure random bytes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -1515,7 +1543,7 @@ let buildInputs = [ FileWhich TestRequires TestSharedFork TestTCP ]; meta = { description = "KyotoTycoon client library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1539,7 +1567,7 @@ let }; meta = { description = "Perl client for B<memcached>, in C language"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1563,7 +1591,7 @@ let }; meta = { description = "A lightweight cache with timed expiration"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1578,7 +1606,7 @@ let meta = { homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl interface to the cairo 2D vector graphics library"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; @@ -1593,11 +1621,25 @@ let buildInputs = [ pkgs.cairo ]; meta = { description = "Integrate Cairo into the Glib type system"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; propagatedBuildInputs = [ Cairo Glib ]; }; + CallContext = buildPerlPackage { + pname = "Call-Context"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Call-Context-0.03.tar.gz"; + sha256 = "0ee6bf46bc72755adb7a6b08e79d12e207de5f7809707b3c353b58cb2f0b5a26"; + }; + meta = { + description = "Sanity-check calling context"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + cam_pdf = buildPerlModule { pname = "CAM-PDF"; version = "1.60"; @@ -1628,7 +1670,7 @@ let sha256 = "a5c91c62cf95fcb868f60eab5c832908f6905221013fea2bce3ff57046d7b6ea"; }; meta = { - license = stdenv.lib.licenses.gpl1Plus; + license = lib.licenses.gpl1Plus; }; }; @@ -1651,7 +1693,7 @@ let }; meta = { description = "Capture STDOUT and STDERR from Perl, XS or external programs"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -1664,7 +1706,7 @@ let }; meta = { description = "Warns and dies noisily with stack backtraces"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestBase ]; }; @@ -1689,7 +1731,7 @@ let }; propagatedBuildInputs = [ CarpAssert ]; meta = { - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; buildInputs = [ TestException ]; }; @@ -1703,7 +1745,7 @@ let }; meta = { description = "Report errors from perspective of caller of a \"clan\" of modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1718,7 +1760,7 @@ let meta = { homepage = "https://github.com/perl-carton/carton"; description = "Perl module dependency manager (aka Bundler for Perl)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1732,7 +1774,7 @@ let propagatedBuildInputs = [ CatalystRuntime DataVisitor ]; meta = { description = "Sensible default end action"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ HTTPRequestAsCGI ]; }; @@ -1748,7 +1790,7 @@ let propagatedBuildInputs = [ CatalystRuntime URIFind ]; meta = { description = "Automated REST Method Dispatching"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1763,7 +1805,7 @@ let propagatedBuildInputs = [ CatalystPluginAuthentication ClassAccessor DataUUID StringEscape ]; meta = { description = "HTTP Basic and Digest authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1788,7 +1830,7 @@ let propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication ]; meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestWarn ]; }; @@ -1804,7 +1846,7 @@ let buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ]; meta = { description= "Authentication from an LDAP Directory"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -1818,7 +1860,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Moose role to create only one instance of component per context"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1833,7 +1875,7 @@ let propagatedBuildInputs = [ CatalystComponentInstancePerContext HTMLFormFuMultiForm RegexpAssemble ]; meta = { description = "Catalyst integration for HTML::FormFu"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */ }; @@ -1849,7 +1891,7 @@ let propagatedBuildInputs = [ CatalystPluginStaticSimple ClassAccessor FileSlurp JSONXS ListMoreUtils PodPOMViewTOC XMLSimple ]; meta = { description = "Serves PODs right from your Catalyst application"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -1865,7 +1907,7 @@ let meta = { homepage = "http://wiki.catalystframework.org/wiki/"; description = "Catalyst Development Tools"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1879,7 +1921,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Regex DispatchType"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1892,7 +1934,7 @@ let }; meta = { description = "The Catalyst developer's manual"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1907,7 +1949,7 @@ let propagatedBuildInputs = [ CatalystComponentInstancePerContext CatalystXComponentTraits DBIxClassSchemaLoader MooseXMarkAsMethods MooseXNonMoose MooseXTypesLoadableClass TieIxHash ]; meta = { description = "DBIx::Class::Schema Model Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1923,7 +1965,7 @@ let meta = { homepage = "http://wiki.catalystframework.org/wiki/"; description = "The Catalyst Framework Runtime"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1937,7 +1979,7 @@ let propagatedBuildInputs = [ CatalystRuntime DateTime ]; meta = { description = "Request logging from within Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1952,7 +1994,7 @@ let propagatedBuildInputs = [ CatalystPluginSession ]; meta = { description = "Infrastructure plugin for the Catalyst authentication framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1978,7 +2020,7 @@ let propagatedBuildInputs = [ CatalystPluginAuthentication SetObject UNIVERSALisa ]; meta = { description = "Role based authorization for Catalyst based on Catalyst::Plugin::Authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -1993,7 +2035,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Flexible caching support for Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2008,7 +2050,7 @@ let propagatedBuildInputs = [ ClassAccessor HTTPMessage MROCompat ]; meta = { description = "HTTP/1.1 cache validators for Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2045,7 +2087,7 @@ let propagatedBuildInputs = [ CatalystRuntime DataFormValidator ]; meta = { description = "Data::FormValidator"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2058,7 +2100,7 @@ let }; propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2072,7 +2114,7 @@ let propagatedBuildInputs = [ ClassAccessor LogHandler MROCompat ]; meta = { description = "Catalyst Plugin for Log::Handler"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2087,7 +2129,7 @@ let propagatedBuildInputs = [ CatalystRuntime ObjectSignature ]; meta = { description = "Generic Session plugin - ties together server side storage and client side state required to maintain session data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2101,7 +2143,7 @@ let propagatedBuildInputs = [ CatalystPluginSession ]; meta = { description = "Per-session custom expiry times"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2135,7 +2177,7 @@ let propagatedBuildInputs = [ CacheCache CatalystPluginSession ClassDataInheritable ]; meta = { description = "File storage backend for session data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2150,7 +2192,7 @@ let buildInputs = [ CatalystActionREST TestWarnings TimeOut URISmartURI ]; meta = { description = "Configurable URIs for Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2164,7 +2206,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "Display a stack trace on the debug screen"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2179,7 +2221,7 @@ let propagatedBuildInputs = [ CatalystRuntime MIMETypes MooseXTypes ]; meta = { description = "Make serving static pages painless"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2193,7 +2235,7 @@ let propagatedBuildInputs = [ CatalystRuntime strictures ]; meta = { description = "Handle passing of status messages between screens of a web application"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2208,7 +2250,7 @@ let propagatedBuildInputs = [ CatalystRuntime TextCSV ]; meta = { description = "CSV view class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2221,7 +2263,7 @@ let }; buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2235,7 +2277,7 @@ let propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "JSON view for your data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2249,7 +2291,7 @@ let propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ]; meta = { description = "Template View Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2284,7 +2326,7 @@ let propagatedBuildInputs = [ Moose URI namespaceautoclean ]; meta = { description = "Replace request base with value passed by HTTP proxy"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2303,7 +2345,7 @@ let propagatedBuildInputs = [ CatalystRuntime MooseXTypes PodParser Starman ]; meta = { description = "Replace the development server with Starman"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2317,7 +2359,7 @@ let meta = { homepage = "https://github.com/toddr/CDB_File"; description = "Perl extension for access to cdb databases"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ BCOW ]; }; @@ -2333,7 +2375,7 @@ let buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; meta = { description = "a data toolkit"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/LibreCat/Catmandu"; }; }; @@ -2347,7 +2389,7 @@ let }; meta = { description = "Get the CDDB info for an audio cd"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; maintainers = [ maintainers.endgame ]; }; }; @@ -2361,7 +2403,7 @@ let }; meta = { description = "Parse a CDDB/freedb data file"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; }; @@ -2377,7 +2419,7 @@ let propagatedBuildInputs = [ HTMLParser ]; meta = { description = "Handle Common Gateway Interface requests and responses"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2392,7 +2434,7 @@ let buildInputs = [ CGI CaptureTiny ModuleBuildTiny SubIdentify Switch TestNoWarnings TestRequires TryTiny ]; meta = { description = "Compile .cgi scripts to a code reference like ModPerl::Registry"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/miyagawa/CGI-Compile"; }; }; @@ -2418,7 +2460,7 @@ let meta = { homepage = "https://github.com/tokuhirom/p5-cgi-emulate-psgi"; description = "PSGI adapter for CGI"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2445,7 +2487,7 @@ let propagatedBuildInputs = [ CGI FCGI ]; doCheck = false; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2469,7 +2511,7 @@ let }; meta = { description = "A lightweight CGI form processing package"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2483,7 +2525,7 @@ let propagatedBuildInputs = [ CGI ]; meta = { description = "Adapt CGI.pm to the PSGI protocol"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2507,7 +2549,7 @@ let propagatedBuildInputs = [ IOStringy ]; meta = { description = "A Simple totally OO CGI interface that is CGI.pm compliant"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestException TestNoWarnings ]; }; @@ -2522,7 +2564,7 @@ let buildInputs = [ TestDeep ]; meta = { description = "Build structures from CGI data"; - license = stdenv.lib.licenses.bsd2; + license = lib.licenses.bsd2; }; }; @@ -2541,7 +2583,7 @@ let propagatedBuildInputs = [ CarpAssert ClassLoad DataUUID DigestJHash HashMoreUtils JSONMaybeXS ListMoreUtils LogAny Moo MooXTypesMooseLikeNumeric StringRewritePrefix TaskWeaken TimeDuration TimeDurationParse ]; meta = { description = "Unified cache handling interface"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2555,7 +2597,7 @@ let propagatedBuildInputs = [ GD ]; meta = { description = "A series of charting modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2568,7 +2610,7 @@ let }; meta = { description = "Package for creating Cisco IPPhone XML objects"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -2582,7 +2624,7 @@ let meta = { homepage = "https://metacpan.org/pod/CLASS"; description = "Alias for __PACKAGE__"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -2595,7 +2637,7 @@ let sha256 = "07215zzr4ydf49832vn54i3gf2q5b97lydkv8j56wb2svvjs64mz"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2620,7 +2662,7 @@ let propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Lets you build groups of accessors"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2633,7 +2675,7 @@ let }; meta = { description = "A minimalistic variant of Class::Accessor"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2646,7 +2688,7 @@ let }; meta = { description = "Run-time load a class the first time you call a method in it"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2670,7 +2712,7 @@ let propagatedBuildInputs = [ AlgorithmC3 ]; meta = { description = "A pragma to use the C3 method resolution order algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2685,7 +2727,7 @@ let propagatedBuildInputs = [ MROCompat ]; meta = { description = "Make NEXT suck less"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2699,7 +2741,7 @@ let buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassC3 ClassInspector MROCompat ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2722,7 +2764,7 @@ let propagatedBuildInputs = [ ParamsValidate ]; meta = { description = "Glues object frameworks together transparently"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2753,8 +2795,8 @@ let }; meta = { description = "Base class for hierarchally ordered objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -2776,7 +2818,7 @@ let }; meta = { description = "Provide utility methods for factory classes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2789,7 +2831,7 @@ let }; meta = { description = "another class and object builder"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -2802,7 +2844,7 @@ let }; meta = { description = "Get information about a class and its structure"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2835,7 +2877,7 @@ let }; meta = { description = "Load modules and create objects on demand"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2863,7 +2905,7 @@ let prePatch = "rm configure"; meta = { description = "A module for creating generic methods"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2878,7 +2920,7 @@ let meta = { homepage = "https://github.com/moose/Class-Method-Modifiers"; description = "Provides Moose-like method modifiers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2892,7 +2934,7 @@ let propagatedBuildInputs = [ ParamsClassify ]; meta = { description = "Dynamic class mixing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2906,7 +2948,7 @@ let propagatedBuildInputs = [ DevelStackTrace ]; meta = { description = "A smart return value object"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2937,7 +2979,7 @@ let }; meta = { description = "Minimalist class construction"; - license = with stdenv.lib.licenses; [ asl20 ]; + license = with lib.licenses; [ asl20 ]; homepage = "https://github.com/dagolden/Class-Tiny"; }; }; @@ -2954,7 +2996,7 @@ let meta = { homepage = "https://github.com/moose/Class-Load"; description = "A working (require \"Class::Name\") and more"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2970,7 +3012,7 @@ let meta = { homepage = "https://github.com/moose/Class-Load-XS"; description = "XS implementation of parts of Class::Load"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -2993,7 +3035,7 @@ let }; meta = { description = "Support for creating standard 'inside-out' classes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3006,7 +3048,7 @@ let }; propagatedBuildInputs = [ ClassStd ]; checkInputs = [ TestPod TestPodCoverage ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Faster but less secure than Class::Std"; license = with licenses; [ artistic1 gpl1Plus ]; }; @@ -3033,7 +3075,7 @@ let propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassISA ]; meta = { description = "Base class for virtual base classes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3046,7 +3088,7 @@ let }; meta = { description = "Generate fast XS accessors without runtime compilation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3062,7 +3104,7 @@ let meta = { homepage = "https://github.com/reyjrar/CLI-Helpers"; description = "Subroutines for making simple command line scripts"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -3075,7 +3117,7 @@ let }; meta = { description = "Clipboard - Copy and Paste with any OS"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ CGI ]; # Disable test on darwin because MacPasteboard fails when not logged in interactively. @@ -3095,7 +3137,7 @@ let }; meta = { description = "Recursively copy Perl datatypes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ BCOW ]; }; @@ -3110,7 +3152,7 @@ let buildInputs = [ Clone ClonePP TestWithoutModule ]; meta = { description = "Choose appropriate clone utility"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3122,7 +3164,7 @@ let sha256 = "15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3137,7 +3179,7 @@ let buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; meta = { description = "Engine for tidyall, your all-in-one code tidier and validator"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3151,7 +3193,7 @@ let propagatedBuildInputs = [ CodeTidyAll TextAligner ]; meta = { description = "TidyAll plugin to sort and align Moose-style attributes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3167,7 +3209,7 @@ let meta = { homepage = "https://github.com/skaji/Command-Runner"; description = "Run external commands and Perl code refs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -3181,7 +3223,7 @@ let }; meta = { description = "Implements some sane defaults for Perl programs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3194,7 +3236,7 @@ let }; meta = { description = "Interface to Bzip2 compression library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3213,7 +3255,7 @@ let meta = { description = "Low-Level Interface to bzip2 compression library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3239,7 +3281,7 @@ let doCheck = !stdenv.isDarwin; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3262,7 +3304,7 @@ let propagatedBuildInputs = [ ModulePluggable ]; meta = { description = "Load configuration from different file formats, transparently"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3276,7 +3318,7 @@ let propagatedBuildInputs = [ CaptureTiny ]; meta = { description = "A module to implement some of AutoConf macros in pure perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3288,7 +3330,7 @@ let sha256 = "1bbg3wp0xcpj04cmm86j1x0j5968jqi5s2c87qs7dgmap1vzk6qa"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3303,7 +3345,7 @@ let propagatedBuildInputs = [ Moo MooXTypesMooseLike ]; meta = { description = "Git-compatible config file parsing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3317,7 +3359,7 @@ let meta = { homepage = "https://github.com/schweikert/Config-Grammar"; description = "A grammar-based, user-friendly config parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3332,7 +3374,7 @@ let meta = { homepage = "https://github.com/rjbs/Config-INI"; description = "Simple .ini-file format"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3347,7 +3389,7 @@ let buildInputs = [ TestDeep ]; meta = { description = "Load (and optionally decrypt via GnuPG) user/pass identity information "; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/dagolden/Config-Identity"; }; }; @@ -3362,8 +3404,8 @@ let propagatedBuildInputs = [ IOStringy ]; meta = { description = "A module for reading .ini-style configuration files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -3378,7 +3420,7 @@ let propagatedBuildInputs = [ ConfigAny ]; meta = { description = "Load a configuration directory tree containing YAML, JSON, XML, Perl, INI or Config::General files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3393,7 +3435,7 @@ let buildInputs = [ TestException YAML ]; meta = { description = "Layered configuration, because configs are like ogres"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3409,7 +3451,7 @@ let meta = { homepage = "https://github.com/rjbs/Config-MVP"; description = "Multivalue-property package-oriented configuration"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3424,7 +3466,7 @@ let meta = { homepage = "https://github.com/rjbs/Config-MVP-Reader-INI"; description = "An MVP config reader for .ini files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3437,7 +3479,7 @@ let }; meta = { description = "Read and write property files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3487,7 +3529,7 @@ let doCheck = false; meta = { description = "Simple, versioned access to configuration data"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3507,7 +3549,7 @@ let ''; meta = { description = "A generic connection to a hierarchical-structured data set"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3522,7 +3564,7 @@ let buildInputs = [ ModuleBuildTiny TestFatal ]; meta = { description = "Facility for creating read-only scalars, arrays, and hashes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3535,7 +3577,7 @@ let }; meta = { description = "Convert binary octets into ASCII armoured messages"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3560,7 +3602,7 @@ let meta = { homepage = "https://metacpan.org/pod/Convert::Base32"; description = "Encoding and decoding of base32 strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3574,7 +3616,7 @@ let }; meta = { description = "Functions for converting to/from bencoded strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3589,7 +3631,7 @@ let propagatedBuildInputs = [ ListUtilsBy ModulePluggable ]; meta = { description = "Color space conversions and named lookups"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3602,7 +3644,7 @@ let }; meta = { description = "Perl module for uuencode and uudecode"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3625,7 +3667,7 @@ let }; meta = { description = "Create automatic curried method call closures for any class or object"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3660,7 +3702,7 @@ let meta = { homepage = "https://github.com/kazeburo/Cookie-Baker"; description = "Cookie string generator / parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3698,7 +3740,7 @@ let buildInputs = [ TestSharedFork TestTCP ]; meta = { description = "Coro based PSGI web server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3712,7 +3754,7 @@ let propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases 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 ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3723,16 +3765,16 @@ let url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Mini-1.111016.tar.gz"; sha256 = "5a297afc3e367ad80811464d4eb7e4dd3caff8ba499cdd2b558f6279443a7657"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ FileHomeDir LWPProtocolHttps ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/minicpan ''; meta = { homepage = "https://github.com/rjbs/CPAN-Mini"; description = "Create a minimal mirror of CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3746,7 +3788,7 @@ let }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3759,7 +3801,7 @@ let }; meta = { description = "Read and write Changes files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3772,7 +3814,7 @@ let }; propagatedBuildInputs = [ CompressBzip2 DataCompare ModuleSignature ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3788,7 +3830,7 @@ let meta = { homepage = "https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index"; description = "Common library for searching CPAN modules, authors and distributions"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -3801,7 +3843,7 @@ let }; meta = { description = "Extract distribution name and version from a distribution filename"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3815,7 +3857,7 @@ let buildInputs = [ TestDeep ]; meta = { description = "Verify requirements in a CPAN::Meta object"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3829,7 +3871,7 @@ let meta = { homepage = "https://github.com/bingos/cpan-perl-releases"; description = "Mapping Perl releases on CPAN to the location of the tarballs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3844,7 +3886,7 @@ let meta = { homepage = "https://github.com/jib/cpanplus-devel"; description = "Ameliorated interface to the CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3859,7 +3901,7 @@ let meta = { homepage = "https://github.com/rjbs/cpan-uploader"; description = "Upload things to the CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3881,7 +3923,7 @@ let }; meta = { description = "CAST5 block cipher in pure Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3910,7 +3952,7 @@ let ]; meta = { description = "Generate shared secret using elliptic-curve Diffie-Hellman function"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3933,7 +3975,7 @@ let propagatedBuildInputs = [ CryptDES ]; meta = { description = "Triple-DES EDE encryption/decryption"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3970,7 +4012,7 @@ let propagatedBuildInputs = [ DataBuffer DigestSHA1 FileWhich ]; meta = { description = "DSA Signatures and Key Generation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -3982,9 +4024,9 @@ let url = "mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.22.tar.gz"; sha256 = "f5af62e908cd31a34b2b813135a0718016fd003ffa0021ffbdd84c50158267aa"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Use block ciphers using ECB mode"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3996,7 +4038,22 @@ let sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; propagatedBuildInputs = [ ClassMix ]; - perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + }; + + CryptFormat = buildPerlPackage { + pname = "Crypt-Format"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Format-0.10.tar.gz"; + sha256 = "89ddc010a6c91d5be7a1874a528eed6eda39f2c401c18e63d80ddfbf7127e2dd"; + }; + buildInputs = [ TestException TestFailWarnings ]; + meta = { + description = "Conversion utilities for encryption applications"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; }; CryptIDEA = buildPerlPackage { @@ -4018,7 +4075,7 @@ let propagatedBuildInputs = [ CryptX JSON ]; meta = { description = "JSON Web Token"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4041,7 +4098,7 @@ let buildInputs = [ pkgs.unzip ModuleBuildTiny ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4056,7 +4113,7 @@ let meta = { homepage = "https://github.com/danaj/Crypt-Random-Seed"; description = "Provide strong randomness for seeding"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4071,7 +4128,7 @@ let propagatedBuildInputs = [ ClassLoader MathPari StatisticsChiSquare ]; meta = { description = "Interface to /dev/random and /dev/urandom"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4086,7 +4143,7 @@ let propagatedBuildInputs = [ CaptureTiny ModuleFind Moo SubExporter TypeTiny namespaceclean ]; meta = { description = "Get weak or strong random data from pluggable sources"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4100,7 +4157,7 @@ let meta = { homepage = "https://github.com/danaj/Crypt-Random-TESHA2"; description = "Random numbers using timer/schedule entropy, aka userspace voodoo entropy"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4132,7 +4189,7 @@ let meta = { homepage = "https://wiki.github.com/toddr/Crypt-RIPEMD160"; description = "Perl extension for the RIPEMD-160 Hash function"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4145,7 +4202,7 @@ let sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; propagatedBuildInputs = [ DigestSHA1 ]; - perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; CryptRijndael = buildPerlPackage { @@ -4175,7 +4232,7 @@ let }; meta = { description = "Provide non blocking randomness"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4191,7 +4248,7 @@ let perlPreHook = "export LD=$CC"; meta = { description = "Scrypt password based key derivation function"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/DCIT/perl-Crypt-ScryptKDF"; maintainers = [ maintainers.sgo ]; }; @@ -4218,7 +4275,7 @@ let meta = { homepage = "https://metacpan.org/release/Crypt-Sodium"; description = "Perl bindings for libsodium (NaCL)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4232,7 +4289,7 @@ let }; meta = { description = "The Twofish Encryption Algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4251,15 +4308,15 @@ let buildInputs = [ TestException ]; propagatedBuildInputs = [ AltCryptRSABigInt CryptCAST5_PP CryptDES_EDE3 CryptDSA CryptIDEA CryptRIPEMD160 CryptRijndael CryptTwofish FileHomeDir LWP ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/pgplet ''; meta = { homepage = "https://github.com/btrott/Crypt-OpenPGP"; description = "Pure-Perl OpenPGP implementation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; doCheck = false; /* test fails with 'No random source available!' */ @@ -4274,7 +4331,7 @@ let }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl wrapper around OpenSSL's AES library"; license = with licenses; [ artistic1 gpl1Plus ]; }; @@ -4300,7 +4357,7 @@ let }; meta = { description = "Guess OpenSSL include path"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/akiym/Crypt-OpenSSL-Guess"; }; }; @@ -4342,7 +4399,7 @@ let meta = { homepage = "https://github.com/dsully/perl-crypt-openssl-x509"; description = "Perl extension to OpenSSL's X509 API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4359,7 +4416,24 @@ let meta = { homepage = "https://metacpan.org/release/Crypt-PBKDF2"; description = "The PBKDF2 password hash algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + CryptPerl = buildPerlPackage { + pname = "Crypt-Perl"; + version = "0.34"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Perl-0.34.tar.gz"; + sha256 = "0e1cb223df0041f6d9b010f11e6f97a97ab55a118a273938eb4fe85d403f1b11"; + }; + checkInputs = [ pkgs.openssl MathBigIntGMP ]; + buildInputs = [ CallContext FileSlurp FileWhich TestClass TestDeep TestException TestFailWarnings TestNoWarnings ]; + propagatedBuildInputs = [ BytesRandomSecureTiny ClassAccessor ConvertASN1 CryptFormat MathProvablePrime SymbolGet TryTiny ]; + meta = { + description = "Cryptography in pure Perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4376,7 +4450,7 @@ let meta = { description = "Minimal Ed25519 bindings"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.thoughtpolice ]; }; buildInputs = [ CanaryStability ]; @@ -4412,10 +4486,10 @@ let url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; }; - perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { description = "XS based CSS minifier"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4444,7 +4518,7 @@ let NIX_CFLAGS_LINK = "-lncurses"; meta = { description = "Perl bindings to ncurses"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; }; @@ -4457,7 +4531,7 @@ let }; meta = { description = "curses based OO user interface framework"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; propagatedBuildInputs = [ Curses TermReadKey ]; }; @@ -4471,7 +4545,7 @@ let }; meta = { description = "Crypto toolkit"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4484,7 +4558,7 @@ let }; meta = { description = "Temporary changing working directory (chdir)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestRequires ]; }; @@ -4499,7 +4573,7 @@ let buildInputs = [ TestRequires ]; meta = { description = "Polymorphic data cloning"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4522,7 +4596,7 @@ let }; meta = { description = "Pretty printing of data structures"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4535,7 +4609,7 @@ let }; meta = { description = "Less indentation and newlines plus sub deparsing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4568,7 +4642,7 @@ let propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes RegexpCommon ]; meta = { description = "Validates user input (usually from an HTML form) based on input profile"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ CGI ]; }; @@ -4584,7 +4658,7 @@ let meta = { homepage = "https://github.com/rjbs/Data-GUID"; description = "Globally unique identifiers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4610,7 +4684,7 @@ let }; meta = { description = "Make binary data human-readable"; - license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + license = with lib.licenses; [ artistic1 gpl2 ]; }; }; @@ -4635,7 +4709,7 @@ let propagatedBuildInputs = [ ClassReturnValue TextvFileasData ]; meta = { description = "Generates iCalendar (RFC 2445) calendar files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4649,7 +4723,7 @@ let buildInputs = [ TestBits ]; meta = { description = "Pack and unpack big-endian IEEE754 floats and doubles"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -4673,7 +4747,7 @@ let meta = { homepage = "https://github.com/msgpack/msgpack-perl"; description = "MessagePack serializing/deserializing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -4689,7 +4763,7 @@ let meta = { homepage = "https://github.com/rjbs/data-optlist"; description = "Parse and validate simple name/value option pairs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4714,7 +4788,7 @@ let buildInputs = [ ClassAccessor DataPage TestException ]; meta = { description = "change long page list to be shorter and well navigate"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4739,7 +4813,7 @@ let meta = { homepage = "https://github.com/mattp-/Data-Perl"; description = "Base classes wrapping fundamental Perl data types"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4753,7 +4827,7 @@ let propagatedBuildInputs = [ ClonePP FileHomeDir PackageStash SortNaturally ]; meta = { description = "colored pretty-print of Perl data structures and objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4768,7 +4842,7 @@ let meta = { homepage = "https://github.com/rjbs/data-section"; description = "Read multiple hunks of data out of your DATA section"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestFailWarnings ]; }; @@ -4782,7 +4856,7 @@ let }; meta = { description = "Modules that serialize data structures"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4796,7 +4870,7 @@ let buildInputs = [ TestDeep ]; propagatedBuildInputs = [ ClassAccessor ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4809,7 +4883,7 @@ let }; propagatedBuildInputs = [ DataPage MathRound ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4824,7 +4898,7 @@ let propagatedBuildInputs = [ Moose PathClass namespaceclean ]; meta = { description = "N at a time iteration API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4838,7 +4912,7 @@ let buildInputs = [ TestPod ]; meta = { description = "Change nature of data within a structure"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4863,7 +4937,7 @@ let meta = { homepage = "https://metacpan.org/release/Data-ULID"; description = "Universally Unique Lexicographically Sortable Identifier"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -4885,10 +4959,10 @@ let sha256 = "1x662pqjg9p0wcigi7pwf969b2ymk66ncm2vd5dfm5i08pdkjpf3"; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "A selection of utilities for data and data types"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/gfx/Perl-Data-Util"; }; }; @@ -4901,7 +4975,7 @@ let sha256 = "51c9efbf8423853616eaa24841e4d1996b2db0036900617fb1dbc76c75a1f360"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4925,7 +4999,7 @@ let propagatedBuildInputs = [ MathRandomMTAuto ]; meta = { description = "Fast random UUID generator using the Mersenne Twister algorithm"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -4940,7 +5014,7 @@ let propagatedBuildInputs = [ NetDomainTLD ]; meta = { description = "Domain and host name validation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4955,7 +5029,7 @@ let propagatedBuildInputs = [ NetAddrIP ]; meta = { description = "IPv4 and IPv6 validation methods"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4969,7 +5043,7 @@ let propagatedBuildInputs = [ DataValidateDomain DataValidateIP ]; meta = { description = "Common URL validation methods"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5032,7 +5106,7 @@ let sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl2Plus ]; + license = with lib.licenses; [ artistic1 gpl2Plus ]; }; }; @@ -5047,7 +5121,7 @@ let propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; meta = { description = "A date and time object"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -5060,7 +5134,7 @@ let }; meta = { description = "Dates in the Julian calendar"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; propagatedBuildInputs = [ DateTime ]; }; @@ -5075,7 +5149,7 @@ let propagatedBuildInputs = [ DateTimeEventRecurrence ]; meta = { description = "DateTime rfc2445 recurrences"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5099,7 +5173,7 @@ let propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ]; meta = { description = "Create DateTime parser classes and objects"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -5113,7 +5187,7 @@ let propagatedBuildInputs = [ DateTime TimeDate ]; meta = { description = "Parses Date::Parse compatible formats"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5127,7 +5201,7 @@ let propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ]; meta = { description = "Flexibly parse strings and turn them into DateTime objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestException TestMockTime TestNoWarnings ]; }; @@ -5142,7 +5216,7 @@ let propagatedBuildInputs = [ DateTime HTTPDate ]; meta = { description = "Date conversion routines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5156,7 +5230,7 @@ let propagatedBuildInputs = [ DateTimeEventICal ]; meta = { description = "Parse and format iCal datetime and duration strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5170,7 +5244,7 @@ let propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parses ISO8601 formats"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ Test2Suite ]; }; @@ -5185,7 +5259,7 @@ let propagatedBuildInputs = [ DateTime ParamsValidate ]; meta = { description = "Convert between DateTime and RFC2822/822 formats"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5200,7 +5274,7 @@ let propagatedBuildInputs = [ Clone DateTime ListMoreUtils ParamsValidate boolean ]; meta = { description = "Create machine readable date/time with natural parsing logic"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5214,7 +5288,7 @@ let propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format MySQL dates and times"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5228,7 +5302,7 @@ let propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format PostgreSQL dates and times"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ ModuleBuildTiny ]; }; @@ -5244,7 +5318,7 @@ let propagatedBuildInputs = [ DateTime ]; meta = { description = "Parse and format strp and strf time patterns"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -5258,7 +5332,7 @@ let propagatedBuildInputs = [ DateTimeFormatBuilder ]; meta = { description = "Parse and format SQLite dates and times"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5272,7 +5346,7 @@ let propagatedBuildInputs = [ DateTime ]; meta = { description = "Parse and format W3CDTF datetime strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5287,7 +5361,7 @@ let propagatedBuildInputs = [ FileShareDir ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Localization support for DateTime.pm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5301,7 +5375,7 @@ let propagatedBuildInputs = [ DateTime ParamsValidate SetInfinite ]; meta = { description = "DateTime set objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5316,7 +5390,7 @@ let propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Time zone object base class and factory"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5332,7 +5406,7 @@ let doCheck = false; meta = { description = "Parse a date/time string using the best method available"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5346,7 +5420,7 @@ let propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; meta = { description = "A collection of handy debugging routines for displaying the values of variables with a minimum of coding"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5360,7 +5434,7 @@ let propagatedBuildInputs = [ PadWalker ]; meta = { description = "Meatier versions of C<caller>"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5373,7 +5447,7 @@ let }; meta = { description = "check that a command is available"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/tokuhirom/Devel-CheckBin"; }; }; @@ -5388,7 +5462,7 @@ let buildInputs = [ ModuleBuildTiny ]; meta = { description = "Check the compiler's availability"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/tokuhirom/Devel-CheckCompiler"; }; }; @@ -5423,7 +5497,7 @@ let meta = { homepage = "https://metacpan.org/release/Devel-Leak"; description = "Utility for looking for perl objects that are not reclaimed"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; # According to Debian + license = with lib.licenses; [ artistic1 gpl1Plus ]; # According to Debian }; }; @@ -5438,7 +5512,7 @@ let meta = { homepage = "https://github.com/bingos/devel-patchperl"; description = "Patch perl source a la Devel::PPPort's buildperl.pl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5452,7 +5526,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "obtain the REFCNT value of a referent"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5465,7 +5539,7 @@ let }; meta = { description = "Perl/Pollution/Portability"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5478,7 +5552,7 @@ let }; meta = { description = "Print out each line before it is executed (like sh -x)"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }; }; @@ -5493,7 +5567,7 @@ let propagatedBuildInputs = [ DeviceOUI Moose ]; meta = { description = "Handle hardware MAC Addresses (EUI-48 and EUI-64)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -5510,7 +5584,7 @@ let propagatedBuildInputs = [ ClassAccessorGrouped LWP SubExporter ]; meta = { description = "Resolve an Organizationally Unique Identifier"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -5562,7 +5636,7 @@ let preCheck = "rm t/65_db_config.t"; # do not run failing tests - meta = with stdenv.lib; { + meta = with lib; { description = "Self Contained SQLite RDBMS in a DBI Driver"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; @@ -5581,7 +5655,7 @@ let meta = { homepage = "https://github.com/gooddata/DBD-MariaDB"; description = "MariaDB and MySQL driver for the Perl5 Database Interface (DBI)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -5617,7 +5691,7 @@ let buildInputs = [ pkgs.oracle-instantclient TestNoWarnings ]; propagatedBuildInputs = [ DBI ]; - postBuild = stdenv.lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath "${pkgs.oracle-instantclient.lib}/lib" blib/arch/auto/DBD/Oracle/Oracle.bundle ''; }; @@ -5641,8 +5715,8 @@ let meta = { description = "DBI PostgreSQL interface"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.unix; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.unix; }; }; @@ -5689,7 +5763,7 @@ let url = "mirror://cpan/authors/id/T/TI/TIMB/DBI-1.643.tar.gz"; sha256 = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa"; }; - postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' + postInstall = lib.optionalString (perl ? crossVersion) '' mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI cat > $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI.pm <<EOF package DBI; @@ -5730,7 +5804,7 @@ let meta = { homepage = "https://dbi.perl.org/"; description = "Database independent interface for Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5746,7 +5820,7 @@ let meta = { homepage = "https://metacpan.org/pod/DBICx::TestDatabase"; description = "Create a temporary database from a DBIx::Class::Schema"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -5763,7 +5837,7 @@ let meta = { homepage = "https://metacpan.org/pod/DBIx::Class"; description = "Extensible and flexible object <-> relational mapper"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5779,7 +5853,7 @@ let meta = { homepage = "https://github.com/frioux/DBIx-Class-Candy"; description = "Sugar for your favorite ORM, DBIx::Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5794,7 +5868,7 @@ let propagatedBuildInputs = [ CarpClan DBIxClass ]; meta = { description = "Cursor class with built-in caching support"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5810,7 +5884,7 @@ let meta = { homepage = "https://metacpan.org/pod/DBIx::Class::DynamicDefault"; description = "Automatically set and update fields"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -5837,7 +5911,7 @@ let meta = { homepage = "https://github.com/frioux/DBIx-Class-Helpers"; description = "Simplify the common case stuff for DBIx::Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5853,7 +5927,7 @@ let meta = { homepage = "https://metacpan.org/pod/DBIx::Class::InflateColumn::Serializer"; description = "Inflators to serialize data structures for DBIx::Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -5868,7 +5942,7 @@ let propagatedBuildInputs = [ DBIxClass ]; meta = { description = "Introspect many-to-many relationships"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5883,7 +5957,7 @@ let propagatedBuildInputs = [ CarpClan ClassUnload DBIxClass DataDump StringToIdentifierEN curry ]; meta = { description = "Create a DBIx::Class::Schema based on a database"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5898,7 +5972,7 @@ let propagatedBuildInputs = [ DBI ]; meta = { description = "Fast, safe DBI connection and transaction management"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5923,7 +5997,7 @@ let propagatedBuildInputs = [ CacheSimpleTimedExpiry ClassAccessor ClassReturnValue Clone DBIxDBSchema Want capitalization ]; meta = { description = "Encapsulate SQL queries and rows in simple perl objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5949,7 +6023,7 @@ let }; meta = { description = "Simple detection of binary versus text in strings"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -5962,7 +6036,7 @@ let }; meta = { description = "Read/write buffer class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -6002,7 +6076,7 @@ let propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6015,7 +6089,7 @@ let }; meta = { description = "Find the path to your perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6028,7 +6102,7 @@ let }; propagatedBuildInputs = [ SubExporterProgressive ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6041,7 +6115,7 @@ let }; meta = { description = "Detect perl's global phase on older perls."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6065,7 +6139,7 @@ let meta = { homepage = "https://github.com/timbunce/devel-nytprof"; description = "Powerful fast feature-rich Perl source code profiler"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestDifferences ]; }; @@ -6081,7 +6155,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "introspect overloaded operators"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6105,7 +6179,7 @@ let }; meta = { description = "An object representing a stack trace"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -6119,7 +6193,7 @@ let propagatedBuildInputs = [ DevelStackTrace ]; meta = { description = "Displays stack trace in HTML"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6132,7 +6206,7 @@ let }; meta = { description = "Dump symbol names or the symbol table"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6145,7 +6219,7 @@ let }; meta = { description = "Module that calculates CRC sums of all sorts"; - license = stdenv.lib.licenses.publicDomain; + license = lib.licenses.publicDomain; }; }; @@ -6158,7 +6232,7 @@ let }; meta = { description = "Keyed-Hashing for Message Authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6171,7 +6245,7 @@ let }; meta = { description = "Perl extension for 32 bit Jenkins Hashing Algorithm"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -6184,7 +6258,7 @@ let }; meta = { description = "Perl interface to the MD2 Algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -6220,7 +6294,7 @@ let }; meta = { description = "Perl Implementation of Rivest's MD5 algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6233,7 +6307,7 @@ let }; meta = { description = "Perl interface to the SHA-1 algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6247,7 +6321,7 @@ let meta = { homepage = "https://metacpan.org/release/Digest-SHA3"; description = "Perl extension for SHA-3"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -6262,7 +6336,7 @@ let propagatedBuildInputs = [ Moo PathTiny ]; meta = { description = "treat a directory and a manifest file as a hash/dictionary of keys to texts or blobs"; - license = with stdenv.lib.licenses; [ mit ]; + license = with lib.licenses; [ mit ]; }; }; @@ -6276,7 +6350,7 @@ let meta = { homepage = "https://github.com/mauke/Dir-Self"; description = "A __DIR__ constant for the directory your source file is in"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6290,7 +6364,7 @@ let propagatedBuildInputs = [ ExporterTiny ]; meta = { description = "dispatch on the type (class) of an argument"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6305,7 +6379,7 @@ let propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Declare version conflicts for your dist"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6321,7 +6395,7 @@ let meta = { homepage = "http://dzil.org/"; description = "Distribution builder; installer not included!"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; }; @@ -6337,7 +6411,7 @@ let propagatedBuildInputs = [ DistZillaPluginMojibakeTests DistZillaPluginTestCPANChanges DistZillaPluginTestCPANMetaJSON DistZillaPluginTestCompile DistZillaPluginTestDistManifest DistZillaPluginTestEOL DistZillaPluginTestKwalitee DistZillaPluginTestMinimumVersion DistZillaPluginTestNoTabs DistZillaPluginTestPerlCritic DistZillaPluginTestPodLinkCheck DistZillaPluginTestPortability DistZillaPluginTestSynopsis DistZillaPluginTestUnusedVars DistZillaPluginTestVersion PodCoverageTrustPod ]; meta = { description = "Test your dist with every testing plugin conceivable"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */ }; @@ -6352,7 +6426,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Dist::Zilla with Changes check"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ PathClass PodCoverage PodCoverageTrustPod PodMarkdown TestDeep TestException TestPod TestPodCoverage ]; }; @@ -6368,7 +6442,7 @@ let meta = { homepage = "https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests"; description = "Release tests for source encoding"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestMojibake ]; }; @@ -6384,7 +6458,7 @@ let meta = { homepage = "https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver"; description = "Weave your Pod together from configuration and Dist::Zilla"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6400,7 +6474,7 @@ let meta = { homepage = "https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod"; description = "Automatically convert POD to a README in any format for Dist::Zilla"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6416,7 +6490,7 @@ let meta = { homepage = "https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod"; description = "Automatically convert POD to a README.mkdn for Dist::Zilla"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6431,7 +6505,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for your changelog"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6447,7 +6521,7 @@ let meta = { homepage = "http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON"; description = "Release tests for your META.json"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6463,7 +6537,7 @@ let meta = { homepage = "https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-Compile"; description = "Common tests to check syntax of your modules, only using core modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6478,7 +6552,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for the manifest"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6493,7 +6567,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Author tests making sure correct line endings are used"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -6508,7 +6582,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for kwalitee"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6523,7 +6597,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for minimum required versions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6538,7 +6612,7 @@ let buildInputs = [ ModuleBuildTiny TestDeep TestNoTabs TestRequires ]; meta = { description = "Author tests that ensure hard tabs are not used"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-NoTabs"; }; }; @@ -6554,7 +6628,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Tests to check your code against best practices"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6570,7 +6644,7 @@ let meta = { homepage = "https://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck"; description = "Add release tests for POD links"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestPodLinkCheck ]; }; @@ -6586,7 +6660,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for portability"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6601,7 +6675,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for synopses"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6616,7 +6690,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for unused variables"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6631,7 +6705,7 @@ let propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release Test::Version tests"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -6646,7 +6720,7 @@ let buildInputs = [ ModuleBuildTiny TestDeep TestFatal ]; meta = { description = "Receive notification when something changes a file's contents"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/karenetheridge/Dist-Zilla-Role-FileWatcher"; }; }; @@ -6662,7 +6736,7 @@ let propagatedBuildInputs = [ PathTiny ]; meta = { description = "Support for C<dotenv> in Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6676,7 +6750,7 @@ let propagatedBuildInputs = [ CaptureTiny ClassXSAccessor DevelCheckOS NumberWithError StatisticsCaseResampling ]; meta = { description = "More reliable benchmarking with the least amount of thinking"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/briandfoy/dumbbench"; }; }; @@ -6692,7 +6766,7 @@ let meta = { homepage = "https://github.com/rjbs/Email-Abstract"; description = "Unified interface to mail representations"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6705,7 +6779,7 @@ let }; meta = { description = "RFC 2822 Address Parsing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6720,7 +6794,7 @@ let propagatedBuildInputs = [ EmailAddress ]; meta = { description = "RFC close address list parsing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6733,7 +6807,7 @@ let }; meta = { description = "Parse and format RFC 2822 email addresses and groups"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6747,7 +6821,7 @@ let meta = { homepage = "https://github.com/rjbs/Email-Date-Format"; description = "Produce RFC 2822 date strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6761,7 +6835,7 @@ let propagatedBuildInputs = [ EmailAbstract EmailAddress EmailMIME ]; meta = { description = "Reply to an email message"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6774,7 +6848,7 @@ let }; meta = { description = "Generate world unique message-ids"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6789,7 +6863,7 @@ let meta = { homepage = "https://github.com/rjbs/Email-MIME"; description = "Easy MIME message handling"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6805,7 +6879,7 @@ let }; meta = { description = "Strip the attachments from an email"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6819,7 +6893,7 @@ let meta = { homepage = "https://github.com/rjbs/Email-MIME-ContentType"; description = "Parse a MIME Content-Type Header"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ TextUnidecode ]; }; @@ -6835,7 +6909,7 @@ let meta = { homepage = "https://github.com/rjbs/Email-MIME-Encodings"; description = "A unified interface to MIME encoding and decoding"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6850,7 +6924,7 @@ let meta = { homepage = "https://github.com/rjbs/Email-Send"; description = "Simply Sending Email"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ MIMETools MailTools ]; }; @@ -6864,10 +6938,10 @@ let }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; preCheck = "rm t/internals.t t/plain_jpeg_attached.t"; # these tests expect EmailMIME version 1.946 and fail with 1.949 (the output difference in benign) - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.matijs.net/software/msgconv/"; description = "A .MSG to mbox converter"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ peterhoeg ]; }; }; @@ -6881,17 +6955,17 @@ let }; buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postPatch = '' patchShebangs --build util ''; - preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.isDarwin '' shortenPerlShebang util/sendmail ''; meta = { homepage = "https://github.com/rjbs/Email-Sender"; description = "A library for sending email"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6906,7 +6980,7 @@ let meta = { homepage = "https://github.com/rjbs/Email-Simple"; description = "Simple parsing of RFC2822 message format and headers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6930,7 +7004,7 @@ let }; propagatedBuildInputs = [ EmailValid ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6943,7 +7017,7 @@ let }; meta = { description = "Character encodings in Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6959,7 +7033,7 @@ let meta = { homepage = "https://metacpan.org/release/Encode-Base32-GMP"; description = "High speed Base32 encoding using GMP with BigInt and MD5 support"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; maintainers = with maintainers; [ sgo ]; }; }; @@ -6974,7 +7048,7 @@ let nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; meta = { description = "An Encode::Encoding subclass that detects the encoding of data"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; }; @@ -6989,7 +7063,7 @@ let outputs = [ "out" ]; meta = { description = "EucJP-ascii - An eucJP-open mapping"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7002,7 +7076,7 @@ let }; meta = { description = "Extra sets of Chinese encodings"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -7032,7 +7106,7 @@ let '' else null; meta = { description = "Determine the locale encoding"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7045,7 +7119,7 @@ let }; meta = { description = "Normalize line ending sequences"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/neilb/Encode-Newlines"; }; }; @@ -7058,7 +7132,7 @@ let sha256 = "d2f36b5015f1e35f640159867b60bf5d5cd66b56cd5e42d33f531be68e5eee35"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7071,7 +7145,7 @@ let }; meta = { description = "Perl module that imports environment variables as scalars or arrays"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7093,7 +7167,7 @@ let }; meta = { description = "Lexically scoped sanctification of %ENV"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/bingos/env-sanctify"; }; }; @@ -7117,7 +7191,7 @@ let buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; meta = { - license = stdenv.lib.licenses.gpl1Plus; + license = lib.licenses.gpl1Plus; }; }; @@ -7131,7 +7205,7 @@ let buildInputs = [ TestFatal TestRequires ]; meta = { description = "Safely and cleanly create closures via string eval"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7145,7 +7219,7 @@ let buildInputs = [ TestUnitLite ]; meta = { description = "Lightweight exceptions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7193,7 +7267,7 @@ let meta = { homepage = "https://metacpan.org/release/Exporter-Declare"; description = "Exporting done right"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7205,7 +7279,7 @@ let sha256 = "1hns15imih8z2h6zv3m1wwmv9fiysacsb52y94v6zf2cmw4kjny0"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7218,7 +7292,7 @@ let }; meta = { description = "An exporter with the features of Sub::Exporter but only core dependencies"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7231,7 +7305,7 @@ let }; meta = { description = "Compile and link C code for Perl modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://metacpan.org/release/ExtUtils-CBuilder"; }; }; @@ -7246,7 +7320,7 @@ let propagatedBuildInputs = [ IOTty ]; meta = { description = "Automate interactions with command line programs that expose a text terminal interface"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7260,7 +7334,7 @@ let propagatedBuildInputs = [ Expect ]; meta = { description = "Wrapper around the Expect module"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; }; @@ -7274,7 +7348,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "Configure-time utilities for using C headers,"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7287,7 +7361,7 @@ let }; meta = { description = "A wrapper for perl's configuration"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7320,7 +7394,7 @@ let sha256 = "165y1cjirbq64w39svkz82cb5jjqkjm8f4c0wqi2lk6050hzf3vq"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7334,7 +7408,7 @@ let buildInputs = [ pkgs.gfortran ]; meta = { description = "A simple interface to F77 libs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ FileWhich ]; }; @@ -7348,7 +7422,7 @@ let }; meta = { description = "Various portability utilities for module builders"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7361,7 +7435,7 @@ let }; meta = { description = "Install files from here to there"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7375,7 +7449,7 @@ let propagatedBuildInputs = [ ExtUtilsConfig ]; meta = { description = "Build.PL install path logic made easy"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7389,7 +7463,7 @@ let perlPreHook = "export LD=$CC"; meta = { description = "A tool to build C libraries"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7402,7 +7476,7 @@ let }; meta = { description = "Create a module Makefile"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7416,7 +7490,7 @@ let propagatedBuildInputs = [ ModuleCPANfile ]; meta = { description = "cpanfile support for EUMM"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7429,10 +7503,11 @@ let }; nativeBuildInputs = [ buildPackages.pkgconfig ]; propagatedBuildInputs = [ pkgs.pkgconfig ]; + doCheck = false; # expects test_glib-2.0.pc in PKG_CONFIG_PATH meta = { homepage = "http://gtk2-perl.sourceforge.net"; description = "Simplistic interface to pkg-config"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }; @@ -7503,7 +7578,7 @@ let url = "mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.79.tar.gz"; sha256 = "1r1lzd74lzzdl2brcanw4n70m37nd8n6gv9clb55m3gv2hdlxylc"; }; - postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i '/use IO::File/d' Makefile.PL ''; }; @@ -7518,7 +7593,7 @@ let propagatedBuildInputs = [ Moo TypeTiny ]; meta = { description = "client library for fastcgi protocol"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ ModuleBuildTiny ]; }; @@ -7545,7 +7620,7 @@ let buildInputs = [ Test2Suite ]; meta = { description = "Check that a library is available for FFI"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7559,7 +7634,7 @@ let meta = { homepage = "https://metacpan.org/release/Fennec-Lite"; description = "Minimalist Fennec, the commonly used bits"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7572,7 +7647,7 @@ let }; buildInputs = [ Test2Suite TestRequires TestWithoutModule ]; propagatedBuildInputs = [ ModulePluggable Moo TypeTiny namespaceautoclean ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Watch for changes to files, cross-platform style"; license = licenses.artistic2; }; @@ -7613,7 +7688,7 @@ let propagatedBuildInputs = [ Readonly ]; meta = { description = "Utilities for handling Byte Order Marks"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7626,7 +7701,7 @@ let }; meta = { description = "Run many filetest checks on a tree"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7650,7 +7725,7 @@ let buildInputs = [ CaptureTiny PathTiny ]; meta = { description = "Recursive copying of files and directories within Perl 5 toolchain"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "http://thenceforward.net/perl/modules/File-Copy-Recursive-Reduced/"; }; }; @@ -7664,7 +7739,7 @@ let }; meta = { description = "Efficiently count the number of line breaks in a file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7700,7 +7775,7 @@ let propagatedBuildInputs = [ ClassXSAccessor ]; meta = { description = "An object oriented File::Find replacement"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -7719,7 +7794,7 @@ let meta = { homepage = "https://www.shlomifish.org/open-source/projects/File-Find-Object/"; description = "Alternative interface to File::Find::Object"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7743,7 +7818,7 @@ let propagatedBuildInputs = [ FileFindRule ParamsUtil ]; meta = { description = "Common rules for searching for Perl things"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7756,7 +7831,7 @@ let }; propagatedBuildInputs = [ TextGlob ]; meta = { - license = stdenv.lib.licenses.free; # Same as Perl + license = lib.licenses.free; # Same as Perl }; }; @@ -7768,9 +7843,9 @@ let sha256 = "05p9m7kpmjv8bmmbs5chb5fqyshcgmskbbzq5c9qpskbx2w5894n"; }; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; description = "simple filename and pathname matching"; - license = stdenv.lib.licenses.free; # Same as Perl + license = lib.licenses.free; # Same as Perl }; }; @@ -7783,7 +7858,7 @@ let }; meta = { description = "Find matches to a pattern in a series of files and related functions"; - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; }; }; @@ -7798,7 +7873,7 @@ let meta = { homepage = "https://github.com/coppit/filehandle-unget/"; description = "FileHandle which supports multi-byte unget"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ romildo ]; }; }; @@ -7813,7 +7888,7 @@ let propagatedBuildInputs = [ FileWhich ]; meta = { description = "Find your home and other directories on any platform"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; preCheck = "export HOME=$TMPDIR"; doCheck = !stdenv.isDarwin; @@ -7837,10 +7912,10 @@ let sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; buildInputs = [ ExtUtilsCChecker ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Modify attributes of symlinks without dereferencing them"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7859,7 +7934,7 @@ let ''; meta = { description = "Determine MIME types of data or files using libmagic"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7882,7 +7957,7 @@ let }; meta = { description = "Load lines from file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7906,7 +7981,7 @@ let }; meta = { description = "Guess file type from contents"; - license = stdenv.lib.licenses.free; # Some form of BSD4/Apache mix. + license = lib.licenses.free; # Some form of BSD4/Apache mix. }; }; @@ -7921,7 +7996,7 @@ let buildInputs = [ TestFatal TestWarnings ]; meta = { description = "Memory mapping made simple and safe."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7935,7 +8010,7 @@ let meta = { homepage = "https://github.com/neilbowers/File-Modified"; description = "Checks intelligently if files have changed"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7966,7 +8041,7 @@ let }; meta = { description = "Create or remove directory trees"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -7984,9 +8059,9 @@ let })]; propagatedBuildInputs = [ ClassAccessor ]; meta = { - license = stdenv.lib.licenses.free; # Same as Perl + license = lib.licenses.free; # Same as Perl description = "Pid File Manipulation"; - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; }; }; @@ -7999,7 +8074,7 @@ let }; meta = { description = "Change directory temporarily for a limited scope"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -8012,7 +8087,7 @@ let }; meta = { description = "Read a file backwards by lines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8036,7 +8111,7 @@ let meta = { homepage = "https://github.com/ingydotnet/file-share-pm"; description = "Extend File::ShareDir to Local Libraries"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8050,7 +8125,7 @@ let propagatedBuildInputs = [ ClassInspector ]; meta = { description = "Locate per-dist and per-module shared files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ FileShareDirInstall ]; }; @@ -8064,7 +8139,7 @@ let }; meta = { description = "Install shared files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8077,7 +8152,7 @@ let }; meta = { description = "Perl extension for filesystem disk space information."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8090,7 +8165,7 @@ let }; meta = { description = "Simple and dumb file system watcher"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestSharedFork ]; }; @@ -8105,7 +8180,7 @@ let buildInputs = [ TestWarn ]; meta = { description = "Estimate file space usage (similar to `du`)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8118,7 +8193,7 @@ let }; meta = { description = "Simple and Efficient Reading/Writing/Modifying of Complete Files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8132,7 +8207,7 @@ let buildInputs = [ TestWarnings ]; meta = { description = "A simple, sane and efficient module to slurp a file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8145,7 +8220,7 @@ let }; meta = { description = "A simple, sane and efficient file slurper [DISCOURAGED]"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8158,8 +8233,8 @@ let }; meta = { description = "Perl extension for reading from continously updated files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -8173,8 +8248,8 @@ let meta = { homepage = "https://github.com/neilb/File-Touch"; description = "Update file access and modification times, optionally creating files if needed"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -8187,7 +8262,7 @@ let }; meta = { description = "File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8202,7 +8277,23 @@ let meta = { homepage = "https://github.com/tommybutler/file-util/wiki"; description = "Easy, versatile, portable file handling"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + FileUtilTempdir = buildPerlPackage { + pname = "File-Util-Tempdir"; + version = "0.034"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/File-Util-Tempdir-0.034.tar.gz"; + sha256 = "076wdwbvqsg64wr5np8j6pnmmhs9li64g9mw2h33zbbgbv7f47fi"; + }; + buildInputs = [ Perlosnames TestException ]; + meta = { + homepage = "https://metacpan.org/release/File-Util-Tempdir"; + description = "Cross-platform way to get system-wide & user private temporary directory"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; }; }; @@ -8216,7 +8307,7 @@ let meta = { homepage = "https://metacpan.org/release/File-Which"; description = "Perl implementation of the which utility as an API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8229,7 +8320,7 @@ let }; meta = { description = "Extended globs."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8242,7 +8333,7 @@ let }; meta = { description = "Source Filters"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8254,7 +8345,7 @@ let sha256 = "0lxz9fsm4ld3l900zxh2w91wjygk0ifn4miw6q5k4mm67d2c9nwm"; }; propagatedBuildInputs = [ CGI DateTimeFormatStrptime HTMLTableExtract JSON JSONParse LWPProtocolHttps StringUtil TextTemplate ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://finance-quote.sourceforge.net/"; description = "Get stock and mutual fund quotes from various exchanges"; license = licenses.gpl2; @@ -8269,9 +8360,9 @@ let url = "mirror://cpan/authors/id/Y/YA/YANNK/Find-Lib-1.04.tar.gz"; sha256 = "0lg88v0sqfpq4d3jwvk6c9blqnpxbz8f4s22zr3b1qb160g94wqx"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Helper to smartly find libs to use in the filesystem tree"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8293,7 +8384,7 @@ let }; meta = { description = "TTF font support for Perl"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; buildInputs = [ IOString ]; }; @@ -8308,7 +8399,7 @@ let doCheck = false; meta = { description = "Extensions and convenience methods to manage background processes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ URI ]; }; @@ -8323,7 +8414,7 @@ let propagatedBuildInputs = [ ClassAccessor ClassDataAccessor DateCalc DateTimeFormatStrptime EmailValidLoose ListMoreUtils TieIxHash UNIVERSALrequire YAML ]; meta = { description = "Validation with simple chains of constraints"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ CGI ]; }; @@ -8349,7 +8440,7 @@ let buildInputs = [ HTTPCookieJar HTTPProxy ModuleBuildTiny Plack Starlet TestFakeHTTPD TestRequires TestSharedFork TestTCP TestValgrind URI ]; meta = { description = "Lightning-fast URL fetcher"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8363,23 +8454,23 @@ let buildInputs = [ TestFatal TestIdentity TestRefcount ]; meta = { description = "represent an operation awaiting completion"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.46"; + version = "0.47"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "1iqbs7n8923xjkai51hiczn5an8cskddl7qrfi30axjl1d56h6r0"; + sha256 = "1ja85hzzl36sjikcyavjqy4m41f2yyrsr1ipypzi5mlw7clhmdi3"; }; buildInputs = [ TestRefcount ]; propagatedBuildInputs = [ Future XSParseSublike ]; - perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "Deferred subroutine syntax for futures"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -8395,7 +8486,7 @@ let propagatedBuildInputs = [ ClassXSAccessor ExceptionClass PathTiny ]; meta = { description = "Verify solutions for solitaire games"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -8426,7 +8517,7 @@ let buildInputs = [ CaptureTiny TestException ]; meta = { description = "Graph Plotting Module for Perl 5"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8440,7 +8531,7 @@ let propagatedBuildInputs = [ GD ]; meta = { description = "Security image (captcha) generator"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8479,7 +8570,7 @@ let buildInputs = [ PathClass TestFatal TestNumberDelta ]; meta = { description = "Perl API for MaxMind's GeoIP2 web services and databases"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8491,7 +8582,7 @@ let sha256 = "3709aa513ce6fd71d1a55a02e34d2f090017d5350a9bd447005653c9b0835b22"; }; meta = { - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; maintainers = [ maintainers.pSub ]; }; }; @@ -8517,7 +8608,7 @@ let meta = { homepage = "https://github.com/rjbs/Getopt-Long-Descriptive"; description = "Getopt::Long, but simpler and more powerful"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8539,9 +8630,9 @@ let }; propagatedBuildInputs = [ Error ]; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; }; @@ -8555,7 +8646,7 @@ let meta = { maintainers = [ maintainers.DamienCassou ]; description = "Create fixup commits for topic branches"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -8571,7 +8662,7 @@ let doCheck = false; meta = { description = "A Pure Perl interface to Git repositories"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8586,7 +8677,7 @@ let propagatedBuildInputs = [ GitVersionCompare SystemCommand namespaceclean ]; meta = { description = "Perl interface to Git repositories"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8600,7 +8691,7 @@ let buildInputs = [ TestNoWarnings ]; meta = { description = "Functions to compare Git versions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8616,7 +8707,7 @@ let meta = { homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl wrappers for the GLib utility and Object libraries"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig ]; }; @@ -8628,10 +8719,15 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.048.tar.gz"; sha256 = "01dx5w6r4nl3rgnz7wvgvqfaa48xmzy90p95d5k6315q44610kx6"; }; + checkInputs = [ pkgs.cairo ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; meta = { + broken = true; # TODO: tests failing because "failed to load libregress.so" + # see https://github.com/NixOS/nixpkgs/pull/68115 + # and https://github.com/NixOS/nixpkgs/issues/68116 + # adding pkgs.gnome3.gjs does not fix it description = "Dynamically create Perl language bindings"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; }; }; @@ -8647,7 +8743,7 @@ let meta = { homepage = "http://gtk2-perl.sourceforge.net"; description = "Perl interface to the 2.x series of the GNOME libraries"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }; @@ -8660,7 +8756,7 @@ let }; buildInputs = [ pkgs.gnome2.libgnomecanvas ]; meta = { - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; }; propagatedBuildInputs = [ Gtk2 ]; }; @@ -8675,7 +8771,7 @@ let propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; meta = { description = "Perl interface to the 2.x series of the GNOME VFS library"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }; @@ -8690,7 +8786,7 @@ let propagatedBuildInputs = [ Gtk2 ]; meta = { description = "Perl interface to the Window Navigator Construction Kit"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }; @@ -8717,7 +8813,7 @@ let doCheck = false; meta = { description = "Supply object methods for interacting with GnuPG"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8745,7 +8841,7 @@ let propagatedBuildInputs = [ pkgs.goocanvas pkgs.gtk2 Gtk2 ]; meta = { description = "Perl interface to the GooCanvas"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8760,7 +8856,7 @@ let propagatedBuildInputs = [ pkgs.goocanvas2 Gtk3 ]; meta = { description = "Perl binding for GooCanvas2 widget using Glib::Object::Introspection"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8776,7 +8872,7 @@ let [ ../development/perl-modules/Google-ProtocolBuffers-multiline-comments.patch ]; meta = { description = "Simple interface to Google Protocol Buffers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8801,7 +8897,7 @@ let buildInputs = [ pkgs.graphviz TestPod ]; propagatedBuildInputs = [ FileWhich IPCRun ParseRecDescent XMLTwig XMLXPath ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Perl interface to the GraphViz graphing tool"; license = licenses.artistic2; }; @@ -8820,7 +8916,7 @@ let meta = { homepage = "https://github.com/coppit/grepmail"; description = "Search mailboxes for mail matching a regular expression"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ romildo ]; }; }; @@ -8845,9 +8941,9 @@ let }; propagatedBuildInputs = [ pkgs.krb5Full.dev ]; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; description = "Perl extension providing access to the GSSAPIv2 library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; makeMakerFlags = "--gssapiimpl ${pkgs.krb5Full.dev}"; }; @@ -8866,7 +8962,7 @@ let meta = { homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; propagatedBuildInputs = [ Pango ]; }; @@ -8881,7 +8977,7 @@ let propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 ]; meta = { description = "Create user interfaces directly from Glade XML files"; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; }; }; @@ -8894,7 +8990,7 @@ let }; propagatedBuildInputs = [ pkgs.gtk2 Gtk2 ]; meta = { - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; }; @@ -8911,7 +9007,7 @@ let doCheck = false; meta = { description = "Perl extension for libappindicator"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; }; @@ -8930,7 +9026,7 @@ let doCheck = false; meta = { description = "Perl bindings for the GtkImageView widget"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; }; @@ -8944,7 +9040,7 @@ let propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 ]; meta = { description = "Use single instance applications"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8958,7 +9054,7 @@ let propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { description = "Perl interface to the 3.x series of the GTK toolkit"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }; @@ -8971,7 +9067,7 @@ let }; meta = { description = "A simple interface to Gtk3's complex MVC list widget"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; propagatedBuildInputs = [ Gtk3 ]; }; @@ -8993,7 +9089,7 @@ let sha256 = "e01b455d46f44710dbcf21b6fa843f09358ce60eee1c4141bc74e0a204d3a020"; }; propagatedBuildInputs = [ DateCalc ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Finnish APRS Parser (Fabulous APRS Parser)"; maintainers = with maintainers; [ andrew-d ]; license = with licenses; [ artistic1 gpl1Plus ]; @@ -9009,17 +9105,17 @@ let }; buildInputs = [ BotTrainingMegaHAL BotTrainingStarCraft DataSection FileSlurp PodSection TestException TestExpect TestOutput TestScript TestScriptRun ]; propagatedBuildInputs = [ ClassLoad DBDSQLite DataDump DirSelf FileCountLines GetoptLongDescriptive IOInteractive IPCSystemSimple ListMoreUtils Moose MooseXGetopt MooseXStrictConstructor MooseXTypes RegexpCommon TermSk namespaceclean ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postPatch = '' patchShebangs bin ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/hailo ''; meta = { homepage = "https://github.com/hailo/hailo"; description = "A pluggable Markov engine analogous to MegaHAL"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9033,7 +9129,7 @@ let propagatedBuildInputs = [ HashMerge ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; description = "Return difference between two hashes as a hash"; }; buildInputs = [ TestSimple13 ]; @@ -9077,7 +9173,7 @@ let propagatedBuildInputs = [ Clone ]; meta = { description = "Recursively merge two or more hashes, simply"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9090,7 +9186,7 @@ let }; meta = { description = "Provide the stuff missing in Hash::Util"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9103,7 +9199,7 @@ let }; meta = { description = "Store multiple values per key"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9136,7 +9232,7 @@ let meta = { homepage = "https://github.com/chorny/Hook-LexWrap"; description = "Lexically scoped subroutine wrappers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9149,7 +9245,7 @@ let }; meta = { description = "Cleans up HTML code for web browsers, not humans"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9171,11 +9267,11 @@ let sha256 = "b1cbac4157ad8dedac6914e1628855e05b8dc885a4007d2e4df8177c6a9b70fb"; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { homepage = "https://github.com/tokuhirom/HTML-Escape"; description = "Extremely fast HTML escaping"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9201,7 +9297,7 @@ let propagatedBuildInputs = [ HTMLParser ]; meta = { description = "Class that represents an HTML form element"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9216,7 +9312,7 @@ let propagatedBuildInputs = [ FontAFM HTMLTree ]; meta = { description = "Base class for HTML formatters"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9230,7 +9326,7 @@ let propagatedBuildInputs = [ HTMLFormatter ]; meta = { description = "HTML to text conversion with links as footnotes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9244,7 +9340,7 @@ let propagatedBuildInputs = [ HTMLFormatTextWithLinks ]; meta = { description = "Converts HTML to Text with tables intact"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9259,7 +9355,7 @@ let propagatedBuildInputs = [ ConfigAny DataVisitor DateTimeFormatBuilder DateTimeFormatNatural EmailValid HTMLScrubber HTMLTokeParserSimple HashFlatten JSONMaybeXS MooseXAliases MooseXAttributeChained NumberFormat PathClass Readonly RegexpCommon TaskWeaken YAMLLibYAML ]; meta = { description = "HTML Form Creation, Rendering and Validation Framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9273,7 +9369,7 @@ let propagatedBuildInputs = [ CryptCBC CryptDES HTMLFormFu ]; meta = { description = "Handle multi-page/stage forms with FormFu"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/FormFu/HTML-FormFu-MultiForm"; }; }; @@ -9291,7 +9387,7 @@ let propagatedBuildInputs = [ CryptBlowfish CryptCBC DataClone DateTimeFormatStrptime EmailValid HTMLTree JSONMaybeXS MooseXGetopt MooseXTypesCommon MooseXTypesLoadableClass aliased ]; meta = { description = "HTML forms using Moose"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9306,7 +9402,7 @@ let propagatedBuildInputs = [ CGI CacheCache ClassContainer ExceptionClass LogAny ]; meta = { description = "High-performance, dynamic web site authoring system"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9321,7 +9417,7 @@ let propagatedBuildInputs = [ CGIPSGI HTMLMason ]; meta = { description = "PSGI handler for HTML::Mason"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9335,7 +9431,7 @@ let propagatedBuildInputs = [ HTMLTagset HTTPMessage ]; meta = { description = "HTML parser class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9348,7 +9444,7 @@ let }; meta = { description = "Generate An HTML Tag Cloud"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9362,7 +9458,7 @@ let propagatedBuildInputs = [ HTMLParser ]; meta = { description = "Extract structure of quoted HTML mail message"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9376,7 +9472,7 @@ let propagatedBuildInputs = [ HTMLParser ]; meta = { description = "Concise attribute rewriting"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9410,7 +9506,7 @@ let }; meta = { description = "Strip scripting constructs out of HTML"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9424,7 +9520,7 @@ let propagatedBuildInputs = [ HTMLParser HTMLStripScripts ]; meta = { description = "XSS filter using HTML::Parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9482,7 +9578,7 @@ let }; meta = { description = "Lightweight, dependency free HTML/XML generation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9507,7 +9603,7 @@ let propagatedBuildInputs = [ HTMLParser ]; meta = { description = "Work with HTML in a DOM-like tree structure"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9521,7 +9617,7 @@ let propagatedBuildInputs = [ HTMLTree XMLXPathEngine ]; meta = { description = "Add XPath support to HTML::TreeBuilder"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9548,7 +9644,7 @@ let propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP Body Parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9563,7 +9659,7 @@ let buildInputs = [ TestDeep TestRequires URI ]; meta = { description = "A minimalist HTTP user agent cookie jar"; - license = with stdenv.lib.licenses; [ asl20 ]; + license = with lib.licenses; [ asl20 ]; homepage = "https://github.com/dagolden/HTTP-CookieJar"; }; }; @@ -9578,7 +9674,7 @@ let propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "HTTP cookie jars"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9592,7 +9688,7 @@ let propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "A simple http server class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9605,7 +9701,7 @@ let }; meta = { description = "Date conversion routines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ TimeDate ]; }; @@ -9621,7 +9717,7 @@ let buildInputs = [ HTTPMessage ModuleBuildTiny ]; meta = { description = "PSGI compliant HTTP Entity Parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/kazeburo/HTTP-Entity-Parser"; }; }; @@ -9661,7 +9757,7 @@ let meta = { homepage = "https://github.com/tokuhirom/HTTP-Headers-Fast"; description = "Faster implementation of HTTP::Headers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9687,7 +9783,7 @@ let meta = { homepage = "https://github.com/libwww-perl/HTTP-Message"; description = "HTTP style message (base class)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9701,7 +9797,7 @@ let buildInputs = [ TestDeep ]; meta = { description = "HTTP MultiPart Parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9715,7 +9811,7 @@ let propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "Choose a variant to serve"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9738,7 +9834,7 @@ let propagatedBuildInputs = [ LWP ]; meta = { description = "A pure Perl HTTP proxy"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; # tests fail because they require network access doCheck = false; @@ -9777,7 +9873,7 @@ let }; doCheck = false; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ CGI ]; }; @@ -9791,7 +9887,7 @@ let }; propagatedBuildInputs = [ AuthenSimple HTTPServerSimple ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9805,7 +9901,7 @@ let propagatedBuildInputs = [ HTMLMason HTTPServerSimple HookLexWrap ]; meta = { description = "A simple mason server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9819,11 +9915,27 @@ let propagatedBuildInputs = [ HTTPServerSimple ]; meta = { description = "PSGI handler for HTTP::Server::Simple"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/miyagawa/HTTP-Server-Simple-PSGI"; }; }; + HTTPTinyCache = buildPerlPackage { + pname = "HTTP-Tiny-Cache"; + version = "0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/HTTP-Tiny-Cache-0.002.tar.gz"; + sha256 = "08c6274x7fxl9r7cw1yiq21wv2mjgxw7db0wv5r80dyw377vfzbk"; + }; + propagatedBuildInputs = [ FileUtilTempdir Logger ]; + meta = { + homepage = "https://metacpan.org/release/HTTP-Tiny-Cache"; + description = "Cache HTTP::Tiny responses"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + HTTPTinyish = buildPerlPackage { pname = "HTTP-Tinyish"; version = "0.17"; @@ -9835,7 +9947,7 @@ let meta = { homepage = "https://github.com/miyagawa/HTTP-Tinyish"; description = "HTTP::Tiny compatible HTTP client wrappers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9848,7 +9960,7 @@ let }; propagatedBuildInputs = [ DateTimeFormatICal FreezeThaw IOString TextvFileasData ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9864,7 +9976,7 @@ let meta = { homepage = "http://imager.perl.org/"; description = "Perl extension for Generating 24 bit Images"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9878,7 +9990,7 @@ let propagatedBuildInputs = [ Imager ]; meta = { description = "Generate QR Code with Imager using libqrencode"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -9893,7 +10005,7 @@ let propagatedBuildInputs = [ IOStringy ]; meta = { description = "Extract meta information from image files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9908,7 +10020,7 @@ let propagatedBuildInputs = [ ExceptionClass Readonly ]; meta = { description = "Perl extension for the SANE (Scanner Access Now Easy) Project"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9924,7 +10036,7 @@ let makeMakerFlags = "--with-jpeg-includes=${pkgs.libjpeg.dev}/include --with-jpeg-libs=${pkgs.libjpeg.out}/lib --with-png-includes=${pkgs.libpng.dev}/include --with-png-libs=${pkgs.libpng.out}/lib"; meta = { description = "Fast, high-quality fixed-point image resizing"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; }; @@ -9938,7 +10050,7 @@ let buildInputs = [ ModuleBuild ]; meta = { description = "Read the dimensions of an image in several popular formats"; - license = with stdenv.lib.licenses; [ artistic1 lgpl21Plus ]; + license = with lib.licenses; [ artistic1 lgpl21Plus ]; }; }; @@ -9961,7 +10073,7 @@ let }; meta = { description = "Alternative but compatible interface to modules that export symbols"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9975,7 +10087,7 @@ let propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Import packages into other packages"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9989,7 +10101,7 @@ let doCheck = false; meta = { description = "Perl core IO modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10002,13 +10114,13 @@ let }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/treescan ''; meta = { description = "Asynchronous/Advanced Input/Output"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10022,7 +10134,7 @@ let meta = { homepage = "https://github.com/ingydotnet/io-all-pm"; description = "IO::All of it to Graham and Damian!"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10038,7 +10150,7 @@ let buildInputs = [ TestFatal TestIdentity TestMetricsAny TestRefcount ]; meta = { description = "Asynchronous event-driven programming"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10053,7 +10165,7 @@ let propagatedBuildInputs = [ Future IOAsync IOSocketSSL ]; meta = { description = "Use SSL/TLS with IO::Async"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -10066,7 +10178,7 @@ let sha256 = "c2c15a254ca74fb8c57d25d7b6cbcaff77a3b4fb5695423f1f80bb423abffea9"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10080,7 +10192,7 @@ let meta = { homepage = "https://github.com/dagolden/IO-CaptureOutput"; description = "Capture STDOUT and STDERR from Perl code, subprocesses or XS"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10094,7 +10206,7 @@ let propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { description = "IO Interface to compressed data files/buffers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; # Same as CompressRawZlib doCheck = false && !stdenv.isDarwin; @@ -10119,7 +10231,7 @@ let }; meta = { description = "Open an HTML file with automatic charset detection"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10145,7 +10257,7 @@ let }; meta = { description = "Utilities for interactive I/O"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10231,7 +10343,7 @@ let meta = { homepage = "https://github.com/noxxi/p5-io-socket-ssl"; description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; # tries to connect to facebook.com etc. }; @@ -10247,7 +10359,7 @@ let propagatedBuildInputs = [ PerlIOviaTimeout ]; meta = { description = "IO::Socket with read/write timeout"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10288,7 +10400,7 @@ let meta = { homepage = "https://github.com/rjbs/io-tiecombine"; description = "Produce tied (and other) separate but combined variables"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10312,7 +10424,7 @@ let propagatedBuildInputs = [ GeographyCountries ]; meta = { description = "Fast lookup of country codes from IP addresses"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -10325,7 +10437,7 @@ let }; meta = { description = "2-letter, 3-letter, and numerical codes for countries"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -10340,7 +10452,7 @@ let doCheck = false; /* attempts a network connection to localhost */ meta = { description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ IOTty ]; buildInputs = [ Readonly ]; @@ -10373,7 +10485,7 @@ let }; meta = { description = "Run commands simply, with detailed diagnostics"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10386,7 +10498,7 @@ let }; meta = { description = "System V IPC constants and system calls"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10400,7 +10512,7 @@ let meta = { homepage = "https://metacpan.org/release/IRC-Utils"; description = "Common utilities for IRC-related tasks"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -10414,12 +10526,12 @@ let sha256 = "0nl5djf6hs6brnp7qnqvj3xwhj1qnjwcv35ih4yqp2mm9b4jqyfh"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/exiftool ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to read, write and edit EXIF meta information"; homepage = "https://exiftool.org/"; @@ -10458,7 +10570,7 @@ let module. The code is automatically compiled as needed, and then loaded for immediate access from Perl. ''; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10479,7 +10591,7 @@ let meta = { homepage = "https://github.com/ingydotnet/inline-c-pm"; description = "C Language Support for Inline"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10511,7 +10623,7 @@ let available to the Perl program as if they had been written in Perl. ''; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -10531,10 +10643,10 @@ let url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; }; - perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { description = "XS based JavaScript minifier"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10547,7 +10659,7 @@ let }; meta = { description = "Avoid XSS with JavaScript value interpolation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/kazeburo/JavaScript-Value-Escape"; }; }; @@ -10560,13 +10672,13 @@ let sha256 = "0z32x2lijij28c9fhmzgxc41i9nw24fyvd2a8ajs5zw9b9sqhjj4"; }; # Do not abort cross-compilation on failure to load native JSON module into host perl - preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.PL --replace "exit 0;" "" ''; buildInputs = [ TestPod ]; meta = { description = "JSON (JavaScript Object Notation) encoder/decoder"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10579,7 +10691,7 @@ let }; meta = { description = "Wrapper Class for the various JSON classes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestFatal TestRequires TestWarnings TestWithoutModule ]; }; @@ -10593,7 +10705,7 @@ let }; meta = { description = "Use L<Cpanel::JSON::XS> with a fallback to L<JSON::XS> and L<JSON::PP>"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestNeeds ]; }; @@ -10607,7 +10719,7 @@ let }; meta = { description = "JSON::XS compatible pure-Perl module"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10620,7 +10732,7 @@ let }; meta = { description = "Helper module in using JSON::PP in Perl 5.6"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10633,7 +10745,7 @@ let }; meta = { description = "Read JSON into a Perl variable"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10649,7 +10761,7 @@ let meta = { homepage = "https://github.com/mojolicious/json-validator"; description = "Validate data against a JSON schema"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -10666,7 +10778,7 @@ let meta = { homepage = "https://github.com/xaicron/p5-JSON-WebToken"; description = "JSON Web Token (JWT) implementation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10690,7 +10802,7 @@ let }; propagatedBuildInputs = [ JSONXS ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10714,18 +10826,18 @@ let preCheck = '' rm t/931_epub.t # epub test fails ''; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; # shebangs need to be patched before executables are copied to $out preBuild = '' patchShebangs bin/ - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' for file in bin/*; do shortenPerlShebang "$file" done ''; meta = { description = "Transforms TeX and LaTeX into XML/HTML/MathML"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; }; }; @@ -10783,7 +10895,7 @@ let ''; doCheck = false; # test would need to start apache httpd meta = { - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -10805,7 +10917,7 @@ let }; meta = { description = "Collection of network protocol modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10818,7 +10930,7 @@ let }; meta = { description = "Add paths relative to the current file to @INC"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; homepage = "https://github.com/Grinnz/lib-relative"; }; }; @@ -10844,7 +10956,7 @@ let meta = { homepage = "https://github.com/neilbowers/Lingua-EN-FindNumber"; description = "Locate (written) numbers in English text"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10857,7 +10969,7 @@ let }; meta = { description = "Convert singular to plural. Select 'a' or 'an'"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10872,7 +10984,7 @@ let meta = { homepage = "https://github.com/neilbowers/Lingua-EN-Inflect-Number"; description = "Force number of words to singular or plural"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10887,7 +10999,7 @@ let propagatedBuildInputs = [ LinguaENInflectNumber LinguaENNumberIsOrdinal LinguaENTagger ]; meta = { description = "Inflect short English Phrases"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10902,7 +11014,7 @@ let propagatedBuildInputs = [ LinguaENFindNumber ]; meta = { description = "Detect if English number is ordinal or cardinal"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10916,7 +11028,7 @@ let propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ]; meta = { description = "Part-of-speech tagger for English natural language processing"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; }; }; @@ -10941,7 +11053,7 @@ let }; meta = { description = "Portuguese language stemming"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/neilb/Lingua-PT-Stemmer"; }; }; @@ -10988,7 +11100,7 @@ let }; meta = { description = "Porter's stemming algorithm for Russian (KOI8-R only)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/neilb/Lingua-Stem-Ru"; }; }; @@ -11026,7 +11138,7 @@ let meta = { homepage = "https://github.com/jhthorsen/linkembedder"; description = "Embed / expand oEmbed resources and other URL / links"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = with maintainers; [ sgo ]; }; }; @@ -11041,9 +11153,9 @@ let buildInputs = [ pkgs.acl ]; NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl"; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11057,7 +11169,7 @@ let meta = { homepage = "https://github.com/trizen/Linux-DesktopFiles"; description = "Fast parsing of the Linux desktop files"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -11073,8 +11185,8 @@ let doCheck = false; meta = { description = "Perl extension to detect on which Linux distribution we are running"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.linux; }; }; @@ -11087,11 +11199,11 @@ let }; buildInputs = [ TestException ]; propagatedBuildInputs = [ SubExporter ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Linux specific special filehandles"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.linux; }; }; @@ -11106,8 +11218,8 @@ let meta = { description = "Scalable directory/file change notification for Perl on Linux"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.linux; }; }; @@ -11121,7 +11233,7 @@ let propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; meta = { description = "Combines List::Util and List::MoreUtils in one bite-sized package"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11145,7 +11257,7 @@ let meta = { homepage = "http://thenceforward.net/perl/modules/List-Compare/"; description = "Compare elements of two or more lists"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11159,7 +11271,7 @@ let propagatedBuildInputs = [ ExporterTiny ListMoreUtilsXS ]; meta = { description = "Provide the stuff missing in List::Util"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestLeakTrace ]; }; @@ -11176,7 +11288,7 @@ let ''; meta = { description = "Provide the stuff missing in List::Util in XS"; - license = with stdenv.lib.licenses; [ asl20 ]; + license = with lib.licenses; [ asl20 ]; }; }; @@ -11191,7 +11303,7 @@ let propagatedBuildInputs = [ ModuleImplementation ]; meta = { description = "Provide the stuff missing in List::Util"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11213,7 +11325,7 @@ let }; meta = { description = "A distribution of modules to handle locale codes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestInter ]; }; @@ -11240,7 +11352,7 @@ let buildInputs = [ TestDifferences TestException TestHexDifferences TestNoWarnings ]; meta = { description = "Locale::MO::File - Write or read gettext MO files."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11279,7 +11391,7 @@ let }; meta = { description = "Compile .po files to .mo files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11307,7 +11419,7 @@ let buildInputs = [ TestDifferences TestException TestNoWarnings ]; meta = { description = "Locale::TextDomain::OO - Perl OO Interface to Uniforum Message Translation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11322,7 +11434,7 @@ let buildInputs = [ TestDifferences TestException TestNoWarnings ]; meta = { description = "Locale::TextDomain::OO::Util - Lexicon utils"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11337,7 +11449,7 @@ let buildInputs = [ TestDifferences TestException TestNoWarnings ]; meta = { description = "Locale::Utils::PlaceholderBabelFish - Utils to expand BabelFish palaceholders"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11352,7 +11464,7 @@ let buildInputs = [ TestDifferences TestException TestNoWarnings ]; meta = { description = "Locale::Utils::PlaceholderMaketext - Utils to expand maketext placeholders"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11367,7 +11479,7 @@ let buildInputs = [ TestDifferences TestException TestNoWarnings ]; meta = { description = "Locale::Utils::PlaceholderNamed - Utils to expand named placeholders"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11380,7 +11492,7 @@ let }; meta = { description = "Create and use a local lib/ for perl modules with PERL5LIB"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ ModuleBuild ]; }; @@ -11406,7 +11518,7 @@ let meta = { homepage = "https://github.com/preaction/Log-Any"; description = "Bringing loggers and listeners together"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11420,7 +11532,7 @@ let propagatedBuildInputs = [ LogAny LogLog4perl ]; meta = { description = "Log::Any adapter for Log::Log4perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/preaction/Log-Any-Adapter-Log4perl"; }; }; @@ -11437,7 +11549,7 @@ let meta = { homepage = "https://github.com/frioux/Log-Contextual"; description = "Simple logging interface with a contextual log"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11451,7 +11563,7 @@ let propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ]; meta = { description = "Dispatches messages to one or more outputs"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; buildInputs = [ IPCRun3 TestFatal TestNeeds ]; }; @@ -11466,11 +11578,26 @@ let propagatedBuildInputs = [ DateManip LogDispatch ]; meta = { description = "Log to Files that Archive/Rotate Themselves"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ PathTiny TestWarn ]; }; + Logger = buildPerlPackage { + pname = "Log-ger"; + version = "0.037"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Log-ger-0.037.tar.gz"; + sha256 = "0f5078g8lkyw09ijpz7dna5xw6yvpd0m283fdrw3s152xmr43qn2"; + }; + meta = { + homepage = "https://metacpan.org/release/Log-ger"; + description = "A lightweight, flexible logging framework"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + LogHandler = buildPerlModule { pname = "Log-Handler"; version = "0.90"; @@ -11481,7 +11608,7 @@ let propagatedBuildInputs = [ ParamsValidate ]; meta = { description = "Log messages to several outputs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11494,7 +11621,7 @@ let }; meta = { description = "Powerful and flexible message logging mechanism"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11508,7 +11635,7 @@ let propagatedBuildInputs = [ LogMessage ]; meta = { description = "Simplified interface to Log::Message"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11530,7 +11657,7 @@ let }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/marioroy/mce-perl"; }; }; @@ -11545,7 +11672,7 @@ let meta = { homepage = "https://mschilli.github.io/log4perl/"; description = "Log4j implementation for Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11561,7 +11688,7 @@ let meta = { homepage = "https://github.com/rjbs/log-dispatch-array"; description = "Log events to an array (reference)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11577,7 +11704,7 @@ let meta = { homepage = "https://github.com/rjbs/Log-Dispatchouli"; description = "A simple wrapper around Log::Dispatch"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11595,7 +11722,7 @@ let ''; meta = { description = "Send messages to a systemd journal"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11609,7 +11736,7 @@ let propagatedBuildInputs = [ IOLockedFile ]; meta = { description = "Helps us create simple logs for our application"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11622,11 +11749,11 @@ let }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) - postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #' ''; doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = with lib; { description = "The World-Wide Web library for Perl"; license = with licenses; [ artistic1 gpl1Plus ]; }; @@ -11643,7 +11770,7 @@ let propagatedBuildInputs = [ LWP ]; meta = { description = "Generate signed OAuth requests"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11656,7 +11783,7 @@ let }; meta = { description = "Guess media type for a file or a URL"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestFatal ]; }; @@ -11672,7 +11799,7 @@ let propagatedBuildInputs = [ LWPProtocolHttps ]; meta = { description = "Provides HTTP/CONNECT proxy support for LWP::UserAgent"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11688,7 +11815,7 @@ let doCheck = false; # tries to connect to https://www.apache.org/. meta = { description = "Provide https support for LWP::UserAgent"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestRequiresInternet ]; }; @@ -11703,7 +11830,7 @@ let propagatedBuildInputs = [ LWP ]; meta = { description = "Legacy HTTP/1.0 support for LWP"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11718,7 +11845,7 @@ let buildInputs = [ ModuleBuildTiny TestFakeHTTPD TestSharedFork TestTCP TestUseAllModules ]; meta = { description = "Override LWP HTTP/HTTPS request's host like /etc/hosts"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/masaki/p5-LWP-UserAgent-DNS-Hosts"; }; }; @@ -11771,7 +11898,7 @@ let url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.009.tar.gz"; sha256 = "85b1d5e9630973b997c3c1634e2df964d6a8d6cb57d9abe1f7093385cf26cf54"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Manipulate Mac OS X pasteboards"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.darwin; @@ -11789,7 +11916,7 @@ let buildInputs = [ TestException ]; meta = { description = "Object Oriented Authentication-Results Headers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ JSON ]; }; @@ -11828,7 +11955,7 @@ let meta = { homepage = "https://github.com/coppit/mail-mbox-messageparser"; description = "A fast and simple mbox folder reader"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; maintainers = with maintainers; [ romildo ]; }; }; @@ -11843,7 +11970,7 @@ let propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; meta = { description = "Processing MIME messages"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11878,7 +12005,7 @@ let }; meta = { description = "Perl 5 module to talk to a POP3 (RFC1939) server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11901,7 +12028,7 @@ let meta = { homepage = "https://github.com/Perl-Email-Project/Mail-Sender"; description = "(DEPRECATED) module for sending mails with attachments through an SMTP server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11920,9 +12047,9 @@ let perl -I blib/lib -MMail::Sendmail -e 'print "1..1\nok 1\n"' ''; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; description = "Simple platform independent mailer"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11943,7 +12070,7 @@ let doCheck = false; # The main test performs network access meta = { description = "An object-oriented implementation of Sender Policy Framework"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -11958,7 +12085,7 @@ let propagatedBuildInputs = [ TimeDate ]; meta = { description = "Various e-mail related modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11972,7 +12099,7 @@ let propagatedBuildInputs = [ MailMessage ]; meta = { description = "Email message exchange"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11985,7 +12112,7 @@ let }; meta = { description = "Perl extension for base 85 numbers, as referenced by RFC 1924"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12018,7 +12145,7 @@ let meta = { homepage = "https://github.com/Grinnz/Math-Calc-Parser"; description = "Parse and evaluate mathematical expressions"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = with maintainers; [ sgo ]; }; }; @@ -12032,7 +12159,7 @@ let }; meta = { description = "Human-readable unit-aware calculator"; - license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + license = with lib.licenses; [ artistic1 gpl2 ]; }; }; @@ -12045,7 +12172,7 @@ let }; meta = { description = "Arbitrary size integer/float math package"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12072,7 +12199,7 @@ let }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12108,7 +12235,7 @@ let NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; meta = { description = "High speed arbitrary size integer math"; - license = with stdenv.lib.licenses; [ lgpl21Plus ]; + license = with lib.licenses; [ lgpl21Plus ]; }; }; @@ -12124,7 +12251,7 @@ let meta = { homepage = "https://github.com/sisyphus/math-gmpz"; description = "Perl interface to the GMP integer functions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -12149,7 +12276,7 @@ let propagatedBuildInputs = [ MathInt64 ]; meta = { description = "Manipulate 128 bits integers in Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; broken = stdenv.is32bit; # compiler doesn't support a 128-bit integer type }; }; @@ -12163,7 +12290,7 @@ let }; meta = { description = "Manipulate 64 bits integers in Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12184,7 +12311,7 @@ let }; meta = { description = "Perl interface to PARI"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12210,7 +12337,7 @@ let meta = { homepage = "https://github.com/danaj/Math-Prime-Util"; description = "Utilities related to prime numbers, including fast sieves and factoring"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; buildInputs = [ TestWarn ]; @@ -12229,7 +12356,23 @@ let meta = { homepage = "https://github.com/danaj/Math-Prime-Util-GMP"; description = "Utilities related to prime numbers, using GMP"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + + MathProvablePrime = buildPerlPackage { + pname = "Math-ProvablePrime"; + version = "0.045"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Math-ProvablePrime-0.045.tar.gz"; + sha256 = "32dce42861ce065a875a91ec14c6557e89af07df10cc450d1c4ded13dcbe3dd5"; + }; + buildInputs = [ FileWhich TestClass TestDeep TestException TestNoWarnings ]; + propagatedBuildInputs = [ BytesRandomSecureTiny ]; + meta = { + description = "Generate a provable prime number, in pure Perl"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -12255,7 +12398,7 @@ let buildInputs = [ TestNoWarnings ]; meta = { description = "Perl interface to the ISAAC PRNG algorithm"; - license = with stdenv.lib.licenses; [ publicDomain mit artistic2 gpl3 ]; + license = with lib.licenses; [ publicDomain mit artistic2 gpl3 ]; }; }; @@ -12284,7 +12427,7 @@ let propagatedBuildInputs = [ CryptRandomSource MathRandomISAAC ]; meta = { description = "Cryptographically-secure, cross-platform replacement for rand()"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -12316,7 +12459,7 @@ let propagatedBuildInputs = [ DataDumperConcise DateTime ListAllUtils MooXStrictConstructor ]; meta = { description = "Code shared by the MaxMind DB reader and writer modules"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -12331,7 +12474,7 @@ let buildInputs = [ PathClass TestBits TestFatal TestNumberDelta TestRequires ]; meta = { description = "Read MaxMind DB files and look up IP addresses"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -12346,7 +12489,7 @@ let buildInputs = [ NetWorks PathClass TestFatal TestNumberDelta TestRequires ]; meta = { description = "Fast XS implementation of MaxMind DB reader"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -12362,7 +12505,7 @@ let hardeningDisable = [ "format" ]; meta = { description = "Create MaxMind DB database files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12384,7 +12527,7 @@ let }; meta = { description = "Expiry plug-in for Memoize that adds LRU cache expiration"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/neilb/Memoize-ExpireLRU"; }; }; @@ -12400,7 +12543,7 @@ let meta = { homepage = "https://github.com/miyagawa/cpanminus"; description = "A CPAN client"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12415,7 +12558,7 @@ let meta = { homepage = "https://github.com/miyagawa/cpanminus"; description = "Legacy internal and client support for Menlo"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12429,16 +12572,16 @@ let buildInputs = [ FennecLite TestException ]; meta = { description = "Tools for creating Meta objects to track custom metrics"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; MetaCPANClient = buildPerlPackage { pname = "MetaCPAN-Client"; - version = "2.028000"; + version = "2.029000"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.028000.tar.gz"; - sha256 = "1fcafd1504e838ea37fa1769c751e096fe6ac7bba41c5f62959b156ea27d319a"; + url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.029000.tar.gz"; + sha256 = "0z75qzrr6r9ijp469majavq8la2jbgn1dq02vdm5m6ip7f887n65"; }; # Most tests are online, so we only include offline tests @@ -12453,7 +12596,7 @@ let meta = { homepage = "https://github.com/metacpan/metacpan-client"; description = "A comprehensive, DWIM-featured client to the MetaCPAN API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -12468,7 +12611,7 @@ let propagatedBuildInputs = [ DevelDeclare ]; meta = { description = "Basic method declarations with signatures, without source filters"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12482,7 +12625,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "abstract collection of monitoring metrics"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12502,7 +12645,7 @@ let installTargets = [ "install" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.mhonarc.org/"; description = "A mail-to-HTML converter"; maintainers = with maintainers; [ lovek323 ]; @@ -12519,7 +12662,7 @@ let }; meta = { description = "Charset Information for MIME"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12545,7 +12688,7 @@ let meta = { homepage = "https://metacpan.org/pod/MIME::EncWords"; description = "Deal with RFC 2047 encoded words (improved)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -12560,7 +12703,7 @@ let propagatedBuildInputs = [ EmailDateFormat ]; meta = { description = "Low-calorie MIME generator (DEPRECATED)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12575,7 +12718,7 @@ let propagatedBuildInputs = [ LWP MIMELite ]; meta = { description = "Provide routine to transform a HTML page in a MIME-Lite mail"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12590,7 +12733,7 @@ let buildInputs = [ TestDeep ]; meta = { description = "class for parsed-and-decoded MIME message"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12603,7 +12746,7 @@ let }; meta = { description = "Definition of MIME types"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12618,7 +12761,7 @@ let meta = { homepage = "https://github.com/mojolicious/minion"; description = "A high performance job queue for Perl"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -12635,7 +12778,7 @@ let meta = { homepage = "https://github.com/Grinnz/Minion-Backend-SQLite"; description = "SQLite backend for Minion job queue"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -12652,7 +12795,7 @@ let meta = { homepage = "https://github.com/preaction/Minion-Backend-mysql"; description = "MySQL backend for Minion job queue"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -12668,7 +12811,7 @@ let meta = { homepage = "https://github.com/rjbs/mixin-linewise"; description = "Write your linewise code for handles; this does the rest"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12681,7 +12824,7 @@ let }; meta = { description = "Store multi-level Perl hash structure in single level tied hash"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12696,7 +12839,7 @@ let }; meta = { description = "Micro Objects. Mo is less."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/ingydotnet/mo-pm"; }; }; @@ -12710,7 +12853,7 @@ let }; meta = { description = "temporarily set Config or XSConfig values"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus artistic2 ]; + license = with lib.licenses; [ artistic1 gpl1Plus artistic2 ]; }; }; @@ -12725,7 +12868,7 @@ let meta = { homepage = "https://github.com/chromatic/Modern-Perl"; description = "Enable all of the features of Modern Perl with one import"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12738,7 +12881,7 @@ let }; meta = { description = "Build and install Perl modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12752,7 +12895,7 @@ let doCheck = false; meta = { description = "A collection of modules removed from Module-Build"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12767,7 +12910,7 @@ let meta = { homepage = "https://github.com/tokuhirom/Module-Build-Pluggable"; description = "Module::Build meets plugins"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestSharedFork ]; }; @@ -12783,7 +12926,7 @@ let propagatedBuildInputs = [ ModuleBuildPluggable ]; meta = { description = "Generate ppport.h"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12798,7 +12941,7 @@ let propagatedBuildInputs = [ ExtUtilsHelpers ExtUtilsInstallPaths ]; meta = { description = "A tiny replacement for Module::Build"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12824,7 +12967,7 @@ let perlPreHook = "export LD=$CC"; meta = { description = "A Module::Build class for building XS modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12839,7 +12982,7 @@ let meta = { homepage = "https://github.com/ingydotnet/module-compile-pm"; description = "Perl Module Compilation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12854,7 +12997,7 @@ let buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; meta = { description = "Generate Kwalitee ratings for a distribution"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://cpants.cpanauthors.org"; }; }; @@ -12868,7 +13011,7 @@ let }; meta = { description = "Parse cpanfile"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/miyagawa/cpanfile"; }; buildInputs = [ Filepushd ]; @@ -12885,7 +13028,7 @@ let buildInputs = [ TestDeep TestNoWarnings ]; meta = { description = "Find out what modules are used"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12898,7 +13041,7 @@ let }; meta = { description = "Find and use installed modules in a (sub)category"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12913,7 +13056,7 @@ let propagatedBuildInputs = [ ModuleRuntime TryTiny ]; meta = { description = "Loads one of several alternate underlying implementations for a module"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -12927,7 +13070,7 @@ let buildInputs = [ TestPod TestPodCoverage ]; meta = { description = "Information about Perl modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ BUtils ]; }; @@ -12942,7 +13085,7 @@ let propagatedBuildInputs = [ FileRemove ModuleBuild ModuleScanDeps YAMLTiny ]; meta = { description = "Standalone, extensible Perl module installer"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12956,7 +13099,7 @@ let propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Declare author-only dependencies"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12970,7 +13113,7 @@ let propagatedBuildInputs = [ ModuleInstall ]; meta = { description = "Designate tests only run by module authors"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12986,7 +13129,7 @@ let meta = { homepage = "https://github.com/bingos/module-install-githubmeta/"; description = "A Module::Install extension to include GitHub meta information in META.yml"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -13003,7 +13146,7 @@ let meta = { homepage = "https://github.com/bingos/module-install-readmefrompod/"; description = "A Module::Install extension to automatically convert POD to a README"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -13020,7 +13163,7 @@ let meta = { homepage = "http://search.cpan.org/dist/Module-Install-ReadmeMarkdownFromPod/"; description = "Create README.mkdn from POD"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -13035,7 +13178,7 @@ let buildInputs = [ PathClass ]; meta = { description = "Automatically sets repository URL from svn/svk/Git checkout"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -13051,7 +13194,7 @@ let propagatedBuildInputs = [ ParamsUtil ]; meta = { description = "Parse and examine a Perl distribution MANIFEST file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13066,7 +13209,7 @@ let meta = { homepage = "https://github.com/neilbowers/Module-Path"; description = "Get the full path to a locally installed module"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13083,7 +13226,7 @@ let ]; meta = { description = "Automatically give your module the ability to have plugins"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ AppFatPacker ]; }; @@ -13108,7 +13251,7 @@ let buildInputs = [ PathClass ]; meta = { description = "Refresh %INC files when updated on disk"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13121,7 +13264,7 @@ let }; meta = { description = "Runtime module handling"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13136,7 +13279,7 @@ let meta = { homepage = "https://github.com/karenetheridge/Module-Runtime-Conflicts"; description = "Provide information on conflicts for Module::Runtime"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13150,7 +13293,7 @@ let buildInputs = [ TestRequires ]; meta = { description = "Recursively scan Perl code for dependencies"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13164,7 +13307,7 @@ let buildInputs = [ IPCRun ]; meta = { description = "Module signature file manipulation"; - license = stdenv.lib.licenses.cc0; + license = lib.licenses.cc0; }; }; @@ -13177,7 +13320,7 @@ let }; meta = { description = "Module name tools and transformations"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13200,7 +13343,7 @@ let }; meta = { description = "Report versions of all modules in memory"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13213,7 +13356,7 @@ let }; meta = { description = "Minimalistic HTML/XML DOM parser with CSS selectors"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; homepage = "https://github.com/Grinnz/Mojo-DOM58"; }; }; @@ -13230,21 +13373,21 @@ let doCheck = false; # would try to start Apache HTTP server meta = { description = "Embed a Perl interpreter in the Apache HTTP server"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.63"; + version = "8.67"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.63.tar.gz"; - sha256 = "1nw500wi6kdyawc2aq37lnx6zfkpby3sczflh5pjz623i8nw4b66"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.67.tar.gz"; + sha256 = "0b1ajsfvpzcmy7qp1rjr2n1z263yk5bkzmal0kx72ajg1l1dd85v"; }; meta = { homepage = "https://mojolicious.org"; description = "Real-time web framework"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = with maintainers; [ thoughtpolice sgo ]; }; }; @@ -13260,7 +13403,7 @@ let meta = { homepage = "https://github.com/jhthorsen/mojolicious-plugin-assetpack"; description = "Compress and convert css, less, sass, javascript and coffeescript files"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = with maintainers; [ sgo ]; }; }; @@ -13275,7 +13418,7 @@ let propagatedBuildInputs = [ Mojolicious ]; meta = { description = "Globally Recognized Avatars for Mojolicious"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -13291,7 +13434,7 @@ let meta = { homepage = "https://github.com/sharifulin/Mojolicious-Plugin-Mail"; description = "Mojolicious Plugin for send mail"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -13307,7 +13450,7 @@ let meta = { homepage = "https://github.com/jhthorsen/mojolicious-plugin-openapi"; description = "OpenAPI / Swagger plugin for Mojolicious"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -13323,7 +13466,7 @@ let meta = { homepage = "https://github.com/mojolicious/mojo-status"; description = "Mojolicious server status plugin"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; }; }; @@ -13339,7 +13482,7 @@ let meta = { homepage = "https://github.com/marcusramberg/mojolicious-plugin-textexceptions"; description = "Render exceptions as text in command line user agents"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -13355,7 +13498,7 @@ let meta = { homepage = "https://github.com/jhthorsen/mojolicious-plugin-webpack"; description = "Mojolicious <3 Webpack"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = with maintainers; [ sgo ]; }; }; @@ -13371,7 +13514,23 @@ let meta = { homepage = "https://github.com/jhthorsen/mojo-redis"; description = "Redis driver based on Mojo::IOLoop"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + + MojoSAML = buildPerlModule { + pname = "Mojo-SAML"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-SAML-0.07.tar.gz"; + sha256 = "03biykpz281z9nmd846jlxwzbaqlqwvh987aw9spl7bgvfn4rhkj"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ CryptOpenSSLRSA CryptOpenSSLX509 DataGUID Mojolicious XMLCanonicalizeXML ]; + meta = { + description = "A SAML2 toolkit using the Mojo toolkit"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -13388,7 +13547,7 @@ let meta = { homepage = "https://github.com/Grinnz/Mojo-SQLite"; description = "A tiny Mojolicious wrapper for SQLite"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -13405,7 +13564,7 @@ let meta = { homepage = "https://github.com/jhthorsen/mojo-mysql"; description = "Mojolicious and Async MySQL/MariaDB"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -13420,7 +13579,7 @@ let propagatedBuildInputs = [ IOPipely Mojolicious ]; meta = { description = "Run blocking functions asynchronously by forking"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13436,7 +13595,7 @@ let meta = { homepage = "https://github.com/jberger/Mojo-JWT"; description = "JSON Web Token the Mojo way"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -13453,7 +13612,25 @@ let meta = { homepage = "https://github.com/mojolicious/mojo-pg"; description = "Mojolicious <3 PostgreSQL"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + + MojoUserAgentCached = buildPerlPackage { + pname = "Mojo-UserAgent-Cached"; + version = "1.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.12.tar.gz"; + sha256 = "08pa3sz63sq2y3g3lbhy2msbnx0myb2igmmc28cm3kaznryvsgwm"; + }; + buildInputs = [ ModuleInstall ]; + propagatedBuildInputs = [ AlgorithmLCSS CHI DataSerializer DevelStackTrace Mojolicious Readonly StringTruncate ]; + doCheck = !stdenv.isDarwin; + meta = { + homepage = "https://github.com/nicomen/mojo-useragent-cached"; + description = "Caching, Non-blocking I/O HTTP, Local file and WebSocket user agent"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -13471,7 +13648,7 @@ let A family of perl modules to streamline writing Naemon, Nagios, Icinga or Shinken (and compatible) plugins ''; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13484,7 +13661,7 @@ let }; meta = { description = "Portably create pipe() or pipe-like handles"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13499,7 +13676,7 @@ let propagatedBuildInputs = [ ClassMethodModifiers ModuleRuntime RoleTiny SubQuote ]; meta = { description = "Minimalist Object Orientation (with Moose compatibility)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13518,7 +13695,7 @@ let meta = { homepage = "http://moose.perl.org/"; description = "A postmodern object system for Perl 5"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.eelco ]; }; }; @@ -13534,7 +13711,7 @@ let propagatedBuildInputs = [ DataPerl Moo ]; meta = { description = "NativeTrait-like behavior for Moo"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13548,7 +13725,7 @@ let propagatedBuildInputs = [ Moo ]; meta = { description = "provide API used in translator modules without translating"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13562,7 +13739,7 @@ let propagatedBuildInputs = [ LocaleTextDomainOO MooXLocalePassthrough ]; meta = { description = "provide API used in translator modules without translating"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13578,7 +13755,7 @@ let preCheck = "rm t/16-namespace_clean.t"; # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=942275 meta = { description = "Explicit Options eXtension for Object Class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13593,7 +13770,7 @@ let buildInputs = [ Moo ]; meta = { description = "turn your Moo class into singleton"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13608,7 +13785,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "Make your Moo-based object constructors blow up on unknown attributes."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13634,7 +13811,7 @@ let propagatedBuildInputs = [ MooXTypesMooseLike ]; meta = { description = "Moo types for numbers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13649,7 +13826,7 @@ let propagatedBuildInputs = [ ListMoreUtils Moose SyntaxKeywordJunction autobox namespaceautoclean ]; meta = { description = "Autoboxed wrappers for Native Perl datatypes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13664,7 +13841,7 @@ let propagatedBuildInputs = [ Moose ]; meta = { description = "Abstract base classes for Moose"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13691,7 +13868,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-App-Cmd"; description = "Mashes up MooseX::Getopt and App::Cmd"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13706,7 +13883,7 @@ let meta = { homepage = "https://github.com/Getty/p5-moox"; description = "Using Moo and MooX:: packages the most lazy way"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13721,7 +13898,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "easy aliasing of methods and attributes in Moo"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13736,7 +13913,7 @@ let buildInputs = [ CaptureTiny ]; meta = { description = "Giving an easy Moo style way to make command organized CLI apps"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13751,7 +13928,7 @@ let propagatedBuildInputs = [ Moo SubHandlesVia ]; meta = { description = "Easily translate Moose code to Moo"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13765,7 +13942,7 @@ let propagatedBuildInputs = [ ConfigAny MouseXConfigFromFile ]; meta = { description = "A Mouse role for setting attributes from a simple configfile"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13778,7 +13955,7 @@ let }; meta = { description = "Do use_ok() for all the MANIFESTed modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13792,7 +13969,7 @@ let propagatedBuildInputs = [ EnvSanctify FileHomeDir PerlDestructLevel XMLTwig ]; meta = { description = "Generate suppressions, analyse and test any command with valgrind."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "http://search.cpan.org/dist/Test-Valgrind/"; }; }; @@ -13808,7 +13985,7 @@ let propagatedBuildInputs = [ MouseXTypes PathClass ]; meta = { description = "A Path::Class type library for Mouse"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13823,7 +14000,7 @@ let propagatedBuildInputs = [ AnyMoose ]; meta = { description = "Organize your Mouse types in libraries"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13838,7 +14015,7 @@ let propagatedBuildInputs = [ MouseXTypesPathClass ]; meta = { description = "An abstract Mouse role for setting attributes from a configfile"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13854,7 +14031,7 @@ let meta = { homepage = "https://github.com/gfx/mousex-getopt"; description = "A Mouse role for processing command line options"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13879,7 +14056,7 @@ let propagatedBuildInputs = [ Moose ]; meta = { description = "Extend your attribute interfaces (deprecated)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13906,7 +14083,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-ConfigFromFile"; description = "An abstract Moose role for setting attributes from a configfile"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13922,7 +14099,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Daemonize"; description = "Role for daemonizing your Moose based application"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13937,7 +14114,7 @@ let propagatedBuildInputs = [ Moose namespaceclean ]; meta = { description = "Emulate Class::Accessor::Fast behavior using Moose attributes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13953,7 +14130,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Getopt"; description = "A Moose role for processing command line options"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13969,7 +14146,7 @@ let meta = { homepage = "https://github.com/pshangov/moosex-has-options"; description = "Succinct options for Moose"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -13985,7 +14162,7 @@ let meta = { homepage = "https://github.com/kentfredric/MooseX-Has-Sugar"; description = "Sugar Syntax for moose 'has' fields"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14001,7 +14178,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-LazyRequire"; description = "Required attributes which fail only when trying to use them"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14015,7 +14192,7 @@ let propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { description = "Mark overload code symbols as methods"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; }; @@ -14031,7 +14208,7 @@ let meta = { homepage = "https://github.com/karenetheridge/moosex-methodattributes"; description = "Code attribute introspection"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14046,7 +14223,7 @@ let propagatedBuildInputs = [ ListMoreUtils Moose ]; meta = { description = "Easy subclassing of non-Moose classes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14061,7 +14238,7 @@ let meta = { homepage = "https://github.com/rjbs/moosex-oneargnew"; description = "Teach ->new to accept single, non-hashref arguments"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14086,7 +14263,7 @@ let propagatedBuildInputs = [ DevelCaller Moose ParamsValidate ]; meta = { description = "An extension of Params::Validate using Moose's types"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14102,7 +14279,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Role-Parameterized"; description = "Roles with composition parameters"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14116,7 +14293,7 @@ let propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; meta = { description = "Roles which support overloading"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14132,7 +14309,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Runnable"; description = "Tag a class as a runnable application"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14179,7 +14356,7 @@ let propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { description = "Make your object constructors blow up on unknown attributes"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -14195,7 +14372,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Traits"; description = "Automatically apply roles at object creation time"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14222,7 +14399,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Types"; description = "Organise your Moose types in libraries"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14238,7 +14415,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Types-Common"; description = "A library of commonly used type constraints"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14254,7 +14431,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Types-DateTime"; description = "DateTime related constraints and coercions for Moose"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14270,7 +14447,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Types-DateTime-MoreCoercions"; description = "Extensions to MooseX::Types::DateTime"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14286,7 +14463,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Types-LoadableClass"; description = "ClassName type constraint with coercion to load the class"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14300,7 +14477,7 @@ let propagatedBuildInputs = [ MooseXTypes PathClass ]; meta = { description = "A Path::Class type library for Moose"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ ModuleBuildTiny TestNeeds ]; }; @@ -14317,7 +14494,7 @@ let meta = { homepage = "https://github.com/karenetheridge/moosex-types-path-tiny"; description = "Path::Tiny types and coercions for Moose"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -14331,7 +14508,7 @@ let propagatedBuildInputs = [ MooseXTypes ]; meta = { description = "Moose types that check against Perl syntax"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14346,7 +14523,7 @@ let meta = { homepage = "https://github.com/dagolden/moosex-types-stringlike"; description = "Moose type constraints for strings or string-like objects"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -14361,7 +14538,7 @@ let propagatedBuildInputs = [ DevelPartialDump MooseXTypes ]; meta = { description = "MooseX::Types::Structured - Structured Type Constraints for Moose"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14377,7 +14554,7 @@ let meta = { homepage = "https://github.com/moose/MooseX-Types-URI"; description = "URI related types and coercions for Moose"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14390,7 +14567,7 @@ let }; meta = { description = "Manipulate / fetch info from MP3 audio files"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -14412,7 +14589,7 @@ let outputs = [ "out" ]; meta = { description = "Module for reading tags of MP3 audio files"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -14425,8 +14602,8 @@ let }; buildInputs = [ ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; perlPreHook = "export LD=$CC"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fno-stack-protector"; - hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-fno-stack-protector"; + hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; }; MouseXNativeTraits = buildPerlPackage { @@ -14440,7 +14617,7 @@ let propagatedBuildInputs = [ Mouse ]; meta = { description = "Extend attribute interfaces for Mouse"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14458,7 +14635,7 @@ let meta = { description = "Mozilla's CA cert bundle in PEM format"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mpl20; }; }; @@ -14473,7 +14650,7 @@ let }; meta = { description = "Mro::* interface compatibility for Perls < 5.9.5"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14484,7 +14661,7 @@ let url = "mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz"; sha256 = "0fjph2q3yp0aa87gckv3391s47m13wbyylj7jb7vqx7hv0pzj0jh"; }; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' # Build.PL in this package uses which to find pkg-config -- make it use path instead patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; doCheck = false; # The main test performs network access @@ -14513,7 +14690,7 @@ let propagatedBuildInputs = [ YAMLLibYAML ]; meta = { description = "A simple Mustache Renderer"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14528,7 +14705,7 @@ let meta = { homepage = "https://github.com/estrabd/mysqldiff"; description = "Generates a database upgrade instruction set"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -14545,7 +14722,7 @@ let meta = { homepage = "https://github.com/moose/namespace-autoclean"; description = "Keep imports out of your namespace"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14559,7 +14736,7 @@ let propagatedBuildInputs = [ BHooksEndOfScope PackageStash ]; meta = { description = "Keep imports and functions out of your namespace"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14573,7 +14750,7 @@ let meta = { homepage = "https://github.com/toddr/Net-Ident"; description = "Lookup the username on the remote end of a TCP/IP connection"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -14586,7 +14763,7 @@ let }; meta = { description = "Manages IPv4 and IPv6 addresses and subnets"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14614,7 +14791,7 @@ let buildInputs = [ TestException ]; meta = { description = "Perl interface to the Amazon Elastic Compute Cloud (EC2) environment."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14642,7 +14819,7 @@ let propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXRoleParameterized MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon SafeIsa SubOverride TermEncoding TermProgressBarSimple XMLLibXML ]; meta = { description = "Use the Amazon S3 - Simple Storage Service"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14656,7 +14833,7 @@ let propagatedBuildInputs = [ JSON ]; meta = { description = "Manage Amazon S3 policies for HTTP POST forms"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14669,14 +14846,14 @@ let }; buildInputs = [ HTTPCookies TestIdentity TestMetricsAny TestRefcount ]; propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ]; - preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.isDarwin '' # network tests fail on Darwin/sandbox, so disable these rm -f t/20local-connect.t t/22local-connect-pipeline.t t/23local-connect-redir.t rm -f t/90rt75615.t t/90rt75616.t t/90rt93232.t ''; meta = { description = "Use HTTP with IO::Async"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -14692,7 +14869,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "asyncronously check remote host for reachability"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/frioux/Net-Async-Ping"; }; }; @@ -14705,13 +14882,13 @@ let sha256 = "000nw7gnj7ks55nib3fiikxx9bfmbla6fimxrbn2z2n7sd187b0d"; }; propagatedBuildInputs = [ IOAsync ProtocolWebSocket URI ]; - preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.isDarwin '' # network tests fail on Darwin/sandbox, so disable these rm -f t/02server.t t/03cross.t ''; meta = { description = "Use WebSockets with IO::Async"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -14728,7 +14905,7 @@ let propagatedBuildInputs = [ ClassAccessor ClassDataInheritable XMLLibXML ]; meta = { description = "Advanced Message Queue Protocol (de)serialization and representation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14741,7 +14918,7 @@ let }; meta = { description = "Manipulate IPv4/IPv6 netblocks in CIDR notation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.bjornfor ]; }; }; @@ -14770,7 +14947,7 @@ let meta = { homepage = "https://github.com/metabrainz/CoverArtArchive"; description = "Query the coverartarchive.org"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14798,7 +14975,7 @@ let meta = { homepage = "http://www.freedesktop.org/wiki/Software/dbus"; description = "Extension for the DBus bindings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14813,7 +14990,7 @@ let makeMakerFlags = "--noonline-tests"; meta = { description = "Perl Interface to the Domain Name System"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -14827,7 +15004,7 @@ let propagatedBuildInputs = [ NetDNS ]; meta = { description = "Mock a DNS Resolver object for testing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestException ]; }; @@ -14841,7 +15018,7 @@ let }; meta = { description = "Work with TLD names"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14855,7 +15032,7 @@ let buildInputs = [ TestException TestHexString ]; meta = { description = "FastCGI Toolkit"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14870,7 +15047,7 @@ let preCheck = "rm t/13-gethostsubs.t"; # it performs DNS queries meta = { description = "the base framework for frame crafting"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -14884,7 +15061,7 @@ let propagatedBuildInputs = [ NetFrame ]; meta = { description = "Internet Protocol v6 layer object"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -14899,7 +15076,7 @@ let propagatedBuildInputs = [ CDDBFile Moo ]; meta = { description = "Perl interface to freedb server(s)"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -14915,7 +15092,7 @@ let meta = { homepage = "https://github.com/libwww-perl/Net-HTTP"; description = "Low-level HTTP connection (client)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; /* wants network */ }; @@ -14970,7 +15147,7 @@ let meta = { homepage = "https://metacpan.org/pod/Net::IP::Lite"; description = "Perl extension for manipulating IPv4/IPv6 addresses"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -14996,7 +15173,7 @@ let propagatedBuildInputs = [ MathBase85 NetIPv4Addr ]; meta = { description = "Check and manipulate IPv6 addresses"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15010,7 +15187,7 @@ let propagatedBuildInputs = [ NetLDAP ConvertASN1 ]; meta = { description = "LDAP server side protocol handling"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -15023,7 +15200,7 @@ let }; meta = { description= "Active Directory Security Identifier manipulation"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -15037,7 +15214,7 @@ let propagatedBuildInputs = [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ]; meta = { description= "test Net::LDAP code"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -15065,7 +15242,7 @@ let propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWP ]; meta = { description = "An implementation of the OAuth protocol"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15101,7 +15278,7 @@ let propagatedBuildInputs = [ NetDNS ]; meta = { description = "Programmable DNS resolver class for offline emulation of DNS"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15116,7 +15293,7 @@ let buildInputs = [ HTTPMessage TestFatal ]; meta = { description = "export monitoring metrics for F<prometheus>"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15133,7 +15310,7 @@ let ''; meta = { description = "Simple wrappers around ssh and scp commands."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ NetSSH StringShellQuote ]; }; @@ -15164,7 +15341,7 @@ let ''; meta = { description = "Secure File Transfer Protocol client"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15178,7 +15355,7 @@ let propagatedBuildInputs = [ Coro NetServer ]; meta = { description = "A co-operative multithreaded server using Coro"; - license = with stdenv.lib.licenses; [ mit ]; + license = with lib.licenses; [ mit ]; }; }; @@ -15196,7 +15373,7 @@ let propagatedBuildInputs = [ NetServer ServerStarter ]; meta = { description = "A hot-deployable variant of Net::Server::PreFork"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15251,7 +15428,7 @@ let doCheck = false; meta = { description = "Simple Network Pager Protocol Client"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15268,7 +15445,7 @@ let ''; meta = { description = "Simple wrappers around ssh commands."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15283,7 +15460,7 @@ let preCheck = "export HOME=$TMPDIR"; meta = { description = "Perl client Interface to SSH"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15305,7 +15482,7 @@ let ''; meta = { description = "Perl extension for using OpenSSL"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -15318,7 +15495,7 @@ let }; meta = { description = "Sends statistics to the stats daemon over UDP"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15331,7 +15508,7 @@ let }; meta = { description = "Interact with TELNET port or other TCP ports"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15348,7 +15525,7 @@ let meta = { homepage = "https://github.com/semifor/Net-Twitter-Lite"; description = "A perl interface to the Twitter API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15379,7 +15556,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "Sane APIs for IP addresses and networks"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15410,7 +15587,7 @@ let }; meta = { description = "Perl extension for formatting numbers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15424,7 +15601,7 @@ let propagatedBuildInputs = [ Moose ]; meta = { description = "Perl extension to model fractions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15437,7 +15614,7 @@ let }; meta = { description = "Number::Misc - handy utilities for numbers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15452,7 +15629,7 @@ let buildInputs = [ TestLectroTest ]; meta = { description = "Numbers with error propagation and scientific rounding"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15465,7 +15642,7 @@ let }; propagatedBuildInputs = [ DigestHMAC ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.pSub ]; }; }; @@ -15479,7 +15656,7 @@ let }; meta = { description = "Per object accessors"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15493,7 +15670,7 @@ let propagatedBuildInputs = [ ExceptionClass ]; meta = { description = "Comprehensive inside-out object support module"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15506,7 +15683,7 @@ let }; meta = { description = "Generate cryptographic signatures for objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15522,7 +15699,7 @@ let doCheck = false; meta = { description = "An object-oriented interface to Ogg Vorbis information and comment fields"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -15535,7 +15712,7 @@ let }; meta = { description = "Read and write OLE storage files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15548,7 +15725,7 @@ let }; meta = { description = "More Opcodes information from opnames.h and opcode.h"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15563,7 +15740,7 @@ let meta = { homepage = "https://github.com/jhthorsen/openapi-client"; description = "A client for talking to an Open API powered server"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -15583,7 +15760,7 @@ let configurePhase = '' substituteInPlace Makefile.PL \ - --replace "@@libpaths@@" '${stdenv.lib.concatStringsSep "\n" (map (f: "-L${f}/lib") buildInputs)}' + --replace "@@libpaths@@" '${lib.concatStringsSep "\n" (map (f: "-L${f}/lib") buildInputs)}' cp -v ${../development/perl-modules/perl-opengl-gl-extensions.txt} utils/glversion.txt @@ -15623,26 +15800,39 @@ let }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; NetZooKeeper = buildPerlPackage { pname = "Net-ZooKeeper"; - version = "0.41"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MAF/Net-ZooKeeper-0.41.tar.gz"; - sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; + version = "0.42pre"; + src = fetchFromGitHub { + owner = "mark-5"; + repo = "p5-net-zookeeper"; + rev = "66e1a360aff9c39af728c36092b540a4b6045f70"; + sha256 = "0xl8lcv9gfv0nn8vrrxa4az359whqdhmzw4r51nn3add8pn3s9ip"; }; buildInputs = [ pkgs.zookeeper_mt ]; + nativeBuildInputs = [ pkgs.gnused ]; # fix "error: format not a string literal and no format arguments [-Werror=format-security]" hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include"; + # Make the async API accessible + NIX_CFLAGS_COMPILE = "-DTHREADED"; NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; + # Most tests are skipped as no server is available in the sandbox. + # `t/35_log.t` seems to suffer from a race condition; remove it. See + # https://github.com/NixOS/nixpkgs/pull/104889#issuecomment-737144513 + preCheck = '' + rm t/35_log.t + '' + lib.optionalString stdenv.isDarwin '' + rm t/30_connect.t + rm t/45_class.t + ''; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members ++ [ maintainers.ztzg ]; homepage = "https://github.com/mark-5/p5-net-zookeeper"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -15655,7 +15845,7 @@ let }; meta = { description = "List constants defined in a package"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15670,7 +15860,7 @@ let propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName ]; meta = { description = "Manage deprecation warnings for your distribution"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -15683,7 +15873,7 @@ let }; meta = { description = "Utilities to read and manipulate patches and CVS"; - license = with stdenv.lib.licenses; [ artistic1 ]; + license = with lib.licenses; [ artistic1 ]; }; }; @@ -15698,7 +15888,7 @@ let propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; meta = { description = "Routines for manipulating stashes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15712,7 +15902,7 @@ let buildInputs = [ TestFatal TestRequires ]; meta = { description = "Faster and more correct implementation of the Package::Stash API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15728,7 +15918,7 @@ let meta = { homepage = "http://gtk2-perl.sourceforge.net/"; description = "Layout and render international text"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }; @@ -15743,7 +15933,7 @@ let meta = { homepage = "https://github.com/dluxhu/perl-parallel-forkmanager"; description = "A simple parallel processing fork manager"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ Moo ]; }; @@ -15759,7 +15949,7 @@ let meta = { homepage = "https://github.com/skaji/Parallel-Pipes"; description = "Parallel processing using pipe(2) for communication and synchronization"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -15775,7 +15965,7 @@ let propagatedBuildInputs = [ ClassAccessorLite ListMoreUtils ProcWait3 ScopeGuard SignalMask ]; meta = { description = "A simple prefork server framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15786,7 +15976,7 @@ let url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz"; sha256 = "052r198xyrsv8wz21gijdigz2cgnidsa37nvyfzdiz4rv1fc33ir"; }; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' }; ParamsUtil = buildPerlPackage { @@ -15798,7 +15988,7 @@ let }; meta = { description = "Simple, compact and correct param-checking functions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15814,7 +16004,7 @@ let perlPreHook = "export LD=$CC"; meta = { description = "Validate method/function parameters"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -15829,7 +16019,7 @@ let buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestWithoutModule ]; meta = { description = "Build an optimized subroutine parameter validator once, use it forever"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -15848,8 +16038,8 @@ let ''; meta = { description = "General function library for safer, more secure programming"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -15876,7 +16066,7 @@ let buildInputs = [ PathTiny ]; meta = { description = "interface to PAUSE's module permissions file (06perms.txt)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/neilb/PAUSE-Permissions"; }; }; @@ -15898,7 +16088,7 @@ let sha256 = "0ad78qri4sg9agghqdm83xsjgks94yvffs23kppy7mqjy8gwwjxn"; }; propagatedBuildInputs = [ IOStringy LWP ]; - meta = with stdenv.lib; { + meta = with lib; { license = with licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15913,7 +16103,7 @@ let meta = { homepage = "https://github.com/bingos/parse-irc"; description = "A parser for the IRC protocol"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -15929,7 +16119,7 @@ let buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; meta = { description = "parses local .pm files as PAUSE does"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15943,8 +16133,8 @@ let propagatedBuildInputs = [ ClassEHierarchy Paranoid ]; meta = { description = "Parser/Generator of human-readable conf files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -15958,7 +16148,7 @@ let buildInputs = [ ExtUtilsMakeMakerCPANfile ]; meta = { description = "parses .pm file as PAUSE does"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15971,7 +16161,7 @@ let }; meta = { description = "Generate Recursive-Descent Parsers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15994,7 +16184,7 @@ let propagatedBuildInputs = [ FileSlurpTiny ]; meta = { description = "build simple recursive-descent parsers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16007,7 +16197,7 @@ let }; meta = { description = "Perl extension for generating and using LALR parsers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16020,7 +16210,7 @@ let }; meta = { description = "Cross-platform path specification manipulation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16035,7 +16225,7 @@ let buildInputs = [ Filepushd PathTiny TestDeep TestFilename ]; meta = { description = "Iterative, recursive file finder"; - license = with stdenv.lib.licenses; [ asl20 ]; + license = with lib.licenses; [ asl20 ]; homepage = "https://github.com/dagolden/Path-Iterator-Rule"; }; }; @@ -16049,7 +16239,7 @@ let }; meta = { description = "File path utility"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; preConfigure = '' @@ -16083,7 +16273,7 @@ let meta = { homepage = "https://github.com/dagolden/PBKDF2-Tiny"; description = "Minimalist PBKDF2 (RFC 2898) with HMAC-SHA1 or HMAC-SHA2"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; maintainers = [ maintainers.sgo ]; }; }; @@ -16097,13 +16287,13 @@ let }; buildInputs = [ pkgs.pcsclite ]; nativeBuildInputs = [ pkgs.pkgconfig ]; - NIX_CFLAGS_LINK = "-L${stdenv.lib.getLib pkgs.pcsclite}/lib -lpcsclite"; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; # tests fail; look unfinished doCheck = false; meta = { homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; description = "Communicate with a smart card using PC/SC"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; }; }; @@ -16119,7 +16309,7 @@ let propagatedBuildInputs = [ FontTTF ]; meta = { description = "Facilitates the creation and modification of PDF files"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }; @@ -16163,8 +16353,8 @@ let meta = { homepage = "http://pdl.perl.org/"; description = "Perl Data Language"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.linux; }; }; @@ -16179,7 +16369,7 @@ let meta = { homepage = "https://github.com/ingydotnet/pegex-pm"; description = "Acmeist PEG Parser Framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ FileShareDirInstall XXX ]; }; @@ -16204,7 +16394,7 @@ let }; meta = { description = "List possible $^O ($OSNAME) values, with description"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16220,7 +16410,7 @@ let meta = { homepage = "http://perlcritic.com"; description = "Critique Perl source code for best-practices"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16234,7 +16424,7 @@ let propagatedBuildInputs = [ PerlCritic Readonly namespaceautoclean ]; meta = { description = "Policies for Perl::Critic concerned with using Moose"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; }; @@ -16258,7 +16448,7 @@ let }; meta = { description = "Querying your filehandle's capabilities"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16282,7 +16472,7 @@ let NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz"; meta = { description = "Perl extension to provide a PerlIO layer to gzip/gunzip"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16296,7 +16486,7 @@ let buildInputs = [ TestException ]; meta = { description = "Fast and correct UTF-8 IO"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16336,7 +16526,7 @@ let buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; meta = { description = "A PerlIO layer that adds read & write timeout to a handle"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16352,8 +16542,8 @@ let meta = { homepage = "http://ldap.perl.org/"; description = "LDAP client library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -16381,7 +16571,7 @@ let }; meta = { description = "Indent and reformat perl scripts"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; }; @@ -16406,8 +16596,8 @@ let }; meta = { description = "Pure-Perl Core-Only replacement for pkg-config"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.limeytexan ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = teams.deshaw.members; }; }; @@ -16423,7 +16613,7 @@ let meta = { homepage = "https://github.com/plack/Plack"; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16438,7 +16628,7 @@ let buildInputs = [ TestRequires TestSharedFork TestTCP ]; meta = { description = "proxy requests"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16453,7 +16643,7 @@ let buildInputs = [ LWP ModuleBuildTiny TestSharedFork TestTCP ]; meta = { description = "Digest authentication"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/miyagawa/Plack-Middleware-Auth-Digest"; }; }; @@ -16469,7 +16659,7 @@ let buildInputs = [ ModuleBuildTiny TestRequires ]; meta = { description = "Write logs to Firebug or Webkit Inspector"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/miyagawa/Plack-Middleware-ConsoleLogger"; }; }; @@ -16486,7 +16676,7 @@ let meta = { homepage = "https://github.com/miyagawa/Plack-Middleware-Debug"; description = "Display information about the current request/response"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16501,7 +16691,7 @@ let buildInputs = [ TestRequires TestSharedFork TestTCP ]; meta = { description = "Compress response body with Gzip or Deflate"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16516,7 +16706,7 @@ let meta = { homepage = "https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect"; description = "Plack::Middleware which sets body for redirect response, if it's not already set"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16530,7 +16720,7 @@ let propagatedBuildInputs = [ Plack ]; meta = { description = "modify HTTP response headers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16544,7 +16734,7 @@ let propagatedBuildInputs = [ Plack ]; meta = { description = "Override REST methods to Plack apps via POST"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16559,7 +16749,7 @@ let meta = { homepage = "https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody"; description = "Plack::Middleware which sets removes body for HTTP response if it's not required"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16573,7 +16763,7 @@ let propagatedBuildInputs = [ Plack ]; meta = { description = "Supports app to run as a reverse proxy backend"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16588,7 +16778,7 @@ let buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ]; meta = { description = "Middleware for session management"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/plack/Plack-Middleware-Session"; }; }; @@ -16605,7 +16795,7 @@ let meta = { homepage = "https://github.com/perl-catalyst/Plack-Test-ExternalServer"; description = "Run HTTP tests on external live servers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16623,9 +16813,9 @@ let # not present (see below). propagatedBuildInputs = [ pkgs.cacert IOPipely IOTty POETestLoops ]; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; description = "Portable multitasking and networking framework for any event loop"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; preCheck = '' set -x @@ -16653,9 +16843,9 @@ let sha256 = "0yx4wsljfmdzsiv0ni98x6lw975cm82ahngbwqvzv60wx5pwkl5y"; }; meta = { - maintainers = [ maintainers.limeytexan ]; + maintainers = teams.deshaw.members; description = "Reusable tests for POE::Loop authors"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -16676,7 +16866,7 @@ let meta = { homepage = "https://github.com/adamkennedy/PPI"; description = "Parse, Analyze and Manipulate Perl (without perl)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16690,7 +16880,7 @@ let propagatedBuildInputs = [ PPI Readonly ]; meta = { description = "Parse Perl string literals and string-literal-like things."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16704,7 +16894,7 @@ let propagatedBuildInputs = [ PPI ]; meta = { description = "Parse regular expressions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16719,7 +16909,7 @@ let propagatedBuildInputs = [ ExceptionClass PPI Readonly ]; meta = { description = "Extensions to L<PPI|PPI>"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16743,7 +16933,7 @@ let }; meta = { description = "Perl extension to access the unix process table"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16757,7 +16947,7 @@ let propagatedBuildInputs = [ ProcProcessTable ]; meta = { description = "Find processes by name, PID, or some other attributes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16778,7 +16968,7 @@ let sha256 = "4c8f0a924b19ad78a13da73fe0fb306d32a7b9d10a332c523087fc83a209a8c4"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16791,7 +16981,7 @@ let }; meta = { description = "Perl extension for wait3 system call"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16815,7 +17005,7 @@ let meta = { homepage = "https://github.com/und3f/protocol-redis"; description = "Redis protocol parser/encoder with asynchronous capabilities"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -16831,7 +17021,7 @@ let meta = { homepage = "https://github.com/Grinnz/Protocol-Redis-Faster"; description = "Optimized pure-perl Redis protocol parser/encoder"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; maintainers = [ maintainers.sgo ]; }; }; @@ -16896,7 +17086,7 @@ let meta = { homepage = "https://github.com/neilbowers/Perl-MinimumVersion"; description = "Find a minimum required version of perl for Perl code"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16911,7 +17101,7 @@ let meta = { homepage = "https://github.com/rjbs/Perl-PrereqScanner"; description = "A tool to scan your Perl code for its prerequisites"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16926,7 +17116,7 @@ let buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; meta = { description = "a tool to scan your Perl code for its prerequisites"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16940,7 +17130,7 @@ let propagatedBuildInputs = [ FileSlurpTiny ]; meta = { description = "Parse and manipulate Perl version strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16954,7 +17144,7 @@ let propagatedBuildInputs = [ IOString TaskWeaken PodParser ]; meta = { description = "An abstract, tree-based interface to perl POD documents"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16988,7 +17178,7 @@ let meta = { homepage = "https://github.com/rjbs/pod-coverage-trustpod"; description = "Allow a module's pod to contain Pod::Coverage hints"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17004,7 +17194,7 @@ let meta = { homepage = "https://github.com/rjbs/Pod-Elemental"; description = "Work with nestable Pod elements"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17020,7 +17210,7 @@ let meta = { homepage = "https://github.com/rjbs/Pod-Elemental-PerlMunger"; description = "A thing that takes a string of Perl and rewrites its documentation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17034,7 +17224,7 @@ let propagatedBuildInputs = [ MixinLinewise ]; meta = { description = "Read a POD document as a series of trivial events"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestDeep ]; }; @@ -17048,7 +17238,7 @@ let }; meta = { description = "Modules for parsing/translating POD format documents"; - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; }; @@ -17063,7 +17253,7 @@ let meta = { homepage = "https://github.com/neilb/Pod-POM"; description = "POD Object Model"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17077,7 +17267,7 @@ let propagatedBuildInputs = [ PodPOM ]; meta = { description = "Generate the TOC of a POD with Pod::POM"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17092,7 +17282,7 @@ let meta = { homepage = "https://github.com/ktat/Pod-Section"; description = "Select specified section from Module's POD"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17107,7 +17297,7 @@ let meta = { homepage = "https://github.com/timj/perl-Pod-LaTeX/tree/master"; description = "Convert Pod data to formatted Latex"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17120,7 +17310,7 @@ let }; meta = { description = "Convert POD data to various other formats"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17135,7 +17325,7 @@ let meta = { homepage = "http://user42.tuxfamily.org/podlinkcheck/index.html"; description = "Check POD L<> link references"; - license = stdenv.lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; }; @@ -17148,7 +17338,7 @@ let }; meta = { description = "Optimized module loading for forking or non-forking processes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17161,7 +17351,7 @@ let }; meta = { description = "Look up Perl documentation in Pod format"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17175,7 +17365,7 @@ let propagatedBuildInputs = [ PodParser ]; meta = { description = "Perl extension for converting Pod to old-style Pod"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17190,7 +17380,7 @@ let meta = { homepage = "https://github.com/rwstauner/Pod-Markdown"; description = "Convert POD to Markdown"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ URI ]; }; @@ -17206,7 +17396,7 @@ let buildInputs = [ TestDifferences ]; meta = { description = "Convert POD to Github's specific markdown"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17239,7 +17429,7 @@ let }; meta = { description = "Remove POD from Perl code"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17254,7 +17444,7 @@ let buildInputs = [ TestCmd ]; meta = { description = "a reformatting Pod Processor"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17270,7 +17460,7 @@ let meta = { homepage = "https://github.com/rjbs/Pod-Weaver"; description = "Weave together a Pod document from an outline"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17283,7 +17473,7 @@ let }; propagatedBuildInputs = [ PodParser ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17308,7 +17498,7 @@ let meta = { homepage = "https://github.com/kazeburo/POSIX-strftime-Compiler"; description = "GNU C library compatible strftime for loggers and servers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ ModuleBuildTiny ]; }; @@ -17320,14 +17510,14 @@ let url = "mirror://cpan/authors/id/S/SY/SYP/App-rainbarf-1.4.tar.gz"; sha256 = "4f139ad35faaf2de0623dc0bb1dd89fa5a431e548bfec87dee194cf0e25cc97d"; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/rainbarf ''; meta = { homepage = "https://github.com/creaktive/rainbarf"; description = "CPU/RAM/battery stats chart bar for tmux (and GNU screen)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17342,7 +17532,7 @@ let meta = { homepage = "http://razor.sourceforge.net/"; description = "Collaborative, content-based spam filtering network agent"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -17358,7 +17548,7 @@ let meta = { homepage = "https://github.com/sanko/readonly"; description = "Facility for creating read-only scalars, arrays, hashes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17384,7 +17574,7 @@ let meta = { homepage = "https://github.com/PerlRedis/perl-redis"; description = "Perl binding for Redis database"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -17397,7 +17587,7 @@ let }; meta = { description = "Utility functions for checking references"; - license = with stdenv.lib.licenses; [ mit ]; + license = with lib.licenses; [ mit ]; }; }; @@ -17417,7 +17607,7 @@ let url = "mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz"; sha256 = "ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Provide commonly requested regular expressions"; license = licenses.mit; }; @@ -17432,7 +17622,7 @@ let }; propagatedBuildInputs = [ RegexpCommon ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17445,7 +17635,7 @@ let }; meta = { description = "Add grammatical parsing features to Perl 5.10 regexes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17468,7 +17658,7 @@ let meta = { homepage = "https://github.com/toddr/Regexp-Parser"; description = "Base class for parsing regexes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17493,7 +17683,7 @@ let propagatedBuildInputs = [ LWPProtocolHttps ]; meta = { description = "A simple client for interacting with RESTful http/https resources"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17508,7 +17698,7 @@ let meta = { homepage = "https://jaldhar.github.io/REST-Utils/"; description = "Utility functions for REST applications"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17541,7 +17731,7 @@ let }; meta = { description = "Just roles. Nothing else"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17555,7 +17745,7 @@ let propagatedBuildInputs = [ MooseXRoleParameterized StringErrf ]; meta = { description = "A thing with a message method"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17569,7 +17759,7 @@ let propagatedBuildInputs = [ Moose ]; meta = { description = "A thing with a list of tags"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17582,7 +17772,7 @@ let }; meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17596,7 +17786,7 @@ let propagatedBuildInputs = [ AnyEvent DataSExpression ]; meta = { description = "An Asynchronous Remote Procedure Stack"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17611,8 +17801,8 @@ let doCheck = false; # Tries to open /var/lib/rpm meta = { description = "Perl bindings for the RPM Package Manager API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.linux; }; }; @@ -17637,7 +17827,7 @@ let buildInputs = [ CGI HTTPServerSimple TestException ]; meta = { description = "Talk to RT installation using REST protocol"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ DateTimeFormatDateParse Error LWP ParamsValidate ]; }; @@ -17651,7 +17841,7 @@ let }; meta = { description = "Call isa, can, does and DOES safely on things that may not be objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17664,7 +17854,7 @@ let }; meta = { description = "Common Scalar and List utility subroutines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17696,7 +17886,7 @@ let }; meta = { description = "Lexically-scoped resource management"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17709,7 +17899,7 @@ let }; meta = { description = "Act on upper scopes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17726,7 +17916,7 @@ let propagatedBuildInputs = [ FileShareDir TieSimple ]; meta = { description = "SDL bindings to Perl"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; }; }; @@ -17748,7 +17938,7 @@ let buildInputs = [ pkgs.xapian DevelLeak ]; meta = { description = "Perl XS frontend to the Xapian C++ search library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17764,7 +17954,7 @@ let meta = { homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; }; }; @@ -17780,7 +17970,7 @@ let meta = { homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; }; }; @@ -17797,7 +17987,7 @@ let meta = { homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; }; }; @@ -17809,7 +17999,7 @@ let url = "mirror://cpan/authors/id/C/CO/COOK/Device-SerialPort-1.04.tar.gz"; sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux/POSIX emulation of Win32::SerialPort functions."; license = with licenses; [ artistic1 gpl1Plus ]; }; @@ -17826,7 +18016,7 @@ let meta = { homepage = "https://github.com/kazuho/p5-Server-Starter"; description = "A superdaemon for hot-deploying server programs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17840,7 +18030,7 @@ let meta = { homepage = "https://github.com/hoytech/Session-Token"; description = "Secure, efficient, simple random session token generation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -17879,7 +18069,7 @@ let }; meta = { description = "Unordered collections (sets) of Perl Objects"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -17891,7 +18081,7 @@ let sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17905,7 +18095,7 @@ let meta = { homepage = "https://github.com/neilb/Smart-Comments"; description = "Comments that do more than just sit there"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -17929,7 +18119,7 @@ let propagatedBuildInputs = [ IPCSignal ]; meta = { description = "Signal masks made easy"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17942,7 +18132,7 @@ let }; meta = { description = "Porters stemming algorithm for norwegian."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17955,7 +18145,7 @@ let }; meta = { description = "Porters stemming algorithm for swedish."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17969,7 +18159,7 @@ let propagatedBuildInputs = [ ClassInspector IOSessionData LWPProtocolHttps TaskWeaken XMLParser ]; meta = { description = "Perl's Web Services Toolkit"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestWarn XMLParserLite ]; }; @@ -17986,7 +18176,7 @@ let patches = [ ../development/perl-modules/Socket6-sv_undef.patch ]; meta = { description = "IPv6 related part of the C socket.h defines and structure manipulators"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -18002,7 +18192,7 @@ let meta = { homepage = "https://github.com/rjbs/Software-License"; description = "Packages that provide templated software licenses"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18017,7 +18207,7 @@ let buildInputs = [ TestCheckDeps ]; meta = { description = "Software::License pack for Creative Commons' licenses"; - license = with stdenv.lib.licenses; [ lgpl3Plus ]; + license = with lib.licenses; [ lgpl3Plus ]; homepage = "https://github.com/SineSwiper/Software-License-CCpack"; }; }; @@ -18031,7 +18221,7 @@ let }; meta = { description = "Sort arrays by one or multiple calculated keys"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18055,7 +18245,7 @@ let buildInputs = [ TestFatal TestNeeds ]; meta = { description = "Type constraints and coercions for Perl"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -18070,7 +18260,7 @@ let buildInputs = [ Filepushd TestFatal ]; meta = { description = "Path::Tiny types and coercions for Specio"; - license = with stdenv.lib.licenses; [ asl20 ]; + license = with lib.licenses; [ asl20 ]; }; }; @@ -18094,7 +18284,7 @@ let meta = { homepage = "https://github.com/runrig/spreadsheet-parseexcel/"; description = "Read information from an Excel file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18108,7 +18298,7 @@ let propagatedBuildInputs = [ OLEStorage_Lite ParseRecDescent ]; meta = { description = "Write to a cross platform Excel binary file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18123,7 +18313,7 @@ let propagatedBuildInputs = [ HashMerge MROCompat Moo ]; meta = { description = "Generate SQL from Perl data structures"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18180,7 +18370,7 @@ let propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; meta = { description = "SQL DDL transformations and more"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18195,7 +18385,7 @@ let propagatedBuildInputs = [ ImportInto strictures ]; meta = { description = "Parameterizable packages"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18220,7 +18410,7 @@ let doCheck = !stdenv.isDarwin; meta = { description = "A simple, high-performance PSGI/Plack HTTP server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18232,9 +18422,9 @@ let sha256 = "1y1kn4929k299fbf6sw9lxcsdlq9fvq777p6yrzk591rr9xhkx8h"; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack NetServerSSPrefork ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/starman ''; @@ -18242,7 +18432,7 @@ let meta = { homepage = "https://github.com/miyagawa/Starman"; description = "High-performance preforking PSGI/Plack web server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18280,7 +18470,7 @@ let }; meta = { description = "Implements the Chi Squared test, using pre-computed tables"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18294,7 +18484,7 @@ let meta = { #homepage = "http://web-cpan.berlios.de/modules/Statistics-Descriptive/"; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ ListMoreUtils ]; }; @@ -18328,7 +18518,7 @@ let meta = { homepage = "https://plackperl.org"; description = "Temporary buffer to save bytes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18342,7 +18532,7 @@ let meta = { homepage = "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git"; description = "Turn on strict and make all warnings fatal"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18391,7 +18581,7 @@ let meta = { homepage = "https://github.com/yappo/p5-String-Diff"; description = "Simple diff to String"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -18407,7 +18597,7 @@ let propagatedBuildInputs = [ StringFormatter ]; meta = { description = "A simple sprintf-like dialect"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18431,7 +18621,7 @@ let meta = { homepage = "https://github.com/rjbs/String-Flogger"; description = "String munging for loggers"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18452,7 +18642,7 @@ let sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; }; propagatedBuildInputs = [ SubExporter ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Build sprintf-like functions of your own"; license = licenses.gpl2; }; @@ -18465,7 +18655,7 @@ let url = "mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.32.tar.gz"; sha256 = "15fwbpz3jdpdgmz794iw9hz2caxrnrw9pdwprxxkanpm92cdhaf7"; }; - meta = with stdenv.lib; { + meta = with lib; { # https://metacpan.org/pod/String::Interpolate description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine."; license = licenses.gpl1Plus; @@ -18482,7 +18672,7 @@ let }; meta = { description = "Interpolated named arguments in string"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18514,7 +18704,7 @@ let propagatedBuildInputs = [ SubExporter ]; meta = { description = "Rewrite strings based on a set of known prefixes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18528,7 +18718,7 @@ let doCheck = !stdenv.isDarwin; meta = { # http://cpansearch.perl.org/src/ROSCH/String-ShellQuote-1.04/README - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18541,7 +18731,7 @@ let }; doCheck = true; meta = { - license = with stdenv.lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ gpl2 ]; description = "Calculate the similarity of two strings"; }; }; @@ -18575,7 +18765,7 @@ let propagatedBuildInputs = [ SubExporter ]; meta = { description = "A module for when strings are too long to be displayed in"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18590,7 +18780,7 @@ let propagatedBuildInputs = [ PadWalker SubExporter TemplateToolkit ]; meta = { description = "Use TT to interpolate lexical variables"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18603,7 +18793,7 @@ let }; meta = { description = "String::Util -- String processing utilities"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ ModuleBuildTiny ]; @@ -18621,7 +18811,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "make simple lightweight record-like structures"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18636,7 +18826,7 @@ let meta = { homepage = "https://github.com/rjbs/sub-exporter"; description = "A sophisticated exporter for custom-built routines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18652,7 +18842,7 @@ let meta = { homepage = "https://github.com/rjbs/Sub-Exporter-ForMethods"; description = "Helper routines for using Sub::Exporter to build methods"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18667,7 +18857,7 @@ let meta = { homepage = "https://github.com/rjbs/sub-exporter-globexporter"; description = "Export shared globs with Sub::Exporter collectors"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18680,7 +18870,7 @@ let }; meta = { description = "Only use Sub::Exporter if you need it"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18695,7 +18885,7 @@ let buildInputs = [ TestFatal TestRequires ]; meta = { description = "alternative handles_via implementation"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18708,7 +18898,7 @@ let }; meta = { description = "Retrieve names of code references"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18722,7 +18912,7 @@ let propagatedBuildInputs = [ Importer ]; meta = { description = "Tool for inspecting subroutines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18735,7 +18925,7 @@ let }; meta = { description = "Install subroutines into packages easily"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18750,7 +18940,7 @@ let meta = { homepage = "https://github.com/p5sagit/Sub-Name"; description = "(Re)name a sub"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18774,7 +18964,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "Efficient generation of subroutines via string eval"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18788,7 +18978,7 @@ let meta = { homepage = "https://github.com/dagolden/sub-uplevel"; description = "Apparently run a function in a higher stack frame"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18811,7 +19001,7 @@ let }; meta = { description = "lib/Safe/Hole.pm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/toddr/Safe-Hole"; }; }; @@ -18827,7 +19017,7 @@ let meta = { homepage = "https://github.com/ingydotnet/swim-pm"; description = "See What I Mean?!"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18841,6 +19031,22 @@ let doCheck = false; # FIXME: 2/293 test failures }; + SymbolGet = buildPerlPackage { + pname = "Symbol-Get"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Symbol-Get-0.10.tar.gz"; + sha256 = "0ee5568c5ae3573ca874e09e4d0524466cfc1ad9a2c24d0bc91d4c7b06f21d9c"; + }; + buildInputs = [ TestDeep TestException ]; + propagatedBuildInputs = [ CallContext ]; + meta = { + description = "Read Perl's symbol table programmatically"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + SymbolGlobalName = buildPerlPackage { pname = "Symbol-Global-Name"; version = "0.05"; @@ -18850,7 +19056,7 @@ let }; meta = { description = "Finds name and type of a global variable"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18874,7 +19080,7 @@ let meta = { homepage = "https://github.com/phaylon/syntax/wiki"; description = "Activate syntax extensions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18890,7 +19096,7 @@ let meta = { homepage = "https://github.com/frioux/Syntax-Keyword-Junction"; description = "Perl6 style Junction operators in Perl5"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18901,7 +19107,7 @@ let url = "mirror://cpan/authors/id/T/TO/TODDR/Sys-Mmap-0.20.tar.gz"; sha256 = "1kz22l7sh2mibliixyshc9958bqlkzsb13agcibp7azii4ncw80q"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Use mmap to map in a file as a Perl variable"; maintainers = with maintainers; [ peterhoeg ]; license = with licenses; [ gpl2Plus ]; @@ -18918,7 +19124,7 @@ let meta = { description = "Memory informations"; maintainers = [ maintainers.pSub ]; - license = with stdenv.lib.licenses; [ gpl2Plus ]; + license = with lib.licenses; [ gpl2Plus ]; }; }; @@ -18941,7 +19147,7 @@ let sha256 = "0z3wqfahc9av7y34aqp6biq3sf8v8q4yynx7bv290vds50dsjb4w"; }) ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; + buildInputs = lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; doCheck = !stdenv.isAarch64; }; @@ -18965,7 +19171,7 @@ let doCheck = !stdenv.isAarch64; # it hangs on Aarch64 meta = { description = "Perl extension for Consistent Signal Handling"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18978,7 +19184,7 @@ let }; meta = { description = "Perl interface to the UNIX syslog(3) calls"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18992,7 +19198,7 @@ let propagatedBuildInputs = [ IPCRun ]; meta = { description = "Object for running system commands"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ PodCoverageTrustPod TestCPANMeta TestPod TestPodCoverage ]; }; @@ -19006,7 +19212,7 @@ let }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' }; TAPParserSourceHandlerpgTAP = buildPerlModule { @@ -19019,7 +19225,7 @@ let doCheck = !stdenv.isDarwin; meta = { description = "Stream TAP from pgTAP test scripts"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19033,7 +19239,7 @@ let propagatedBuildInputs = [ CatalystAuthenticationStoreDBIxClass CatalystControllerHTMLFormFu CatalystDevel CatalystManual CatalystPluginAuthorizationACL CatalystPluginAuthorizationRoles CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace CatalystViewTT ]; meta = { description = "Everything you need to follow the Catalyst Tutorial"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; /* fails with 'open3: exec of .. perl .. failed: Argument list too long at .../TAP/Parser/Iterator/Process.pm line 165.' */ }; @@ -19049,7 +19255,7 @@ let propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC ListMoreUtils MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; meta = { description = "Install the CPAN dependencies of the Freecell Solver test suite"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -19075,7 +19281,7 @@ let meta = { homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Specifications for installing all the Test::Run"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -19088,7 +19294,7 @@ let }; meta = { description = "Ensure that a platform has weaken support"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19103,7 +19309,7 @@ let meta = { homepage = "https://github.com/karpet/template-plugin-autoformat"; description = "TT plugin for Text::Autoformat"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19128,7 +19334,7 @@ let meta = { maintainers = with maintainers; [ eelco ]; description = "Perl Template Toolkit Plugin for IO::All"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19162,7 +19368,7 @@ let propagatedBuildInputs = [ TemplateToolkit ]; meta = { description = "Rudimentary profiling for Template Toolkit"; - license = with stdenv.lib.licenses; [ artistic2 gpl3 ]; + license = with lib.licenses; [ artistic2 gpl3 ]; }; }; @@ -19175,7 +19381,7 @@ let }; meta = { description = "Template Toolkit reimplemented in as little code as possible"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19189,7 +19395,7 @@ let doCheck = !stdenv.isDarwin; meta = { description = "Comprehensive template processing system"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ AppConfig ]; buildInputs = [ CGI TestLeakTrace ]; @@ -19205,7 +19411,7 @@ let propagatedBuildInputs = [ GD TemplateToolkit ]; meta = { description = "GD plugin(s) for the Template Toolkit"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19218,7 +19424,7 @@ let }; meta = { description = "Detect encoding of the current terminal"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19233,7 +19439,7 @@ let propagatedBuildInputs = [ ClassMethodMaker TermReadKey ]; meta = { description = "Provide a progress meter on a standard terminal"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19247,7 +19453,7 @@ let propagatedBuildInputs = [ IOInteractive TermProgressBar ]; meta = { description = ""; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestMockObject ]; }; @@ -19274,7 +19480,7 @@ let }; # use native libraries from the host when running build commands - postConfigure = stdenv.lib.optionalString cross (let + postConfigure = lib.optionalString cross (let host_perl = buildPerl; host_self = buildPerl.pkgs.TermReadKey; perl_lib = "${host_perl}/lib/perl5/${host_perl.version}"; @@ -19284,7 +19490,7 @@ let ''); # TermReadKey uses itself in the build process - nativeBuildInputs = stdenv.lib.optionals cross [ + nativeBuildInputs = lib.optionals cross [ buildPerl.pkgs.TermReadKey ]; }; @@ -19316,7 +19522,7 @@ let meta = { homepage = "https://sourceforge.net/projects/perl-trg/"; description = "Perl extension for the GNU Readline/History Library"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19332,7 +19538,7 @@ let meta = { description = "a modified version of T::RL::Perl with several new nonstandard features specific to TTYtter"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19348,7 +19554,7 @@ let meta = { description = "This module lets you ask the user for a password in the traditional way, from the keyboard, without echoing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19360,7 +19566,7 @@ let sha256 = "7a142361f22f2e5fae9d6e39353663e8bdfa6118d1aee82204bd9083ddb04154"; }; propagatedBuildInputs = [ TermReadKey TextAutoformat ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://metacpan.org/release/Term-Shell"; description = "A simple command-line shell framework"; license = with licenses; [ artistic1 gpl1Plus ]; @@ -19386,7 +19592,7 @@ let propagatedBuildInputs = [ DevelHide TermSizePerl ]; meta = { description = "Retrieve terminal size"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19399,7 +19605,7 @@ let }; meta = { description = "Perl extension for retrieving terminal size (Perl version)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19413,7 +19619,7 @@ let propagatedBuildInputs = [ Importer ]; meta = { description = "Format a header and rows into a table"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19426,7 +19632,7 @@ let }; meta = { description = "Perl extension for displaying a progress indicator on a terminal."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19440,7 +19646,7 @@ let propagatedBuildInputs = [ LogMessageSimple ]; meta = { description = "User interfaces via Term::ReadLine made easy"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19475,7 +19681,7 @@ let propagatedBuildInputs = [ Curses ]; meta = { description = "ASCII sprite animation framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19489,7 +19695,7 @@ let buildInputs = [ IPCRun3 Test2Suite ]; meta = { description = "Fail if tests warn"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; propagatedBuildInputs = [ TestSimple13 ]; }; @@ -19504,7 +19710,7 @@ let propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { description = "Distribution with a rich set of tools built upon the Test2 framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19519,7 +19725,7 @@ let buildInputs = [ TestNeeds ]; meta = { description = "subtests that you can die your way out of ... but survive"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/rjbs/Test-Abortable"; }; }; @@ -19555,7 +19761,7 @@ let buildInputs = [ TestMost TestNoWarnings TestTrap ]; meta = { description = "Aggregate C<*.t> tests to make them run faster"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; broken = true; # This module only works with Test::More version < 1.3, but you have 1.302133 }; }; @@ -19583,7 +19789,7 @@ let buildInputs = [ TestFatal ]; meta = { description = "Provides a bits_is() subroutine for testing binary data"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -19597,7 +19803,7 @@ let propagatedBuildInputs = [ CPANMetaCheck ]; meta = { description = "Check for presence of dependencies"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19612,7 +19818,7 @@ let propagatedBuildInputs = [ MROCompat ModuleRuntime TryTiny ]; meta = { description = "Easily create test classes in an xUnit/JUnit style"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19626,7 +19832,7 @@ let buildInputs = [ TestClass TestDeep TestDifferences TestException TestMost TestWarn ]; meta = { description = "Test Classes the easy way"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19642,7 +19848,7 @@ let meta = { homepage = "https://github.com/karenetheridge/Test-CleanNamespaces"; description = "Check for uncleaned imports"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19656,7 +19862,7 @@ let doCheck = false; /* test fails */ meta = { description = "Perl module for portable testing of commands and scripts"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/neilb/Test-Cmd"; }; }; @@ -19671,7 +19877,7 @@ let meta = { homepage = "https://github.com/danboo/perl-test-command"; description = "Test routines for external commands "; - license = with stdenv.lib.licenses; [ artistic1 gpl1 ]; + license = with lib.licenses; [ artistic1 gpl1 ]; }; }; @@ -19685,7 +19891,7 @@ let propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { description = "Check whether Perl files compile correctly"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19698,7 +19904,7 @@ let }; meta = { description = "Validate your CPAN META.yml files"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -19712,7 +19918,7 @@ let propagatedBuildInputs = [ JSON ]; meta = { description = "Validate your CPAN META.json files"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = with lib.licenses; [ artistic2 ]; }; }; @@ -19727,7 +19933,7 @@ let propagatedBuildInputs = [ IOAll ListMoreUtils MooX MooXlate ]; meta = { description = "Split data-driven tests into several test scripts"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -19751,7 +19957,7 @@ let }; meta = { description = "Test directory attributes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19765,7 +19971,7 @@ let propagatedBuildInputs = [ CaptureTiny TextDiff ]; meta = { description = "Test strings and data structures and show differences if not ok"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19780,7 +19986,7 @@ let propagatedBuildInputs = [ ModuleManifest ]; meta = { description = "Author test that validates a package MANIFEST"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19793,7 +19999,7 @@ let }; meta = { description = "Check the correct line endings in your project"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19817,7 +20023,7 @@ let propagatedBuildInputs = [ ClassAccessorChained ExpectSimple ]; meta = { description = "Automated driving and testing of terminal-based programs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19831,7 +20037,7 @@ let buildInputs = [ CaptureTiny ]; meta = { description = "Add test failures if warnings are caught"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -19846,7 +20052,7 @@ let buildInputs = [ LWP ModuleBuildTiny TestException TestSharedFork TestTCP TestUseAllModules ]; meta = { description = "a fake HTTP server"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/masaki/Test-Fake-HTTPD"; }; }; @@ -19862,7 +20068,7 @@ let meta = { homepage = "https://github.com/rjbs/Test-Fatal"; description = "Incredibly simple helpers for testing code with exceptions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19876,7 +20082,7 @@ let buildInputs = [ Testutf8 ]; meta = { description = "Check file attributes"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19890,7 +20096,7 @@ let propagatedBuildInputs = [ TextDiff ]; meta = { description = "Test routines for examining the contents of files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19906,7 +20112,7 @@ let meta = { homepage = "https://github.com/kentfredric/Test-File-ShareDir"; description = "Create a Fake ShareDir for your modules for testing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19920,7 +20126,7 @@ let propagatedBuildInputs = [ PathTiny ]; meta = { description = "Portable filename comparison"; - license = with stdenv.lib.licenses; [ asl20 ]; + license = with lib.licenses; [ asl20 ]; }; }; @@ -19933,7 +20139,7 @@ let }; meta = { description = "test code which forks"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19946,7 +20152,7 @@ let }; meta = { description = "Detailed analysis of test results"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19972,7 +20178,7 @@ let }; meta = { description = "test binary strings with hex dump diagnostics"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19985,7 +20191,7 @@ let }; meta = { description = "assert the referential identity of a reference"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20024,7 +20230,7 @@ let buildInputs = [ CPANMetaCheck TestDeep TestWarnings ]; meta = { description = "Test the Kwalitee of a distribution before you release it"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/karenetheridge/Test-Kwalitee"; }; }; @@ -20040,7 +20246,7 @@ let buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ]; meta = { description = "A LWP::UserAgent suitable for simulating and testing network calls"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent"; }; }; @@ -20054,7 +20260,7 @@ let }; meta = { description = "Traces memory leaks"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20067,7 +20273,7 @@ let }; meta = { description = "Easy, automatic, specification-based tests"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20081,7 +20287,7 @@ let propagatedBuildInputs = [ ListMoreUtils ModulePluggable ]; meta = { description = "do use_ok for modules in search path"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20116,7 +20322,7 @@ let }; meta = { description = "assert that code does not cause growth in memory usage"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20130,7 +20336,7 @@ let propagatedBuildInputs = [ MetricsAny ]; meta = { description = "assert that code produces metrics via L<Metrics::Any>"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20143,7 +20349,7 @@ let }; buildInputs = [ ClassInspector TestAssert TestUnitLite ]; propagatedBuildInputs = [ FatalException Moose namespaceclean ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simulating other classes"; license = licenses.lgpl2Plus; }; @@ -20160,7 +20366,7 @@ let meta = { homepage = "https://github.com/zigorou/p5-test-mock-guard"; description = "Simple mock test library using RAII"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20185,7 +20391,7 @@ let propagatedBuildInputs = [ SubIdentify ]; meta = { description = "Control superclass method dispatch"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20201,7 +20407,7 @@ let propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ]; meta = { description = "Perl extension for emulating troublesome interfaces"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20224,7 +20430,7 @@ let buildInputs = [ AnyEvent ModuleBuildTiny TestClass TestMockTime TestRequires ]; meta = { description = "Replaces actual time with simulated high resolution time"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/tarao/perl5-Test-MockTime-HiRes"; }; }; @@ -20239,7 +20445,7 @@ let meta = { homepage = "https://github.com/creaktive/Test-Mojibake"; description = "Check your source for encoding misbehavior"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20252,7 +20458,7 @@ let }; meta = { description = "Enhancing Test::More for UTF8-based projects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20266,7 +20472,7 @@ let propagatedBuildInputs = [ ExceptionClass ]; meta = { description = "Most commonly needed test functions and features"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestDeep TestDifferences TestException TestWarn ]; }; @@ -20283,7 +20489,7 @@ let meta = { homepage = "https://github.com/kazuho/p5-test-mysqld"; description = "Mysqld runner for tests"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -20297,7 +20503,7 @@ let }; meta = { description = "Skip tests when modules not available"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20310,7 +20516,7 @@ let }; meta = { description = "Check the presence of tabs in your project"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20323,7 +20529,7 @@ let }; meta = { description = "Make sure you didn't emit any warnings while testing"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; }; }; @@ -20357,7 +20563,7 @@ let buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; meta = { description = "tests module permissions in your distribution"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20380,7 +20586,7 @@ let }; propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestPerlCritic ]; }; @@ -20394,7 +20600,7 @@ let }; meta = { description = "Check for POD errors in files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20419,7 +20625,7 @@ let propagatedBuildInputs = [ CaptureTiny Moose podlinkcheck ]; meta = { description = "Tests POD for invalid links"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20433,7 +20639,7 @@ let propagatedBuildInputs = [ LWP URIFind ]; meta = { description = "Checks POD for any http 404 links"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ ModuleBuildTiny TestPod ]; }; @@ -20447,7 +20653,7 @@ let }; meta = { description = "Check file names portability"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20460,7 +20666,7 @@ let }; meta = { description = "assert reference counts on objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20473,7 +20679,7 @@ let }; meta = { description = "Checks to see if the module can be loaded"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20487,7 +20693,7 @@ let propagatedBuildInputs = [ GitVersionCompare ]; meta = { description = "Check your test requirements against the available version of Git"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20500,7 +20706,7 @@ let }; meta = { description = "Easily test network connectivity"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20528,7 +20734,7 @@ let meta = { homepage = "https://github.com/rjbs/Test-Routine"; description = "Composable units of assertion"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20544,7 +20750,7 @@ let meta = { homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Base class to run standard TAP scripts"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -20561,7 +20767,7 @@ let meta = { homepage = "http://web-cpan.berlios.de/modules/Test-Run/"; description = "Analyze tests from the command line using Test::Run"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -20577,7 +20783,7 @@ let meta = { homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Define different interpreters for different test scripts with Test::Run"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -20593,7 +20799,7 @@ let meta = { homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Stop processing the entire test suite"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -20611,7 +20817,7 @@ let meta = { homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Make the file verdict ('ok', 'NOT OK')"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -20628,7 +20834,7 @@ let meta = { homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "A Test::Run plugin that"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -20644,7 +20850,7 @@ let meta = { homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Trim the first components"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -20659,7 +20865,7 @@ let propagatedBuildInputs = [ PathTiny ]; meta = { description = "Tests that an external program is valgrind-clean"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -20686,7 +20892,7 @@ let propagatedBuildInputs = [ IPCRun3 TestException ]; meta = { description = "Test scripts with run"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20701,7 +20907,7 @@ let meta = { homepage = "https://github.com/tokuhirom/Test-SharedFork"; description = "Fork test"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20714,7 +20920,7 @@ let }; meta = { description = "Basic utilities for writing tests"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20728,7 +20934,7 @@ let propagatedBuildInputs = [ DevelGlobalPhase PackageStash TieIxHash ]; meta = { description = "Write tests in a declarative specification style"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestDeep TestTrap ]; }; @@ -20752,7 +20958,7 @@ let }; meta = { description = "Test your SYNOPSIS code"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20765,7 +20971,7 @@ let }; meta = { description = "Write tests, not scripts that run them"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20778,7 +20984,7 @@ let }; meta = { description = "Temporary directories that stick around when tests fail"; - license = with stdenv.lib.licenses; [ asl20 ]; + license = with lib.licenses; [ asl20 ]; homepage = "https://github.com/dagolden/Test-TempDir-Tiny"; }; @@ -20793,7 +20999,7 @@ let }; meta = { description = "Testing TCP program"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestSharedFork ]; }; @@ -20807,7 +21013,7 @@ let }; meta = { description = "Testing UNIX domain socket program"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ TestSharedFork TestTCP ]; @@ -20822,7 +21028,7 @@ let }; meta = { description = "Overrides the time() and sleep() core functions for testing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20835,7 +21041,7 @@ let }; meta = { description = "Test::Toolbox - tools for testing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20849,7 +21055,7 @@ let propagatedBuildInputs = [ FileFindObjectRule ]; meta = { description = "Test for trailing space in source files"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -20862,7 +21068,7 @@ let }; meta = { description = "Unit testing without external dependencies"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20876,7 +21082,7 @@ let propagatedBuildInputs = [ SubUplevel ]; meta = { description = "Perl extension to test methods for warnings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20891,7 +21097,7 @@ let meta = { homepage = "https://github.com/karenetheridge/Test-Warnings"; description = "Test for warnings and the lack of them"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20904,7 +21110,7 @@ let }; meta = { description = "Test fallback behaviour in absence of modules"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20920,7 +21126,7 @@ let meta = { homepage = "https://github.com/petdance/test-www-mechanize"; description = "Testing-specific WWW::Mechanize subclass"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -20935,7 +21141,7 @@ let propagatedBuildInputs = [ CatalystRuntime WWWMechanize ]; meta = { description = "Test::WWW::Mechanize for Catalyst"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ CatalystPluginSession CatalystPluginSessionStateCookie TestException TestWWWMechanize Testutf8 ]; }; @@ -20962,7 +21168,7 @@ let propagatedBuildInputs = [ Plack ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21022,7 +21228,7 @@ let meta = { homepage = "https://github.com/neilbowers/Text-Autoformat"; description = "Automatic text wrapping and reformatting"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21035,7 +21241,7 @@ let }; meta = { description = "Extract delimited text sequences from strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21048,7 +21254,7 @@ let sha256 = "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"; }; perlPreHook = "export LD=$CC"; - perlPostHook = stdenv.lib.optionalString stdenv.isDarwin '' + perlPostHook = lib.optionalString stdenv.isDarwin '' oldPath="$(pwd)/btparse/src/libbtparse.dylib" newPath="$out/lib/libbtparse.dylib" @@ -21060,7 +21266,7 @@ let ''; meta = { description = "Interface to read and parse BibTeX files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21091,7 +21297,7 @@ let }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21105,7 +21311,7 @@ let propagatedBuildInputs = [ TextCSV ]; meta = { description = "Encoding aware Text::CSV"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21118,7 +21324,7 @@ let }; meta = { description = "Comma-Separated Values manipulation routines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21132,21 +21338,21 @@ let propagatedBuildInputs = [ AlgorithmDiff ]; meta = { description = "Perform diffs on files and record sets"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; TextFormat = buildPerlModule { pname = "Text-Format"; - version = "0.61"; + version = "0.62"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz"; - sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b"; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.62.tar.gz"; + sha256 = "0104z7jjv46kqh77rnx8kvmsbr5dy0s56xm01dckq4ly65br0hkx"; }; meta = { homepage = "https://metacpan.org/release/Text-Format"; description = "Format text"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ bcdarwin ]; }; }; @@ -21161,7 +21367,7 @@ let propagatedBuildInputs = [ FileSlurp StringDiff ]; meta = { description = "Generate a colorful HTML diff of strings/files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -21197,7 +21403,7 @@ let buildInputs = [ DataVisitor PathTiny TryTiny YAML ]; meta = { description = "Text::Hogan - A mustache templating engine statement-for-statement cloned from hogan.js"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21220,7 +21426,7 @@ let meta = { homepage = "https://github.com/wchristian/Test-InDistDir"; description = "Test environment setup for development with IDE"; - license = stdenv.lib.licenses.wtfpl; + license = lib.licenses.wtfpl; maintainers = [ maintainers.sgo ]; }; }; @@ -21234,7 +21440,7 @@ let }; meta = { description = "Framework for more readable interactive test scripts"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ FileFindRule TestPod TestPodCoverage ]; }; @@ -21249,7 +21455,7 @@ let buildInputs = [ PDFAPI2 ]; meta = { description = "Pango style markup formatting"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21262,7 +21468,7 @@ let }; meta = { description = "Generate random Latin looking text"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -21276,7 +21482,7 @@ let }; meta = { description = "Interact with a t/test_manifest file"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21301,7 +21507,7 @@ let meta = { homepage = "https://github.com/rjbs/Test-MinimumVersion"; description = "Does your code require newer perl than you think?"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21314,7 +21520,7 @@ let }; meta = { description = "Micro template engine with Perl5 language"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21329,7 +21535,7 @@ let propagatedBuildInputs = [ HTMLParser TextMarkdown ]; meta = { description = "Convert MultiMarkdown syntax to (X)HTML"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -21355,7 +21561,7 @@ let sha256 = "c186a50256e0bedfafb17e7ce157e7c52f19503bb79e18ebf06255911f6ead1a"; }; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21369,7 +21575,7 @@ let propagatedBuildInputs = [ TextDiff ]; meta = { description = "Patches text with given patch"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; }; }; @@ -21392,7 +21598,7 @@ let propagatedBuildInputs = [ TextAutoformat ]; meta = { description = "Extract the structure of a quoted mail message"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21421,7 +21627,7 @@ let }; meta = { description = "Manual text wrapping and reformatting"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21434,7 +21640,7 @@ let }; meta = { description = "Allows conversion between Roman and Arabic algarisms"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; }; }; @@ -21447,7 +21653,7 @@ let }; meta = { description = "Simple eyecandy ASCII tables"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; propagatedBuildInputs = [ UnicodeLineBreak ]; }; @@ -21471,7 +21677,7 @@ let buildInputs = [ TestWarn ]; meta = { description = "Sprintf-like function with named conversions"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -21486,7 +21692,7 @@ let meta = { homepage = "https://www.shlomifish.org/open-source/projects/docmake/"; description = "Organize Data in Tables"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; }; }; @@ -21519,7 +21725,7 @@ let propagatedBuildInputs = [ DataDump ]; meta = { description = "Trap exit codes, exceptions, output, etc"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21536,7 +21742,7 @@ let meta = { homepage = "https://github.com/gfx/p5-Test-Vars"; description = "Detects unused variables"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21551,7 +21757,7 @@ let propagatedBuildInputs = [ FileFindRulePerl ]; meta = { description = "Check to see that version's in modules are sane"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -21564,7 +21770,7 @@ let }; meta = { description = "Remove leading and/or trailing whitespace from strings"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21598,7 +21804,7 @@ let meta = { homepage = "https://github.com/2shortplanks/Test-utf8"; description = "Handy utf8 tests"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21611,7 +21817,7 @@ let }; meta = { description = "Extract collocations and Ngrams from text"; - license = stdenv.lib.licenses.free; + license = lib.licenses.free; maintainers = [ maintainers.bzizou ]; }; }; @@ -21626,7 +21832,7 @@ let propagatedBuildInputs = [ ClassAccessorChained ]; meta = { description = "Parse vFile formatted files into data structures"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21653,7 +21859,7 @@ let ''; meta = { description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words"; - license = with stdenv.lib.licenses; [ artistic1 gpl2 ]; + license = with lib.licenses; [ artistic1 gpl2 ]; # bogus use of glibc, pretty sure, think this is what we have glibcLocales for? broken = stdenv.hostPlatform.libc != "glibc"; }; @@ -21668,7 +21874,7 @@ let }; meta = { description = "Word wrap text by breaking long lines"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestDifferences ]; }; @@ -21684,7 +21890,7 @@ let meta = { homepage = "https://github.com/rjbs/Throwable"; description = "A role for classes that can be thrown"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21698,7 +21904,7 @@ let propagatedBuildInputs = [ ClassVirtual enum ]; meta = { description = "A Least-Recently Used cache"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21711,7 +21917,7 @@ let }; propagatedBuildInputs = [ TieCacheLRU ]; meta = { - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; }; @@ -21724,7 +21930,7 @@ let }; meta = { description = "Cycle through a list of values via a scalar"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21738,7 +21944,7 @@ let propagatedBuildInputs = [ CryptBlowfish CryptCBC CryptDES ]; meta = { description = "Hashes (and objects based on hashes) with encrypting fields"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -21764,7 +21970,7 @@ let }; meta = { description = "Ordered associative arrays for Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21778,7 +21984,7 @@ let meta = { homepage = "https://github.com/dagolden/tie-handle-offset"; description = "Tied handle that hides the beginning of a file"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; }; }; @@ -21791,7 +21997,7 @@ let }; meta = { description = "Ordered hashes for Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; doCheck = false; /* test fails on some machines */ }; @@ -21813,7 +22019,7 @@ let sha256 = "0c207850e77efb16618e0aa015507926a3425b34aad5aa6e3e40d83989a085a3"; }; meta = { - license = stdenv.lib.licenses.artistic1; + license = lib.licenses.artistic1; }; }; @@ -21826,7 +22032,7 @@ let }; meta = { description = "Variable ties made much easier: much, much, much easier.."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21841,7 +22047,7 @@ let buildInputs = [ ModuleBuild TestDifferences TestException TestNoWarnings ]; meta = { description = "Tie::Sub - Tying a subroutine, function or method to a hash"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21872,7 +22078,7 @@ let }; meta = { description = "Rounded or exact English expression of durations"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21887,7 +22093,7 @@ let propagatedBuildInputs = [ ExporterLite ]; meta = { description = "Parse string that represents time duration"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21900,7 +22106,7 @@ let }; meta = { description = "Efficiently compute time from local and GMT time"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21937,7 +22143,7 @@ let }; meta = { description = "A Perl module to deal with time periods"; - license = stdenv.lib.licenses.gpl1; + license = lib.licenses.gpl1; maintainers = [ maintainers.winpat ]; }; }; @@ -21952,7 +22158,7 @@ let meta = { description = "Object Oriented time objects"; homepage = "https://metacpan.org/release/Time-Piece"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -21988,7 +22194,7 @@ let description = "Tools for running a map tile server"; homepage = "https://github.com/openstreetmap/tirex"; maintainers = with maintainers; [ jglukasik ]; - license = with stdenv.lib.licenses; [ gpl2 ]; + license = with lib.licenses; [ gpl2 ]; }; }; @@ -22003,7 +22209,7 @@ let buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ]; doCheck = false; # Expects working X11. meta = { - license = stdenv.lib.licenses.tcltk; + license = lib.licenses.tcltk; }; }; @@ -22016,7 +22222,7 @@ let }; meta = { description = "An N-ary tree"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; propagatedBuildInputs = [ FileSlurpTiny ]; }; @@ -22031,7 +22237,7 @@ let buildInputs = [ TestException ]; meta = { description = "A simple tree object"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22056,7 +22262,7 @@ let buildInputs = [ CPANMetaCheck CaptureTiny ]; meta = { description = "Minimal try/catch with proper preservation of $@"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -22069,7 +22275,7 @@ let }; propagatedBuildInputs = [ DispatchClass TryTiny ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22084,7 +22290,7 @@ let buildInputs = [ TestRequires TestSharedFork TestTCP ]; meta = { description = "AnyEvent HTTP server for PSGI (like Thin)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/miyagawa/Twiggy"; }; }; @@ -22099,7 +22305,7 @@ let propagatedBuildInputs = [ ExporterTiny ]; meta = { description = "Tiny, yet Moo(se)-compatible type constraint"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestMemoryCycle ]; }; @@ -22126,7 +22332,7 @@ let meta = { homepage = "https://github.com/chromatic/UNIVERSAL-can"; description = "Work around buggy code calling UNIVERSAL::can() as a function"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22140,7 +22346,7 @@ let meta = { homepage = "https://github.com/chromatic/UNIVERSAL-isa"; description = "Attempt to recover from people calling UNIVERSAL::isa as a function"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22153,7 +22359,7 @@ let }; meta = { description = "Require() modules from a variable"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22164,10 +22370,10 @@ let url = "mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz"; sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d"; }; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Unicode case-folding for case-insensitive lookups"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22190,7 +22396,7 @@ let propagatedBuildInputs = [ MIMECharset ]; meta = { description = "UAX #14 Unicode Line Breaking Algorithm"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22213,7 +22419,7 @@ let buildInputs = [ TestNoWarnings ]; meta = { description = "Preparation of Internationalized Strings (RFC 3454)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; }; @@ -22229,7 +22435,7 @@ let meta = { homepage = "https://github.com/chansen/p5-unicode-utf8"; description = "Encoding and decoding of UTF-8 encoding form"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; }; }; @@ -22254,7 +22460,7 @@ let meta = { homepage = "https://github.com/libwww-perl/URI"; description = "Uniform Resource Identifiers (absolute and relative)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22268,7 +22474,7 @@ let propagatedBuildInputs = [ URINested ]; meta = { description = "Database URIs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22282,7 +22488,7 @@ let propagatedBuildInputs = [ URI ]; meta = { description = "Find URIs in arbitrary text"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22296,7 +22502,7 @@ let propagatedBuildInputs = [ ParamsValidate URI ]; meta = { description = "Build a URI from a set of named parameters"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestFatal ]; }; @@ -22320,7 +22526,7 @@ let }; meta = { description = "Collect information about a user"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22344,7 +22550,7 @@ let propagatedBuildInputs = [ URI ]; meta = { description = "Nested URIs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22359,7 +22565,7 @@ let buildInputs = [ TestFatal TestNoWarnings ]; meta = { description = "Subclassable and hostless URIs"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22373,7 +22579,7 @@ let propagatedBuildInputs = [ URI ]; meta = { description = "Object for handling URI templates (RFC 6570)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22387,7 +22593,7 @@ let propagatedBuildInputs = [ CPANDistnameInfo URI ]; meta = { description = "URLs that refer to things on the CPAN"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/rjbs/URI-cpan"; }; }; @@ -22403,7 +22609,7 @@ let meta = { homepage = "https://metacpan.org/release/URI-ws"; description = "WebSocket support for URI package"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22416,7 +22622,7 @@ let }; meta = { description = "Pure Perl UUID Support With Functional Interface"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22429,7 +22635,7 @@ let }; meta = { description = "Associate user-defined magic to variables from Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22442,7 +22648,7 @@ let }; meta = { description = "Structured version objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22457,7 +22663,7 @@ let meta = { maintainers = [ maintainers.chreekat ]; description = "Edit a directory in $EDITOR"; - license = with stdenv.lib.licenses; [ gpl1 ]; + license = with lib.licenses; [ gpl1 ]; }; }; @@ -22471,7 +22677,7 @@ let propagatedBuildInputs = [ AnyEventCacheDNS AnyEventHTTP JSON StringApprox XMLSimple ]; meta = { description = "Perl interface to Amazon EC2, Virtual Private Cloud, Elastic Load Balancing, Autoscaling, and Relational Database services"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22485,7 +22691,7 @@ let propagatedBuildInputs = [ DateTimeFormatISO8601 VMEC2 ]; meta = { description = "Cache credentials respecting expiration time for IAM roles"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22501,7 +22707,7 @@ let meta = { homepage = "https://validator.w3.org/checklink"; description = "A tool to check links and anchors in Web pages or full Web sites"; - license = stdenv.lib.licenses.w3c; + license = lib.licenses.w3c; }; }; @@ -22519,7 +22725,7 @@ let name = "WWWCurl-curl-7.71.0.patch"; }) ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-return-type"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; buildInputs = [ pkgs.curl ]; doCheck = false; # performs network access }; @@ -22533,7 +22739,7 @@ let }; meta = { description = "parser and builder for application/x-www-form-urlencoded"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/kazeburo/WWW-Form-UrlEncoded"; }; }; @@ -22550,7 +22756,7 @@ let meta = { homepage = "https://github.com/libwww-perl/WWW-Mechanize"; description = "Handy web browsing in a Perl object"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ CGI HTTPServerSimple PathTiny TestDeep TestFatal TestOutput TestWarnings ]; }; @@ -22579,7 +22785,7 @@ let propagatedBuildInputs = [ URI ]; meta = { description = "Database of robots.txt-derived permissions"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22594,7 +22800,7 @@ let propagatedBuildInputs = [ LWPProtocolhttps ]; meta = { description = "Accessing Twilio's REST API with Perl"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22618,7 +22824,7 @@ let }; meta = { description = "Quote argument lists for Win32"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22634,7 +22840,7 @@ let meta = { homepage = "https://github.com/jonasbn/perl-workflow"; description = "Simple, flexible system to implement workflows"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22701,7 +22907,7 @@ let buildInputs = [ EncodeHanExtra ModuleUtil ]; meta = { description = "Miscellaneous helpers for X11::Protocol connections."; - license = with stdenv.lib.licenses; [ gpl1Plus gpl3Plus ]; + license = with lib.licenses; [ gpl1Plus gpl3Plus ]; homepage = "http://user42.tuxfamily.org/x11-protocol-other/index.html"; }; }; @@ -22732,7 +22938,22 @@ let doCheck = false; # requires an X server meta = { description = "XCB bindings for X"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + XMLCanonicalizeXML = buildPerlPackage { + pname = "XML-CanonicalizeXML"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SJ/SJZASADA/XML-CanonicalizeXML-0.10.tar.gz"; + sha256 = "1vl6wbqmq91mc0hkgfwlndbxcv2jm01hj7kpzprw3d6bh144ca77"; + }; + buildInputs = [ pkgs.libxml2 ]; + meta = { + description = "Perl extension for inclusive (1.0 and 1.1) and exclusive canonicalization of XML using libxml2"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; }; }; @@ -22747,7 +22968,7 @@ let propagatedBuildInputs = [ XMLTokeParser ]; meta = { description = "Recursive descent XML parsing"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22771,7 +22992,7 @@ let propagatedBuildInputs = [ XMLTreePP ]; meta = { description = "Parse/write/merge/edit RSS/RDF/Atom syndication feeds"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22802,12 +23023,12 @@ let url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Filter-Sort-1.01.tar.gz"; sha256 = "sha256-UQWF85pJFszV+o1UXpYXnJHq9vx8l6QBp1aOhBFi+l8="; }; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ XMLSAX XMLSAXWriter ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/xmlsort ''; }; @@ -22864,7 +23085,7 @@ let propagatedBuildInputs = [ XMLLibXML ]; meta = { description = "XML::LibXML based XML::Simple clone"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22908,9 +23129,9 @@ let sha256 = "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk"; }; patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ]; - postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Expat/Makefile.PL --replace 'use English;' '#' - '' + stdenv.lib.optionalString stdenv.isCygwin '' + '' + lib.optionalString stdenv.isCygwin '' sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm ''; makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include"; @@ -22927,7 +23148,7 @@ let buildInputs = [ TestRequires ]; meta = { description = "Lightweight pure-perl XML Parser (based on regexps)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22942,7 +23163,7 @@ let propagatedBuildInputs = [ XMLParser ]; meta = { description = "Modules for parsing and evaluating XPath statements"; - license = stdenv.lib.licenses.artistic2; + license = lib.licenses.artistic2; }; }; @@ -22978,7 +23199,7 @@ let # disable tests that require network preCheck = "rm t/{26-xmlrpc.t,37-mod_xmlrpc.t}"; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; description = "Client and server implementation of XML-RPC protocol"; }; }; @@ -22994,7 +23215,7 @@ let meta = { homepage = "http://perl-rss.sourceforge.net/"; description = "Creates and updates RSS files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23021,7 +23242,7 @@ let meta = { description = "Base class for SAX Drivers and Filters"; homepage = "https://github.com/grantm/XML-SAX-Base"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23037,7 +23258,7 @@ let installTargets = [ "pure_install" ]; meta = { description = "SAX Driver for Expat"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23052,7 +23273,7 @@ let meta = { homepage = "https://github.com/perigrin/xml-sax-writer"; description = "SAX2 XML Writer"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23086,7 +23307,7 @@ let propagatedBuildInputs = [ XMLParser ]; meta = { description = "Simplified interface to XML::Parser"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23100,7 +23321,7 @@ let propagatedBuildInputs = [ LWP ]; meta = { description = "Pure Perl implementation for parsing/writing XML documents"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23151,7 +23372,7 @@ let buildInputs = [ ExtUtilsDepends TestFatal TestSimple13 ]; meta = { description = "XS pointer backed objects using sv_magic"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23163,10 +23384,10 @@ let sha256 = "99a1bdda3ffa67514adb6aa189c902fa78dca41d778a42ae7079f604a045ac43"; }; buildInputs = [ TestFatal ]; - perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing sub-like syntax"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; }; @@ -23181,7 +23402,7 @@ let propagatedBuildInputs = [ YAMLPP ]; meta = { description = "See Your Data in the Nude"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/ingydotnet/xxx-pm"; }; }; @@ -23199,7 +23420,7 @@ let meta = { homepage = "https://github.com/ingydotnet/yaml-pm"; description = "YAML Ain't Markup Language (tm)"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23210,10 +23431,10 @@ let url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.32.tar.gz"; sha256 = "1fz9r9vvsmjkzvcbznxw65b319vkmwzd0ck09q9nwip00gn907fv"; }; - perlPreHook = stdenv.lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "Fast, lightweight YAML loader and dumper"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; }; }; @@ -23245,7 +23466,7 @@ let buildInputs = [ TestDeep TestWarn ]; meta = { description = "YAML Framework"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23261,11 +23482,11 @@ let meta = { homepage = "https://github.com/mikegrb/WebService-Linode"; description = "Perl Interface to the Linode.com API"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; -} // stdenv.lib.optionalAttrs (config.allowAliases or true) { +} // lib.optionalAttrs (config.allowAliases or true) { autodie = null; # part of Perl AutoLoader = null; # part of Perl 5.22 constant = null; # part of Perl 5.22 diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d4518b60d24d4..95b6d96644d68 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkgconfig, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit -, readline, rsync, fetchpatch +, readline, rsync, fetchpatch, valgrind }: -let +lib.makeScope pkgs.newScope (self: with self; { buildPecl = import ../build-support/build-pecl.nix { php = php.unwrapped; inherit lib; @@ -21,15 +21,10 @@ let pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; - callPackage = pkgs.newScope { - inherit mkDerivation php buildPecl pcre'; - }; -in -{ - inherit buildPecl; + php = phpPackage; # This is a set of interactive tools based on PHP. - packages = { + tools = { box = callPackage ../development/php-packages/box { }; composer = callPackage ../development/php-packages/composer { }; @@ -83,7 +78,15 @@ in mongodb = callPackage ../development/php-packages/mongodb { }; - oci8 = callPackage ../development/php-packages/oci8 { }; + oci8 = callPackage ../development/php-packages/oci8 ({ + version = "2.2.0"; + sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; + } // lib.optionalAttrs (lib.versionAtLeast php.version "8.0") { + version = "3.0.1"; + sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; + }); + + pdlib = callPackage ../development/php-packages/pdlib { }; pcov = callPackage ../development/php-packages/pcov { }; @@ -331,7 +334,7 @@ in sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4"; }); } - { name = "json"; } + { name = "json"; enable = lib.versionOlder php.version "8.0"; } { name = "ldap"; buildInputs = [ openldap cyrus_sasl ]; configureFlags = [ @@ -341,7 +344,9 @@ in "LDAP_LIBDIR=${openldap.out}/lib" ] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}"; doCheck = false; } - { name = "mbstring"; buildInputs = [ oniguruma ]; doCheck = false; } + { name = "mbstring"; buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ + pcre' + ]; doCheck = false; } { name = "mysqli"; internalDeps = [ php.extensions.mysqlnd ]; configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; @@ -388,11 +393,10 @@ in # oci8 (7.4, 7.3, 7.2) # odbc (7.4, 7.3, 7.2) { name = "opcache"; - buildInputs = [ pcre' ]; - # HAVE_OPCACHE_FILE_CACHE is defined in config.h, which is - # included from ZendAccelerator.h, but ZendAccelerator.h is - # included after the ifdef... - patches = lib.optional (lib.versionOlder php.version "7.4") [ + buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ + valgrind.dev + ]; + patches = [] ++ lib.optional (lib.versionOlder php.version "7.4") [ (pkgs.writeText "zend_file_cache_config.patch" '' --- a/ext/opcache/zend_file_cache.c +++ b/ext/opcache/zend_file_cache.c @@ -456,7 +460,7 @@ in doCheck = false; } # recode (7.3, 7.2) - { name = "session"; } + { name = "session"; doCheck = !(lib.versionAtLeast php.version "8.0"); } { name = "shmop"; } { name = "simplexml"; buildInputs = [ libxml2 pcre' ]; @@ -546,4 +550,4 @@ in # Produce the final attribute set of all extensions defined. in builtins.listToAttrs namedExtensions); -} +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be068a6c5073a..a3afe73c4db44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8,10 +8,11 @@ { pkgs , stdenv +, lib , python }: -with pkgs.lib; +with lib; self: @@ -64,7 +65,7 @@ let # Create a PYTHONPATH from a list of derivations. This function recurses into the items to find derivations # providing Python modules. - makePythonPath = drvs: stdenv.lib.makeSearchPath python.sitePackages (requiredPythonModules drvs); + makePythonPath = drvs: lib.makeSearchPath python.sitePackages (requiredPythonModules drvs); removePythonPrefix = name: removePrefix namePrefix name; @@ -167,9 +168,15 @@ in { adb-shell = callPackage ../development/python-modules/adb-shell { }; + adblock = callPackage ../development/python-modules/adblock { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; - adguardhome= callPackage ../development/python-modules/adguardhome { }; + adguardhome = callPackage ../development/python-modules/adguardhome { }; + + advantage-air = callPackage ../development/python-modules/advantage-air { }; aenum = callPackage ../development/python-modules/aenum { }; @@ -205,6 +212,8 @@ in { aioftp = callPackage ../development/python-modules/aioftp { }; + aioguardian = callPackage ../development/python-modules/aioguardian { }; + aioh2 = callPackage ../development/python-modules/aioh2 { }; aioharmony = callPackage ../development/python-modules/aioharmony { }; @@ -221,6 +230,10 @@ in { aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; + aioitertools = callPackage ../development/python-modules/aioitertools { }; + + aiobotocore = callPackage ../development/python-modules/aiobotocore { }; + aiohue = callPackage ../development/python-modules/aiohue { }; aioimaplib = callPackage ../development/python-modules/aioimaplib { }; @@ -233,12 +246,16 @@ in { aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; + aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { }; + aiomysql = callPackage ../development/python-modules/aiomysql { }; aionotify = callPackage ../development/python-modules/aionotify { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; + aiopulse = callPackage ../development/python-modules/aiopulse { }; + aioredis = callPackage ../development/python-modules/aioredis { }; aioresponses = callPackage ../development/python-modules/aioresponses { }; @@ -251,12 +268,18 @@ in { aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + aiostream = callPackage ../development/python-modules/aiostream { }; + aiounifi = callPackage ../development/python-modules/aiounifi { }; aiounittest = callPackage ../development/python-modules/aiounittest { }; + aiowinreg = callPackage ../development/python-modules/aiowinreg { }; + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + airly = callPackage ../development/python-modules/airly { }; + ajpy = callPackage ../development/python-modules/ajpy { }; alabaster = callPackage ../development/python-modules/alabaster { }; @@ -279,6 +302,8 @@ in { amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + ambiclimate = callPackage ../development/python-modules/ambiclimate { }; + amply = callPackage ../development/python-modules/amply { }; amqp = callPackage ../development/python-modules/amqp { }; @@ -357,6 +382,8 @@ in { arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { }; + archinfo = callPackage ../development/python-modules/archinfo { }; + area = callPackage ../development/python-modules/area { }; arelle = callPackage ../development/python-modules/arelle { gui = true; }; @@ -421,6 +448,8 @@ in { astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + astropy-extension-helpers = callPackage ../development/python-modules/astropy-extension-helpers { }; + astroquery = callPackage ../development/python-modules/astroquery { }; asttokens = callPackage ../development/python-modules/asttokens { }; @@ -429,6 +458,8 @@ in { async_generator = callPackage ../development/python-modules/async_generator { }; + asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; + asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { }; asyncpg = callPackage ../development/python-modules/asyncpg { }; @@ -443,6 +474,10 @@ in { async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + asyncwhois = callPackage ../development/python-modules/asyncwhois { }; + + asysocks = callPackage ../development/python-modules/asysocks { }; + atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; atom = callPackage ../development/python-modules/atom { }; @@ -496,6 +531,8 @@ in { av = callPackage ../development/python-modules/av { inherit (pkgs) pkgconfig; }; + avea = callPackage ../development/python-modules/avea { }; + avro3k = callPackage ../development/python-modules/avro3k { }; avro = callPackage ../development/python-modules/avro { }; @@ -504,8 +541,8 @@ in { awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; + awkward0 = callPackage ../development/python-modules/awkward0 { }; awkward = callPackage ../development/python-modules/awkward { }; - awkward1 = callPackage ../development/python-modules/awkward1 { }; aws-adfs = callPackage ../development/python-modules/aws-adfs { }; @@ -595,6 +632,8 @@ in { azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { }; + azure-mgmt-databoxedge = callPackage ../development/python-modules/azure-mgmt-databoxedge { }; + azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { }; azure-mgmt-datalake-analytics = callPackage ../development/python-modules/azure-mgmt-datalake-analytics { }; @@ -758,6 +797,8 @@ in { backports_csv = callPackage ../development/python-modules/backports_csv { }; + backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_lzma = callPackage ../development/python-modules/backports_lzma { }; @@ -868,6 +909,8 @@ in { bitarray = callPackage ../development/python-modules/bitarray { }; + bitbox02 = callPackage ../development/python-modules/bitbox02 { }; + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; @@ -908,6 +951,8 @@ in { blivet = callPackage ../development/python-modules/blivet { }; + blockchain = callPackage ../development/python-modules/blockchain { }; + blockdiag = callPackage ../development/python-modules/blockdiag { }; blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 @@ -1041,7 +1086,9 @@ in { cachy = callPackage ../development/python-modules/cachy { }; - cadquery = callPackage ../development/python-modules/cadquery { }; + cadquery = callPackage ../development/python-modules/cadquery { + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }; caffe = toPythonModule (pkgs.caffe.override { pythonSupport = true; @@ -1106,6 +1153,8 @@ in { cement = callPackage ../development/python-modules/cement { }; + connect-box = callPackage ../development/python-modules/connect_box { }; + cerberus = callPackage ../development/python-modules/cerberus { }; certbot = callPackage ../development/python-modules/certbot { }; @@ -1175,6 +1224,8 @@ in { cirq = callPackage ../development/python-modules/cirq { }; + ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { }; + ciso8601 = callPackage ../development/python-modules/ciso8601 { }; citeproc-py = callPackage ../development/python-modules/citeproc-py { }; @@ -1215,6 +1266,10 @@ in { click-threading = callPackage ../development/python-modules/click-threading { }; + clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {}; + + clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {}; + cliff = callPackage ../development/python-modules/cliff { }; clifford = callPackage ../development/python-modules/clifford { }; @@ -1297,6 +1352,8 @@ in { colour = callPackage ../development/python-modules/colour { }; + commandparse = callPackage ../development/python-modules/commandparse { }; + CommonMark = callPackage ../development/python-modules/commonmark { }; compiledb = callPackage ../development/python-modules/compiledb { }; @@ -1316,6 +1373,8 @@ in { confluent-kafka = callPackage ../development/python-modules/confluent-kafka { }; + confuse = callPackage ../development/python-modules/confuse { }; + connexion = callPackage ../development/python-modules/connexion { }; consonance = callPackage ../development/python-modules/consonance { }; @@ -1346,6 +1405,8 @@ in { cornice = callPackage ../development/python-modules/cornice { }; + coronavirus = callPackage ../development/python-modules/coronavirus { }; + cot = callPackage ../development/python-modules/cot { }; covCore = callPackage ../development/python-modules/cov-core { }; @@ -1385,12 +1446,12 @@ in { cryptacular = callPackage ../development/python-modules/cryptacular { }; cryptography = if isPy27 then - callPackage ../development/python-modules/cryptography/2.9.nix { } + callPackage ../development/python-modules/cryptography/3.3.nix { } else callPackage ../development/python-modules/cryptography { }; cryptography_vectors = if isPy27 then - callPackage ../development/python-modules/cryptography/vectors-2.9.nix { } + callPackage ../development/python-modules/cryptography/vectors-3.3.nix { } else callPackage ../development/python-modules/cryptography/vectors.nix { }; @@ -1452,6 +1513,8 @@ in { daemonize = callPackage ../development/python-modules/daemonize { }; + daemonocle = callPackage ../development/python-modules/daemonocle { }; + daphne = callPackage ../development/python-modules/daphne { }; darcsver = callPackage ../development/python-modules/darcsver { }; @@ -1524,6 +1587,8 @@ in { dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; + dbutils = callPackage ../development/python-modules/dbutils { }; + dcmstack = callPackage ../development/python-modules/dcmstack { }; ddt = callPackage ../development/python-modules/ddt { }; @@ -1775,6 +1840,8 @@ in { dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; + dnachisel = callPackage ../development/python-modules/dnachisel { }; + dnslib = callPackage ../development/python-modules/dnslib { }; dnspython = if isPy3k then @@ -1838,6 +1905,8 @@ in { dropbox = callPackage ../development/python-modules/dropbox { }; + ds-store = callPackage ../development/python-modules/ds-store { }; + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; dtopt = callPackage ../development/python-modules/dtopt { }; @@ -1951,6 +2020,10 @@ in { etelemetry = callPackage ../development/python-modules/etelemetry { }; + etebase = callPackage ../development/python-modules/etebase { + inherit (pkgs.darwin.apple_sdk.frameworks) Security; + }; + etesync = callPackage ../development/python-modules/etesync { }; eth-hash = callPackage ../development/python-modules/eth-hash { }; @@ -1985,8 +2058,6 @@ in { exifread = callPackage ../development/python-modules/exifread { }; - extension-helpers = callPackage ../development/python-modules/extension-helpers { }; - extras = callPackage ../development/python-modules/extras { }; eyeD3 = callPackage ../development/python-modules/eyed3 { }; @@ -2021,6 +2092,8 @@ in { fastcache = callPackage ../development/python-modules/fastcache { }; + fastdiff = callPackage ../development/python-modules/fastdiff { }; + fastdtw = callPackage ../development/python-modules/fastdtw { }; fastecdsa = callPackage ../development/python-modules/fastecdsa { }; @@ -2060,7 +2133,10 @@ in { feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; }; - feedparser = callPackage ../development/python-modules/feedparser { }; + feedparser = if isPy3k then + callPackage ../development/python-modules/feedparser { } + else + callPackage ../development/python-modules/feedparser/5.nix { }; fenics = callPackage ../development/libraries/science/math/fenics { inherit (pkgs) pkg-config; @@ -2100,6 +2176,8 @@ in { fitbit = callPackage ../development/python-modules/fitbit { }; + fixerio = callPackage ../development/python-modules/fixerio { }; + fixtures = callPackage ../development/python-modules/fixtures { }; flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; @@ -2116,6 +2194,8 @@ in { flaky = callPackage ../development/python-modules/flaky { }; + flametree = callPackage ../development/python-modules/flametree { }; + flammkuchen = callPackage ../development/python-modules/flammkuchen { }; flask-admin = callPackage ../development/python-modules/flask-admin { }; @@ -2268,7 +2348,10 @@ in { freetype-py = callPackage ../development/python-modules/freetype-py { }; - freezegun = callPackage ../development/python-modules/freezegun { }; + freezegun = if isPy27 then + callPackage ../development/python-modules/freezegun/0.3.nix { } + else + callPackage ../development/python-modules/freezegun { }; fritzconnection = callPackage ../development/python-modules/fritzconnection { }; @@ -2416,6 +2499,8 @@ in { glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 + glances-api = callPackage ../development/python-modules/glances-api { }; + glasgow = callPackage ../development/python-modules/glasgow { }; glob2 = callPackage ../development/python-modules/glob2 { }; @@ -2444,7 +2529,7 @@ in { goocalendar = callPackage ../development/python-modules/goocalendar { }; - google_api_core = callPackage ../development/python-modules/google_api_core { }; + google-api-core = callPackage ../development/python-modules/google-api-core { }; google_api_python_client = let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; @@ -2461,9 +2546,9 @@ in { googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; - google_apputils = callPackage ../development/python-modules/google_apputils { }; + google-apputils = callPackage ../development/python-modules/google-apputils { }; - google_auth = callPackage ../development/python-modules/google_auth { }; + google-auth = callPackage ../development/python-modules/google-auth { }; google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; @@ -2471,79 +2556,81 @@ in { google-cloud-access-context-manager = callPackage ../development/python-modules/google-cloud-access-context-manager { }; - google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; + google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { }; - google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; + google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { }; - google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { }; + google-cloud-bigquery = callPackage ../development/python-modules/google-cloud-bigquery { }; - google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { }; + google-cloud-bigquery-datatransfer = callPackage ../development/python-modules/google-cloud-bigquery-datatransfer { }; - google_cloud_bigtable = callPackage ../development/python-modules/google_cloud_bigtable { }; + google-cloud-bigtable = callPackage ../development/python-modules/google-cloud-bigtable { }; - google_cloud_container = callPackage ../development/python-modules/google_cloud_container { }; + google-cloud-container = callPackage ../development/python-modules/google-cloud-container { }; - google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; + google-cloud-core = callPackage ../development/python-modules/google-cloud-core { }; - google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { }; + google-cloud-dataproc = callPackage ../development/python-modules/google-cloud-dataproc { }; - google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { }; + google-cloud-datastore = callPackage ../development/python-modules/google-cloud-datastore { }; - google_cloud_dlp = callPackage ../development/python-modules/google_cloud_dlp { }; + google-cloud-dlp = callPackage ../development/python-modules/google-cloud-dlp { }; - google_cloud_dns = callPackage ../development/python-modules/google_cloud_dns { }; + google-cloud-dns = callPackage ../development/python-modules/google-cloud-dns { }; - google_cloud_error_reporting = callPackage ../development/python-modules/google_cloud_error_reporting { }; + google-cloud-error-reporting = callPackage ../development/python-modules/google-cloud-error-reporting { }; - google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { }; + google-cloud-firestore = callPackage ../development/python-modules/google-cloud-firestore { }; google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { }; - google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { }; + google-cloud-iot = callPackage ../development/python-modules/google-cloud-iot { }; - google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { }; + google-cloud-kms = callPackage ../development/python-modules/google-cloud-kms { }; - google_cloud_language = callPackage ../development/python-modules/google_cloud_language { }; + google-cloud-language = callPackage ../development/python-modules/google-cloud-language { }; - google_cloud_logging = callPackage ../development/python-modules/google_cloud_logging { }; + google-cloud-logging = callPackage ../development/python-modules/google-cloud-logging { }; - google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { }; + google-cloud-monitoring = callPackage ../development/python-modules/google-cloud-monitoring { }; google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { }; - google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { }; + google-cloud-os-config = callPackage ../development/python-modules/google-cloud-os-config { }; - google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { }; + google-cloud-pubsub = callPackage ../development/python-modules/google-cloud-pubsub { }; - google_cloud_resource_manager = callPackage ../development/python-modules/google_cloud_resource_manager { }; + google-cloud-redis = callPackage ../development/python-modules/google-cloud-redis { }; - google_cloud_runtimeconfig = callPackage ../development/python-modules/google_cloud_runtimeconfig { }; + google-cloud-resource-manager = callPackage ../development/python-modules/google-cloud-resource-manager { }; - google_cloud_secret_manager = callPackage ../development/python-modules/google_cloud_secret_manager { }; + google-cloud-runtimeconfig = callPackage ../development/python-modules/google-cloud-runtimeconfig { }; - google_cloud_securitycenter = callPackage ../development/python-modules/google_cloud_securitycenter { }; + google-cloud-secret-manager = callPackage ../development/python-modules/google-cloud-secret-manager { }; - google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; + google-cloud-securitycenter = callPackage ../development/python-modules/google-cloud-securitycenter { }; - google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; + google-cloud-spanner = callPackage ../development/python-modules/google-cloud-spanner { }; - google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; + google-cloud-speech = callPackage ../development/python-modules/google-cloud-speech { }; - google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { }; + google-cloud-storage = callPackage ../development/python-modules/google-cloud-storage { }; - google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { }; + google-cloud-tasks = callPackage ../development/python-modules/google-cloud-tasks { }; - google_cloud_texttospeech = callPackage ../development/python-modules/google_cloud_texttospeech { }; + google-cloud-testutils = callPackage ../development/python-modules/google-cloud-testutils { }; - google_cloud_trace = callPackage ../development/python-modules/google_cloud_trace { }; + google-cloud-texttospeech = callPackage ../development/python-modules/google-cloud-texttospeech { }; - google_cloud_translate = callPackage ../development/python-modules/google_cloud_translate { }; + google-cloud-trace = callPackage ../development/python-modules/google-cloud-trace { }; - google_cloud_videointelligence = callPackage ../development/python-modules/google_cloud_videointelligence { }; + google-cloud-translate = callPackage ../development/python-modules/google-cloud-translate { }; - google_cloud_vision = callPackage ../development/python-modules/google_cloud_vision { }; + google-cloud-videointelligence = callPackage ../development/python-modules/google-cloud-videointelligence { }; - google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { }; + google-cloud-vision = callPackage ../development/python-modules/google-cloud-vision { }; + + google-cloud-websecurityscanner = callPackage ../development/python-modules/google-cloud-websecurityscanner { }; google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; @@ -2563,7 +2650,7 @@ in { google-pasta = callPackage ../development/python-modules/google-pasta { }; - google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; + google-resumable-media = callPackage ../development/python-modules/google-resumable-media { }; googletrans = callPackage ../development/python-modules/googletrans { }; @@ -2605,8 +2692,12 @@ in { graph_nets = callPackage ../development/python-modules/graph_nets { }; + graphene = callPackage ../development/python-modules/graphene { }; + graphql-core = callPackage ../development/python-modules/graphql-core { }; + graphql-relay = callPackage ../development/python-modules/graphql-relay { }; + graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; @@ -2765,6 +2856,8 @@ in { hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + hole = callPackage ../development/python-modules/hole { }; + holidays = callPackage ../development/python-modules/holidays { }; holoviews = callPackage ../development/python-modules/holoviews { }; @@ -2800,8 +2893,6 @@ in { html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; - htmltreediff = callPackage ../development/python-modules/htmltreediff { }; - HTSeq = callPackage ../development/python-modules/HTSeq { }; httmock = callPackage ../development/python-modules/httmock { }; @@ -3056,7 +3147,11 @@ in { isodate = callPackage ../development/python-modules/isodate { }; - isort = callPackage ../development/python-modules/isort { }; + isort = if isPy3k then + callPackage ../development/python-modules/isort { } + else + callPackage ../development/python-modules/isort/4.nix { + }; isoweek = callPackage ../development/python-modules/isoweek { }; @@ -3154,12 +3249,16 @@ in { jsondiff = callPackage ../development/python-modules/jsondiff { }; + jsonfield = callPackage ../development/python-modules/jsonfield { }; + jsonlines = callPackage ../development/python-modules/jsonlines { }; jsonmerge = callPackage ../development/python-modules/jsonmerge { }; json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; + json-schema-for-humans = callPackage ../development/python-modules/json-schema-for-humans { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; jsonpatch = callPackage ../development/python-modules/jsonpatch { }; @@ -3186,6 +3285,8 @@ in { jsonschema = callPackage ../development/python-modules/jsonschema { }; + jsonstreams = callPackage ../development/python-modules/jsonstreams { }; + jsonwatch = callPackage ../development/python-modules/jsonwatch { }; jug = callPackage ../development/python-modules/jug { }; @@ -3227,6 +3328,8 @@ in { jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; + jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { }; + jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; @@ -3351,9 +3454,13 @@ in { lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; + ldap = callPackage ../development/python-modules/ldap { + inherit (pkgs) openldap cyrus_sasl; + }; + ldap3 = callPackage ../development/python-modules/ldap3 { }; - ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; + ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; ldappool = callPackage ../development/python-modules/ldappool { }; @@ -3367,10 +3474,16 @@ in { ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + ledgerwallet = callPackage ../development/python-modules/ledgerwallet { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; + }; + lektor = callPackage ../development/python-modules/lektor { }; leveldb = callPackage ../development/python-modules/leveldb { }; + lexid = callPackage ../development/python-modules/lexid { }; + libagent = callPackage ../development/python-modules/libagent { }; pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; @@ -3465,13 +3578,13 @@ in { p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; - broken = (super.meta.broken or false) || pythonAtLeast "3.8"; + broken = super.meta.broken or isPy27; }; })) (p: p.override { enablePython = true; - inherit python; + python3 = python; }) (p: p.py) ]; @@ -3482,7 +3595,10 @@ in { libtmux = callPackage ../development/python-modules/libtmux { }; - libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python; + libtorrent-rasterbar = if isPy27 then + (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python + else + (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; @@ -3533,6 +3649,8 @@ in { linuxfd = callPackage ../development/python-modules/linuxfd { }; + liquidctl = callPackage ../development/python-modules/liquidctl { }; + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; })); littleutils = callPackage ../development/python-modules/littleutils { }; @@ -3553,7 +3671,9 @@ in { llvm = pkgs.llvm_9; }; # llvmlite always requires a specific version of llvm. - lmdb = callPackage ../development/python-modules/lmdb { }; + lmdb = callPackage ../development/python-modules/lmdb { + inherit (pkgs) lmdb; + }; lml = callPackage ../development/python-modules/lml { }; @@ -3619,7 +3739,24 @@ in { macropy = callPackage ../development/python-modules/macropy { }; - maestral = callPackage ../development/python-modules/maestral { }; + maestral = callPackage ../development/python-modules/maestral { + + # https://github.com/SamSchott/maestral/issues/250#issuecomment-739510048 + survey = self.survey.overridePythonAttrs (old: rec { + version = "2.2.1"; + src = old.src.override { + inherit version; + sha256 = "sha256-7ubWkqk1vyaJDLMOuKwUx2Bjziyi3HqpaQq4pKp4Z+0="; + }; + }); + watchdog = self.watchdog.overridePythonAttrs (old: rec { + version = "0.10.3"; + src = old.src.override { + inherit version; + sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04"; + }; + }); + }; magic = callPackage ../development/python-modules/magic { }; @@ -3676,6 +3813,8 @@ in { else callPackage ../development/python-modules/markdown/3_1.nix { }; + markdown-it-py = callPackage ../development/python-modules/markdown-it-py { }; + markdown-macros = callPackage ../development/python-modules/markdown-macros { }; markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript { }; @@ -3740,6 +3879,8 @@ in { mechanize = callPackage ../development/python-modules/mechanize { }; + mediafile = callPackage ../development/python-modules/mediafile { }; + meinheld = callPackage ../development/python-modules/meinheld { }; meld3 = callPackage ../development/python-modules/meld3 { }; @@ -3777,10 +3918,16 @@ in { mido = callPackage ../development/python-modules/mido { }; + milc = callPackage ../development/python-modules/milc { }; + milksnake = callPackage ../development/python-modules/milksnake { }; minidb = callPackage ../development/python-modules/minidb { }; + minidump = callPackage ../development/python-modules/minidump { }; + + minikerberos = callPackage ../development/python-modules/minikerberos { }; + minimock = callPackage ../development/python-modules/minimock { }; mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py; @@ -3813,6 +3960,8 @@ in { mnemonic = callPackage ../development/python-modules/mnemonic { }; + mne-python = callPackage ../development/python-modules/mne-python { }; + mnist = callPackage ../development/python-modules/mnist { }; mocket = callPackage ../development/python-modules/mocket { }; @@ -4057,6 +4206,8 @@ in { netcdf4 = callPackage ../development/python-modules/netcdf4 { }; + netdata = callPackage ../development/python-modules/netdata { }; + netdisco = callPackage ../development/python-modules/netdisco { }; netifaces = callPackage ../development/python-modules/netifaces { }; @@ -4131,6 +4282,8 @@ in { noise = callPackage ../development/python-modules/noise { }; + noiseprotocol = callPackage ../development/python-modules/noiseprotocol { }; + nose2 = callPackage ../development/python-modules/nose2 { }; nose = callPackage ../development/python-modules/nose { }; @@ -4291,6 +4444,8 @@ in { openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { }; + opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; @@ -4342,7 +4497,9 @@ in { oyaml = callPackage ../development/python-modules/oyaml { }; - packaging = callPackage ../development/python-modules/packaging { }; + packaging = if isPy3k + then callPackage ../development/python-modules/packaging { } + else callPackage ../development/python-modules/packaging/2.nix { }; packet-python = callPackage ../development/python-modules/packet-python { }; @@ -4453,6 +4610,8 @@ in { pathtools = callPackage ../development/python-modules/pathtools { }; + patiencediff = callPackage ../development/python-modules/patiencediff { }; + patool = callPackage ../development/python-modules/patool { }; patsy = callPackage ../development/python-modules/patsy { }; @@ -4548,6 +4707,8 @@ in { phpserialize = callPackage ../development/python-modules/phpserialize { }; + phx-class-registry = callPackage ../development/python-modules/phx-class-registry { }; + piccata = callPackage ../development/python-modules/piccata { }; pickleshare = callPackage ../development/python-modules/pickleshare { }; @@ -4603,16 +4764,22 @@ in { inherit (pkgs.libsForQt5) soqt; }; - pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; }; pkginfo = callPackage ../development/python-modules/pkginfo { }; pkuseg = callPackage ../development/python-modules/pkuseg { }; + pysbd = callPackage ../development/python-modules/pysbd { }; + + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; + python-csxcad = callPackage ../development/python-modules/python-csxcad { }; python-openems = callPackage ../development/python-modules/python-openems { }; + python-tado = callPackage ../development/python-modules/python-tado { }; + pkutils = callPackage ../development/python-modules/pkutils { }; plac = callPackage ../development/python-modules/plac { }; @@ -4728,6 +4895,8 @@ in { pre-commit = callPackage ../development/python-modules/pre-commit { }; + pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { }; + preggy = callPackage ../development/python-modules/preggy { }; premailer = callPackage ../development/python-modules/premailer { }; @@ -4736,7 +4905,10 @@ in { pretend = callPackage ../development/python-modules/pretend { }; - prettytable = callPackage ../development/python-modules/prettytable { }; + prettytable = if isPy3k then + callPackage ../development/python-modules/prettytable { } + else + callPackage ../development/python-modules/prettytable/1.nix { }; priority = callPackage ../development/python-modules/priority { }; @@ -4841,6 +5013,10 @@ in { pxml = callPackage ../development/python-modules/pxml { }; + py-air-control = callPackage ../development/python-modules/py-air-control { }; + + py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { }; + py2bit = callPackage ../development/python-modules/py2bit { }; py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); @@ -4873,6 +5049,8 @@ in { pyannotate = callPackage ../development/python-modules/pyannotate { }; + pyarlo = callPackage ../development/python-modules/pyarlo { }; + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; }; pyasn1 = callPackage ../development/python-modules/pyasn1 { }; @@ -4994,12 +5172,16 @@ in { pycurl = callPackage ../development/python-modules/pycurl { }; + pycxx = callPackage ../development/python-modules/pycxx { }; + pydantic = callPackage ../development/python-modules/pydantic { }; pydbus = callPackage ../development/python-modules/pydbus { }; pydenticon = callPackage ../development/python-modules/pydenticon { }; + pydexcom = callPackage ../development/python-modules/pydexcom { }; + pydicom = callPackage ../development/python-modules/pydicom { }; pydispatcher = callPackage ../development/python-modules/pydispatcher { }; @@ -5040,6 +5222,8 @@ in { pyepsg = callPackage ../development/python-modules/pyepsg { }; + pyerfa = callPackage ../development/python-modules/pyerfa { }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; @@ -5084,6 +5268,8 @@ in { pyfttt = callPackage ../development/python-modules/pyfttt { }; + pyfuse3 = callPackage ../development/python-modules/pyfuse3 { }; + pyfxa = callPackage ../development/python-modules/pyfxa { }; pygal = callPackage ../development/python-modules/pygal { }; @@ -5123,7 +5309,10 @@ in { pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }; + pygobject3 = if isPy3k then + callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; } + else + callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson pkgconfig; }; pygogo = callPackage ../development/python-modules/pygogo { }; @@ -5165,6 +5354,8 @@ in { pyhs100 = callPackage ../development/python-modules/pyhs100 { }; + pyi2cflash = callPackage ../development/python-modules/pyi2cflash { }; + pyicloud = callPackage ../development/python-modules/pyicloud { }; PyICU = callPackage ../development/python-modules/pyicu { }; @@ -5175,7 +5366,7 @@ in { pyipp = callPackage ../development/python-modules/pyipp { }; - pyjade = callPackage ../development/python-modules/pyjade { }; + pyiqvia = callPackage ../development/python-modules/pyiqvia { }; pyjet = callPackage ../development/python-modules/pyjet { }; @@ -5201,6 +5392,8 @@ in { pykwalify = callPackage ../development/python-modules/pykwalify { }; + pylacrosse = callPackage ../development/python-modules/pylacrosse { }; + pylama = callPackage ../development/python-modules/pylama { }; pylast = callPackage ../development/python-modules/pylast { }; @@ -5211,7 +5404,10 @@ in { pylev = callPackage ../development/python-modules/pylev { }; - pylibacl = callPackage ../development/python-modules/pylibacl { }; + pylibacl = if isPy3k then + callPackage ../development/python-modules/pylibacl { } + else + callPackage ../development/python-modules/pylibacl/0.5.nix { }; pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; @@ -5276,6 +5472,8 @@ in { pymetno = callPackage ../development/python-modules/pymetno { }; + pymodbus = callPackage ../development/python-modules/pymodbus { }; + pymongo = callPackage ../development/python-modules/pymongo { }; pympler = callPackage ../development/python-modules/pympler { }; @@ -5312,6 +5510,8 @@ in { pync = callPackage ../development/python-modules/pync { }; + pynest2d = callPackage ../development/python-modules/pynest2d { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pynmea2 = callPackage ../development/python-modules/pynmea2 { }; @@ -5347,8 +5547,12 @@ in { pyopengl = callPackage ../development/python-modules/pyopengl { }; + pyopengl-accelerate = callPackage ../development/python-modules/pyopengl-accelerate { }; + pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyosf = callPackage ../development/python-modules/pyosf { }; + pyosmium = callPackage ../development/python-modules/pyosmium { }; pyotp = callPackage ../development/python-modules/pyotp { }; @@ -5406,6 +5610,8 @@ in { pypubsub = callPackage ../development/python-modules/pypubsub { }; + pypugjs = callPackage ../development/python-modules/pypugjs { }; + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; @@ -5579,6 +5785,8 @@ in { pyspice = callPackage ../development/python-modules/pyspice { }; + pyspiflash = callPackage ../development/python-modules/pyspiflash { }; + pyspinel = callPackage ../development/python-modules/pyspinel { }; pyspotify = callPackage ../development/python-modules/pyspotify { }; @@ -5587,6 +5795,10 @@ in { pysptk = callPackage ../development/python-modules/pysptk { }; + pysqlcipher3 = callPackage ../development/python-modules/pysqlcipher3 { + inherit (pkgs) sqlcipher; + }; + pysqlite = callPackage ../development/python-modules/pysqlite { }; pysqueezebox = callPackage ../development/python-modules/pysqueezebox { }; @@ -5609,7 +5821,11 @@ in { pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pysvn = callPackage ../development/python-modules/pysvn { }; + pysvn = callPackage ../development/python-modules/pysvn { + inherit (pkgs) bash subversion apr aprutil expat neon openssl; + }; + + pysychonaut = callPackage ../development/python-modules/pysychonaut { }; pytabix = callPackage ../development/python-modules/pytabix { }; @@ -5624,7 +5840,7 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; # pytest>=6 is too new for most packages - pytest = if isPy3k then self.pytest_5 else self.pytest_4; + pytest = if isPy3k then self.pytest_6 else self.pytest_4; pytest_4 = callPackage ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle @@ -5661,14 +5877,18 @@ in { pytest-black = callPackage ../development/python-modules/pytest-black { }; + pytest-cache = self.pytestcache; # added 2021-01-04 pytestcache = callPackage ../development/python-modules/pytestcache { }; pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; + pytest-celery = callPackage ../development/python-modules/pytest-celery { }; + pytest-check = callPackage ../development/python-modules/pytest-check { }; pytest-click = callPackage ../development/python-modules/pytest-click { }; + pytest-cov = self.pytestcov; # self 2021-01-04 pytestcov = callPackage ../development/python-modules/pytest-cov { }; pytest-cram = callPackage ../development/python-modules/pytest-cram { }; @@ -5705,8 +5925,6 @@ in { pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; - pyopengl-accelerate = callPackage ../development/python-modules/pyopengl-accelerate { }; - pytest-html = callPackage ../development/python-modules/pytest-html { }; pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; @@ -5734,7 +5952,8 @@ in { pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; + pytest-pep8 = self.pytestpep8; # added 2021-01-04 + pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; @@ -5742,6 +5961,7 @@ in { pytest-qt = callPackage ../development/python-modules/pytest-qt { }; + pytest-quickcheck = self.pytestquickcheck; pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; @@ -5758,6 +5978,7 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; + pytest-runner = self.pytestrunner; # added 2021-01-04 pytestrunner = callPackage ../development/python-modules/pytestrunner { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; @@ -5766,12 +5987,16 @@ in { pytest-services = callPackage ../development/python-modules/pytest-services { }; + pytest-snapshot = callPackage ../development/python-modules/pytest-snapshot { }; + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; pytest-socket = callPackage ../development/python-modules/pytest-socket { }; pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; + pytest-subtests = callPackage ../development/python-modules/pytest-subtests { }; + pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; @@ -5792,11 +6017,11 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; - - pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; - - pytest_xdist = self.pytest_xdist_1; + pytest-xdist = self.pytest_xdist; # added 2021-01-04 + pytest_xdist = if isPy27 then + callPackage ../development/python-modules/pytest-xdist/1.nix { } + else + callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; @@ -5854,6 +6079,8 @@ in { python-forecastio = callPackage ../development/python-modules/python-forecastio { }; + python-frontmatter = callPackage ../development/python-modules/python-frontmatter { }; + python-gitlab = callPackage ../development/python-modules/python-gitlab { }; python-gnupg = callPackage ../development/python-modules/python-gnupg { }; @@ -5867,7 +6094,10 @@ in { pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; - pythonix = callPackage ../development/python-modules/pythonix { inherit (pkgs) meson pkgconfig; }; + pythonix = callPackage ../development/python-modules/pythonix { + inherit (pkgs) pkg-config; + meson = pkgs.meson.override { python3 = self.python; }; + }; python-jenkins = callPackage ../development/python-modules/python-jenkins { }; @@ -5913,6 +6143,8 @@ in { python-multipart = callPackage ../development/python-modules/python-multipart { }; + python-mystrom = callPackage ../development/python-modules/python-mystrom { }; + python-nest = callPackage ../development/python-modules/python-nest { }; pythonnet = callPackage @@ -5925,11 +6157,15 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; - pythonocc-core = - toPythonModule (callPackage ../development/python-modules/pythonocc-core { inherit (pkgs.xorg) libX11; }); + pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { + inherit (pkgs.xorg) libX11; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }); python-olm = callPackage ../development/python-modules/python-olm { }; + python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; }; python-otr = callPackage ../development/python-modules/python-otr { }; @@ -5999,10 +6235,16 @@ in { python-vlc = callPackage ../development/python-modules/python-vlc { }; + python-whois = callPackage ../development/python-modules/python-whois { }; + python-wifi = callPackage ../development/python-modules/python-wifi { }; python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + pyeverlights = callPackage ../development/python-modules/pyeverlights { }; + + pytile = callPackage ../development/python-modules/pytile { }; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; pytmx = callPackage ../development/python-modules/pytmx { }; @@ -6097,8 +6339,12 @@ in { pywick = callPackage ../development/python-modules/pywick { }; + pywilight = callPackage ../development/python-modules/pywilight { }; + pywinrm = callPackage ../development/python-modules/pywinrm { }; + pywizlight = callPackage ../development/python-modules/pywizlight { }; + pyxattr = let pyxattr' = callPackage ../development/python-modules/pyxattr { }; pyxattr_2 = pyxattr'.overridePythonAttrs (oldAttrs: rec { @@ -6126,7 +6372,7 @@ in { pyzufall = callPackage ../development/python-modules/pyzufall { }; - qasm2image = callPackage ../development/python-modules/qasm2image { }; + qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; @@ -6213,6 +6459,8 @@ in { rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; + re-assert = callPackage ../development/python-modules/re-assert { }; + readchar = callPackage ../development/python-modules/readchar { }; readme = callPackage ../development/python-modules/readme { }; @@ -6235,6 +6483,8 @@ in { reedsolo = callPackage ../development/python-modules/reedsolo { }; + reflink = callPackage ../development/python-modules/reflink { }; + regex = callPackage ../development/python-modules/regex { }; regional = callPackage ../development/python-modules/regional { }; @@ -6456,6 +6706,10 @@ in { salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + sane = callPackage ../development/python-modules/sane { + inherit (pkgs) saneBackends; + }; + sampledata = callPackage ../development/python-modules/sampledata { }; samplerate = callPackage ../development/python-modules/samplerate { }; @@ -6486,6 +6740,8 @@ in { schema = callPackage ../development/python-modules/schema { }; + schiene = callPackage ../development/python-modules/schiene { }; + scikit-bio = callPackage ../development/python-modules/scikit-bio { }; scikit-build = callPackage ../development/python-modules/scikit-build { }; @@ -6568,6 +6824,8 @@ in { seabreeze = callPackage ../development/python-modules/seabreeze { }; + seccomp = callPackage ../development/python-modules/seccomp { }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; }; secretstorage = if isPy3k then @@ -6630,6 +6888,7 @@ in { setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; + setuptools-scm = self.setuptools_scm; # added 2021-01-04 setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; @@ -6640,6 +6899,8 @@ in { sfepy = callPackage ../development/python-modules/sfepy { }; + sgmllib3k = callPackage ../development/python-modules/sgmllib3k { }; + shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; shap = callPackage ../development/python-modules/shap { }; @@ -6765,6 +7026,8 @@ in { snapperGUI = callPackage ../development/python-modules/snappergui { }; + snapshottest = callPackage ../development/python-modules/snapshottest { }; + sniffio = callPackage ../development/python-modules/sniffio { }; snitun = callPackage ../development/python-modules/snitun { }; @@ -6935,6 +7198,7 @@ in { sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { }; sqlite-utils = callPackage ../development/python-modules/sqlite-utils { }; sqlmap = callPackage ../development/python-modules/sqlmap { }; @@ -6973,7 +7237,9 @@ in { stack-data = callPackage ../development/python-modules/stack-data { }; - starlette = callPackage ../development/python-modules/starlette { }; + starlette = callPackage ../development/python-modules/starlette { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; + }; staticjinja = callPackage ../development/python-modules/staticjinja { }; @@ -7045,6 +7311,8 @@ in { sure = callPackage ../development/python-modules/sure { }; + survey = callPackage ../development/python-modules/survey { }; + suseapi = callPackage ../development/python-modules/suseapi { }; svg2tikz = callPackage ../development/python-modules/svg2tikz { }; @@ -7103,7 +7371,9 @@ in { telegram = callPackage ../development/python-modules/telegram { }; - telethon = callPackage ../development/python-modules/telethon { }; + telethon = callPackage ../development/python-modules/telethon { + inherit (pkgs) openssl; + }; telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; @@ -7115,62 +7385,39 @@ in { tensorboardx = callPackage ../development/python-modules/tensorboardx { }; - tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; - }; - - tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/2/bin.nix { + tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; + cudatoolkit = pkgs.cudatoolkit_11_0; + cudnn = pkgs.cudnn_cudatoolkit_11_0; }; - tensorflow-bin = self.tensorflow-bin_1; + tensorflow-bin = self.tensorflow-bin_2; - tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 { + tensorflow-build_2 = callPackage ../development/python-modules/tensorflow { cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; - nccl = pkgs.nccl_cudatoolkit_10; - openssl = pkgs.openssl_1_1; - inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; - inherit (pkgs) flatbuffers; - }; - - tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 { - cudaSupport = pkgs.config.cudaSupport or false; - cudatoolkit = pkgs.cudatoolkit_11; - cudnn = pkgs.cudnn_cudatoolkit_11; + cudatoolkit = pkgs.cudatoolkit_11_0; + cudnn = pkgs.cudnn_cudatoolkit_11_0; nccl = pkgs.nccl_cudatoolkit_11; openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; inherit (pkgs) flatbuffers; }; - tensorflow-build = self.tensorflow-build_1; - - tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; + tensorflow-build = self.tensorflow-build_2; - tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; + tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator { }; - tensorflow-estimator = self.tensorflow-estimator_1; + tensorflow-estimator = self.tensorflow-estimator_2; tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; - tensorflow = self.tensorflow_1; - tensorflow_1 = self.tensorflow-build_1; + tensorflow = self.tensorflow_2; tensorflow_2 = self.tensorflow-build_2; - tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; + tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard { }; - tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; - - tensorflow-tensorboard = self.tensorflow-tensorboard_1; + tensorflow-tensorboard = self.tensorflow-tensorboard_2; tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; @@ -7186,6 +7433,8 @@ in { termstyle = callPackage ../development/python-modules/termstyle { }; + teslajsonpy = callPackage ../development/python-modules/teslajsonpy { }; + tess = callPackage ../development/python-modules/tess { }; tesserocr = callPackage ../development/python-modules/tesserocr { }; @@ -7270,6 +7519,8 @@ in { tinydb = callPackage ../development/python-modules/tinydb { }; + tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; + tiros = callPackage ../development/python-modules/tiros { }; tissue = callPackage ../development/python-modules/tissue { }; @@ -7338,7 +7589,10 @@ in { trackpy = callPackage ../development/python-modules/trackpy { }; - traitlets = callPackage ../development/python-modules/traitlets { }; + traitlets = if pythonOlder "3.7" then + callPackage ../development/python-modules/traitlets/4.nix { } + else + callPackage ../development/python-modules/traitlets { }; traits = callPackage ../development/python-modules/traits { }; @@ -7508,6 +7762,8 @@ in { unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; + unrardll = callPackage ../development/python-modules/unrardll { }; + unrpa = callPackage ../development/python-modules/unrpa { }; untangle = callPackage ../development/python-modules/untangle { }; @@ -7520,9 +7776,9 @@ in { update-dotdee = callPackage ../development/python-modules/update-dotdee { }; - uproot = callPackage ../development/python-modules/uproot { }; + uproot3 = callPackage ../development/python-modules/uproot3 { }; - uproot-methods = callPackage ../development/python-modules/uproot-methods { }; + uproot3-methods = callPackage ../development/python-modules/uproot3-methods { }; uptime = callPackage ../development/python-modules/uptime { }; @@ -7598,6 +7854,8 @@ in { vidstab = callPackage ../development/python-modules/vidstab { }; + ViennaRNA = toPythonModule pkgs.ViennaRNA; + viewstate = callPackage ../development/python-modules/viewstate { }; vine = callPackage ../development/python-modules/vine { }; @@ -7618,8 +7876,12 @@ in { vmprof = callPackage ../development/python-modules/vmprof { }; + vncdo = callPackage ../development/python-modules/vncdo { }; + vobject = callPackage ../development/python-modules/vobject { }; + volkszaehler = callPackage ../development/python-modules/volkszaehler { }; + voluptuous = callPackage ../development/python-modules/voluptuous { }; voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; @@ -7630,8 +7892,17 @@ in { vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; - vtk = toPythonModule (pkgs.vtk_7.override { - inherit (self) python; + vtk = self.vtk_7; + vtk_7 = toPythonModule (pkgs.vtk_7.override { + pythonInterpreter = python; + enablePython = true; + }); + vtk_8 = toPythonModule (pkgs.vtk_8.override { + pythonInterpreter = python; + enablePython = true; + }); + vtk_9 = toPythonModule (pkgs.vtk_9.override { + pythonInterpreter = python; enablePython = true; }); @@ -7641,6 +7912,8 @@ in { vxi11 = callPackage ../development/python-modules/vxi11 { }; + vyper = callPackage ../development/compilers/vyper { }; + w3lib = callPackage ../development/python-modules/w3lib { }; wadllib = callPackage ../development/python-modules/wadllib { }; @@ -7659,6 +7932,8 @@ in { wasabi = callPackage ../development/python-modules/wasabi { }; + wasmer = callPackage ../development/python-modules/wasmer { }; + watchdog = callPackage ../development/python-modules/watchdog { }; WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; @@ -7695,6 +7970,8 @@ in { webtest = callPackage ../development/python-modules/webtest { }; + webthing = callPackage ../development/python-modules/webthing { }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; west = callPackage ../development/python-modules/west { }; @@ -7711,12 +7988,18 @@ in { whitenoise = callPackage ../development/python-modules/whitenoise { }; + whois = callPackage ../development/python-modules/whois { }; + whoosh = callPackage ../development/python-modules/whoosh { }; widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; willow = callPackage ../development/python-modules/willow { }; + winacl = callPackage ../development/python-modules/winacl { }; + + winsspi = callPackage ../development/python-modules/winsspi { }; + wled = callPackage ../development/python-modules/wled { }; word2vec = callPackage ../development/python-modules/word2vec { }; @@ -7729,6 +8012,8 @@ in { wptserve = callPackage ../development/python-modules/wptserve { }; + wrapio = callPackage ../development/python-modules/wrapio { }; + wrapt = callPackage ../development/python-modules/wrapt { }; wrf-python = callPackage ../development/python-modules/wrf-python { }; @@ -7743,6 +8028,8 @@ in { WSME = callPackage ../development/python-modules/WSME { }; + wsnsimpy = callPackage ../development/python-modules/wsnsimpy { }; + wsproto = if (pythonAtLeast "3.6") then callPackage ../development/python-modules/wsproto { } else diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index 7479377bd3026..5e309a0129c35 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -9,7 +9,7 @@ let blasUsers = [ # "julia_07" "julia_10" "julia_11" "julia_13" "octave" "octaveFull" "fflas-ffpack" "linbox" "R" "ipopt" "hpl" "rspamd" "octopus" - "sundials" "sundials_2" "superlu" "suitesparse_5_3" "suitesparse_4_4" + "sundials" "superlu" "suitesparse_5_3" "suitesparse_4_4" "suitesparse_4_2" "scs" "scalapack" "petsc" "cholmod-extra" "arpack" "qrupdate" "libcint" "iml" "globalarrays" "arrayfire" "armadillo" "xfitter" "lammps" "plink-ng" "quantum-espresso" "siesta" diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 1e33c7b0585b7..411093186a6ca 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -142,15 +142,13 @@ rec { /* Recursively map a (nested) set of derivations to an isomorphic set of meta.platforms values. */ packagePlatforms = mapAttrs (name: value: - let res = builtins.tryEval ( if isDerivation value then value.meta.hydraPlatforms or (value.meta.platforms or [ "x86_64-linux" ]) else if value.recurseForDerivations or false || value.recurseForRelease or false then packagePlatforms value else - []); - in if res.success then res.value else [] + [] ); diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 58b0300cc79ce..8fc460ca52278 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -200,6 +200,9 @@ let then self else import ./stage.nix (args // { overlays = args.overlays ++ extraOverlays; }); + # NOTE: each call to extend causes a full nixpkgs rebuild, adding ~130MB + # of allocations. DO NOT USE THIS IN NIXPKGS. + # # Extend the package set with a single overlay. This preserves # preexisting overlays. Prefer to initialize with the right overlays # in one go when calling Nixpkgs, for performance and simplicity. diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index b3851ba20f09c..48e4618762a67 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -34,14 +34,18 @@ self: super: let }); }; - staticAdapters = [ makeStaticLibraries propagateBuildInputs ] + staticAdapters = + # makeStaticDarwin must go first so that the extraBuildInputs + # override does not recreate mkDerivation, removing subsequent + # adapters. + optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin + + ++ [ makeStaticLibraries propagateBuildInputs ] # Apple does not provide a static version of libSystem or crt0.o # So we can’t build static binaries without extensive hacks. ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries - ++ optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin - # Glibc doesn’t come with static runtimes by default. # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) ; @@ -104,214 +108,27 @@ in { haskellStaticAdapter; }; - nghttp2 = super.nghttp2.override { - enableApp = false; - }; - - ncurses = super.ncurses.override { - enableStatic = true; - }; - libxml2 = super.libxml2.override ({ - enableShared = false; - enableStatic = true; - } // optionalAttrs super.stdenv.hostPlatform.isDarwin { - pythonSupport = false; - }); zlib = super.zlib.override { - static = true; - shared = false; - splitStaticOutput = false; - # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag stdenv = super.stdenv; }; - xz = super.xz.override { - enableStatic = true; - }; - busybox = super.busybox.override { - enableStatic = true; - }; - libiberty = super.libiberty.override { - staticBuild = true; - }; - libpfm = super.libpfm.override { - enableShared = false; - }; - ipmitool = super.ipmitool.override { - static = true; - }; - neon = super.neon.override { - static = true; - shared = false; - }; - fmt = super.fmt.override { - enableShared = false; - }; - gifsicle = super.gifsicle.override { - static = true; - }; - bzip2 = super.bzip2.override { - linkStatic = true; - }; - optipng = super.optipng.override { - static = true; - }; - openblas = super.openblas.override { - enableStatic = true; - enableShared = false; - }; - mkl = super.mkl.override { enableStatic = true; }; - nix = super.nix.override { enableStatic = true; }; - openssl = (super.openssl_1_1.override { static = true; }).overrideAttrs (o: { + openssl = super.openssl_1_1.overrideAttrs (o: { # OpenSSL doesn't like the `--enable-static` / `--disable-shared` flags. configureFlags = (removeUnknownConfigureFlags o.configureFlags); }); - arrow-cpp = super.arrow-cpp.override { - enableShared = false; - }; boost = super.boost.override { - enableStatic = true; - enableShared = false; - # Don’t use new stdenv for boost because it doesn’t like the # --disable-shared flag stdenv = super.stdenv; }; - thrift = super.thrift.override { - static = true; - twisted = null; - }; - gmp = super.gmp.override { - withStatic = true; - }; - gflags = super.gflags.override { - enableShared = false; - }; - cdo = super.cdo.override { - enable_all_static = true; - }; - gsm = super.gsm.override { - staticSupport = true; - }; - crc32c = super.crc32c.override { - staticOnly = true; - }; - parted = super.parted.override { - enableStatic = true; - }; - libiconvReal = super.libiconvReal.override { - enableShared = false; - enableStatic = true; - }; perl = super.perl.override { # Don’t use new stdenv zlib because # it doesn’t like the --disable-shared flag stdenv = super.stdenv; }; - woff2 = super.woff2.override { - static = true; - }; - snappy = super.snappy.override { - static = true; - }; - lz4 = super.lz4.override { - enableShared = false; - enableStatic = true; - }; - libressl = super.libressl.override { - buildShared = false; - }; - libjpeg_turbo = super.libjpeg_turbo.override { - enableStatic = true; - enableShared = false; - }; - - darwin = super.darwin // { - libiconv = super.darwin.libiconv.override { - enableShared = false; - enableStatic = true; - }; - }; - - kmod = super.kmod.override { - withStatic = true; - }; - - curl = super.curl.override { - # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 - gssSupport = false; - }; - - e2fsprogs = super.e2fsprogs.override { - shared = false; - }; - - brotli = super.brotli.override { - staticOnly = true; - }; - - zstd = super.zstd.override { - static = true; - }; - - llvmPackages_8 = super.llvmPackages_8 // { - libraries = super.llvmPackages_8.libraries // rec { - libcxxabi = super.llvmPackages_8.libraries.libcxxabi.override { - enableShared = false; - }; - libcxx = super.llvmPackages_8.libraries.libcxx.override { - enableShared = false; - inherit libcxxabi; - }; - libunwind = super.llvmPackages_8.libraries.libunwind.override { - enableShared = false; - }; - }; - }; ocaml-ng = self.lib.mapAttrs (_: set: if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; - - python27 = super.python27.override { static = true; }; - python36 = super.python36.override { static = true; }; - python37 = super.python37.override { static = true; }; - python38 = super.python38.override { static = true; }; - python39 = super.python39.override { static = true; }; - python3Minimal = super.python3Minimal.override { static = true; }; - - - libev = super.libev.override { static = true; }; - - libexecinfo = super.libexecinfo.override { enableShared = false; }; - - tree-sitter = super.tree-sitter.override { - enableShared = false; - enableStatic = true; - }; - - xorg = super.xorg.overrideScope' (xorgself: xorgsuper: { - libX11 = xorgsuper.libX11.overrideAttrs (attrs: { - depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ]; - }); - xauth = xorgsuper.xauth.overrideAttrs (attrs: { - # missing transitive dependencies - preConfigure = attrs.preConfigure or "" + '' - export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" - ''; - }); - xdpyinfo = xorgsuper.xdpyinfo.overrideAttrs (attrs: { - # missing transitive dependencies - preConfigure = attrs.preConfigure or "" + '' - export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp" - ''; - }); - libxcb = xorgsuper.libxcb.overrideAttrs (attrs: { - configureFlags = attrs.configureFlags ++ [ "--disable-shared" ]; - }); - libXi= xorgsuper.libXi.overrideAttrs (attrs: { - configureFlags = attrs.configureFlags ++ [ "--disable-shared" ]; - }); - }); } |