diff options
Diffstat (limited to 'pkgs/top-level')
24 files changed, 1395 insertions, 676 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 76de35caac9..b47be646672 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 @@ -164,6 +166,7 @@ mapAliases ({ cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 cups-googlecloudprint = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; + cloud-print-connector = throw "Google Cloudprint is officially discontinued since Jan 2021, more info https://support.google.com/chrome/a/answer/9633006"; curaLulzbot = throw "curaLulzbot has been removed due to insufficient upstream support for a modern dependency chain"; # added 2021-10-23 cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 cv = progress; # added 2015-09-06 @@ -201,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 @@ -212,6 +217,7 @@ mapAliases ({ ec2_ami_tools = ec2-ami-tools; # added 2021-10-08 ec2_api_tools = ec2-api-tools; # added 2021-10-08 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 + elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # added 2021-06-09 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07 @@ -265,6 +271,7 @@ mapAliases ({ and has only been used for old fontconfig caches. ''; foomatic_filters = foomatic-filters; # 2016-08 + fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # 2021-11-07 fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 @@ -373,8 +380,10 @@ 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 kodiGBM = kodi-gbm; kodiPlain = kodi; kodiPlainWayland = kodi-wayland; @@ -428,6 +437,7 @@ mapAliases ({ libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 + libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it."; # added 2021-11-09 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblastfm = libsForQt5.liblastfm; # added 2020-06-14 liblrdf = lrdf; # added 2018-04-25 @@ -454,7 +464,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; @@ -467,6 +476,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; @@ -481,8 +491,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"; @@ -566,6 +576,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 @@ -585,8 +596,9 @@ 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 = nixUnstable; # added 2021-05-21 + nixFlakes = nixStable; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 nmap-unfree = nmap; # added 2021-04-06 nologin = shadow; # added 2018-04-25 @@ -776,9 +788,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 @@ -882,6 +895,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 @@ -967,6 +981,7 @@ mapAliases ({ virtmanager-qt = virt-manager-qt; # added 2019-10-29 virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 vorbisTools = vorbis-tools; # added 2016-01-26 + vtun = throw "vtune has been removed as it's unmaintained upstream."; # added 2021-10-29 way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13 webkit = webkitgtk; # added 2019-03-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 @@ -979,6 +994,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 @@ -1214,4 +1230,6 @@ mapAliases ({ targetLlvmLibraries = targetPackages.llvmPackages_git.libraries; }); + inherit (stdenv.hostPlatform) system; # added 2021-10-22 + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9008787f44..768b110dc22 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 { }; @@ -315,11 +317,13 @@ with pkgs; html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; + buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; + probe-run = callPackage ../development/tools/rust/probe-run { 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; @@ -420,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 {}; @@ -491,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 { }; @@ -860,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 { }; @@ -980,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 { }; @@ -1020,10 +1028,6 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - coreterminal = libsForQt5.callPackage ../applications/terminal-emulators/coreterminal { - inherit (lxqt) qtermwidget; - }; - ctx = callPackage ../applications/terminal-emulators/ctx { }; darktile = callPackage ../applications/terminal-emulators/darktile { }; @@ -1042,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 { @@ -1275,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 { }; @@ -1333,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 { }; @@ -1341,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 { }; @@ -1375,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 { }; @@ -1431,6 +1443,8 @@ with pkgs; client = true; }); + antennas = callPackage ../servers/antennas { }; + apg = callPackage ../tools/security/apg { }; apt-dater = callPackage ../tools/package-management/apt-dater { @@ -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 { }; @@ -1467,6 +1483,8 @@ with pkgs; inherit (nodePackages) bitwarden-cli; + inherit (nodePackages) concurrently; + inherit (nodePackages) hyperspace-cli; bklk = callPackage ../applications/misc/bklk { }; @@ -1514,6 +1532,8 @@ with pkgs; certigo = callPackage ../tools/admin/certigo { }; + certipy = callPackage ../tools/security/certipy { }; + catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; chezmoi = callPackage ../tools/misc/chezmoi { }; @@ -1533,8 +1553,6 @@ with pkgs; codeql = callPackage ../development/tools/analysis/codeql { }; - corearchiver = libsForQt5.callPackage ../tools/archivers/corearchiver { }; - container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; @@ -1571,8 +1589,12 @@ with pkgs; cozy = callPackage ../applications/audio/cozy { }; + cpptoml = callPackage ../development/libraries/cpptoml { }; + cpuid = callPackage ../os-specific/linux/cpuid { }; + msr = callPackage ../os-specific/linux/msr { }; + ctrtool = callPackage ../tools/archivers/ctrtool { }; crowbar = callPackage ../tools/security/crowbar { }; @@ -1629,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 { }; @@ -1663,10 +1685,12 @@ 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 { }; + flirc = libsForQt5.callPackage ../applications/video/flirc { }; + flood = nodePackages.flood; font-config-info = callPackage ../tools/misc/font-config-info { }; @@ -1717,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 { }; @@ -1777,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 { }; @@ -1815,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 { }; @@ -2121,6 +2149,8 @@ with pkgs; butane = callPackage ../development/tools/butane { }; + buttercup-desktop = callPackage ../tools/security/buttercup-desktop { }; + charles = charles4; inherit (callPackage ../applications/networking/charles {}) charles3 @@ -2178,6 +2208,8 @@ with pkgs; bmake = callPackage ../development/tools/build-managers/bmake { }; + go-mk = callPackage ../development/tools/build-managers/go-mk { }; + boca = callPackage ../development/libraries/boca { }; bochs = callPackage ../applications/virtualization/bochs { @@ -2210,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 { }; @@ -2226,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 { }; @@ -2300,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; @@ -2358,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 { }; @@ -2440,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 {}; @@ -2744,6 +2779,8 @@ with pkgs; gtk = gtk3; }; + dstp = callPackage ../development/tools/dstp { }; + dsvpn = callPackage ../applications/networking/dsvpn { }; dtools = callPackage ../development/tools/dtools { }; @@ -2918,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; @@ -3043,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 { }; @@ -3195,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 { }; @@ -3227,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 { }; @@ -3313,6 +3354,8 @@ with pkgs; mq-cli = callPackage ../tools/system/mq-cli { }; + mrkd = with python3Packages; toPythonApplication mrkd; + n2n = callPackage ../tools/networking/n2n { }; nextdns = callPackage ../applications/networking/nextdns { }; @@ -3324,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; @@ -3372,8 +3414,12 @@ with pkgs; optar = callPackage ../tools/graphics/optar {}; + oni2 = callPackage ../applications/editors/oni2 { }; + obinskit = callPackage ../applications/misc/obinskit {}; + odoo = callPackage ../applications/finance/odoo {}; + odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; ossutil = callPackage ../tools/admin/ossutil {}; @@ -3410,7 +3456,9 @@ with pkgs; pn = callPackage ../tools/text/pn { }; - pocket-casts = callPackage ../applications/audio/pocket-casts { }; + pocket-casts = callPackage ../applications/audio/pocket-casts { + electron = electron_12; + }; poweralertd = callPackage ../tools/misc/poweralertd { }; @@ -3528,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 {}; @@ -3856,7 +3904,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; - cemu = qt5.callPackage ../applications/science/math/cemu { }; + cemu = qt5.callPackage ../applications/science/math/cemu { + stdenv = gcc9Stdenv; + }; isolyzer = callPackage ../tools/cd-dvd/isolyzer { }; @@ -4045,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; }; @@ -4117,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 { }; @@ -4149,16 +4207,8 @@ with pkgs; qtbase = qt5.qtbase; }; - coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; - - coreshot = libsForQt5.callPackage ../tools/misc/coreshot { }; - c14 = callPackage ../applications/networking/c14 { }; - corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; - - coretoppings = libsForQt5.callPackage ../applications/misc/coretoppings { }; - certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; @@ -4237,7 +4287,7 @@ with pkgs; cpcfs = callPackage ../tools/filesystems/cpcfs { }; - coreutils = callPackage ../tools/misc/coreutils { }; + coreutils = callPackage ../tools/misc/coreutils { }; coreutils-full = coreutils.override { minimal = false; }; coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; @@ -4272,7 +4322,8 @@ with pkgs; cudatoolkit_11_1 cudatoolkit_11_2 cudatoolkit_11_3 - cudatoolkit_11_4; + cudatoolkit_11_4 + cudatoolkit_11_5; cudatoolkit = cudatoolkit_10; @@ -4285,7 +4336,9 @@ with pkgs; cudnn_cudatoolkit_11 cudnn_cudatoolkit_11_0 cudnn_cudatoolkit_11_1 - cudnn_cudatoolkit_11_2; + cudnn_cudatoolkit_11_2 + cudnn_cudatoolkit_11_3 + cudnn_cudatoolkit_11_4; cudnn = cudnn_cudatoolkit_10; @@ -4504,6 +4557,8 @@ with pkgs; tk = tk-8_5; }; + picoscope = callPackage ../applications/science/electronics/picoscope { }; + picotts = callPackage ../tools/audio/picotts { }; wgetpaste = callPackage ../tools/text/wgetpaste { }; @@ -4556,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; }; @@ -4569,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 { @@ -4706,7 +4763,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; @@ -4726,6 +4785,18 @@ with pkgs; strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; + schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { + inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; + electron = electron_13; + }; + schildichat-desktop-wayland = schildichat-desktop.override { + useWayland = true; + }; + + schildichat-web = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-web.nix { + conf = config.schildichat-web.conf or {}; + }; + tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4736,7 +4807,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 { }; @@ -4761,7 +4832,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; @@ -4837,7 +4908,7 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! elk6Version = "6.8.3"; - elk7Version = "7.10.2"; + elk7Version = "7.11.1"; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { util-linux = util-linuxMinimal; @@ -4852,11 +4923,6 @@ with pkgs; util-linux = util-linuxMinimal; jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { - enableUnfree = false; - util-linux = util-linuxMinimal; - jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; @@ -4869,7 +4935,7 @@ with pkgs; elasticsearch = elasticsearch6-oss; }; elasticsearch7Plugins = elasticsearchPlugins.override { - elasticsearch = elasticsearch7-oss; + elasticsearch = elasticsearch7; }; elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { @@ -5034,7 +5100,11 @@ with pkgs; fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; - fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { }; + fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { + abseil-cpp = abseil-cpp.override { + cxxStandard = "17"; + }; + }; fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; @@ -5093,9 +5163,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 { }; @@ -5239,9 +5307,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 { }; @@ -5357,6 +5423,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 {}; @@ -5387,6 +5455,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 { }; @@ -5655,7 +5725,9 @@ with pkgs; gitleaks = callPackage ../tools/security/gitleaks { }; - gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { + libgit2 = libgit2_1_1; # git2go only supports v1.1.x + }; gitstats = callPackage ../applications/version-management/gitstats { }; @@ -5834,7 +5906,9 @@ with pkgs; govc = callPackage ../tools/virtualization/govc { }; - goverlay = callPackage ../tools/graphics/goverlay { }; + goverlay = callPackage ../tools/graphics/goverlay { + inherit (qt5) wrapQtAppsHook; + }; gpart = callPackage ../tools/filesystems/gpart { }; @@ -6290,7 +6364,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 { }; @@ -6389,6 +6463,13 @@ 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 { }; + }; + invoice2data = callPackage ../tools/text/invoice2data { }; inxi = callPackage ../tools/system/inxi { }; @@ -6456,6 +6537,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 { }; @@ -6493,6 +6575,8 @@ with pkgs; jekyll = callPackage ../applications/misc/jekyll { }; + jet = callPackage ../development/tools/jet { }; + jfsutils = callPackage ../tools/filesystems/jfsutils { }; jhead = callPackage ../tools/graphics/jhead { }; @@ -6612,7 +6696,7 @@ with pkgs; kakouneUtils = callPackage ../applications/editors/kakoune/plugins/kakoune-utils.nix { }; kak-lsp = callPackage ../tools/misc/kak-lsp { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; kbdd = callPackage ../applications/window-managers/kbdd { }; @@ -6653,7 +6737,7 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; keyscope = callPackage ../tools/security/keyscope { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security; }; keystore-explorer = callPackage ../applications/misc/keystore-explorer { @@ -6667,14 +6751,13 @@ with pkgs; enableUnfree = false; }; kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; - kibana7-oss = callPackage ../development/tools/misc/kibana/7.x.nix { - enableUnfree = false; - }; kibana = kibana6; kibana-oss = kibana6-oss; kibi = callPackage ../applications/editors/kibi { }; + kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; + kismet = callPackage ../applications/networking/sniffers/kismet { }; kiterunner = callPackage ../tools/security/kiterunner { }; @@ -6761,10 +6844,6 @@ with pkgs; libscrypt = callPackage ../development/libraries/libscrypt { }; - libcsys = libsForQt5.callPackage ../development/libraries/libcsys { }; - - libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; - libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { @@ -6773,6 +6852,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 { }; @@ -6956,6 +7036,8 @@ with pkgs; ministat = callPackage ../tools/misc/ministat { }; + mjolnir = callPackage ../servers/mjolnir { }; + mmv = callPackage ../tools/misc/mmv { }; mmv-go = callPackage ../tools/misc/mmv-go { }; @@ -7050,13 +7132,9 @@ with pkgs; nodejs_latest = nodejs-16_x; nodejs-slim_latest = nodejs-slim-16_x; - nodePackages_latest = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { - nodejs = nodejs_latest; - }); + nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs; - nodePackages = dontRecurseIntoAttrs (callPackage ../development/node-packages/default.nix { - inherit nodejs; - }); + nodePackages = dontRecurseIntoAttrs nodejs.pkgs; np2kai = callPackage ../misc/emulators/np2kai { }; @@ -7264,8 +7342,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 { }; @@ -7323,6 +7402,8 @@ with pkgs; lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxd = callPackage ../tools/admin/lxd { }; + lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; + lzfse = callPackage ../tools/compression/lzfse { }; lzham = callPackage ../tools/compression/lzham { }; @@ -7347,7 +7428,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 { }; @@ -7601,7 +7682,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 { }; @@ -7734,6 +7817,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 { }; @@ -7798,7 +7883,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; @@ -7844,7 +7929,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 { }; @@ -7957,9 +8042,7 @@ with pkgs; ntopng = callPackage ../tools/networking/ntopng { }; - ntp = callPackage ../tools/networking/ntp { - libcap = if stdenv.isLinux then libcap else null; - }; + ntp = callPackage ../tools/networking/ntp { }; numdiff = callPackage ../tools/text/numdiff { }; @@ -8020,6 +8103,10 @@ with pkgs; ocserv = callPackage ../tools/networking/ocserv { }; + octofetch = callPackage ../tools/misc/octofetch { + inherit (darwin.apple_sdk.frameworks) Security; + }; + oha = callPackage ../tools/networking/oha { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -8050,7 +8137,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 { }; @@ -8142,8 +8229,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 { @@ -8192,7 +8283,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 { }; @@ -8468,9 +8559,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); @@ -8487,7 +8576,9 @@ with pkgs; pinnwand = callPackage ../servers/pinnwand { }; - piping-server-rust = callPackage ../servers/piping-server-rust { }; + piping-server-rust = callPackage ../servers/piping-server-rust { + inherit (darwin.apple_sdk.frameworks) Security; + }; pirate-get = callPackage ../tools/networking/pirate-get { }; @@ -8644,6 +8735,8 @@ with pkgs; proxify = callPackage ../tools/networking/proxify { }; + proxysql = callPackage ../servers/sql/proxysql { }; + proxytunnel = callPackage ../tools/misc/proxytunnel { openssl = openssl_1_0_2; }; @@ -8656,6 +8749,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 { }; @@ -8706,7 +8801,7 @@ with pkgs; pycangjie = pythonPackages.pycangjie; - pycflow2dot = with python.pkgs; toPythonApplication pycflow2dot; + pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot; pydb = callPackage ../development/tools/pydb { }; @@ -8740,9 +8835,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"; @@ -8981,6 +9074,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 { }; @@ -9393,7 +9488,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 { }; @@ -9422,13 +9517,17 @@ with pkgs; smu = callPackage ../tools/text/smu { }; + smpq = callPackage ../applications/misc/smpq { }; + sn0int = callPackage ../tools/security/sn0int { }; snabb = callPackage ../tools/networking/snabb { }; 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 { }; @@ -9527,7 +9626,9 @@ with pkgs; syntex = callPackage ../tools/graphics/syntex {}; - sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; + synapse-admin = callPackage ../tools/admin/synapse-admin {}; + + sl = callPackage ../tools/misc/sl { }; socat = callPackage ../tools/networking/socat { }; @@ -9552,7 +9653,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 { }; @@ -9617,8 +9718,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 { }; @@ -9666,13 +9765,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; @@ -9692,7 +9791,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 { }; @@ -9827,7 +9926,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 { }; @@ -9864,6 +9963,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; @@ -9878,6 +9981,8 @@ with pkgs; thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { }; + threema-desktop = callPackage ../applications/networking/instant-messengers/threema-desktop { }; + tidy-viewer = callPackage ../tools/text/tidy-viewer { }; tiled = libsForQt5.callPackage ../applications/editors/tiled { }; @@ -10226,6 +10331,8 @@ with pkgs; v2ray = callPackage ../tools/networking/v2ray { }; + v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { }; + vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; vampire = callPackage ../applications/science/logic/vampire {}; @@ -10377,10 +10484,6 @@ with pkgs; sentry-native = callPackage ../development/libraries/sentry-native { }; - vtun = callPackage ../tools/networking/vtun { - openssl = openssl_1_0_2; - }; - waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp { inherit (darwin.apple_sdk.frameworks) OpenCL; }; @@ -10439,6 +10542,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 { }; @@ -10453,7 +10558,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; @@ -10502,7 +10607,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 { }; @@ -10572,7 +10677,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; @@ -10583,6 +10690,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 { }; @@ -10631,7 +10740,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 { }; @@ -10677,7 +10789,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 { @@ -11012,6 +11124,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 { }; @@ -11132,8 +11246,8 @@ with pkgs; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix; - adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix; + adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix { inherit lib; }; + adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {} @@ -11150,8 +11264,8 @@ with pkgs; then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix; - adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix; + adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix { inherit lib; }; + adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-15 = if stdenv.isLinux then callPackage adoptopenjdk-bin-15-packages-linux.jdk-hotspot {} @@ -11168,8 +11282,8 @@ with pkgs; then callPackage adoptopenjdk-bin-15-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-15-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix; - adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix; + adoptopenjdk-bin-14-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix { inherit lib; }; + adoptopenjdk-bin-14-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-14 = if stdenv.isLinux then callPackage adoptopenjdk-bin-14-packages-linux.jdk-hotspot {} @@ -11186,8 +11300,8 @@ with pkgs; then callPackage adoptopenjdk-bin-14-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-14-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; - adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; + adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix { inherit lib; }; + adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-13 = if stdenv.isLinux then callPackage adoptopenjdk-bin-13-packages-linux.jdk-hotspot {} @@ -11204,8 +11318,8 @@ with pkgs; then callPackage adoptopenjdk-bin-13-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-13-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; - adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; + adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix { inherit lib; }; + adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} @@ -11222,8 +11336,8 @@ with pkgs; then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; - adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix; - adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; + adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix { inherit lib; }; + adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {} @@ -11261,6 +11375,10 @@ with pkgs; as31 = callPackage ../development/compilers/as31 { }; + asl = callPackage ../development/compilers/asl { + tex = texlive.combined.scheme-medium; + }; + asn1c = callPackage ../development/compilers/asn1c { }; aspectj = callPackage ../development/compilers/aspectj { }; @@ -11413,7 +11531,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 { }; @@ -11432,7 +11550,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; @@ -11494,7 +11612,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; @@ -11681,8 +11799,6 @@ with pkgs; reproducibleBuild = true; profiledCompiler = false; - enableLTO = !stdenv.isi686; - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; @@ -11695,8 +11811,6 @@ with pkgs; reproducibleBuild = true; profiledCompiler = false; - enableLTO = !stdenv.isi686; - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; @@ -11709,8 +11823,6 @@ with pkgs; reproducibleBuild = true; profiledCompiler = false; - enableLTO = !stdenv.isi686; - libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; @@ -11808,8 +11920,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"; @@ -11939,14 +12050,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 { }; @@ -11956,13 +12067,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 { }; @@ -12212,6 +12325,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }); graalvm11-ce = graalvmCEPackages.graalvm11-ce; + graalvm17-ce = graalvmCEPackages.graalvm17-ce; inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee @@ -12253,7 +12367,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; @@ -12267,14 +12381,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 { }; @@ -12300,7 +12414,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 { }; @@ -12444,7 +12558,7 @@ with pkgs; stdenv = gcc7Stdenv; })); - llvmPackages_latest = llvmPackages_12; + llvmPackages_latest = llvmPackages_13; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); @@ -12650,29 +12764,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - # Because rustc-1.46.0 enables static PIE by default for - # `x86_64-unknown-linux-musl` this release will suffer from: - # - # https://github.com/NixOS/nixpkgs/issues/94228 - # - # So this commit doesn't remove the 1.45.2 release. - rust_1_45 = callPackage ../development/compilers/rust/1_45.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_10 = llvmPackages_10.libllvm; - }; - 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_45 = rust_1_45.packages.stable; - 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; @@ -12723,7 +12826,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; }; @@ -12750,6 +12855,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; }; @@ -12778,7 +12884,9 @@ with pkgs; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; + cargo-modules = callPackage ../development/tools/rust/cargo-modules { + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices; + }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12788,7 +12896,9 @@ with pkgs; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; - cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { }; + cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12820,7 +12930,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; @@ -12863,7 +12975,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; }; @@ -12871,7 +12983,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; }; }; @@ -13134,6 +13246,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 { }; @@ -13150,19 +13264,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 { }); @@ -13295,6 +13409,13 @@ with pkgs; ### END OF LUA + ### CuboCore + CuboCore = recurseIntoAttrs (import ./cubocore-packages.nix { + inherit newScope lxqt lib libsForQt5; + }); + + ### End of CuboCore + lush2 = callPackage ../development/interpreters/lush {}; maude = callPackage ../development/interpreters/maude { @@ -13405,12 +13526,6 @@ with pkgs; bluezSupport = true; x11Support = true; }; - python36Full = python36.override { - self = python36Full; - pythonAttr = "python36Full"; - bluezSupport = true; - x11Support = true; - }; python37Full = python37.override { self = python37Full; pythonAttr = "python37Full"; @@ -13436,11 +13551,10 @@ with pkgs; python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python36 python37 python38 python39 python310 python3Minimal pypy27 pypy37; + inherit (pythonInterpreters) python27 python37 python38 python39 python310 python3Minimal pypy27 pypy37; # Python package sets. python27Packages = python27.pkgs; - python36Packages = python36.pkgs; python37Packages = python37.pkgs; python38Packages = recurseIntoAttrs python38.pkgs; python39Packages = recurseIntoAttrs python39.pkgs; @@ -13470,7 +13584,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 { }; @@ -13490,6 +13604,7 @@ with pkgs; pipenv = callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; + pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {}; pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; pyradio = callPackage ../applications/audio/pyradio {}; @@ -13507,6 +13622,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 {}; @@ -13553,8 +13672,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; @@ -13584,6 +13701,7 @@ with pkgs; spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; + spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { }; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; @@ -13640,7 +13758,9 @@ with pkgs; # Needed for autogen guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; - guile_2_2 = callPackage ../development/interpreters/guile { }; + guile_2_2 = callPackage ../development/interpreters/guile/2.2.nix { }; + + guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { }; guile = guile_2_2; @@ -13707,7 +13827,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; @@ -13830,7 +13950,8 @@ with pkgs; electron_12 electron_13 electron_14 - electron_15; + electron_15 + electron_16; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -13998,15 +14119,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; @@ -14218,7 +14330,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 { }; @@ -14406,7 +14518,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 { }; @@ -14422,6 +14534,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 { }; @@ -14498,9 +14612,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 { }; @@ -14540,11 +14654,10 @@ with pkgs; java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 }; gradle = res.gradleGen.gradle_latest; - gradle_4_10 = res.gradleGen.gradle_4_10; - gradle_4 = gradle_4_10; + gradle_4 = res.gradleGen.gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; - gradle_6 = res.gradleGen.gradle_6_8; - gradle_7 = res.gradleGen.gradle_7; + gradle_6 = res.gradleGen.gradle_6_9; + gradle_7 = res.gradleGen.gradle_7_3; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. @@ -14574,7 +14687,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 {}; @@ -14650,10 +14763,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 { @@ -14783,8 +14896,6 @@ with pkgs; minizinc = callPackage ../development/tools/minizinc { }; minizincide = qt514.callPackage ../development/tools/minizinc/ide.nix { }; - mk = callPackage ../development/tools/build-managers/mk { }; - mkcert = callPackage ../development/tools/misc/mkcert { }; mkdocs = callPackage ../development/tools/documentation/mkdocs { }; @@ -14805,8 +14916,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); @@ -14969,6 +15080,8 @@ with pkgs; pycritty = with python3Packages; toPythonApplication pycritty; + pylint-exit = callPackage ../development/tools/pylint-exit { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { inherit (linuxPackages) perf; }; @@ -15078,6 +15191,8 @@ with pkgs; sbt-extras = callPackage ../development/tools/build-managers/sbt-extras { }; + scala-cli = callPackage ../development/tools/build-managers/scala-cli {}; + scc = callPackage ../development/tools/misc/scc { }; scss-lint = callPackage ../development/tools/scss-lint { }; @@ -15092,7 +15207,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 { }; @@ -15175,6 +15290,8 @@ with pkgs; sselp = callPackage ../tools/X11/sselp{ }; + statix = callPackage ../tools/nix/statix { }; + stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { }; stm32flash = callPackage ../development/embedded/stm32/stm32flash { }; @@ -15284,11 +15401,15 @@ 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 { }; - turbogit = callPackage ../development/tools/turbogit { }; + turbogit = callPackage ../development/tools/turbogit { + libgit2 = libgit2_1_1; # git2go only supports v1.1.x + }; tweak = callPackage ../applications/editors/tweak { }; @@ -15474,7 +15595,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; @@ -15506,7 +15629,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 { }; @@ -15613,7 +15736,6 @@ with pkgs; bobcat = callPackage ../development/libraries/bobcat { }; boehmgc = callPackage ../development/libraries/boehm-gc { }; - boehmgc_766 = callPackage ../development/libraries/boehm-gc/7.6.6.nix { }; boolstuff = callPackage ../development/libraries/boolstuff { }; @@ -15667,7 +15789,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 { }; @@ -15675,7 +15797,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; @@ -15687,6 +15809,8 @@ with pkgs; ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; + ndn-tools = callPackage ../tools/networking/ndn-tools { }; + cddlib = callPackage ../development/libraries/cddlib {}; cdk = callPackage ../development/libraries/cdk {}; @@ -15781,6 +15905,8 @@ with pkgs; cmrt = callPackage ../development/libraries/cmrt { }; + coeurl = callPackage ../development/libraries/coeurl { }; + cogl = callPackage ../development/libraries/cogl { }; coin3d = callPackage ../development/libraries/coin3d { }; @@ -15791,6 +15917,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 { }; @@ -15835,6 +15963,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 { }; @@ -16023,9 +16153,6 @@ with pkgs; linbox = callPackage ../development/libraries/linbox { }; - ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; @@ -16034,7 +16161,6 @@ with pkgs; }; # Aliases - ffmpeg_2 = ffmpeg_2_8; ffmpeg_3 = ffmpeg_3_4; # Please make sure this is updated to the latest version on the next major # update to ffmpeg @@ -16282,6 +16408,16 @@ with pkgs; ]; }); + libgit2_1_1 = libgit2.overrideAttrs (oldAttrs: rec { + version = "1.1.1"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc="; + }; + }); + libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; libhsts = callPackage ../development/libraries/libhsts { }; @@ -16314,6 +16450,8 @@ with pkgs; stdenv = gccStdenv; # doesn't compile without gcc }; + mtrace = callPackage ../development/libraries/glibc/mtrace.nix { }; + # Provided by libc on Operating Systems that use the Extensible Linker Format. elf-header = if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" @@ -16381,8 +16519,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 { }; @@ -16502,7 +16640,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; @@ -16566,7 +16704,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 { }; @@ -16604,6 +16742,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 { }; @@ -16787,10 +16929,6 @@ with pkgs; hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; }; - hunter = callPackage ../applications/misc/hunter { - inherit (darwin.apple_sdk.frameworks) CoreServices IOKit Security; - }; - hwloc = callPackage ../development/libraries/hwloc {}; inherit (callPackage ../development/tools/misc/hydra { }) @@ -16857,8 +16995,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 { }; @@ -16961,7 +17104,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 { }; @@ -16995,6 +17138,7 @@ with pkgs; }; keybinder3 = callPackage ../development/libraries/keybinder3 { + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; automake = automake111x; }; @@ -17146,6 +17290,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 { }; @@ -17817,7 +17963,7 @@ with pkgs; libkeyfinder = callPackage ../development/libraries/audio/libkeyfinder { }; - libkml = callPackage ../development/libraries/libkml { }; + libks = callPackage ../development/libraries/libks { }; libksba = callPackage ../development/libraries/libksba { }; @@ -17983,7 +18129,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 { }; @@ -18236,7 +18384,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 { }; @@ -18302,6 +18452,7 @@ with pkgs; libxml2 = callPackage ../development/libraries/libxml2 { python = python3; + inherit (darwin) libiconv; }; libxml2Python = let @@ -18410,13 +18561,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 { }; @@ -18549,8 +18708,6 @@ with pkgs; mueval = callPackage ../development/tools/haskell/mueval { }; - mumlib = callPackage ../development/libraries/mumlib { }; - muparser = callPackage ../development/libraries/muparser { inherit (darwin.stubs) setfile; }; @@ -18621,7 +18778,7 @@ with pkgs; nghttp2 = callPackage ../development/libraries/nghttp2 { }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins {}; + nix-plugins = callPackage ../development/libraries/nix-plugins { nix = nix_2_3; }; nika-fonts = callPackage ../data/fonts/nika-fonts { }; @@ -18642,9 +18799,6 @@ with pkgs; nss = lowPrio (callPackage ../development/libraries/nss { }); nssTools = nss.tools; - # required for stable thunderbird and firefox-esr-78 - nss_3_53 = lowPrio (callPackage ../development/libraries/nss/3.53.nix { }); - nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; nsss = skawarePackages.nsss; @@ -18834,7 +18988,8 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_0_2 - openssl_1_1; + openssl_1_1 + openssl_3_0; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { }; @@ -18850,6 +19005,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 { }; @@ -18905,7 +19065,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 { }; @@ -18954,6 +19114,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 { }; @@ -18973,8 +19135,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 { }; @@ -19176,12 +19339,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 { }; @@ -19234,6 +19399,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 { }; @@ -19317,7 +19493,9 @@ with pkgs; sdrplay = callPackage ../applications/radio/sdrplay {}; - sdrpp = callPackage ../applications/radio/sdrpp { }; + sdrpp = callPackage ../applications/radio/sdrpp { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; @@ -19529,9 +19707,13 @@ with pkgs; srtp = callPackage ../development/libraries/srtp { }; + stargate-libcds = callPackage ../development/libraries/stargate-libcds { }; + stb = callPackage ../development/libraries/stb { }; - stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; + StormLib = callPackage ../development/libraries/StormLib { }; + + stxxl = callPackage ../development/libraries/stxxl { }; sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); @@ -19552,13 +19734,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" @@ -19852,6 +20034,8 @@ with pkgs; CoreText IOSurface ImageIO OpenGL GLUT; }; + vtk_8_withQt5 = vtk_8.override { enableQt = true; }; + vtk_9 = libsForQt515.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; @@ -19860,8 +20044,10 @@ with pkgs; CoreText IOSurface ImageIO OpenGL GLUT; }; + vtk_9_withQt5 = vtk_9.override { enableQt = true; }; + vtk = vtk_8; - vtkWithQt5 = vtk.override { enableQt = true; }; + vtkWithQt5 = vtk_8_withQt5; vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; @@ -19958,7 +20144,7 @@ with pkgs; }; wxSVG = callPackage ../development/libraries/wxSVG { - wxGTK = wxGTK30; + wxGTK = wxGTK30-gtk3; }; wtk = callPackage ../development/libraries/wtk { }; @@ -20079,7 +20265,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 { }; @@ -20165,9 +20351,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 { }; @@ -20204,14 +20388,13 @@ with pkgs; go = buildPackages.go_1_16; }; # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms, - # it also requires >=10.13 stdenv on darwin which - # is not currently available for x86_64-darwin + # 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; @@ -20222,14 +20405,13 @@ with pkgs; go = buildPackages.go_1_16; }; # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms, - # it also requires >=10.13 stdenv on darwin which - # is not currently available for x86_64-darwin + # 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; @@ -20352,7 +20534,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; @@ -20390,7 +20572,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 { }; @@ -20474,9 +20656,7 @@ with pkgs; dex2jar = callPackage ../development/tools/java/dex2jar { }; - doh-proxy = callPackage ../servers/dns/doh-proxy { - python3Packages = python36Packages; - }; + doh-proxy = callPackage ../servers/dns/doh-proxy { }; doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust { inherit (darwin.apple_sdk.frameworks) Security; @@ -20549,6 +20729,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 { }; @@ -20602,7 +20786,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 { }; @@ -20684,7 +20868,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { }; + lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { + nodejs = nodejs-14_x; + }; lighttpd = callPackage ../servers/http/lighttpd { }; @@ -20734,18 +20920,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; @@ -20774,8 +20960,6 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mumsi = callPackage ../servers/mumsi { }; - mycorrhiza = callPackage ../servers/mycorrhiza { }; myserver = callPackage ../servers/http/myserver { }; @@ -20843,9 +21027,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 { }; @@ -20900,6 +21082,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 { }); @@ -21149,7 +21333,8 @@ 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 { }; @@ -21304,7 +21489,7 @@ with pkgs; enableMDNS = true; enableDomainController = true; enableRegedit = true; - enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64; + enableCephFS = !stdenv.hostPlatform.isAarch64; }); sambaFull = samba4Full; @@ -21356,7 +21541,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 { }; @@ -21364,6 +21549,8 @@ with pkgs; squid = callPackage ../servers/squid { }; + duckling-proxy = callPackage ../servers/duckling-proxy { }; + sslh = callPackage ../servers/sslh { }; thttpd = callPackage ../servers/http/thttpd { }; @@ -21455,6 +21642,8 @@ with pkgs; wallabag = callPackage ../servers/web-apps/wallabag { }; + webdav = callPackage ../servers/webdav { }; + webmetro = callPackage ../servers/webmetro { }; wsdd = callPackage ../servers/wsdd { }; @@ -21463,9 +21652,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 { }; @@ -21711,12 +21898,13 @@ with pkgs; fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; - fscryptctl-experimental = callPackage ../os-specific/linux/fscryptctl/legacy.nix { }; fwanalyzer = callPackage ../tools/filesystems/fwanalyzer { }; 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 { }; @@ -21735,6 +21923,8 @@ with pkgs; ebtables = callPackage ../os-specific/linux/ebtables { }; + error-inject = callPackages ../os-specific/linux/error-inject { }; + extrace = callPackage ../os-specific/linux/extrace { }; facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; @@ -21742,7 +21932,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; @@ -21825,6 +22015,8 @@ with pkgs; intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { }; + intel-cmt-cat = callPackage ../os-specific/linux/intel-cmt-cat { }; + intel-compute-runtime = callPackage ../os-specific/linux/intel-compute-runtime { }; intel-ocl = callPackage ../os-specific/linux/intel-ocl { }; @@ -21841,9 +22033,9 @@ with pkgs; iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); # hiPrio for collisions with inetutils (ping and tftpd.8.gz) - iptables = iptables-legacy; - iptables-legacy = callPackage ../os-specific/linux/iptables { }; - iptables-nftables-compat = callPackage ../os-specific/linux/iptables { nftablesCompat = true; }; + iptables = callPackage ../os-specific/linux/iptables { }; + iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; }; + iptables-nftables-compat = iptables; iptstate = callPackage ../os-specific/linux/iptstate { } ; @@ -21952,11 +22144,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; }; @@ -22000,6 +22192,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; @@ -22080,18 +22274,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 { }; @@ -22127,6 +22326,8 @@ with pkgs; musl-fts = callPackage ../os-specific/linux/musl-fts { }; musl-obstack = callPackage ../os-specific/linux/musl-obstack { }; + nsh = callPackage ../shells/nsh { }; + nushell = callPackage ../shells/nushell { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -22368,6 +22569,8 @@ with pkgs; radeontop = callPackage ../os-specific/linux/radeontop { }; + rasdaemon = callPackage ../os-specific/linux/rasdaemon { }; + raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { }; @@ -22421,6 +22624,8 @@ with pkgs; seturgent = callPackage ../os-specific/linux/seturgent { }; + sgx-sdk = callPackage ../os-specific/linux/sgx-sdk { }; + shadow = callPackage ../os-specific/linux/shadow { }; sinit = callPackage ../os-specific/linux/sinit { @@ -22444,7 +22649,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 { }; @@ -22632,9 +22837,8 @@ with pkgs; util-linuxCurses = util-linux; util-linuxMinimal = if stdenv.isLinux then appendToName "minimal" (util-linux.override { - minimal = true; + nlsSupport = false; ncurses = null; - perl = null; systemd = null; }) else util-linux; @@ -22708,6 +22912,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 { }; @@ -22737,6 +22945,8 @@ with pkgs; aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; + ayu-theme-gtk = callPackage ../data/themes/ayu-theme-gtk { }; + b612 = callPackage ../data/fonts/b612 { }; babelstone-han = callPackage ../data/fonts/babelstone-han { }; @@ -22971,6 +23181,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; }; @@ -23060,6 +23280,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 {}; @@ -23206,6 +23431,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 {}) @@ -23338,6 +23565,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 { }; @@ -23358,6 +23587,8 @@ with pkgs; shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; + sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { }; + sjasmplus = callPackage ../development/compilers/sjasmplus { }; skeu = callPackage ../data/themes/skeu { }; @@ -23506,7 +23737,7 @@ with pkgs; tenderness = callPackage ../data/fonts/tenderness { }; terminus_font = callPackage ../data/fonts/terminus-font - { inherit (buildPackages.xorg) fonttosfnt mkfontscale; }; + { inherit (buildPackages.xorg) mkfontscale; }; terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; @@ -23587,6 +23818,8 @@ with pkgs; inherit (gnome) gnome-shell; }; + vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { }; + vistafonts = callPackage ../data/fonts/vista-fonts { }; vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { }; @@ -23728,7 +23961,9 @@ with pkgs; antiword = callPackage ../applications/office/antiword {}; - anup = callPackage ../applications/misc/anup {}; + anup = callPackage ../applications/misc/anup { + inherit (darwin.apple_sdk.frameworks) Security; + }; anytype = callPackage ../applications/misc/anytype { }; @@ -23736,6 +23971,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 {}; @@ -23798,6 +24037,8 @@ with pkgs; audio-recorder = callPackage ../applications/audio/audio-recorder { }; + auto-multiple-choice = callPackage ../applications/misc/auto-multiple-choice { }; + autokey = callPackage ../applications/office/autokey { }; autotalent = callPackage ../applications/audio/autotalent { }; @@ -23818,8 +24059,6 @@ with pkgs; cheesecutter = callPackage ../applications/audio/cheesecutter { }; - corefm = libsForQt5.callPackage ../applications/misc/corefm { }; - milkytracker = callPackage ../applications/audio/milkytracker { }; ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; @@ -23957,7 +24196,7 @@ with pkgs; gtk = gtk3; }; - bluej = callPackage ../applications/editors/bluej/default.nix { + bluej = callPackage ../applications/editors/bluej { jdk = jetbrains.jdk; }; @@ -24087,6 +24326,8 @@ with pkgs; boops = callPackage ../applications/audio/boops { }; + ChowKick = callPackage ../applications/audio/ChowKick { }; + CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); @@ -24105,6 +24346,10 @@ with pkgs; clapper = callPackage ../applications/video/clapper { }; + ciscoPacketTracer7 = callPackage ../applications/networking/cisco-packet-tracer/7.nix { }; + + ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { }; + claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; useGtk3 = false; @@ -24132,8 +24377,6 @@ with pkgs; clipit = callPackage ../applications/misc/clipit { }; - cloud-print-connector = callPackage ../servers/cloud-print-connector { }; - cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { }; clp = callPackage ../applications/science/math/clp { }; @@ -24164,8 +24407,6 @@ with pkgs; copyq = libsForQt5.callPackage ../applications/misc/copyq { }; - coreaction = libsForQt5.callPackage ../applications/misc/coreaction { }; - corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; coriander = callPackage ../applications/video/coriander { @@ -24176,8 +24417,6 @@ with pkgs; ffmpeg = ffmpeg-full; }; - coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { }; - csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { }; @@ -24255,9 +24494,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 { }; @@ -24319,7 +24558,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 { }; @@ -24524,6 +24763,10 @@ with pkgs; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; + entangle = callPackage ../applications/video/entangle { + inherit (gst_all_1) gstreamer gst-plugins-base; + }; + eolie = callPackage ../applications/networking/browsers/eolie { }; epdfview = callPackage ../applications/misc/epdfview { }; @@ -24566,6 +24809,11 @@ with pkgs; evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; + eww = callPackage ../applications/window-managers/eww { }; + eww-wayland = callPackage ../applications/window-managers/eww { + withWayland = true; + }; + exaile = callPackage ../applications/audio/exaile { }; exercism = callPackage ../applications/misc/exercism { }; @@ -24582,7 +24830,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; }; @@ -24677,7 +24925,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 { }; @@ -24736,7 +24983,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 { }; @@ -24951,7 +25198,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; @@ -24963,15 +25210,13 @@ with pkgs; }); firefox-unwrapped = firefoxPackages.firefox; - firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; - firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; - firefox-esr = firefox-esr-78; - firefox-esr-unwrapped = firefoxPackages.firefox-esr-78; + firefox-esr = firefox-esr-91; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-91; firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { @@ -25230,7 +25475,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 { }; @@ -25314,6 +25559,8 @@ with pkgs; gtkpod = callPackage ../applications/audio/gtkpod { }; + q4wine = libsForQt5.callPackage ../applications/misc/q4wine { }; + qrcodegen = callPackage ../development/libraries/qrcodegen { }; qrencode = callPackage ../development/libraries/qrencode { }; @@ -25458,12 +25705,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; @@ -25481,9 +25728,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 { }; @@ -25534,12 +25781,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 { }; @@ -25552,11 +25803,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"; @@ -25588,6 +25841,8 @@ with pkgs; withPortAudio = stdenv.isDarwin; }; + srain = callPackage ../applications/networking/irc/srain { }; + super-productivity = callPackage ../applications/office/super-productivity { }; wlroots = callPackage ../development/libraries/wlroots { @@ -25684,11 +25939,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 { }; @@ -25725,6 +25980,8 @@ with pkgs; imagej = callPackage ../applications/graphics/imagej { }; + fiji = callPackage ../applications/graphics/fiji { }; + imagemagick6_light = imagemagick6.override { bzip2 = null; zlib = null; @@ -25794,7 +26051,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; }; @@ -25888,6 +26145,8 @@ with pkgs; dupd = callPackage ../tools/misc/dupd { }; + jconvolver = callPackage ../applications/audio/jconvolver { }; + jdupes = callPackage ../tools/misc/jdupes { }; jed = callPackage ../applications/editors/jed { }; @@ -26035,6 +26294,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 { }; @@ -26081,6 +26342,8 @@ with pkgs; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; linkerd_stable = linkerd; + kumactl = callPackage ../applications/networking/cluster/kumactl { }; + kile-wl = callPackage ../applications/misc/kile-wl { }; kiln = callPackage ../applications/misc/kiln { }; @@ -26097,6 +26360,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 { }; @@ -26196,6 +26461,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 { }; @@ -26226,6 +26495,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 { }; @@ -26283,7 +26554,9 @@ with pkgs; lscolors = callPackage ../applications/misc/lscolors { }; - lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit { }; + lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit { + inherit (darwin.apple_sdk.frameworks) OpenCL; + }; luddite = with python3Packages; toPythonApplication luddite; @@ -26353,6 +26626,10 @@ with pkgs; markets = callPackage ../applications/misc/markets { }; + markmind = callPackage ../applications/misc/markmind { + electron = electron_9; + }; + marp = callPackage ../applications/office/marp { }; magnetico = callPackage ../applications/networking/p2p/magnetico { }; @@ -26420,13 +26697,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 { }; @@ -26540,7 +26818,7 @@ with pkgs; mop = callPackage ../applications/misc/mop { }; - mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { + mopidyPackages = callPackages ../applications/audio/mopidy { python = python3; }; @@ -26622,6 +26900,8 @@ with pkgs; nload = callPackage ../applications/networking/nload { }; + nali = callPackage ../applications/networking/nali { }; + normalize = callPackage ../applications/audio/normalize { }; mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; @@ -26725,6 +27005,8 @@ with pkgs; neocomp = callPackage ../applications/window-managers/neocomp { }; + nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { }; + newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { }; @@ -26859,16 +27141,7 @@ with pkgs; shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; shogun = callPackage ../applications/science/machine-learning/shogun { - stdenv = gcc8Stdenv; - - # Workaround for the glibc abi version mismatch. - # Please note that opencv builds are by default disabled. - opencv = opencv3.override { - stdenv = gcc8Stdenv; - openexr = openexr.override { - stdenv = gcc8Stdenv; - }; - }; + opencv = opencv3; }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; @@ -26903,6 +27176,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 { }; @@ -26985,6 +27260,8 @@ with pkgs; jdk = jdk11; }; + netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; + ncdu = callPackage ../tools/misc/ncdu { }; ncdc = callPackage ../applications/networking/p2p/ncdc { }; @@ -27023,9 +27300,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; }; @@ -27163,6 +27440,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 { }; @@ -27183,9 +27464,7 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - pcsxr = callPackage ../misc/emulators/pcsxr { - ffmpeg = ffmpeg_2; - }; + pcsxr = callPackage ../misc/emulators/pcsxr { }; pcsx2 = callPackage ../misc/emulators/pcsx2 { wxGTK = wxGTK30-gtk3; @@ -27264,10 +27543,8 @@ with pkgs; picoloop = callPackage ../applications/audio/picoloop { }; pidgin = callPackage ../applications/networking/instant-messengers/pidgin { - openssl = if config.pidgin.openssl or true then openssl else null; - gnutls = if config.pidgin.gnutls or false then gnutls else null; - libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null; - startupnotification = libstartup_notification; + withOpenssl = config.pidgin.openssl or true; + withGnutls = config.pidgin.gnutls or false; plugins = []; }; @@ -27297,8 +27574,12 @@ with pkgs; pika-backup = callPackage ../applications/backup/pika-backup { }; + pur = callPackage ../development/tools/pur { }; + 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 { }; @@ -27611,6 +27892,8 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; + roomeqwizard = callPackage ../applications/audio/roomeqwizard { }; + radiotray-ng = callPackage ../applications/audio/radiotray-ng { wxGTK = wxGTK30; }; @@ -27876,6 +28159,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 { }; @@ -27935,7 +28220,9 @@ 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 { }; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; @@ -27950,7 +28237,9 @@ with pkgs; snapper = callPackage ../tools/misc/snapper { }; snapper-gui = callPackage ../applications/misc/snapper-gui { }; - snd = callPackage ../applications/audio/snd { }; + snd = callPackage ../applications/audio/snd { + inherit (darwin.apple_sdk.frameworks) CoreServices CoreMIDI; + }; shntool = callPackage ../applications/audio/shntool { }; @@ -27978,7 +28267,7 @@ with pkgs; spotify-unwrapped = callPackage ../applications/audio/spotify { curl = curl.override { - sslSupport = false; gnutlsSupport = true; + opensslSupport = false; gnutlsSupport = true; }; }; @@ -28044,7 +28333,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; @@ -28063,6 +28352,8 @@ with pkgs; git = gitMinimal; }; + surge-XT = callPackage ../applications/audio/surge-XT { }; + survex = callPackage ../applications/misc/survex { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -28105,7 +28396,6 @@ with pkgs; }; synergy = libsForQt5.callPackage ../applications/misc/synergy { - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; }; @@ -28144,7 +28434,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 { }; @@ -28194,6 +28484,8 @@ with pkgs; temporal = callPackage ../applications/networking/cluster/temporal { }; + tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; }; + tendermint = callPackage ../tools/networking/tendermint { }; termdbms = callPackage ../development/tools/database/termdbms { }; @@ -28226,7 +28518,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; @@ -28238,9 +28530,7 @@ with pkgs; }); thunderbird-unwrapped = thunderbirdPackages.thunderbird; - thunderbird-78-unwrapped = thunderbirdPackages.thunderbird-78; thunderbird = wrapThunderbird thunderbird-unwrapped { }; - thunderbird-78 = wrapThunderbird thunderbird-78-unwrapped { }; thunderbird-wayland = wrapThunderbird thunderbird-unwrapped { forceWayland = true; }; thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; @@ -28270,7 +28560,9 @@ with pkgs; timg = callPackage ../tools/graphics/timg { }; - timidity = callPackage ../tools/misc/timidity { }; + timidity = callPackage ../tools/misc/timidity { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; tint2 = callPackage ../applications/misc/tint2 { }; @@ -28447,7 +28739,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 { }; @@ -28514,7 +28806,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 {}; @@ -28540,7 +28832,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 { }; @@ -28674,6 +28966,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; @@ -28780,6 +29077,10 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; + whalebird = callPackage ../applications/misc/whalebird { + electron = electron_12; + }; + wio = callPackage ../applications/window-managers/wio { }; whitebox-tools = callPackage ../applications/gis/whitebox-tools { @@ -28840,94 +29141,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 { @@ -29007,10 +29220,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 { }; @@ -29028,6 +29238,8 @@ with pkgs; picom = callPackage ../applications/window-managers/picom {}; + picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; + xd = callPackage ../applications/networking/p2p/xd {}; xdaliclock = callPackage ../tools/misc/xdaliclock {}; @@ -29040,6 +29252,8 @@ with pkgs; xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; + xdg-desktop-portal-pantheon = callPackage ../development/libraries/xdg-desktop-portal-pantheon { }; + xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { }; xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { }; @@ -29215,7 +29429,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 { }; @@ -29343,7 +29557,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; @@ -29352,16 +29567,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 { }; @@ -29634,9 +29858,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; @@ -29686,13 +29908,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 { }; @@ -29744,7 +29966,11 @@ with pkgs; ddnet = callPackage ../games/ddnet { }; - devilutionx = callPackage ../games/devilutionx {}; + devilutionx = callPackage ../games/devilutionx { + SDL2 = SDL2.override { + withStatic = true; + }; + }; dhewm3 = callPackage ../games/dhewm3 {}; @@ -29903,7 +30129,6 @@ with pkgs; gemrb = callPackage ../games/gemrb { }; gimx = callPackage ../games/gimx {}; - gimx-afterglow = lowPrio (gimx.override { gimxAuth = "afterglow"; }); gl117 = callPackage ../games/gl-117 {}; @@ -30122,7 +30347,7 @@ with pkgs; openarena = callPackage ../games/openarena { }; opendungeons = callPackage ../games/opendungeons { - ogre = ogre1_9; + ogre = ogre1_10; }; openlierox = callPackage ../games/openlierox { }; @@ -30384,22 +30609,14 @@ with pkgs; steam-acf = callPackage ../tools/games/steam-acf { }; protontricks = python3Packages.callPackage ../tools/package-management/protontricks { - winetricks = winetricks.override { - # Remove default build of wine to reduce closure size. - # Falls back to wine in PATH. - wine = null; - }; - - inherit steam-run yad; + inherit winetricks steam-run yad; }; protonup = with python3Packages; toPythonApplication protonup; sdlpop = callPackage ../games/sdlpop { }; - stepmania = callPackage ../games/stepmania { - ffmpeg = ffmpeg_2; - }; + stepmania = callPackage ../games/stepmania { }; streamlit = python3Packages.callPackage ../applications/science/machine-learning/streamlit { }; @@ -30669,7 +30886,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 { }); @@ -30726,7 +30943,7 @@ with pkgs; }; arcan = recurseIntoAttrs (callPackage ../desktops/arcan { - callPackage = newScope pkgs.arcan; + callPackage = newScope arcan; }); xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); @@ -30991,7 +31208,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 { }; @@ -31131,7 +31348,12 @@ with pkgs; or-tools = callPackage ../development/libraries/science/math/or-tools { python = python3; - abseil-cpp = abseil-cpp.override { static = true; }; + # or-tools builds with -std=c++17, so abseil-cpp must + # also be built that way + abseil-cpp = abseil-cpp.override { + static = true; + cxxStandard = "17"; + }; }; rubiks = callPackage ../development/libraries/science/math/rubiks { }; @@ -31190,30 +31412,31 @@ with pkgs; gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { singlePrec = true; - mpiEnabled = false; fftw = fftwSinglePrec; - cmake = cmakeCurses; }; gromacsMpi = lowPrio (gromacs.override { singlePrec = true; - mpiEnabled = true; + enableMpi = true; fftw = fftwSinglePrec; - cmake = cmakeCurses; }); gromacsDouble = lowPrio (gromacs.override { singlePrec = false; - mpiEnabled = false; fftw = fftw; - cmake = cmakeCurses; }); gromacsDoubleMpi = lowPrio (gromacs.override { singlePrec = false; - mpiEnabled = true; + enableMpi = true; fftw = fftw; - cmake = cmakeCurses; + }); + + gromacsCudaMpi = lowPrio (gromacs.override { + singlePrec = true; + enableMpi = true; + enableCuda = true; + fftw = fftwSinglePrec; }); zegrapher = libsForQt5.callPackage ../applications/science/math/zegrapher { }; @@ -31339,6 +31562,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 { }; @@ -31358,6 +31583,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; @@ -31544,9 +31771,9 @@ with pkgs; } // (config.caffe or {})); caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec { - inherit (python36Packages) python future six numpy pydot; + inherit (python3Packages) python future six numpy pydot; protobuf = protobuf3_1; - python-protobuf = python36Packages.protobuf.override { inherit protobuf; }; + python-protobuf = python3Packages.protobuf.override { inherit protobuf; }; opencv3 = opencv3WithoutCuda; # Used only for image loading. }); @@ -31786,7 +32013,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 { }; @@ -31830,7 +32057,9 @@ with pkgs; click = callPackage ../applications/networking/cluster/click { }; - clinfo = callPackage ../tools/system/clinfo { }; + clinfo = callPackage ../tools/system/clinfo { + inherit (darwin.apple_sdk.frameworks) OpenCL; + }; clpeak = callPackage ../tools/misc/clpeak { }; @@ -31842,6 +32071,8 @@ with pkgs; cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; + cups-kyocera-ecosys-m2x35-40-p2x35-40dnw = callPackage ../misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw {}; + cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x {}; cups-kyodialog3 = callPackage ../misc/cups/drivers/kyodialog3 {}; @@ -32146,6 +32377,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 { }; @@ -32181,6 +32418,7 @@ with pkgs; }) nix nixStable + nix_2_3 nix_2_4 nixUnstable; @@ -32248,8 +32486,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, ... }: { @@ -32299,7 +32537,7 @@ with pkgs; */ nixosTesting = (import ../../nixos/lib/testing-python.nix { - inherit (pkgs.stdenv.hostPlatform) system; + inherit (stdenv.hostPlatform) system; inherit pkgs; extraConfigurations = [( { lib, ... }: { @@ -32313,14 +32551,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 { }; @@ -32333,13 +32571,13 @@ with pkgs; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; - nix-doc = callPackage ../tools/package-management/nix-doc { }; + nix-doc = callPackage ../tools/package-management/nix-doc { nix = nix_2_3; }; 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; @@ -32353,9 +32591,9 @@ 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 { }; + nixos-option = callPackage ../tools/nix/nixos-option { nix = nix_2_3; }; nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -32384,7 +32622,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 { }; @@ -32400,7 +32638,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 { }; @@ -32547,7 +32785,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 { }; @@ -32557,15 +32797,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; }); @@ -32636,8 +32884,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 { }; @@ -32645,7 +32893,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 { }; @@ -32784,6 +33032,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 {}; @@ -32948,7 +33198,9 @@ with pkgs; wiki-js = callPackage ../servers/web-apps/wiki-js { }; - wiki-tui = callPackage ../misc/wiki-tui { }; + wiki-tui = callPackage ../misc/wiki-tui { + inherit (darwin.apple_sdk.frameworks) Security; + }; winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { callPackage = newScope self; @@ -32956,7 +33208,7 @@ with pkgs; inherit wineBuild; inherit (callPackage ./wine-packages.nix {}) - minimal base full stable unstable staging fonts; + minimal base full stable stableFull unstable unstableFull staging stagingFull fonts; }); winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); @@ -33487,7 +33739,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 {}; @@ -33499,7 +33751,13 @@ with pkgs; zesarux = callPackage ../misc/emulators/zesarux { }; - zthrottle = callPackage ../tools/misc/zthrottle { }; + zk = callPackage ../applications/office/zk {}; zktree = callPackage ../applications/misc/zktree {}; + + zrythm = callPackage ../applications/audio/zrythm { + inherit (plasma5Packages) breeze-icons; + }; + + zthrottle = callPackage ../tools/misc/zthrottle { }; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5feb98a1704..bf5b65f9388 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -74,6 +74,7 @@ let mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {}; mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {}; mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {}; + mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {}; metalib = callPackage ../development/coq-modules/metalib { }; multinomials = callPackage ../development/coq-modules/multinomials {}; odd-order = callPackage ../development/coq-modules/odd-order { }; @@ -87,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/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix new file mode 100644 index 00000000000..3c6ed65e928 --- /dev/null +++ b/pkgs/top-level/cubocore-packages.nix @@ -0,0 +1,94 @@ +{ newScope, lxqt, lib, libsForQt5 }: + +let + packages = self: with self; { + + # Libs + libcprime = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcprime { }; + + libcsys = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcsys { }; + + # Apps + coreaction = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreaction { + inherit libcprime libcsys; + }; + + corearchiver = libsForQt5.callPackage ../applications/misc/cubocore-packages/corearchiver { + inherit libcprime libcsys; + }; + + corefm = libsForQt5.callPackage ../applications/misc/cubocore-packages/corefm { + inherit libcprime libcsys; + }; + + coregarage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coregarage { + inherit libcprime libcsys; + }; + + corehunt = libsForQt5.callPackage ../applications/misc/cubocore-packages/corehunt { + inherit libcprime libcsys; + }; + + coreimage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreimage { + inherit libcprime libcsys; + }; + + coreinfo = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreinfo { + inherit libcprime libcsys; + }; + + corekeyboard = libsForQt5.callPackage ../applications/misc/cubocore-packages/corekeyboard { + inherit libcprime libcsys; + }; + + corepad = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepad { + inherit libcprime libcsys; + }; + + corepaint = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepaint { + inherit libcprime libcsys; + }; + + corepdf = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepdf { + inherit libcprime libcsys; + }; + + corepins = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepins { + inherit libcprime libcsys; + }; + + corerenamer = libsForQt5.callPackage ../applications/misc/cubocore-packages/corerenamer { + inherit libcprime libcsys; + }; + + coreshot = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreshot { + inherit libcprime libcsys; + }; + + corestats = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestats { + inherit libcprime libcsys; + }; + + corestuff = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestuff { + inherit libcprime libcsys; + }; + + coreterminal = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreterminal { + inherit (lxqt) qtermwidget; + inherit libcprime libcsys; + }; + + coretime = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretime { + inherit libcprime libcsys; + }; + + coretoppings = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretoppings { + inherit libcprime libcsys; + }; + + coreuniverse = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreuniverse { + inherit libcprime libcsys; + }; + }; +in +lib.makeScope newScope packages diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index 173c37f4921..1910cb37274 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -17,16 +17,23 @@ let buildDhallDirectoryPackage = callPackage ../development/interpreters/dhall/build-dhall-directory-package.nix { }; + buildDhallUrl = + callPackage ../development/interpreters/dhall/build-dhall-url.nix { }; + in { inherit callPackage buildDhallPackage buildDhallGitHubPackage buildDhallDirectoryPackage + buildDhallUrl ; lib = import ../development/dhall-modules/lib.nix { inherit lib; }; + dhall-grafana = + callPackage ../development/dhall-modules/dhall-grafana.nix { }; + dhall-kubernetes = callPackage ../development/dhall-modules/dhall-kubernetes.nix { }; 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 a0ff1324808..175e940eed2 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -1,7 +1,11 @@ -{ lib, newScope, kodi }: +{ lib, newScope, kodi, libretro }: with lib; +let + inherit (libretro) genesis-plus-gx mgba snes9x; +in + let self = rec { addonDir = "/share/kodi/addons"; @@ -68,10 +72,22 @@ let self = rec { snes = callPackage ../applications/video/kodi-packages/controllers { controller = "snes"; }; }; + iagl = callPackage ../applications/video/kodi-packages/iagl { }; + + libretro = callPackage ../applications/video/kodi-packages/libretro { }; + + 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 { }; joystick = callPackage ../applications/video/kodi-packages/joystick { }; + keymap = callPackage ../applications/video/kodi-packages/keymap { }; + netflix = callPackage ../applications/video/kodi-packages/netflix { }; svtplay = callPackage ../applications/video/kodi-packages/svtplay { }; @@ -100,12 +116,16 @@ let self = rec { # addon packages (dependencies) + archive_tool = callPackage ../applications/video/kodi-packages/archive_tool { }; + certifi = callPackage ../applications/video/kodi-packages/certifi { }; chardet = callPackage ../applications/video/kodi-packages/chardet { }; dateutil = callPackage ../applications/video/kodi-packages/dateutil { }; + defusedxml = callPackage ../applications/video/kodi-packages/defusedxml { }; + idna = callPackage ../applications/video/kodi-packages/idna { }; inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 4220d57aee1..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 @@ -174,15 +166,27 @@ in { ]; }; - linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { + linux_5_15 = callPackage ../os-specific/linux/kernel/linux-5.15.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_14; + kernel = linux_5_15; kernelPatches = kernel.kernelPatches; }; @@ -226,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 @@ -320,6 +325,7 @@ in { nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; + nvidia_x11_legacy470 = nvidiaPackages.legacy_470; nvidia_x11_beta = nvidiaPackages.beta; nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; nvidia_x11 = nvidiaPackages.stable; @@ -432,6 +438,8 @@ in { virtualbox = pkgs.virtualboxHardened; }; + vm-tools = callPackage ../os-specific/linux/vm-tools { }; + wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; @@ -465,13 +473,13 @@ in { linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14); + linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); }; rtPackages = { # 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 = { @@ -495,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); @@ -510,10 +519,10 @@ in { packageAliases = { linux_default = packages.linux_5_10; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_14; + 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/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index 777cce7e5e0..350dd273fe2 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -3,7 +3,8 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } '' set -o pipefail - export NIX_STATE_DIR=$TMPDIR + export NIX_STORE_DIR=$TMPDIR/store + export NIX_STATE_DIR=$TMPDIR/state export NIX_PATH=nixpkgs=$TMPDIR/barf.nix opts=(--option build-users-group "") nix-store --init diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c9da008e8f5..b2d2d2415e2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -321,6 +321,8 @@ let inherit (pkgs) opam git mercurial coreutils gnutar bzip2; }; + dune-site = callPackage ../development/ocaml-modules/dune-site { }; + duration = callPackage ../development/ocaml-modules/duration { }; earley = callPackage ../development/ocaml-modules/earley { }; @@ -342,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; } ); @@ -417,6 +419,10 @@ let getopt = callPackage ../development/ocaml-modules/getopt { }; + gluten = callPackage ../development/ocaml-modules/gluten { }; + gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { }; + gluten-lwt-unix = callPackage ../development/ocaml-modules/gluten/lwt-unix.nix { }; + gmap = callPackage ../development/ocaml-modules/gmap { }; gnuplot = callPackage ../development/ocaml-modules/gnuplot { @@ -1032,6 +1038,8 @@ let phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; + piaf = callPackage ../development/ocaml-modules/piaf { }; + piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; @@ -1050,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 { }; @@ -1144,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 {}; @@ -1455,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 2cc19753271..3b427030756 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -229,7 +229,7 @@ let buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ AlienBuild ArchiveExtract CaptureTiny Filechdir PathTiny ShellConfigGenerate ShellGuess SortVersions URI ]; meta = { - homepage = https://metacpan.org/pod/Alien::Base::ModuleBuild; + homepage = "https://metacpan.org/pod/Alien::Base::ModuleBuild"; description = "A Module::Build subclass for building Alien:: modules and their libraries"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -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. @@ -3518,13 +3518,33 @@ let }; }; + CompressRawLzma = buildPerlPackage { + pname = "Compress-Raw-Lzma"; + version = "2.101"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Lzma-2.101.tar.gz"; + sha256 = "bb267fd31981eda11f444038f8a0fca4b94a51ae61b2db71246abf6a4d322a36"; + }; + preConfigure = '' + cat > config.in <<EOF + INCLUDE = ${pkgs.xz.dev}/include + LIB = ${pkgs.xz.out}/lib + EOF + ''; + meta = { + homepage = "https://github.com/pmqs/Compress-Raw-Lzma"; + description = "Low-Level Interface to lzma compression library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + 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 = '' @@ -5784,6 +5804,20 @@ let }; }; + DateTimeFormatRFC3339 = buildPerlPackage rec { + pname = "DateTime-Format-RFC3339"; + version = "1.2.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IK/IKEGAMI/DateTime-Format-RFC3339-v${version}.tar.gz"; + sha256 = "1xqdbbiksy6kapc3mv3ayjahmxxlzmb5x7rad4by1iii9hif2vhk"; + }; + propagatedBuildInputs = [ DateTime ]; + meta = { + description = "Parse and format RFC3339 datetime strings"; + license = lib.licenses.cc0; + }; + }; + DateTimeSet = buildPerlModule { pname = "DateTime-Set"; version = "0.3900"; @@ -9688,10 +9722,10 @@ let Gtk3ImageView = buildPerlPackage rec { pname = "Gtk3-ImageView"; - version = "9"; + version = "10"; src = fetchurl { url = "mirror://cpan/authors/id/A/AS/ASOKOLOV/Gtk3-ImageView-${version}.tar.gz"; - sha256 = "sha256-0dxe0p1UQglq+xok7g4l2clJ9WqOHxCeAzWD65E0H9w="; + sha256 = "sha256-vHfnBgaeZPK7hBgZcP1KjepG+IvsDE3XwrH9U4xoN+Y="; }; buildInputs = [ pkgs.gtk3 ]; propagatedBuildInputs = [ Readonly Gtk3 ]; @@ -9987,7 +10021,7 @@ let }; propagatedBuildInputs = [ IPCRun URI constant-defer ]; meta = { - homepage = http://user42.tuxfamily.org/html-formatexternal/index.html; + homepage = "http://user42.tuxfamily.org/html-formatexternal/index.html"; description = "HTML to text formatting using external programs"; license = lib.licenses.gpl3Plus; }; @@ -10960,10 +10994,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 = { @@ -11776,6 +11810,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 ]; @@ -15032,7 +15073,7 @@ let makeMakerFlags = "POSTGRES_HOME=${pkgs.postgresql}"; meta = { - homepage = https://github.com/TJC/Test-postgresql; + homepage = "https://github.com/TJC/Test-postgresql"; description = "PostgreSQL runner for tests"; license = with lib.licenses; [ artistic2 ]; }; @@ -17378,7 +17419,7 @@ let buildInputs = [ ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ Moo MooXTypeTiny TryTiny TypeTiny ]; meta = { - homepage = https://github.com/karenetheridge/Path-Dispatcher; + homepage = "https://github.com/karenetheridge/Path-Dispatcher"; description = "Flexible and extensible dispatch"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20093,7 +20134,7 @@ let buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ ShellGuess ]; meta = { - homepage = https://metacpan.org/pod/Shell::Config::Generate; + homepage = "https://metacpan.org/pod/Shell::Config::Generate"; description = "Portably generate config for any shell"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20107,7 +20148,7 @@ let sha256 = "4069fa2637e443118ed956d710231d166823d23b2a64eb87b8a46872e865a12b"; }; meta = { - homepage = https://metacpan.org/pod/Shell::Guess; + homepage = "https://metacpan.org/pod/Shell::Guess"; description = "Make an educated guess about the shell in use"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20590,12 +20631,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "7.8.0"; + version = "7.9.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; - rev = "v7.8.0"; - sha256 = "sha256-D/sVIKMWy3WnDM97+ofG3ClgGhJJuK2a6NJLC03S4LI="; + rev = "v7.9.0"; + sha256 = "sha256-QxY6TRVQWrN689CD76CQZeyXsDVWxk24N1v67DCvmDo="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -23366,7 +23407,7 @@ let }; propagatedBuildInputs = [ AlgorithmDiff HTMLParser ]; meta = { - homepage = https://metacpan.org/release/Text-WordDiff; + homepage = "https://metacpan.org/release/Text-WordDiff"; description = "Track changes between documents"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -24512,6 +24553,13 @@ 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; buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ]; @@ -24666,7 +24714,8 @@ let sha256 = "068nhmld1031grgi4qm7k5niwxlbn6qd08zf6g1gj4c7qfas62q1"; }; SKIP_SAX_INSTALL = 1; - buildInputs = [ AlienBuild AlienLibxml2 ]; + buildInputs = [ AlienBuild AlienLibxml2 ] + ++ lib.optional stdenv.isDarwin pkgs.libiconv; propagatedBuildInputs = [ XMLSAX ]; }; @@ -25121,7 +25170,7 @@ let buildInputs = [ NetHTTP TestFailWarnings TestFatal ]; propagatedBuildInputs = [ HTTPHeadersActionPack HTTPMessage HashMultiValue IOHandleUtil ModuleRuntime Plack SubExporter TryTiny ]; meta = { - homepage = http://metacpan.org/release/Web-Machine; + homepage = "http://metacpan.org/release/Web-Machine"; description = "A Perl port of Webmachine"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f53f4543319..578803d0da7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -33,34 +33,41 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ - blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 + blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 - bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # added 2019-11-27 class-registry = phx-class-registry; # added 2021-10-05 ConfigArgParse = configargparse; # added 2021-03-18 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 - dftfit = throw "it's dependency lammps-cython no longer builds"; + dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 - djangorestframework-jwt = drf-jwt; - dns = dnspython; # Alias for compatibility, 2017-12-10 - faulthandler = throw "faulthandler is built into ${python.executable}"; + djangorestframework-jwt = drf-jwt; # added 2021-07-20 + django_redis = django-redis; # added 2021-10-11 + 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 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 HAP-python = hap-python; # added 2021-06-01 + hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07 + IMAPClient = imapclient; # added 2021-10-28 jupyter_client = jupyter-client; # added 2021-10-15 - lammps-cython = throw "no longer builds and is unmaintained"; + lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 MechanicalSoup = mechanicalsoup; # added 2021-06-01 pam = python-pam; # added 2020-09-07. - PasteDeploy = pastedeploy; - powerlineMemSegment = powerline-mem-segment; - privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 + PasteDeploy = pastedeploy; # added 2021-10-07 + powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 + privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 prometheus_client = prometheus-client; # added 2021-06-10 - prompt_toolkit = prompt-toolkit; + prompt_toolkit = prompt-toolkit; # added 2021-07-22 + pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pysmart-smartx = pysmart; # added 2021-10-22 @@ -69,22 +76,29 @@ 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 "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + 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 + 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 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 - sphinxcontrib_plantuml = sphinxcontrib-plantuml; - topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 - tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 - WazeRouteCalculator = wazeroutecalculator; # 2021-09-29 - websocket_client = websocket-client; + sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 + sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 + topydo = throw "topydo was moved to pkgs.topydo"; # added 2017-09-22 + tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 + WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 + websocket_client = websocket-client; # added 2021-06-15 zc-buildout221 = zc-buildout; # added 2021-07-21 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55b93266783..9916b8250e9 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 { }; @@ -315,6 +319,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 +403,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 { }; @@ -409,6 +417,8 @@ in { airthings-cloud = callPackage ../development/python-modules/airthings-cloud { }; + airtouch4pyapi = callPackage ../development/python-modules/airtouch4pyapi { }; + ajpy = callPackage ../development/python-modules/ajpy { }; ajsonrpc = callPackage ../development/python-modules/ajsonrpc { }; @@ -461,6 +471,10 @@ in { angr = callPackage ../development/python-modules/angr { }; + angrcli = callPackage ../development/python-modules/angrcli { + inherit (pkgs) coreutils; + }; + angrop = callPackage ../development/python-modules/angrop { }; aniso8601 = callPackage ../development/python-modules/aniso8601 { }; @@ -691,7 +705,9 @@ in { audioread = callPackage ../development/python-modules/audioread { }; - audiotools = callPackage ../development/python-modules/audiotools { }; + audiotools = callPackage ../development/python-modules/audiotools { + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreServices; + }; augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; @@ -1314,6 +1330,8 @@ in { build = callPackage ../development/python-modules/build { }; + buildcatrust = callPackage ../development/python-modules/buildcatrust { }; + bumps = callPackage ../development/python-modules/bumps { }; bunch = callPackage ../development/python-modules/bunch { }; @@ -1373,6 +1391,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 { }; @@ -1399,6 +1419,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 { }; @@ -1423,6 +1445,8 @@ in { certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; + certbot-dns-google = callPackage ../development/python-modules/certbot-dns-google { }; + certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; certifi = callPackage ../development/python-modules/certifi { }; @@ -1695,6 +1719,8 @@ in { confuse = callPackage ../development/python-modules/confuse { }; + confight = callPackage ../development/python-modules/confight { }; + connexion = callPackage ../development/python-modules/connexion { }; consonance = callPackage ../development/python-modules/consonance { }; @@ -2008,6 +2034,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 { }; @@ -2100,6 +2128,8 @@ in { django-csp = callPackage ../development/python-modules/django-csp { }; + django-debug-toolbar = callPackage ../development/python-modules/django-debug-toolbar { }; + django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { }; @@ -2112,6 +2142,8 @@ in { django-formtools = callPackage ../development/python-modules/django-formtools { }; + django-graphiql-debug-toolbar = callPackage ../development/python-modules/django-graphiql-debug-toolbar { }; + django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { }; django_guardian = callPackage ../development/python-modules/django_guardian { }; @@ -2127,6 +2159,8 @@ in { django-jinja = callPackage ../development/python-modules/django-jinja2 { }; + django-js-asset = callPackage ../development/python-modules/django-js-asset { }; + django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; @@ -2137,6 +2171,8 @@ in { django-maintenance-mode = callPackage ../development/python-modules/django-maintenance-mode { }; + django-mptt = callPackage ../development/python-modules/django-mptt { }; + django_nose = callPackage ../development/python-modules/django_nose { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; @@ -2151,6 +2187,8 @@ in { django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; + django-prometheus = callPackage ../development/python-modules/django-prometheus { }; + django-q = callPackage ../development/python-modules/django-q { }; djangoql = callPackage ../development/python-modules/djangoql { }; @@ -2159,10 +2197,12 @@ in { django-raster = callPackage ../development/python-modules/django-raster { }; - django_redis = callPackage ../development/python-modules/django_redis { }; + django-redis = callPackage ../development/python-modules/django-redis { }; django-rest-auth = callPackage ../development/python-modules/django-rest-auth { }; + django-rq = callPackage ../development/python-modules/django-rq { }; + djangorestframework = callPackage ../development/python-modules/djangorestframework { }; djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; @@ -2185,9 +2225,13 @@ in { django-storages = callPackage ../development/python-modules/django-storages { }; + django-tables2 = callPackage ../development/python-modules/django-tables2 { }; + django_tagging = callPackage ../development/python-modules/django_tagging { }; - django_taggit = callPackage ../development/python-modules/django_taggit { }; + django-taggit = callPackage ../development/python-modules/django-taggit { }; + + django-timezone-field = callPackage ../development/python-modules/django-timezone-field { }; django_treebeard = callPackage ../development/python-modules/django_treebeard { }; @@ -2223,6 +2267,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 { }; @@ -2239,6 +2285,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 { }; @@ -2255,9 +2303,7 @@ in { dodgy = callPackage ../development/python-modules/dodgy { }; - dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; - - dogpile_core = callPackage ../development/python-modules/dogpile.core { }; + dogpile-cache = callPackage ../development/python-modules/dogpile-cache { }; dogtail = callPackage ../development/python-modules/dogtail { }; @@ -2313,6 +2359,8 @@ in { duecredit = callPackage ../development/python-modules/duecredit { }; + duet = callPackage ../development/python-modules/duet { }; + dufte = callPackage ../development/python-modules/dufte { }; dugong = callPackage ../development/python-modules/dugong { }; @@ -2339,6 +2387,8 @@ in { easywatch = callPackage ../development/python-modules/easywatch { }; + ebaysdk = callPackage ../development/python-modules/ebaysdk { }; + ec2instanceconnectcli = callPackage ../tools/virtualization/ec2instanceconnectcli { }; eccodes = toPythonModule (pkgs.eccodes.override { @@ -2390,6 +2440,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 { }; @@ -2424,6 +2476,8 @@ in { routerFeatures = true; }; + entry-points-txt = callPackage ../development/python-modules/entry-points-txt { }; + entrypoint2 = callPackage ../development/python-modules/entrypoint2 { }; entrypoints = callPackage ../development/python-modules/entrypoints { }; @@ -2685,6 +2739,8 @@ in { flake8 = callPackage ../development/python-modules/flake8 { }; + flake8-length = callPackage ../development/python-modules/flake8-length { }; + flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; @@ -2699,6 +2755,8 @@ in { flammkuchen = callPackage ../development/python-modules/flammkuchen { }; + flashtext = callPackage ../development/python-modules/flashtext { }; + flask-admin = callPackage ../development/python-modules/flask-admin { }; flask-api = callPackage ../development/python-modules/flask-api { }; @@ -2781,6 +2839,8 @@ in { flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { }; + flask-talisman = callPackage ../development/python-modules/flask-talisman { }; + flask_testing = callPackage ../development/python-modules/flask-testing { }; flask-versioned = callPackage ../development/python-modules/flask-versioned { }; @@ -2926,6 +2986,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 { }; @@ -2964,6 +3026,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 { }; @@ -3044,6 +3108,8 @@ in { gipc = callPackage ../development/python-modules/gipc { }; + gistyc = callPackage ../development/python-modules/gistyc { }; + git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { }; @@ -3094,6 +3160,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 { }; @@ -3259,6 +3327,8 @@ in { graphene = callPackage ../development/python-modules/graphene { }; + graphene-django = callPackage ../development/python-modules/graphene-django { }; + graphqlclient= callPackage ../development/python-modules/graphqlclient { }; graphql-core = callPackage ../development/python-modules/graphql-core { }; @@ -3388,12 +3458,16 @@ in { hdate = callPackage ../development/python-modules/hdate { }; + ha-av = callPackage ../development/python-modules/ha-av { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ }; halo = callPackage ../development/python-modules/halo { }; + halohome = callPackage ../development/python-modules/halohome { }; + handout = callPackage ../development/python-modules/handout { }; hangups = callPackage ../development/python-modules/hangups { }; @@ -3408,18 +3482,20 @@ in { hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; - hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - hcloud = callPackage ../development/python-modules/hcloud { }; hcs_utils = callPackage ../development/python-modules/hcs_utils { }; hdbscan = callPackage ../development/python-modules/hdbscan { }; + hdfs = callPackage ../development/python-modules/hdfs { }; + hdlparse = callPackage ../development/python-modules/hdlparse { }; hdmedians = callPackage ../development/python-modules/hdmedians { }; + headerparser = callPackage ../development/python-modules/headerparser { }; + heapdict = callPackage ../development/python-modules/heapdict { }; helpdev = callPackage ../development/python-modules/helpdev { }; @@ -3646,6 +3722,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 { }; @@ -3658,13 +3738,15 @@ in { imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; + image-go-nord = callPackage ../development/python-modules/image-go-nord { }; + image-match = callPackage ../development/python-modules/image-match { }; imagesize = callPackage ../development/python-modules/imagesize { }; imantics = callPackage ../development/python-modules/imantics { }; - IMAPClient = callPackage ../development/python-modules/imapclient { }; + imapclient = callPackage ../development/python-modules/imapclient { }; imaplib2 = callPackage ../development/python-modules/imaplib2 { }; @@ -3728,6 +3810,8 @@ in { inkex = callPackage ../development/python-modules/inkex { }; + inotify = callPackage ../development/python-modules/inotify { }; + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; inotifyrecursive = callPackage ../development/python-modules/inotifyrecursive { }; @@ -3879,6 +3963,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 { }; @@ -4031,6 +4117,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 { }; @@ -4174,6 +4262,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; }; @@ -4202,6 +4292,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 { @@ -4280,6 +4372,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; @@ -4356,6 +4450,8 @@ in { inherit python; })).py; + life360 = callPackage ../development/python-modules/life360 { }; + lightgbm = callPackage ../development/python-modules/lightgbm { }; lightning = callPackage ../development/python-modules/lightning { }; @@ -4463,6 +4559,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 { }; @@ -4531,6 +4629,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 { }; @@ -4547,6 +4649,8 @@ in { markdown = callPackage ../development/python-modules/markdown { }; + markdown-include = callPackage ../development/python-modules/markdown-include { }; + markdown-it-py = callPackage ../development/python-modules/markdown-it-py { }; markdown-macros = callPackage ../development/python-modules/markdown-macros { }; @@ -4581,7 +4685,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; }; @@ -4692,6 +4796,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 { }; @@ -4796,6 +4902,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 { }; @@ -4826,6 +4934,8 @@ in { mpyq = callPackage ../development/python-modules/mpyq { }; + mrkd = callPackage ../development/python-modules/mrkd { }; + ms-cv = callPackage ../development/python-modules/ms-cv { }; msal = callPackage ../development/python-modules/msal { }; @@ -4882,6 +4992,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 { }; @@ -4980,6 +5092,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 { }; @@ -5022,6 +5136,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 { }; @@ -5201,6 +5317,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 { }; @@ -5217,6 +5335,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 { }; @@ -5251,7 +5371,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 { }; @@ -5368,6 +5488,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 { }; @@ -5462,7 +5584,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 { }; @@ -5622,10 +5744,7 @@ in { pipdate = callPackage ../development/python-modules/pipdate { }; - pip-tools = callPackage ../development/python-modules/pip-tools { - git = pkgs.gitMinimal; - inherit (pkgs) glibcLocales; - }; + pip-tools = callPackage ../development/python-modules/pip-tools { }; pipx = callPackage ../development/python-modules/pipx { }; @@ -5700,6 +5819,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 { }; @@ -5849,6 +5970,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 { }; @@ -5946,8 +6069,12 @@ in { protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; + proton-client = callPackage ../development/python-modules/proton-client { }; + protonup = callPackage ../development/python-modules/protonup { }; + protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib { }; + prov = callPackage ../development/python-modules/prov { }; prox-tv = callPackage ../development/python-modules/prox-tv { }; @@ -5986,8 +6113,6 @@ in { pulsectl = callPackage ../development/python-modules/pulsectl { }; - pur = callPackage ../development/python-modules/pur { }; - pure-cdb = callPackage ../development/python-modules/pure-cdb { }; pure-eval = callPackage ../development/python-modules/pure-eval { }; @@ -6026,10 +6151,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 { }; @@ -6092,6 +6221,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 { }; @@ -6160,6 +6291,8 @@ in { pyclimacell = callPackage ../development/python-modules/pyclimacell { }; + pyclip = callPackage ../development/python-modules/pyclip { }; + pyclipper = callPackage ../development/python-modules/pyclipper { }; pycm = callPackage ../development/python-modules/pycm { }; @@ -6229,6 +6362,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 { }; @@ -6269,6 +6404,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 { }; @@ -6295,12 +6434,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 { }; @@ -6364,7 +6507,7 @@ in { pygal = callPackage ../development/python-modules/pygal { }; pygame = callPackage ../development/python-modules/pygame { - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreMIDI; + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; @@ -6509,6 +6652,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 { }; @@ -6577,6 +6722,8 @@ in { pymanopt = callPackage ../development/python-modules/pymanopt { }; + pymarshal = callPackage ../development/python-modules/pymarshal { }; + pymata-express = callPackage ../development/python-modules/pymata-express { }; pymatgen = callPackage ../development/python-modules/pymatgen { }; @@ -6683,6 +6830,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 { }; @@ -6892,7 +7041,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 { }; @@ -6964,6 +7113,8 @@ in { pysearpc = toPythonModule pkgs.libsearpc; + pysecuritas = callPackage ../development/python-modules/pysecuritas { }; + pysendfile = callPackage ../development/python-modules/pysendfile { }; pysensors = callPackage ../development/python-modules/pysensors { }; @@ -7208,6 +7359,8 @@ in { pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; + pytest-dotenv = callPackage ../development/python-modules/pytest-dotenv { }; + pytest-env = callPackage ../development/python-modules/pytest-env { }; pytest-error-for-skips = callPackage ../development/python-modules/pytest-error-for-skips { }; @@ -7430,11 +7583,8 @@ 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; }; }; @@ -7493,7 +7643,7 @@ in { python-miio = callPackage ../development/python-modules/python-miio { }; - python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; + python-mimeparse = callPackage ../development/python-modules/python-mimeparse { }; python-mnist = callPackage ../development/python-modules/python-mnist { }; @@ -7660,6 +7810,8 @@ in { cudaSupport = false; }; + pytraccar = callPackage ../development/python-modules/pytraccar { }; + pytradfri = callPackage ../development/python-modules/pytradfri { }; pytrafikverket = callPackage ../development/python-modules/pytrafikverket { }; @@ -7709,6 +7861,8 @@ in { pyupgrade = callPackage ../development/python-modules/pyupgrade { }; + pyuptimerobot = callPackage ../development/python-modules/pyuptimerobot { }; + pyusb = callPackage ../development/python-modules/pyusb { inherit (pkgs) libusb1; }; @@ -7729,6 +7883,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 { }; @@ -7763,6 +7919,8 @@ in { pywavelets = callPackage ../development/python-modules/pywavelets { }; + pywayland = callPackage ../development/python-modules/pywayland { }; + pywbem = callPackage ../development/python-modules/pywbem { inherit (pkgs) libxml2; }; @@ -7781,6 +7939,8 @@ in { pywizlight = callPackage ../development/python-modules/pywizlight { }; + pywlroots = callPackage ../development/python-modules/pywlroots { }; + pyxattr = callPackage ../development/python-modules/pyxattr { }; pyworld = callPackage ../development/python-modules/pyworld { }; @@ -7827,18 +7987,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 { }; @@ -7874,6 +8044,8 @@ in { queuelib = callPackage ../development/python-modules/queuelib { }; + qutip = callPackage ../development/python-modules/qutip { }; + qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; r2pipe = callPackage ../development/python-modules/r2pipe { }; @@ -7924,8 +8096,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 { }; @@ -7968,6 +8138,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 { }; @@ -8082,6 +8254,8 @@ in { rising = callPackage ../development/python-modules/rising { }; + ritassist = callPackage ../development/python-modules/ritassist { }; + rivet = toPythonModule (pkgs.rivet.override { python3 = python; }); @@ -8180,14 +8354,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 { }; @@ -8319,7 +8490,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 { }; @@ -8468,7 +8639,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 { }; @@ -8482,7 +8653,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 { }; @@ -8536,6 +8707,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 { }; @@ -8776,7 +8949,7 @@ in { sqlalchemy-jsonfield = callPackage ../development/python-modules/sqlalchemy-jsonfield { }; - sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; + sqlalchemy-migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; @@ -8822,6 +8995,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; }; @@ -8830,6 +9005,8 @@ in { starline = callPackage ../development/python-modules/starline { }; + stashy = callPackage ../development/python-modules/stashy { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; statistics = callPackage ../development/python-modules/statistics { }; @@ -8872,6 +9049,8 @@ in { stripe = callPackage ../development/python-modules/stripe { }; + striprtf = callPackage ../development/python-modules/striprtf { }; + structlog = callPackage ../development/python-modules/structlog { }; stumpy = callPackage ../development/python-modules/stumpy { }; @@ -8988,6 +9167,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 { }; @@ -9239,6 +9420,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 { }; @@ -9407,6 +9590,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 { }; @@ -9447,6 +9634,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 { }; @@ -9501,6 +9690,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 { }; @@ -9523,6 +9714,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 { }; @@ -9587,6 +9780,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 { }; @@ -9668,6 +9863,8 @@ in { enablePython = true; }); + vulcan-api = callPackage ../development/python-modules/vulcan-api { }; + vultr = callPackage ../development/python-modules/vultr { }; vulture = callPackage ../development/python-modules/vulture { }; @@ -9711,8 +9908,12 @@ in { waterfurnace = callPackage ../development/python-modules/waterfurnace { }; + watermark = callPackage ../development/python-modules/watermark { }; + wavedrom = callPackage ../development/python-modules/wavedrom { }; + wavefile = callPackage ../development/python-modules/wavefile { }; + wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; wcmatch = callPackage ../development/python-modules/wcmatch { }; @@ -9763,6 +9964,8 @@ in { werkzeug = callPackage ../development/python-modules/werkzeug { }; + werkzeug1 = callPackage ../development/python-modules/werkzeug/1.nix { }; + west = callPackage ../development/python-modules/west { }; wfuzz = callPackage ../development/python-modules/wfuzz { }; @@ -9771,6 +9974,10 @@ in { wheel = callPackage ../development/python-modules/wheel { }; + wheel-filename = callPackage ../development/python-modules/wheel-filename { }; + + wheel-inspect = callPackage ../development/python-modules/wheel-inspect { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; whirlpool-sixth-sense = callPackage ../development/python-modules/whirlpool-sixth-sense { }; @@ -9892,6 +10099,8 @@ in { xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + xkbcommon = callPackage ../development/python-modules/xkbcommon { }; + xkcdpass = callPackage ../development/python-modules/xkcdpass { }; xknx = callPackage ../development/python-modules/xknx { }; @@ -10140,7 +10349,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 927827b66e5..56b39b5087a 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -110,6 +110,8 @@ with self; with super; { feedparser = callPackage ../development/python-modules/feedparser/5.nix { }; + filelock = callPackage ../development/python-modules/filelock/3.2.nix { }; + flask = callPackage ../development/python-modules/flask/1.nix { }; flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; @@ -413,6 +415,11 @@ 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 { }; @@ -528,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 { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index bc3f5524e6a..c80462d9d1e 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -136,6 +136,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea libqtav = callPackage ../development/libraries/libqtav { }; + libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; + kpmcore = callPackage ../development/libraries/kpmcore { }; mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 0cd73d68518..f6e34e7084b 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -182,7 +182,7 @@ let hledger-web hlint hpack - hyper-haskell + # hyper-haskell # depends on electron-10.4.7 which is marked as insecure hyper-haskell-server-with-packages icepeak idris @@ -330,10 +330,7 @@ let }; constituents = accumulateDerivations [ # haskell specific tests - # - # TODO: The writers test appears to be failing on darwin for unknown - # reasons. See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881307871. - (lib.recursiveUpdate jobs.tests.haskell { writers.x86_64-darwin = null; }) + jobs.tests.haskell # important top-level packages jobs.cabal-install jobs.cabal2nix diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 48541035604..af492cc4b98 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -4,7 +4,10 @@ */ { # The platforms for which we build Nixpkgs. - supportedSystems ? [ "x86_64-linux" ] + supportedSystems ? [ + "aarch64-linux" + "x86_64-linux" + ] , # Attributes passed to nixpkgs. Don't build packages marked as unfree. nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } }: diff --git a/pkgs/top-level/release-r.nix b/pkgs/top-level/release-r.nix index d31e9ced22d..4c715a7786d 100644 --- a/pkgs/top-level/release-r.nix +++ b/pkgs/top-level/release-r.nix @@ -4,7 +4,7 @@ $ hydra-eval-jobs -I . pkgs/top-level/release-r.nix */ -{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] }: +{ supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] }: with import ./release-lib.nix { inherit supportedSystems; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index a990c5ed70c..9d34ddb3685 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -76,8 +76,10 @@ let trivialBuilders = self: super: import ../build-support/trivial-builders.nix { - inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.pkgsBuildHost.xorg) lndir; - inherit (self) runtimeShell; + inherit lib; + inherit (self) runtimeShell stdenv stdenvNoCC; + inherit (self.pkgsBuildHost) shellcheck; + inherit (self.pkgsBuildHost.xorg) lndir; }; stdenvBootstappingAndPlatforms = self: super: let @@ -116,7 +118,6 @@ let inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; in { inherit buildPlatform hostPlatform targetPlatform; - inherit (hostPlatform) system; }; splice = self: super: import ./splice.nix lib self (adjacentPackages != null); diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index b26bc361cf5..fff2d73110c 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -51,6 +51,11 @@ rec { }; stable = base.override { wineRelease = "stable"; }; + stableFull = full.override { wineRelease = "stable"; }; + unstable = base.override { wineRelease = "unstable"; }; + unstableFull = full.override { wineRelease = "unstable"; }; + staging = base.override { wineRelease = "staging"; }; + stagingFull = full.override { wineRelease = "staging"; }; } |