diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 876 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/kodi-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/metrics.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/nim-packages.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/octave-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 38 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 183 | ||||
| -rw-r--r-- | pkgs/top-level/python2-packages.nix | 13 |
15 files changed, 785 insertions, 440 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dafbd0c6d30..9767edf86b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -54,7 +54,8 @@ mapAliases ({ ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06 - antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 + antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # added 2020-08-06 + antimicroX = antimicrox; # added 2021-10-31 arduino_core = arduino-core; # added 2015-02-04 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28 arora = throw "arora has been removed."; # added 2020-09-09 @@ -76,6 +77,7 @@ mapAliases ({ bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22 beegfs = throw "beegfs has been removed."; # added 2019-11-24 + beret = throw "beret has been removed"; # added 2021-11-16 bluezFull = bluez; # Added 2019-12-03 bpftool = bpftools; # Added 2021-05-03 brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # added 2021-01-24 @@ -202,6 +204,8 @@ mapAliases ({ dnnl = oneDNN; # added 2020-04-22 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25 + dolphinEmu = dolphin-emu; # added 2021-11-10 + dolphinEmuMaster = dolphin-emu-beta; # added 2021-11-10 dotnet-netcore = dotnet-runtime; # added 2021-10-07 double_conversion = double-conversion; # 2017-11-22 docker_compose = docker-compose; # 2018-11-10 @@ -224,6 +228,7 @@ mapAliases ({ emacsPackages = emacs.pkgs; # added 2020-12-18 enblendenfuse = enblend-enfuse; # 2015-09-30 envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 + epoxy = libepoxy; # 2021-11-11 esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 @@ -376,6 +381,7 @@ mapAliases ({ joseki = apache-jena-fuseki; # added 2016-02-28 jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 json_glib = json-glib; # added 2018-02-25 + kafkacat = kcat; # added 2021-10-07 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 @@ -459,7 +465,6 @@ mapAliases ({ linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; - linuxPackages_rt_5_11 = linuxKernel.packages.linux_rt_5_11; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; @@ -472,6 +477,7 @@ mapAliases ({ linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_14 = linuxKernel.packages.linux_5_14; + linuxPackages_5_15 = linuxKernel.packages.linux_5_15; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -486,8 +492,8 @@ mapAliases ({ linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; linux_5_10 = linuxKernel.kernels.linux_5_10; linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; - linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; linux_5_14 = linuxKernel.kernels.linux_5_14; + linux_5_15 = linuxKernel.kernels.linux_5_15; # added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; @@ -571,6 +577,7 @@ mapAliases ({ mssys = ms-sys; # added 2015-12-13 mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22 multipath_tools = multipath-tools; # added 2016-01-21 + mumsi = throw "mumsi has been removed from nixpkgs, as it's unmaintained and does not build anymore"; # added 2021-11-18 mupen64plus1_5 = mupen64plus; # added 2016-02-12 mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15 mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 @@ -590,6 +597,7 @@ mapAliases ({ nfsUtils = nfs-utils; # added 2014-12-06 nginxUnstable = nginxMainline; # added 2018-04-25 nilfs_utils = nilfs-utils; # added 2018-04-25 + nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # added 2019-12-22 nixFlakes = nixStable; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 @@ -781,9 +789,10 @@ mapAliases ({ qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # added 2021-02-15 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 - ring-daemon = jami-daemon; #added 2021-10-26 + ring-daemon = jami-daemon; # added 2021-10-26 radare2-cutter = cutter; # added 2021-03-30 redkite = throw "redkite was archived by upstream"; # added 2021-04-12 + retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # added 2021-11-19 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 rpiboot-unstable = rpiboot; # added 2021-07-30 rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # added 2021-08-08 @@ -887,6 +896,7 @@ mapAliases ({ stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09 surf-webkit2 = surf; # added 2017-04-02 + svgcleaner = throw "svgcleaner has been removed."; # added 2021-11-17 swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14 swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 swtpm-tpm2 = swtpm; # added 2021-02-26 @@ -985,6 +995,7 @@ mapAliases ({ wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; # added 2021-11-19 xp-pen-g430 = pentablet-driver; # added 2020-05-03 xdg_utils = xdg-utils; # added 2021-02-01 xfceUnstable = xfce4-14; # added 2019-09-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46874715ed3..8c5d52aab07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -259,7 +259,9 @@ with pkgs; clj-kondo = callPackage ../development/tools/clj-kondo { }; - cloak = callPackage ../applications/misc/cloak { }; + cloak = callPackage ../applications/misc/cloak { + inherit (darwin.apple_sdk.frameworks) Security; + }; cmark = callPackage ../development/libraries/cmark { }; @@ -321,7 +323,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; - mix2nix = callPackage ../development/tools/mix2nix/default.nix { }; + mix2nix = callPackage ../development/tools/mix2nix { }; prisma-engines = callPackage ../development/tools/database/prisma-engines { inherit (darwin.apple_sdk.frameworks) Security; @@ -422,9 +424,9 @@ with pkgs; dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; dotnet-sdk_6 = dotnetCorePackages.sdk_6_0; - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-runtime = dotnetCorePackages.runtime_5_0; - dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0; dumb-init = callPackage ../applications/virtualization/dumb-init {}; @@ -493,7 +495,7 @@ with pkgs; prefer-remote-fetch = import ../build-support/prefer-remote-fetch; - global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { }; + global-platform-pro = callPackage ../development/tools/global-platform-pro { }; graph-easy = callPackage ../tools/graphics/graph-easy { }; @@ -862,6 +864,8 @@ with pkgs; aescrypt = callPackage ../tools/misc/aescrypt { }; + aether-lv2 = callPackage ../applications/audio/aether-lv2 { }; + acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; adriconf = callPackage ../tools/graphics/adriconf { }; @@ -982,6 +986,8 @@ with pkgs; tnat64 = callPackage ../tools/networking/tnat64 { }; + topicctl = callPackage ../tools/misc/topicctl { }; + veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; @@ -1040,6 +1046,8 @@ with pkgs; hyper = callPackage ../applications/terminal-emulators/hyper { }; + iqueue = callPackage ../development/libraries/iqueue {}; + iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; kitty = callPackage ../applications/terminal-emulators/kitty { @@ -1273,7 +1281,9 @@ with pkgs; argyllcms = callPackage ../tools/graphics/argyllcms {}; - arj = callPackage ../tools/archivers/arj { }; + arj = callPackage ../tools/archivers/arj { + stdenv = gccStdenv; + }; arp-scan = callPackage ../tools/misc/arp-scan { }; @@ -1331,6 +1341,8 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; + aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; awscli = callPackage ../tools/admin/awscli { }; @@ -1339,6 +1351,8 @@ with pkgs; awsebcli = callPackage ../tools/virtualization/awsebcli {}; + awslimitchecker = callPackage ../tools/admin/awslimitchecker { }; + awslogs = callPackage ../tools/admin/awslogs { }; aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; @@ -1373,7 +1387,7 @@ with pkgs; awless = callPackage ../tools/virtualization/awless { }; - berglas = callPackage ../tools/admin/berglas/default.nix { }; + berglas = callPackage ../tools/admin/berglas { }; betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; @@ -1459,7 +1473,9 @@ with pkgs; bic = callPackage ../development/interpreters/bic { }; - binance = callPackage ../applications/misc/binance { }; + binance = callPackage ../applications/misc/binance { + electron = electron_12; + }; bit = callPackage ../applications/version-management/git-and-tools/bit { }; @@ -1635,7 +1651,7 @@ with pkgs; ecdsautils = callPackage ../tools/security/ecdsautils { }; - echidna = haskell.lib.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { }); + echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { }); sedutil = callPackage ../tools/security/sedutil { }; @@ -1669,7 +1685,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + fitnesstrax = callPackage ../applications/misc/fitnesstrax { }; flavours = callPackage ../applications/misc/flavours { }; @@ -1725,6 +1741,8 @@ with pkgs; gitless = callPackage ../applications/version-management/gitless { python = python3; }; + gistyc = with python3Packages; toPythonApplication gistyc; + gitlint = python3Packages.callPackage ../tools/misc/gitlint { }; gitter = callPackage ../applications/networking/instant-messengers/gitter { }; @@ -1785,7 +1803,7 @@ with pkgs; hime = callPackage ../tools/inputmethods/hime {}; - hinit = haskell.lib.justStaticExecutables haskellPackages.hinit; + hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; hostctl = callPackage ../tools/system/hostctl { }; @@ -1823,6 +1841,8 @@ with pkgs; pacparser = callPackage ../tools/networking/pacparser { }; + parquet-tools = callPackage ../tools/misc/parquet-tools { }; + pass = callPackage ../tools/security/pass { }; passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; @@ -2222,7 +2242,7 @@ with pkgs; bozohttpd = callPackage ../servers/http/bozohttpd { }; bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; - bpb = callPackage ../tools/security/bpb { }; + bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; bpytop = callPackage ../tools/system/bpytop { }; @@ -2238,6 +2258,7 @@ with pkgs; broot = callPackage ../tools/misc/broot { inherit (darwin.apple_sdk.frameworks) Security; + inherit (xorg) libxcb; }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; @@ -2312,7 +2333,7 @@ with pkgs; cue2pops = callPackage ../tools/cd-dvd/cue2pops { }; - cabal2nix-unwrapped = haskell.lib.justStaticExecutables (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix); + cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (haskell.lib.compose.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix); cabal2nix = symlinkJoin { inherit (cabal2nix-unwrapped) name meta; @@ -2370,7 +2391,7 @@ with pkgs; catclock = callPackage ../applications/misc/catclock { }; - cardpeek = callPackage ../applications/misc/cardpeek { }; + cardpeek = callPackage ../applications/misc/cardpeek { inherit (darwin.apple_sdk.frameworks) PCSC; }; cawbird = callPackage ../applications/networking/cawbird { }; @@ -2452,6 +2473,8 @@ with pkgs; clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; + clusterctl = callPackage ../applications/networking/cluster/clusterctl { }; + coloredlogs = with python3Packages; toPythonApplication coloredlogs; colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; @@ -2756,6 +2779,8 @@ with pkgs; gtk = gtk3; }; + dstp = callPackage ../development/tools/dstp { }; + dsvpn = callPackage ../applications/networking/dsvpn { }; dtools = callPackage ../development/tools/dtools { }; @@ -2930,7 +2955,7 @@ with pkgs; fsmark = callPackage ../tools/misc/fsmark { }; - futhark = haskell.lib.justStaticExecutables haskellPackages.futhark; + futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark; inherit (nodePackages) fx; @@ -3055,6 +3080,8 @@ with pkgs; gotify-cli = callPackage ../tools/misc/gotify-cli { }; + gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; + gping = callPackage ../tools/networking/gping { }; gpu-burn = callPackage ../applications/misc/gpu-burn { }; @@ -3207,6 +3234,10 @@ with pkgs; lite = callPackage ../applications/editors/lite { }; + lite-xl = callPackage ../applications/editors/lite-xl { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + loadwatch = callPackage ../tools/system/loadwatch { }; loccount = callPackage ../development/tools/misc/loccount { }; @@ -3239,9 +3270,7 @@ with pkgs; marlin-calc = callPackage ../tools/misc/marlin-calc {}; - masscan = callPackage ../tools/security/masscan { - stdenv = gccStdenv; - }; + masscan = callPackage ../tools/security/masscan { }; massren = callPackage ../tools/misc/massren { }; @@ -3338,9 +3367,8 @@ with pkgs; nfstrace = callPackage ../tools/networking/nfstrace { }; nix-direnv = callPackage ../tools/misc/nix-direnv { }; - nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; }; - nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor); + nix-output-monitor = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-output-monitor); nix-template = callPackage ../tools/package-management/nix-template { inherit (darwin.apple_sdk.frameworks) Security; @@ -3548,7 +3576,7 @@ with pkgs; sydbox = callPackage ../os-specific/linux/sydbox { }; synth = callPackage ../tools/misc/synth { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) AppKit Security; }; syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {}; @@ -4067,6 +4095,12 @@ with pkgs; libpinyin = callPackage ../development/libraries/libpinyin { }; + inherit (import ../development/libraries/libsbsms pkgs) + libsbsms + libsbsms_2_0_2 + libsbsms_2_3_0 + ; + libskk = callPackage ../development/libraries/libskk { inherit (gnome) gnome-common; }; @@ -4139,6 +4173,8 @@ with pkgs; ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { }; + ibus-theme-tools = callPackage ../tools/misc/ibus-theme-tools { }; + interception-tools = callPackage ../tools/inputmethods/interception-tools { }; interception-tools-plugins = { caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; @@ -4575,8 +4611,8 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; - dolphinEmuMaster = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { + dolphin-emu = callPackage ../misc/emulators/dolphin-emu { }; + dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -4588,6 +4624,8 @@ with pkgs; dorkscout = callPackage ../tools/security/dorkscout { }; + downonspot = callPackage ../applications/misc/downonspot { }; + sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; slade = callPackage ../applications/misc/slade { @@ -4602,6 +4640,8 @@ with pkgs; driftnet = callPackage ../tools/networking/driftnet {}; + driftctl = callPackage ../applications/networking/cluster/driftctl { }; + drill = callPackage ../tools/networking/drill { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4725,7 +4765,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pax = callPackage ../tools/archivers/pax { }; + pax = callPackage ../tools/archivers/pax { + inherit (pkgs.darwin.apple_sdk.libs) utmp; + }; rage = callPackage ../tools/security/rage { inherit (darwin.apple_sdk.frameworks) Foundation Security; @@ -4767,7 +4809,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - timeline = callPackage ../applications/office/timeline/default.nix { }; + timeline = callPackage ../applications/office/timeline { }; tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; @@ -4792,7 +4834,7 @@ with pkgs; uudeview = callPackage ../tools/misc/uudeview { }; - uusi = haskell.lib.justStaticExecutables haskellPackages.uusi; + uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { inherit (python3Packages) sphinx; @@ -5123,9 +5165,7 @@ with pkgs; icu = icu63; }; - fluent-bit = callPackage ../tools/misc/fluent-bit { - stdenv = gccStdenv; - }; + fluent-bit = callPackage ../tools/misc/fluent-bit { }; flux = callPackage ../development/compilers/flux { }; @@ -5269,9 +5309,7 @@ with pkgs; fprintd = callPackage ../tools/security/fprintd { }; - fprintd-tod = callPackage ../tools/security/fprintd { - libfprint = libfprint-tod; - }; + fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { }; ferdi = callPackage ../applications/networking/instant-messengers/ferdi { mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; @@ -5387,6 +5425,8 @@ with pkgs; gandom-fonts = callPackage ../data/fonts/gandom-fonts { }; + gaphor = python3Packages.callPackage ../tools/misc/gaphor { }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; garmintools = callPackage ../development/libraries/garmintools {}; @@ -5417,6 +5457,8 @@ with pkgs; gelasio = callPackage ../data/fonts/gelasio { }; + gemget = callPackage ../tools/networking/gemget {}; + gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; genext2fs = callPackage ../tools/filesystems/genext2fs { }; @@ -5906,7 +5948,7 @@ with pkgs; }; graphviz-nox = graphviz.override { - xorg = null; + withXorg = false; libdevil = libdevil-nox; }; @@ -6324,7 +6366,7 @@ with pkgs; icemon = libsForQt5.callPackage ../applications/networking/icemon { }; - icepeak = haskell.lib.justStaticExecutables haskellPackages.icepeak; + icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak; iceshelf = callPackage ../tools/backup/iceshelf { }; @@ -6423,6 +6465,8 @@ with pkgs; intermodal = callPackage ../tools/misc/intermodal { }; + internetarchive = with python3Packages; toPythonApplication internetarchive; + invidious = callPackage ../servers/invidious { # needs a specific version of lsquic lsquic = callPackage ../servers/invidious/lsquic.nix { }; @@ -6495,6 +6539,7 @@ with pkgs; isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { }; isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { }; + isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { }; ispike = callPackage ../development/libraries/science/robotics/ispike { }; @@ -6532,6 +6577,8 @@ with pkgs; jekyll = callPackage ../applications/misc/jekyll { }; + jet = callPackage ../development/tools/jet { }; + jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { }; @@ -6650,6 +6697,8 @@ with pkgs; }; kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { }; + kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { }; + kak-lsp = callPackage ../tools/misc/kak-lsp { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -6711,6 +6760,8 @@ with pkgs; kibi = callPackage ../applications/editors/kibi { }; + kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; + kismet = callPackage ../applications/networking/sniffers/kismet { }; kiterunner = callPackage ../tools/security/kiterunner { }; @@ -6805,6 +6856,7 @@ with pkgs; libcryptui = callPackage ../development/libraries/libcryptui { autoreconfHook = buildPackages.autoreconfHook269; + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }; libshumate = callPackage ../development/libraries/libshumate { }; @@ -6988,6 +7040,8 @@ with pkgs; ministat = callPackage ../tools/misc/ministat { }; + mjolnir = callPackage ../servers/mjolnir { }; + mmv = callPackage ../tools/misc/mmv { }; mmv-go = callPackage ../tools/misc/mmv-go { }; @@ -7292,8 +7346,9 @@ with pkgs; inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets_4_2; - libwebsockets = libwebsockets_4_2; + libwebsockets_4_2 + libwebsockets_4_3; + libwebsockets = libwebsockets_4_3; licensee = callPackage ../tools/package-management/licensee { }; @@ -7377,7 +7432,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - madlang = haskell.lib.justStaticExecutables haskellPackages.madlang; + madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang; maeparser = callPackage ../development/libraries/maeparser { }; @@ -7631,7 +7686,9 @@ with pkgs; metasploit = callPackage ../tools/security/metasploit { }; - mhost = callPackage ../applications/networking/mhost { }; + mhost = callPackage ../applications/networking/mhost { + inherit (darwin.apple_sdk.frameworks) Security; + }; ms-sys = callPackage ../tools/misc/ms-sys { }; @@ -7764,6 +7821,8 @@ with pkgs; netcat-gnu = callPackage ../tools/networking/netcat { }; + netdiscover = callPackage ../tools/networking/netdiscover { }; + nethogs = callPackage ../tools/networking/nethogs { }; netkittftp = callPackage ../tools/networking/netkit/tftp { }; @@ -7828,7 +7887,7 @@ with pkgs; ngrep = callPackage ../tools/networking/ngrep { }; - neuron-notes = haskell.lib.justStaticExecutables (haskell.lib.generateOptparseApplicativeCompletion "neuron" haskellPackages.neuron); + neuron-notes = haskell.lib.compose.justStaticExecutables (haskell.lib.compose.generateOptparseApplicativeCompletion "neuron" haskellPackages.neuron); ngrok = ngrok-2; @@ -7874,7 +7933,7 @@ with pkgs; nvchecker = with python3Packages; toPythonApplication nvchecker; - nvfetcher = haskell.lib.justStaticExecutables haskellPackages.nvfetcher; + nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher; miller = callPackage ../tools/text/miller { }; @@ -8048,7 +8107,9 @@ with pkgs; ocserv = callPackage ../tools/networking/ocserv { }; - octofetch = callPackage ../tools/misc/octofetch { }; + octofetch = callPackage ../tools/misc/octofetch { + inherit (darwin.apple_sdk.frameworks) Security; + }; oha = callPackage ../tools/networking/oha { inherit (darwin.apple_sdk.frameworks) Security; @@ -8080,7 +8141,7 @@ with pkgs; offlineimap = callPackage ../tools/networking/offlineimap { }; - ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { }; + ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; ogdf = callPackage ../development/libraries/ogdf { }; @@ -8172,8 +8233,12 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; + openseachest = callPackage ../tools/system/openseachest { }; + opensm = callPackage ../tools/networking/opensm { }; + tinyssh = callPackage ../tools/networking/tinyssh { }; + opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); openssh = opensshPackages.openssh.override { @@ -8222,7 +8287,7 @@ with pkgs; update-dotdee = with python3Packages; toPythonApplication update-dotdee; - update-nix-fetchgit = haskell.lib.justStaticExecutables haskellPackages.update-nix-fetchgit; + update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit; update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { }; @@ -8498,9 +8563,7 @@ with pkgs; phosh = callPackage ../applications/window-managers/phosh { }; - pinentry = libsForQt5.callPackage ../tools/security/pinentry { - libcap = if stdenv.isDarwin then null else libcap; - }; + pinentry = libsForQt5.callPackage ../tools/security/pinentry { }; pinentry-curses = (lib.getOutput "curses" pinentry); pinentry-emacs = (lib.getOutput "emacs" pinentry); @@ -8676,6 +8739,8 @@ with pkgs; proxify = callPackage ../tools/networking/proxify { }; + proxysql = callPackage ../servers/sql/proxysql { }; + proxytunnel = callPackage ../tools/misc/proxytunnel { openssl = openssl_1_0_2; }; @@ -8688,6 +8753,8 @@ with pkgs; cntlm = callPackage ../tools/networking/cntlm { }; + cnping = callPackage ../tools/networking/cnping { }; + past-time = python3Packages.callPackage ../tools/misc/past-time { }; pastebinit = callPackage ../tools/misc/pastebinit { }; @@ -8772,9 +8839,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; }; - rig = callPackage ../tools/misc/rig { - stdenv = gccStdenv; - }; + rig = callPackage ../tools/misc/rig { }; riseup-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { provider = "riseup"; @@ -9013,6 +9078,8 @@ with pkgs; reuse = callPackage ../tools/package-management/reuse { }; + inherit (nodePackages) reveal-md; + rewritefs = callPackage ../os-specific/linux/rewritefs { }; rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; @@ -9425,7 +9492,7 @@ with pkgs; slides = callPackage ../applications/misc/slides { }; - slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; + slirp4netns = callPackage ../tools/networking/slirp4netns { }; slsnif = callPackage ../tools/misc/slsnif { }; @@ -9462,7 +9529,9 @@ with pkgs; snallygaster = callPackage ../tools/security/snallygaster { }; - snapcast = callPackage ../applications/audio/snapcast { }; + snapcast = callPackage ../applications/audio/snapcast { + pulseaudioSupport = config.pulseaudio or stdenv.isLinux; + }; snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { }; @@ -9545,6 +9614,8 @@ with pkgs; stdman = callPackage ../data/documentation/stdman { }; + stderred = callPackage ../tools/misc/stderred { }; + steck = callPackage ../servers/pinnwand/steck.nix { }; stenc = callPackage ../tools/backup/stenc { }; @@ -9561,7 +9632,7 @@ with pkgs; synapse-admin = callPackage ../tools/admin/synapse-admin {}; - sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; + sl = callPackage ../tools/misc/sl { }; socat = callPackage ../tools/networking/socat { }; @@ -9586,7 +9657,7 @@ with pkgs; speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; - splot = haskell.lib.justStaticExecutables haskellPackages.splot; + splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot; spotdl = callPackage ../tools/audio/spotdl { }; @@ -9651,8 +9722,6 @@ with pkgs; svgbob = callPackage ../tools/graphics/svgbob { }; - svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - ssb = callPackage ../tools/security/ssb { }; ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; @@ -9700,13 +9769,13 @@ with pkgs; stuntman = callPackage ../tools/networking/stuntman { }; - stutter = haskell.lib.justStaticExecutables haskellPackages.stutter; + stutter = haskell.lib.compose.justStaticExecutables haskellPackages.stutter; strongswan = callPackage ../tools/networking/strongswan { }; strongswanTNC = strongswan.override { enableTNC = true; }; strongswanNM = strongswan.override { enableNetworkManager = true; }; - stylish-haskell = haskell.lib.justStaticExecutables haskellPackages.stylish-haskell; + stylish-haskell = haskell.lib.compose.justStaticExecutables haskellPackages.stylish-haskell; su = shadow.su; @@ -9726,7 +9795,7 @@ with pkgs; swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { }; - swapview = callPackage ../os-specific/linux/swapview/default.nix { }; + swapview = callPackage ../os-specific/linux/swapview { }; swtpm = callPackage ../tools/security/swtpm { }; @@ -9777,6 +9846,8 @@ with pkgs; inherit (xorg) xauth xorgserver; }; + systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; + t = callPackage ../tools/misc/t { }; tabnine = callPackage ../development/tools/tabnine { }; @@ -9861,7 +9932,7 @@ with pkgs; telescope = callPackage ../applications/networking/browsers/telescope { }; termscp = callPackage ../tools/networking/termscp { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Foundation Security; }; termius = callPackage ../applications/networking/termius { }; @@ -9898,6 +9969,10 @@ with pkgs; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; + thedesk = callPackage ../applications/misc/thedesk { + electron = electron_12; + }; + theharvester = callPackage ../tools/security/theharvester { }; inherit (nodePackages) thelounge; @@ -10473,6 +10548,8 @@ with pkgs; wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; + wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { }; + woff2 = callPackage ../development/web/woff2 { }; woof = callPackage ../tools/misc/woof { }; @@ -10487,7 +10564,7 @@ with pkgs; wsmancli = callPackage ../tools/system/wsmancli {}; - wstunnel = haskell.lib.justStaticExecutables haskellPackages.wstunnel; + wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel; wolfebin = callPackage ../tools/networking/wolfebin { python = python2; @@ -10536,7 +10613,7 @@ with pkgs; time = callPackage ../tools/misc/time { }; - tweet-hs = haskell.lib.justStaticExecutables haskellPackages.tweet-hs; + tweet-hs = haskell.lib.compose.justStaticExecutables haskellPackages.tweet-hs; tweeny = callPackage ../development/libraries/tweeny { }; @@ -10606,7 +10683,9 @@ with pkgs; withRedis = true; }; - unicorn = callPackage ../development/libraries/unicorn { }; + unicorn = callPackage ../development/libraries/unicorn { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; units = callPackage ../tools/misc/units { enableCurrenciesUpdater = true; @@ -10617,6 +10696,8 @@ with pkgs; unrar = callPackage ../tools/archivers/unrar { }; + unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; + vul = callPackage ../applications/misc/vul { }; xar = callPackage ../tools/compression/xar { }; @@ -10665,7 +10746,10 @@ with pkgs; inherit (chickenPackages_4) eggDerivation fetchegg; }; - unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; }; + unar = callPackage ../tools/archivers/unar { + inherit (darwin.apple_sdk.frameworks) Foundation AppKit; + stdenv = clangStdenv; + }; unp = callPackage ../tools/archivers/unp { }; @@ -10711,7 +10795,7 @@ with pkgs; volumeicon = callPackage ../tools/audio/volumeicon { }; - waf = callPackage ../development/tools/build-managers/waf { python = python3; }; + waf = callPackage ../development/tools/build-managers/waf { }; wafHook = callPackage ../development/tools/build-managers/wafHook { }; wagyu = callPackage ../tools/misc/wagyu { @@ -11046,6 +11130,8 @@ with pkgs; zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; + zsh-vi-mode = callPackage ../shells/zsh/zsh-vi-mode {}; + zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { }; zsh-z = callPackage ../shells/zsh/zsh-z { }; @@ -11451,7 +11537,7 @@ with pkgs; scry = callPackage ../development/tools/scry { }; - dasm = callPackage ../development/compilers/dasm/default.nix { }; + dasm = callPackage ../development/compilers/dasm { }; dbmate = callPackage ../development/tools/database/dbmate { }; @@ -11470,7 +11556,7 @@ with pkgs; eql = callPackage ../development/compilers/eql {}; - elm2nix = haskell.lib.justStaticExecutables haskellPackages.elm2nix; + elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix; elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { inherit (darwin.apple_sdk.frameworks) Security; @@ -11532,7 +11618,7 @@ with pkgs; if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: { cc = old.cc.override { reproducibleBuild = false; - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + profiledCompiler = with stdenv; (!isDarwin && hostPlatform.isx86); }; }) else ccWrapper; @@ -11840,8 +11926,7 @@ with pkgs; inherit (gnome2) libart_lgpl; }); - # aarch64-darwin doesn't support earlier gcc - gnat = if (stdenv.isDarwin && stdenv.isAarch64) then gnat11 else gnat9; + gnat = gnat11; gnat6 = wrapCC (gcc6.cc.override { name = "gnat"; @@ -11971,14 +12056,14 @@ with pkgs; inherit (haskellPackages) ghc; - cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install; + cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install; - stack = haskell.lib.justStaticExecutables haskellPackages.stack; - hlint = haskell.lib.justStaticExecutables haskellPackages.hlint; + stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack; + hlint = haskell.lib.compose.justStaticExecutables haskellPackages.hlint; - krank = haskell.lib.justStaticExecutables haskellPackages.krank; + krank = haskell.lib.compose.justStaticExecutables haskellPackages.krank; - stylish-cabal = haskell.lib.justStaticExecutables haskellPackages.stylish-cabal; + stylish-cabal = haskell.lib.compose.justStaticExecutables haskellPackages.stylish-cabal; all-cabal-hashes = callPackage ../data/misc/hackage { }; @@ -11988,13 +12073,15 @@ with pkgs; purescript-psa = nodePackages.purescript-psa; + purenix = haskell.lib.compose.justStaticExecutables haskellPackages.purenix; + spago = callPackage ../development/tools/purescript/spago { }; pulp = nodePackages.pulp; pscid = nodePackages.pscid; - coreboot-toolchain = callPackage ../development/tools/misc/coreboot-toolchain { }; + coreboot-toolchain = callPackages ../development/tools/misc/coreboot-toolchain { }; remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { }; @@ -12286,7 +12373,7 @@ with pkgs; javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - juniper = callPackage ../development/compilers/juniper/default.nix { }; + juniper = callPackage ../development/compilers/juniper { }; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; @@ -12300,14 +12387,14 @@ with pkgs; julia-lts = julia_10; julia-stable = julia_15; - julia = julia-lts; + julia = julia-stable; julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { }; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; julia-lts-bin = julia_10-bin; julia-stable-bin = julia_16-bin; - julia-bin = julia-lts-bin; + julia-bin = julia-stable-bin; jwasm = callPackage ../development/compilers/jwasm { }; @@ -12333,7 +12420,7 @@ with pkgs; knightos-z80e = callPackage ../development/tools/knightos/z80e { }; - koka = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/koka { }); + koka = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../development/compilers/koka { }); kotlin = callPackage ../development/compilers/kotlin { }; kotlin-native = callPackage ../development/compilers/kotlin/native.nix { }; @@ -12477,7 +12564,7 @@ with pkgs; stdenv = gcc7Stdenv; })); - llvmPackages_latest = llvmPackages_12; + llvmPackages_latest = llvmPackages_13; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); @@ -12683,18 +12770,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_55 = callPackage ../development/compilers/rust/1_55.nix { + rust_1_56 = callPackage ../development/compilers/rust/1_56.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_12 = llvmPackages_12.libllvm; + llvm_13 = llvmPackages_13.libllvm; }; - rust = rust_1_55; + rust = rust_1_56; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; - rustPackages_1_55 = rust_1_55.packages.stable; - rustPackages = rustPackages_1_55; + rustPackages_1_56 = rust_1_56.packages.stable; + rustPackages = rustPackages_1_56; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -12745,7 +12832,9 @@ with pkgs; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; cargo-license = callPackage ../tools/package-management/cargo-license { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; - cargo-outdated = callPackage ../tools/package-management/cargo-outdated {}; + cargo-outdated = callPackage ../tools/package-management/cargo-outdated { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12772,6 +12861,7 @@ with pkgs; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-depgraph = callPackage ../development/tools/rust/cargo-depgraph { }; cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12846,7 +12936,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - devserver = callPackage ../development/tools/rust/devserver { }; + devserver = callPackage ../development/tools/rust/devserver { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; @@ -12889,7 +12981,7 @@ with pkgs; sbcl_2_1_9 = callPackage ../development/compilers/sbcl/2.1.9.nix {}; sbcl = sbcl_2_1_9; - roswell = callPackage ../development/tools/roswell/default.nix { }; + roswell = callPackage ../development/tools/roswell { }; 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; }; @@ -12897,7 +12989,7 @@ with pkgs; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; }; scala = scala_2_13; - scala-runners = callPackage ../development/compilers/scala-runners/default.nix { + scala-runners = callPackage ../development/compilers/scala-runners { coursier = coursier.override { jre = jdk8; }; }; @@ -13160,6 +13252,8 @@ with pkgs; clips = callPackage ../development/interpreters/clips { }; + cliscord = callPackage ../misc/cliscord { }; + clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; @@ -13176,19 +13270,19 @@ with pkgs; clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; - dhall = haskell.lib.justStaticExecutables haskellPackages.dhall; + dhall = haskell.lib.compose.justStaticExecutables haskellPackages.dhall; - dhall-bash = haskell.lib.justStaticExecutables haskellPackages.dhall-bash; + dhall-bash = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-bash; - dhall-docs = haskell.lib.justStaticExecutables haskellPackages.dhall-docs; + dhall-docs = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-docs; - dhall-lsp-server = haskell.lib.justStaticExecutables haskellPackages.dhall-lsp-server; + dhall-lsp-server = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-lsp-server; - dhall-json = haskell.lib.justStaticExecutables haskellPackages.dhall-json; + dhall-json = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-json; - dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix; + dhall-nix = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-nix; - dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text; + dhall-text = haskell.lib.compose.justStaticExecutables haskellPackages.dhall-text; dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { }); @@ -13496,7 +13590,7 @@ with pkgs; setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix {}; # These pyside tools do not provide any Python modules and are meant to be here. - # See ../development/python-modules/pyside/default.nix for details. + # See ../development/python-modules/pyside for details. pysideApiextractor = callPackage ../development/python-modules/pyside/apiextractor.nix { }; pysideGeneratorrunner = callPackage ../development/python-modules/pyside/generatorrunner.nix { }; @@ -13534,6 +13628,10 @@ with pkgs; stdenv = if stdenv.isDarwin then stdenv else gcc7Stdenv; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + racket_7_9 = callPackage ../development/interpreters/racket/racket_7_9.nix { + stdenv = if stdenv.isDarwin then stdenv else gcc7Stdenv; + inherit (darwin.apple_sdk.frameworks) CoreFoundation; + }; racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; rakudo = callPackage ../development/interpreters/rakudo {}; @@ -13580,8 +13678,6 @@ with pkgs; 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_7 ruby_3_0; @@ -13737,7 +13833,7 @@ with pkgs; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; - rappel = callPackage ../development/misc/rappel/default.nix { }; + rappel = callPackage ../development/misc/rappel { }; pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; @@ -13860,7 +13956,8 @@ with pkgs; electron_12 electron_13 electron_14 - electron_15; + electron_15 + electron_16; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -14028,15 +14125,6 @@ with pkgs; bison = callPackage ../development/tools/parsing/bison { }; - # Ruby fails to build with current bison - bison_3_5 = bison.overrideAttrs (oldAttrs: rec { - version = "3.5.4"; - src = fetchurl { - url = "mirror://gnu/${oldAttrs.pname}/${oldAttrs.pname}-${version}.tar.gz"; - sha256 = "0a2cbrqh7mgx2dwf5qm10v68iakv1i0dqh9di4x5aqxsz96ibpf0"; - }; - }); - bisoncpp = callPackage ../development/tools/parsing/bisonc++ { }; black = with python3Packages; toPythonApplication black; @@ -14248,7 +14336,7 @@ with pkgs; credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_7) llvm libclang; + inherit (llvmPackages_8) llvm libclang; }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -14436,7 +14524,7 @@ with pkgs; flootty = callPackage ../development/tools/flootty { }; - fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); + fffuu = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); ffuf = callPackage ../tools/security/ffuf { }; @@ -14452,6 +14540,8 @@ with pkgs; fprettify = callPackage ../development/tools/fprettify { }; + fortran-language-server = python3.pkgs.callPackage ../development/tools/fortran-language-server { }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; @@ -14528,9 +14618,9 @@ with pkgs; gnome-usage = callPackage ../applications/misc/gnome-usage {}; - gnome-inform7 = callPackage ../applications/editors/gnome-inform7/default.nix { }; + gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { }; - gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-latex = callPackage ../applications/editors/gnome-latex { }; gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; @@ -14566,15 +14656,15 @@ with pkgs; gpuvis = callPackage ../development/tools/misc/gpuvis { }; - gradleGen = callPackage ../development/tools/build-managers/gradle { - java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 + gradle-packages = import ../development/tools/build-managers/gradle { + inherit jdk8 jdk11 jdk17; }; - gradle = res.gradleGen.gradle_latest; - gradle_4_10 = res.gradleGen.gradle_4_10; - gradle_4 = gradle_4_10; - gradle_5 = res.gradleGen.gradle_5_6; - gradle_6 = res.gradleGen.gradle_6_9; - gradle_7 = res.gradleGen.gradle_7; + gradleGen = gradle-packages.gen; + gradle_4 = callPackage gradle-packages.gradle_4 { }; + gradle_5 = callPackage gradle-packages.gradle_5 { }; + gradle_6 = callPackage gradle-packages.gradle_6 { }; + gradle_7 = callPackage gradle-packages.gradle_7 { }; + gradle = gradle_7; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -14604,7 +14694,7 @@ with pkgs; guile = guile_2_0; }; - hadolint = haskell.lib.justStaticExecutables haskellPackages.hadolint; + hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint; halfempty = callPackage ../development/tools/halfempty {}; @@ -14680,10 +14770,10 @@ with pkgs; k2tf = callPackage ../development/tools/misc/k2tf { }; - kafkacat = callPackage ../development/tools/kafkacat { }; - kati = callPackage ../development/tools/build-managers/kati { }; + kcat = callPackage ../development/tools/kcat { }; + kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { @@ -14833,8 +14923,8 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; - haskell-ci = haskell.lib.justStaticExecutables haskellPackages.haskell-ci; - haskell-ci-unstable = lowPrio (haskell.lib.justStaticExecutables haskellPackages.haskell-ci-unstable); + haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci; + haskell-ci-unstable = lowPrio (haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci-unstable); neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false); @@ -15124,7 +15214,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - shake = haskell.lib.justStaticExecutables haskellPackages.shake; + shake = haskell.lib.compose.justStaticExecutables haskellPackages.shake; shallot = callPackage ../tools/misc/shallot { }; @@ -15318,6 +15408,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars; + trellis = callPackage ../development/embedded/fpga/trellis { }; ttyd = callPackage ../servers/ttyd { }; @@ -15510,7 +15602,9 @@ with pkgs; appstream-glib = callPackage ../development/libraries/appstream-glib { }; - apr = callPackage ../development/libraries/apr { }; + apr = callPackage ../development/libraries/apr { + autoreconfHook = buildPackages.autoreconfHook269; + }; aprutil = callPackage ../development/libraries/apr-util { db = if stdenv.isFreeBSD then db4 else db; @@ -15542,7 +15636,7 @@ with pkgs; assimp = callPackage ../development/libraries/assimp { }; asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; - asio = callPackage ../development/libraries/asio/default.nix { }; + asio = callPackage ../development/libraries/asio { }; aspell = callPackage ../development/libraries/aspell { }; @@ -15638,7 +15732,7 @@ with pkgs; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; - bicgl = callPackage ../development/libraries/science/biology/bicgl { }; + bicgl = callPackage ../development/libraries/science/biology/bicgl { inherit (darwin.apple_sdk.frameworks) GLUT; }; # TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt @@ -15702,7 +15796,7 @@ with pkgs; c-blosc = callPackage ../development/libraries/c-blosc { }; # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 - cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; + cachix = haskell.lib.compose.justStaticExecutables haskellPackages.cachix; hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; @@ -15710,7 +15804,7 @@ with pkgs; isa-l = callPackage ../development/libraries/isa-l { }; - niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv); + niv = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.niv); ormolu = haskellPackages.ormolu.bin; @@ -15818,6 +15912,8 @@ with pkgs; cmrt = callPackage ../development/libraries/cmrt { }; + coeurl = callPackage ../development/libraries/coeurl { }; + cogl = callPackage ../development/libraries/cogl { }; coin3d = callPackage ../development/libraries/coin3d { }; @@ -15828,6 +15924,8 @@ with pkgs; cointop = callPackage ../applications/misc/cointop { }; + collada-dom = callPackage ../development/libraries/collada-dom { }; + cog = callPackage ../development/web/cog { }; cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; @@ -15872,6 +15970,8 @@ with pkgs; cryptominisat = callPackage ../applications/science/logic/cryptominisat { }; + csdr = callPackage ../applications/radio/csdr { }; + ctypes_sh = callPackage ../development/libraries/ctypes_sh { }; curlcpp = callPackage ../development/libraries/curlcpp { }; @@ -16015,7 +16115,7 @@ with pkgs; entt = callPackage ../development/libraries/entt { }; - epoxy = callPackage ../development/libraries/epoxy {}; + libepoxy = callPackage ../development/libraries/libepoxy {}; libesmtp = callPackage ../development/libraries/libesmtp { }; @@ -16426,8 +16526,8 @@ with pkgs; relibc = callPackage ../development/libraries/relibc { }; - # Only supported on Linux, using glibc - glibcLocales = if stdenv.hostPlatform.libc == "glibc" then callPackage ../development/libraries/glibc/locales.nix { } else null; + # Only supported on Linux + glibcLocales = if stdenv.hostPlatform.isLinux then callPackage ../development/libraries/glibc/locales.nix { } else null; glibcInfo = callPackage ../development/libraries/glibc/info.nix { }; @@ -16547,7 +16647,7 @@ with pkgs; then callPackage ../development/libraries/gnu-efi { } else null; - gnutls = callPackage ../development/libraries/gnutls/default.nix { + gnutls = callPackage ../development/libraries/gnutls { inherit (darwin.apple_sdk.frameworks) Security; util-linux = util-linuxMinimal; # break the cyclic dependency autoconf = buildPackages.autoconf269; @@ -16611,7 +16711,7 @@ with pkgs; glib-testing = callPackage ../development/libraries/glib-testing { }; - glirc = haskell.lib.justStaticExecutables haskellPackages.glirc; + glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc; gom = callPackage ../development/libraries/gom { }; @@ -16649,6 +16749,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; + pangomm_2_42 = callPackage ../development/libraries/pangomm/2.42.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + gdata-sharp = callPackage ../development/libraries/gdata-sharp { }; gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; @@ -16898,8 +17002,13 @@ with pkgs; } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu70 = callPackage ../development/libraries/icu/70.nix ({ + nativeBuildRoot = buildPackages.icu70.override { buildRootOnly = true; }; + } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); - icu = icu69; + icu = icu70; id3lib = callPackage ../development/libraries/id3lib { }; @@ -17002,7 +17111,7 @@ with pkgs; json2hcl = callPackage ../development/tools/json2hcl { }; - json2yaml = haskell.lib.justStaticExecutables haskellPackages.json2yaml; + json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; json-glib = callPackage ../development/libraries/json-glib { }; @@ -17036,6 +17145,7 @@ with pkgs; }; keybinder3 = callPackage ../development/libraries/keybinder3 { + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; automake = automake111x; }; @@ -17187,6 +17297,8 @@ with pkgs; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; + libbde = callPackage ../development/libraries/libbde { }; + libbencodetools = callPackage ../development/libraries/libbencodetools { }; libbluedevil = callPackage ../development/libraries/libbluedevil { }; @@ -18024,7 +18136,9 @@ with pkgs; libpgf = callPackage ../development/libraries/libpgf { }; - libphonenumber = callPackage ../development/libraries/libphonenumber { }; + libphonenumber = callPackage ../development/libraries/libphonenumber { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; libplacebo = callPackage ../development/libraries/libplacebo { }; @@ -18277,7 +18391,9 @@ with pkgs; libversion = callPackage ../development/libraries/libversion { }; - libvirt = callPackage ../development/libraries/libvirt { }; + libvirt = callPackage ../development/libraries/libvirt { + inherit (darwin.apple_sdk.frameworks) Carbon AppKit; + }; libvirt_5_9_0 = callPackage ../development/libraries/libvirt/5.9.0.nix { }; libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; @@ -18452,13 +18568,21 @@ with pkgs; opencl-clang = callPackage ../development/libraries/opencl-clang { }; - mapnik = callPackage ../development/libraries/mapnik { }; + mapnik = callPackage ../development/libraries/mapnik { + gdal = gdal.override { + libgeotiff = libgeotiff.override { proj = proj_7; }; + libspatialite = libspatialite.override { proj = proj_7; }; + proj = proj_7; + }; + proj = proj_7; + }; + marisa = callPackage ../development/libraries/marisa {}; matio = callPackage ../development/libraries/matio { }; - matterhorn = haskell.lib.justStaticExecutables haskellPackages.matterhorn; + matterhorn = haskell.lib.compose.justStaticExecutables haskellPackages.matterhorn; maxflow = callPackage ../development/libraries/maxflow { }; @@ -18591,8 +18715,6 @@ with pkgs; mueval = callPackage ../development/tools/haskell/mueval { }; - mumlib = callPackage ../development/libraries/mumlib { }; - muparser = callPackage ../development/libraries/muparser { inherit (darwin.stubs) setfile; }; @@ -18890,6 +19012,11 @@ with pkgs; openrct2 = callPackage ../games/openrct2 { }; + openwebrx = callPackage ../applications/radio/openwebrx { + inherit (python3Packages) + buildPythonPackage buildPythonApplication setuptools; + }; + optparse-bash = callPackage ../development/libraries/optparse-bash { }; orcania = callPackage ../development/libraries/orcania { }; @@ -18945,7 +19072,7 @@ with pkgs; pkgdiff = callPackage ../tools/misc/pkgdiff { }; - place-cursor-at = haskell.lib.justStaticExecutables haskellPackages.place-cursor-at; + place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; plib = callPackage ../development/libraries/plib { }; @@ -18994,6 +19121,8 @@ with pkgs; presage = callPackage ../development/libraries/presage { }; + present = callPackage ../misc/present { }; + prime-server = callPackage ../development/libraries/prime-server { }; primesieve = callPackage ../development/libraries/science/math/primesieve { }; @@ -19013,8 +19142,9 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf3_18; + protobuf = protobuf3_19; + protobuf3_19 = callPackage ../development/libraries/protobuf/3.19.nix { }; protobuf3_18 = callPackage ../development/libraries/protobuf/3.18.nix { }; protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; protobuf3_16 = callPackage ../development/libraries/protobuf/3.16.nix { }; @@ -19216,12 +19346,14 @@ with pkgs; readosm = callPackage ../development/libraries/readosm { }; + recastnavigation = callPackage ../development/libraries/recastnavigation { }; + rinutils = callPackage ../development/libraries/rinutils { }; kissfft = callPackage ../development/libraries/kissfft { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { - haskellLib = haskell.lib; + haskellLib = haskell.lib.compose; }; lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { }; @@ -19274,6 +19406,17 @@ with pkgs; rocksdb_lite = rocksdb.override { enableLite = true; }; + rocksdb_6_23 = rocksdb.overrideAttrs (old: rec { + pname = "rocksdb"; + version = "6.23.3"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk="; + }; + }); + rotate-backups = callPackage ../tools/backup/rotate-backups { }; rote = callPackage ../development/libraries/rote { }; @@ -19577,7 +19720,7 @@ with pkgs; StormLib = callPackage ../development/libraries/StormLib { }; - stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; + stxxl = callPackage ../development/libraries/stxxl { }; sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); @@ -19598,13 +19741,13 @@ with pkgs; sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec { name = "sqlite-${version}"; version = "3.27.2+replication3"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "CanonicalLtd"; repo = "sqlite"; rev = "version-${version}"; sha256 = "1aw1naa5y25ial251f74h039pgcz92p4b3994jvfzqpjlz06qwvw"; }; - nativeBuildInputs = [ pkgs.tcl ]; + nativeBuildInputs = [ tcl ]; configureFlags = oldAttrs.configureFlags ++ [ "--enable-replication" "--disable-amalgamation" @@ -20008,7 +20151,7 @@ with pkgs; }; wxSVG = callPackage ../development/libraries/wxSVG { - wxGTK = wxGTK30; + wxGTK = wxGTK30-gtk3; }; wtk = callPackage ../development/libraries/wtk { }; @@ -20129,7 +20272,7 @@ with pkgs; cppzmq = callPackage ../development/libraries/cppzmq {}; - czmq = callPackage ../development/libraries/czmq/default.nix {}; + czmq = callPackage ../development/libraries/czmq {}; zmqpp = callPackage ../development/libraries/zmqpp { }; @@ -20215,9 +20358,7 @@ with pkgs; lucene = callPackage ../development/libraries/java/lucene { }; - lucenepp = callPackage ../development/libraries/lucene++ { - boost = boost155; - }; + lucenepp = callPackage ../development/libraries/lucene++ { }; mockobjects = callPackage ../development/libraries/java/mockobjects { }; @@ -20257,10 +20398,10 @@ with pkgs; # across different go versions and/or platforms: # https://github.com/NixOS/nixpkgs/issues/144667 # - # do not uncomment this without approval from the go CODEOWNERS - #buildGo117Package = callPackage ../development/go-packages/generic { - # go = buildPackages.go_1_17; - #}; + # That's why `buildGoPackage != buildGo117Package`. + buildGo117Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_17; + }; buildGoPackage = buildGo116Package; @@ -20274,10 +20415,10 @@ with pkgs; # across different go versions and/or platforms: # https://github.com/NixOS/nixpkgs/issues/144667 # - # do not uncomment this without approval from the go CODEOWNERS - #buildGo117Module = callPackage ../development/go-modules/generic { - # go = buildPackages.go_1_17; - #}; + # That's why `buildGoModule != buildGo117Module`. + buildGo117Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_17; + }; buildGoModule = buildGo116Module; @@ -20400,7 +20541,7 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; - apacheHttpd = pkgs.apacheHttpd_2_4; + apacheHttpd = apacheHttpd_2_4; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; @@ -20438,7 +20579,7 @@ with pkgs; subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; }; - apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4); + apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor apacheHttpd_2_4 apacheHttpdPackages_2_4); apacheHttpdPackages = apacheHttpdPackages_2_4; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; @@ -20595,6 +20736,10 @@ with pkgs; fcgiwrap = callPackage ../servers/fcgiwrap { }; + fedigroups = callPackage ../servers/fedigroups { + inherit (darwin.apple_sdk.frameworks) Security; + }; + felix = callPackage ../servers/felix { }; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; @@ -20648,7 +20793,7 @@ with pkgs; hashi-ui = callPackage ../servers/hashi-ui {}; - hasura-graphql-engine = haskell.lib.justStaticExecutables haskellPackages.graphql-engine; + hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskellPackages.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; @@ -20782,18 +20927,18 @@ with pkgs; mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; # Backwards compatibility. - mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; - mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; - mod_python = pkgs.apacheHttpdPackages.mod_python; - mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; - mod_ca = pkgs.apacheHttpdPackages.mod_ca; - mod_crl = pkgs.apacheHttpdPackages.mod_crl; - mod_csr = pkgs.apacheHttpdPackages.mod_csr; - mod_ocsp = pkgs.apacheHttpdPackages.mod_ocsp; - mod_scep = pkgs.apacheHttpdPackages.mod_scep; - mod_spkac = pkgs.apacheHttpdPackages.mod_spkac; - mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12; - mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp; + mod_dnssd = apacheHttpdPackages.mod_dnssd; + mod_fastcgi = apacheHttpdPackages.mod_fastcgi; + mod_python = apacheHttpdPackages.mod_python; + mod_wsgi = apacheHttpdPackages.mod_wsgi; + mod_ca = apacheHttpdPackages.mod_ca; + mod_crl = apacheHttpdPackages.mod_crl; + mod_csr = apacheHttpdPackages.mod_csr; + mod_ocsp = apacheHttpdPackages.mod_ocsp; + mod_scep = apacheHttpdPackages.mod_scep; + mod_spkac = apacheHttpdPackages.mod_spkac; + mod_pkcs12 = apacheHttpdPackages.mod_pkcs12; + mod_timestamp = apacheHttpdPackages.mod_timestamp; inherit (callPackages ../servers/mpd { stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; @@ -20822,8 +20967,6 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mumsi = callPackage ../servers/mumsi { }; - mycorrhiza = callPackage ../servers/mycorrhiza { }; myserver = callPackage ../servers/http/myserver { }; @@ -20891,9 +21034,7 @@ with pkgs; nsq = callPackage ../servers/nsq { }; - oauth2-proxy = callPackage ../servers/oauth2-proxy { - buildGoModule = buildGo115Module; - }; + oauth2-proxy = callPackage ../servers/oauth2-proxy { }; openbgpd = callPackage ../servers/openbgpd { }; @@ -20948,6 +21089,8 @@ with pkgs; pshs = callPackage ../servers/http/pshs { }; + quark = callPackage ../servers/http/quark { }; + sympa = callPackage ../servers/mail/sympa { }; system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { }); @@ -21197,7 +21340,7 @@ with pkgs; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; - postgresql13Packages = pkgs.postgresqlPackages; + postgresql13Packages = postgresqlPackages; postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -21353,7 +21496,7 @@ with pkgs; enableMDNS = true; enableDomainController = true; enableRegedit = true; - enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64; + enableCephFS = !stdenv.hostPlatform.isAarch64; }); sambaFull = samba4Full; @@ -21405,7 +21548,7 @@ with pkgs; sogo = callPackage ../servers/web-apps/sogo { }; spacecookie = - haskell.lib.justStaticExecutables haskellPackages.spacecookie; + haskell.lib.compose.justStaticExecutables haskellPackages.spacecookie; spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; @@ -21413,6 +21556,8 @@ with pkgs; squid = callPackage ../servers/squid { }; + duckling-proxy = callPackage ../servers/duckling-proxy { }; + sslh = callPackage ../servers/sslh { }; thttpd = callPackage ../servers/http/thttpd { }; @@ -21504,6 +21649,8 @@ with pkgs; wallabag = callPackage ../servers/web-apps/wallabag { }; + webdav = callPackage ../servers/webdav { }; + webmetro = callPackage ../servers/webmetro { }; wsdd = callPackage ../servers/wsdd { }; @@ -21512,9 +21659,7 @@ with pkgs; xinetd = callPackage ../servers/xinetd { }; - zookeeper = callPackage ../servers/zookeeper { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + zookeeper = callPackage ../servers/zookeeper { }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; @@ -21622,7 +21767,7 @@ with pkgs; iucode-tool = callPackage ../os-specific/linux/microcode/iucode-tool.nix { }; - inherit (callPackages ../os-specific/linux/apparmor { python = python3; }) + inherit (callPackages ../os-specific/linux/apparmor { }) libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure; @@ -21765,6 +21910,8 @@ with pkgs; fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; + fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { }; + firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; fwts = callPackage ../os-specific/linux/fwts { }; @@ -21792,7 +21939,7 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; ffado = libsForQt5.callPackage ../os-specific/linux/ffado { - inherit (pkgs.linuxPackages) kernel; + inherit (linuxPackages) kernel; }; libffado = ffado; @@ -22004,11 +22151,11 @@ with pkgs; # This serves as a test for linuxPackages_custom linuxPackages_custom_tinyconfig_kernel = let - base = pkgs.linuxPackages.kernel; + base = linuxPackages.kernel; tinyLinuxPackages = linuxKernel.customPackage { inherit (base) version src; allowImportFromDerivation = false; - configfile = pkgs.linuxConfig { + configfile = linuxConfig { makeTarget = "tinyconfig"; src = base.src; }; @@ -22052,6 +22199,8 @@ with pkgs; linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened; linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened; + linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; + linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; @@ -22132,18 +22281,23 @@ with pkgs; lsscsi = callPackage ../os-specific/linux/lsscsi { }; - lvm2 = callPackage ../os-specific/linux/lvm2 { + lvm2-2_03 = callPackage ../os-specific/linux/lvm2/2_03.nix { # udev is the same package as systemd which depends on cryptsetup # which depends on lvm2 again. But we only need the libudev part # which does not depend on cryptsetup. udev = systemdMinimal; }; - lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 { + lvm2-2_02 = callPackage ../os-specific/linux/lvm2/2_02.nix { + udev = systemdMinimal; + }; + lvm2 = if stdenv.targetPlatform.isMusl then lvm2-2_02 else lvm2-2_03; + + lvm2_dmeventd = lvm2.override { enableDmeventd = true; enableCmdlib = true; }; - maddy = callPackage ../servers/maddy/default.nix { }; + maddy = callPackage ../servers/maddy { }; mbelib = callPackage ../development/libraries/audio/mbelib { }; @@ -22502,7 +22656,7 @@ with pkgs; sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; - }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor + }; # sysdig is a client, for a driver look at linuxPackagesFor sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; @@ -22765,6 +22919,10 @@ with pkgs; anarchism = callPackage ../data/documentation/anarchism { }; + ananicy = callPackage ../misc/ananicy { }; + + ananicy-cpp = callPackage ../misc/ananicy-cpp { }; + andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -23030,6 +23188,16 @@ with pkgs; gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { }; + palenight-theme = callPackage ../data/themes/gtk-theme-framework { theme = "palenight"; }; + + amarena-theme = callPackage ../data/themes/gtk-theme-framework { theme = "amarena"; }; + + gruvterial-theme = callPackage ../data/themes/gtk-theme-framework { theme = "gruvterial"; }; + + oceanic-theme = callPackage ../data/themes/gtk-theme-framework { theme = "oceanic"; }; + + spacx-gtk-theme = callPackage ../data/themes/gtk-theme-framework { theme = "spacx"; }; + gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk { inherit (plasma5Packages) breeze-icons; }; @@ -23119,6 +23287,11 @@ with pkgs; kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { }; + la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme { + inherit (plasma5Packages) breeze-icons; + inherit (pantheon) elementary-icon-theme; + }; + layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { }; lato = callPackage ../data/fonts/lato {}; @@ -23265,6 +23438,8 @@ with pkgs; netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; + netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk { }; + nordic = callPackage ../data/themes/nordic { }; inherit (callPackages ../data/fonts/noto-fonts {}) @@ -23397,6 +23572,8 @@ with pkgs; rime-data = callPackage ../data/misc/rime-data { }; + rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { }; + route159 = callPackage ../data/fonts/route159 { }; sampradaya = callPackage ../data/fonts/sampradaya { }; @@ -23801,6 +23978,10 @@ with pkgs; apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; + apkeep = callPackage ../tools/misc/apkeep { + inherit (darwin.apple_sdk.frameworks) Security; + }; + apngasm = callPackage ../applications/graphics/apngasm {}; apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix {}; @@ -23827,6 +24008,8 @@ with pkgs; arion = callPackage ../applications/virtualization/arion { }; + arkade = callPackage ../applications/networking/cluster/arkade { }; + asuka = callPackage ../applications/networking/browsers/asuka { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -24022,7 +24205,7 @@ with pkgs; gtk = gtk3; }; - bluej = callPackage ../applications/editors/bluej/default.nix { + bluej = callPackage ../applications/editors/bluej { jdk = jetbrains.jdk; }; @@ -24320,9 +24503,9 @@ with pkgs; dablin = callPackage ../applications/radio/dablin { }; - darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { + darcs = haskell.lib.compose.overrideCabal (drv: { configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; - }); + }) (haskell.lib.compose.justStaticExecutables haskellPackages.darcs); darcs-to-git = callPackage ../applications/version-management/git-and-tools/darcs-to-git { }; @@ -24384,7 +24567,7 @@ with pkgs; djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; djview = libsForQt5.callPackage ../applications/graphics/djview { }; - djview4 = pkgs.djview; + djview4 = djview; dmenu = callPackage ../applications/misc/dmenu { }; dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { }; @@ -24656,7 +24839,7 @@ with pkgs; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; - greenfoot = callPackage ../applications/editors/greenfoot/default.nix { + greenfoot = callPackage ../applications/editors/greenfoot { jdk = jetbrains.jdk; }; @@ -24751,7 +24934,6 @@ with pkgs; fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; }; - fluidsynth_1 = fluidsynth.override { version = "1"; }; fmit = libsForQt5.callPackage ../applications/audio/fmit { }; @@ -24810,7 +24992,7 @@ with pkgs; genxword = callPackage ../applications/misc/genxword { }; - geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; + geoipupdate = callPackage ../applications/misc/geoipupdate { }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -25025,7 +25207,7 @@ with pkgs; filezilla = callPackage ../applications/networking/ftp/filezilla { }; firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { - callPackage = pkgs.newScope { + callPackage = newScope { inherit (rustPackages) cargo rustc; libpng = libpng_apng; gnused = gnused_422; @@ -25302,7 +25484,7 @@ with pkgs; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; - deadd-notification-center = callPackage ../applications/misc/deadd-notification-center/default.nix { }; + deadd-notification-center = callPackage ../applications/misc/deadd-notification-center { }; lollypop = callPackage ../applications/audio/lollypop { }; @@ -25386,6 +25568,8 @@ with pkgs; gtkpod = callPackage ../applications/audio/gtkpod { }; + q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; + qrcodegen = callPackage ../development/libraries/qrcodegen { }; qrencode = callPackage ../development/libraries/qrencode { }; @@ -25530,12 +25714,12 @@ with pkgs; hivelytracker = callPackage ../applications/audio/hivelytracker { }; - hledger = haskell.lib.justStaticExecutables haskellPackages.hledger; + hledger = haskell.lib.compose.justStaticExecutables haskellPackages.hledger; hledger-check-fancyassertions = callPackage ../applications/office/hledger-check-fancyassertions { }; - hledger-iadd = haskell.lib.justStaticExecutables haskellPackages.hledger-iadd; - hledger-interest = haskell.lib.justStaticExecutables haskellPackages.hledger-interest; - hledger-ui = haskell.lib.justStaticExecutables haskellPackages.hledger-ui; - hledger-web = haskell.lib.justStaticExecutables haskellPackages.hledger-web; + hledger-iadd = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-iadd; + hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest; + hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui; + hledger-web = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-web; homebank = callPackage ../applications/office/homebank { gtk = gtk3; @@ -25553,9 +25737,9 @@ with pkgs; hdl-dump = callPackage ../tools/misc/hdl-dump { }; - hpack = haskell.lib.justStaticExecutables haskellPackages.hpack; + hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; - hpcg = callPackage ../tools/misc/hpcg/default.nix { }; + hpcg = callPackage ../tools/misc/hpcg { }; hpl = callPackage ../tools/misc/hpl { }; @@ -25606,12 +25790,16 @@ with pkgs; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; + indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { ocamlPackages = ocaml-ng.ocamlPackages_4_08; }; leftwm = callPackage ../applications/window-managers/leftwm { }; + levant = callPackage ../applications/networking/cluster/levant { }; + lwm = callPackage ../applications/window-managers/lwm { }; marker = callPackage ../applications/editors/marker { }; @@ -25624,11 +25812,13 @@ with pkgs; pinboard = with python3Packages; toPythonApplication pinboard; - pinboard-notes-backup = haskell.lib.justStaticExecutables haskellPackages.pinboard-notes-backup; + pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup; pixelnuke = callPackage ../applications/graphics/pixelnuke { }; - pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap/default.nix { }; + pixeluvo = callPackage ../applications/graphics/pixeluvo { }; + + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; @@ -25758,11 +25948,11 @@ with pkgs; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; - windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; + windowchef = callPackage ../applications/window-managers/windowchef { }; wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; - wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; + wmfs = callPackage ../applications/window-managers/wmfs { }; i810switch = callPackage ../os-specific/linux/i810switch { }; @@ -25799,6 +25989,8 @@ with pkgs; imagej = callPackage ../applications/graphics/imagej { }; + fiji = callPackage ../applications/graphics/fiji { }; + imagemagick6_light = imagemagick6.override { bzip2 = null; zlib = null; @@ -25868,7 +26060,7 @@ with pkgs; img2pdf = with python3Packages; toPythonApplication img2pdf; - imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { + imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { typescript = nodePackages.typescript; }; @@ -26111,6 +26303,8 @@ with pkgs; kube-score = callPackage ../applications/networking/cluster/kube-score { }; + kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod { }; + kubeval = callPackage ../applications/networking/cluster/kubeval { }; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; @@ -26175,6 +26369,8 @@ with pkgs; chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { }; + helm-docs = callPackage ../applications/networking/cluster/helm-docs { }; + kubetail = callPackage ../applications/networking/cluster/kubetail { } ; kupfer = callPackage ../applications/misc/kupfer { }; @@ -26274,6 +26470,10 @@ with pkgs; }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; + libresprite = callPackage ../applications/editors/libresprite { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; + }; + libvmi = callPackage ../development/libraries/libvmi { }; libutp = callPackage ../applications/networking/p2p/libutp { }; @@ -26304,6 +26504,8 @@ with pkgs; lighthouse = callPackage ../applications/misc/lighthouse { }; + lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { }; + lighttable = callPackage ../applications/editors/lighttable {}; libdsk = callPackage ../misc/emulators/libdsk { }; @@ -26504,13 +26706,14 @@ with pkgs; menyoki = callPackage ../applications/graphics/menyoki { inherit (xorg) libX11 libXrandr; + inherit (darwin.apple_sdk.frameworks) AppKit; }; mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - mercurialFull = appendToName "full" (pkgs.mercurial.override { fullBuild = true; }); + mercurialFull = appendToName "full" (mercurial.override { fullBuild = true; }); merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; @@ -26624,7 +26827,7 @@ with pkgs; mop = callPackage ../applications/misc/mop { }; - mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { + mopidyPackages = callPackages ../applications/audio/mopidy { python = python3; }; @@ -26706,6 +26909,8 @@ with pkgs; nload = callPackage ../applications/networking/nload { }; + nali = callPackage ../applications/networking/nali { }; + normalize = callPackage ../applications/audio/normalize { }; mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; @@ -26912,8 +27117,6 @@ with pkgs; yambar = callPackage ../applications/misc/yambar { }; - yambar-wayland = callPackage ../applications/misc/yambar { waylandSupport = true; }; - polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { @@ -26980,6 +27183,8 @@ with pkgs; mlt-qt5 = libsForQt514.mlt; }; + synology-drive = libsForQt5.callPackage ../applications/networking/synology-drive { }; + taxi = callPackage ../applications/networking/ftp/taxi { }; librep = callPackage ../development/libraries/librep { }; @@ -27102,9 +27307,9 @@ with pkgs; muchsync = callPackage ../applications/networking/mailreaders/notmuch/muchsync.nix { }; - nufraw = callPackage ../applications/graphics/nufraw/default.nix { }; + nufraw = callPackage ../applications/graphics/nufraw { }; - nufraw-thumbnailer = callPackage ../applications/graphics/nufraw/default.nix { + nufraw-thumbnailer = callPackage ../applications/graphics/nufraw { addThumbnailer = true; }; @@ -27242,6 +27447,10 @@ with pkgs; pantalaimon = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { }; + pantalaimon-headless = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { + enableDbusUi = false; + }; + pavucontrol = callPackage ../applications/audio/pavucontrol { }; paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; @@ -27376,6 +27585,8 @@ with pkgs; purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; + purple-googlechat = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-googlechat { }; + purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { }; @@ -27688,6 +27899,8 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; + roomeqwizard = callPackage ../applications/audio/roomeqwizard { }; + radiotray-ng = callPackage ../applications/audio/radiotray-ng { wxGTK = wxGTK30; }; @@ -27953,6 +28166,8 @@ with pkgs; dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; + synology-drive-client = callPackage ../applications/networking/synology-drive-client { }; + maestral = with python3Packages; toPythonApplication maestral; maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; @@ -28012,7 +28227,7 @@ with pkgs; super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; - super-slicer-staging = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).staging; + super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).latest; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; @@ -28059,7 +28274,7 @@ with pkgs; spotify-unwrapped = callPackage ../applications/audio/spotify { curl = curl.override { - sslSupport = false; gnutlsSupport = true; + opensslSupport = false; gnutlsSupport = true; }; }; @@ -28125,7 +28340,7 @@ with pkgs; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) subversion_1_10 subversion; - subversionClient = appendToName "client" (pkgs.subversion.override { + subversionClient = appendToName "client" (subversion.override { bdbSupport = false; perlBindings = true; pythonBindings = true; @@ -28144,6 +28359,8 @@ with pkgs; git = gitMinimal; }; + surge-XT = callPackage ../applications/audio/surge-XT { }; + survex = callPackage ../applications/misc/survex { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -28224,7 +28441,7 @@ with pkgs; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskell = haskell.lib.justStaticExecutables haskellPackages.taskell; + taskell = haskell.lib.compose.justStaticExecutables haskellPackages.taskell; tap-plugins = callPackage ../applications/audio/tap-plugins { }; @@ -28308,7 +28525,7 @@ with pkgs; thonny = callPackage ../applications/editors/thonny { }; thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { - callPackage = pkgs.newScope { + callPackage = newScope { inherit (rustPackages) cargo rustc; libpng = libpng_apng; gnused = gnused_422; @@ -28529,7 +28746,7 @@ with pkgs; uroboros = callPackage ../tools/system/uroboros { }; - uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; + uuagc = haskell.lib.compose.justStaticExecutables haskellPackages.uuagc; uucp = callPackage ../tools/misc/uucp { }; @@ -28596,7 +28813,7 @@ with pkgs; vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; - vimv = callPackage ../tools/misc/vimv/default.nix { }; + vimv = callPackage ../tools/misc/vimv { }; qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; @@ -28622,7 +28839,7 @@ with pkgs; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { - gtk = pkgs.gtk3; + gtk = gtk3; }; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; @@ -28756,6 +28973,11 @@ with pkgs; vscodium-fhs = vscodium.fhs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; + openvscode-server = callPackage ../servers/openvscode-server { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + inherit (darwin) cctools; + }; + code-server = callPackage ../servers/code-server { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; inherit (darwin) cctools; @@ -28926,94 +29148,6 @@ with pkgs; wp-cli = callPackage ../development/tools/wp-cli { }; - retroArchCores = - let - cfg = config.retroarch or {}; - inherit (lib) optional; - in with libretro; - ([ ] - ++ optional (cfg.enableAtari800 or false) atari800 - ++ optional (cfg.enableBeetleGBA or false) beetle-gba - ++ optional (cfg.enableBeetleLynx or false) beetle-lynx - ++ optional (cfg.enableBeetleNGP or false) beetle-ngp - ++ optional (cfg.enableBeetlePCEFast or false) beetle-pce-fast - ++ optional (cfg.enableBeetlePCFX or false) beetle-pcfx - ++ optional (cfg.enableBeetlePSX or false) beetle-psx - ++ optional (cfg.enableBeetlePSXHW or false) beetle-psx-hw - ++ optional (cfg.enableBeetleSaturn or false) beetle-saturn - ++ optional (cfg.enableBeetleSaturnHW or false) beetle-saturn-hw - ++ optional (cfg.enableBeetleSNES or false) beetle-snes - ++ optional (cfg.enableBeetleSuperGrafx or false) beetle-supergrafx - ++ optional (cfg.enableBeetleWswan or false) beetle-wswan - ++ optional (cfg.enableBeetleVB or false) beetle-vb - ++ optional (cfg.enableBlueMSX or false) bluemsx - ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury - ++ optional (cfg.enableCitra or false) citra - ++ optional (cfg.enableDesmume or false) desmume - ++ optional (cfg.enableDesmume2015 or false) desmume2015 - ++ optional (cfg.enableDolphin or false) dolphin - ++ optional (cfg.enableDOSBox or false) dosbox - ++ optional (cfg.enableEightyOne or false) eightyone - ++ optional (cfg.enableFBAlpha2012 or false) fbalpha2012 - ++ optional (cfg.enableFBNeo or false) fbneo - ++ optional (cfg.enableFceumm or false) fceumm - ++ optional (cfg.enableFlycast or false) flycast - ++ optional (cfg.enableFMSX or false) fmsx - ++ optional (cfg.enableFreeIntv or false) freeintv - ++ optional (cfg.enableGambatte or false) gambatte - ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx - ++ optional (cfg.enableGpsp or false) gpsp - ++ optional (cfg.enableGW or false) gw - ++ optional (cfg.enableHandy or false) handy - ++ optional (cfg.enableHatari or false) hatari - ++ optional (cfg.enableMAME or false) mame - ++ optional (cfg.enableMAME2000 or false) mame2000 - ++ optional (cfg.enableMAME2003 or false) mame2003 - ++ optional (cfg.enableMAME2003Plus or false) mame2003-plus - ++ optional (cfg.enableMAME2010 or false) mame2010 - ++ optional (cfg.enableMAME2015 or false) mame2015 - ++ optional (cfg.enableMAME2016 or false) mame2016 - ++ optional (cfg.enableMesen or false) mesen - ++ optional (cfg.enableMeteor or false) meteor - ++ optional (cfg.enableMGBA or false) mgba - ++ optional (cfg.enableMupen64Plus or false) mupen64plus - ++ optional (cfg.enableNeoCD or false) neocd - ++ optional (cfg.enableNestopia or false) nestopia - ++ optional (cfg.enableNP2kai or false) np2kai - ++ optional (cfg.enableO2EM or false) o2em - ++ optional (cfg.enableOpera or false) opera - ++ optional (cfg.enableParallelN64 or false) parallel-n64 - ++ optional (cfg.enablePCSXRearmed or false) pcsx_rearmed - ++ optional (cfg.enablePicodrive or false) picodrive - ++ optional (cfg.enablePlay or false) play - ++ optional (cfg.enablePPSSPP or false) ppsspp - ++ optional (cfg.enablePrboom or false) prboom - ++ optional (cfg.enableProSystem or false) prosystem - ++ optional (cfg.enableQuickNES or false) quicknes - ++ optional (cfg.enableSameBoy or false) sameboy - ++ optional (cfg.enableScummVM or false) scummvm - ++ optional (cfg.enableSMSPlusGX or false) smsplus-gx - ++ optional (cfg.enableSnes9x or false) snes9x - ++ optional (cfg.enableSnes9x2002 or false) snes9x2002 - ++ optional (cfg.enableSnes9x2005 or false) snes9x2005 - ++ optional (cfg.enableSnes9x2010 or false) snes9x2010 - ++ optional (cfg.enableStella or false) stella - ++ optional (cfg.enableStella2014 or false) stella2014 - ++ optional (cfg.enableTGBDual or false) tgbdual - ++ optional (cfg.enableThePowderToy or false) the-powder-toy - ++ optional (cfg.enableTIC80 or false) tic80 - ++ optional (cfg.enableVbaNext or false) vba-next - ++ optional (cfg.enableVbaM or false) vba-m - ++ optional (cfg.enableVecx or false) vecx - ++ optional (cfg.enableVirtualJaguar or false) virtualjaguar - ++ optional (cfg.enableYabause or false) yabause - ); - - wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { - inherit retroarch; - cores = retroArchCores; - }; - wsjtx = qt5.callPackage ../applications/radio/wsjtx { }; wxhexeditor = callPackage ../applications/editors/wxhexeditor { @@ -29093,10 +29227,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = - callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { - cores = retroArchCores; - }; - xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; + callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { }; xca = libsForQt5.callPackage ../applications/misc/xca { }; @@ -29305,7 +29436,7 @@ with pkgs; inherit (gnome2) scrollkeeper libglade; }; - xygrib = libsForQt514.callPackage ../applications/misc/xygrib/default.nix {}; + xygrib = libsForQt514.callPackage ../applications/misc/xygrib {}; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -29433,7 +29564,8 @@ with pkgs; aeon = callPackage ../applications/blockchains/aeon { }; alfis = callPackage ../applications/blockchains/alfis { - inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; + inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; + inherit (gnome) zenity; }; alfis-nogui = alfis.override { withGui = false; @@ -29442,16 +29574,25 @@ with pkgs; balanceofsatoshis = nodePackages.balanceofsatoshis; bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { + boost = boost17x; miniupnpc = miniupnpc_2; withGui = true; + inherit (darwin) autoSignDarwinBinariesHook; }; bitcoind = callPackage ../applications/blockchains/bitcoin { + boost = boost17x; miniupnpc = miniupnpc_2; withGui = false; + inherit (darwin) autoSignDarwinBinariesHook; }; - bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; }; + bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { + boost = boost17x; + miniupnpc = miniupnpc_2; + withGui = false; + inherit (darwin) autoSignDarwinBinariesHook; + }; cgminer = callPackage ../applications/blockchains/cgminer { }; @@ -29724,9 +29865,7 @@ with pkgs; bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; - bench = haskell.lib.justStaticExecutables haskellPackages.bench; - - beret = callPackage ../games/beret { }; + bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; black-hole-solver = callPackage ../games/black-hole-solver { inherit (perlPackages) PathTiny; @@ -29776,13 +29915,13 @@ with pkgs; chocolateDoom = callPackage ../games/chocolate-doom { }; - clonehero-unwrapped = pkgs.callPackage ../games/clonehero { }; + clonehero-unwrapped = callPackage ../games/clonehero { }; - clonehero = pkgs.callPackage ../games/clonehero/fhs-wrapper.nix { }; + clonehero = callPackage ../games/clonehero/fhs-wrapper.nix { }; crispyDoom = callPackage ../games/crispy-doom { }; - vintagestory = callPackage ../games/vintagestory/default.nix { }; + vintagestory = callPackage ../games/vintagestory { }; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; @@ -29997,7 +30136,6 @@ with pkgs; gemrb = callPackage ../games/gemrb { }; gimx = callPackage ../games/gimx {}; - gimx-afterglow = lowPrio (gimx.override { gimxAuth = "afterglow"; }); gl117 = callPackage ../games/gl-117 {}; @@ -30755,7 +30893,7 @@ with pkgs; inherit (cinnamon) mint-x-icons mint-y-icons; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { - callPackage = newScope pkgs.enlightenment; + callPackage = newScope enlightenment; }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); @@ -30812,7 +30950,7 @@ with pkgs; }; arcan = recurseIntoAttrs (callPackage ../desktops/arcan { - callPackage = newScope pkgs.arcan; + callPackage = newScope arcan; }); xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); @@ -31077,7 +31215,7 @@ with pkgs; snpeff = callPackage ../applications/science/biology/snpeff { }; - somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { }; + somafm-cli = callPackage ../tools/misc/somafm-cli { }; somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; @@ -31431,6 +31569,8 @@ with pkgs; honeytrap = callPackage ../tools/security/honeytrap { }; + kissat = callPackage ../applications/science/logic/kissat {}; + tini = callPackage ../applications/virtualization/tini {}; ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; @@ -31450,6 +31590,8 @@ with pkgs; key = callPackage ../applications/science/logic/key { }; + keymapviz = callPackage ../tools/misc/keymapviz { }; + lean = callPackage ../applications/science/logic/lean {}; lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; @@ -31878,7 +32020,7 @@ with pkgs; android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; - antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { }; + antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; atari800 = callPackage ../misc/emulators/atari800 { }; @@ -32242,6 +32384,12 @@ with pkgs; mame = libsForQt514.callPackage ../misc/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; + # TODO: remove it on mame 0.238 + stdenv = + if stdenv.cc.isClang then + overrideCC stdenv clang_6 + else + stdenv; }; martyr = callPackage ../development/libraries/martyr { }; @@ -32345,8 +32493,8 @@ with pkgs; nixos = configuration: let - c = import (pkgs.path + "/nixos/lib/eval-config.nix") { - inherit (pkgs.stdenv.hostPlatform) system; + c = import (path + "/nixos/lib/eval-config.nix") { + inherit (stdenv.hostPlatform) system; modules = [( { lib, ... }: { @@ -32396,7 +32544,7 @@ with pkgs; */ nixosTesting = (import ../../nixos/lib/testing-python.nix { - inherit (pkgs.stdenv.hostPlatform) system; + inherit (stdenv.hostPlatform) system; inherit pkgs; extraConfigurations = [( { lib, ... }: { @@ -32410,14 +32558,14 @@ with pkgs; loadedTest = if builtins.typeOf test == "path" then import test else test; - calledTest = if pkgs.lib.isFunction loadedTest + calledTest = if lib.isFunction loadedTest then callPackage loadedTest {} else loadedTest; in nixosTesting.makeTest calledTest; nixosOptionsDoc = attrs: - (import ../../nixos/lib/make-options-doc/default.nix) + (import ../../nixos/lib/make-options-doc) ({ inherit pkgs lib; } // attrs); nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { }; @@ -32434,9 +32582,9 @@ with pkgs; nix-bundle = callPackage ../tools/package-management/nix-bundle { }; - nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; - nix-deploy = haskell.lib.justStaticExecutables haskellPackages.nix-deploy; - nix-diff = haskell.lib.justStaticExecutables haskellPackages.nix-diff; + nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate; + nix-deploy = haskell.lib.compose.justStaticExecutables haskellPackages.nix-deploy; + nix-diff = haskell.lib.compose.justStaticExecutables haskellPackages.nix-diff; nix-du = callPackage ../tools/package-management/nix-du { inherit (darwin.apple_sdk.frameworks) Security; @@ -32450,7 +32598,7 @@ with pkgs; }; nix-index = callPackage ../tools/package-management/nix-index/wrapper.nix { }; - nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter); + nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter); nixos-option = callPackage ../tools/nix/nixos-option { nix = nix_2_3; }; @@ -32481,7 +32629,7 @@ with pkgs; nix-top = callPackage ../tools/package-management/nix-top { }; - nix-tree = haskell.lib.justStaticExecutables (haskellPackages.nix-tree); + nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree); nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { }; @@ -32497,7 +32645,7 @@ with pkgs; nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; - nixfmt = haskell.lib.justStaticExecutables haskellPackages.nixfmt; + nixfmt = haskell.lib.compose.justStaticExecutables haskellPackages.nixfmt; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; @@ -32644,7 +32792,9 @@ with pkgs; qdl = callPackage ../tools/misc/qdl { }; - rates = callPackage ../tools/misc/rates { }; + rates = callPackage ../tools/misc/rates { + inherit (darwin.apple_sdk.frameworks) Security; + }; rargs = callPackage ../tools/misc/rargs { }; @@ -32654,15 +32804,23 @@ with pkgs; redprl = callPackage ../applications/science/logic/redprl { }; - renderizer = pkgs.callPackage ../development/tools/renderizer {}; + renderizer = callPackage ../development/tools/renderizer {}; retroarchBare = callPackage ../misc/emulators/retroarch { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; }; + wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { + inherit retroarch; + }; + retroarch = wrapRetroArch { retroarch = retroarchBare; }; + retroarchFull = retroarch.override { + cores = builtins.filter (c: c ? libretroCore) (builtins.attrValues libretro); + }; + libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { retroarch = retroarchBare; }); @@ -32733,8 +32891,8 @@ with pkgs; mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { }; # This driver is only available as a 32 bit proprietary binary driver - mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).driver; - mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw/default.nix { }).cupswrapper; + mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver; + mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper; mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; @@ -32742,7 +32900,7 @@ with pkgs; mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { }; mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { }; - samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36/default.nix { }; + samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36 { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; @@ -32881,6 +33039,8 @@ with pkgs; tfswitch = callPackage ../applications/networking/cluster/tfswitch {}; + tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; + tilt = callPackage ../applications/networking/cluster/tilt {}; timeular = callPackage ../applications/office/timeular {}; @@ -33586,7 +33746,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; }; - cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { }; + cagebreak = callPackage ../applications/window-managers/cagebreak { }; psftools = callPackage ../os-specific/linux/psftools {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5e73426afbc..bf5b65f9388 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -88,6 +88,7 @@ let semantics = callPackage ../development/coq-modules/semantics {}; serapi = callPackage ../development/coq-modules/serapi {}; simple-io = callPackage ../development/coq-modules/simple-io { }; + smpl = callPackage ../development/coq-modules/smpl { }; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; tlc = callPackage ../development/coq-modules/tlc {}; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 1ca8621b711..f0fcef73383 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -6,7 +6,6 @@ , fetchFromGitHub , fetchNuGet , glib -, pkg-config , mono , overrides ? {} }: diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3b89aabf1fd..bf340c10cb3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -19,13 +19,13 @@ let "ghcHEAD" ]; - haskellLib = import ../development/haskell-modules/lib.nix { + haskellLibUncomposable = import ../development/haskell-modules/lib.nix { inherit (pkgs) lib; inherit pkgs; }; callPackage = newScope { - inherit haskellLib; + haskellLib = haskellLibUncomposable.compose; overrides = pkgs.haskell.packageOverrides; }; @@ -44,7 +44,7 @@ let inherit (pkgs.haskell) compiler packages; in { - lib = haskellLib; + lib = haskellLibUncomposable; package-list = callPackage ../development/haskell-modules/package-list.nix {}; @@ -108,6 +108,7 @@ in { else packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.darwin) autoSignDarwinBinariesHook; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; }; @@ -122,17 +123,17 @@ in { # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr; + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc901; # no binary yet + bootPkgs = packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr; + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; libffi = pkgs.libffi; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index a7a24a2edb7..175e940eed2 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -3,7 +3,7 @@ with lib; let - inherit (libretro) genesis-plus-gx snes9x; + inherit (libretro) genesis-plus-gx mgba snes9x; in let self = rec { @@ -78,6 +78,8 @@ let self = rec { libretro-genplus = callPackage ../applications/video/kodi-packages/libretro-genplus { inherit genesis-plus-gx; }; + libretro-mgba = callPackage ../applications/video/kodi-packages/libretro-mgba { inherit mgba; }; + libretro-snes9x = callPackage ../applications/video/kodi-packages/libretro-snes9x { inherit snes9x; }; jellyfin = callPackage ../applications/video/kodi-packages/jellyfin { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8c97a418b29..2aa9f8482f1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -159,14 +159,6 @@ in { ]; }; - linux_rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -181,12 +173,17 @@ in { ]; }; - linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_testing = let + testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + latest = packageAliases.linux_latest.kernel; + in if latest.kernelAtLeast testing.baseVersion + then latest + else testing; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { kernel = linux_5_15; @@ -233,6 +230,7 @@ in { linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { }; + linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; })); /* Linux kernel modules are inherently tied to a specific kernel. So @@ -482,7 +480,6 @@ in { # realtime kernel packages linux_rt_5_4 = packagesFor kernels.linux_rt_5_4; linux_rt_5_10 = packagesFor kernels.linux_rt_5_10; - linux_rt_5_11 = packagesFor kernels.linux_rt_5_11; }; rpiPackages = { @@ -506,6 +503,7 @@ in { linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { }); linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { }); + linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); @@ -524,7 +522,7 @@ in { linux_latest = packages.linux_5_15; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; - linux_rt_latest = packages.linux_rt_5_11; + linux_rt_latest = packages.linux_rt_5_10; linux_hardkernel_latest = packages.hardkernel_4_14; }; diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index c045439da1a..d413b881eaa 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -4,11 +4,11 @@ with pkgs; runCommand "nixpkgs-metrics" { nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ]; - #FIXME: the job doesn't work, see issue #76776 - #requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time + requiredSystemFeatures = [ "benchmark" ]; # dedicated `t2a` machine, by @vcunat } '' - export NIX_STATE_DIR=$TMPDIR + export NIX_STORE_DIR=$TMPDIR/store + export NIX_STATE_DIR=$TMPDIR/state export NIX_PAGER= nix-store --init diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index 5d45b0c5eca..6c8c5ff7cc7 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -48,22 +48,41 @@ lib.makeScope newScope (self: pixie = callPackage ../development/nim-packages/pixie { }; + python = callPackage ../development/nim-packages/python { }; + redis = callPackage ../development/nim-packages/redis { }; redpool = callPackage ../development/nim-packages/redpool { }; regex = callPackage ../development/nim-packages/regex { }; + rocksdb = callPackage ../development/nim-packages/rocksdb { + inherit (pkgs) rocksdb; + }; + sass = callPackage ../development/nim-packages/sass { }; sdl2 = callPackage ../development/nim-packages/sdl2 { }; segmentation = callPackage ../development/nim-packages/segmentation { }; + snappy = + callPackage ../development/nim-packages/snappy { inherit (pkgs) snappy; }; + + spry = callPackage ../development/nim-packages/spry { }; + + spryvm = callPackage ../development/nim-packages/spryvm { }; + + stew = callPackage ../development/nim-packages/stew { }; + supersnappy = callPackage ../development/nim-packages/supersnappy { }; + tempfile = callPackage ../development/nim-packages/tempfile { }; + typography = callPackage ../development/nim-packages/typography { }; + ui = callPackage ../development/nim-packages/ui { inherit (pkgs) libui; }; + unicodedb = callPackage ../development/nim-packages/unicodedb { }; unicodeplus = callPackage ../development/nim-packages/unicodeplus { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 87d6f4619bb..b2d2d2415e2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -344,8 +344,8 @@ let then ppxlib.override { version = "0.15.0"; } else ppxlib; in { - ppx_deriving = ppx_deriving.override { ppxlib = ppxlib_0_15; }; - ppxlib = ppxlib_0_15; + ppx_deriving_0_15 = ppx_deriving.override { ppxlib = ppxlib_0_15; }; + inherit ppxlib_0_15; } ); @@ -1058,9 +1058,7 @@ let ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; - ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { - ppxlib = ppxlib.override { version = "0.22.0"; }; - }; + ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; @@ -1152,9 +1150,7 @@ let ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix { }; - ppx_cstubs = callPackage ../development/ocaml-modules/ppx_cstubs { - ppxlib = ppxlib.override { version = "0.22.0"; }; - }; + ppx_cstubs = callPackage ../development/ocaml-modules/ppx_cstubs { }; ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {}; @@ -1463,7 +1459,7 @@ let if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { inherit self; - inherit (pkgs) lib openssl zstd; + inherit (pkgs) fetchpatch lib openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix index 115b38095ed..b4aeb905280 100644 --- a/pkgs/top-level/octave-packages.nix +++ b/pkgs/top-level/octave-packages.nix @@ -214,7 +214,7 @@ makeScope newScope (self: windows = callPackage ../development/octave-modules/windows { }; zeromq = callPackage ../development/octave-modules/zeromq { - inherit (pkgs) zeromq; + inherit (pkgs) zeromq autoreconfHook; }; }) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 38604bf4ac4..70b7926d30e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3501,10 +3501,10 @@ let CompressRawBzip2 = buildPerlPackage { pname = "Compress-Raw-Bzip2"; - version = "2.096"; + version = "2.101"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.096.tar.gz"; - sha256 = "1glcjnbqksaviwyrprh9i4dybsb12kzfy0bx932l0xya9riyfr55"; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.101.tar.gz"; + sha256 = "1n5q01akpsw1skn59c3nivwjfqcn00wzdj8gx4q0wac8sd7i76qc"; }; # Don't build a private copy of bzip2. @@ -3540,11 +3540,11 @@ let CompressRawZlib = buildPerlPackage { pname = "Compress-Raw-Zlib"; - version = "2.096"; + version = "2.101"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.096.tar.gz"; - sha256 = "04jrqvqsa2c655idw7skv5rhb9vx9997h4n9if5p99srq4hblk6d"; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.101.tar.gz"; + sha256 = "1cmb39dw928jssa3fzk4pxb7sw8q1zyx3yikgq01nz17x0ara6wx"; }; preConfigure = '' @@ -8046,6 +8046,11 @@ let }; nativeBuildInputs = [ buildPackages.pkg-config ]; propagatedBuildInputs = [ pkgs.pkg-config ]; + postPatch = '' + # no pkg-config binary when cross-compiling so the check fails + substituteInPlace Makefile.PL \ + --replace "pkg-config" "$PKG_CONFIG" + ''; doCheck = false; # expects test_glib-2.0.pc in PKG_CONFIG_PATH meta = { homepage = "http://gtk2-perl.sourceforge.net"; @@ -10994,10 +10999,10 @@ let IOCompress = buildPerlPackage { pname = "IO-Compress"; - version = "2.096"; + version = "2.102"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.096.tar.gz"; - sha256 = "9d219fd5df4b490b5d2f847921e3cb1c3392758fa0bae9b05a8992b3620ba572"; + url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.102.tar.gz"; + sha256 = "193jvi4800cbcac5n1swj9zgwwqck9c47g0g592ldr7fbfd7zynn"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; meta = { @@ -11810,6 +11815,13 @@ let url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.12.tar.gz"; sha256 = "1px35q9qchzd7rxqldj87vbrall8v31blidhmh0d25d5hyq9lw25"; }; + patches = [ + (fetchpatch { + name = "deterministic-libnet.cfg"; + url = "https://github.com/steve-m-hay/perl-libnet/commit/7d076c4352f67ee4ed64092cfad3963a2321bd53.patch"; + sha256 = "0pg9w2m08janqn5nrp4x9w5hbcsyxz87hfskd21zzfrzjk8z28qv"; + }) + ]; meta = { description = "Collection of network protocol modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -24546,7 +24558,15 @@ let url = "mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz"; sha256 = "1cjpghw7cnackw20lbd7yzm222kz5bnrwz52f8ay24d1f4pwrnxf"; }; + patches = [ + # Pull upstream fix for parallel build failure + (fetchpatch { + url = "https://github.com/stapelberg/X11-XCB/commit/813608dacdae1ae35c9eb0f171a958617e014520.patch"; + sha256 = "017f5r4fyryhzgp99lw3csrl21r27hmqv483vp9fdz9xkvrmh743"; + }) + ]; AUTOMATED_TESTING = false; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ]; NIX_CFLAGS_LINK = "-lxcb -lxcb-util -lxcb-xinerama -lxcb-icccm"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3b7be354942..578803d0da7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -48,6 +48,7 @@ mapAliases ({ django_taggit = django-taggit; # added 2021-10-11 dns = dnspython; # added 2017-12-10 dogpile_cache = dogpile-cache; # added 2021-10-28 + dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 @@ -75,14 +76,19 @@ mapAliases ({ pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 + python-igraph = igraph; # added 2021-11-11 python-lz4 = lz4; # added 2018-06-01 python_mimeparse = python-mimeparse; # added 2021-10-31 python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 requests_toolbelt = requests-toolbelt; # added 2017-09-26 rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + ruamel_base = ruamel-base; # added 2021-11-01 + ruamel_yaml = ruamel-yaml; # added 2021-11-01 + ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01 scikitlearn = scikit-learn; # added 2021-07-21 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b97a7007ead..40b820b3a0c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -221,6 +221,8 @@ in { affine = callPackage ../development/python-modules/affine { }; + afsapi = callPackage ../development/python-modules/afsapi { }; + agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; @@ -247,6 +249,8 @@ in { aioapns = callPackage ../development/python-modules/aioapns { }; + aiocron = callPackage ../development/python-modules/aiocron { }; + ailment = callPackage ../development/python-modules/ailment { }; aioamqp = callPackage ../development/python-modules/aioamqp { }; @@ -293,9 +297,7 @@ in { aiohomekit = callPackage ../development/python-modules/aiohomekit { }; - aiohttp = callPackage ../development/python-modules/aiohttp { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + aiohttp = callPackage ../development/python-modules/aiohttp { }; aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; @@ -315,6 +317,8 @@ in { aiohue = callPackage ../development/python-modules/aiohue { }; + aiohwenergy = callPackage ../development/python-modules/aiohwenergy { }; + aioimaplib = callPackage ../development/python-modules/aioimaplib { }; aioinflux = callPackage ../development/python-modules/aioinflux { }; @@ -397,6 +401,8 @@ in { aiounittest = callPackage ../development/python-modules/aiounittest { }; + aiovlc = callPackage ../development/python-modules/aiovlc { }; + aiowatttime = callPackage ../development/python-modules/aiowatttime { }; aiowinreg = callPackage ../development/python-modules/aiowinreg { }; @@ -1383,6 +1389,8 @@ in { cartopy = callPackage ../development/python-modules/cartopy { }; + casa-formats-io = callPackage ../development/python-modules/casa-formats-io { }; + casbin = callPackage ../development/python-modules/casbin { }; case = callPackage ../development/python-modules/case { }; @@ -1409,6 +1417,8 @@ in { cchardet = callPackage ../development/python-modules/cchardet { }; + cdcs = callPackage ../development/python-modules/cdcs { }; + celery = callPackage ../development/python-modules/celery { }; cement = callPackage ../development/python-modules/cement { }; @@ -2022,6 +2032,8 @@ in { devolo-home-control-api = callPackage ../development/python-modules/devolo-home-control-api { }; + devolo-plc-api = callPackage ../development/python-modules/devolo-plc-api { }; + devpi-common = callPackage ../development/python-modules/devpi-common { }; devtools = callPackage ../development/python-modules/devtools { }; @@ -2253,6 +2265,8 @@ in { dnspython = callPackage ../development/python-modules/dnspython { }; + dnspythonchia = callPackage ../development/python-modules/dnspythonchia { }; + doc8 = callPackage ../development/python-modules/doc8 { }; docker = callPackage ../development/python-modules/docker { }; @@ -2269,6 +2283,8 @@ in { docloud = callPackage ../development/python-modules/docloud { }; + docstring-to-markdown = callPackage ../development/python-modules/docstring-to-markdown { }; + docopt = callPackage ../development/python-modules/docopt { }; docopt-ng = callPackage ../development/python-modules/docopt-ng { }; @@ -2287,8 +2303,6 @@ in { dogpile-cache = callPackage ../development/python-modules/dogpile-cache { }; - dogpile-core = callPackage ../development/python-modules/dogpile-core { }; - dogtail = callPackage ../development/python-modules/dogtail { }; doit = callPackage ../development/python-modules/doit { }; @@ -2424,6 +2438,8 @@ in { eliot = callPackage ../development/python-modules/eliot { }; + eliqonline = callPackage ../development/python-modules/eliqonline { }; + elmax = callPackage ../development/python-modules/elmax { }; emailthreads = callPackage ../development/python-modules/emailthreads { }; @@ -2968,6 +2984,8 @@ in { pythonPackages = self; }); + gaphas = callPackage ../development/python-modules/gaphas { }; + garminconnect-aio = callPackage ../development/python-modules/garminconnect-aio { }; garminconnect-ha = callPackage ../development/python-modules/garminconnect-ha { }; @@ -3006,6 +3024,8 @@ in { genanki = callPackage ../development/python-modules/genanki { }; + generic = callPackage ../development/python-modules/generic { }; + genome-collector = callPackage ../development/python-modules/genome-collector { }; genpy = callPackage ../development/python-modules/genpy { }; @@ -3086,6 +3106,8 @@ in { gipc = callPackage ../development/python-modules/gipc { }; + gistyc = callPackage ../development/python-modules/gistyc { }; + git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { }; @@ -3136,6 +3158,8 @@ in { goocalendar = callPackage ../development/python-modules/goocalendar { }; + goodwe = callPackage ../development/python-modules/goodwe { }; + google-api-core = callPackage ../development/python-modules/google-api-core { }; google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; @@ -3440,6 +3464,8 @@ in { halo = callPackage ../development/python-modules/halo { }; + halohome = callPackage ../development/python-modules/halohome { }; + handout = callPackage ../development/python-modules/handout { }; hangups = callPackage ../development/python-modules/hangups { }; @@ -3460,6 +3486,8 @@ in { hdbscan = callPackage ../development/python-modules/hdbscan { }; + hdfs = callPackage ../development/python-modules/hdfs { }; + hdlparse = callPackage ../development/python-modules/hdlparse { }; hdmedians = callPackage ../development/python-modules/hdmedians { }; @@ -3692,6 +3720,10 @@ in { ignite = callPackage ../development/python-modules/ignite { }; + igraph = callPackage ../development/python-modules/igraph { + inherit (pkgs) igraph; + }; + ihatemoney = callPackage ../development/python-modules/ihatemoney { }; ijson = callPackage ../development/python-modules/ijson { }; @@ -3929,6 +3961,8 @@ in { jedi = callPackage ../development/python-modules/jedi { }; + jedi-language-server = callPackage ../development/python-modules/jedi-language-server { }; + jeepney = callPackage ../development/python-modules/jeepney { }; jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; @@ -4081,6 +4115,8 @@ in { jupytext = callPackage ../development/python-modules/jupytext { }; + justbackoff = callPackage ../development/python-modules/justbackoff { }; + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; jxmlease = callPackage ../development/python-modules/jxmlease { }; @@ -4224,6 +4260,8 @@ in { lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; + lc7001 = callPackage ../development/python-modules/lc7001 { }; + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; @@ -4252,6 +4290,8 @@ in { leveldb = callPackage ../development/python-modules/leveldb { }; + levenshtein = callPackage ../development/python-modules/levenshtein { }; + lexid = callPackage ../development/python-modules/lexid { }; lhapdf = toPythonModule (pkgs.lhapdf.override { @@ -4330,6 +4370,8 @@ in { libpyfoscam = callPackage ../development/python-modules/libpyfoscam { }; + libpyvivotek = callPackage ../development/python-modules/libpyvivotek { }; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -4406,6 +4448,8 @@ in { inherit python; })).py; + life360 = callPackage ../development/python-modules/life360 { }; + lightgbm = callPackage ../development/python-modules/lightgbm { }; lightning = callPackage ../development/python-modules/lightning { }; @@ -4513,6 +4557,8 @@ in { luftdaten = callPackage ../development/python-modules/luftdaten { }; + luxtronik = callPackage ../development/python-modules/luxtronik { }; + lupa = callPackage ../development/python-modules/lupa { }; lupupy = callPackage ../development/python-modules/lupupy { }; @@ -4581,6 +4627,10 @@ in { manhole = callPackage ../development/python-modules/manhole { }; + manimpango = callPackage ../development/python-modules/manimpango { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; + }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; manuel = callPackage ../development/python-modules/manuel { }; @@ -4633,7 +4683,7 @@ in { mathlibtools = callPackage ../development/python-modules/mathlibtools { }; - matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { + matplotlib = callPackage ../development/python-modules/matplotlib { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; @@ -4744,6 +4794,8 @@ in { milksnake = callPackage ../development/python-modules/milksnake { }; + mill-local = callPackage ../development/python-modules/mill-local { }; + millheater = callPackage ../development/python-modules/millheater { }; miniaudio = callPackage ../development/python-modules/miniaudio { }; @@ -4848,6 +4900,8 @@ in { mortgage = callPackage ../development/python-modules/mortgage { }; + motionblinds = callPackage ../development/python-modules/motionblinds { }; + motioneye-client = callPackage ../development/python-modules/motioneye-client { }; moto = callPackage ../development/python-modules/moto { }; @@ -4936,6 +4990,8 @@ in { mutf8 = callPackage ../development/python-modules/mutf8 { }; + mujson = callPackage ../development/python-modules/mujson { }; + mwclient = callPackage ../development/python-modules/mwclient { }; mwdblib = callPackage ../development/python-modules/mwdblib { }; @@ -5034,6 +5090,8 @@ in { neo = callPackage ../development/python-modules/neo { }; + nessclient = callPackage ../development/python-modules/nessclient { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; nestedtext = callPackage ../development/python-modules/nestedtext { }; @@ -5076,6 +5134,8 @@ in { Nikola = callPackage ../development/python-modules/Nikola { }; + niko-home-control = callPackage ../development/python-modules/niko-home-control { }; + nilearn = callPackage ../development/python-modules/nilearn { }; niluclient = callPackage ../development/python-modules/niluclient { }; @@ -5255,6 +5315,8 @@ in { ofxtools = callPackage ../development/python-modules/ofxtools { }; + oemthermostat = callPackage ../development/python-modules/oemthermostat { }; + olefile = callPackage ../development/python-modules/olefile { }; omegaconf = callPackage ../development/python-modules/omegaconf { }; @@ -5271,6 +5333,8 @@ in { onnx = callPackage ../development/python-modules/onnx { }; + oocsi = callPackage ../development/python-modules/oocsi { }; + open-garage = callPackage ../development/python-modules/open-garage { }; openant = callPackage ../development/python-modules/openant { }; @@ -5305,7 +5369,7 @@ in { openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; - openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { }; + openrouteservice = callPackage ../development/python-modules/openrouteservice { }; opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; @@ -5422,6 +5486,8 @@ in { pamqp = callPackage ../development/python-modules/pamqp { }; + panacotta = callPackage ../development/python-modules/panacotta { }; + pandas = callPackage ../development/python-modules/pandas { }; pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; @@ -5516,7 +5582,7 @@ in { pathvalidate = callPackage ../development/python-modules/pathvalidate { }; - pathy = callPackage ../development/python-modules/pathy/default.nix { }; + pathy = callPackage ../development/python-modules/pathy { }; patiencediff = callPackage ../development/python-modules/patiencediff { }; @@ -5751,6 +5817,8 @@ in { pysiaalarm = callPackage ../development/python-modules/pysiaalarm { }; + pyskyqhub = callPackage ../development/python-modules/pyskyqhub { }; + pysyncthru = callPackage ../development/python-modules/pysyncthru { }; python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; @@ -5900,6 +5968,8 @@ in { pot = callPackage ../development/python-modules/pot { }; + potentials = callPackage ../development/python-modules/potentials { }; + potr = callPackage ../development/python-modules/potr { }; power = callPackage ../development/python-modules/power { }; @@ -6079,10 +6149,14 @@ in { py-dmidecode = callPackage ../development/python-modules/py-dmidecode { }; + py-nightscout = callPackage ../development/python-modules/py-nightscout { }; + py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { }; py-ubjson = callPackage ../development/python-modules/py-ubjson { }; + py-zabbix = callPackage ../development/python-modules/py-zabbix { }; + py17track = callPackage ../development/python-modules/py17track { }; py2bit = callPackage ../development/python-modules/py2bit { }; @@ -6145,6 +6219,8 @@ in { pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; + pybalboa = callPackage ../development/python-modules/pybalboa { }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; pybids = callPackage ../development/python-modules/pybids { }; @@ -6174,7 +6250,7 @@ in { pybullet = callPackage ../development/python-modules/pybullet { }; pycairo = callPackage ../development/python-modules/pycairo { - inherit (pkgs) meson; + inherit (pkgs.buildPackages) meson; }; pycallgraph = callPackage ../development/python-modules/pycallgraph { }; @@ -6284,6 +6360,8 @@ in { pydbus = callPackage ../development/python-modules/pydbus { }; + pydeck = callPackage ../development/python-modules/pydeck { }; + pydeconz = callPackage ../development/python-modules/pydeconz { }; pydelijn = callPackage ../development/python-modules/pydelijn { }; @@ -6324,6 +6402,10 @@ in { pydy = callPackage ../development/python-modules/pydy { }; + pydyf = callPackage ../development/python-modules/pydyf { }; + + pyebus = callPackage ../development/python-modules/pyebus { }; + pyechonest = callPackage ../development/python-modules/pyechonest { }; pyeclib = callPackage ../development/python-modules/pyeclib { }; @@ -6350,12 +6432,16 @@ in { pyenvisalink = callPackage ../development/python-modules/pyenvisalink { }; + pyephember = callPackage ../development/python-modules/pyephember { }; + pyepsg = callPackage ../development/python-modules/pyepsg { }; pyerfa = callPackage ../development/python-modules/pyerfa { }; pyevmasm = callPackage ../development/python-modules/pyevmasm { }; + pyevilgenius = callPackage ../development/python-modules/pyevilgenius { }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; @@ -6564,6 +6650,8 @@ in { pylatexenc = callPackage ../development/python-modules/pylatexenc { }; + pylaunches = callPackage ../development/python-modules/pylaunches { }; + PyLD = callPackage ../development/python-modules/PyLD { }; pylev = callPackage ../development/python-modules/pylev { }; @@ -6740,6 +6828,8 @@ in { pynetdicom = callPackage ../development/python-modules/pynetdicom { }; + pynina = callPackage ../development/python-modules/pynina { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pynmea2 = callPackage ../development/python-modules/pynmea2 { }; @@ -6949,7 +7039,7 @@ in { pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; - PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; + pyrmvtransport = callPackage ../development/python-modules/pyrmvtransport { }; Pyro4 = callPackage ../development/python-modules/pyro4 { }; @@ -7021,6 +7111,8 @@ in { pysearpc = toPythonModule pkgs.libsearpc; + pysecuritas = callPackage ../development/python-modules/pysecuritas { }; + pysendfile = callPackage ../development/python-modules/pysendfile { }; pysensors = callPackage ../development/python-modules/pysensors { }; @@ -7489,10 +7581,6 @@ in { python-http-client = callPackage ../development/python-modules/python-http-client { }; - python-igraph = callPackage ../development/python-modules/python-igraph { - inherit (pkgs) igraph; - }; - pythonix = callPackage ../development/python-modules/pythonix { nix = pkgs.nix_2_3; meson = pkgs.meson.override { python3 = self.python; }; @@ -7720,6 +7808,8 @@ in { cudaSupport = false; }; + pytraccar = callPackage ../development/python-modules/pytraccar { }; + pytradfri = callPackage ../development/python-modules/pytradfri { }; pytrafikverket = callPackage ../development/python-modules/pytrafikverket { }; @@ -7769,6 +7859,8 @@ in { pyupgrade = callPackage ../development/python-modules/pyupgrade { }; + pyuptimerobot = callPackage ../development/python-modules/pyuptimerobot { }; + pyusb = callPackage ../development/python-modules/pyusb { inherit (pkgs) libusb1; }; @@ -7789,6 +7881,8 @@ in { pyverilog = callPackage ../development/python-modules/pyverilog { }; + pyversasense = callPackage ../development/python-modules/pyversasense { }; + pyvesync = callPackage ../development/python-modules/pyvesync { }; pyvex = callPackage ../development/python-modules/pyvex { }; @@ -7891,18 +7985,28 @@ in { qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; + qiskit = callPackage ../development/python-modules/qiskit { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - qiskit = callPackage ../development/python-modules/qiskit { }; + qiskit-finance = callPackage ../development/python-modules/qiskit-finance { }; qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; + qiskit-machine-learning = callPackage ../development/python-modules/qiskit-machine-learning { }; + + qiskit-nature = callPackage ../development/python-modules/qiskit-nature { }; + + qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { }; + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; + qnap-qsw = callPackage ../development/python-modules/qnap-qsw{ }; + qrcode = callPackage ../development/python-modules/qrcode { }; qreactor = callPackage ../development/python-modules/qreactor { }; @@ -7990,8 +8094,6 @@ in { rdflib = callPackage ../development/python-modules/rdflib { }; - rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; - rdkit = callPackage ../development/python-modules/rdkit { }; re-assert = callPackage ../development/python-modules/re-assert { }; @@ -8034,6 +8136,8 @@ in { reikna = callPackage ../development/python-modules/reikna { }; + related = callPackage ../development/python-modules/related { }; + relatorio = callPackage ../development/python-modules/relatorio { }; remarshal = callPackage ../development/python-modules/remarshal { }; @@ -8148,6 +8252,8 @@ in { rising = callPackage ../development/python-modules/rising { }; + ritassist = callPackage ../development/python-modules/ritassist { }; + rivet = toPythonModule (pkgs.rivet.override { python3 = python; }); @@ -8246,14 +8352,11 @@ in { rtslib = callPackage ../development/python-modules/rtslib { }; - ruamel-base = self.ruamel_base; - ruamel_base = callPackage ../development/python-modules/ruamel_base { }; + ruamel-base = callPackage ../development/python-modules/ruamel-base { }; - ruamel-yaml = self.ruamel_yaml; - ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; + ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { }; - ruamel-yaml-clib = self.ruamel_yaml_clib; - ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { }; + ruamel-yaml-clib = callPackage ../development/python-modules/ruamel-yaml-clib { }; rubymarshal = callPackage ../development/python-modules/rubymarshal { }; @@ -8385,7 +8488,7 @@ in { scikit-survival = callPackage ../development/python-modules/scikit-survival { }; - scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; + scs = callPackage ../development/python-modules/scs { }; sdnotify = callPackage ../development/python-modules/sdnotify { }; @@ -8534,7 +8637,7 @@ in { simplekml = callPackage ../development/python-modules/simplekml { }; - simple-di = callPackage ../development/python-modules/simple_di { }; + simple-di = callPackage ../development/python-modules/simple-di { }; simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; @@ -8548,7 +8651,7 @@ in { signify = callPackage ../development/python-modules/signify { }; - sip = callPackage ../development/python-modules/sip/default.nix { }; + sip = callPackage ../development/python-modules/sip { }; sip_4 = callPackage ../development/python-modules/sip/4.x.nix { }; @@ -8602,6 +8705,8 @@ in { slowapi = callPackage ../development/python-modules/slowapi { }; + slugid = callPackage ../development/python-modules/slugid { }; + sly = callPackage ../development/python-modules/sly { }; smart-meter-texas = callPackage ../development/python-modules/smart-meter-texas { }; @@ -8888,6 +8993,8 @@ in { stack-data = callPackage ../development/python-modules/stack-data { }; + stanza = callPackage ../development/python-modules/stanza { }; + starlette = callPackage ../development/python-modules/starlette { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -9058,6 +9165,8 @@ in { tailer = callPackage ../development/python-modules/tailer { }; + tailscale = callPackage ../development/python-modules/tailscale { }; + tappy = callPackage ../development/python-modules/tappy { }; tasklib = callPackage ../development/python-modules/tasklib { }; @@ -9309,6 +9418,8 @@ in { toposort = callPackage ../development/python-modules/toposort { }; + torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { }; + torchgpipe = callPackage ../development/python-modules/torchgpipe { }; torchvision = callPackage ../development/python-modules/torchvision { }; @@ -9477,6 +9588,10 @@ in { types-requests = callPackage ../development/python-modules/types-requests { }; + types-setuptools = callPackage ../development/python-modules/types-setuptools { }; + + types-toml = callPackage ../development/python-modules/types-toml { }; + typesentry = callPackage ../development/python-modules/typesentry { }; typesystem = callPackage ../development/python-modules/typesystem { }; @@ -9517,6 +9632,8 @@ in { ujson = callPackage ../development/python-modules/ujson { }; + ukkonen = callPackage ../development/python-modules/ukkonen { }; + ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; umalqurra = callPackage ../development/python-modules/umalqurra { }; @@ -9571,6 +9688,8 @@ in { untokenize = callPackage ../development/python-modules/untokenize { }; + uonet-request-signer-hebe = callPackage ../development/python-modules/uonet-request-signer-hebe { }; + upass = callPackage ../development/python-modules/upass { }; upb-lib = callPackage ../development/python-modules/upb-lib { }; @@ -9593,6 +9712,8 @@ in { uptime = callPackage ../development/python-modules/uptime { }; + uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { }; + uranium = callPackage ../development/python-modules/uranium { }; uritemplate = callPackage ../development/python-modules/uritemplate { }; @@ -9657,6 +9778,8 @@ in { vdirsyncer = callPackage ../development/python-modules/vdirsyncer { }; + vehicle = callPackage ../development/python-modules/vehicle { }; + vega = callPackage ../development/python-modules/vega { }; vega_datasets = callPackage ../development/python-modules/vega_datasets { }; @@ -9738,6 +9861,8 @@ in { enablePython = true; }); + vulcan-api = callPackage ../development/python-modules/vulcan-api { }; + vultr = callPackage ../development/python-modules/vultr { }; vulture = callPackage ../development/python-modules/vulture { }; @@ -9785,6 +9910,8 @@ in { wavedrom = callPackage ../development/python-modules/wavedrom { }; + wavefile = callPackage ../development/python-modules/wavefile { }; + wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; wcmatch = callPackage ../development/python-modules/wcmatch { }; @@ -10220,7 +10347,9 @@ in { zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; - zopfli = callPackage ../development/python-modules/zopfli { }; + zopfli = callPackage ../development/python-modules/zopfli { + inherit (pkgs) zopfli; + }; zstandard = callPackage ../development/python-modules/zstandard { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index cce882a1c5b..f9f9dc3bdb6 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -415,12 +415,17 @@ with self; with super; { prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit/1.nix { }; + protobuf = callPackage ../development/python-modules/protobuf { + disabled = isPyPy; + protobuf = pkgs.protobuf3_17; # last version compatible with Python 2 + }; + pyamf = callPackage ../development/python-modules/pyamf { }; pyblosxom = callPackage ../development/python-modules/pyblosxom { }; pycairo = callPackage ../development/python-modules/pycairo/1.18.nix { - inherit (pkgs) meson; + inherit (pkgs.buildPackages) meson; }; pycangjie = disabled pycangjie; @@ -530,11 +535,9 @@ with self; with super; { robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; - ruamel-ordereddict = self.ruamel_ordereddict; - ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; + ruamel-ordereddict = callPackage ../development/python-modules/ruamel-ordereddict { }; - ruamel_yaml = self.ruamel-yaml; - ruamel-yaml = callPackage ../development/python-modules/ruamel_yaml/0.16.nix { }; + ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml/0.16.nix { }; runsnakerun = callPackage ../development/python-modules/runsnakerun { }; |