diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 762 | ||||
| -rw-r--r-- | pkgs/top-level/config.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/emscripten-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/java-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/kodi-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/octave-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 45 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 137 | ||||
| -rw-r--r-- | pkgs/top-level/release-haskell.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/ruby-packages.nix | 4 |
16 files changed, 804 insertions, 315 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2328a1f3f91c..183d93114cfd9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -78,6 +78,7 @@ mapAliases ({ ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30 antimicroX = antimicrox; # Added 2021-10-31 + apple-music-electron = throw "'apple-music-electron' is end of life and has been removed, you can use 'cider' instead"; # Added 2022-10-02 ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # Added 2021-09-28 arduino_core = throw "'arduino_core' has been renamed to/replaced by 'arduino-core'"; # Converted to throw 2022-02-22 asciidocFull = throw "'asciidocFull' has been renamed to/replaced by 'asciidoc-full'"; # Converted to throw 2022-02-22 @@ -86,6 +87,8 @@ mapAliases ({ asterisk_17 = throw "asterisk_17: Asterisk 17 is end of life and has been removed"; # Added 2022-04-06 at_spi2_atk = throw "'at_spi2_atk' has been renamed to/replaced by 'at-spi2-atk'"; # Converted to throw 2022-02-22 at_spi2_core = throw "'at_spi2_core' has been renamed to/replaced by 'at-spi2-core'"; # Converted to throw 2022-02-22 + audacity-gtk2 = throw "'audacity-gtk2' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 + audacity-gtk3 = throw "'audacity-gtk3' has been removed to/replaced by 'audacity'"; # Added 2022-10-09 automoc4 = throw "automoc4 has been removed from nixpkgs"; # Added 2022-05-30 avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2022-09-24 awesome-4-0 = awesome; # Added 2022-05-05 @@ -150,6 +153,8 @@ mapAliases ({ catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2022-09-24 cde-gtk-theme = throw "cde-gtk-theme has been removed from nixpkgs as it shipped with python2 scripts that didn't work anymore"; # Added 2022-01-12 checkbashism = throw "'checkbashism' has been renamed to/replaced by 'checkbashisms'"; # Converted to throw 2022-02-22 + chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 + chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15 chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07 cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22 cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11 @@ -515,7 +520,12 @@ mapAliases ({ interfacer = throw "interfacer is deprecated and archived by upstream"; # Added 2022-04-05 inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2022-09-24 iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 + ipfs = kubo; # Added 2022-09-27 + ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 + ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 + ipfs-migrator = kubo-migrator; # Added 2022-09-27 iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2022-09-24 + iproute_mptcp = throw "'iproute_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 itch-setup = throw "itch-setup has benn removed, use itch instead"; # Added 2022-06-02 @@ -605,6 +615,7 @@ mapAliases ({ liblapackWithoutAtlas = throw "'liblapackWithoutAtlas' has been renamed to/replaced by 'lapack-reference'"; # Converted to throw 2022-02-22 liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2022-09-24 liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 + libmicrohttpd_0_9_70 = throw "'libmicrohttpd_0_9_70' has been removed because it is insecure, and has been replaced by 'libmicrohttpd_0_9_69' and 'libmicrohttpd_0_9_71'"; # Added 2022-10-10 libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 libnih = throw "'libnih' has been removed"; # Converted to throw 2022-05-17 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; @@ -630,7 +641,6 @@ mapAliases ({ libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2022-09-24 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 - lighthouse = throw "lighthouse has been removed: abandoned by upstream"; # Added 2022-04-24 lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15 lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2"; # Added 2022-01-14 lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2"; # Added 2022-01-14 @@ -651,6 +661,7 @@ mapAliases ({ linuxPackages_5_18 = linuxKernel.packages.linux_5_18; linuxPackages_5_19 = linuxKernel.packages.linux_5_19; linuxPackages_5_4 = linuxKernel.packages.linux_5_4; + linuxPackages_6_0 = linuxKernel.packages.linux_6_0; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -671,7 +682,10 @@ mapAliases ({ linux_5_18 = linuxKernel.kernels.linux_5_18; linux_5_19 = linuxKernel.kernels.linux_5_19; linux_5_4 = linuxKernel.kernels.linux_5_4; - linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; + linux_6_0 = linuxKernel.kernels.linux_6_0; + linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 + linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 + linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -743,7 +757,7 @@ mapAliases ({ mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2022-09-24 murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2022-09-24 mutt-with-sidebar = mutt; # Added 2022-09-17 - mysql-client = throw "'mysql-client' has been renamed to/replaced by 'hiPrio'"; # Converted to throw 2022-09-24 + mysql-client = throw "'mysql-client' has been renamed to/replaced by 'mariadb.client'"; # Converted to throw 2022-09-24 mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2022-09-24 mesa_drivers = throw "'mesa_drivers' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-09-24 @@ -770,6 +784,7 @@ mapAliases ({ ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 neochat = libsForQt5.plasmaMobileGear.neochat; # added 2022-05-10 + nettools_mptcp = throw "'nettools_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 networkmanager_l2tp = throw "'networkmanager_l2tp' has been renamed to/replaced by 'networkmanager-l2tp'"; # Converted to throw 2022-02-22 @@ -840,13 +855,13 @@ mapAliases ({ paperless-ng = paperless-ngx; # Added 2022-04-11 parity = throw "'parity' has been renamed to/replaced by 'openethereum'"; # Converted to throw 2022-09-24 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 - parlatype = throw "parlatype has been removed: unmaintained"; # Added 2022-04-24 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09 pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 pbis-open = throw "pbis-open has been removed, because it is no longer maintained upstream"; # added 2021-12-15 pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project"; # Added 2022-01-01 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 + pdfstudio = throw "'pdfstudio' has been replaced with 'pdfstudio<year>', where '<year>' is the year from the PDF Studio version number, because each license is specific to a given year"; # Added 2022-09-04 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 @@ -1140,6 +1155,7 @@ mapAliases ({ tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22 textadept11 = textadept; # Added 2022-06-07 tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 + timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09 timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2022-09-24 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 tkcvs = tkrev; # Added 2022-03-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05fa70c1fd601..ac42823910a56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -126,6 +126,8 @@ with pkgs; _experimental-update-script-combinators = callPackage ../common-updater/combinators.nix { }; + directoryListingUpdater = callPackage ../common-updater/directory-listing-updater.nix { }; + gitUpdater = callPackage ../common-updater/git-updater.nix { }; httpTwoLevelsUpdater = callPackage ../common-updater/http-two-levels-updater.nix { }; @@ -185,7 +187,9 @@ with pkgs; meta.platforms = lib.platforms.linux; } ../build-support/setup-hooks/auto-patchelf.sh; - appflowy = callPackage ../applications/office/appflowy { }; + appflowy = callPackage ../applications/office/appflowy { + openssl = openssl_1_1; + }; appimageTools = callPackage ../build-support/appimage { buildFHSUserEnv = buildFHSUserEnvBubblewrap; @@ -306,7 +310,9 @@ with pkgs; breakpad = callPackage ../development/misc/breakpad { }; - brev-cli = callPackage ../development/misc/brev-cli { }; + brev-cli = callPackage ../development/misc/brev-cli { + buildGoModule = buildGo118Module; # build fails with 1.19 + }; buf = callPackage ../development/tools/buf { }; @@ -729,7 +735,9 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; - mangal = callPackage ../applications/misc/mangal { }; + mangal = callPackage ../applications/misc/mangal { + buildGoModule = buildGo119Module; + }; graphw00f = callPackage ../tools/security/graphw00f { }; @@ -899,7 +907,9 @@ with pkgs; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } ../build-support/setup-hooks/ld-is-cc-hook.sh; - libgtkflow = callPackage ../development/libraries/libgtkflow { }; + libgflow = callPackage ../development/libraries/libgflow { }; + libgtkflow3 = callPackage ../development/libraries/libgtkflow3 { }; + libgtkflow4 = callPackage ../development/libraries/libgtkflow4 { }; libredirect = callPackage ../build-support/libredirect { }; @@ -928,7 +938,9 @@ with pkgs; { deps = [ dieHook ]; substitutions = { shell = targetPackages.runtimeShell; - passthru.tests = tests.makeWrapper; + }; + passthru = { + tests = tests.makeWrapper; }; } ../build-support/setup-hooks/make-wrapper.sh; @@ -1070,7 +1082,7 @@ with pkgs; _1password-gui = callPackage ../applications/misc/1password-gui { }; - _1password-gui-beta = callPackage ../applications/misc/1password-gui/beta.nix { }; + _1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; }; _6tunnel = callPackage ../tools/networking/6tunnel { }; @@ -1104,6 +1116,8 @@ with pkgs; acpica-tools = callPackage ../tools/system/acpica-tools { }; + acquire = with python3Packages; toPythonApplication acquire; + act = callPackage ../development/tools/misc/act { }; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -1138,7 +1152,7 @@ with pkgs; aefs = callPackage ../tools/filesystems/aefs { }; aegisub = callPackage ../applications/video/aegisub ({ - wxGTK = wxGTK31; + wxGTK = wxGTK32; inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa; } // (config.aegisub or {})); @@ -1315,6 +1329,8 @@ with pkgs; godspeed = callPackage ../tools/networking/godspeed { }; + guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; + fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; headsetcontrol = callPackage ../tools/audio/headsetcontrol { }; @@ -1416,6 +1432,8 @@ with pkgs; use64 = true; }; + wwcd = callPackage ../tools/misc/wwcd { }; + writedisk = callPackage ../tools/misc/writedisk { }; xcd = callPackage ../tools/misc/xcd { }; @@ -1510,7 +1528,7 @@ with pkgs; fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; + fsuae-launcher = libsForQt5.callPackage ../applications/emulators/fs-uae/launcher.nix { }; fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; @@ -1562,7 +1580,15 @@ with pkgs; melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; - mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; + mgba = callPackage ../applications/emulators/mgba { + ffmpeg = ffmpeg_4; + lua = lua5_4; + inherit (libsForQt5) + qtbase + qtmultimedia + qttools + wrapQtAppsHook; + }; mupen64plus = callPackage ../applications/emulators/mupen64plus { }; @@ -1747,6 +1773,8 @@ with pkgs; inherit (qt5) wrapQtAppsHook; }; + felix-fm = callPackage ../applications/file-managers/felix-fm { }; + joshuto = callPackage ../applications/file-managers/joshuto { inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; }; @@ -1803,6 +1831,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; + blackbox-terminal = callPackage ../applications/terminal-emulators/blackbox-terminal { }; + contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { fmt = fmt_8; }; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; @@ -1899,6 +1929,8 @@ with pkgs; tilix = callPackage ../applications/terminal-emulators/tilix { }; + tym = callPackage ../applications/terminal-emulators/tym { }; + wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm { @@ -1939,8 +1971,6 @@ with pkgs; termsyn = callPackage ../data/fonts/termsyn { }; - timedoctor = callPackage ../applications/office/timedoctor { }; - tvnamer = callPackage ../tools/misc/tvnamer { }; twine = with python3Packages; toPythonApplication twine; @@ -2061,6 +2091,8 @@ with pkgs; arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { }; arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { }; + arduino-language-server = callPackage ../development/embedded/arduino/arduino-language-server { }; + arduino-mk = callPackage ../development/embedded/arduino/arduino-mk {}; apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; @@ -2207,7 +2239,10 @@ with pkgs; brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; - stdenvBootstrapTools = if stdenv.hostPlatform.isDarwin then + # Derivation's result is not used by nixpkgs. Useful for validation for + # regressions of bootstrapTools on hydra and on ofborg. Example: + # pkgsCross.aarch64-multiplatform.freshBootstrapTools.build + freshBootstrapTools = if stdenv.hostPlatform.isDarwin then callPackage ../stdenv/darwin/make-bootstrap-tools.nix { localSystem = stdenv.buildPlatform; crossSystem = @@ -2215,7 +2250,7 @@ with pkgs; } else if stdenv.hostPlatform.isLinux then callPackage ../stdenv/linux/make-bootstrap-tools.nix {} - else throw "stdenvBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}"; + else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}"; boxes = callPackage ../tools/text/boxes { }; @@ -2376,6 +2411,8 @@ with pkgs; clair = callPackage ../tools/admin/clair { }; + clairvoyance = callPackage ../tools/security/clairvoyance { }; + cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; cloudfox = callPackage ../tools/security/cloudfox { }; @@ -2434,7 +2471,9 @@ with pkgs; cudd = callPackage ../development/libraries/cudd { }; - cue = callPackage ../development/tools/cue { }; + cue = callPackage ../development/tools/cue { + buildGoModule = buildGo118Module; # tests fail with 1.19 + }; cuelsp = callPackage ../development/tools/cuelsp {}; @@ -2493,6 +2532,8 @@ with pkgs; droidmote = callPackage ../tools/inputmethods/droidmote { }; + eartag = callPackage ../applications/audio/eartag { }; + ecdsautils = callPackage ../tools/security/ecdsautils { }; echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage (../tools/security/echidna) { }); @@ -2567,6 +2608,8 @@ with pkgs; git-privacy = callPackage ../development/tools/git-privacy { }; + git-publish = python3Packages.callPackage ../applications/version-management/git-and-tools/git-publish { }; + git-repo-updater = python3Packages.callPackage ../development/tools/git-repo-updater { }; git-revise = with python3Packages; toPythonApplication git-revise; @@ -3338,6 +3381,8 @@ with pkgs; clash = callPackage ../tools/networking/clash { }; + clash-geoip = callPackage ../data/misc/clash-geoip { }; + clasp = callPackage ../tools/misc/clasp { }; clevercsv = with python3Packages; toPythonApplication clevercsv; @@ -3416,6 +3461,8 @@ with pkgs; acpidump-all coreboot-utils; + coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { }; + corosync = callPackage ../servers/corosync { }; cowsay = callPackage ../tools/misc/cowsay { }; @@ -3440,6 +3487,8 @@ with pkgs; oguri = callPackage ../tools/wayland/oguri { }; + shotman = callPackage ../tools/wayland/shotman { }; + slurp = callPackage ../tools/wayland/slurp { }; sov = callPackage ../tools/wayland/sov { }; @@ -3561,6 +3610,8 @@ with pkgs; csv2odf = callPackage ../applications/office/csv2odf { }; + csv2parquet = callPackage ../tools/misc/csv2parquet { }; + csvdiff = callPackage ../tools/text/csvdiff { }; csview = callPackage ../tools/text/csview { }; @@ -3684,6 +3735,8 @@ with pkgs; direnv = callPackage ../tools/misc/direnv { }; + dirstalk = callPackage ../tools/security/dirstalk { }; + h = callPackage ../tools/misc/h { }; discount = callPackage ../tools/text/discount { }; @@ -3817,7 +3870,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_19; + electron = electron_20; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -3911,6 +3964,8 @@ with pkgs; faudio = callPackage ../development/libraries/faudio { }; + fblog = callPackage ../development/tools/fblog { }; + fd = callPackage ../tools/misc/fd { }; fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; @@ -3975,7 +4030,9 @@ with pkgs; fx_cast_bridge = callPackage ../tools/misc/fx_cast { }; - fzf = callPackage ../tools/misc/fzf { }; + fzf = callPackage ../tools/misc/fzf { + buildGoModule = buildGo119Module; + }; fzf-obc = callPackage ../shells/bash/fzf-obc { }; @@ -4160,6 +4217,8 @@ with pkgs; huniq = callPackage ../tools/text/huniq { }; + hunt = callPackage ../tools/misc/hunt { }; + hyprland = callPackage ../applications/window-managers/hyprland { wlroots = wlroots.overrideAttrs (_: { version = "unstable-2022-06-07"; @@ -4173,7 +4232,9 @@ with pkgs; }); }; - hysteria = callPackage ../tools/networking/hysteria { }; + hysteria = callPackage ../tools/networking/hysteria { + buildGoModule = buildGo119Module; + }; hyx = callPackage ../tools/text/hyx { }; @@ -4296,8 +4357,14 @@ with pkgs; libnss-mysql = callPackage ../os-specific/linux/libnss-mysql { }; + libnvme = callPackage ../os-specific/linux/libnvme { }; + libxnd = callPackage ../development/libraries/libxnd { }; + libzbc = callPackage ../os-specific/linux/libzbc { }; + + libzbd = callPackage ../os-specific/linux/libzbd { }; + lifeograph = callPackage ../applications/editors/lifeograph { }; limitcpu = callPackage ../tools/misc/limitcpu { }; @@ -4629,8 +4696,9 @@ with pkgs; pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; - procs = callPackage ../tools/admin/procs { - inherit (darwin.apple_sdk.frameworks) Security; + procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs { + inherit (darwin.apple_sdk_11_0.frameworks) Security; + inherit (darwin.apple_sdk_11_0) Libsystem; inherit (darwin) libiconv; }; @@ -4708,6 +4776,8 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; + srvc = callPackage ../applications/version-management/srvc { }; + ssmsh = callPackage ../tools/admin/ssmsh { }; stacs = callPackage ../tools/security/stacs { }; @@ -4718,7 +4788,9 @@ with pkgs; statserial = callPackage ../tools/misc/statserial { }; - steampipe = callPackage ../tools/misc/steampipe { }; + steampipe = callPackage ../tools/misc/steampipe { + buildGoModule = buildGo119Module; + }; step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; @@ -4728,7 +4800,9 @@ with pkgs; string-machine = callPackage ../applications/audio/string-machine { }; - stripe-cli = callPackage ../tools/admin/stripe-cli { }; + stripe-cli = callPackage ../tools/admin/stripe-cli { + buildGoModule = buildGo118Module; # tests fail with 1.19 + }; bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; @@ -4862,8 +4936,6 @@ with pkgs; appleseed = callPackage ../tools/graphics/appleseed { }; - apple-music-electron = callPackage ../applications/audio/apple-music-electron { }; - apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { }; arping = callPackage ../tools/networking/arping { }; @@ -5330,7 +5402,7 @@ with pkgs; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { stdenv = clangStdenv; - protobuf = pkgs.protobuf3_8.overrideDerivation (_: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf.overrideDerivation (_: { stdenv = clangStdenv; }); }; rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; @@ -5528,7 +5600,8 @@ with pkgs; cudaPackages_11_4 = callPackage ./cuda-packages.nix { cudaVersion = "11.4"; }; cudaPackages_11_5 = callPackage ./cuda-packages.nix { cudaVersion = "11.5"; }; cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; }; - cudaPackages_11 = cudaPackages_11_6; + cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaVersion = "11.7"; }; + cudaPackages_11 = cudaPackages_11_7; cudaPackages = recurseIntoAttrs cudaPackages_11; # TODO: move to alias @@ -5809,6 +5882,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + doggo = callPackage ../tools/networking/doggo { + buildGoModule = buildGo118Module; # build fails with 1.19 + }; + dosfstools = callPackage ../tools/filesystems/dosfstools { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; @@ -6048,7 +6125,9 @@ with pkgs; tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; - trivy = callPackage ../tools/admin/trivy { }; + trivy = callPackage ../tools/admin/trivy { + buildGoModule = buildGo119Module; + }; trompeloeil = callPackage ../development/libraries/trompeloeil { }; @@ -6257,6 +6336,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { }; + exempi = callPackage ../development/libraries/exempi { stdenv = if stdenv.isDarwin then stdenv else if stdenv.isi686 then gcc6Stdenv @@ -6605,8 +6686,10 @@ with pkgs; freetube = callPackage ../applications/video/freetube { }; + freeze = callPackage ../tools/security/freeze { }; + freqtweak = callPackage ../applications/audio/freqtweak { - wxGTK = wxGTK31-gtk2; + wxGTK = wxGTK32; }; frescobaldi = python3Packages.callPackage ../misc/frescobaldi {}; @@ -6907,6 +6990,8 @@ with pkgs; git-my = callPackage ../applications/version-management/git-and-tools/git-my { }; + git-nomad = callPackage ../applications/version-management/git-and-tools/git-nomad { }; + git-octopus = callPackage ../applications/version-management/git-and-tools/git-octopus { }; git-open = callPackage ../applications/version-management/git-and-tools/git-open { }; @@ -7363,6 +7448,8 @@ with pkgs; gssdp = callPackage ../development/libraries/gssdp { }; + gssdp_1_6 = callPackage ../development/libraries/gssdp/1.6.nix { }; + gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; grype = callPackage ../tools/security/grype { }; @@ -7385,6 +7472,8 @@ with pkgs; gtkperf = callPackage ../development/tools/misc/gtkperf { }; + gtkradiant = callPackage ../applications/misc/gtkradiant { }; + gtk-frdp = callPackage ../development/libraries/gtk-frdp {}; gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; @@ -7393,6 +7482,8 @@ with pkgs; gupnp = callPackage ../development/libraries/gupnp { }; + gupnp_1_6 = callPackage ../development/libraries/gupnp/1.6.nix { }; + gupnp-av = callPackage ../development/libraries/gupnp-av {}; gupnp-dlna = callPackage ../development/libraries/gupnp-dlna {}; @@ -7407,7 +7498,9 @@ with pkgs; gvolicon = callPackage ../tools/audio/gvolicon {}; - gvproxy = callPackage ../tools/networking/gvproxy { }; + gvproxy = callPackage ../tools/networking/gvproxy { + buildGoModule = buildGo118Module; # fails to build with 1.19 + }; gzip = callPackage ../tools/compression/gzip { }; @@ -7435,6 +7528,7 @@ with pkgs; plplot = callPackage ../development/libraries/plplot { inherit (xorg) libX11; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; pxattr = callPackage ../tools/archivers/pxattr { }; @@ -7582,6 +7676,8 @@ with pkgs; hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { }; + holochain-launcher = callPackage ../applications/misc/holochain-launcher { }; + homesick = callPackage ../tools/misc/homesick { }; honcho = callPackage ../tools/system/honcho { }; @@ -7822,20 +7918,15 @@ with pkgs; ipfetch = callPackage ../tools/networking/ipfetch { }; - ipfs = callPackage ../applications/networking/ipfs { - openssl = openssl_1_1; - }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { buildGoModule = buildGo119Module; }; - ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { }; - ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { }; - ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { }; - ipget = callPackage ../applications/networking/ipget { }; + ipget = callPackage ../applications/networking/ipget { + buildGoModule = buildGo118Module; # build fails with 1.19 + }; i-pi = with python3Packages; toPythonApplication i-pi; @@ -7975,6 +8066,8 @@ with pkgs; joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; + jot = callPackage ../applications/misc/jot { }; + journaldriver = callPackage ../tools/misc/journaldriver { openssl = openssl_1_1; }; @@ -8001,6 +8094,8 @@ with pkgs; jql = callPackage ../development/tools/jql { }; + jqp = callPackage ../development/tools/jqp { }; + jo = callPackage ../development/tools/jo { }; jrnl = callPackage ../applications/misc/jrnl { }; @@ -8173,6 +8268,14 @@ with pkgs; kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; + kubo = callPackage ../applications/networking/kubo { + openssl = openssl_1_1; + }; + + kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { }; + kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { }; + kubo-migrator = callPackage ../applications/networking/kubo-migrator { }; + kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; peruse = libsForQt5.callPackage ../tools/misc/peruse { }; @@ -8531,7 +8634,9 @@ with pkgs; nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { }; + nodejs-16_x-openssl_1_1 = callPackage ../development/web/nodejs/v16.nix { + openssl = openssl_1_1; + }; nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; @@ -8572,6 +8677,8 @@ with pkgs; latexrun = callPackage ../tools/typesetting/tex/latexrun { }; + lazycli = callPackage ../tools/misc/lazycli { }; + lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { }; ldapmonitor = callPackage ../tools/security/ldapmonitor { }; @@ -8596,6 +8703,8 @@ with pkgs; leela = callPackage ../tools/graphics/leela { }; + lemmeknow = callPackage ../tools/misc/lemmeknow { }; + lethe = callPackage ../tools/security/lethe { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -8763,7 +8872,9 @@ with pkgs; lidarr = callPackage ../servers/lidarr { }; - limesuite = callPackage ../applications/radio/limesuite { }; + limesuite = callPackage ../applications/radio/limesuite { + inherit (darwin.apple_sdk.frameworks) GLUT; + }; limesurvey = callPackage ../servers/limesurvey { }; @@ -8899,6 +9010,8 @@ with pkgs; sasl = gsasl; }; + matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { }; + email = callPackage ../tools/networking/email { }; maim = callPackage ../tools/graphics/maim {}; @@ -8995,6 +9108,8 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; + microbin = callPackage ../servers/microbin { }; + microdnf = callPackage ../tools/package-management/microdnf { }; microplane = callPackage ../tools/misc/microplane { }; @@ -9356,6 +9471,9 @@ with pkgs; nomad_1_3 = callPackage ../applications/networking/cluster/nomad/1.3.nix { buildGoModule = buildGo119Module; }; + nomad_1_4 = callPackage ../applications/networking/cluster/nomad/1.4.nix { + buildGoModule = buildGo119Module; + }; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; @@ -9433,6 +9551,8 @@ with pkgs; pwsafe = callPackage ../applications/misc/pwsafe { }; + napi-rs-cli = callPackage ../development/tools/napi-rs-cli { }; + neil = callPackage ../development/tools/neil { }; niff = callPackage ../tools/package-management/niff { }; @@ -9496,7 +9616,7 @@ with pkgs; # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; - ntfy = callPackage ../tools/misc/ntfy {}; + ntfy = callPackage ../tools/misc/ntfy { python = python39; }; ntfy-sh = callPackage ../tools/misc/ntfy-sh { }; @@ -9774,7 +9894,9 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; - opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; + opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { + buildGoModule = buildGo119Module; + }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; @@ -9831,6 +9953,8 @@ with pkgs; overmind = callPackage ../applications/misc/overmind { }; + oxker = callPackage ../applications/misc/oxker { }; + ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; ovito = libsForQt5.callPackage ../applications/graphics/ovito { @@ -10062,6 +10186,8 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; + phodav_2_0 = callPackage ../tools/networking/phodav/2.0.nix { }; + photon-rss = callPackage ../applications/networking/feedreaders/photon { }; pim6sd = callPackage ../servers/pim6sd { }; @@ -10114,6 +10240,8 @@ with pkgs; plantuml = callPackage ../tools/misc/plantuml { }; + plantuml-c4 = callPackage ../tools/misc/plantuml/plantuml-c4.nix { }; + plantuml-server = callPackage ../tools/misc/plantuml-server { }; plan9port = callPackage ../tools/system/plan9port { @@ -10198,7 +10326,9 @@ with pkgs; pocketbase = callPackage ../servers/pocketbase { }; podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; - podman-unwrapped = callPackage ../applications/virtualization/podman { }; + podman-unwrapped = callPackage ../applications/virtualization/podman { + buildGoModule = buildGo118Module; # nixosTests.oci-containers.podman fails with 1.19 (channel blocker) + }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; @@ -10222,6 +10352,8 @@ with pkgs; poly2tri-c = callPackage ../development/libraries/poly2tri-c { }; + polypane = callPackage ../applications/networking/browsers/polypane { }; + ponysay = callPackage ../tools/misc/ponysay { }; popfile = callPackage ../tools/text/popfile { }; @@ -10388,8 +10520,8 @@ with pkgs; remarshal = with python3Packages; toPythonApplication remarshal; - rehex = callPackage ../applications/editors/rehex { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; + rehex = darwin.apple_sdk_11_0.callPackage ../applications/editors/rehex { + inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit; }; rig = callPackage ../tools/misc/rig { }; @@ -10425,6 +10557,8 @@ with pkgs; mpi = openmpi; # this attribute should used to build MPI applications + ucc = callPackage ../development/libraries/ucc {}; + ucx = callPackage ../development/libraries/ucx {}; openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {}); @@ -10525,9 +10659,7 @@ with pkgs; radvd = callPackage ../tools/networking/radvd { }; - rain = callPackage ../development/tools/rain { - buildGoModule = buildGo117Module; - }; + rain = callPackage ../development/tools/rain { }; rainbowstream = with python3.pkgs; toPythonApplication rainbowstream; @@ -10567,6 +10699,8 @@ with pkgs; read-edid = callPackage ../os-specific/linux/read-edid { }; + readstat = callPackage ../applications/science/math/readstat { }; + redir = callPackage ../tools/networking/redir { }; redmine = callPackage ../applications/version-management/redmine { }; @@ -10860,10 +10994,7 @@ with pkgs; sacd = callPackage ../tools/cd-dvd/sacd { }; - safe = callPackage ../tools/security/safe { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + safe = callPackage ../tools/security/safe { }; safety-cli = with python3.pkgs; toPythonApplication safety; @@ -10998,6 +11129,8 @@ with pkgs; sg3_utils = callPackage ../tools/system/sg3_utils { }; + sget = callPackage ../tools/security/sget { }; + sha1collisiondetection = callPackage ../tools/security/sha1collisiondetection { }; shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { }; @@ -11163,6 +11296,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; + boost-sml = callPackage ../development/libraries/boost-ext/boost-sml {}; + smu = callPackage ../tools/text/smu { }; smug = callPackage ../tools/misc/smug { }; @@ -11549,6 +11684,8 @@ with pkgs; inherit (callPackages ../applications/networking/taler { }) taler-exchange taler-merchant; + tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; + tangram = callPackage ../applications/networking/instant-messengers/tangram { }; t1utils = callPackage ../tools/misc/t1utils { }; @@ -11611,10 +11748,12 @@ with pkgs; teip = callPackage ../tools/text/teip { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; + telegraf = callPackage ../servers/monitoring/telegraf { + buildGoModule = buildGo119Module; + }; teleport = callPackage ../servers/teleport { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; }; telepresence = callPackage ../tools/networking/telepresence { @@ -11785,7 +11924,7 @@ with pkgs; toml2json = callPackage ../development/tools/toml2json { }; - toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; + toml2nix = callPackage ../development/tools/toml2nix { }; topgrade = callPackage ../tools/misc/topgrade { inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; @@ -11863,7 +12002,9 @@ with pkgs; tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; }; - tracee = callPackage ../tools/security/tracee { }; + tracee = callPackage ../tools/security/tracee { + buildGoModule = buildGo118Module; # tests fail with 1.19 + }; tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { }; @@ -11968,6 +12109,8 @@ with pkgs; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twspace-dl = callPackage ../tools/misc/twspace-dl { }; + twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; twurl = callPackage ../tools/misc/twurl { }; @@ -12269,6 +12412,8 @@ with pkgs; wf-recorder = callPackage ../applications/video/wf-recorder { }; + whatip = callPackage ../tools/networking/whatip {}; + whatweb = callPackage ../tools/security/whatweb { }; whipper = callPackage ../applications/audio/whipper { }; @@ -12319,9 +12464,7 @@ with pkgs; wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel; - wolfebin = callPackage ../tools/networking/wolfebin { - python = python2; - }; + wolfebin = callPackage ../tools/networking/wolfebin { }; xautoclick = callPackage ../applications/misc/xautoclick {}; @@ -12850,10 +12993,7 @@ with pkgs; zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { }; - zfsbackup = callPackage ../tools/backup/zfsbackup { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + zfsbackup = callPackage ../tools/backup/zfsbackup { }; zfstools = callPackage ../tools/filesystems/zfstools { }; @@ -13087,7 +13227,7 @@ with pkgs; semeru-bin = semeru-bin-17; semeru-jre-bin = semeru-jre-bin-17; - adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit lib; }; + adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; }; adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux @@ -13358,7 +13498,7 @@ with pkgs; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; - devpi-server = callPackage ../development/tools/devpi-server {}; + devpi-server = python3Packages.callPackage ../development/tools/devpi-server {}; dictu = callPackage ../development/compilers/dictu { }; @@ -13393,6 +13533,7 @@ with pkgs; flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; + flutter2 = flutterPackages.v2; fnm = callPackage ../development/tools/fnm { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; @@ -14054,6 +14195,8 @@ with pkgs; inherit (emacs.pkgs.melpaStablePackages) irony; }; + heptagon = callPackage ../development/compilers/heptagon { }; + holo-build = callPackage ../tools/package-management/holo-build { }; hugs = callPackage ../development/interpreters/hugs { }; @@ -14538,6 +14681,10 @@ with pkgs; rasm = callPackage ../development/compilers/rasm { }; + replibyte = callPackage ../development/tools/database/replibyte { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rgbds = callPackage ../development/compilers/rgbds { }; rgxg = callPackage ../tools/text/rgxg { }; @@ -14578,11 +14725,11 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_63 = callPackage ../development/compilers/rust/1_63.nix { + rust_1_64 = callPackage ../development/compilers/rust/1_64.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_14 = llvmPackages_14.libllvm; }; - rust = rust_1_63; + rust = rust_1_64; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -14591,8 +14738,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_63 = rust_1_63.packages.stable; - rustPackages = rustPackages_1_63; + rustPackages_1_64 = rust_1_64.packages.stable; + rustPackages = rustPackages_1_64; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -14631,6 +14778,9 @@ with pkgs; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + cargo-clone = callPackage ../development/tools/rust/cargo-clone { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { inherit (darwin.apple_sdk.frameworks) Security; @@ -14648,6 +14798,7 @@ with pkgs; cargo-hack = callPackage ../development/tools/rust/cargo-hack { }; cargo-license = callPackage ../development/tools/rust/cargo-license { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; + cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -14705,6 +14856,10 @@ with pkgs; inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; }; + + cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15084,22 +15239,35 @@ with pkgs; # Below, the classic self-bootstrapping process cbqn-bootstrap = lib.dontRecurseIntoAttrs { + # Use clang to compile CBQN if we aren't already. + # CBQN's upstream primarily targets and tests clang which means using gcc + # will result in slower binaries and on some platforms failing/broken builds. + # See https://github.com/dzaima/CBQN/issues/12. + # + # Known issues: + # + # * CBQN using gcc is broken at runtime on i686 due to + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58416, + # * CBQN uses some CPP macros gcc doesn't like for aarch64. + stdenv = if !stdenv.cc.isClang then clangStdenv else stdenv; + mbqn-source = buildPackages.mbqn.src; phase0 = callPackage ../development/interpreters/bqn/cbqn { + inherit (cbqn-bootstrap) stdenv; genBytecode = false; bqn-path = null; mbqn-source = null; }; phase1 = callPackage ../development/interpreters/bqn/cbqn { - inherit (cbqn-bootstrap) mbqn-source; + inherit (cbqn-bootstrap) mbqn-source stdenv; genBytecode = true; bqn-path = "${buildPackages.cbqn-bootstrap.phase0}/bin/cbqn"; }; phase2 = callPackage ../development/interpreters/bqn/cbqn { - inherit (cbqn-bootstrap) mbqn-source; + inherit (cbqn-bootstrap) mbqn-source stdenv; genBytecode = true; bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn"; }; @@ -15197,6 +15365,7 @@ with pkgs; gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { inherit (llvmPackages) openmp; + inherit (darwin.apple_sdk.frameworks) Cocoa; # MPICH currently build on Darwin mpi = mpich; }; @@ -15222,7 +15391,9 @@ with pkgs; io = callPackage ../development/interpreters/io { }; - ivy = callPackage ../development/interpreters/ivy { }; + ivy = callPackage ../development/interpreters/ivy { + buildGoModule = buildGo118Module; # tests fail with 1.19 + }; j = callPackage ../development/interpreters/j { stdenv = clangStdenv; @@ -15452,7 +15623,7 @@ with pkgs; update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { }; # Should eventually be moved inside Python interpreters. - python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; + python-setup-hook = buildPackages.callPackage ../development/interpreters/python/setup-hook.nix { }; pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); @@ -15876,7 +16047,8 @@ with pkgs; electron_17 electron_18 electron_19 - electron_20; + electron_20 + electron_21; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -16115,7 +16287,10 @@ with pkgs; bump = callPackage ../development/tools/github/bump { }; - libbpf = callPackage ../os-specific/linux/libbpf { }; + libbpf_1 = callPackage ../os-specific/linux/libbpf { }; + libbpf_0 = callPackage ../os-specific/linux/libbpf/0.x.nix { }; + # until more issues are fixed default to libbpf 0.x + libbpf = libbpf_0; bpftools = callPackage ../os-specific/linux/bpftools { }; @@ -16737,6 +16912,8 @@ with pkgs; insomnia = callPackage ../development/web/insomnia { }; + ihp-new = callPackage ../development/web/ihp-new { }; + iozone = callPackage ../development/tools/misc/iozone { }; itstool = callPackage ../development/tools/misc/itstool { }; @@ -17297,6 +17474,11 @@ with pkgs; slimerjs = callPackage ../development/tools/slimerjs {}; + slint-lsp = callPackage ../development/tools/misc/slint-lsp { + inherit (xorg) libXcursor libXi; + inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; + }; + sloccount = callPackage ../development/tools/misc/sloccount { }; sloc = nodePackages.sloc; @@ -17526,7 +17708,9 @@ with pkgs; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; - wails = callPackage ../development/tools/wails { }; + wails = callPackage ../development/tools/wails { + buildGoModule = buildGo119Module; + }; whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { }; @@ -17703,7 +17887,8 @@ with pkgs; at-spi2-core = callPackage ../development/libraries/at-spi2-core { }; - at-spi2-atk = callPackage ../development/libraries/at-spi2-atk { }; + # Not moved to aliases while we decide if we should split the package again. + at-spi2-atk = at-spi2-core; aqbanking = callPackage ../development/libraries/aqbanking { }; @@ -18344,6 +18529,7 @@ with pkgs; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; freeimage = callPackage ../development/libraries/freeimage { + inherit (darwin) autoSignDarwinBinariesHook; libraw = libraw_unstable; }; @@ -18418,6 +18604,8 @@ with pkgs; gcr = callPackage ../development/libraries/gcr { }; + gcr_4 = callPackage ../development/libraries/gcr/4.nix { }; + gdl = callPackage ../development/libraries/gdl { }; gdome2 = callPackage ../development/libraries/gdome2 { }; @@ -18442,6 +18630,10 @@ with pkgs; geocode-glib = callPackage ../development/libraries/geocode-glib {}; + geocode-glib_2 = geocode-glib.override { + libsoup = libsoup_3; + }; + geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; @@ -18477,8 +18669,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { }; - gdcm = callPackage ../development/libraries/gdcm { inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; }; @@ -18817,7 +19007,8 @@ with pkgs; ace = callPackage ../development/libraries/ace { }; - atk = callPackage ../development/libraries/atk { }; + # Not moved to aliases while we decide if we should split the package again. + atk = at-spi2-core; atkmm = callPackage ../development/libraries/atkmm { }; @@ -19447,9 +19638,7 @@ with pkgs; libccd = callPackage ../development/libraries/libccd { }; - libcec = callPackage ../development/libraries/libcec { - libraspberrypi = null; - }; + libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -19477,6 +19666,8 @@ with pkgs; libchamplain = callPackage ../development/libraries/libchamplain { }; + libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; }; + libchardet = callPackage ../development/libraries/libchardet { }; libchewing = callPackage ../development/libraries/libchewing { }; @@ -19610,7 +19801,7 @@ with pkgs; libdwarf = callPackage ../development/libraries/libdwarf { }; dwarfdump = libdwarf.bin; - libdwarf_0_4 = callPackage ../development/libraries/libdwarf/0.4.nix { }; + libdwarf_20210528 = callPackage ../development/libraries/libdwarf/20210528.nix { }; libe57format = callPackage ../development/libraries/libe57format { }; @@ -20113,7 +20304,7 @@ with pkgs; libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { }; + libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { }; libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { }; libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { }; libmicrohttpd = libmicrohttpd_0_9_71; @@ -20210,9 +20401,7 @@ with pkgs; libopusenc = callPackage ../development/libraries/libopusenc { }; - libosinfo = callPackage ../development/libraries/libosinfo { - inherit (gnome) libsoup; - }; + libosinfo = callPackage ../development/libraries/libosinfo { }; libosip = callPackage ../development/libraries/osip {}; @@ -20405,12 +20594,7 @@ with pkgs; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; - # this is still the new version of the old API - libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; - - inherit (callPackages ../development/libraries/libtoxcore {}) - libtoxcore_0_1 libtoxcore_0_2; - libtoxcore = libtoxcore_0_2; + libtoxcore = callPackage ../development/libraries/libtoxcore {}; libtpms = callPackage ../tools/security/libtpms { }; @@ -21165,9 +21349,10 @@ with pkgs; inherit (callPackages ../development/libraries/libressl { }) libressl_3_4 - libressl_3_5; + libressl_3_5 + libressl_3_6; - libressl = libressl_3_5; + libressl = libressl_3_6; boringssl = callPackage ../development/libraries/boringssl { }; @@ -21470,10 +21655,10 @@ with pkgs; }; }; }); - libsForQt5_openssl_1_1 = recurseIntoAttrs (import ./qt5-packages.nix { + libsForQt5_openssl_1_1 = import ./qt5-packages.nix { inherit lib pkgs; qt5 = qt5_openssl_1_1; - }); + }; # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop plasma5Packages = libsForQt515; @@ -21490,7 +21675,7 @@ with pkgs; inherit buildPackages; cmake = cmake.overrideAttrs (attrs: { patches = attrs.patches ++ [ - ../development/libraries/qt-6/cmake.patch + ../development/libraries/qt-6/patches/cmake.patch ]; }); }); @@ -21739,6 +21924,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { }; + + sigutils = callPackage ../applications/radio/sigutils { }; + sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {}; selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { }; @@ -21858,13 +22047,24 @@ with pkgs; snowcrash = callPackage ../tools/security/snowcrash { }; - soapyairspy = callPackage ../applications/radio/soapyairspy { }; + soapyairspy = callPackage ../applications/radio/soapyairspy { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; - soapyaudio = callPackage ../applications/radio/soapyaudio { }; + soapyaudio = callPackage ../applications/radio/soapyaudio { + inherit (darwin.apple_sdk.frameworks) Accelerate CoreAudio; + }; - soapybladerf = callPackage ../applications/radio/soapybladerf { }; + soapybladerf = callPackage ../applications/radio/soapybladerf { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; - soapyhackrf = callPackage ../applications/radio/soapyhackrf { }; + soapyhackrf = callPackage ../applications/radio/soapyhackrf { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; soapysdr = callPackage ../applications/radio/soapysdr { }; @@ -21890,7 +22090,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit Security; }; - soapyuhd = callPackage ../applications/radio/soapyuhd { }; + soapyuhd = callPackage ../applications/radio/soapyuhd { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; social-engineer-toolkit = callPackage ../tools/security/social-engineer-toolkit { }; @@ -21947,6 +22150,8 @@ with pkgs; spice-gtk = callPackage ../development/libraries/spice-gtk { }; + spice-gtk_libsoup2 = spice-gtk.override { withLibsoup2 = true; }; + spice-protocol = callPackage ../development/libraries/spice-protocol { }; spice-up = callPackage ../applications/office/spice-up { }; @@ -21957,6 +22162,10 @@ with pkgs; splat = callPackage ../applications/radio/splat { }; + suscan = callPackage ../applications/radio/suscan { }; + + suwidgets = libsForQt5.callPackage ../applications/radio/suwidgets { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srm = callPackage ../tools/security/srm { }; @@ -22188,10 +22397,7 @@ with pkgs; umockdev = callPackage ../development/libraries/umockdev { }; - unconvert = callPackage ../development/tools/unconvert { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + unconvert = callPackage ../development/tools/unconvert { }; uncover = callPackage ../tools/security/uncover { }; @@ -22276,6 +22482,10 @@ with pkgs; stdenv = clangStdenv; }; + vte-gtk4 = vte.override { + gtkVersion = "4"; + }; + vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { @@ -22350,6 +22560,8 @@ with pkgs; gtk3 = gtk4; }; + webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader {}; + websocketpp = callPackage ../development/libraries/websocket++ { }; webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { stdenv = gcc10StdenvCompat; }; @@ -22401,6 +22613,11 @@ with pkgs; wxGTK31-gtk2 = wxGTK31.override { withGtk2 = true; }; wxGTK31-gtk3 = wxGTK31.override { withGtk2 = false; }; + wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix { + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit; + }; + wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30-gtk3; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -22736,7 +22953,8 @@ with pkgs; quicklispPackages = quicklispPackagesSBCL; # Alternative lisp-modules implementation - lispPackages_new = callPackage ../development/lisp-modules-new/lisp-packages.nix {}; + lispPackages_new = recurseIntoAttrs (callPackage ../development/lisp-modules-new/lisp-packages.nix {}); + ### DEVELOPMENT / PERL MODULES @@ -23086,20 +23304,14 @@ with pkgs; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; grafana-agent = callPackage ../servers/monitoring/grafana-agent { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; + buildGoModule = buildGo118Module; # tests fail with 1.19 }; grafana-loki = callPackage ../servers/monitoring/loki { }; + promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; mimir = callPackage ../servers/monitoring/mimir { }; - promtail = grafana-loki.overrideAttrs (o: { - pname = "promtail"; - subPackages = ["clients/cmd/promtail"]; - CGO_ENABLED = 1; - }); - grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; @@ -23121,6 +23333,8 @@ with pkgs; hashi-ui = callPackage ../servers/hashi-ui {}; + hashi-up = callPackage ../applications/networking/cluster/hashi-up { }; + hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; @@ -23184,6 +23398,8 @@ with pkgs; janus-gateway = callPackage ../servers/janus-gateway { }; + janusgraph = callPackage ../servers/nosql/janusgraph { }; + jboss = callPackage ../servers/http/jboss { }; jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { }; @@ -23398,7 +23614,11 @@ with pkgs; onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { }; - outline = callPackage ../servers/web-apps/outline { }; + outline = callPackage ../servers/web-apps/outline (lib.fix (super: { + yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; }; + yarn = yarn.override { inherit (super) nodejs; }; + nodejs = nodejs-16_x; + })); openbgpd = callPackage ../servers/openbgpd { }; @@ -23576,6 +23796,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + mongodb-6_0 = callPackage ../servers/nosql/mongodb/6.0.nix { + sasl = cyrus_sasl; + boost = boost178.override { enableShared = false; }; + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + nginx-sso = callPackage ../servers/nginx-sso { }; percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { @@ -23586,10 +23813,7 @@ with pkgs; immudb = callPackage ../servers/nosql/immudb { }; - influxdb = callPackage ../servers/nosql/influxdb { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + influxdb = callPackage ../servers/nosql/influxdb { }; influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; # For backwards compatibility with older versions of influxdb2, @@ -23712,12 +23936,14 @@ with pkgs; postgresql_12 postgresql_13 postgresql_14 + postgresql_15 ; postgresql = postgresql_14.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; + postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs; postgresql14Packages = postgresqlPackages; postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; @@ -23764,17 +23990,16 @@ with pkgs; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; - prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; - prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { }; + prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { + buildGoModule = buildGo118Module; # nixosTests.prometheus-exporter.ldap fails with 1.19 + }; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { }; prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; @@ -24091,15 +24316,13 @@ with pkgs; libdrm = if stdenv.isLinux then libdrm else null; abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override` or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin - }) // { inherit xlibsWrapper; } ); + })); xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { }; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - yaws = callPackage ../servers/http/yaws { - erlang = erlangR21; - }; + yaws = callPackage ../servers/http/yaws { }; youtrack = callPackage ../servers/jetbrains/youtrack.nix { }; @@ -24500,8 +24723,6 @@ with pkgs; iproute2 = callPackage ../os-specific/linux/iproute { }; - iproute_mptcp = callPackage ../os-specific/linux/iproute/mptcp.nix { }; - iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); # hiPrio for collisions with inetutils (ping) @@ -24521,7 +24742,9 @@ with pkgs; iwd = callPackage ../os-specific/linux/iwd { }; - jfbview = callPackage ../os-specific/linux/jfbview { }; + jfbview = callPackage ../os-specific/linux/jfbview { + imlib2 = imlib2Full; + }; jfbpdf = jfbview.override { imageSupport = false; }; @@ -24552,6 +24775,8 @@ with pkgs; libaio = callPackage ../os-specific/linux/libaio { }; + libajantv2 = callPackage ../development/libraries/libajantv2 {}; + libargon2 = callPackage ../development/libraries/libargon2 { }; libatasmart = callPackage ../os-specific/linux/libatasmart { }; @@ -24610,6 +24835,7 @@ with pkgs; tgt = callPackage ../tools/networking/tgt { }; lkl = callPackage ../applications/virtualization/lkl { }; + lklWithFirewall = callPackage ../applications/virtualization/lkl { firewallSupport = true; }; inherit (callPackages ../os-specific/linux/kernel-headers { }) linuxHeaders makeLinuxHeaders; @@ -24657,10 +24883,6 @@ with pkgs; linuxPackages_testing_bcachefs = linuxKernel.packages.linux_testing_bcachefs; linux_testing_bcachefs = linuxKernel.kernels.linux_testing_bcachefs; - # kernel with mtcp support - linuxPackages_mptcp = linuxKernel.packageAliases.linux_mptcp; - linux_mptcp = linuxPackages_mptcp.kernel; - # Realtime kernel linuxPackages-rt = linuxKernel.packageAliases.linux_rt_default; linuxPackages-rt_latest = linuxKernel.packageAliases.linux_rt_latest; @@ -24698,6 +24920,8 @@ with pkgs; # XanMod kernel linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; linux_xanmod = linuxKernel.kernels.linux_xanmod; + linuxPackages_xanmod_stable = linuxKernel.packages.linux_xanmod_stable; + linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt; @@ -24849,8 +25073,6 @@ with pkgs; then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; - nettools_mptcp = callPackage ../os-specific/linux/net-tools/mptcp.nix { }; - nftables = callPackage ../os-specific/linux/nftables { }; noah = callPackage ../os-specific/darwin/noah { @@ -24948,6 +25170,7 @@ with pkgs; gotop = callPackage ../tools/system/gotop { inherit (darwin.apple_sdk.frameworks) IOKit; + buildGoModule = buildGo119Module; }; go-migrate = callPackage ../development/tools/go-migrate { }; @@ -25127,6 +25350,8 @@ with pkgs; reap = callPackage ../os-specific/linux/reap { }; + rectangle = callPackage ../os-specific/darwin/rectangle { }; + regionset = callPackage ../os-specific/linux/regionset { }; rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; @@ -25928,6 +26153,8 @@ with pkgs; libratbag = callPackage ../os-specific/linux/libratbag { }; + librist = callPackage ../development/libraries/librist { }; + libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; @@ -26292,6 +26519,10 @@ with pkgs; stdmanpages = callPackage ../data/documentation/std-man-pages { }; + star-history = callPackage ../tools/misc/star-history { + inherit (darwin.apple_sdk.frameworks) Security; + }; + starfetch = callPackage ../tools/misc/starfetch { }; starship = callPackage ../tools/misc/starship { @@ -26580,7 +26811,7 @@ with pkgs; spatialite_gui = callPackage ../applications/gis/spatialite-gui { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; - wxGTK = wxGTK30-gtk3; + wxGTK = wxGTK32; }; spatialite_tools = callPackage ../applications/gis/spatialite-tools { }; @@ -26631,14 +26862,16 @@ with pkgs; foxitreader = libsForQt512.callPackage ../applications/misc/foxitreader { }; - pdfstudio = import ../applications/misc/pdfstudio { - program = "pdfstudio"; - inherit callPackage fetchurl libgccjit; + pdfstudio2021 = callPackage ../applications/misc/pdfstudio { + year = "2021"; }; - pdfstudioviewer = import ../applications/misc/pdfstudio { + pdfstudio2022 = callPackage ../applications/misc/pdfstudio { + year = "2022"; + }; + + pdfstudioviewer = callPackage ../applications/misc/pdfstudio { program = "pdfstudioviewer"; - inherit callPackage fetchurl libgccjit; }; aeolus = callPackage ../applications/audio/aeolus { }; @@ -26707,6 +26940,8 @@ with pkgs; ao = libfive; + apache-directory-server = callPackage ../servers/apache-directory-server {}; + apache-directory-studio = callPackage ../applications/networking/apache-directory-studio {}; apkeep = callPackage ../tools/misc/apkeep { @@ -26735,7 +26970,9 @@ with pkgs; argocd = callPackage ../applications/networking/cluster/argocd { }; - argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { }; + argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { + buildGoModule = buildGo119Module; + }; argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { }; @@ -26745,6 +26982,8 @@ with pkgs; arkade = callPackage ../applications/networking/cluster/arkade { }; + artem = callPackage ../applications/graphics/artem { }; + asuka = callPackage ../applications/networking/browsers/asuka { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -26781,16 +27020,10 @@ with pkgs; }; audaciousQt5 = audacious; - audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; - audacity-gtk3 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk3; }; - audacity = - if stdenv.isDarwin then - callPackage ../applications/audio/audacity { - inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon Cocoa CoreAudio CoreAudioKit CoreServices; - suil = suil-qt5; - } - else - audacity-gtk2; + audacity = callPackage ../applications/audio/audacity { + inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox AudioUnit Carbon CoreAudio CoreAudioKit CoreServices; + suil = suil-qt5; + }; audio-recorder = callPackage ../applications/audio/audio-recorder { }; @@ -26908,6 +27141,8 @@ with pkgs; bevelbar = callPackage ../applications/window-managers/bevelbar { }; + bfcal = libsForQt5.callPackage ../applications/misc/bfcal { }; + bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { @@ -27042,7 +27277,7 @@ with pkgs; calculix = callPackage ../applications/science/math/calculix {}; - calibre = libsForQt5.callPackage ../applications/misc/calibre { }; + calibre = qt6Packages.callPackage ../applications/misc/calibre { }; calibre-web = callPackage ../servers/calibre-web { }; @@ -27091,6 +27326,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; + cyan = callPackage ../applications/graphics/cyan {}; + cyanrip = callPackage ../applications/audio/cyanrip { }; centerim = callPackage ../applications/networking/instant-messengers/centerim { }; @@ -27518,7 +27755,9 @@ with pkgs; elementary-planner = callPackage ../applications/office/elementary-planner { }; - elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; + elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { + libdwarf = libdwarf_20210528; + }; elfx86exts = callPackage ../applications/misc/elfx86exts { }; @@ -27574,6 +27813,8 @@ with pkgs; inherit (gnome) empathy; + endeavour = callPackage ../applications/misc/endeavour { }; + enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; entangle = callPackage ../applications/video/entangle { @@ -27670,6 +27911,8 @@ with pkgs; icesl = callPackage ../applications/misc/icesl { }; + karlender = callPackage ../applications/office/karlender { }; + keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; @@ -27678,6 +27921,7 @@ with pkgs; inherit (gnome) evince; evolution-data-server = gnome.evolution-data-server; + evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; @@ -27795,15 +28039,15 @@ with pkgs; freebayes = callPackage ../applications/science/biology/freebayes { }; + freefilesync = callPackage ../applications/networking/freefilesync { }; + freewheeling = callPackage ../applications/audio/freewheeling { }; fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; fritzprofiles = with python3.pkgs; toPythonApplication fritzprofiles; - fsv = callPackage ../applications/misc/fsv { - autoreconfHook = buildPackages.autoreconfHook269; - }; + fsv = callPackage ../applications/misc/fsv { }; ft2-clone = callPackage ../applications/audio/ft2-clone { inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa; @@ -27953,7 +28197,7 @@ with pkgs; gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; - inherit (ocaml-ng.ocamlPackages_4_10) google-drive-ocamlfuse; + inherit (ocaml-ng.ocamlPackages_4_12) google-drive-ocamlfuse; googler = callPackage ../applications/misc/googler { python = python3; @@ -27961,10 +28205,7 @@ with pkgs; gopher = callPackage ../applications/networking/gopher/gopher { }; - gophernotes = callPackage ../applications/editors/gophernotes { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + gophernotes = callPackage ../applications/editors/gophernotes { }; goxel = callPackage ../applications/graphics/goxel { }; @@ -28050,7 +28291,9 @@ with pkgs; fdupes = callPackage ../tools/misc/fdupes { }; - feh = callPackage ../applications/graphics/feh { }; + feh = callPackage ../applications/graphics/feh { + imlib2 = imlib2Full; + }; feishu = callPackage ../applications/networking/instant-messengers/feishu {}; @@ -28439,7 +28682,9 @@ with pkgs; qrcodegen = callPackage ../development/libraries/qrcodegen { }; - qrencode = callPackage ../development/libraries/qrencode { }; + qrencode = callPackage ../development/libraries/qrencode { + inherit (darwin) libobjc; + }; geeqie = callPackage ../applications/graphics/geeqie { }; @@ -28630,7 +28875,9 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; - hugo = callPackage ../applications/misc/hugo { }; + hugo = callPackage ../applications/misc/hugo { + buildGoModule = buildGo119Module; + }; gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { }; @@ -28997,6 +29244,8 @@ with pkgs; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; + inklingreader = callPackage ../tools/misc/inklingreader { }; + inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; }; @@ -29112,10 +29361,7 @@ with pkgs; k3sup = callPackage ../applications/networking/cluster/k3sup {}; - kconf = callPackage ../applications/networking/cluster/kconf { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + kconf = callPackage ../applications/networking/cluster/kconf { }; kail = callPackage ../tools/networking/kail { }; @@ -29230,6 +29476,8 @@ with pkgs; kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; + kubedog = callPackage ../applications/networking/cluster/kubedog { }; + kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; kube-score = callPackage ../applications/networking/cluster/kube-score { }; @@ -29262,18 +29510,14 @@ with pkgs; kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; - kuttl = callPackage ../applications/networking/cluster/kuttl { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + kuttl = callPackage ../applications/networking/cluster/kuttl { }; - kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; + kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { }; + kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { }; kubectl-tree = callPackage ../applications/networking/cluster/kubectl-tree { }; @@ -29671,7 +29915,7 @@ with pkgs; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = adoptopenjdk-hotspot-bin-16; }; + mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-17; }; megapixels = callPackage ../applications/graphics/megapixels { }; @@ -29941,7 +30185,9 @@ with pkgs; normalize = callPackage ../applications/audio/normalize { }; - norouter = callPackage ../tools/networking/norouter { }; + norouter = callPackage ../tools/networking/norouter { + buildGoModule = buildGo118Module; # tests fail with 1.19 + }; mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; @@ -30047,7 +30293,9 @@ with pkgs; nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { }; - newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; + newsflash = callPackage ../applications/networking/feedreaders/newsflash { + webkitgtk = webkitgtk_5_0; + }; nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { }; @@ -30095,8 +30343,12 @@ with pkgs; onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; + opcr-policy = callPackage ../development/tools/opcr-policy { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { }; + openmm = callPackage ../development/libraries/science/chemistry/openmm { }; + openshift = callPackage ../applications/networking/cluster/openshift { }; opsdroid = callPackage ../applications/networking/opsdroid { }; @@ -30107,7 +30359,10 @@ with pkgs; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; - p4 = callPackage ../applications/version-management/p4 { }; + p4 = callPackage ../applications/version-management/p4 { + inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security; + openssl = openssl_1_1; + }; p4d = callPackage ../applications/version-management/p4d { }; p4v = libsForQt515.callPackage ../applications/version-management/p4v { }; @@ -30277,7 +30532,10 @@ with pkgs; diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { }; - diff-pdf = callPackage ../applications/misc/diff-pdf { wxGTK = wxGTK31; }; + diff-pdf = callPackage ../applications/misc/diff-pdf { + wxGTK = wxGTK32; + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; diffuse = callPackage ../applications/misc/diffuse { }; @@ -30470,6 +30728,10 @@ with pkgs; owamp = callPackage ../applications/networking/owamp { }; + owofetch = callPackage ../tools/misc/owofetch { + inherit (darwin.apple_sdk.frameworks) Foundation DiskArbitration; + }; + vgmplay-libvgm = callPackage ../applications/audio/vgmplay-libvgm { }; vgmtools = callPackage ../tools/audio/vgmtools { }; @@ -30522,10 +30784,14 @@ with pkgs; enableDbusUi = false; }; + parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; + pavucontrol = callPackage ../applications/audio/pavucontrol { }; paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; + parlatype = callPackage ../applications/audio/parlatype { }; + packet = callPackage ../development/tools/packet { }; packet-sd = callPackage ../development/tools/packet-sd { }; @@ -30671,10 +30937,6 @@ with pkgs; tdlib-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tdlib-purple { }; - toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { - libtoxcore = libtoxcore-new; - }; - pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; @@ -30741,7 +31003,9 @@ with pkgs; pqiv = callPackage ../applications/graphics/pqiv { }; - qiv = callPackage ../applications/graphics/qiv { }; + qiv = callPackage ../applications/graphics/qiv { + imlib2 = imlib2Full; + }; premid = callPackage ../applications/misc/premid { }; @@ -30817,13 +31081,15 @@ with pkgs; qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat {}; qemu = callPackage ../applications/virtualization/qemu { - inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor; + inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor vmnet; inherit (darwin.stubs) rez setfile; inherit (darwin) sigtool; }; qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; + canokey-qemu = callPackage ../applications/virtualization/qemu/canokey-qemu.nix { }; + wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; @@ -30967,6 +31233,9 @@ with pkgs; }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser-qt6 = callPackage ../applications/networking/browsers/qutebrowser { + inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland; + }; qxw = callPackage ../applications/editors/qxw {}; @@ -31284,9 +31553,13 @@ with pkgs; swingsane = callPackage ../applications/graphics/swingsane { }; - sxiv = callPackage ../applications/graphics/sxiv { }; + sxiv = callPackage ../applications/graphics/sxiv { + imlib2 = imlib2Full; + }; - nsxiv = callPackage ../applications/graphics/nsxiv { }; + nsxiv = callPackage ../applications/graphics/nsxiv { + imlib2 = imlib2Full; + }; resilio-sync = callPackage ../applications/networking/resilio-sync { }; @@ -31354,15 +31627,27 @@ with pkgs; prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; - super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { + wxGTK31-gtk3 = wxGTK31-gtk3.override { + # https://github.com/supermerill/SuperSlicer/issues/1093 + withEGL = false; + }; + }; - super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).latest; + super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { + wxGTK31-gtk3 = wxGTK31-gtk3.override { + # https://github.com/supermerill/SuperSlicer/issues/1093 + withEGL = false; + }; + }).latest; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; - routedns = callPackage ../tools/networking/routedns { }; + routedns = callPackage ../tools/networking/routedns { + buildGoModule = buildGo118Module; # build fails with 1.19 + }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; @@ -31387,7 +31672,10 @@ with pkgs; socialscan = with python3.pkgs; toPythonApplication socialscan; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { stdenv = gcc10StdenvCompat; }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { + bzip2 = bzip2_1_1; + stdenv = gcc10StdenvCompat; + }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; @@ -31787,10 +32075,7 @@ with pkgs; toxic = callPackage ../applications/networking/instant-messengers/toxic { }; - toxiproxy = callPackage ../development/tools/toxiproxy { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + toxiproxy = callPackage ../development/tools/toxiproxy { }; tqsl = callPackage ../applications/radio/tqsl { openssl = openssl_1_1; @@ -31833,7 +32118,8 @@ with pkgs; tree = callPackage ../tools/system/tree {}; treesheets = callPackage ../applications/office/treesheets { - wxGTK = wxGTK31-gtk3; + wxGTK = wxGTK32; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; tremc = callPackage ../applications/networking/p2p/tremc { }; @@ -31933,6 +32219,8 @@ with pkgs; uwimap = callPackage ../tools/networking/uwimap { }; + utm = callPackage ../os-specific/darwin/utm { }; + utox = callPackage ../applications/networking/instant-messengers/utox { }; valentina = libsForQt5.callPackage ../applications/misc/valentina { }; @@ -32364,7 +32652,9 @@ with pkgs; wsjtx = qt5.callPackage ../applications/radio/wsjtx { }; wxhexeditor = callPackage ../applications/editors/wxhexeditor { - wxGTK = wxGTK31; + inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (llvmPackages) openmp; + wxGTK = wxGTK32; }; xa = callPackage ../development/compilers/xa/xa.nix { }; @@ -32901,7 +33191,9 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon.nix { }; + erigon = callPackage ../applications/blockchains/erigon.nix { + buildGoModule = buildGo119Module; + }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -33130,7 +33422,11 @@ with pkgs; gotypist = callPackage ../games/gotypist { }; - heroic = callPackage ../games/heroic { }; + heroic-unwrapped = callPackage ../games/heroic { }; + + heroic = callPackage ../games/heroic/fhsenv.nix { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }; julius = callPackage ../games/julius { }; @@ -33566,6 +33862,8 @@ with pkgs; gnushogi = callPackage ../games/gnushogi { }; + gogdl = python3Packages.callPackage ../games/gogdl { }; + gogui = callPackage ../games/gogui { }; gscrabble = python3Packages.callPackage ../games/gscrabble { }; @@ -34315,7 +34613,7 @@ with pkgs; keen4 = callPackage ../games/keen4 { }; zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { - wxGTK = wxGTK31; + wxGTK = wxGTK32; }); zeroad = zeroadPackages.zeroad; @@ -34363,7 +34661,7 @@ with pkgs; gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; - chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell { }; + gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { }; gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; @@ -35061,7 +35359,13 @@ with pkgs; cadical = callPackage ../applications/science/logic/cadical {}; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12; + inherit (ocaml-ng) + ocamlPackages_4_05 + ocamlPackages_4_09 + ocamlPackages_4_10 + ocamlPackages_4_12 + ocamlPackages_4_14 + ; }) mkCoqPackages coqPackages_8_5 coq_8_5 coqPackages_8_6 coq_8_6 @@ -35879,8 +36183,7 @@ with pkgs; gotestwaf = callPackage ../tools/security/gotestwaf { }; gowitness = callPackage ../tools/security/gowitness { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; + buildGoModule = buildGo119Module; }; guetzli = callPackage ../applications/graphics/guetzli { }; @@ -35993,14 +36296,18 @@ with pkgs; # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_22 kops_1_23 kops_1_24 + kops_1_25 ; - kops = kops_1_24; + kops = kops_1_25; lguf-brightness = callPackage ../misc/lguf-brightness { }; + lighthouse = callPackage ../applications/blockchains/lighthouse { + inherit (darwin.apple_sdk.frameworks) Security; + }; + lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; @@ -36380,6 +36687,8 @@ with pkgs; qdl = callPackage ../tools/misc/qdl { }; + qperf = callPackage ../os-specific/linux/qperf { }; + rates = callPackage ../tools/misc/rates { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -36539,7 +36848,9 @@ with pkgs; soundmodem = callPackage ../applications/radio/soundmodem {}; - soundOfSorting = callPackage ../misc/sound-of-sorting { }; + soundOfSorting = callPackage ../misc/sound-of-sorting { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; sourceAndTags = callPackage ../misc/source-and-tags { hasktags = haskellPackages.hasktags; @@ -36761,7 +37072,7 @@ with pkgs; wasm-pack = callPackage ../development/tools/wasm-pack { inherit (darwin.apple_sdk.frameworks) Security; - libressl = libressl_3_4; + libressl = libressl_3_5; }; wasynth = callPackage ../development/tools/wasynth { }; @@ -36830,6 +37141,12 @@ with pkgs; wordpress = callPackage ../servers/web-apps/wordpress { }; + wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages { + plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json; + themes = lib.importJSON ../servers/web-apps/wordpress/packages/themes.json; + languages = lib.importJSON ../servers/web-apps/wordpress/packages/languages.json; + }); + wprecon = callPackage ../tools/security/wprecon { }; wraith = callPackage ../applications/networking/irc/wraith { @@ -36837,7 +37154,7 @@ with pkgs; }; wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { - wxGTK = wxGTK30; + wxGTK = wxGTK32; inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.stubs) setfile rez derez; }; @@ -37044,7 +37361,7 @@ with pkgs; simplenote = callPackage ../applications/misc/simplenote { }; - hy = python3Packages.hy.withPackages (python-packages: [ ]); + hy = with python3Packages; toPythonApplication hy; wmic-bin = callPackage ../servers/monitoring/plugins/wmic-bin.nix { }; @@ -37203,15 +37520,16 @@ with pkgs; dapper = callPackage ../development/tools/dapper { }; - kube3d = callPackage ../applications/networking/cluster/kube3d {}; + kube3d = callPackage ../applications/networking/cluster/kube3d { + buildGoModule = buildGo118Module; # tests fail with 1.19 + }; zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots {}; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; zrepl = callPackage ../tools/backup/zrepl { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; + buildGoModule = buildGo118Module; # nixosTests.zrepl fails with 1.19 }; uhubctl = callPackage ../tools/misc/uhubctl {}; @@ -37232,7 +37550,9 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { }; + werf = callPackage ../applications/networking/cluster/werf { + buildGoModule = buildGo119Module; + }; wifi-password = callPackage ../os-specific/darwin/wifi-password {}; @@ -37357,4 +37677,6 @@ with pkgs; swaysettings = callPackage ../applications/misc/swaysettings { }; aitrack = libsForQt5.callPackage ../applications/misc/aitrack { }; + + widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { }; } diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 6ddd647a2b1a1..a47655f114243 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -9,11 +9,11 @@ let mkMassRebuild = args: mkOption (builtins.removeAttrs args [ "feature" ] // { type = args.type or (types.uniq types.bool); default = args.default or false; - description = (args.description or '' + description = lib.mdDoc ((args.description or '' Whether to ${args.feature} while building nixpkgs packages. '') + '' Changing the default may cause a mass rebuild. - ''; + ''); }); options = { @@ -34,35 +34,35 @@ let /* Config options */ warnUndeclaredOptions = mkOption { - description = "Whether to warn when <literal>config</literal> contains an unrecognized attribute."; + description = lib.mdDoc "Whether to warn when `config` contains an unrecognized attribute."; type = types.bool; default = false; }; doCheckByDefault = mkMassRebuild { - feature = "run <literal>checkPhase</literal> by default"; + feature = "run `checkPhase` by default"; }; strictDepsByDefault = mkMassRebuild { - feature = "set <literal>strictDeps</literal> to true by default"; + feature = "set `strictDeps` to true by default"; }; enableParallelBuildingByDefault = mkMassRebuild { - feature = "set <literal>enableParallelBuilding</literal> to true by default"; + feature = "set `enableParallelBuilding` to true by default"; }; configurePlatformsByDefault = mkMassRebuild { - feature = "set <literal>configurePlatforms</literal> to <literal>[\"build\" \"host\"]</literal> by default"; + feature = "set `configurePlatforms` to `[\"build\" \"host\"]` by default"; }; contentAddressedByDefault = mkMassRebuild { - feature = "set <literal>__contentAddressed</literal> to true by default"; + feature = "set `__contentAddressed` to true by default"; }; allowAliases = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to expose old attribute names for compatibility. The recommended setting is to enable this, as it @@ -82,10 +82,10 @@ let default = false; # getEnv part is in check-meta.nix defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"''; - description = '' + description = lib.mdDoc '' Whether to allow unfree packages. - See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree">Installing unfree packages</link> in the NixOS manual. + See [Installing unfree packages](https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree) in the NixOS manual. ''; }; @@ -94,10 +94,10 @@ let default = false; # getEnv part is in check-meta.nix defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"''; - description = '' + description = lib.mdDoc '' Whether to allow broken packages. - See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-broken">Installing broken packages</link> in the NixOS manual. + See [Installing broken packages](https://nixos.org/manual/nixpkgs/stable/#sec-allow-broken) in the NixOS manual. ''; }; @@ -106,22 +106,22 @@ let default = false; # getEnv part is in check-meta.nix defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"''; - description = '' + description = lib.mdDoc '' Whether to allow unsupported packages. - See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-unsupported-system">Installing packages on unsupported systems</link> in the NixOS manual. + See [Installing packages on unsupported systems](https://nixos.org/manual/nixpkgs/stable/#sec-allow-unsupported-system) in the NixOS manual. ''; }; showDerivationWarnings = mkOption { type = types.listOf (types.enum [ "maintainerless" ]); default = []; - description = '' + description = lib.mdDoc '' Which warnings to display for potentially dangerous or deprecated values passed into `stdenv.mkDerivation`. A list of warnings can be found in - <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/check-meta.nix">/pkgs/stdenv/generic/check-meta.nix</link>. + [/pkgs/stdenv/generic/check-meta.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/check-meta.nix). This is not a stable interface; warnings may be added, changed or removed without prior notice. @@ -130,7 +130,7 @@ let checkMeta = mkOption { type = types.bool; - default = true; + default = false; description = '' Whether to check that the `meta` attribute of derivations are correct during evaluation time. ''; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 87688c53d2da7..65de529685e3a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchzip , callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 -, ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html +, ocamlPackages_4_10, ocamlPackages_4_12, ocamlPackages_4_14 +, fetchpatch, makeWrapper, coq2html }@args: let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let @@ -130,6 +131,7 @@ let ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12 + ocamlPackages_4_14 ; }; in rec { @@ -171,7 +173,7 @@ in rec { coqPackages_8_14 = mkCoqPackages coq_8_14; coqPackages_8_15 = mkCoqPackages coq_8_15; coqPackages_8_16 = mkCoqPackages coq_8_16; - coqPackages = recurseIntoAttrs coqPackages_8_15; + coqPackages = recurseIntoAttrs coqPackages_8_16; coq = coqPackages.coq; } diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 9a6b188095023..d5f820d0d60b9 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -50,7 +50,7 @@ rec { }).overrideDerivation (old: { propagatedBuildInputs = [ zlib ]; - buildInputs = old.buildInputs ++ [ pkg-config ]; + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ]; # just override it with nothing so it does not fail autoreconfPhase = "echo autoreconfPhase not used..."; @@ -87,7 +87,7 @@ rec { pname = "xmlmirror"; version = "unstable-2016-06-05"; - buildInputs = [ pkg-config libtool gnumake libxml2 nodejs openjdk json_c ]; + buildInputs = [ libtool gnumake libxml2 nodejs openjdk json_c ]; nativeBuildInputs = [ pkg-config zlib autoconf automake ]; src = pkgs.fetchgit { @@ -140,7 +140,7 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - buildInputs = old.buildInputs ++ [ pkg-config ]; + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pkg-config ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; dontStrip = true; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 302b301b115ef..8a419a6a0960e 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -28,7 +28,7 @@ in { }; mkAdoptopenjdk = path-linux: path-darwin: let - package-linux = import path-linux { inherit lib; }; + package-linux = import path-linux { inherit stdenv lib; }; package-darwin = import path-darwin { inherit lib; }; package = if stdenv.isLinux then package-linux @@ -45,7 +45,11 @@ in { mkBootstrap = adoptopenjdk: path: args: /* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */ if adoptopenjdk.jdk-hotspot.meta.available - then adoptopenjdk.jdk-hotspot + then + # only linux has the gtkSupport option + if stdenv.isLinux + then adoptopenjdk.jdk-hotspot.override { gtkSupport = false; } + else adoptopenjdk.jdk-hotspot else callPackage path args; mkOpenjdk = path-linux: path-darwin: args: diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 11dd5270e63d8..7891669e0fce3 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -100,6 +100,8 @@ let self = rec { vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { }; + visualization-waveform = callPackage ../applications/video/kodi/addons/visualization-waveform { }; + youtube = callPackage ../applications/video/kodi/addons/youtube { }; # addon packages (dependencies) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 139848b4fe97b..2b690422ecd52 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -61,10 +61,6 @@ in { # New vendor kernels should go to nixos-hardware instead. # e.g. https://github.com/NixOS/nixos-hardware/tree/master/microsoft/surface/kernel - linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { - kernelPatches = linux_4_19.kernelPatches; - }; - linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper @@ -177,6 +173,13 @@ in { ]; }; + linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -229,7 +232,8 @@ in { }; linux_xanmod = xanmodKernels.lts; - linux_xanmod_latest = xanmodKernels.edge; + linux_xanmod_stable = xanmodKernels.current; + linux_xanmod_latest = xanmodKernels.next; linux_xanmod_tt = xanmodKernels.tt; linux_libre = deblobKernel packageAliases.linux_default.kernel; @@ -531,6 +535,7 @@ in { linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19); + linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0); }; rtPackages = { @@ -547,7 +552,6 @@ in { }; packages = recurseIntoAttrs (vanillaPackages // rtPackages // rpiPackages // { - linux_mptcp_95 = packagesFor kernels.linux_mptcp_95; # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. linux_testing = packagesFor kernels.linux_testing; @@ -575,6 +579,7 @@ in { linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); + linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt); @@ -588,7 +593,7 @@ in { packageAliases = { linux_default = packages.linux_5_15; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_19; + linux_latest = packages.linux_6_0; linux_mptcp = packages.linux_mptcp_95; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_5_10; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index eb77005a39931..cf5b4fcb59876 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -92,7 +92,6 @@ let bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { }; bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { }; - bls12-381-unix = callPackage ../development/ocaml-modules/bls12-381/unix.nix { }; bls12-381-legacy = callPackage ../development/ocaml-modules/bls12-381/legacy.nix { }; bos = callPackage ../development/ocaml-modules/bos { }; @@ -578,9 +577,7 @@ let git-binary = pkgs.git; }; - git-cohttp = callPackage ../development/ocaml-modules/git/cohttp.nix { }; - - git-cohttp-unix = callPackage ../development/ocaml-modules/git/cohttp-unix.nix { }; + git-mirage = callPackage ../development/ocaml-modules/git/mirage.nix { }; git-paf = callPackage ../development/ocaml-modules/git/paf.nix { }; @@ -629,8 +626,6 @@ let irmin-http = callPackage ../development/ocaml-modules/irmin/http.nix { }; - irmin-layers = callPackage ../development/ocaml-modules/irmin/layers.nix { }; - irmin-mirage = callPackage ../development/ocaml-modules/irmin/mirage.nix { }; irmin-mirage-git = callPackage ../development/ocaml-modules/irmin/mirage-git.nix { }; @@ -641,7 +636,7 @@ let irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { }; - irmin-unix = callPackage ../development/ocaml-modules/irmin/unix.nix { }; + irmin-tezos = callPackage ../development/ocaml-modules/irmin/tezos.nix { }; irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { }; @@ -691,9 +686,6 @@ let lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; - lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { - inherit (pkgs.gnome2) libgnomecanvas gtksourceview; - }; lablgtk = callPackage ../development/ocaml-modules/lablgtk { inherit (pkgs.gnome2) libgnomecanvas gtksourceview; }; diff --git a/pkgs/top-level/octave-packages.nix b/pkgs/top-level/octave-packages.nix index 3895d7871f91e..374163fa56732 100644 --- a/pkgs/top-level/octave-packages.nix +++ b/pkgs/top-level/octave-packages.nix @@ -23,8 +23,6 @@ with lib; makeScope newScope (self: let - inherit (octave) blas lapack gfortran python texinfo gnuplot; - callPackage = self.callPackage; buildOctavePackage = callPackage ../development/interpreters/octave/build-octave-package.nix { @@ -33,11 +31,6 @@ makeScope newScope (self: inherit computeRequiredOctavePackages; }; - wrapOctave = callPackage ../development/interpreters/octave/wrap-octave.nix { - inherit octave; - inherit (pkgs) makeSetupHook makeWrapper; - }; - # Given a list of required Octave package derivations, get a list of # ALL required Octave packages needed for the ones specified to run. computeRequiredOctavePackages = drvs: let diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6a5806736e91a..6a18218966621 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13873,7 +13873,8 @@ let url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/Log-Journald-0.30.tar.gz"; hash = "sha256-VZks+aHh+4M/QoMAUlv6fPftRrg+xBT4KgkXibN9CKM="; }; - buildInputs = [ pkgs.pkg-config pkgs.systemd ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.systemd ]; postPatch = '' substituteInPlace Build.PL \ --replace "libsystemd-journal" "libsystemd" @@ -15732,17 +15733,12 @@ let mod_perl2 = buildPerlPackage { pname = "mod_perl"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz"; - hash = "sha256-yiqeGM35D5xgI+eGNp1bp16NrCkuv+qZAMKb9C3Bb3Q="; + url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.12.tar.gz"; + hash = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; }; - patches = [ - # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617 - ../development/perl-modules/mod_perl2-PL_hash_seed.patch - ]; - makeMakerFlags = "MP_AP_DESTDIR=$out"; buildInputs = [ pkgs.apacheHttpd ]; doCheck = false; # would try to start Apache HTTP server @@ -19415,11 +19411,17 @@ let perlldap = buildPerlPackage { pname = "perl-ldap"; - version = "0.66"; + version = "0.68"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.66.tar.gz"; - hash = "sha256-CSY85hZugMmNaJ1B0JmVuBM4n9Bpt4RgH23Ff44rQQI="; + url = "mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.68.tar.gz"; + hash = "sha256-4vOJ/j56nkthSIaSkZrXI7mPO0ebUoj2ENqownmVs1E="; }; + # ldapi socket location should match the one compiled into the openldap package + postPatch = '' + for f in lib/Net/LDAPI.pm lib/Net/LDAP/Util.pm lib/Net/LDAP.pod lib/Net/LDAP.pm; do + sed -i 's:/var/run/ldapi:/run/openldap/ldapi:g' "$f" + done + ''; buildInputs = [ TextSoundex ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { @@ -20935,7 +20937,8 @@ let url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/RPM2-1.4.tar.gz"; hash = "sha256-XstCqmkyTm9AiKv64HMTkG5aq/L0bxIE8/HeWRVbtjY="; }; - buildInputs = [ pkgs.pkg-config pkgs.rpm ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.rpm ]; doCheck = false; # Tries to open /var/lib/rpm meta = { description = "Perl bindings for the RPM Package Manager API"; @@ -22609,12 +22612,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "8.5.0"; + version = "8.8.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; - hash = "sha256-VuM4rPrG15vXnF5e1MBSGB76zLI+8nkSiJmwWg8aJgE="; + hash = "sha256-8maLIW4hBbMbq+rnwEfaHsUgpppaU5K4aQTwTgUjdcI="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -26969,8 +26972,6 @@ let url = "mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz"; hash = "sha256-3pbdbHwfJfMoeqevZJAr+ErKqo4MO7dqoWdjZ+BKCLc="; }; - buildInputs = [ pkgs.xlibsWrapper ]; - NIX_CFLAGS_LINK = "-lX11"; doCheck = false; # requires an X server meta = { description = "Perl module for the X Window System Protocol, version 11"; @@ -27001,8 +27002,8 @@ let url = "mirror://cpan/authors/id/C/CT/CTRONDLP/X11-GUITest-0.28.tar.gz"; hash = "sha256-3O7eU3AGEP/xQtydXE5M0DcMiKTysTcfnL9NjYzm9ks="; }; - buildInputs = [ pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi ]; - NIX_CFLAGS_LINK = "-lX11 -lXext -lXtst"; + buildInputs = [ pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXt pkgs.xorg.libXtst ]; + NIX_CFLAGS_LINK = "-lX11"; doCheck = false; # requires an X server meta = { description = "Provides GUI testing/interaction routines"; @@ -27230,7 +27231,8 @@ let url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz"; hash = "sha256-En4XqHf7YeR7nouHv42q0xM5pioAEh+XUdUitDiw9/A="; }; - buildInputs = [ pkgs.pkg-config pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.zlib pkgs.libxml2 pkgs.libxslt ]; propagatedBuildInputs = [ XMLLibXML ]; meta = { description = "Interface to the GNOME libxslt library"; @@ -27806,7 +27808,8 @@ let makeMakerFlags = "--prefix-openssl=${pkgs.openssl_1_1.dev}"; - buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 pkgs.pkg-config ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 ]; meta = { description = "Perl wrapper for the ldns DNS library"; license = with lib.licenses; [ bsd3 ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 2be63015122ff..e5eb38c32e440 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -22,6 +22,7 @@ , libffi , libiconv , libjpeg +, libkrb5 , libpng , libsodium , libwebp @@ -342,10 +343,8 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "imap"; - buildInputs = [ uwimap openssl pam pcre2 ]; - configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; - # uwimap doesn't build on darwin. - enable = (!stdenv.isDarwin); + buildInputs = [ uwimap openssl pam pcre2 libkrb5 ]; + configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" "--with-kerberos" ]; } { name = "intl"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5fc08d1d688ac..b49f7e43e1b06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -171,6 +171,8 @@ in { acoustics = callPackage ../development/python-modules/acoustics { }; + acquire = callPackage ../development/python-modules/acquire { }; + actdiag = callPackage ../development/python-modules/actdiag { }; adafruit-io = callPackage ../development/python-modules/adafruit-io { }; @@ -1283,7 +1285,10 @@ in { bcdoc = callPackage ../development/python-modules/bcdoc { }; - bcrypt = callPackage ../development/python-modules/bcrypt { }; + bcrypt = if stdenv.hostPlatform.system == "i686-linux" then + callPackage ../development/python-modules/bcrypt/3.nix { } + else + callPackage ../development/python-modules/bcrypt { }; beaker = callPackage ../development/python-modules/beaker { }; @@ -1385,6 +1390,8 @@ in { bleach = callPackage ../development/python-modules/bleach { }; + bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { }; + bleak = callPackage ../development/python-modules/bleak { }; bleak-retry-connector = callPackage ../development/python-modules/bleak-retry-connector { }; @@ -2030,6 +2037,8 @@ in { configshell = callPackage ../development/python-modules/configshell { }; + configupdater = callPackage ../development/python-modules/configupdater { }; + confluent-kafka = callPackage ../development/python-modules/confluent-kafka { }; confuse = callPackage ../development/python-modules/confuse { }; @@ -2473,6 +2482,50 @@ in { diskcache = callPackage ../development/python-modules/diskcache { }; + dissect = callPackage ../development/python-modules/dissect { }; + + dissect-cim = callPackage ../development/python-modules/dissect-cim { }; + + dissect-clfs = callPackage ../development/python-modules/dissect-clfs { }; + + dissect-cstruct = callPackage ../development/python-modules/dissect-cstruct { }; + + dissect-fat = callPackage ../development/python-modules/dissect-fat { }; + + dissect-ffs = callPackage ../development/python-modules/dissect-ffs { }; + + dissect-esedb = callPackage ../development/python-modules/dissect-esedb { }; + + dissect-etl = callPackage ../development/python-modules/dissect-etl { }; + + dissect-eventlog = callPackage ../development/python-modules/dissect-eventlog { }; + + dissect-evidence = callPackage ../development/python-modules/dissect-evidence { }; + + dissect-extfs = callPackage ../development/python-modules/dissect-extfs { }; + + dissect-hypervisor = callPackage ../development/python-modules/dissect-hypervisor { }; + + dissect-ntfs = callPackage ../development/python-modules/dissect-ntfs { }; + + dissect-ole = callPackage ../development/python-modules/dissect-ole { }; + + dissect-regf = callPackage ../development/python-modules/dissect-regf { }; + + dissect-shellitem = callPackage ../development/python-modules/dissect-shellitem { }; + + dissect-sql = callPackage ../development/python-modules/dissect-sql { }; + + dissect-target = callPackage ../development/python-modules/dissect-target { }; + + dissect-util = callPackage ../development/python-modules/dissect-util { }; + + dissect-vmfs = callPackage ../development/python-modules/dissect-vmfs { }; + + dissect-volume = callPackage ../development/python-modules/dissect-volume { }; + + dissect-xfs = callPackage ../development/python-modules/dissect-xfs { }; + dissononce = callPackage ../development/python-modules/dissononce { }; distlib = callPackage ../development/python-modules/distlib { }; @@ -2499,10 +2552,14 @@ in { django-anymail = callPackage ../development/python-modules/django-anymail { }; + django-annoying = callPackage ../development/python-modules/django-annoying { }; + django-appconf = callPackage ../development/python-modules/django-appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; + django-autocomplete-light = callPackage ../development/python-modules/django-autocomplete-light { }; + django-cache-url = callPackage ../development/python-modules/django-cache-url { }; django-cacheops = callPackage ../development/python-modules/django-cacheops { }; @@ -2527,6 +2584,8 @@ in { django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { }; + django-cryptography = callPackage ../development/python-modules/django-cryptography { }; django-csp = callPackage ../development/python-modules/django-csp { }; @@ -2555,6 +2614,8 @@ in { django-haystack = callPackage ../development/python-modules/django-haystack { }; + django-hcaptcha = callPackage ../development/python-modules/django-hcaptcha { }; + django-health-check = callPackage ../development/python-modules/django-health-check { }; django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; @@ -2568,6 +2629,8 @@ in { django-js-asset = callPackage ../development/python-modules/django-js-asset { }; + django-js-reverse = callPackage ../development/python-modules/django-js-reverse { }; + django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; @@ -2602,6 +2665,8 @@ in { django-q = callPackage ../development/python-modules/django-q { }; + django-scopes = callPackage ../development/python-modules/django-scopes { }; + djangoql = callPackage ../development/python-modules/djangoql { }; django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; @@ -2796,6 +2861,8 @@ in { drf-spectacular-sidecar = callPackage ../development/python-modules/drf-spectacular-sidecar { }; + drf-writable-nested = callPackage ../development/python-modules/drf-writable-nested { }; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; drivelib = callPackage ../development/python-modules/drivelib { }; @@ -2895,6 +2962,8 @@ in { ed25519 = callPackage ../development/python-modules/ed25519 { }; + ed25519-blake2b = callPackage ../development/python-modules/ed25519-blake2b { }; + edalize = callPackage ../development/python-modules/edalize { }; editables = callPackage ../development/python-modules/editables { }; @@ -3126,6 +3195,8 @@ in { extras = callPackage ../development/python-modules/extras { }; + extruct = callPackage ../development/python-modules/extruct { }; + eyeD3 = callPackage ../development/python-modules/eyed3 { }; ezdxf = callPackage ../development/python-modules/ezdxf { }; @@ -3450,6 +3521,8 @@ in { flit-core = callPackage ../development/python-modules/flit-core { }; + flow-record = callPackage ../development/python-modules/flow-record { }; + flower = callPackage ../development/python-modules/flower { }; flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; @@ -4289,6 +4362,8 @@ in { html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + html-text = callPackage ../development/python-modules/html-text { }; + HTSeq = callPackage ../development/python-modules/HTSeq { }; httmock = callPackage ../development/python-modules/httmock { }; @@ -4399,6 +4474,8 @@ in { iaqualink = callPackage ../development/python-modules/iaqualink { }; + ibeacon-ble = callPackage ../development/python-modules/ibeacon-ble { }; + ibis = callPackage ../development/python-modules/ibis { }; ibis-framework = callPackage ../development/python-modules/ibis-framework { }; @@ -4860,6 +4937,8 @@ in { json-tricks = callPackage ../development/python-modules/json-tricks { }; + jstyleson = callPackage ../development/python-modules/jstyleson { }; + jug = callPackage ../development/python-modules/jug { }; junitparser = callPackage ../development/python-modules/junitparser { }; @@ -4986,6 +5065,8 @@ in { keepkey = callPackage ../development/python-modules/keepkey { }; + kegtron-ble = callPackage ../development/python-modules/kegtron-ble { }; + keras-applications = callPackage ../development/python-modules/keras-applications { }; keras = callPackage ../development/python-modules/keras { }; @@ -5067,6 +5148,8 @@ in { language-data = callPackage ../development/python-modules/language-data { }; + language-tags = callPackage ../development/python-modules/language-tags { }; + lark = callPackage ../development/python-modules/lark { }; latexcodec = callPackage ../development/python-modules/latexcodec { }; @@ -5696,8 +5779,12 @@ in { mezzanine = callPackage ../development/python-modules/mezzanine { }; + mf2py = callPackage ../development/python-modules/mf2py { }; + micawber = callPackage ../development/python-modules/micawber { }; + microdata = callPackage ../development/python-modules/microdata { }; + midiutil = callPackage ../development/python-modules/midiutil { }; mido = callPackage ../development/python-modules/mido { }; @@ -5756,6 +5843,7 @@ in { mkdocs-autorefs = callPackage ../development/python-modules/mkdocs-autorefs { }; mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { }; mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; + mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { }; mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; @@ -6403,10 +6491,12 @@ in { onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { }; - onnxruntime = (toPythonModule (pkgs.onnxruntime.override { - python3Packages = self; - pythonSupport = true; - })).python; + onnxruntime = callPackage ../development/python-modules/onnxruntime { + onnxruntime = pkgs.onnxruntime.override { + python3Packages = self; + pythonSupport = true; + }; + }; onvif-zeep-async = callPackage ../development/python-modules/onvif-zeep-async { }; @@ -6446,6 +6536,11 @@ in { openidc-client = callPackage ../development/python-modules/openidc-client { }; + openmm = toPythonModule (pkgs.openmm.override { + python3Packages = self; + enablePython = true; + }); + openpyxl = callPackage ../development/python-modules/openpyxl { }; openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; @@ -6997,6 +7092,8 @@ in { pypoolstation = callPackage ../development/python-modules/pypoolstation { }; + pyrdfa3 = callPackage ../development/python-modules/pyrdfa3 { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; @@ -7324,7 +7421,7 @@ in { psd-tools = callPackage ../development/python-modules/psd-tools { }; psutil = callPackage ../development/python-modules/psutil { - inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; + inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; psutil-home-assistant = callPackage ../development/python-modules/psutil-home-assistant { }; @@ -7397,6 +7494,8 @@ in { py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { }; + py-bip39-bindings = callPackage ../development/python-modules/py-bip39-bindings { }; + py-dmidecode = callPackage ../development/python-modules/py-dmidecode { }; py-nightscout = callPackage ../development/python-modules/py-nightscout { }; @@ -7405,6 +7504,8 @@ in { py-sneakers = callPackage ../development/python-modules/py-sneakers { }; + py-sr25519-bindings = callPackage ../development/python-modules/py-sr25519-bindings { }; + py-tes = callPackage ../development/python-modules/py-tes { }; py-tree-sitter = callPackage ../development/python-modules/py-tree-sitter { }; @@ -8330,6 +8431,12 @@ in { withWebKit = true; }; + pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix { }; + + pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { }; + + pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine.nix { }; + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { @@ -8370,6 +8477,8 @@ in { pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; + pyreadstat = callPackage ../development/python-modules/pyreadstat { }; + pyrealsense2 = toPythonModule (pkgs.librealsense.override { enablePython = true; pythonPackages = self; @@ -9527,6 +9636,8 @@ in { recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; + recipe-scrapers = callPackage ../development/python-modules/recipe-scrapers { }; + recoll = toPythonModule (pkgs.recoll.override { python3Packages = self; }); @@ -9803,6 +9914,8 @@ in { rst2ansi = callPackage ../development/python-modules/rst2ansi { }; + rst2pdf = callPackage ../development/python-modules/rst2pdf { }; + rstcheck = callPackage ../development/python-modules/rstcheck { }; rstcheck-core = callPackage ../development/python-modules/rstcheck-core { }; @@ -10400,6 +10513,8 @@ in { spinners = callPackage ../development/python-modules/spinners { }; + sphinx-automodapi = callPackage ../development/python-modules/sphinx-automodapi { }; + sphinx-better-theme = callPackage ../development/python-modules/sphinx-better-theme { }; sphinx-book-theme = callPackage ../development/python-modules/sphinx-book-theme { }; @@ -11327,12 +11442,16 @@ in { types-protobuf = callPackage ../development/python-modules/types-protobuf { }; + types-python-dateutil = callPackage ../development/python-modules/types-python-dateutil { }; + types-pytz = callPackage ../development/python-modules/types-pytz { }; types-pyyaml = callPackage ../development/python-modules/types-pyyaml { }; types-redis = callPackage ../development/python-modules/types-redis { }; + types-retry = callPackage ../development/python-modules/types-retry { }; + types-requests = callPackage ../development/python-modules/types-requests { }; types-setuptools = callPackage ../development/python-modules/types-setuptools { }; @@ -11594,6 +11713,8 @@ in { versionfinder = callPackage ../development/python-modules/versionfinder { }; + versioningit = callPackage ../development/python-modules/versioningit { }; + versiontag = callPackage ../development/python-modules/versiontag { }; versiontools = callPackage ../development/python-modules/versiontools { }; @@ -11893,8 +12014,8 @@ in { }; wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix { - wxGTK = pkgs.wxGTK31.override { - withGtk2 = false; + inherit (pkgs.darwin.apple_sdk.frameworks) AGL AudioToolbox AVFoundation AVKit Carbon Cocoa CoreMedia CoreFoundation IOKit Kernel OpenGL Security WebKit; + wxGTK = pkgs.wxGTK31-gtk3.override { withWebKit = true; }; }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 167896af4d2b4..0f9c461539e6c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -53,6 +53,7 @@ let ghc8107 ghc902 ghc924 + ghc942 ]; # packagePlatforms applied to `haskell.packages.*` @@ -354,12 +355,26 @@ let # working as expected. cabal-install = released; Cabal_3_6_3_0 = released; + Cabal_3_8_1_0 = released; cabal2nix = released; cabal2nix-unstable = released; funcmp = released; - haskell-language-server = released; + haskell-language-server = [ + compilerNames.ghc884 + compilerNames.ghc8107 + compilerNames.ghc902 + compilerNames.ghc924 + # https://github.com/haskell/haskell-language-server/issues/3190 + ]; hoogle = released; - hlint = released; + hlint = [ + compilerNames.ghc884 + compilerNames.ghc8107 + compilerNames.ghc902 + compilerNames.ghc924 + # https://github.com/ndmitchell/hlint/issues/1413 + ]; + hpack = released; hsdns = released; jailbreak-cabal = released; language-nix = released; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index bac3d1b1171dd..61116328b29f5 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -30,7 +30,7 @@ let "aarch64" ] (arch: builtins.elem "${arch}-darwin" systemsWithAnySupport); - jobs = + nonPackageJobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; @@ -167,7 +167,9 @@ let (system: { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { - localSystem = { inherit system; }; + pkgs = import ../.. { + localSystem = { inherit system; }; + }; }) dist test; }) @@ -175,7 +177,9 @@ let // optionalAttrs supportDarwin.x86_64 { x86_64-darwin = let - bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }; + bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { + localSystem = { system = "x86_64-darwin"; }; + }; in { # Lightweight distribution and test inherit (bootstrap) dist test; @@ -186,14 +190,25 @@ let # Cross compiled bootstrap tools aarch64-darwin = let - bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; crossSystem = "aarch64-darwin"; }; + bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { + localSystem = { system = "x86_64-darwin"; }; + crossSystem = { system = "aarch64-darwin"; }; + }; in { # Distribution only for now inherit (bootstrap) dist; }; }; - } // (mapTestOn ((packagePlatforms pkgs) // { + }; + + # Do not allow attribute collision between jobs inserted in + # 'nonPackageAttrs' and jobs pulled in from 'pkgs'. + # Conflicts usually cause silent job drops like in + # https://github.com/NixOS/nixpkgs/pull/182058 + jobs = lib.attrsets.unionOfDisjoint + nonPackageJobs + (mapTestOn ((packagePlatforms pkgs) // { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; idrisPackages = packagePlatforms pkgs.idrisPackages; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 28c4ac010e1f7..b81d1bfd59695 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -3038,10 +3038,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh"; + sha256 = "sha256-AM0pP5ZafGRLF4/+BUsuA6DuNNc4wX2/OsTZeL4p6Io="; type = "gem"; }; - version = "0.16.0"; + version = "0.17.0"; }; tilt = { groups = ["default"]; |