diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/top-level | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/top-level')
20 files changed, 639 insertions, 421 deletions
diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 780c0112520c..ed5f2afd2372 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -70,6 +70,7 @@ mapAliases ({ amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 + ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 antimicroX = antimicrox; # Added 2021-10-31 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 @@ -94,6 +95,7 @@ mapAliases ({ bash_5 = bash; # Added 2021-08-20 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 + beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08 binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 bird2 = bird; # Added 2022-02-21 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 @@ -146,6 +148,7 @@ mapAliases ({ chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 + chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 @@ -171,7 +174,7 @@ mapAliases ({ cvs_fast_export = cvs-fast-export; # Added 2021-06-10 # these are for convenience, not for backward compat and shouldn't expire - clang6Stdenv = lowPrio llvmPackages_6.stdenv; + clang6Stdenv = throw "clang6Stdenv has been removed from nixpkgs"; # Added 2024-01-08 clang7Stdenv = throw "clang7Stdenv has been removed from nixpkgs"; # Added 2023-11-19 clang8Stdenv = lowPrio llvmPackages_8.stdenv; clang9Stdenv = lowPrio llvmPackages_9.stdenv; @@ -184,7 +187,9 @@ mapAliases ({ clang16Stdenv = lowPrio llvmPackages_16.stdenv; clang17Stdenv = lowPrio llvmPackages_17.stdenv; + clang-tools_6 = throw "clang-tools_6 has been removed from nixpkgs"; # Added 2024-01-08 clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 + clang_6 = throw "clang_6 has been removed from nixpkgs"; # Added 2024-01-08 clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19 ### D ### @@ -287,6 +292,7 @@ mapAliases ({ framework-system-tools = framework-tool; # added 2023-12-09 fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. + futuresql = libsForQt5.futuresql; # added 2023-11-11 fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 fcitx = throw "fcitx is deprecated, please use fcitx5 instead."; # Added 2023-03-13 @@ -298,7 +304,9 @@ mapAliases ({ g4py = python3Packages.geant4; # Added 2020-06-06 garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10 + garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12 garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 + gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 @@ -409,6 +417,7 @@ mapAliases ({ i3-gaps = i3; # Added 2023-01-03 icedtea8_web = throw "'icedtea8_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 icedtea_web = throw "'icedtea_web' has been renamed to/replaced by 'adoptopenjdk-icedtea-web'"; # Converted to throw 2023-09-10 + ignite = throw "'ignite' has been removed as the upstream project was archived, please use 'flintlock' instead"; # Added 2024-01-07 imag = throw "'imag' has been removed, upstream gone"; # Added 2023-01-13 imagemagick7Big = imagemagickBig; # Added 2021-02-22 imagemagick7 = imagemagick; # Added 2021-02-22 @@ -441,7 +450,8 @@ mapAliases ({ join-desktop = throw "'join-desktop' has been removed because it is unmaintained upstream"; # Added 2023-10-04 # Julia - + julia_18 = throw "'julia_18' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 + julia_18-bin = throw "'julia_18-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 ### K ### @@ -495,6 +505,7 @@ mapAliases ({ liblastfm = libsForQt5.liblastfm; # Added 2020-06-14 libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 + libquotient = libsForQt5.libquotient; # Added 2023-11-11 libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = lrdf; # Added 2020-03-22 libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 @@ -537,6 +548,7 @@ mapAliases ({ linuxPackages_6_4 = linuxKernel.packages.linux_6_4; linuxPackages_6_5 = linuxKernel.packages.linux_6_5; linuxPackages_6_6 = linuxKernel.packages.linux_6_6; + linuxPackages_6_7 = linuxKernel.packages.linux_6_7; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -562,6 +574,7 @@ mapAliases ({ linux_6_4 = linuxKernel.kernels.linux_6_4; linux_6_5 = linuxKernel.kernels.linux_6_5; linux_6_6 = linuxKernel.kernels.linux_6_6; + linux_6_7 = linuxKernel.kernels.linux_6_7; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -593,9 +606,13 @@ mapAliases ({ linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_testing', or any other linux kernel with bcachefs support"; linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_testing', or any other linux kernel with bcachefs support"; + lld_6 = throw "lld_6 has been removed from nixpkgs"; # Added 2024-01-08 lld_7 = throw "lld_7 has been removed from nixpkgs"; # Added 2023-11-19 + lldb_6 = throw "lldb_6 has been removed from nixpkgs"; # Added 2024-01-08 lldb_7 = throw "lldb_7 has been removed from nixpkgs"; # Added 2023-11-19 + llvmPackages_6 = throw "llvmPackages_6 has been removed from nixpkgs"; # Added 2024-01-09 llvmPackages_7 = throw "llvmPackages_7 has been removed from nixpkgs"; # Added 2023-11-19 + llvm_6 = throw "llvm_6 has been removed from nixpkgs"; # Added 2024-01-08 llvm_7 = throw "llvm_7 has been removed from nixpkgs"; # Added 2023-11-19 lobster-two = google-fonts; # Added 2021-07-22 @@ -715,6 +732,7 @@ mapAliases ({ noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16 noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 + NSPlist = nsplist; # Added 2024-01-05 nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated; use cudaPackages.cuda_cccl"; ### O ### @@ -745,6 +763,7 @@ mapAliases ({ openssl_3_0 = openssl_3; # Added 2022-06-27 openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 orchis = orchis-theme; # Added 2021-06-09 + oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15 oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10 osxfuse = macfuse-stubs; # Added 2021-03-20 oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09 @@ -757,6 +776,7 @@ mapAliases ({ paperless-ng = paperless-ngx; # Added 2022-04-11 paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 parity = openethereum; # Added 2020-08-01 + partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 pcsctools = pcsc-tools; # Added 2023-12-07 pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 @@ -803,6 +823,7 @@ mapAliases ({ pinentry_gtk2 = throw "'pinentry_gtk2' has been renamed to/replaced by 'pinentry-gtk2'"; # Converted to throw 2023-09-10 pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10 pinentry_qt5 = pinentry-qt; # Added 2020-02-11 + PlistCpp = plistcpp; # Added 2024-01-05 poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 @@ -893,8 +914,10 @@ mapAliases ({ rr-unstable = rr; # Added 2022-09-17 rtl8723bs-firmware = throw "rtl8723bs-firmware was added in mainline kernel version 4.12"; # Added 2023-07-03 rtsp-simple-server = throw "rtsp-simple-server is rebranded as mediamtx, including default config path update"; # Added 2023-04-11 + rtx = mise; # Added 2024-01-05 runCommandNoCC = runCommand; runCommandNoCCLocal = runCommandLocal; + rustc-wasm32 = rustc; # Added 2023-12-01 rxvt_unicode = rxvt-unicode-unwrapped; # Added 2020-02-02 rxvt_unicode-with-plugins = rxvt-unicode; # Added 2020-02-02 @@ -1003,6 +1026,7 @@ mapAliases ({ tokodon = plasma5Packages.tokodon; tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 transfig = fig2dev; # Added 2022-02-15 + transifex-client = transifex-cli; # Added 2023-12-29 trezor_agent = trezor-agent; # Added 2024-01-07 trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 @@ -1102,6 +1126,7 @@ mapAliases ({ yacc = bison; # moved from top-level 2021-03-14 yafaray-core = libyafaray; # Added 2022-09-23 yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 + yubikey-manager4 = throw "yubikey-manager4 has been removed, since it is no longer required by yubikey-manager-qt. Please update to yubikey-manager."; # Added 2024-01-14 yuzu-ea = yuzuPackages.early-access; # Added 2022-08-18 yuzu-early-access = yuzuPackages.early-access; # Added 2023-12-29 yuzu = yuzuPackages.mainline; # Added 2021-01-25 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 48e33bb70ba9..43a99e04ea82 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -225,8 +225,6 @@ with pkgs; } ''); - chkservice = callPackage ../tools/admin/chkservice { }; - # addDriverRunpath is the preferred package name, as this enables # many more scenarios than just opengl now. addDriverRunpath = callPackage ../build-support/add-driver-runpath { }; @@ -379,7 +377,7 @@ with pkgs; bloom = qt6Packages.callPackage ../development/tools/bloom { }; - bloodhound-py = callPackage ../tools/security/bloodhound-py { }; + bloodhound-py = with python3Packages; toPythonApplication bloodhound-py; bodyclose = callPackage ../development/tools/bodyclose { }; @@ -849,6 +847,7 @@ with pkgs; octodns-providers = recurseIntoAttrs { bind = python3Packages.callPackage ../tools/networking/octodns/providers/bind { }; + gandi = python3Packages.callPackage ../tools/networking/octodns/providers/gandi { }; hetzner = python3Packages.callPackage ../tools/networking/octodns/providers/hetzner { }; powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { }; }; @@ -1722,8 +1721,6 @@ with pkgs; audible-cli = callPackage ../tools/misc/audible-cli { }; - audiobookshelf = callPackage ../servers/audiobookshelf { }; - auditwheel = with python3Packages; toPythonApplication auditwheel; amidst = callPackage ../tools/games/minecraft/amidst { }; @@ -1759,6 +1756,8 @@ with pkgs; bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; + bonsai = callPackage ../tools/misc/bonsai { }; + cie-middleware-linux = callPackage ../tools/security/cie-middleware-linux { }; cidrgrep = callPackage ../tools/text/cidrgrep { }; @@ -1812,7 +1811,13 @@ with pkgs; }; gamescope = callPackage ../applications/window-managers/gamescope { - wlroots = wlroots_0_16; + enableExecutable = true; + enableWsi = false; + }; + + gamescope-wsi = callPackage ../applications/window-managers/gamescope { + enableExecutable = false; + enableWsi = true; }; gay = callPackage ../tools/misc/gay { }; @@ -2792,7 +2797,7 @@ with pkgs; pcem = callPackage ../applications/emulators/pcem { }; - pcsx2 = qt6Packages.callPackage ../applications/emulators/pcsx2 { }; + pcsx2 = disable-warnings-if-gcc13 (qt6Packages.callPackage ../applications/emulators/pcsx2 { }); pcsxr = callPackage ../applications/emulators/pcsxr { }; @@ -3022,7 +3027,7 @@ with pkgs; ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { - inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; blackbox-terminal = callPackage ../applications/terminal-emulators/blackbox-terminal { }; @@ -3031,6 +3036,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.libs) utmp; inherit (darwin) sigtool; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + catch2 = catch2_3; fmt = fmt_9; }; @@ -3949,8 +3955,6 @@ with pkgs; glyr = callPackage ../tools/audio/glyr { }; - gtklp = callPackage ../tools/misc/gtklp { }; - google-amber = callPackage ../tools/graphics/amber { inherit (darwin) cctools; }; @@ -4404,8 +4408,6 @@ with pkgs; charles4 ; - libquotient = libsForQt5.callPackage ../development/libraries/libquotient { }; - quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; @@ -4442,10 +4444,6 @@ with pkgs; blockdiag = with python3Packages; toPythonApplication blockdiag; - bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; - - bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; - bmon = callPackage ../tools/misc/bmon { }; boca = callPackage ../development/libraries/boca { }; @@ -4780,10 +4778,6 @@ with pkgs; fw-ectool = callPackage ../os-specific/linux/fw-ectool { }; - czkawka = callPackage ../tools/misc/czkawka { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; - chayang = callPackage ../tools/wayland/chayang { }; cherrytree = callPackage ../applications/misc/cherrytree { }; @@ -4854,7 +4848,9 @@ with pkgs; wl-mirror = callPackage ../tools/wayland/wl-mirror { }; - wl-screenrec = callPackage ../tools/wayland/wl-screenrec { }; + wl-screenrec = callPackage ../tools/wayland/wl-screenrec { + ffmpeg = ffmpeg_5; + }; wleave = callPackage ../tools/wayland/wleave { }; @@ -5109,8 +5105,6 @@ with pkgs; disfetch = callPackage ../tools/misc/disfetch { }; - disk-filltest = callPackage ../tools/system/disk-filltest { }; - disk-inventory-x = callPackage ../tools/filesystems/disk-inventory-x { }; diskscan = callPackage ../tools/misc/diskscan { }; @@ -5238,7 +5232,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_27; + electron = electron_28; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -5705,9 +5699,15 @@ with pkgs; hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { }; + hyprlang = callPackage ../by-name/hy/hyprlang/package.nix { + stdenv = gcc13Stdenv; + }; + hyprnome = callPackage ../applications/misc/hyprnome { }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { + stdenv = gcc13Stdenv; + }; hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { wlroots = wlroots_0_16; @@ -5731,8 +5731,6 @@ with pkgs; ifm = callPackage ../tools/graphics/ifm { }; - iina = callPackage ../applications/video/iina { }; - ink = callPackage ../tools/misc/ink { }; inklecate = callPackage ../development/compilers/inklecate { }; @@ -6186,7 +6184,6 @@ with pkgs; optar = callPackage ../tools/graphics/optar { }; - oni2 = callPackage ../applications/editors/oni2 { }; obinskit = callPackage ../applications/misc/obinskit { }; @@ -7011,7 +7008,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Security CoreServices SystemConfiguration; }; - gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; }; + gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { }; kime = callPackage ../tools/inputmethods/kime { }; @@ -7323,15 +7320,13 @@ with pkgs; cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaVersion = "12.1"; }; cudaPackages_12_2 = callPackage ./cuda-packages.nix { cudaVersion = "12.2"; }; cudaPackages_12_3 = callPackage ./cuda-packages.nix { cudaVersion = "12.3"; }; - cudaPackages_12 = recurseIntoAttrs cudaPackages_12_0; + cudaPackages_12 = cudaPackages_12_2; # Latest supported by cudnn # Use the older cudaPackages for tensorflow and jax, as determined by cudnn # compatibility: https://www.tensorflow.org/install/source#gpu cudaPackagesGoogle = cudaPackages_11; - # TODO: try upgrading once there is a cuDNN release supporting CUDA 12. No - # such cuDNN release as of 2023-01-10. - cudaPackages = cudaPackages_11; + cudaPackages = recurseIntoAttrs cudaPackages_12; # TODO: move to alias cudatoolkit = cudaPackages.cudatoolkit; @@ -7362,8 +7357,11 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }; - inherit (curl-impersonate) curl-impersonate-ff curl-impersonate-chrome; + curl-impersonate = + builtins.mapAttrs (_: pin-to-gcc12-if-gcc13) + (darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { }); + curl-impersonate-ff = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-ff; + curl-impersonate-chrom = pin-to-gcc12-if-gcc13 curl-impersonate.curl-impersonate-chrome; curlie = callPackage ../tools/networking/curlie { }; @@ -7946,7 +7944,7 @@ with pkgs; efibootmgr = callPackage ../tools/system/efibootmgr { }; - efivar = callPackage ../tools/system/efivar { }; + efivar = disable-warnings-if-gcc13 (callPackage ../tools/system/efivar { }); eget = callPackage ../tools/misc/eget { }; @@ -8476,8 +8474,6 @@ with pkgs; garage_0_8 garage_0_9 garage_0_8_4 garage_0_9_0; - garmin-plugin = callPackage ../applications/misc/garmin-plugin { }; - garmintools = callPackage ../development/libraries/garmintools { }; gau = callPackage ../tools/security/gau { }; @@ -8563,7 +8559,9 @@ with pkgs; gifsicle = callPackage ../tools/graphics/gifsicle { }; - gifski = callPackage ../tools/graphics/gifski { }; + gifski = callPackage ../tools/graphics/gifski { + ffmpeg = ffmpeg_5; + }; github-backup = callPackage ../tools/misc/github-backup { }; @@ -8791,7 +8789,7 @@ with pkgs; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; - google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + google-cloud-cpp = disable-warnings-if-gcc13 (callPackage ../development/libraries/google-cloud-cpp { }); google-java-format = callPackage ../development/tools/google-java-format { }; @@ -8992,6 +8990,8 @@ with pkgs; gtdialog = callPackage ../development/libraries/gtdialog { }; + gtkclipblock = callPackage ../by-name/gt/gtkclipblock/package.nix { stdenv = gcc13Stdenv; }; + gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; }; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; @@ -9377,8 +9377,6 @@ with pkgs; irods irods-icommands; - ignite = callPackage ../applications/virtualization/ignite { }; - igmpproxy = callPackage ../tools/networking/igmpproxy { }; ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { @@ -9439,7 +9437,7 @@ with pkgs; inql = callPackage ../tools/security/inql { }; - intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; + intel-media-sdk = disable-warnings-if-gcc13 (callPackage ../development/libraries/intel-media-sdk { }); intermodal = callPackage ../tools/misc/intermodal { }; @@ -9858,8 +9856,6 @@ with pkgs; krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; - kpcli = callPackage ../tools/security/kpcli { }; kphotoalbum = libsForQt5.callPackage ../applications/graphics/kphotoalbum { }; @@ -10273,6 +10269,8 @@ with pkgs; ncrack = callPackage ../tools/security/ncrack { }; + netexec = python3Packages.callPackage ../tools/security/netexec { }; + nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; netdata = callPackage ../tools/system/netdata { @@ -10686,8 +10684,6 @@ with pkgs; # former a lower priority than Nettle. lsh = lowPrio (callPackage ../tools/networking/lsh { }); - lshw = callPackage ../tools/system/lshw { }; - lunatic = callPackage ../development/interpreters/lunatic { }; lux = callPackage ../tools/video/lux { }; @@ -10889,6 +10885,8 @@ with pkgs; miniupnpd = callPackage ../tools/networking/miniupnpd { }; + miniupnpd-nftables = callPackage ../tools/networking/miniupnpd { firewall = "nftables"; }; + miniball = callPackage ../development/libraries/miniball { }; minijail = callPackage ../tools/system/minijail { }; @@ -11027,7 +11025,7 @@ with pkgs; muffet = callPackage ../tools/networking/muffet { }; - multipass = libsForQt5.callPackage ../tools/virtualization/multipass { }; + multipass = qt6Packages.callPackage ../tools/virtualization/multipass { }; multitime = callPackage ../tools/misc/multitime { }; @@ -11141,7 +11139,11 @@ with pkgs; netbox2netshot = callPackage ../tools/admin/netbox2netshot { }; - netcat = libressl.nc; + netcat = libressl.nc.overrideAttrs (old: { + meta = old.meta // { + mainProgram = "nc"; + }; + }); netcat-gnu = callPackage ../tools/networking/netcat { }; @@ -11587,7 +11589,7 @@ with pkgs; open-ecard = callPackage ../tools/security/open-ecard { }; - open-interpreter = callPackage ../tools/llm/open-interpreter { }; + open-interpreter = with python3Packages; toPythonApplication open-interpreter; openjade = callPackage ../tools/text/sgml/openjade { }; @@ -12505,10 +12507,6 @@ with pkgs; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; - qgrep = callPackage ../tools/text/qgrep { - inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; - }; - qhull = callPackage ../development/libraries/qhull { }; qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; @@ -13372,8 +13370,6 @@ with pkgs; sqlboiler = callPackage ../development/tools/sqlboiler { }; - ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; - sshed = callPackage ../tools/networking/sshed { }; sshguard = callPackage ../tools/security/sshguard { }; @@ -13695,8 +13691,6 @@ with pkgs; squeekboard = callPackage ../applications/accessibility/squeekboard { }; - sx = callPackage ../tools/X11/sx { }; - systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; t = callPackage ../tools/misc/t { }; @@ -13732,8 +13726,6 @@ with pkgs; target-isns = callPackage ../os-specific/linux/target-isns { }; - tarlz = callPackage ../tools/archivers/tarlz { }; - tarsnap = callPackage ../tools/backup/tarsnap { }; tarsnapper = callPackage ../tools/backup/tarsnapper { }; @@ -14087,8 +14079,6 @@ with pkgs; tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { }; - transifex-client = python39.pkgs.callPackage ../tools/text/transifex-client { }; - transifex-cli = callPackage ../applications/misc/transifex-cli { }; translatelocally = callPackage ../applications/misc/translatelocally { }; @@ -15423,8 +15413,6 @@ with pkgs; oksh = callPackage ../shells/oksh { }; - loksh = callPackage ../shells/loksh { }; - scponly = callPackage ../shells/scponly { }; rush = callPackage ../shells/rush { }; @@ -15531,7 +15519,7 @@ with pkgs; asciigraph = callPackage ../tools/text/asciigraph { }; autocorrect = callPackage ../tools/text/autocorrect { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; as31 = callPackage ../development/compilers/as31 { }; @@ -15626,7 +15614,6 @@ with pkgs; }; clang = llvmPackages.clang; - clang_6 = llvmPackages_6.clang; clang_8 = llvmPackages_8.clang; clang_9 = llvmPackages_9.clang; clang_10 = llvmPackages_10.clang; @@ -15640,10 +15627,6 @@ with pkgs; clang-tools = callPackage ../development/tools/clang-tools { }; - clang-tools_6 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_6; - }; - clang-tools_8 = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_8; }; @@ -15807,10 +15790,10 @@ with pkgs; fluidd = callPackage ../applications/misc/fluidd { }; - flutterPackages = - recurseIntoAttrs (callPackage ../development/compilers/flutter { }); - flutter-unwrapped = flutterPackages.stable; - flutter = flutterPackages.wrapFlutter flutter-unwrapped; + flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); + flutter = flutterPackages.stable; + flutter316 = flutterPackages.v3_16; + flutter313 = flutterPackages.v3_13; fnm = callPackage ../development/tools/fnm { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; @@ -15835,11 +15818,30 @@ with pkgs; default-gcc-version = if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6 - else 12; + else if stdenv.buildPlatform.isDarwin then 12 # unable to test + else if stdenv.buildPlatform.isAarch64 then 12 # unable to test + else 13; gcc = pkgs.${"gcc${toString default-gcc-version}"}; gccFun = callPackage ../development/compilers/gcc; gcc-unwrapped = gcc.cc; + disable-warnings-if-gcc13 = pkg: + if (pkg.stdenv.cc.cc.isGNU or false && lib.versionAtLeast pkg.stdenv.cc.cc.version "13.0") + then pkg.overrideAttrs(previousAttrs: previousAttrs // { + env = previousAttrs.env or {} // { + NIX_CFLAGS_COMPILE = (previousAttrs.env.NIX_CFLAGS_COMPILE or "") + " -Wno-error"; + }; + }) + else pkg; + + pin-to-gcc12-if-gcc13 = pkg: + if !(lib.isDerivation pkg) || !(pkg?override) then pkg else + pkg.override (previousArgs: + lib.optionalAttrs (previousArgs.stdenv.cc.cc.isGNU or false && + lib.versionAtLeast previousArgs.stdenv.cc.cc.version "13.0") { + stdenv = gcc12Stdenv; + }); + wrapNonDeterministicGcc = stdenv: ccWrapper: if ccWrapper.isGNU then ccWrapper.overrideAttrs(old: { env = old.env // { @@ -16199,8 +16201,6 @@ with pkgs; inherit (llvmPackages_15) llvm; }; - gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 { }; gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 { }; gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 { }; @@ -16315,12 +16315,12 @@ with pkgs; inherit (callPackage ../development/compilers/haxe { inherit (darwin.apple_sdk.frameworks) Security; }) - haxe_4_2 + haxe_4_3 haxe_4_1 haxe_4_0 ; - haxe = haxe_4_2; + haxe = haxe_4_3; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); inherit (haxePackages) hxcpp; @@ -16381,7 +16381,9 @@ with pkgs; idris = idrisPackages.with-packages [ idrisPackages.base ] ; - idris2 = callPackage ../development/compilers/idris2 { }; + idris2Packages = recurseIntoAttrs (callPackage ../development/compilers/idris2 { }); + + inherit (idris2Packages) idris2; inherit (callPackage ../development/tools/database/indradb { }) indradb-server @@ -16408,7 +16410,7 @@ with pkgs; hugs = callPackage ../development/interpreters/hugs { }; inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21; - openjfx = openjfx17; + openjfx = pin-to-gcc12-if-gcc13 (openjfx17.override { }); openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; @@ -16515,17 +16517,17 @@ with pkgs; inherit (callPackage ../development/compilers/julia { }) julia_16-bin - julia_18-bin julia_19-bin - julia_18 - julia_19; + julia_110-bin + julia_19 + julia_110; julia-lts = julia_16-bin; - julia-stable = julia_19; + julia-stable = julia_110; julia = julia-stable; julia-lts-bin = julia_16-bin; - julia-stable-bin = julia_19-bin; + julia-stable-bin = julia_110-bin; julia-bin = julia-stable-bin; jwasm = callPackage ../development/compilers/jwasm { }; @@ -16582,7 +16584,6 @@ with pkgs; }; lld = llvmPackages.lld; - lld_6 = llvmPackages_6.lld; lld_8 = llvmPackages_8.lld; lld_9 = llvmPackages_9.lld; lld_10 = llvmPackages_10.lld; @@ -16595,7 +16596,6 @@ with pkgs; lld_17 = llvmPackages_17.lld; lldb = llvmPackages.lldb; - lldb_6 = llvmPackages_6.lldb; lldb_8 = llvmPackages_8.lldb; lldb_9 = llvmPackages_9.lldb; lldb_10 = llvmPackages_10.lldb; @@ -16608,7 +16608,6 @@ with pkgs; lldb_17 = llvmPackages_17.lldb; llvm = llvmPackages.llvm; - llvm_6 = llvmPackages_6.llvm; llvm_8 = llvmPackages_8.llvm; llvm_9 = llvmPackages_9.llvm; llvm_10 = llvmPackages_10.llvm; @@ -16640,18 +16639,12 @@ with pkgs; stdenv.targetPlatform)); in pkgs.${"llvmPackages_${minSupported}"}; - llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 { - inherit (stdenvAdapters) overrideCC; - buildLlvmTools = buildPackages.llvmPackages_6.tools; - targetLlvm = targetPackages.llvmPackages_6.llvm or llvmPackages_6.llvm; - targetLlvmLibraries = targetPackages.llvmPackages_6.libraries or llvmPackages_6.libraries; - }); - llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvm = targetPackages.llvmPackages_8.llvm or llvmPackages_8.llvm; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries or llvmPackages_8.libraries; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 }); llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 { @@ -16659,6 +16652,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_9.tools; targetLlvm = targetPackages.llvmPackages_9.llvm or llvmPackages_9.llvm; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries or llvmPackages_9.libraries; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 }); llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 { @@ -16666,6 +16660,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_10.tools; targetLlvm = targetPackages.llvmPackages_10.llvm or llvmPackages_10.llvm; targetLlvmLibraries = targetPackages.llvmPackages_10.libraries or llvmPackages_10.libraries; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 }); llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({ @@ -16687,6 +16682,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_13.tools; targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries; targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 })); llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({ @@ -16694,6 +16690,7 @@ with pkgs; buildLlvmTools = buildPackages.llvmPackages_14.tools; targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; + stdenv = if stdenv.cc.cc.isGNU or false then gcc12Stdenv else stdenv; # does not build with gcc13 })); llvmPackages_15 = recurseIntoAttrs (callPackage ../development/compilers/llvm/15 ({ @@ -16735,7 +16732,7 @@ with pkgs; minimacy = callPackage ../development/compilers/minimacy { }; - mint = callPackage ../development/compilers/mint { crystal = crystal_1_2; }; + mint = callPackage ../development/compilers/mint { crystal = crystal_1_9; }; mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { }; @@ -16906,11 +16903,11 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_74 = callPackage ../development/compilers/rust/1_74.nix { + rust_1_75 = callPackage ../development/compilers/rust/1_75.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_16 = llvmPackages_16.libllvm; + llvm_17 = llvmPackages_17.libllvm; }; - rust = rust_1_74; + rust = rust_1_75; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16918,24 +16915,11 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_74 = rust_1_74.packages.stable; - rustPackages = rustPackages_1_74; + rustPackages_1_75 = rust_1_75.packages.stable; + rustPackages = rustPackages_1_75; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; - # https://github.com/NixOS/nixpkgs/issues/89426 - rustc-wasm32 = wrapRustc ((rustc.unwrapped.override { - stdenv = stdenv.override { - targetPlatform = lib.systems.elaborate { - # lib.systems.elaborate won't recognize "unknown" as the last component. - config = "wasm32-unknown-wasi"; - rust.rustcTarget = "wasm32-unknown-unknown"; - }; - }; - }).overrideAttrs (old: { - configureFlags = old.configureFlags ++ ["--set=build.docs=false"]; - })); - makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; @@ -17894,9 +17878,9 @@ with pkgs; python27Packages = python27.pkgs // { __attrsFailEvaluation = true; }; python38Packages = python38.pkgs // { __attrsFailEvaluation = true; }; python39Packages = python39.pkgs // { __attrsFailEvaluation = true; }; - python310Packages = recurseIntoAttrs python310.pkgs // { pythonPackages = python310.pkgs // { __attrsFailEvaluation = true; }; }; + python310Packages = python310.pkgs // { __attrsFailEvaluation = true; }; python311Packages = recurseIntoAttrs python311.pkgs // { pythonPackages = python311.pkgs // { __attrsFailEvaluation = true; }; }; - python312Packages = python312.pkgs // { __attrsFailEvaluation = true; }; + python312Packages = recurseIntoAttrs python312.pkgs // { pythonPackages = python312.pkgs // { __attrsFailEvaluation = true; }; }; python313Packages = python313.pkgs // { __attrsFailEvaluation = true; }; pypyPackages = pypy.pkgs // { __attrsFailEvaluation = true; }; pypy2Packages = pypy2.pkgs // { __attrsFailEvaluation = true; }; @@ -18208,8 +18192,6 @@ with pkgs; rappel = callPackage ../development/misc/rappel { }; - pharo = callPackage ../development/pharo { }; - protege-distribution = callPackage ../development/web/protege-distribution { }; publii = callPackage ../development/web/publii {}; @@ -18232,7 +18214,7 @@ with pkgs; asdf-vm = callPackage ../tools/misc/asdf-vm { }; - rtx = callPackage ../tools/misc/rtx { + mise = callPackage ../tools/misc/mise { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -18271,20 +18253,20 @@ with pkgs; autoadb = callPackage ../misc/autoadb { }; - ansible = ansible_2_15; - ansible_2_15 = python3Packages.toPythonApplication python3Packages.ansible-core; - ansible_2_14 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.14.13"; + ansible = ansible_2_16; + ansible_2_16 = python3Packages.toPythonApplication python3Packages.ansible-core; + ansible_2_15 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.15.5"; src = oldAttrs.src.override { inherit version; - hash = "sha256-ThuzNPDDImq0jFme/knNX+A/JdRVi8BsJ0reK6PiV2o="; + hash = "sha256-jMU5y41DSa8//ZAccHIvenogOuZCfdrJX/31RqbkFgI="; }; })); - ansible_2_13 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { - version = "2.13.10"; + ansible_2_14 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec { + version = "2.14.13"; src = oldAttrs.src.override { inherit version; - hash = "sha256-1LQKSq+GDe9sLJ6K1SAfhoPj59fY4hRjxtWepPixLfc="; + hash = "sha256-ThuzNPDDImq0jFme/knNX+A/JdRVi8BsJ0reK6PiV2o="; }; })); @@ -18531,16 +18513,16 @@ with pkgs; bazel_self = bazel_4; }; - bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { + bazel_5 = pin-to-gcc12-if-gcc13 (callPackage ../development/tools/build-managers/bazel/bazel_5 { inherit (darwin) cctools sigtool; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; bazel_self = bazel_5; - }; + }); - bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { + bazel_6 = pin-to-gcc12-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { inherit (darwin) cctools; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; @@ -18549,7 +18531,7 @@ with pkgs; darwin.apple_sdk_11_0.stdenv else if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; bazel_self = bazel_6; - }; + }); bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 { inherit (darwin) cctools sigtool; @@ -19203,8 +19185,6 @@ with pkgs; funzzy = callPackage ../development/tools/misc/funzzy { }; - futuresql = libsForQt5.callPackage ../development/libraries/futuresql { }; - fzf-make = callPackage ../development/tools/misc/fzf-make { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; @@ -19707,7 +19687,7 @@ with pkgs; openai-whisper = with python3.pkgs; toPythonApplication openai-whisper; openai-whisper-cpp = darwin.apple_sdk_11_0.callPackage ../tools/audio/openai-whisper-cpp { - inherit (darwin.apple_sdk_11_0.frameworks) Accelerate CoreGraphics CoreML CoreVideo; + inherit (darwin.apple_sdk_11_0.frameworks) Accelerate CoreGraphics CoreML CoreVideo MetalKit; }; opengrok = callPackage ../development/tools/misc/opengrok { }; @@ -20488,6 +20468,8 @@ with pkgs; adslib = callPackage ../development/libraries/adslib { }; + aemu = callPackage ../development/libraries/aemu { }; + afflib = callPackage ../development/libraries/afflib { }; aften = callPackage ../development/libraries/aften { }; @@ -20652,10 +20634,6 @@ with pkgs; bencodetools = callPackage ../development/libraries/bencodetools { }; - beignet = callPackage ../development/libraries/beignet { - inherit (llvmPackages_6) libllvm libclang; - }; - belle-sip = callPackage ../development/libraries/belle-sip { }; @@ -20669,7 +20647,7 @@ with pkgs; else callPackage ../os-specific/linux/bionic-prebuilt { }; - bobcat = callPackage ../development/libraries/bobcat { }; + bobcat = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/bobcat { }); boehmgc = callPackage ../development/libraries/boehm-gc { }; @@ -20684,6 +20662,7 @@ with pkgs; boost181 boost182 boost183 + boost184 ; boost = boost181; @@ -20724,9 +20703,7 @@ with pkgs; c-blosc = callPackage ../development/libraries/c-blosc { }; - # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 - # ghc94: https://discourse.haskell.org/t/facing-mmap-4096-bytes-at-nil-cannot-allocate-memory-youre-not-alone/6259 - cachix = haskell.lib.justStaticExecutables haskell.packages.ghc94.cachix; + cachix = lib.getBin haskellPackages.cachix; calcium = callPackage ../development/libraries/calcium { }; @@ -20954,7 +20931,7 @@ with pkgs; crocoddyl = callPackage ../development/libraries/crocoddyl { }; - crossguid = callPackage ../development/libraries/crossguid { }; + crossguid = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/crossguid { }); cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -21068,7 +21045,6 @@ with pkgs; mesa libvdpau-va-gl vaapiVdpau - beignet glxinfo vdpauinfo; }; @@ -21460,6 +21436,8 @@ with pkgs; gf2x = callPackage ../development/libraries/gf2x { }; + gfxstream = callPackage ../development/libraries/gfxstream { }; + gd = callPackage ../development/libraries/gd { automake = automake115x; }; @@ -21577,10 +21555,7 @@ with pkgs; mtrace = callPackage ../development/libraries/glibc/mtrace.nix { }; # Provided by libc on Operating Systems that use the Extensible Linker Format. - elf-header = - if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" - then null - else elf-header-real; + elf-header = if stdenv.hostPlatform.isElf then null else elf-header-real; elf-header-real = callPackage ../development/libraries/elf-header { }; @@ -22190,8 +22165,6 @@ with pkgs; ip2location-c = callPackage ../development/libraries/ip2location-c { }; - iir1 = callPackage ../development/libraries/iir1 { }; - irrlicht = if !stdenv.isDarwin then callPackage ../development/libraries/irrlicht { } else callPackage ../development/libraries/irrlicht/mac.nix { @@ -22284,6 +22257,11 @@ with pkgs; libjson = callPackage ../development/libraries/libjson { }; + libjodycode = callPackage ../development/libraries/libjodycode { + # missing aligned_alloc() + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; + libb64 = callPackage ../development/libraries/libb64 { }; judy = callPackage ../development/libraries/judy { }; @@ -22457,9 +22435,7 @@ with pkgs; libavif = callPackage ../development/libraries/libavif { }; - libayatana-common = callPackage ../development/libraries/libayatana-common { - inherit (lomiri) cmake-extras; - }; + libayatana-common = callPackage ../development/libraries/libayatana-common { }; libb2 = callPackage ../development/libraries/libb2 { }; @@ -22702,7 +22678,7 @@ with pkgs; dwarfdump = libdwarf.bin; libdwarf_20210528 = callPackage ../development/libraries/libdwarf/20210528.nix { }; - libe57format = callPackage ../development/libraries/libe57format { }; + libe57format = disable-warnings-if-gcc13 (callPackage ../development/libraries/libe57format { }); libeatmydata = callPackage ../development/libraries/libeatmydata { }; @@ -22730,9 +22706,11 @@ with pkgs; libfido2 = callPackage ../development/libraries/libfido2 {}; - libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { - inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; - }; + libfilezilla = + pin-to-gcc12-if-gcc13 + (darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { + inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; + }); libfishsound = callPackage ../development/libraries/libfishsound { }; @@ -23624,7 +23602,10 @@ with pkgs; libuldaq = callPackage ../development/libraries/libuldaq { }; - libunicode = callPackage ../development/libraries/libunicode { fmt = fmt_8; }; + libunicode = callPackage ../development/libraries/libunicode { + catch2 = catch2_3; + fmt = fmt_9; + }; libunwind = if stdenv.isDarwin then darwin.libunwind @@ -23905,7 +23886,7 @@ with pkgs; mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; - memorymapping = callPackage ../development/libraries/memorymapping { }; + memorymapping = disable-warnings-if-gcc13 (callPackage ../development/libraries/memorymapping { }); memorymappingHook = makeSetupHook { name = "memorymapping-hook"; propagatedBuildInputs = [ memorymapping ]; @@ -24068,6 +24049,8 @@ with pkgs; ch4backend = libfabric; }; + mpich-pmix = mpich.override { pmixSupport = true; withPm = [ ]; }; + mstpd = callPackage ../os-specific/linux/mstpd { }; mtdev = callPackage ../development/libraries/mtdev { }; @@ -24202,31 +24185,13 @@ with pkgs; nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { }; nv-codec-headers-12 = callPackage ../development/libraries/nv-codec-headers/12_x.nix { }; - mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: - let - nvidia-container-toolkit = callPackage ../applications/virtualization/nvidia-container-toolkit { - inherit containerRuntimePath configTemplate; - }; - in symlinkJoin { - inherit name; - paths = [ - libnvidia-container - nvidia-container-toolkit - ] ++ additionalPaths; - }; - - nvidia-docker = mkNvidiaContainerPkg { - name = "nvidia-docker"; - containerRuntimePath = "${docker}/libexec/docker/runc"; - configTemplate = ../applications/virtualization/nvidia-docker/config.toml; - additionalPaths = [ (callPackage ../applications/virtualization/nvidia-docker { }) ]; - }; - - nvidia-podman = mkNvidiaContainerPkg { - name = "nvidia-podman"; - containerRuntimePath = "${runc}/bin/runc"; - configTemplate = ../applications/virtualization/nvidia-podman/config.toml; - }; + nvidiaCtkPackages = + callPackage ../applications/virtualization/nvidia-container-toolkit/packages.nix + { }; + inherit (nvidiaCtkPackages) + nvidia-docker + nvidia-podman + ; nvidia-vaapi-driver = lib.hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { }); @@ -24310,7 +24275,7 @@ with pkgs; opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; - opencollada = callPackage ../development/libraries/opencollada { }; + opencollada = disable-warnings-if-gcc13 (callPackage ../development/libraries/opencollada { }); opencore-amr = callPackage ../development/libraries/opencore-amr { }; @@ -24406,7 +24371,7 @@ with pkgs; libressl = libressl_3_8; - boringssl = callPackage ../development/libraries/boringssl { }; + boringssl = disable-warnings-if-gcc13 (callPackage ../development/libraries/boringssl { }); wolfssl = darwin.apple_sdk_11_0.callPackage ../development/libraries/wolfssl { inherit (darwin.apple_sdk_11_0.frameworks) Security; @@ -24564,9 +24529,9 @@ with pkgs; primesieve = callPackage ../applications/science/math/primesieve { }; - proj = callPackage ../development/libraries/proj { + proj = disable-warnings-if-gcc13 (callPackage ../development/libraries/proj { stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; - }; + }); proj_7 = callPackage ../development/libraries/proj/7.nix { }; @@ -24618,10 +24583,16 @@ with pkgs; pylode = callPackage ../misc/pylode { }; - python-qt = callPackage ../development/libraries/python-qt { + python-qt = (callPackage ../development/libraries/python-qt { python = python3; - inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; - }; + inherit (builtins.mapAttrs (_: pkg: pkg.override (previousArgs: lib.optionalAttrs (previousArgs ? stdenv) { stdenv = gcc12Stdenv; })) qt5) + qmake qttools qtwebengine qtxmlpatterns; + stdenv = gcc12Stdenv; + }) + .overrideAttrs(previousAttrs: { + NIX_CFLAGS_COMPILE = "-w"; + meta = previousAttrs.meta // { broken = true; }; + }); pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; @@ -24806,7 +24777,7 @@ with pkgs; rlottie = callPackage ../development/libraries/rlottie { }; - rocksdb = callPackage ../development/libraries/rocksdb { }; + rocksdb = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/rocksdb { }); rocksdb_7_10 = rocksdb.overrideAttrs rec { pname = "rocksdb"; @@ -24852,6 +24823,8 @@ with pkgs; rubberband = callPackage ../development/libraries/rubberband { }; + rutabaga_gfx = callPackage ../development/libraries/rutabaga_gfx { }; + rure = callPackage ../development/libraries/rure { }; rustc-demangle = callPackage ../development/libraries/rustc-demangle { }; @@ -24915,9 +24888,22 @@ with pkgs; SDL2_image = callPackage ../development/libraries/SDL2_image { inherit (darwin.apple_sdk.frameworks) Foundation; }; - SDL2_image_2_0_5 = SDL2_image.override({ # Pinned for pygame, toppler + # Pinned for pygame, toppler + SDL2_image_2_0 = SDL2_image.overrideAttrs (oldAttrs: { version = "2.0.5"; - hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; + src = fetchurl { + inherit (oldAttrs.src) url; + hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; + }; + }); + # Pinned for hedgewars: + # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 + SDL2_image_2_6 = SDL2_image.overrideAttrs (oldAttrs: { + version = "2.6.3"; + src = fetchurl { + inherit (oldAttrs.src) url; + hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw="; + }; }); SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { @@ -24938,9 +24924,9 @@ with pkgs; sdrplay = callPackage ../applications/radio/sdrplay { }; - sdrpp = callPackage ../applications/radio/sdrpp { + sdrpp = pin-to-gcc12-if-gcc13 (callPackage ../applications/radio/sdrpp { inherit (darwin.apple_sdk.frameworks) AppKit; - }; + }); sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { }; @@ -25350,8 +25336,6 @@ with pkgs; tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { }; - tinyxml-2 = callPackage ../development/libraries/tinyxml-2 { }; - tiscamera = callPackage ../os-specific/linux/tiscamera { }; tivodecode = callPackage ../applications/video/tivodecode { }; @@ -25441,7 +25425,7 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; - v8 = callPackage ../development/libraries/v8 ( + v8 = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/v8 ( let stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16" then overrideLibcxx llvmPackages_15.stdenv @@ -25450,7 +25434,7 @@ with pkgs; { stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; } - ); + )); intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; @@ -25629,6 +25613,7 @@ with pkgs; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK32; + stdenv = gcc12Stdenv; }; wtk = callPackage ../development/libraries/wtk { }; @@ -25718,7 +25703,6 @@ with pkgs; yubihsm-connector = callPackage ../tools/security/yubihsm-connector { }; - yubikey-manager4 = callPackage ../tools/misc/yubikey-manager/4.nix { }; yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { }; @@ -26349,11 +26333,11 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; }; - envoy = callPackage ../servers/http/envoy { + envoy = pin-to-gcc12-if-gcc13 (callPackage ../servers/http/envoy { go = go_1_20; jdk = openjdk11_headless; gn = gn1924; - }; + }); ergochat = callPackage ../servers/irc/ergochat { }; @@ -26809,7 +26793,7 @@ with pkgs; openxr-loader = callPackage ../development/libraries/openxr-loader { }; - osrm-backend = callPackage ../servers/osrm-backend { }; + osrm-backend = disable-warnings-if-gcc13 (callPackage ../servers/osrm-backend { }); oven-media-engine = callPackage ../servers/misc/oven-media-engine { }; @@ -27266,9 +27250,9 @@ with pkgs; protobuf = protobuf_21; }; - rippled = callPackage ../servers/rippled { + rippled = disable-warnings-if-gcc13 (callPackage ../servers/rippled { boost = boost177; - }; + }); rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { }; @@ -27733,10 +27717,6 @@ with pkgs; inherit (pkgs) meson; }; - cpuset = callPackage ../os-specific/linux/cpuset { - pythonPackages = python3Packages; - }; - criu = callPackage ../os-specific/linux/criu { }; cryptomator = callPackage ../tools/security/cryptomator { @@ -27910,9 +27890,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { - stdenv = gcc12Stdenv; - }; + btop = disable-warnings-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../tools/system/btop { }); nmon = callPackage ../os-specific/linux/nmon { }; @@ -27943,16 +27921,16 @@ with pkgs; iproute2 = callPackage ../os-specific/linux/iproute { }; - ipu6-camera-bin = callPackage ../os-specific/linux/firmware/ipu6-camera-bins {}; + ipu6-camera-bins = callPackage ../os-specific/linux/firmware/ipu6-camera-bins {}; ipu6-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {}; - ipu6ep-camera-bin = callPackage ../os-specific/linux/firmware/ipu6-camera-bins { + ipu6ep-camera-hal = callPackage ../development/libraries/ipu6-camera-hal { ipuVersion = "ipu6ep"; }; - ipu6ep-camera-hal = callPackage ../development/libraries/ipu6-camera-hal { - ipu6-camera-bin = ipu6ep-camera-bin; + ipu6epmtl-camera-hal = callPackage ../development/libraries/ipu6-camera-hal { + ipuVersion = "ipu6epmtl"; }; ivsc-firmware = callPackage ../os-specific/linux/firmware/ivsc-firmware { }; @@ -28147,7 +28125,9 @@ with pkgs; # zen-kernel linuxPackages_zen = linuxKernel.packages.linux_zen; + linux_zen = linuxPackages_zen.kernel; linuxPackages_lqx = linuxKernel.packages.linux_lqx; + linux_lqx = linuxPackages_lqx.kernel; # XanMod kernel linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; @@ -29745,6 +29725,8 @@ with pkgs; office-code-pro = callPackage ../data/fonts/office-code-pro { }; + _0xproto = callPackage ../data/fonts/0xproto { }; + oldstandard = callPackage ../data/fonts/oldstandard { }; oldsindhi = callPackage ../data/fonts/oldsindhi { }; @@ -30876,7 +30858,7 @@ with pkgs; clapper = callPackage ../applications/video/clapper { }; - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { }; + claws-mail = disable-warnings-if-gcc13 (callPackage ../applications/networking/mailreaders/claws-mail { }); cligh = python3Packages.callPackage ../development/tools/github/cligh { }; @@ -30977,8 +30959,6 @@ with pkgs; cordless = callPackage ../applications/networking/instant-messengers/cordless { }; - cosmic-settings = callPackage ../applications/window-managers/cosmic/settings { }; - coursera-dl = callPackage ../applications/misc/coursera-dl { }; coyim = callPackage ../applications/networking/instant-messengers/coyim { }; @@ -31380,6 +31360,10 @@ with pkgs; espeakup = callPackage ../applications/accessibility/espeakup { }; + espflash = callPackage ../development/embedded/espflash { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + etebase-server = with python3Packages; toPythonApplication etebase-server; etesync-dav = callPackage ../applications/misc/etesync-dav { }; @@ -31579,8 +31563,6 @@ 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 { }; @@ -31694,12 +31676,12 @@ with pkgs; }; }; }; - gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { + gnuradio3_8 = disable-warnings-if-gcc13 (callPackage ../applications/radio/gnuradio/wrapper.nix { unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { inherit (darwin.apple_sdk.frameworks) CoreAudio; python = python3; }; - }; + }); gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. @@ -31744,7 +31726,7 @@ with pkgs; gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; - inherit (ocaml-ng.ocamlPackages_4_12) google-drive-ocamlfuse; + inherit (ocamlPackages) google-drive-ocamlfuse; googler = callPackage ../applications/misc/googler { python = python3; @@ -32031,6 +32013,8 @@ with pkgs; xrdp = callPackage ../applications/networking/remote/xrdp { }; + pulseaudio-module-xrdp = callPackage ../applications/networking/remote/xrdp/pulseaudio-module-xrdp { }; + freerdp = callPackage ../applications/networking/remote/freerdp { inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; @@ -33109,6 +33093,8 @@ with pkgs; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; + kubevela = callPackage ../applications/networking/cluster/kubevela { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { }; kubectl-convert = kubectl.convert; @@ -33550,8 +33536,6 @@ with pkgs; mbrola = callPackage ../applications/audio/mbrola { }; - mcomix = callPackage ../applications/graphics/mcomix { }; - mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; @@ -34139,10 +34123,6 @@ with pkgs; jre = openjdk17; }; - prevo = callPackage ../applications/misc/prevo { }; - prevo-data = callPackage ../applications/misc/prevo/data.nix { }; - prevo-tools = callPackage ../applications/misc/prevo/tools.nix { }; - psi-notify = callPackage ../applications/misc/psi-notify { }; ptex = callPackage ../development/libraries/ptex { }; @@ -34210,7 +34190,7 @@ with pkgs; rep-gtk = callPackage ../development/libraries/rep-gtk { }; - reproc = callPackage ../development/libraries/reproc { }; + reproc = disable-warnings-if-gcc13 (callPackage ../development/libraries/reproc { }); sawfish = callPackage ../applications/window-managers/sawfish { }; @@ -34297,8 +34277,6 @@ with pkgs; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; - ncdc = callPackage ../applications/networking/p2p/ncdc { }; - ncspot = callPackage ../applications/audio/ncspot { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -34363,7 +34341,7 @@ with pkgs; obs-cli = callPackage ../applications/misc/obs-cli { }; obs-studio = qt6Packages.callPackage ../applications/video/obs-studio { - ffmpeg_4 = ffmpeg-full; + ffmpeg = ffmpeg-full; }; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); @@ -34577,9 +34555,7 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - jpsxdec = callPackage ../tools/games/jpsxdec { - jdk = openjdk8; - }; + jpsxdec = callPackage ../tools/games/jpsxdec { }; pdfslicer = callPackage ../applications/misc/pdfslicer { }; @@ -34701,6 +34677,8 @@ with pkgs; plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); + plugdata = callPackage ../applications/audio/plugdata { }; + plugin-torture = callPackage ../applications/audio/plugin-torture { }; poke = callPackage ../applications/editors/poke { }; @@ -35262,7 +35240,7 @@ with pkgs; spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { }; - spike = callPackage ../applications/virtualization/spike { }; + spike = pin-to-gcc12-if-gcc13 (callPackage ../applications/virtualization/spike { }); tensorman = callPackage ../tools/misc/tensorman { }; @@ -35374,12 +35352,12 @@ with pkgs; slic3r = callPackage ../applications/misc/slic3r { }; - curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; + curaengine_stable = disable-warnings-if-gcc13 (callPackage ../applications/misc/curaengine/stable.nix { }); - curaengine = callPackage ../applications/misc/curaengine { + curaengine = disable-warnings-if-gcc13 (callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; protobuf = protobuf_21; - }; + }); cura = libsForQt5.callPackage ../applications/misc/cura { }; @@ -36179,10 +36157,10 @@ with pkgs; virtual-ans = callPackage ../applications/audio/virtual-ans { }; - virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { + virtualbox = disable-warnings-if-gcc13 (libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; - }; + }); virtualboxHardened = lowPrio (virtualbox.override { enableHardening = true; @@ -36394,8 +36372,6 @@ with pkgs; stdenv = if stdenv.cc.isClang then gccStdenv else stdenv; }; - websploit = python3Packages.callPackage ../tools/security/websploit { }; - webssh = with python3Packages; toPythonApplication webssh; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { @@ -36875,7 +36851,7 @@ with pkgs; zerobin = callPackage ../applications/networking/zerobin { }; - zeroc-ice = callPackage ../development/libraries/zeroc-ice { }; + zeroc-ice = disable-warnings-if-gcc13 (callPackage ../development/libraries/zeroc-ice { }); zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; }; @@ -37082,11 +37058,11 @@ with pkgs; lightning-pool = callPackage ../applications/blockchains/lightning-pool { }; - litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin { + litecoin = disable-warnings-if-gcc13 (libsForQt5.callPackage ../applications/blockchains/litecoin { inherit (darwin.apple_sdk.frameworks) AppKit; boost = pkgs.boost177; - }; - litecoind = litecoin.override { withGui = false; }; + }); + litecoind = disable-warnings-if-gcc13 (litecoin.override { withGui = false; }); livedl = callPackage ../tools/misc/livedl { }; @@ -37162,15 +37138,15 @@ with pkgs; vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { withGui = true; }; - vertcoind = callPackage ../applications/blockchains/vertcoin { + vertcoind = disable-warnings-if-gcc13 (callPackage ../applications/blockchains/vertcoin { withGui = false; - }; + }); wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; wasabibackend = callPackage ../applications/blockchains/wasabibackend { }; - wownero = callPackage ../applications/blockchains/wownero { }; + wownero = disable-warnings-if-gcc13 (callPackage ../applications/blockchains/wownero { }); zcash = callPackage ../applications/blockchains/zcash { inherit (darwin.apple_sdk.frameworks) Security; @@ -37258,8 +37234,6 @@ with pkgs; antsimulator = callPackage ../games/antsimulator { }; - atlauncher = callPackage ../games/atlauncher { }; - augustus = callPackage ../games/augustus { }; ballerburg = callPackage ../games/ballerburg { } ; @@ -38104,7 +38078,11 @@ with pkgs; openxcom = callPackage ../games/openxcom { SDL = SDL_compat; }; - openxray = callPackage ../games/openxray { }; + openxray = callPackage ../games/openxray { + # Builds with Clang, but hits an assertion failure unless GCC is used + # https://github.com/OpenXRay/xray-16/issues/1224 + stdenv = gccStdenv; + }; orthorobot = callPackage ../games/orthorobot { love = love_0_10; }; @@ -38413,7 +38391,7 @@ with pkgs; tome4 = callPackage ../games/tome4 { }; toppler = callPackage ../games/toppler { - SDL2_image = SDL2_image_2_0_5; + SDL2_image = SDL2_image_2_0; }; torus-trooper = callPackage ../games/torus-trooper { }; @@ -39065,6 +39043,7 @@ with pkgs; trimal = callPackage ../applications/science/biology/trimal { }; trimmomatic = callPackage ../applications/science/biology/trimmomatic { + jdk = pkgs.jdk11_headless; # Reduce closure size jre = pkgs.jre_minimal.override { modules = [ "java.base" "java.logging" ]; @@ -39314,7 +39293,7 @@ with pkgs; ipopt = callPackage ../development/libraries/science/math/ipopt { }; - gmsh = callPackage ../applications/science/math/gmsh { }; + gmsh = disable-warnings-if-gcc13 (callPackage ../applications/science/math/gmsh { }); wcpg = callPackage ../development/libraries/science/math/wcpg { }; @@ -39385,6 +39364,8 @@ with pkgs; elmerfem = callPackage ../applications/science/physics/elmerfem { }; + fasthenry = callPackage ../applications/science/physics/fasthenry { }; + mcfm = callPackage ../applications/science/physics/MCFM { stdenv = gccStdenv; lhapdf = lhapdf.override { stdenv = gccStdenv; python = null; }; @@ -39577,6 +39558,8 @@ with pkgs; monosat = callPackage ../applications/science/logic/monosat { }; + msat = callPackage ../applications/science/logic/msat { }; + nusmv = callPackage ../applications/science/logic/nusmv { }; nuXmv = callPackage ../applications/science/logic/nuXmv { }; @@ -39657,7 +39640,7 @@ with pkgs; avy = callPackage ../applications/science/logic/avy { }; - btor2tools = callPackage ../applications/science/logic/btor2tools { }; + btor2tools = pin-to-gcc12-if-gcc13 (callPackage ../applications/science/logic/btor2tools { }); boolector = callPackage ../applications/science/logic/boolector { stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_14.stdenv else stdenv; @@ -39691,6 +39674,11 @@ with pkgs; appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; + inherit (libsForQt5.callPackage ../applications/science/electronics/simulide { }) + simulide_0_4_15 simulide_1_0_0 simulide_1_1_0; + + simulide = simulide_1_0_0; + eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; @@ -39734,6 +39722,14 @@ with pkgs; kicad = callPackage ../applications/science/electronics/kicad { }; # this is the same but without the (sizable) 3D models library kicad-small = kicad.override { pname = "kicad-small"; with3d = false; }; + # this is the stable branch at whatever point update.sh last updated versions.nix + kicad-testing = kicad.override { pname = "kicad-testing"; testing = true; }; + # and a small version of that + kicad-testing-small = kicad.override { + pname = "kicad-testing-small"; + testing = true; + with3d = false; + }; # this is the master branch at whatever point update.sh last updated versions.nix kicad-unstable = kicad.override { pname = "kicad-unstable"; stable = false; }; # and a small version of that @@ -40486,8 +40482,6 @@ with pkgs; mamba = callPackage ../applications/audio/mamba { }; - martyr = callPackage ../development/libraries/martyr { }; - mas = callPackage ../os-specific/darwin/mas { }; micromamba = callPackage ../tools/package-management/micromamba { }; @@ -40524,11 +40518,12 @@ with pkgs; networkd-dispatcher = callPackage ../tools/networking/networkd-dispatcher { }; - nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix { - storeDir = config.nix.storeDir or "/nix/store"; - stateDir = config.nix.stateDir or "/nix/var"; - inherit (darwin.apple_sdk.frameworks) Security; - }); + nixVersions = builtins.mapAttrs (_: disable-warnings-if-gcc13) + (recurseIntoAttrs (callPackage ../tools/package-management/nix { + storeDir = config.nix.storeDir or "/nix/store"; + stateDir = config.nix.stateDir or "/nix/var"; + inherit (darwin.apple_sdk.frameworks) Security; + })); nix = nixVersions.stable; @@ -41152,6 +41147,8 @@ with pkgs; tfswitch = callPackage ../applications/networking/cluster/tfswitch { }; + tftui = python3Packages.callPackage ../applications/networking/cluster/tftui { }; + tfupdate = callPackage ../applications/networking/cluster/tfupdate { }; tgswitch = callPackage ../applications/networking/cluster/tgswitch { }; @@ -41268,7 +41265,6 @@ with pkgs; vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { }; vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { - llvmPackages = llvmPackages_6; luaPackages = lua51Packages; }); @@ -41455,6 +41451,8 @@ with pkgs; xpad = callPackage ../applications/misc/xpad { }; + xpipe = callPackage ../applications/networking/xpipe { }; + xsane = callPackage ../applications/graphics/sane/xsane.nix { }; xsser = python3Packages.callPackage ../tools/security/xsser { }; @@ -41600,9 +41598,7 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb { }; - sccache = callPackage ../development/tools/misc/sccache { - inherit (darwin.apple_sdk.frameworks) Security; - }; + sccache = callPackage ../development/tools/misc/sccache { }; scip = callPackage ../development/tools/misc/scip { }; @@ -41654,12 +41650,6 @@ with pkgs; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { }; - NSPlist = callPackage ../development/libraries/NSPlist { }; - - PlistCpp = callPackage ../development/libraries/PlistCpp { }; - - xib2nib = callPackage ../development/tools/xib2nib { }; - linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { }; hss = callPackage ../tools/networking/hss { }; @@ -41833,6 +41823,10 @@ with pkgs; nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy { }; + weasis = callPackage ../by-name/we/weasis/package.nix { + jre = jdk21; + }; + webwormhole = callPackage ../tools/networking/webwormhole { }; werf = callPackage ../applications/networking/cluster/werf { }; diff --git a/nixpkgs/pkgs/top-level/cuda-packages.nix b/nixpkgs/pkgs/top-level/cuda-packages.nix index 9045b5754ab8..4b8ad4646485 100644 --- a/nixpkgs/pkgs/top-level/cuda-packages.nix +++ b/nixpkgs/pkgs/top-level/cuda-packages.nix @@ -72,14 +72,7 @@ let # Loose packages cudatoolkit = final.callPackage ../development/cuda-modules/cudatoolkit {}; - # SaxPy is only available after 11.4 because it requires redistributable versions of CUDA libraries. - saxpy = attrsets.optionalAttrs (strings.versionAtLeast cudaVersion "11.4") ( - final.callPackage ../development/cuda-modules/saxpy {} - ); - } - # NCCL is not supported on Jetson, because it does not use NVLink or PCI-e for inter-GPU communication. - # https://forums.developer.nvidia.com/t/can-jetson-orin-support-nccl/232845/9 - // attrsets.optionalAttrs (!flags.isJetsonBuild) { + saxpy = final.callPackage ../development/cuda-modules/saxpy {}; nccl = final.callPackage ../development/cuda-modules/nccl {}; nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests {}; } @@ -113,8 +106,8 @@ let shimsFn = ../development/cuda-modules/tensorrt/shims.nix; fixupFn = ../development/cuda-modules/tensorrt/fixup.nix; }) - (callPackage ../test/cuda/cuda-samples/extension.nix {inherit cudaVersion;}) - (callPackage ../test/cuda/cuda-library-samples/extension.nix {}) + (callPackage ../development/cuda-modules/cuda-samples/extension.nix {inherit cudaVersion;}) + (callPackage ../development/cuda-modules/cuda-library-samples/extension.nix {}) ]; cudaPackages = customisation.makeScope newScope ( diff --git a/nixpkgs/pkgs/top-level/darwin-packages.nix b/nixpkgs/pkgs/top-level/darwin-packages.nix index 2547b0c81cca..73943fb3b8a3 100644 --- a/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -196,6 +196,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { xcode_12 xcode_12_0_1 xcode_12_1 xcode_12_2 xcode_12_3 xcode_12_4 xcode_12_5 xcode_12_5_1 xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1 xcode_14 xcode_14_1 + xcode_15 xcode_15_1 xcode; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; diff --git a/nixpkgs/pkgs/top-level/hare-third-party.nix b/nixpkgs/pkgs/top-level/hare-third-party.nix index 8cf7cc4a9d8e..3796bbcba5b9 100644 --- a/nixpkgs/pkgs/top-level/hare-third-party.nix +++ b/nixpkgs/pkgs/top-level/hare-third-party.nix @@ -8,5 +8,7 @@ in hare-compress = callPackage ../development/hare-third-party/hare-compress { }; hare-ev = callPackage ../development/hare-third-party/hare-ev { }; hare-json = callPackage ../development/hare-third-party/hare-json { }; + hare-ssh = callPackage ../development/hare-third-party/hare-ssh { }; hare-toml = callPackage ../development/hare-third-party/hare-toml { }; + hare-png = callPackage ../development/hare-third-party/hare-png { }; }) diff --git a/nixpkgs/pkgs/top-level/kodi-packages.nix b/nixpkgs/pkgs/top-level/kodi-packages.nix index b16f5acc99ac..d0a494786561 100644 --- a/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -1,4 +1,5 @@ -{ config, lib, newScope, kodi, libretro }: +{ config, lib, newScope, kodi, libretro +, disable-warnings-if-gcc13 }: with lib; @@ -106,6 +107,8 @@ let self = rec { pvr-iptvsimple = callPackage ../applications/video/kodi/addons/pvr-iptvsimple { }; + pvr-vdr-vnsi = callPackage ../applications/video/kodi/addons/pvr-vdr-vnsi { }; + osmc-skin = callPackage ../applications/video/kodi/addons/osmc-skin { }; vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { }; @@ -154,7 +157,7 @@ let self = rec { inputstream-adaptive = callPackage ../applications/video/kodi/addons/inputstream-adaptive { }; - inputstream-ffmpegdirect = callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { }; + inputstream-ffmpegdirect = disable-warnings-if-gcc13 (callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { }); inputstream-rtmp = callPackage ../applications/video/kodi/addons/inputstream-rtmp { }; diff --git a/nixpkgs/pkgs/top-level/linux-kernels.nix b/nixpkgs/pkgs/top-level/linux-kernels.nix index 0783f358a4a6..dc71b01f3c26 100644 --- a/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -185,6 +185,14 @@ in { ]; }; + linux_6_7 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.7"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { # A special branch that tracks the kernel under the release process @@ -290,15 +298,7 @@ in { akvcam = callPackage ../os-specific/linux/akvcam { }; - amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { - libffi = pkgs.libffi.overrideAttrs (orig: rec { - version = "3.3"; - src = fetchurl { - url = "https://github.com/libffi/libffi/releases/download/v${version}/${orig.pname}-${version}.tar.gz"; - sha256 = "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj"; - }; - }); - }; + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; apfs = callPackage ../os-specific/linux/apfs { }; @@ -586,6 +586,7 @@ in { linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); + linux_6_7 = recurseIntoAttrs (packagesFor kernels.linux_6_7); __attrsFailEvaluation = true; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 @@ -650,7 +651,7 @@ in { packageAliases = { linux_default = packages.linux_6_1; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_6; + linux_latest = packages.linux_6_7; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_1; diff --git a/nixpkgs/pkgs/top-level/lua-packages.nix b/nixpkgs/pkgs/top-level/lua-packages.nix index 014cf6d394f9..f4868822463b 100644 --- a/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/nixpkgs/pkgs/top-level/lua-packages.nix @@ -59,6 +59,45 @@ rec { # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = toLuaModule (callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }); + lua-pam = callPackage({fetchFromGitHub, linux-pam, openpam}: buildLuaPackage rec { + pname = "lua-pam"; + version = "unstable-2015-07-03"; + # Needed for `disabled`, overridden in buildLuaPackage + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "devurandom"; + repo = "lua-pam"; + rev = "3818ee6346a976669d74a5cbc2a83ad2585c5953"; + hash = "sha256-YlMZ5mM9Ij/9yRmgA0X1ahYVZMUx8Igj5OBvAMskqTg="; + fetchSubmodules = true; + }; + + # The makefile tries to link to `-llua<luaversion>` + LUA_LIBS = "-llua"; + + buildInputs = lib.optionals stdenv.isLinux [linux-pam] + ++ lib.optionals stdenv.isDarwin [openpam]; + + installPhase = '' + runHook preInstall + + install -Dm755 pam.so $out/lib/lua/${lua.luaversion}/pam.so + + runHook postInstall + ''; + + # The package does not build with lua 5.4 or luaJIT + disabled = luaAtLeast "5.4" || isLuaJIT; + + meta = with lib; { + description = "Lua module for PAM authentication"; + homepage = "https://github.com/devurandom/lua-pam"; + license = licenses.mit; + maintainers = with maintainers; [ traxys ]; + }; + }) {}; + lua-resty-core = callPackage ({ fetchFromGitHub }: buildLuaPackage rec { pname = "lua-resty-core"; version = "0.1.24"; diff --git a/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix b/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix index 0b4af4114ef8..4acdab996787 100644 --- a/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -18,7 +18,7 @@ pkgs.runCommand "nixpkgs-release-checks" echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix # Make sure that Nixpkgs does not use <nixpkgs>. - badFiles=$(find $src/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true) + badFiles=$(find $src/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs/' || true) if [[ -n $badFiles ]]; then echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself." echo "The offending files: $badFiles" diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index 209962a91554..b31932759c85 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -1010,8 +1010,6 @@ let macaddr-sexp = callPackage ../development/ocaml-modules/macaddr/sexp.nix { }; - macaque = callPackage ../development/ocaml-modules/macaque { }; - mad = callPackage ../development/ocaml-modules/mad { }; magic = callPackage ../development/ocaml-modules/magic { }; @@ -1110,7 +1108,7 @@ let mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { }; - mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { mtime = mtime_1; }; + mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { }; mirage-crypto-rng-async = callPackage ../development/ocaml-modules/mirage-crypto/rng-async.nix { }; @@ -1176,6 +1174,8 @@ let mrmime = callPackage ../development/ocaml-modules/mrmime { }; + msat = callPackage ../development/ocaml-modules/msat { }; + mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; mtime = callPackage ../development/ocaml-modules/mtime { }; @@ -1770,7 +1770,7 @@ let topkg = callPackage ../development/ocaml-modules/topkg { }; torch = callPackage ../development/ocaml-modules/torch { - inherit (pkgs.python3Packages) torch; + torch = pkgs.libtorch-bin; }; trace = callPackage ../development/ocaml-modules/trace { }; diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index 246ca657f478..f963db925087 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -21792,6 +21792,9 @@ with self; { description = "GNU C library compatible strftime for loggers and servers"; homepage = "https://github.com/kazeburo/POSIX-strftime-Compiler"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + broken = stdenv.hostPlatform.isMusl; # Broken for Musl at 2023-01-14, reports: + # Nixpkgs: https://github.com/NixOS/nixpkgs/issues/210749 + # Upstream: https://github.com/kazeburo/POSIX-strftime-Compiler/issues/8 }; }; diff --git a/nixpkgs/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix index c424226f76b9..751a13b34ce7 100644 --- a/nixpkgs/pkgs/top-level/php-packages.nix +++ b/nixpkgs/pkgs/top-level/php-packages.nix @@ -370,6 +370,17 @@ lib.makeScope pkgs.newScope (self: with self; { configureFlags = [ "--enable-dom" ]; + patches = lib.optionals (lib.versionOlder php.version "8.2.14") [ + # Fix tests with libxml 2.12 + # Part of 8.3.1RC1+, 8.2.14RC1+ + (fetchpatch { + url = "https://github.com/php/php-src/commit/061058a9b1bbd90d27d97d79aebcf2b5029767b0.patch"; + hash = "sha256-0hOlAG+pOYp/gUU0MUMZvzWpgr0ncJi5GB8IeNxxyEU="; + excludes = [ + "NEWS" + ]; + }) + ]; } { name = "enchant"; @@ -610,7 +621,9 @@ lib.makeScope pkgs.newScope (self: with self; { # The `sqlite3_bind_bug68849.phpt` test is currently broken for i686 Linux systems since sqlite 3.43, cf.: # - https://github.com/php/php-src/issues/12076 # - https://www.sqlite.org/forum/forumpost/abbb95376ec6cd5f - patches = lib.optional (stdenv.isi686 && stdenv.isLinux) ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch; + patches = lib.optionals (stdenv.isi686 && stdenv.isLinux) [ + ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch + ]; } { name = "sysvmsg"; } { name = "sysvsem"; } diff --git a/nixpkgs/pkgs/top-level/python-aliases.nix b/nixpkgs/pkgs/top-level/python-aliases.nix index c4f307d89f45..9c167009a8dd 100644 --- a/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/nixpkgs/pkgs/top-level/python-aliases.nix @@ -39,6 +39,7 @@ mapAliases ({ aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 + aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16 amazon_kclpy = amazon-kclpy; # added 2023-08-08 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16 @@ -270,6 +271,7 @@ mapAliases ({ mir_eval = mir-eval; # added 2024-01-07 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 + mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mrkd = throw "mrkd has been promoted to a top-level attribute"; # added 2023-08-01 multi_key_dict = multi-key-dict; # added 2023-11-05 @@ -279,6 +281,7 @@ mapAliases ({ ninja-python = ninja; # add 2022-08-03 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 + nose_warnings_filters = nose-warnings-filters; # added 2024-01-07 notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 Nuitka = nuitka; # added 2023-02-19 ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead."; @@ -297,6 +300,7 @@ mapAliases ({ poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09 poetry2conda = throw "poetry2conda was promoted to a top-level attribute"; # Added 2022-10-02 Polygon3 = polygon3; # Added 2023-08-08 + posix_ipc = posix-ipc; # added 2024-01-07 poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29 postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 @@ -314,6 +318,7 @@ mapAliases ({ pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23 pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 + pygame_sdl2 = pygame-sdl2; # added 2024-01-07 pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20 PyGithub = pygithub; # added 2023-02-19 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 @@ -339,6 +344,9 @@ mapAliases ({ pymyq = python-myq; # added 2023-10-20 python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 + pyqt5_sip = pyqt5-sip; # added 2024-01-07 + pyqt5_with_qtmultimedia = pyqt5-multimedia; # added 2024-01-07 + pyqt5_with_qtwebkit = pyqt5-webkit; # added 2024-01-07 pyramid_beaker = pyramid-beaker; # added 2023-08-23 pyramid_chameleon = pyramid-chameleon; # added 2023-08-23 pyramid_exclog = pyramid-exclog; # added 2023-08-24 @@ -405,14 +413,17 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qds_sdk = qds-sdk; # added 2023-10-21 Quandl = quandl; # added 2023-02-19 + querystring_parser = querystring-parser; # added 2024-01-07 qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 + radicale_infcloud = radicale-infcloud; # added 2024-01-07 radio_beam = radio-beam; # added 2023-11-04 ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20 rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06 + retry_decorator = retry-decorator; # added 2024-01-07 retworkx = rustworkx; # added 2023-05-14 repeated_test = repeated-test; # added 2022-11-15 repoze_lru = repoze-lru; # added 2023-11-11 @@ -439,6 +450,7 @@ mapAliases ({ setuptools_scm = setuptools-scm; # added 2021-06-03 setuptoolsTrial = setuptools-trial; # added 2023-11-11 sharkiqpy = sharkiq; # added 2022-05-21 + sip_4 = sip4; # added 2024-01-07 ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 @@ -479,8 +491,10 @@ mapAliases ({ tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 + ufoLib2 = ufolib2; # added 2024-01-07 ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05 unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01 + update_checker = update-checker; # added 2024-01-07 uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13 uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13 validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07 @@ -504,8 +518,9 @@ mapAliases ({ Yapsy = yapsy; # added 2023-02-19 z3 = z3-solver; # added 2023-12-03 zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20 - zc-buildout221 = zc-buildout; # added 2021-07-21 zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; + zc-buildout221 = zc-buildout; # added 2021-07-21 + zc_lockfile = zc-lockfile; # added 2024-01-06 zipstream-new = throw "zipstream-new has been removed, because it was packaged as a dependency for octoprint, which has switched to zipstream-ng since."; # added 2024-01-05 zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 zope_component = zope-component; # added 2023-07-28 diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 9d9eea8c89f7..cbbe4a9074f1 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -16,6 +16,9 @@ self: super: with self; { build = toPythonModule (callPackage ../development/python-modules/bootstrap/build { inherit (bootstrap) flit-core installer; }); + packaging = toPythonModule (callPackage ../development/python-modules/bootstrap/packaging { + inherit (bootstrap) flit-core installer; + }); }; setuptools = callPackage ../development/python-modules/setuptools { }; @@ -346,8 +349,6 @@ self: super: with self; { aioquic = callPackage ../development/python-modules/aioquic { }; - aioquic-mitmproxy = callPackage ../development/python-modules/aioquic-mitmproxy { }; - aiorecollect = callPackage ../development/python-modules/aiorecollect { }; aioredis = callPackage ../development/python-modules/aioredis { }; @@ -802,6 +803,8 @@ self: super: with self; { astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + astropy-iers-data = callPackage ../development/python-modules/astropy-iers-data { }; + astropy-extension-helpers = callPackage ../development/python-modules/astropy-extension-helpers { }; astroquery = callPackage ../development/python-modules/astroquery { }; @@ -1337,6 +1340,8 @@ self: super: with self; { baron = callPackage ../development/python-modules/baron { }; + base2048 = callPackage ../development/python-modules/base2048 { }; + base36 = callPackage ../development/python-modules/base36 { }; base58 = callPackage ../development/python-modules/base58 { }; @@ -1482,6 +1487,8 @@ self: super: with self; { bip32 = callPackage ../development/python-modules/bip32 { }; + birch = callPackage ../development/python-modules/birch { }; + bitarray = callPackage ../development/python-modules/bitarray { }; bitbox02 = callPackage ../development/python-modules/bitbox02 { }; @@ -1556,6 +1563,8 @@ self: super: with self; { blocksat-cli = callPackage ../development/python-modules/blocksat-cli { }; + bloodhound-py = callPackage ../development/python-modules/bloodhound-py { }; + blosc2 = callPackage ../development/python-modules/blosc2 { }; bluemaestro-ble = callPackage ../development/python-modules/bluemaestro-ble { }; @@ -2070,6 +2079,8 @@ self: super: with self; { ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + clarabel = callPackage ../development/python-modules/clarabel { }; + clarifai = callPackage ../development/python-modules/clarifai { }; clarifai-grpc = callPackage ../development/python-modules/clarifai-grpc { }; @@ -2540,13 +2551,13 @@ self: super: with self; { cysignals = callPackage ../development/python-modules/cysignals { }; - cython = callPackage ../development/python-modules/Cython { }; + cython = callPackage ../development/python-modules/cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.3"; + version = "3.0.6"; src = old.src.override { inherit version; - hash = "sha256-MnMJMBsB9ynxc6lFEcsigMh7oDyJ7UKOiPkT93gkUDA="; + hash = "sha256-OZ0YVnLGZ7Juq73KQgyYVkWDeYrzvEdnCooJ6fGd1mA="; }; patches = [ ]; }); @@ -2695,7 +2706,7 @@ self: super: with self; { dbus-next = callPackage ../development/python-modules/dbus-next { }; - dbus-python = callPackage ../development/python-modules/dbus { + dbus-python = callPackage ../development/python-modules/dbus-python { inherit (pkgs) dbus; }; @@ -2793,6 +2804,8 @@ self: super: with self; { denonavr = callPackage ../development/python-modules/denonavr { }; + dep-logic = callPackage ../development/python-modules/dep-logic { }; + dependency-injector = callPackage ../development/python-modules/dependency-injector { }; deploykit = callPackage ../development/python-modules/deploykit { }; @@ -3524,7 +3537,7 @@ self: super: with self; { ecoaliface = callPackage ../development/python-modules/ecoaliface { }; - ecos = callPackage ../development/python-modules/ecos { }; + ecos = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/ecos { }); ecpy = callPackage ../development/python-modules/ecpy { }; @@ -3550,6 +3563,8 @@ self: super: with self; { inherit (pkgs) edlib; }; + eduvpn-common = callPackage ../development/python-modules/eduvpn-common { }; + edward = callPackage ../development/python-modules/edward { }; effdet = callPackage ../development/python-modules/effdet { }; @@ -3678,6 +3693,8 @@ self: super: with self; { ephemeral-port-reserve = callPackage ../development/python-modules/ephemeral-port-reserve { }; + epion = callPackage ../development/python-modules/epion { }; + epson-projector = callPackage ../development/python-modules/epson-projector { }; equinox = callPackage ../development/python-modules/equinox { }; @@ -3940,7 +3957,7 @@ self: super: with self; { fastrlock = callPackage ../development/python-modules/fastrlock { }; - fasttext = callPackage ../development/python-modules/fasttext { }; + fasttext = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/fasttext { }); fasttext-predict = callPackage ../development/python-modules/fasttext-predict { }; @@ -4323,6 +4340,8 @@ self: super: with self; { freezegun = callPackage ../development/python-modules/freezegun { }; + frelatage = callPackage ../development/python-modules/frelatage { }; + frida-python = callPackage ../development/python-modules/frida-python { }; frigidaire = callPackage ../development/python-modules/frigidaire { }; @@ -4406,6 +4425,8 @@ self: super: with self; { gaphas = callPackage ../development/python-modules/gaphas { }; + gardena-bluetooth = callPackage ../development/python-modules/gardena-bluetooth { }; + garminconnect-aio = callPackage ../development/python-modules/garminconnect-aio { }; garminconnect = callPackage ../development/python-modules/garminconnect { }; @@ -4627,9 +4648,9 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = pkgs.disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh { enablePython = true; - }); + })); gntp = callPackage ../development/python-modules/gntp { }; @@ -4844,6 +4865,8 @@ self: super: with self; { gradio-client = callPackage ../development/python-modules/gradio/client.nix { }; + gradio-pdf = callPackage ../development/python-modules/gradio-pdf { }; + grafanalib = callPackage ../development/python-modules/grafanalib/default.nix { }; grammalecte = callPackage ../development/python-modules/grammalecte { }; @@ -4955,6 +4978,8 @@ self: super: with self; { gtimelog = callPackage ../development/python-modules/gtimelog { }; + gto = callPackage ../development/python-modules/gto { }; + gtts = callPackage ../development/python-modules/gtts { }; gtts-token = callPackage ../development/python-modules/gtts-token { }; @@ -5896,6 +5921,8 @@ self: super: with self; { jsonschema = callPackage ../development/python-modules/jsonschema { }; + jsonschema-path = callPackage ../development/python-modules/jsonschema-path { }; + jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; jsonschema-specifications = callPackage ../development/python-modules/jsonschema-specifications { }; @@ -6159,6 +6186,10 @@ self: super: with self; { langchain = callPackage ../development/python-modules/langchain { }; + langchain-community = callPackage ../development/python-modules/langchain-community { }; + + langchain-core = callPackage ../development/python-modules/langchain-core { }; + langcodes = callPackage ../development/python-modules/langcodes { }; langdetect = callPackage ../development/python-modules/langdetect { }; @@ -6708,6 +6739,8 @@ self: super: with self; { rtmixer = callPackage ../development/python-modules/rtmixer { }; + regress = callPackage ../development/python-modules/regress { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; makefun = callPackage ../development/python-modules/makefun { }; @@ -7076,7 +7109,7 @@ self: super: with self; { mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { }; - mkdocs-minify = callPackage ../development/python-modules/mkdocs-minify { }; + mkdocs-minify-plugin = callPackage ../development/python-modules/mkdocs-minify-plugin { }; mkdocs-redirects = callPackage ../development/python-modules/mkdocs-redirects { }; mkdocs-simple-hooks = callPackage ../development/python-modules/mkdocs-simple-hooks { }; mkdocs-swagger-ui-tag = callPackage ../development/python-modules/mkdocs-swagger-ui-tag { }; @@ -8384,7 +8417,7 @@ self: super: with self; { nose-randomly = callPackage ../development/python-modules/nose-randomly { }; - nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { }; + nose-warnings-filters = callPackage ../development/python-modules/nose-warnings-filters { }; nosexcover = callPackage ../development/python-modules/nosexcover { }; @@ -8622,6 +8655,8 @@ self: super: with self; { open-garage = callPackage ../development/python-modules/open-garage { }; + open-interpreter = callPackage ../development/python-modules/open-interpreter { }; + open-meteo = callPackage ../development/python-modules/open-meteo { }; openai-triton = callPackage ../development/python-modules/openai-triton { @@ -8876,6 +8911,8 @@ self: super: with self; { pagelabels = callPackage ../development/python-modules/pagelabels { }; + paginate = callPackage ../development/python-modules/paginate { }; + paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; palace = callPackage ../development/python-modules/palace { }; @@ -9062,6 +9099,8 @@ self: super: with self; { pdoc = callPackage ../development/python-modules/pdoc { }; + pdoc-pyo3-sample-library = callPackage ../development/python-modules/pdoc-pyo3-sample-library { }; + pdoc3 = callPackage ../development/python-modules/pdoc3 { }; peaqevcore = callPackage ../development/python-modules/peaqevcore { }; @@ -9088,7 +9127,12 @@ self: super: with self; { pem = callPackage ../development/python-modules/pem { }; - pendulum = callPackage ../development/python-modules/pendulum { }; + pendulum = if pythonAtLeast "3.12" then + pendulum_3 + else + callPackage ../development/python-modules/pendulum { }; + + pendulum_3 = callPackage ../development/python-modules/pendulum/3.nix { }; pep440 = callPackage ../development/python-modules/pep440 { }; @@ -9354,6 +9398,8 @@ self: super: with self; { pyatag = callPackage ../development/python-modules/pyatag { }; + pyatem = callPackage ../development/python-modules/pyatem { }; + pyatome = callPackage ../development/python-modules/pyatome { }; pycketcasts = callPackage ../development/python-modules/pycketcasts { }; @@ -9401,6 +9447,8 @@ self: super: with self; { pyinstaller-versionfile = callPackage ../development/python-modules/pyinstaller-versionfile { }; + pyisemail = callPackage ../development/python-modules/pyisemail { }; + pyisy = callPackage ../development/python-modules/pyisy { }; pyixapi = callPackage ../development/python-modules/pyixapi { }; @@ -9694,7 +9742,7 @@ self: super: with self; { portpicker = callPackage ../development/python-modules/portpicker { }; - posix_ipc = callPackage ../development/python-modules/posix_ipc { }; + posix-ipc = callPackage ../development/python-modules/posix-ipc { }; posthog = callPackage ../development/python-modules/posthog { }; @@ -10020,6 +10068,8 @@ self: super: with self; { pyasuswrt = callPackage ../development/python-modules/pyasuswrt { }; + pyasyncore = callPackage ../development/python-modules/pyasyncore { }; + pyathena = callPackage ../development/python-modules/pyathena { }; pyatmo = callPackage ../development/python-modules/pyatmo { }; @@ -10046,7 +10096,7 @@ self: super: with self; { pybigwig = callPackage ../development/python-modules/pybigwig { }; - pybind11 = callPackage ../development/python-modules/pybind11 { }; + pybind11 = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/pybind11 { }); pybindgen = callPackage ../development/python-modules/pybindgen { }; @@ -10162,7 +10212,7 @@ self: super: with self; { pycron = callPackage ../development/python-modules/pycron { }; - pycrypto = callPackage ../development/python-modules/pycrypto { }; + pycrypto = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/pycrypto { }); pycryptodome = callPackage ../development/python-modules/pycryptodome { }; @@ -10204,6 +10254,8 @@ self: super: with self; { pydantic = callPackage ../development/python-modules/pydantic { }; + pydantic_1 = callPackage ../development/python-modules/pydantic/1.nix { }; + pydantic-compat = callPackage ../development/python-modules/pydantic-compat { }; pydantic-core = callPackage ../development/python-modules/pydantic-core { }; @@ -10408,10 +10460,10 @@ self: super: with self; { pygame = callPackage ../development/python-modules/pygame { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; - SDL2_image = pkgs.SDL2_image_2_0_5; + SDL2_image = pkgs.SDL2_image_2_0; }; - pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; + pygame-sdl2 = callPackage ../development/python-modules/pygame-sdl2 { }; pygame-gui = callPackage ../development/python-modules/pygame-gui { }; @@ -10975,18 +11027,18 @@ self: super: with self; { pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { }; - pyqt5_sip = callPackage ../development/python-modules/pyqt/sip.nix { }; + pyqt5-sip = callPackage ../development/python-modules/pyqt/sip.nix { }; - pyqt5_with_qtmultimedia = self.pyqt5.override { + pyqt5-multimedia = self.pyqt5.override { withMultimedia = true; }; /* - `pyqt5_with_qtwebkit` should not be used by python libraries in + `pyqt5-webkit` should not be used by python libraries in pkgs/development/python-modules/*. Putting this attribute in `propagatedBuildInputs` may cause collisions. */ - pyqt5_with_qtwebkit = self.pyqt5.override { + pyqt5-webkit = self.pyqt5.override { withWebKit = true; }; @@ -11233,12 +11285,18 @@ self: super: with self; { pysmi = callPackage ../development/python-modules/pysmi { }; + pysmi-lextudio = callPackage ../development/python-modules/pysmi-lextudio { }; + pysml = callPackage ../development/python-modules/pysml { }; pysmt = callPackage ../development/python-modules/pysmt { }; pysnmp = callPackage ../development/python-modules/pysnmp { }; + pysnmpcrypto = callPackage ../development/python-modules/pysnmpcrypto { }; + + pysnmp-lextudio = callPackage ../development/python-modules/pysnmp-lextudio { }; + pysnmp-pyasn1 = callPackage ../development/python-modules/pysnmp-pyasn1 { }; pysnmp-pysmi = callPackage ../development/python-modules/pysnmp-pysmi { }; @@ -11301,6 +11359,8 @@ self: super: with self; { pystardict = callPackage ../development/python-modules/pystardict { }; + pystatgrab = callPackage ../development/python-modules/pystatgrab { }; + pystemd = callPackage ../development/python-modules/pystemd { inherit (pkgs) systemd; }; @@ -11343,6 +11403,8 @@ self: super: with self; { pyte = callPackage ../development/python-modules/pyte { }; + pytedee-async = callPackage ../development/python-modules/pytedee-async { }; + pytenable = callPackage ../development/python-modules/pytenable { }; pytensor = callPackage ../development/python-modules/pytensor { }; @@ -12134,6 +12196,8 @@ self: super: with self; { pyyardian = callPackage ../development/python-modules/pyyardian { }; + pyzabbix = callPackage ../development/python-modules/pyzabbix { }; + pyzerproc = callPackage ../development/python-modules/pyzerproc { }; pyzmq = callPackage ../development/python-modules/pyzmq { }; @@ -12255,7 +12319,7 @@ self: super: with self; { qudida = callPackage ../development/python-modules/qudida { }; - querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + querystring-parser = callPackage ../development/python-modules/querystring-parser { }; questionary = callPackage ../development/python-modules/questionary { }; @@ -12269,7 +12333,7 @@ self: super: with self; { rachiopy = callPackage ../development/python-modules/rachiopy { }; - radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { + radicale-infcloud = callPackage ../development/python-modules/radicale-infcloud { radicale = pkgs.radicale.override { python3 = python; }; }; @@ -12524,7 +12588,7 @@ self: super: with self; { retry = callPackage ../development/python-modules/retry { }; - retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + retry-decorator = callPackage ../development/python-modules/retry-decorator { }; retrying = callPackage ../development/python-modules/retrying { }; @@ -13122,6 +13186,8 @@ self: super: with self; { sigrok = callPackage ../development/python-modules/sigrok { }; + sigstore = callPackage ../development/python-modules/sigstore { }; + sigstore-protobuf-specs = callPackage ../development/python-modules/sigstore-protobuf-specs { }; sigstore-rekor-types = callPackage ../development/python-modules/sigstore-rekor-types { }; @@ -13194,7 +13260,7 @@ self: super: with self; { sip = callPackage ../development/python-modules/sip { }; - sip_4 = callPackage ../development/python-modules/sip/4.x.nix { }; + sip4 = callPackage ../development/python-modules/sip/4.x.nix { }; sipyco = callPackage ../development/python-modules/sipyco { }; @@ -13780,6 +13846,8 @@ self: super: with self; { strawberry-graphql = callPackage ../development/python-modules/strawberry-graphql { }; + strct = callPackage ../development/python-modules/strct { }; + streamdeck = callPackage ../development/python-modules/streamdeck { }; streaming-form-data = callPackage ../development/python-modules/streaming-form-data { }; @@ -14099,6 +14167,13 @@ self: super: with self; { grpc = compat.grpcTF; grpcio = compat.grpcioTF; tensorboard = compat.tensorboardTF; + + # Tensorflow 2.13 doesn't support gcc13: + # https://github.com/tensorflow/tensorflow/issues/61289 + # + # We use the nixpkgs' default libstdc++ to stay compatible with other + # python modules + stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv; }; tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { }; @@ -15413,6 +15488,8 @@ self: super: with self; { types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; + types-markdown = callPackage ../development/python-modules/types-markdown { }; + types-mock = callPackage ../development/python-modules/types-mock { }; types-pillow = callPackage ../development/python-modules/types-pillow { }; @@ -15421,6 +15498,8 @@ self: super: with self; { types-psutil = callPackage ../development/python-modules/types-psutil { }; + types-psycopg2 = callPackage ../development/python-modules/types-psycopg2 { }; + types-pyopenssl = callPackage ../development/python-modules/types-pyopenssl { }; types-python-dateutil = callPackage ../development/python-modules/types-python-dateutil { }; @@ -15499,7 +15578,7 @@ self: super: with self; { ufo2ft = callPackage ../development/python-modules/ufo2ft { }; - ufoLib2 = callPackage ../development/python-modules/ufoLib2 { }; + ufolib2 = callPackage ../development/python-modules/ufolib2 { }; ufolint = callPackage ../development/python-modules/ufolint { }; @@ -15575,6 +15654,8 @@ self: super: with self; { unifiled = callPackage ../development/python-modules/unifiled { }; + unique-log-filter = callPackage ../development/python-modules/unique-log-filter { }; + units = callPackage ../development/python-modules/units { }; unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; @@ -15613,7 +15694,7 @@ self: super: with self; { upcloud-api = callPackage ../development/python-modules/upcloud-api { }; - update_checker = callPackage ../development/python-modules/update_checker { }; + update-checker = callPackage ../development/python-modules/update-checker { }; update-copyright = callPackage ../development/python-modules/update-copyright { }; @@ -16101,6 +16182,7 @@ self: super: with self; { wxGTK = pkgs.wxGTK32.override { withWebKit = true; }; + inherit (pkgs) mesa; }; wyoming = callPackage ../development/python-modules/wyoming { }; @@ -16363,7 +16445,7 @@ self: super: with self; { zc-buildout = callPackage ../development/python-modules/buildout { }; - zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; + zc-lockfile = callPackage ../development/python-modules/zc-lockfile { }; zcbor = callPackage ../development/python-modules/zcbor { }; diff --git a/nixpkgs/pkgs/top-level/qt5-packages.nix b/nixpkgs/pkgs/top-level/qt5-packages.nix index f38a4c1c4907..decb95383438 100644 --- a/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -100,6 +100,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; + futuresql = callPackage ../development/libraries/futuresql { }; + qgpgme = callPackage ../development/libraries/gpgme { }; grantlee = callPackage ../development/libraries/grantlee/5 { }; @@ -162,9 +164,9 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP libqtav = callPackage ../development/libraries/libqtav { }; - libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; + libquotient = callPackage ../development/libraries/libquotient { }; - kpmcore = callPackage ../development/libraries/kpmcore { }; + libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; @@ -175,7 +177,7 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; mlt = pkgs.mlt.override { - enableQt = true; + qt = qt5; }; phonon = callPackage ../development/libraries/phonon { }; @@ -196,10 +198,11 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; - qca-qt5 = callPackage ../development/libraries/qca-qt5 { + qca = callPackage ../development/libraries/qca { stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; inherit (libsForQt5) qtbase; }; + qca-qt5 = self.qca; qcoro = callPackage ../development/libraries/qcoro { }; diff --git a/nixpkgs/pkgs/top-level/qt6-packages.nix b/nixpkgs/pkgs/top-level/qt6-packages.nix index b9f3fdd35eef..940a5e154562 100644 --- a/nixpkgs/pkgs/top-level/qt6-packages.nix +++ b/nixpkgs/pkgs/top-level/qt6-packages.nix @@ -29,11 +29,31 @@ makeScopeWithSplicing' { inherit stdenv; # LIBRARIES + appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + + kdsoap = callPackage ../development/libraries/kdsoap { }; + + futuresql = callPackage ../development/libraries/futuresql { }; + kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; + libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; + libquotient = callPackage ../development/libraries/libquotient { }; + mlt = pkgs.mlt.override { + qt = qt6; + }; + + qca = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/qca { + inherit (qt6) qtbase qt5compat; + }; + qcoro = callPackage ../development/libraries/qcoro { }; + qgpgme = callPackage ../development/libraries/gpgme { }; + packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; qt6ct = callPackage ../tools/misc/qt6ct { }; qt6gtk2 = callPackage ../tools/misc/qt6gtk2 { }; + qtforkawesome = callPackage ../development/libraries/qtforkawesome { }; + qtkeychain = callPackage ../development/libraries/qtkeychain { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -44,6 +64,8 @@ makeScopeWithSplicing' { qt5Kvantum = pkgs.libsForQt5.qtstyleplugin-kvantum; }; + qtutilities = callPackage ../development/libraries/qtutilities { }; + quazip = callPackage ../development/libraries/quazip { }; qscintilla = callPackage ../development/libraries/qscintilla { }; diff --git a/nixpkgs/pkgs/top-level/release-haskell.nix b/nixpkgs/pkgs/top-level/release-haskell.nix index 6a60de224ade..afaa94a23a32 100644 --- a/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/nixpkgs/pkgs/top-level/release-haskell.nix @@ -333,6 +333,7 @@ let nota nvfetcher ormolu + pakcs pandoc petrinizer place-cursor-at diff --git a/nixpkgs/pkgs/top-level/release-small.nix b/nixpkgs/pkgs/top-level/release-small.nix index a8ef5bc49667..30e0c188bb70 100644 --- a/nixpkgs/pkgs/top-level/release-small.nix +++ b/nixpkgs/pkgs/top-level/release-small.nix @@ -54,7 +54,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; gnused = all; gnutar = all; gnutls = linux; - grub = linux; grub2 = linux; guile = linux; # tests fail on Cygwin gzip = all; @@ -67,7 +66,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; idutils = all; inetutils = linux; iputils = linux; - kvm = linux; qemu = linux; qemu_kvm = linux; lapack-reference = linux; diff --git a/nixpkgs/pkgs/top-level/release.nix b/nixpkgs/pkgs/top-level/release.nix index f2b38b4a8964..b257f2411c7d 100644 --- a/nixpkgs/pkgs/top-level/release.nix +++ b/nixpkgs/pkgs/top-level/release.nix @@ -156,12 +156,6 @@ let jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-linux jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_6.clang.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_6.libcxx.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_7.clang.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_7.libcxx.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_7.clang.x86_64-linux - jobs.tests.cc-wrapper.llvmPackages_7.libcxx.x86_64-linux jobs.tests.cc-multilib-gcc.x86_64-linux jobs.tests.cc-multilib-clang.x86_64-linux jobs.tests.stdenv-inputs.x86_64-linux @@ -191,10 +185,6 @@ let jobs.tests.cc-wrapper.gcc8Stdenv.x86_64-darwin jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin - jobs.tests.cc-wrapper.llvmPackages_5.clang.x86_64-darwin - jobs.tests.cc-wrapper.llvmPackages_5.libcxx.x86_64-darwin - jobs.tests.cc-wrapper.llvmPackages_6.clang.x86_64-darwin - jobs.tests.cc-wrapper.llvmPackages_6.libcxx.x86_64-darwin jobs.tests.stdenv-inputs.x86_64-darwin jobs.tests.macOSSierraShared.x86_64-darwin jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin diff --git a/nixpkgs/pkgs/top-level/ruby-packages.nix b/nixpkgs/pkgs/top-level/ruby-packages.nix index 7d4d220e23a8..f1e648fdc123 100644 --- a/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -1,4 +1,14 @@ { + abbrev = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hj2qyx7rzpc7awhvqlm597x7qdxwi4kkml4aqnp5jylmsm4w6xd"; + type = "gem"; + }; + version = "0.1.2"; + }; actioncable = { dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver" "zeitwerk"]; groups = ["default"]; @@ -644,10 +654,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dd9wik69yqi54r1mgmvi7gqzgzh7vw4nfwriknk1z7piwv6w22c"; + sha256 = "1kcvivig7vvw3bnds1pi4m69wn7cgmsffn93lw5i1nzw490x2da4"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; cocoapods-wholemodule = { groups = ["default"]; @@ -901,10 +911,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; type = "gem"; }; - version = "0.6.20231109"; + version = "0.6.20240107"; }; dotenv = { groups = ["default"]; @@ -965,10 +975,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vsqmx8pslcg1zca7hfc89vfnbcfvgyfbbxpdk2xm4cidl80zmv9"; + sha256 = "0l4znxsrcsa6a1ylig4wkml1kdydyvb3qzh7mr1gn39zn25wflj0"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; erubi = { groups = ["default"]; @@ -1016,10 +1026,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q9yz7x36mpzpz04bg6hdyrzzk4bri9jg3h2ygw26bf6v3axq53q"; + sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x"; type = "gem"; }; - version = "0.108.0"; + version = "0.109.0"; }; execjs = { groups = ["default"]; @@ -1032,25 +1042,26 @@ version = "2.9.1"; }; faraday = { - dependencies = ["base64" "faraday-net_http" "ruby2_keywords"]; + dependencies = ["faraday-net_http"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; + sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.0"; }; faraday-net_http = { + dependencies = ["net-http"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; + sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; ffi = { groups = ["default"]; @@ -1100,10 +1111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06m6hxq8vspx9h9bgc2s19m56jzasvl45vblrfv1q5h1qg1k6amw"; + sha256 = "0p2xiw0n4l1k3ynma1vl0fzw5w8xhkv70x4f829nydxv7hply80y"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; fog-dnsimple = { dependencies = ["fog-core" "fog-json"]; @@ -1226,10 +1237,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rf4603ffvdlvnzx1nmh2x5j8lic3p24115sm7bx6p2nwii09f69"; + sha256 = "0hfjw17g33qfsrb0lwcsl0capyjdpm6zpzxrspzfb4lyppqyyqic"; type = "gem"; }; - version = "1.18.0"; + version = "1.19.0"; }; github-pages = { dependencies = ["github-pages-health-check" "jekyll" "jekyll-avatar" "jekyll-coffeescript" "jekyll-commonmark-ghpages" "jekyll-default-layout" "jekyll-feed" "jekyll-gist" "jekyll-github-metadata" "jekyll-include-cache" "jekyll-mentions" "jekyll-optional-front-matter" "jekyll-paginate" "jekyll-readme-index" "jekyll-redirect-from" "jekyll-relative-links" "jekyll-remote-theme" "jekyll-sass-converter" "jekyll-seo-tag" "jekyll-sitemap" "jekyll-swiss" "jekyll-theme-architect" "jekyll-theme-cayman" "jekyll-theme-dinky" "jekyll-theme-hacker" "jekyll-theme-leap-day" "jekyll-theme-merlot" "jekyll-theme-midnight" "jekyll-theme-minimal" "jekyll-theme-modernist" "jekyll-theme-primer" "jekyll-theme-slate" "jekyll-theme-tactile" "jekyll-theme-time-machine" "jekyll-titles-from-headings" "jemoji" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "minima" "nokogiri" "rouge" "terminal-table"]; @@ -1340,14 +1351,15 @@ version = "5.0.0"; }; highline = { + dependencies = ["abbrev"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; + sha256 = "1yw7mjnq498xr34rvpyacw7dagw1azsds0gk781p493ygx7ck7m6"; type = "gem"; }; - version = "2.1.0"; + version = "3.0.0"; }; hike = { groups = ["default"]; @@ -1520,10 +1532,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phrzmmxbwqmkh4dzld3pc82yml996nzfdzjipniv8wwrxwbgb3r"; + sha256 = "0hh8d5l4ki6vg2p5x3v000gkrdqi1kdjv4vk5v8lfz9gr4kdc007"; type = "gem"; }; - version = "1.11.0"; + version = "1.11.1"; }; jaro_winkler = { groups = ["default"]; @@ -2115,20 +2127,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s5v614c1kg5z4hqrmza5fr7qfpqvqirc51624wwsq9vismdisnv"; + sha256 = "1p6hdglfjx9r0rycn2fb0zjg2czl72nyfx8mmrf20w4qmslj0fj9"; type = "gem"; }; - version = "4.1.2"; + version = "5.0.2"; }; link-header-parser = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wp8sdrv5j89gbb68zvxlyd84q4ddyz726db76sn76bbmm9621mc"; + sha256 = "1bm32imabc12rjjw8ysca55c99flcsichynfflphxy8gda07dj9x"; type = "gem"; }; - version = "5.1.0"; + version = "5.1.1"; }; liquid = { groups = ["default"]; @@ -2262,10 +2274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; type = "gem"; }; - version = "3.5.1"; + version = "3.5.2"; }; mime-types-data = { groups = ["default"]; @@ -2323,10 +2335,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; + sha256 = "1g4sjps6k8gvsm9hig3v6hnlpklgjipdaha2z2q0grxdfh6hrsb8"; type = "gem"; }; - version = "5.20.0"; + version = "5.21.1"; }; molinillo = { groups = ["default"]; @@ -2429,16 +2441,27 @@ }; version = "1.4.10"; }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; + type = "gem"; + }; + version = "0.4.1"; + }; net-imap = { dependencies = ["date" "net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1izifdsinnfi34v2x3yavc0kxcmi1cwph11akqf949rf00sckkcp"; + sha256 = "0z9f6kfxz9qanar534gs3mk6snyvw8rnx3f6ykjn2jiziv0rv1ig"; type = "gem"; }; - version = "0.4.9"; + version = "0.4.9.1"; }; net-pop = { dependencies = ["net-protocol"]; @@ -2479,10 +2502,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rx3758w0bmbr21s2nsc6llflsrnp50fwdnly3ixra4v53gbhzid"; + sha256 = "0csspzqrg7s2v2wdp6vqqs1rra6w5ilpgnps5h52ig6rp7x2i389"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.0.1"; }; net-ssh = { groups = ["default"]; @@ -2520,10 +2543,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; + sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.0"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2638,10 +2661,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r69dbh6h6j4d54isany2ir4ni4gf2ysvk3k44awi6amz18nggpd"; + sha256 = "0c53sypj4pac5id0abxjbii9g5xnykb9aapwr1z38wzaqv1ys026"; type = "gem"; }; - version = "3.2.2.4"; + version = "3.3.0.3"; }; paru = { groups = ["default"]; @@ -2784,10 +2807,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pp43n69p6bjvc640wgcz295w1q2v9awcqgbwcqn082dbvq5xvnx"; + sha256 = "0xgsr1agv754709fb7x11zn07skmbwlds88sa5s57d7x1apswmkd"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; psych = { dependencies = ["stringio"]; @@ -2816,10 +2839,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; + sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; type = "gem"; }; - version = "6.4.0"; + version = "6.4.2"; }; pwntools = { dependencies = ["crabstone" "dentaku" "elftools" "keystone-engine" "method_source" "one_gadget" "rainbow" "ruby2ruby" "rubyserial"]; @@ -2853,15 +2876,15 @@ version = "2.2.8"; }; rack-protection = { - dependencies = ["rack"]; + dependencies = ["base64" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; + sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; rack-session = { dependencies = ["rack"]; @@ -3039,10 +3062,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ih6igmfcb4b9a8hd46ggn85zfyclz9h828d0xafy2pq5qlz9fs2"; + sha256 = "0sj80r3gy4sb27mrgc6pwcf2lra669p8p81axdv2p5pfm6k3mqbq"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; red-colors = { dependencies = ["matrix"]; @@ -3114,10 +3137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xrghj2vka7girycp1m88kvl4qxkm4mj4djz4w1jzywb4v97fclm"; + sha256 = "1ndxm0xnv27p4gv6xynk6q41irckj76q1jsqpysd9h6f86hhp841"; type = "gem"; }; - version = "2.8.3"; + version = "2.9.0"; }; reline = { dependencies = ["io-console"]; @@ -3125,10 +3148,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi6zfj6zqzxcbamhjm9w9cswv62f76l8gsdfcnmhpw35cyxphh8"; + sha256 = "0fhwdmw89zqb1fdxcd6lr57zabbfi08z8j6kqwngak0xnxi2j10l"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.2"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -3275,10 +3298,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rfg3p6bblx9gv934fdgaji0wg0xl1drhrnlifqdgkw8wbiaw0jg"; + sha256 = "0cf7fn4dwf45r3nhnda0dhnwn8qghswyqbfxr2ippb3z8a6gmc8v"; type = "gem"; }; - version = "1.20.1"; + version = "1.20.2"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -3318,10 +3341,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g1vdas991rv6lrjppjxjbfyzif4jxbncrcg9shgzrmibzilbnwr"; + sha256 = "1wajd1cib17jlvfh0agiz2x20p22v6g2ydvqpm6c7srv2x3g7vbb"; type = "gem"; }; - version = "0.13.2"; + version = "0.13.4"; }; ruby-lxc = { groups = ["default"]; @@ -3507,10 +3530,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "148cmk9bdj6y2ax06rd5q5i322lmzn49qd1cal616hys6qd04bm1"; + sha256 = "0csan4kfiwr8a94l0zy3xsrs525ygkc0ly8mdihx5lf9x6ywg6s0"; type = "gem"; }; - version = "0.21.0"; + version = "0.21.1"; }; sequel = { dependencies = ["bigdecimal"]; @@ -3518,10 +3541,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b2ypz0sgivfjzsr4igh6cm46fifzkanmz0fw8p0yq5xr4isv722"; + sha256 = "1698b1fc8b5yxgb3y5w3bkz1xjxxwpa19b3x17211x8jhy5cjzjd"; type = "gem"; }; - version = "5.75.0"; + version = "5.76.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3592,10 +3615,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8"; + sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; slather = { dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"]; @@ -3623,10 +3646,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a77kysns9pz4nx149df0f987qj1pdfyjby2jr3iwmj2zj7r3klp"; + sha256 = "1ndib94d181y5gd7qg515ralb02zri91vd3q94k21fgc4r897cd4"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; snmp = { groups = ["default"]; @@ -3654,10 +3677,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xm54yjrdz200iahvily91n0nlv9xr2yp1rjz077fq1z2pi1kadg"; + sha256 = "1raijm9if45lssx8a0m8dpnb9d7grqgyrgnx7g3v4vyw3wvn6pm0"; type = "gem"; }; - version = "0.5.11164"; + version = "0.5.11193"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -3665,10 +3688,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08irz5llz31im8pmkk5k0kw433jyyji1qa98xkdmpphncdjr38am"; + sha256 = "0g5frmpl4dlb36y4zv1p5mvd3pag5ya96bjpjmyxpchzb5jmjjw9"; type = "gem"; }; - version = "1.6.9"; + version = "1.7.0"; }; stringio = { groups = ["default"]; @@ -3788,10 +3811,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fqzm5a7wf7r9jl7pxs7g6m3qpvyzpia0pid0blzc0b34n0nrb35"; + sha256 = "1nva5glid3mpwqk0siws74r6qfv89n0amw9ffzwnwlm12cd4ahdm"; type = "gem"; }; - version = "2.1.6"; + version = "2.1.7"; }; treetop = { dependencies = ["polyglot"]; @@ -3899,6 +3922,16 @@ }; version = "2.5.0"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + type = "gem"; + }; + version = "0.13.0"; + }; uuid4r = { groups = ["default"]; platforms = []; |