diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 257 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/darwin-packages.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/java-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/kodi-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 445 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 105 |
11 files changed, 735 insertions, 142 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d399c8ee659..d3c866bc348 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -92,6 +92,9 @@ mapAliases ({ bird2 = bird; # Added 2022-02-21 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 + blender-with-packages = args: + lib.warn "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`" + (blender.withPackages (_: args.packages)).overrideAttrs (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30 bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10 boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08 @@ -124,6 +127,7 @@ mapAliases ({ ### C ### callPackage_i686 = pkgsi686Linux.callPackage; + cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 @@ -133,6 +137,8 @@ mapAliases ({ chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 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 + chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 citra = citra-nightly; # added 2022-05-17 clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 @@ -316,6 +322,8 @@ mapAliases ({ godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 + google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 + google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 go-thumbnailer = thud; # Added 2023-09-21 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 @@ -327,6 +335,9 @@ mapAliases ({ gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 + graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 + graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 + graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 gringo = clingo; # added 2022-11-27 gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 @@ -335,6 +346,7 @@ mapAliases ({ gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10 grub2_full = grub2; # Added 2022-11-18 grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 + guile-disarchive = disarchive; # Added 2023-10-27 guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16 ### H ### @@ -449,6 +461,7 @@ mapAliases ({ librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 libseat = seatd; # Added 2021-06-24 + libsigcxx12 = throw "'libsigcxx12' has been removed, please use newer versions"; # Added 2023-10-20 libsForQt515 = libsForQt5; # Added 2022-11-24 libtensorflow-bin = libtensorflow; # Added 2022-09-25 libtorrentRasterbar = libtorrent-rasterbar; # Added 2020-12-20 @@ -483,6 +496,7 @@ mapAliases ({ linuxPackages_6_3 = linuxKernel.packages.linux_6_3; 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_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -507,6 +521,7 @@ mapAliases ({ linux_6_3 = linuxKernel.kernels.linux_6_3; 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_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -597,6 +612,7 @@ mapAliases ({ nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; + nixops = throw "'nixops' has been removed. Please use 'nixops_unstable' for the time being."; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = nmap; # Added 2021-04-06 @@ -696,6 +712,8 @@ 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 + poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 + privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 @@ -850,6 +868,7 @@ mapAliases ({ spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 + ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 steam-run-native = steam-run; # added 2022-02-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 @@ -867,6 +886,7 @@ mapAliases ({ telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 testVersion = testers.testVersion; # Added 2022-04-20 + tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 timescale-prometheus = promscale; # Added 2020-09-29 tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 @@ -960,6 +980,7 @@ mapAliases ({ xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 + xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07 ### Y ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95249c87fdb..af609d1e8a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -285,7 +285,7 @@ with pkgs; _0x = callPackage ../tools/misc/0x { }; atuin = callPackage ../tools/misc/atuin { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) AppKit Security SystemConfiguration; }; automatic-timezoned = callPackage ../tools/system/automatic-timezoned { }; @@ -364,6 +364,8 @@ with pkgs; blst = callPackage ../development/libraries/blst { }; + bloom = qt6Packages.callPackage ../development/tools/bloom { }; + bloodhound-py = callPackage ../tools/security/bloodhound-py { }; bodyclose = callPackage ../development/tools/bodyclose { }; @@ -445,6 +447,10 @@ with pkgs; ccal = callPackage ../tools/misc/ccal { }; + celeste-classic-pm = pkgs.celeste-classic.override { + practiceMod = true; + }; + cereal = cereal_1_3_0; cereal_1_3_0 = callPackage ../development/libraries/cereal/1.3.0.nix { }; cereal_1_3_2 = callPackage ../development/libraries/cereal/1.3.2.nix { }; @@ -642,6 +648,8 @@ with pkgs; efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; + elektroid = callPackage ../applications/audio/elektroid { }; + eludris = callPackage ../tools/misc/eludris { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -732,7 +740,9 @@ with pkgs; inherit (darwin) DarwinTools; }; - mix2nix = callPackage ../development/tools/mix2nix { }; + mix2nix = callPackage ../development/tools/mix2nix { + elixir = elixir_1_14; + }; n98-magerun = callPackage ../development/tools/misc/n98-magerun { }; @@ -1080,7 +1090,7 @@ with pkgs; mya = callPackage ../applications/misc/mya { }; mysql-shell = callPackage ../development/tools/mysql-shell { - inherit (darwin) cctools developer_cmds DarwinTools; + inherit (darwin) cctools DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. @@ -1089,7 +1099,7 @@ with pkgs; }; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { - inherit (darwin) cctools developer_cmds DarwinTools; + inherit (darwin) cctools DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. @@ -1116,7 +1126,7 @@ with pkgs; fetchs3 = callPackage ../build-support/fetchs3 { }; - fetchFromBittorrent = callPackage ../build-support/fetchbittorrent { }; + fetchtorrent = callPackage ../build-support/fetchtorrent { }; fetchsvn = if stdenv.buildPlatform != stdenv.hostPlatform # hack around splicing being crummy with things that (correctly) don't eval. @@ -1538,7 +1548,10 @@ with pkgs; adminer = callPackage ../servers/adminer { }; - akkoma = callPackage ../servers/akkoma { }; + akkoma = callPackage ../servers/akkoma { + elixir = elixir_1_14; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); + }; akkoma-frontends = recurseIntoAttrs { akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; admin-fe = callPackage ../servers/akkoma/admin-fe { }; @@ -1586,8 +1599,8 @@ with pkgs; }; honggfuzz = callPackage ../tools/security/honggfuzz { - clang = clang_12; - llvm = llvm_12; + clang = clang_16; + llvm = llvm_16; }; aflplusplus = callPackage ../tools/security/aflplusplus { @@ -1708,6 +1721,7 @@ with pkgs; butler = callPackage ../games/itch/butler.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; + buildGoModule = buildGo120Module; }; carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { }; @@ -1756,7 +1770,7 @@ with pkgs; fastfetch = darwin.apple_sdk_11_0.callPackage ../tools/misc/fastfetch { inherit (darwin.apple_sdk_11_0.frameworks) - AppKit Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices + AppKit Apple80211 Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices Foundation IOBluetooth MediaRemote OpenCL; inherit (darwin) moltenvk; @@ -2052,8 +2066,6 @@ with pkgs; tfk8s = callPackage ../tools/misc/tfk8s { }; - tfplugindocs = callPackage ../development/tools/tfplugindocs { }; - thumbs = callPackage ../tools/misc/thumbs { }; tnat64 = callPackage ../tools/networking/tnat64 { }; @@ -3986,7 +3998,10 @@ with pkgs; lesspass-cli = callPackage ../tools/security/lesspass-cli { }; - livebook = callPackage ../servers/web-apps/livebook { }; + livebook = callPackage ../servers/web-apps/livebook { + elixir = elixir_1_15; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_15; }); + }; lsix = callPackage ../tools/graphics/lsix { }; @@ -4090,7 +4105,10 @@ with pkgs; play-with-mpv = callPackage ../tools/video/play-with-mpv { }; - plausible = callPackage ../servers/web-apps/plausible { }; + plausible = callPackage ../servers/web-apps/plausible { + elixir = elixir_1_14; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); + }; pam-reattach = callPackage ../os-specific/darwin/pam-reattach { }; @@ -4678,7 +4696,10 @@ with pkgs; cloudbrute = callPackage ../tools/security/cloudbrute { }; - cloudflared = callPackage ../applications/networking/cloudflared { }; + cloudflared = callPackage ../applications/networking/cloudflared { + # https://github.com/cloudflare/cloudflared/issues/1054 + buildGoModule = buildGo120Module; + }; cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { }; @@ -4790,7 +4811,9 @@ with pkgs; wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; + wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { + ocamlPackages = ocaml-ng.ocamlPackages_5_0; + }; waylogout = callPackage ../tools/wayland/waylogout { }; @@ -5043,8 +5066,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - diesel-cli-ext = callPackage ../development/tools/diesel-cli-ext { }; - refinery-cli = callPackage ../development/tools/refinery-cli { }; digitemp = callPackage ../tools/misc/digitemp { }; @@ -5785,7 +5806,7 @@ with pkgs; klipper = callPackage ../servers/klipper { }; - klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { }; + klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-11; }; klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { }; @@ -5989,7 +6010,7 @@ with pkgs; }; micropad = callPackage ../applications/office/micropad { - electron = electron_25; + electron = electron_27; }; midicsv = callPackage ../tools/audio/midicsv { }; @@ -6009,6 +6030,8 @@ with pkgs; moar = callPackage ../tools/misc/moar { }; mobilizon = callPackage ../servers/mobilizon { + elixir = elixir_1_14; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { }; }; @@ -6240,7 +6263,7 @@ with pkgs; pn = callPackage ../tools/text/pn { }; pocket-casts = callPackage ../applications/audio/pocket-casts { - electron = electron_22; + electron = electron_27; }; portal = callPackage ../tools/misc/portal { }; @@ -7782,7 +7805,7 @@ with pkgs; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_24; + electron = electron_25; }; schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh @@ -8843,12 +8866,6 @@ with pkgs; grails = callPackage ../development/web/grails { jdk = null; }; - graylog-3_3 = callPackage ../tools/misc/graylog/3.3.nix { }; - - graylog-4_0 = callPackage ../tools/misc/graylog/4.0.nix { }; - - graylog-4_3 = callPackage ../tools/misc/graylog/4.3.nix { }; - graylog-5_0 = callPackage ../tools/misc/graylog/5.0.nix { }; graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { }; @@ -9918,8 +9935,6 @@ with pkgs; lhasa = callPackage ../tools/compression/lhasa { }; - libcpuid = callPackage ../tools/misc/libcpuid { }; - libcsptr = callPackage ../development/libraries/libcsptr { }; libgovirt = callPackage ../applications/virtualization/libgovirt { }; @@ -10312,7 +10327,7 @@ with pkgs; npmHooks = callPackage ../build-support/node/build-npm-package/hooks { }; - inherit (callPackage ../build-support/node/fetch-npm-deps { }) + inherit (callPackages ../build-support/node/fetch-npm-deps { }) fetchNpmDeps prefetch-npm-deps; nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs; @@ -10950,7 +10965,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_22; + electron = electron_25; # blank screen with electron_26 }; mosh = callPackage ../tools/networking/mosh { }; @@ -11776,8 +11791,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; }; - owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; - oxefmsynth = callPackage ../applications/audio/oxefmsynth { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -12144,7 +12157,10 @@ with pkgs; tautulli = python3Packages.callPackage ../servers/tautulli { }; - pleroma = callPackage ../servers/pleroma { }; + pleroma = callPackage ../servers/pleroma { + elixir = elixir_1_14; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); + }; plfit = callPackage ../tools/misc/plfit { python = null; @@ -12391,8 +12407,6 @@ with pkgs; pypass = with python3Packages; toPythonApplication pypass; - pyspread = libsForQt5.callPackage ../applications/office/pyspread { }; - teapot = callPackage ../applications/office/teapot { }; ticktick = callPackage ../applications/office/ticktick { }; @@ -13243,7 +13257,7 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair { }; sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Carbon CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight; }; sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { }; @@ -13420,8 +13434,6 @@ with pkgs; spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; - spigot = callPackage ../tools/misc/spigot { }; - spiped = callPackage ../tools/networking/spiped { }; sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { }; @@ -15457,6 +15469,9 @@ with pkgs; ### DEVELOPMENT / COMPILERS + temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21; + temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21; + temurin-bin-20 = javaPackages.compiler.temurin-bin.jdk-20; temurin-jre-bin-20 = javaPackages.compiler.temurin-bin.jre-20; @@ -16893,7 +16908,7 @@ with pkgs; ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 - ocamlformat_0_26_0; + ocamlformat_0_26_0 ocamlformat_0_26_1; inherit (ocamlPackages) odig; @@ -17168,7 +17183,7 @@ with pkgs; cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; @@ -17763,6 +17778,11 @@ with pkgs; luarocks = luaPackages.luarocks; luarocks-nix = luaPackages.luarocks-nix; + luarocks-packages-updater = callPackage ../development/lua-modules/updater { + inherit (python3Packages) buildPythonApplication ; + }; + + luau = callPackage ../development/interpreters/luau { }; lune = callPackage ../development/interpreters/lune { }; @@ -17982,10 +18002,6 @@ with pkgs; poetryPlugins = recurseIntoAttrs poetry.plugins; - poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix { - inherit pkgs lib; - }; - poetry2conda = callPackage ../tools/package-management/poetry2conda { }; pip-audit = callPackage ../development/tools/pip-audit { }; @@ -18117,7 +18133,6 @@ with pkgs; inherit (darwin) libobjc; }; - ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; starlark = callPackage ../development/interpreters/starlark { }; @@ -19653,7 +19668,11 @@ with pkgs; mermerd = callPackage ../development/tools/database/mermerd { }; - python-matter-server = with python3Packages; toPythonApplication python-matter-server; + python-matter-server = with python3Packages; toPythonApplication ( + python-matter-server.overridePythonAttrs (oldAttrs: { + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ oldAttrs.passthru.optional-dependencies.server; + }) + ); minify = callPackage ../development/web/minify { }; @@ -19864,8 +19883,6 @@ with pkgs; premake = premake4; - privacyidea = callPackage ../applications/misc/privacyidea { }; - process-compose = callPackage ../applications/misc/process-compose { }; process-viewer = callPackage ../applications/misc/process-viewer { }; @@ -20918,9 +20935,7 @@ with pkgs; cog = callPackage ../development/web/cog { }; - cosmocc = callPackage ../development/tools/cosmocc { }; - - cosmopolitan = callPackage ../development/libraries/cosmopolitan { }; + inherit (cosmopolitan) cosmocc; python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { }; @@ -20942,7 +20957,11 @@ with pkgs; cpp-jwt = callPackage ../development/libraries/cpp-jwt { }; - ctranslate2 = callPackage ../development/libraries/ctranslate2 { }; + ctranslate2 = callPackage ../development/libraries/ctranslate2 { + stdenv = if pkgs.config.cudaSupport then gcc11Stdenv else stdenv; + withCUDA = pkgs.config.cudaSupport; + withCuDNN = pkgs.config.cudaSupport; + }; ubus = callPackage ../development/libraries/ubus { }; @@ -22251,8 +22270,6 @@ with pkgs; jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { }; - jasper = callPackage ../development/libraries/jasper { }; - jbig2dec = callPackage ../development/libraries/jbig2dec { }; jbig2enc = callPackage ../development/libraries/jbig2enc { }; @@ -22443,6 +22460,10 @@ with pkgs; libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { }; + libaribcaption = callPackage ../by-name/li/libaribcaption/package.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreFoundation CoreGraphics CoreText; + }; + libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { }; libasr = callPackage ../development/libraries/libasr { }; @@ -22524,6 +22545,8 @@ with pkgs; then pkgs.libcanberra else pkgs.libcanberra-gtk2; + libcaption = callPackage ../development/libraries/libcaption { }; + libcbor = callPackage ../development/libraries/libcbor { }; libccd = callPackage ../development/libraries/libccd { }; @@ -23077,7 +23100,9 @@ with pkgs; inherit (lomiri) cmake-extras; }; - libre = callPackage ../development/libraries/libre { }; + libre = callPackage ../development/libraries/libre { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; librecast = callPackage ../development/libraries/librecast { }; @@ -23453,8 +23478,6 @@ with pkgs; libsigcxx = callPackage ../development/libraries/libsigcxx { }; - libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; - libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { }; libsigsegv = callPackage ../development/libraries/libsigsegv { }; @@ -24340,10 +24363,6 @@ with pkgs; ffmpeg = ffmpeg_4; }; - opencv3WithoutCuda = opencv3.override { - enableCuda = false; - }; - opencv4 = callPackage ../development/libraries/opencv/4.x.nix { inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; @@ -24351,6 +24370,10 @@ with pkgs; ffmpeg = ffmpeg_4; }; + opencv4WithoutCuda = opencv4.override { + enableCuda = false; + }; + opencv = opencv4; imath = callPackage ../development/libraries/imath { }; @@ -24647,7 +24670,7 @@ with pkgs; inherit (__splicedPackages) makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper bison cups dconf harfbuzz libGL perl gtk3 python3 - darwin buildPackages; + darwin; inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; inherit config; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; @@ -26036,10 +26059,6 @@ with pkgs; }; # Steel Bank Common Lisp - sbclBootstrap = wrapLisp { - pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {}; - faslExt = "fasl"; - }; sbcl_2_3_8 = wrapLisp { pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.8"; }; faslExt = "fasl"; @@ -26224,7 +26243,7 @@ with pkgs; jre = pkgs.jdk11_headless; python = python3; }; - cassandra = cassandra_3_11; + cassandra = cassandra_4; cassandra-cpp-driver = callPackage ../development/libraries/cassandra-cpp-driver/default.nix { }; @@ -26344,6 +26363,7 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; }; envoy = callPackage ../servers/http/envoy { + go = go_1_20; jdk = openjdk11_headless; gn = gn1924; }; @@ -27078,14 +27098,12 @@ with pkgs; timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; inherit (import ../servers/sql/postgresql pkgs) - postgresql_11 postgresql_12 postgresql_13 postgresql_14 postgresql_15 postgresql_16 - postgresql_11_jit postgresql_12_jit postgresql_13_jit postgresql_14_jit @@ -27096,12 +27114,10 @@ with pkgs; postgresql_jit = postgresql_15_jit.override { this = postgresql_jit; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; postgresqlJitPackages = recurseIntoAttrs postgresql_jit.pkgs; - postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs; postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs; postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs; postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs; postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs; - postgresql11JitPackages = recurseIntoAttrs postgresql_11_jit.pkgs; postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs; postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs; postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs; @@ -27343,7 +27359,6 @@ with pkgs; snipe-it = callPackage ../servers/web-apps/snipe-it { php = php81; - phpPackages = php81Packages; }; sogo = callPackage ../servers/web-apps/sogo { }; @@ -29022,6 +29037,8 @@ with pkgs; aileron = callPackage ../data/fonts/aileron { }; + alacritty-theme = callPackage ../data/themes/alacritty-theme { }; + albatross = callPackage ../data/themes/albatross { }; alegreya = callPackage ../data/fonts/alegreya { }; @@ -29288,6 +29305,8 @@ with pkgs; ferrum = callPackage ../data/fonts/ferrum { }; + fg-virgil = callPackage ../data/fonts/fg-virgil { }; + fixedsys-excelsior = callPackage ../data/fonts/fixedsys-excelsior { }; graphs = callPackage ../data/misc/graphs { }; @@ -30083,6 +30102,7 @@ with pkgs; tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { inherit (gnome) adwaita-icon-theme; + inherit (libsForQt5) breeze-icons; }; tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; @@ -30324,8 +30344,6 @@ with pkgs; anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { }; - yggdrasil = callPackage ../tools/networking/yggdrasil { }; - masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; @@ -30526,8 +30544,6 @@ with pkgs; brutefir = callPackage ../applications/audio/brutefir { }; - cadence = libsForQt5.callPackage ../applications/audio/cadence { }; - cheesecutter = callPackage ../applications/audio/cheesecutter { }; cutecapture = callPackage ../applications/video/cutecapture { }; @@ -30678,8 +30694,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; }; - blender-with-packages = callPackage ../applications/misc/blender/wrapper.nix { }; - blender-hip = blender.override { hipSupport = true; }; blflash = callPackage ../tools/misc/blflash { }; @@ -30755,8 +30769,6 @@ with pkgs; caerbannog = callPackage ../applications/misc/caerbannog { }; - cardboard = callPackage ../applications/window-managers/cardboard { }; - cardo = callPackage ../data/fonts/cardo { }; cage = callPackage ../applications/window-managers/cage { @@ -30873,10 +30885,6 @@ with pkgs; chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); - chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); - - chromiumDev = lowPrio (chromium.override { channel = "dev"; }); - chuck = callPackage ../applications/audio/chuck { inherit (darwin) DarwinTools; inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport; @@ -30995,6 +31003,8 @@ with pkgs; cosmic-panel = callPackage ../applications/window-managers/cosmic/panel { }; + cosmic-settings = callPackage ../applications/window-managers/cosmic/settings { }; + coursera-dl = callPackage ../applications/misc/coursera-dl { }; coyim = callPackage ../applications/networking/instant-messengers/coyim { }; @@ -31049,6 +31059,8 @@ with pkgs; dablin = callPackage ../applications/radio/dablin { }; + daktilo = callPackage ../tools/misc/daktilo { }; + darcs = haskell.lib.compose.overrideCabal (drv: { configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }) (haskell.lib.compose.justStaticExecutables haskellPackages.darcs); @@ -31950,6 +31962,10 @@ with pkgs; flex-ndax = callPackage ../applications/radio/flex-ndax { }; + floorp-unwrapped = callPackage ../applications/networking/browsers/floorp { }; + + floorp = wrapFirefox floorp-unwrapped { }; + fluxbox = callPackage ../applications/window-managers/fluxbox { }; hackedbox = callPackage ../applications/window-managers/hackedbox { }; @@ -32271,10 +32287,6 @@ with pkgs; google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; - google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; - - google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - go-graft = callPackage ../applications/networking/go-graft { }; gostatic = callPackage ../applications/misc/gostatic { }; @@ -33000,12 +33012,15 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { }; - k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { }; - inherit (callPackage ../applications/networking/cluster/k3s { }) - k3s_1_26 - k3s_1_27 - ; + k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { + buildGoModule = buildGo120Module; + }; + k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { + buildGoModule = buildGo120Module; + }; + inherit (callPackage ../applications/networking/cluster/k3s { + buildGoModule = buildGo120Module; + }) k3s_1_26 k3s_1_27; k3s = k3s_1_27; k3sup = callPackage ../applications/networking/cluster/k3sup { }; @@ -34924,7 +34939,7 @@ with pkgs; qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; - qpwgraph = libsForQt5.callPackage ../applications/audio/qpwgraph { }; + qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { }; qrcode = callPackage ../tools/graphics/qrcode { }; @@ -35357,7 +35372,10 @@ with pkgs; wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; + sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { + elixir = elixir_1_14; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); + }; stag = callPackage ../applications/misc/stag { curses = ncurses; @@ -35455,6 +35473,8 @@ with pkgs; super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + super-slicer-beta = super-slicer.beta; + super-slicer-latest = super-slicer.latest; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; @@ -35671,7 +35691,9 @@ with pkgs; taizen = callPackage ../applications/misc/taizen { }; - talosctl = callPackage ../applications/networking/cluster/talosctl { }; + talosctl = callPackage ../applications/networking/cluster/talosctl { + buildGoModule = buildGo120Module; + }; talentedhack = callPackage ../applications/audio/talentedhack { }; @@ -35683,7 +35705,9 @@ with pkgs; teams = callPackage ../applications/networking/instant-messengers/teams { }; - teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { }; + teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux { + electron = electron_27; + }; teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { }; @@ -37557,6 +37581,8 @@ with pkgs; brogue = callPackage ../games/brogue { }; + brogue-ce = callPackage ../games/brogue-ce { }; + brutalmaze = callPackage ../games/brutalmaze { }; bsdgames = callPackage ../games/bsdgames { }; @@ -38319,6 +38345,11 @@ with pkgs; }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; + rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2.nix { }; + rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure.nix { }; + experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix { }; + summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix { }; + shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix { }; shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; @@ -38382,8 +38413,6 @@ with pkgs; steamback = python311.pkgs.callPackage ../tools/games/steamback { }; - steamguard-cli = callPackage ../tools/security/steamguard-cli { }; - protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit winetricks steam-run yad; }; @@ -39455,9 +39484,7 @@ with pkgs; alt-ergo = callPackage ../applications/science/logic/alt-ergo { }; - aspino = callPackage ../applications/science/logic/aspino { - stdenv = gcc10StdenvCompat; - }; + aspino = callPackage ../applications/science/logic/aspino { }; beluga = callPackage ../applications/science/logic/beluga { }; @@ -39805,7 +39832,7 @@ with pkgs; caffe = callPackage ../applications/science/math/caffe ({ inherit (config) cudaSupport; cudaPackages = cudaPackages_10_1; - opencv3 = opencv3WithoutCuda; # Used only for image loading. + opencv4 = opencv4WithoutCuda; # Used only for image loading. blas = openblas; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; } // (config.caffe or {})); @@ -40449,6 +40476,8 @@ with pkgs; j2cli = with python3Packages; toPythonApplication j2cli; + jq-lsp = callPackage ../development/tools/language-servers/jq-lsp { }; + jquake = callPackage ../applications/misc/jquake { }; jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; @@ -40560,11 +40589,7 @@ with pkgs; nixStatic = pkgsStatic.nix; - nixops = callPackage ../tools/package-management/nixops { }; - - nixops_unstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); - - nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; + nixops_unstable = callPackage ../applications/networking/cluster/nixops { }; /* Evaluate a NixOS configuration using this evaluation of Nixpkgs. @@ -41530,6 +41555,10 @@ with pkgs; yandex-browser = callPackage ../applications/networking/browsers/yandex-browser { }; + yandex-browser-beta = yandex-browser.override { edition = "beta"; }; + + yandex-browser-corporate = yandex-browser.override { edition = "corporate"; }; + yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; yara = callPackage ../tools/security/yara { }; @@ -41664,8 +41693,6 @@ with pkgs; tora = libsForQt5.callPackage ../development/tools/tora { }; - xulrunner = firefox-unwrapped; - xrq = callPackage ../applications/misc/xrq { }; pynitrokey = callPackage ../tools/security/pynitrokey { }; @@ -41895,9 +41922,7 @@ with pkgs; stayrtr = callPackage ../servers/stayrtr { }; - sunshine = callPackage ../servers/sunshine { - ffmpeg_5-full = ffmpeg_5-full.override { nv-codec-headers = nv-codec-headers-11; }; - }; + sunshine = callPackage ../servers/sunshine { }; sentencepiece = callPackage ../development/libraries/sentencepiece { }; @@ -41948,7 +41973,7 @@ with pkgs; inherit (callPackage ../applications/misc/zettlr { texlive = texlive.combined.scheme-medium; - }) zettlr zettlr-beta; + }) zettlr; unpoller = callPackage ../servers/monitoring/unpoller { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 078bbb80942..5ca5e3867d5 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -125,7 +125,13 @@ let Verdi = callPackage ../development/coq-modules/Verdi {}; VST = callPackage ../development/coq-modules/VST ((lib.optionalAttrs (lib.versionAtLeast self.coq.version "8.14") { - compcert = self.compcert.override { version = "3.11"; }; + compcert = self.compcert.override { + version = with lib.versions; lib.switch self.coq.version [ + { case = isEq "8.17"; out = "3.13"; } + { case = range "8.15" "8.16"; out = "3.12"; } + { case = isEq "8.14"; out = "3.11"; } + ] null; + }; }) // (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") { ITree = self.ITree.override { version = "4.0.0"; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index ed049340332..bc35b206569 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -233,15 +233,25 @@ impure-cmds // appleSourcePackages // chooseLibs // { ../../nixos/modules/profiles/macos-builder.nix ] ++ modules; + # If you need to override this, consider starting with the right Nixpkgs + # in the first place, ie change `pkgs` in `pkgs.darwin.linux-builder`. + # or if you're creating new wiring that's not `pkgs`-centric, perhaps use the + # macos-builder profile directly. virtualisation.host = { inherit pkgs; }; + + nixpkgs.hostPlatform = lib.mkDefault (toGuest stdenv.hostPlatform.system); }; - system = toGuest stdenv.hostPlatform.system; + system = null; }; in nixos.config.system.build.macos-builder-installer) { modules = [ ]; }; + linux-builder-x86_64 = self.linux-builder.override { + modules = [ { nixpkgs.hostPlatform = "x86_64-linux"; } ]; + }; + } // lib.optionalAttrs config.allowAliases { builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 }); diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 85383eca38e..a4bafcc71dd 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -215,7 +215,7 @@ in { ../development/compilers/openjdk/21.nix ../development/compilers/zulu/21.nix { - openjdk21-bootstrap = temurin-bin.jdk-20; + openjdk21-bootstrap = temurin-bin.jdk-21; openjfx = openjfx21; }; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index c9d57a8d147..4fa6c306455 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -84,6 +84,8 @@ let self = rec { orftvthek = callPackage ../applications/video/kodi/addons/orftvthek { }; + radioparadise = callPackage ../applications/video/kodi/addons/radioparadise { }; + svtplay = callPackage ../applications/video/kodi/addons/svtplay { }; steam-controller = callPackage ../applications/video/kodi/addons/steam-controller { }; @@ -92,6 +94,8 @@ let self = rec { steam-library = callPackage ../applications/video/kodi/addons/steam-library { }; + somafm = callPackage ../applications/video/kodi/addons/somafm { }; + pdfreader = callPackage ../applications/video/kodi/addons/pdfreader { }; pvr-hts = callPackage ../applications/video/kodi/addons/pvr-hts { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d796fa7164d..c839d11748c 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -178,6 +178,14 @@ in { ]; }; + linux_6_6 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.6"; + 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 @@ -385,6 +393,8 @@ in { mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { }; + nct6687d = callPackage ../os-specific/linux/nct6687d { }; + new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { }; nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; @@ -573,6 +583,7 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); 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); } // 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 linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 @@ -633,7 +644,7 @@ in { packageAliases = { linux_default = packages.linux_6_1; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_5; + linux_latest = packages.linux_6_6; 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/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 872e67262a5..95c2ea7b418 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -742,7 +742,7 @@ let } else if lib.versionOlder "4.10.2" ocaml.version then import ../development/ocaml-modules/janestreet/0.15.nix { - inherit self; + inherit self ocaml; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; } else if lib.versionOlder "4.08" ocaml.version @@ -794,6 +794,7 @@ let janeStreet = import ../development/ocaml-modules/janestreet/0.15.nix { self = self' // jsDeps; + inherit ocaml; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; }; @@ -1272,6 +1273,7 @@ let ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; }; ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; }; + ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; }; ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7c121240193..7a0db7fa216 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -278,6 +278,25 @@ with self; { }; }; + AlienFFI = buildPerlPackage { + pname = "Alien-FFI"; + version = "0.27"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-FFI-0.27.tar.gz"; + hash = "sha256-Kbsgg/P5gqOfSFIkP09qEZFpZvIObneGTpkmnRHotl4="; + }; + patches = [ ../development/perl-modules/Alien-FFI-dont-download.patch ]; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.libffi CaptureTiny Test2Suite NetSSLeay MojoDOM58 IOSocketSSL ]; + propagatedBuildInputs = [ AlienBuild ]; + meta = { + homepage = "https://metacpan.org/pod/Alien::FFI"; + description = "Build and make available libffi"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + AlienGMP = buildPerlPackage { pname = "Alien-GMP"; version = "1.16"; @@ -992,6 +1011,61 @@ with self; { }; }; + ArchiveLibarchive = buildPerlPackage { + pname = "Archive-Libarchive"; + version = "0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-0.08.tar.gz"; + hash = "sha256-6ONC1U/T1uXn4xYP4IjBOgpQM8/76JSBodJHHUNyAFk="; + }; + patches = [ ../development/perl-modules/ArchiveLibarchive-set-findlib-path.patch ]; + postPatch = '' + substituteInPlace lib/Archive/Libarchive/Lib.pm --replace "@@libarchive@@" "${pkgs.libarchive.lib}/lib" + ''; + buildInputs = [ FFIC Filechdir PathTiny SubIdentify TermTable Test2Suite Test2ToolsMemoryCycle TestArchiveLibarchive TestScript ]; + propagatedBuildInputs = [ FFICStat FFICheckLib FFIPlatypus FFIPlatypusTypeEnum FFIPlatypusTypePtrObject RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/Archive::Libarchive"; + description = "Modern Perl bindings to libarchive"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + ArchiveLibarchiveExtract = buildPerlPackage { + pname = "Archive-Libarchive-Extract"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-Extract-0.03.tar.gz"; + hash = "sha256-yXfAR0hnIX6zJvte5pA04e9spBQUkWHjEpAblf0SwIE="; + }; + buildInputs = [ Test2Suite TestScript ]; + propagatedBuildInputs = [ ArchiveLibarchive Filechdir PathTiny RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/Archive::Libarchive::Extract"; + description = "An archive extracting mechanism (using libarchive)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + ArchiveLibarchivePeek = buildPerlPackage { + pname = "Archive-Libarchive-Peek"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Archive-Libarchive-Peek-0.04.tar.gz"; + hash = "sha256-DYhJ4xG2RsozWz6gGodTtAIkK5XOgAo7zNXHCC4nJPo="; + }; + buildInputs = [ Filechdir Test2Suite TestScript ]; + propagatedBuildInputs = [ ArchiveLibarchive PathTiny RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/Archive::Libarchive::Peek"; + description = "Peek into archives without extracting them"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + ArrayCompare = buildPerlModule { pname = "Array-Compare"; version = "3.0.7"; @@ -9187,6 +9261,23 @@ with self; { }; }; + FFIC = buildPerlPackage { + pname = "FFI-C"; + version = "0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-C-0.15.tar.gz"; + hash = "sha256-63BgfmZzvMsY3yf0zuRZ+23EGODak+aSzcNVX+QNL04="; + }; + buildInputs = [ CaptureTiny PathTiny Test2Suite ]; + propagatedBuildInputs = [ ClassInspector FFIPlatypus FFIPlatypusTypeEnum RefUtil SubIdentify SubInstall ]; + meta = { + homepage = "https://metacpan.org/pod/FFI::C"; + description = "C data types for FFI"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + FFICheckLib = buildPerlPackage { pname = "FFI-CheckLib"; version = "0.27"; @@ -9202,6 +9293,74 @@ with self; { }; }; + FFICStat = buildPerlPackage { + pname = "FFI-C-Stat"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-C-Stat-0.02.tar.gz"; + hash = "sha256-ThXY9vn5hAfGUtnTE7URUHcTkgGOBx18GShDrILBvlk="; + }; + buildInputs = [ Filechdir PathTiny Test2Suite TestScript ]; + propagatedBuildInputs = [ FFIPlatypus RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/FFI::C::Stat"; + description = "Object-oriented FFI interface to native stat and lstat"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + FFIPlatypus = buildPerlPackage { + pname = "FFI-Platypus"; + version = "2.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-2.08.tar.gz"; + hash = "sha256-EbOrEU7ZY1YxzYWzjSKXhuFEv5Sjr5rAnD17s0M2uSQ="; + }; + buildInputs = [ AlienFFI Test2Suite ]; + propagatedBuildInputs = [ CaptureTiny FFICheckLib ]; + meta = { + homepage = "https://pl.atypus.org"; + description = "Write Perl bindings to non-Perl libraries with FFI. No XS required"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + FFIPlatypusTypePtrObject = buildPerlPackage { + pname = "FFI-Platypus-Type-PtrObject"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-Type-PtrObject-0.03.tar.gz"; + hash = "sha256-4elJB++QtANgqabAPSlaEwR9T2ybVqyvHfK1TRcwf3Q="; + }; + buildInputs = [ Test2Suite Test2ToolsFFI ]; + propagatedBuildInputs = [ FFIPlatypus RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/FFI::Platypus::Type::PtrObject"; + description = "Platypus custom type for an object wrapped around an opaque pointer"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + FFIPlatypusTypeEnum = buildPerlPackage { + pname = "FFI-Platypus-Type-Enum"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-Platypus-Type-Enum-0.06.tar.gz"; + hash = "sha256-yVSmBPfWkpYk+pQT2NDh2DtL2XfQVifKznPtU6lcd98="; + }; + buildInputs = [ FFIPlatypus Test2Suite ]; + propagatedBuildInputs = [ RefUtil ]; + meta = { + homepage = "https://metacpan.org/pod/FFI::Platypus::Type::Enum"; + description = "Custom platypus type for dealing with C enumerated types"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + FennecLite = buildPerlModule { pname = "Fennec-Lite"; version = "0.004"; @@ -9810,6 +9969,21 @@ with self; { }; }; + FileShareDirDist = buildPerlPackage { + pname = "File-ShareDir-Dist"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-ShareDir-Dist-0.07.tar.gz"; + hash = "sha256-jX/l0O4iNR9B75Wtwi29VsMf+iqbLBmEMA6S/36f6G0="; + }; + meta = { + homepage = "https://metacpan.org/pod/File::ShareDir::Dist"; + description = "Locate per-dist shared files"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + FileShareDirInstall = buildPerlPackage { pname = "File-ShareDir-Install"; version = "0.13"; @@ -14099,6 +14273,21 @@ with self; { }; }; + LogfileRotate = buildPerlPackage { + pname = "Logfile-Rotate"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PA/PAULG/Logfile-Rotate-1.04.tar.gz"; + hash = "sha256-gQ+LfM2GV9Ox71PNR1glR4Rc67WCArBVObNAhjjK2j4="; + }; + meta = { + description = "Perl module to rotate logfiles"; + homepage = "https://metacpan.org/dist/Logfile-Rotate"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + Logger = buildPerlPackage { pname = "Log-ger"; version = "0.037"; @@ -14468,6 +14657,36 @@ with self; { }; }; + MacPropertyList = buildPerlPackage { + pname = "Mac-PropertyList"; + version = "1.504"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BD/BDFOY/Mac-PropertyList-1.504.tar.gz"; + hash = "sha256-aIl96Yw2j76c22iF1H3qADxG7Ho3MmNSPvZkVwc7eq4="; + }; + propagatedBuildInputs = [ XMLEntities ]; + meta = { + description = "Work with Mac plists at a low level"; + homepage = "https://github.com/briandfoy/mac-propertylist"; + license = lib.licenses.artistic2; + }; + }; + + MacSysProfile = buildPerlPackage { + pname = "Mac-SysProfile"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DM/DMUEY/Mac-SysProfile-0.05.tar.gz"; + hash = "sha256-QDOXa3dbOcwqaTtyoC1l71p7oDveTU2w3/RuEmx9n2w="; + }; + propagatedBuildInputs = [ MacPropertyList ]; + meta = { + description = "Perl extension for OS X system_profiler"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + platforms = lib.platforms.darwin; + }; + }; + MailAuthenticationResults = buildPerlPackage { pname = "Mail-AuthenticationResults"; version = "1.20200824.1"; @@ -15452,6 +15671,23 @@ with self; { }; }; + MinionBackendRedis = buildPerlModule { + pname = "Minion-Backend-Redis"; + version = "0.003"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DF/DFUG/Minion-Backend-Redis-0.003.tar.gz"; + hash = "sha256-zXZRIQbfHKmQF75fObSmXgSCawzZQxe3GsAWGzXzI6A="; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ Minion MojoRedis Mojolicious SortVersions ]; + meta = { + homepage = "https://github.com/Difegue/Minion-Backend-Redis"; + description = "Redis backend for Minion job queue"; + license = with lib.licenses; [ artistic2 ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + MinionBackendSQLite = buildPerlModule { pname = "Minion-Backend-SQLite"; version = "5.0.6"; @@ -16258,6 +16494,22 @@ with self; { }; }; + MojoliciousPluginRenderFile = buildPerlPackage { + pname = "Mojolicious-Plugin-RenderFile"; + version = "0.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KO/KOORCHIK/Mojolicious-Plugin-RenderFile-0.12.tar.gz"; + hash = "sha256-AT5CoswGvHBBuxPJ3ziK8kAQ5peTqN8PCrHSQKphFz8="; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + description = "\"render_file\" helper for Mojolicious"; + homepage = "https://github.com/koorchik/Mojolicious-Plugin-RenderFile"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + MojoliciousPluginStatus = buildPerlPackage { pname = "Mojolicious-Plugin-Status"; version = "1.17"; @@ -16290,6 +16542,23 @@ with self; { }; }; + MojoliciousPluginTemplateToolkit = buildPerlModule { + pname = "Mojolicious-Plugin-TemplateToolkit"; + version = "0.006"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojolicious-Plugin-TemplateToolkit-0.006.tar.gz"; + hash = "sha256-dBoFAmtTArtrKc+I3KICC3rv0iNHgWELpZNaqPCXNKY="; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ ClassMethodModifiers Mojolicious TemplateToolkit ]; + meta = { + homepage = "https://github.com/Grinnz/Mojolicious-Plugin-TemplateToolkit"; + description = "Template Toolkit renderer plugin for Mojolicious"; + license = with lib.licenses; [ artistic2 ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + MojoliciousPluginTextExceptions = buildPerlPackage { pname = "Mojolicious-Plugin-TextExceptions"; version = "0.02"; @@ -16856,6 +17125,22 @@ with self; { }; }; + TestArchiveLibarchive = buildPerlPackage { + pname = "Test-Archive-Libarchive"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Archive-Libarchive-0.02.tar.gz"; + hash = "sha256-KxkYZx4F2i2dIiwQx9kXWFpiQYb+r7j4SQhZnDRwJ1E="; + }; + propagatedBuildInputs = [ RefUtil Test2Suite ]; + meta = { + homepage = "https://metacpan.org/pod/Test::Archive::Libarchive"; + description = "Testing tools for Archive::Libarchive"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + TestPostgreSQL = buildPerlModule { pname = "Test-PostgreSQL"; version = "1.29"; @@ -17783,6 +18068,20 @@ with self; { }; }; + NetDNSNative = buildPerlPackage { + pname = "Net-DNS-Native"; + version = "0.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLEG/Net-DNS-Native-0.22.tar.gz"; + hash = "sha256-EI2d7bq5/69qDQFSVSbeGJSITpUL/YM3F+XNOJBcMNU="; + }; + meta = { + description = "Non-blocking system DNS resolver"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + NetIdent = buildPerlPackage { pname = "Net-Ident"; version = "1.25"; @@ -18034,6 +18333,22 @@ with self; { }; }; + NetCUPS = buildPerlPackage { + pname = "Net-CUPS"; + version = "0.64"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.64.tar.gz"; + hash = "sha256-17x3/w9iv4dMhDxZDrEqgLvUR0mi+3Tb7URcNdDoWoU="; + }; + buildInputs = [ pkgs.cups pkgs.cups-filters ]; + NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.cups}/lib -lcups"; + meta = { + description = "Common Unix Printing System Interface"; + homepage = "https://github.com/niner/perl-Net-CUPS"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetDBus = buildPerlPackage { pname = "Net-DBus"; version = "1.2.0"; @@ -19225,6 +19540,22 @@ with self; { }; }; + ParallelLoops = buildPerlPackage { + pname = "Parallel-Loops"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMORCH/Parallel-Loops-0.10.tar.gz"; + hash = "sha256-b5Z7RuejY7FocbmZHDWeFC3Dsigc/psa85kEcEyL0qo="; + }; + propagatedBuildInputs = [ ParallelForkManager ]; + meta = { + description = "Execute loops using parallel forked subprocesses"; + homepage = "https://github.com/pmorch/perl-Parallel-Loops"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + ParallelPipes = buildPerlModule { pname = "Parallel-Pipes"; version = "0.102"; @@ -19380,6 +19711,20 @@ with self; { }; }; + ParseEDID = buildPerlPackage { + pname = "Parse-Edid"; + version = "1.0.7"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GROUSSE/Parse-EDID-1.0.7.tar.gz"; + hash = "sha256-GtwPEFoyGYoqK02lsOD5hfBe/tmc42YZCnkOFl1nW/E="; + }; + buildInputs = [ TestWarn ]; + meta = { + description = "Extended display identification data (EDID) parser"; + license = lib.licenses.gpl3Plus; + }; + }; + ParseDebControl = buildPerlPackage { pname = "Parse-DebControl"; version = "2.005"; @@ -19986,10 +20331,10 @@ with self; { PerlMagick = ImageMagick; # added 2021-08-02 ImageMagick = buildPerlPackage rec { pname = "Image-Magick"; - version = "7.1.1-18"; + version = "7.1.1-20"; src = fetchurl { url = "mirror://cpan/authors/id/J/JC/JCRISTY/Image-Magick-${version}.tar.gz"; - hash = "sha256-42mvGP4FkY/YfPOh/jRiUFWdDk+S2oB0Jfqv30AAlxw="; + hash = "sha256-oMAwXQBxuV2FgPHBhUi+toNFPVnRLNjZqdP2q+ki6jg="; }; buildInputs = [ pkgs.imagemagick ]; preConfigure = @@ -20449,6 +20794,35 @@ with self; { }; }; + ProcDaemon = buildPerlPackage { + pname = "Proc-Daemon"; + version = "0.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AK/AKREAL/Proc-Daemon-0.23.tar.gz"; + hash = "sha256-NMC4W3lItDHLq8l87lgINeUVzPQ7rb2DOesQlHQIm2k="; + }; + buildInputs = [ ProcProcessTable ]; + meta = { + description = "Run Perl program(s) as a daemon process"; + homepage = "https://github.com/akreal/Proc-Daemon"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + ProcPIDFile = buildPerlPackage { + pname = "Proc-PID-File"; + version = "1.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DM/DMITRI/Proc-PID-File-1.29.tar.gz"; + hash = "sha256-O87aSd8YLT2BaLcMKlGyBW8v1FlQptBCipmS/TVc1KQ="; + }; + meta = { + description = "Manage process id files"; + homepage = "https://github.com/dtikhonov/Proc-PID-File"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ProcFind = buildPerlPackage { pname = "Proc-Find"; version = "0.051"; @@ -23128,6 +23502,21 @@ with self; { }; }; + SysCpuAffinity = buildPerlModule { + pname = "Sys-CpuAffinity"; + version = "1.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MOB/Sys-CpuAffinity-1.12.tar.gz"; + hash = "sha256-/jLAXz6wWXCMZH8ruFslBFhZHyupBR2Nhm9Uajh+6Eg="; + }; + doCheck = false; # Would run checks for all supported systems + meta = { + description = "Set CPU affinity for processes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + SysHostnameLong = buildPerlPackage { pname = "Sys-Hostname-Long"; version = "1.5"; @@ -23848,6 +24237,40 @@ with self; { }; }; + Test2ToolsFFI = buildPerlPackage { + pname = "Test2-Tools-FFI"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test2-Tools-FFI-0.06.tar.gz"; + hash = "sha256-MA28QKEubG+7y7lv05uQK+bZZXJtrx5qtzuKCv0lLy8="; + }; + buildInputs = [ FileShareDirInstall Test2Suite ]; + propagatedBuildInputs = [ CaptureTiny FFICheckLib FFIPlatypus FileShareDirDist ]; + meta = { + homepage = "https://metacpan.org/pod/Test2::Tools::FFI"; + description = "Tools for testing FFI"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + + Test2ToolsMemoryCycle = buildPerlPackage { + pname = "Test2-Tools-MemoryCycle"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test2-Tools-MemoryCycle-0.01.tar.gz"; + hash = "sha256-U1s9ylQqMyUVEq3ktafb6+PESNg/iA0ZjkPcEnl5aYs="; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ DevelCycle PadWalker ]; + meta = { + homepage = "https://metacpan.org/pod/Test2::Tools::MemoryCycle"; + description = "Check for memory leaks and circular memory references"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ tomasajt ]; + }; + }; + TestAbortable = buildPerlPackage { pname = "Test-Abortable"; version = "0.002"; @@ -27685,6 +28108,24 @@ with self; { }; }; + XMLEntities = buildPerlPackage { + pname = "XML-Entities"; + version = "1.0002"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SI/SIXTEASE/XML-Entities-1.0002.tar.gz"; + hash = "sha256-wyqk8wlXPXZIqy5Bb2K2sgZS8q2c/T7sgv1REB/nMQ0="; + }; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + propagatedBuildInputs = [ LWP ]; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/download-entities.pl + ''; + meta = { + description = "Mapping of XML entities to Unicode"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + XMLDOM = buildPerlPackage { pname = "XML-DOM"; version = "1.46"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0d7e6321d54..00f517bc578 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 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 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 @@ -128,6 +129,7 @@ mapAliases ({ eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 EasyProcess = easyprocess; # added 2023-02-19 email_validator = email-validator; # added 2022-06-22 + enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 et_xmlfile = et-xmlfile; # added 2023-10-16 ev3dev2 = python-ev3dev2; # added 2023-06-19 Fabric = fabric; # addedd 2023-02-19 @@ -201,6 +203,7 @@ mapAliases ({ jaraco_text = jaraco-text; # added 2023-07-14 jaraco_stream = jaraco-stream; # added 2023-07-14 JayDeBeApi = jaydebeapi; # added 2023-02-19 + jinja2_pluralize = jinja2-pluralize; # added 2023-11-01 jinja2_time = jinja2-time; # added 2022-11-07 JPype1 = jpype1; # added 2023-02-19 jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28 @@ -244,6 +247,7 @@ mapAliases ({ 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."; + openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30 opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 @@ -259,7 +263,7 @@ mapAliases ({ 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 - privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 + privacyidea-ldap-proxy = throw "privacyidea-ldap-proxy has been removed from nixpkgs"; # added 2023-10-31 prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 protonup = protonup-ng; # Added 2022-11-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd7dc514102..806d4d6609f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,8 +18,6 @@ self: super: with self; { }); }; - bootstrapped-pip = toPythonModule (callPackage ../development/python-modules/bootstrapped-pip { }); - setuptools = callPackage ../development/python-modules/setuptools { }; a2wsgi = callPackage ../development/python-modules/a2wsgi { }; @@ -306,8 +304,6 @@ self: super: with self; { aionanoleaf = callPackage ../development/python-modules/aionanoleaf { }; - aionotify = callPackage ../development/python-modules/aionotify { }; - aionotion = callPackage ../development/python-modules/aionotion { }; aiooncue = callPackage ../development/python-modules/aiooncue { }; @@ -1444,6 +1440,8 @@ self: super: with self; { bip-utils = callPackage ../development/python-modules/bip-utils { }; + bip32 = callPackage ../development/python-modules/bip32 { }; + bitarray = callPackage ../development/python-modules/bitarray { }; bitbox02 = callPackage ../development/python-modules/bitbox02 { }; @@ -2126,6 +2124,8 @@ self: super: with self; { cloudflare = callPackage ../development/python-modules/cloudflare { }; + cloudpathlib = callPackage ../development/python-modules/cloudpathlib { }; + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; cloudscraper = callPackage ../development/python-modules/cloudscraper { }; @@ -2240,8 +2240,12 @@ self: super: with self; { compiledb = callPackage ../development/python-modules/compiledb { }; + complycube = callPackage ../development/python-modules/complycube { }; + compreffor = callPackage ../development/python-modules/compreffor { }; + compressai = callPackage ../development/python-modules/compressai { }; + concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { }; conda = callPackage ../development/python-modules/conda { }; @@ -2896,6 +2900,8 @@ self: super: with self; { django-allauth = callPackage ../development/python-modules/django-allauth { }; + django-allauth-2fa = callPackage ../development/python-modules/django-allauth-2fa { }; + django-anymail = callPackage ../development/python-modules/django-anymail { }; django-annoying = callPackage ../development/python-modules/django-annoying { }; @@ -3054,6 +3060,8 @@ self: super: with self; { django-prometheus = callPackage ../development/python-modules/django-prometheus { }; + django-pwa = callPackage ../development/python-modules/django-pwa { }; + django-q = callPackage ../development/python-modules/django-q { }; django-scheduler = callPackage ../development/python-modules/django-scheduler { }; @@ -3529,8 +3537,6 @@ self: super: with self; { energyzero = callPackage ../development/python-modules/energyzero { }; - enhancements = callPackage ../development/python-modules/enhancements { }; - enlighten = callPackage ../development/python-modules/enlighten { }; enocean = callPackage ../development/python-modules/enocean { }; @@ -4093,6 +4099,8 @@ self: super: with self; { flit-scm = callPackage ../development/python-modules/flit-scm { }; + floret = callPackage ../development/python-modules/floret { }; + flow-record = callPackage ../development/python-modules/flow-record { }; flower = callPackage ../development/python-modules/flower { }; @@ -5562,9 +5570,7 @@ self: super: with self; { jaraco-text = callPackage ../development/python-modules/jaraco-text { }; - jarowinkler = callPackage ../development/python-modules/jarowinkler { - inherit (pkgs) cmake ninja; - }; + jarowinkler = callPackage ../development/python-modules/jarowinkler { }; javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; @@ -5631,7 +5637,7 @@ self: super: with self; { jinja2-git = callPackage ../development/python-modules/jinja2-git { }; - jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; + jinja2-pluralize = callPackage ../development/python-modules/jinja2-pluralize { }; jinja2-time = callPackage ../development/python-modules/jinja2-time { }; @@ -5747,6 +5753,8 @@ self: super: with self; { junitparser = callPackage ../development/python-modules/junitparser { }; + junit2html = callPackage ../development/python-modules/junit2html { }; + junit-xml = callPackage ../development/python-modules/junit-xml { }; junos-eznc = callPackage ../development/python-modules/junos-eznc { }; @@ -5976,6 +5984,8 @@ self: super: with self; { krakenex = callPackage ../development/python-modules/krakenex { }; + krfzf-py = callPackage ../development/python-modules/krfzf-py { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; l18n = callPackage ../development/python-modules/l18n { }; @@ -7031,6 +7041,8 @@ self: super: with self; { mpmath = callPackage ../development/python-modules/mpmath { }; + mpris-server = callPackage ../development/python-modules/mpris-server { }; + mpv = callPackage ../development/python-modules/mpv { inherit (pkgs) mpv; }; @@ -8415,8 +8427,6 @@ self: super: with self; { openant = callPackage ../development/python-modules/openant { }; - openapi-schema-pydantic = callPackage ../development/python-modules/openapi-schema-pydantic { }; - openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { }; openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; @@ -9097,6 +9107,8 @@ self: super: with self; { prodict = callPackage ../development/python-modules/prodict { }; + prometheus-pandas = callPackage ../development/python-modules/prometheus-pandas { }; + prophet = callPackage ../development/python-modules/prophet { }; propka = callPackage ../development/python-modules/propka { }; @@ -9117,6 +9129,7 @@ self: super: with self; { pycketcasts = callPackage ../development/python-modules/pycketcasts { }; + pycomposefile = callPackage ../development/python-modules/pycomposefile { }; pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; pycookiecheat = callPackage ../development/python-modules/pycookiecheat { }; @@ -9504,8 +9517,6 @@ self: super: with self; { prison = callPackage ../development/python-modules/prison { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea-ldap-proxy { }; - proboscis = callPackage ../development/python-modules/proboscis { }; process-tests = callPackage ../development/python-modules/process-tests { }; @@ -11498,6 +11509,8 @@ self: super: with self; { python-olm = callPackage ../development/python-modules/python-olm { }; + python-on-whales = callPackage ../development/python-modules/python-on-whales { }; + python-opendata-transport = callPackage ../development/python-modules/python-opendata-transport { }; python-openstackclient = callPackage ../development/python-modules/python-openstackclient { }; @@ -11642,6 +11655,8 @@ self: super: with self; { pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + pytorch-msssim = callPackage ../development/python-modules/pytorch-msssim { }; + pytorch-pfn-extras = callPackage ../development/python-modules/pytorch-pfn-extras { }; pytraccar = callPackage ../development/python-modules/pytraccar { }; @@ -13233,6 +13248,8 @@ self: super: with self; { texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; }; + sphinxcontrib-wavedrom = callPackage ../development/python-modules/sphinxcontrib-wavedrom { }; + sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; sphinxcontrib-youtube = callPackage ../development/python-modules/sphinxcontrib-youtube { }; @@ -13317,6 +13334,8 @@ self: super: with self; { sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + sqlite-migrate = callPackage ../development/python-modules/sqlite-migrate { }; + sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { }; sqlite-utils = callPackage ../development/python-modules/sqlite-utils { }; @@ -13685,16 +13704,62 @@ self: super: with self; { inherit (pkgs.config) cudaSupport; }; - tensorflow-build = callPackage ../development/python-modules/tensorflow { + tensorflow-build = let + compat = rec { + protobufTF = pkgs.protobuf3_21.override { + abseil-cpp = pkgs.abseil-cpp; + }; + grpcTF = (pkgs.grpc.overrideAttrs ( + oldAttrs: rec { + # nvcc fails on recent grpc versions, so we use the latest patch level + # of the grpc version bundled by upstream tensorflow to allow CUDA + # support + version = "1.27.3"; + src = pkgs.fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + hash = "sha256-PpiOT4ZJe1uMp5j+ReQulC9jpT0xoR2sAl6vRYKA0AA="; + fetchSubmodules = true; + }; + patches = [ ]; + postPatch = '' + sed -i "s/-std=c++11/-std=c++17/" CMakeLists.txt + echo "set(CMAKE_CXX_STANDARD 17)" >> CMakeLists.txt + ''; + }) + ).override { + protobuf = protobufTF; + }; + protobuf-pythonTF = self.protobuf.override { + protobuf = protobufTF; + }; + grpcioTF = self.grpcio.override { + protobuf = protobufTF; + grpc = grpcTF; + }; + tensorboard-plugin-profileTF = self.tensorboard-plugin-profile.override { + protobuf = protobuf-pythonTF; + }; + tensorboardTF = self.tensorboard.override { + grpcio = grpcioTF; + protobuf = protobuf-pythonTF; + tensorboard-plugin-profile = tensorboard-plugin-profileTF; + }; + }; + in + callPackage ../development/python-modules/tensorflow { inherit (pkgs.darwin) cctools; inherit (pkgs.config) cudaSupport; inherit (self.tensorflow-bin) cudaPackages; inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers; flatbuffers-python = self.flatbuffers; - protobuf-core = pkgs.protobuf; - protobuf-python = self.protobuf; - lmdb-core = pkgs.lmdb; + protobuf-core = compat.protobufTF; + protobuf-python = compat.protobuf-pythonTF; + grpc = compat.grpcTF; + grpcio = compat.grpcioTF; + tensorboard = compat.tensorboardTF; }; tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { }; @@ -15492,6 +15557,8 @@ self: super: with self; { wcwidth = callPackage ../development/python-modules/wcwidth { }; + weasel = callPackage ../development/python-modules/weasel { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; weaviate-client = callPackage ../development/python-modules/weaviate-client { }; @@ -15608,6 +15675,8 @@ self: super: with self; { withings-api = callPackage ../development/python-modules/withings-api { }; + withings-sync = callPackage ../development/python-modules/withings-sync { }; + wktutils = callPackage ../development/python-modules/wktutils { }; wled = callPackage ../development/python-modules/wled { }; |