diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/agda-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 33 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 495 | ||||
| -rw-r--r-- | pkgs/top-level/coq-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/cubocore-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/cuda-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/darwin-packages.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/java-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/linux-kernels.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 96 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 109 | ||||
| -rw-r--r-- | pkgs/top-level/release-attrpaths-superset.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/release-cuda.nix | 191 | ||||
| -rw-r--r-- | pkgs/top-level/release-python.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/stage.nix | 2 |
20 files changed, 530 insertions, 507 deletions
diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 1e0e6e0a2d586..d1097a48327bc 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -35,5 +35,7 @@ let agdarsec = callPackage ../development/libraries/agda/agdarsec { }; _1lab = callPackage ../development/libraries/agda/1lab { }; + + generics = callPackage ../development/libraries/agda/generics { }; }; in mkAgdaPackages Agda diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 71c93af775413..4f0b3a9f0aee4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -86,6 +86,13 @@ mapAliases ({ ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 + apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_1 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_2 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 antimicroX = antimicrox; # Added 2021-10-31 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 @@ -126,6 +133,7 @@ mapAliases ({ bitwarden = bitwarden-desktop; # Added 2024-02-25 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 + blackmagic-desktop-video = throw "blackmagic-desktop-video has been due to being unmaintained"; # Added 2024-07-02 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 @@ -149,6 +157,7 @@ mapAliases ({ bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17 bukut = throw "bukut has been removed since it has been archived by upstream"; # Added 2023-05-24 + butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18 # Shorter names; keep the longer name for back-compat. Added 2023-04-11 buildFHSUserEnv = buildFHSEnv; buildFHSUserEnvChroot = buildFHSEnvChroot; @@ -202,6 +211,8 @@ mapAliases ({ collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 + coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 + cosmic-tasks = tasks; # Added 2024-07-04 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 @@ -555,6 +566,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 + gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 @@ -688,6 +700,7 @@ mapAliases ({ libcxxabi = throw "'libcxxabi' was merged into 'libcxx'"; # Converted to throw 2024-03-08 libdwarf_20210528 = throw "'libdwarf_20210528' has been removed because it is not used in nixpkgs, move to libdwarf"; # Added 2024-03-23 libgme = game-music-emu; # Added 2022-07-20 + libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22 libgpgerror = libgpg-error; # Added 2021-09-04 libheimdal = heimdal; # Added 2022-11-18 libintlOrEmpty = throw "'libintlOrEmpty' has been replaced by gettext"; # Converted to throw 2023-09-10 @@ -849,6 +862,8 @@ mapAliases ({ mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 + marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-darkcyan" marwaita-darkcyan; # Added 2024-07-01 + marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01 matrique = spectral; # Added 2020-01-27 matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 @@ -914,18 +929,18 @@ mapAliases ({ netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 netease-music-tui = throw "netease-music-tui has been removed due to unmaintained by upstream and broken functionality"; # Added 2024-03-03 - nextcloud26 = throw '' - Nextcloud v26 has been removed from `nixpkgs` as the support for is dropped - by upstream in 2024-04. Please upgrade to at least Nextcloud v27 by declaring + nextcloud27 = throw '' + Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped + by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring - services.nextcloud.package = pkgs.nextcloud27; + services.nextcloud.package = pkgs.nextcloud28; in your NixOS config. - WARNING: if you were on Nextcloud 25 you have to upgrade to Nextcloud 26 - first on 23.11 because Nextcloud doesn't support upgrades across multiple major versions! - ''; # Added 2023-10-13 - nextcloud25Packages = throw "Nextcloud25 is EOL!"; # Added 2023-10-13 + WARNING: if you were on Nextcloud 26 you have to upgrade to Nextcloud 27 + first on 24.05 because Nextcloud doesn't support upgrades across multiple major versions! + ''; # Added 2024-06-25 + nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 neoload = throw "'neoload' has been removed as it is broken and unmaintained"; # Added 2024-03-02 @@ -1343,11 +1358,13 @@ mapAliases ({ tkcvs = tkrev; # Added 2022-03-07 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 + tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 tootle = throw "'tootle' has been removed as it is not maintained upstream. Consider using 'tuba' instead"; # Added 2024-02-11 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 transmission = lib.warn (transmission3Warning {}) transmission_3; # Added 2024-06-10 transmission-gtk = lib.warn (transmission3Warning {suffix = "-gtk";}) transmission_3-gtk; # Added 2024-06-10 transmission-qt = lib.warn (transmission3Warning {suffix = "-qt";}) transmission_3-qt; # Added 2024-06-10 + treefmt = treefmt2; # 2024-06-28 libtransmission = lib.warn (transmission3Warning {prefix = "lib";}) libtransmission_3; # Added 2024-06-10 transfig = fig2dev; # Added 2022-02-15 transifex-client = transifex-cli; # Added 2023-12-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3c68a62eec4..e439820389df6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -411,8 +411,6 @@ with pkgs; caroline = callPackage ../development/libraries/caroline { }; - cartridges = callPackage ../applications/misc/cartridges { }; - castget = callPackage ../applications/networking/feedreaders/castget { }; catatonit = callPackage ../applications/virtualization/catatonit { }; @@ -839,9 +837,11 @@ with pkgs; grsync = callPackage ../applications/misc/grsync { }; + devShellTools = callPackage ../build-support/dev-shell-tools { }; + dockerTools = callPackage ../build-support/docker { writePython3 = buildPackages.writers.writePython3; - } // { __attrsFailEvaluation = true; }; + }; fakeNss = callPackage ../build-support/fake-nss { }; @@ -1075,14 +1075,14 @@ with pkgs; fetchpatch = callPackage ../build-support/fetchpatch { # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 - patchutils = buildPackages.patchutils_0_3_3; + patchutils = __splicedPackages.patchutils_0_3_3; } // { tests = pkgs.tests.fetchpatch; version = 1; }; fetchpatch2 = callPackage ../build-support/fetchpatch { - patchutils = buildPackages.patchutils_0_4_2; + patchutils = __splicedPackages.patchutils_0_4_2; } // { tests = pkgs.tests.fetchpatch2; version = 2; @@ -1229,8 +1229,6 @@ with pkgs; libredirect = callPackage ../build-support/libredirect { }; - livecaptions = callPackage ../applications/misc/livecaptions { }; - madonctl = callPackage ../applications/misc/madonctl { }; copyDesktopItems = makeSetupHook { @@ -1290,7 +1288,10 @@ with pkgs; mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit lib writeText; inherit (emacs.pkgs) inherit-local; }; + nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix { + inherit lib writeText; + inherit (emacs.pkgs) inherit-local; + }; nix-gitignore = callPackage ../build-support/nix-gitignore { }; @@ -1363,7 +1364,7 @@ with pkgs; fixDarwinDylibNames = makeSetupHook { name = "fix-darwin-dylib-names-hook"; - substitutions = { inherit (binutils) targetPrefix; }; + substitutions = { inherit (darwin.binutils) targetPrefix; }; meta.platforms = lib.platforms.darwin; } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; @@ -1532,6 +1533,7 @@ with pkgs; admin-fe = callPackage ../servers/akkoma/admin-fe { nodejs = nodejs_18; yarn = yarn.override { nodejs = nodejs_18; }; + python3 = python311; }; }; akkoma-emoji = recurseIntoAttrs { @@ -1548,8 +1550,6 @@ with pkgs; wxGTK = wxGTK32; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { }; - aerospike = callPackage ../servers/nosql/aerospike { }; aespipe = callPackage ../tools/security/aespipe { }; @@ -1643,7 +1643,6 @@ with pkgs; aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { - inherit (gnome) zenity; inherit (plasma5Packages) kdialog; }; @@ -1691,10 +1690,6 @@ with pkgs; btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { }; - butler = callPackage ../by-name/bu/butler/package.nix { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { }; cf-vault = callPackage ../tools/admin/cf-vault { }; @@ -2354,8 +2349,6 @@ with pkgs; git-mit = callPackage ../applications/version-management/git-mit { }; - git-my = callPackage ../applications/version-management/git-my { }; - git-machete = python3Packages.callPackage ../applications/version-management/git-machete { }; git-nomad = callPackage ../applications/version-management/git-nomad { }; @@ -2776,9 +2769,7 @@ with pkgs; vice = callPackage ../applications/emulators/vice { }; - winetricks = callPackage ../applications/emulators/wine/winetricks.nix { - inherit (gnome) zenity; - }; + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { }; xcpc = callPackage ../applications/emulators/xcpc { }; @@ -2854,7 +2845,7 @@ with pkgs; x16-run = x16.run; yabause = libsForQt5.callPackage ../applications/emulators/yabause { - freeglut = null; + libglut = null; openal = null; }; @@ -2884,6 +2875,10 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; + saunafs = callPackage ../by-name/sa/saunafs/package.nix { + boost = boost185; + }; + mucommander = callPackage ../applications/file-managers/mucommander { }; nnn = callPackage ../applications/file-managers/nnn { }; @@ -3335,8 +3330,6 @@ with pkgs; berglas = callPackage ../tools/admin/berglas { }; - betterdiscordctl = callPackage ../tools/misc/betterdiscordctl { }; - betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { }; binocle = callPackage ../applications/misc/binocle { @@ -3473,8 +3466,6 @@ with pkgs; bkyml = callPackage ../tools/misc/bkyml { }; - blackmagic-desktop-video = callPackage ../tools/video/blackmagic-desktop-video { }; - blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; bmap-tools = callPackage ../tools/misc/bmap-tools { }; @@ -4550,14 +4541,14 @@ with pkgs; cloudflared = callPackage ../applications/networking/cloudflared { # https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250 buildGoModule = buildGoModule.override { - go = go_1_21.overrideAttrs { + go = go_1_22.overrideAttrs { pname = "cloudflare-go"; - version = "0-unstable-2023-12-06"; + version = "1.22.2-devel-cf"; src = fetchFromGitHub { owner = "cloudflare"; repo = "go"; - rev = "34129e47042e214121b6bbff0ded4712debed18e"; - sha256 = "sha256-RA9KTY4cSxIt7dyJgAFQPemc6YBgcSwc/hqB4JHPxng="; + rev = "ec0a014545f180b0c74dfd687698657a9e86e310"; + sha256 = "sha256-oQQ9Jyh8TphZSCaHqaugTL7v0aeZjyOdVACz86I2KvU="; }; }; }; @@ -4727,8 +4718,6 @@ with pkgs; clockify = callPackage ../applications/office/clockify { }; - contrast = callPackage ../applications/accessibility/contrast { }; - cplex = callPackage ../applications/science/math/cplex (config.cplex or {}); cpulimit = callPackage ../tools/misc/cpulimit { }; @@ -5274,8 +5263,6 @@ with pkgs; futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark; - fx = callPackage ../development/tools/fx { }; - tllist = callPackage ../development/libraries/tllist { }; fcft = callPackage ../development/libraries/fcft { }; @@ -5487,6 +5474,10 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; + hyprland = callPackage ../by-name/hy/hyprland/package.nix { + libliftoff = libliftoff_0_4; + }; + hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { }; @@ -5689,8 +5680,8 @@ with pkgs; loccount = callPackage ../development/tools/misc/loccount { }; logseq = callPackage ../by-name/lo/logseq/package.nix { - # electron version from: https://github.com/logseq/logseq/blob/d8c6ca264bdf9a6a0f03c46dbf3509210367624a/package.json#L116 - electron = electron_28; + # electron version from: https://github.com/logseq/logseq/blob/0.10.9/package.json#L116 + electron = electron_27; }; long-shebang = callPackage ../misc/long-shebang { }; @@ -5821,7 +5812,7 @@ with pkgs; monetdb = callPackage ../servers/sql/monetdb { }; - monado = callPackage ../applications/graphics/monado { + monado = callPackage ../by-name/mo/monado/package.nix { inherit (gst_all_1) gstreamer gst-plugins-base; }; @@ -5925,8 +5916,6 @@ with pkgs; nsz = with python3.pkgs; toPythonApplication nsz; - nwipe = callPackage ../tools/security/nwipe { }; - nx2elf = callPackage ../tools/compression/nx2elf { }; nx-libs = callPackage ../tools/X11/nx-libs { }; @@ -6228,10 +6217,6 @@ with pkgs; routersploit = callPackage ../tools/security/routersploit { }; - routinator = callPackage ../servers/routinator { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - rsbep = callPackage ../tools/backup/rsbep { }; rsbkb = callPackage ../tools/text/rsbkb { }; @@ -6286,8 +6271,6 @@ with pkgs; mongoaudit = callPackage ../tools/security/mongoaudit { }; - mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; moosefs = callPackage ../tools/filesystems/moosefs { }; @@ -6758,9 +6741,7 @@ with pkgs; libsbsms_2_3_0 ; - libskk = callPackage ../development/libraries/libskk { - inherit (gnome) gnome-common; - }; + libskk = callPackage ../development/libraries/libskk { }; m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { }; @@ -6812,6 +6793,8 @@ with pkgs; openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; }; + pinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-pinyin { }; + rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; @@ -7661,7 +7644,7 @@ with pkgs; easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_17; + llvmPackages = llvmPackages_18; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -7787,8 +7770,6 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; - f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = with python3Packages; toPythonApplication fabric; fail2ban = callPackage ../tools/security/fail2ban { }; @@ -8020,9 +8001,7 @@ with pkgs; fortune = callPackage ../tools/misc/fortune { }; - fox = callPackage ../development/libraries/fox { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + fox = callPackage ../development/libraries/fox {}; fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -9460,7 +9439,7 @@ with pkgs; # 2. the rest are added from here: https://github.com/keybase/client/blob/68bb8c893c5214040d86ea36f2f86fbb7fac8d39/go/chat/attachments/preview_darwin.go#L7 # #cgo LDFLAGS: -framework AVFoundation -framework CoreFoundation -framework ImageIO -framework CoreMedia -framework Foundation -framework CoreGraphics -lobjc # with the exception of CoreFoundation, due to the warning in https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/frameworks.nix#L25 - inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox; }; kbfs = callPackage ../tools/security/keybase/kbfs.nix { }; @@ -9471,8 +9450,6 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - keymapp = callPackage ../applications/misc/keymapp { }; - keyscope = callPackage ../tools/security/keyscope { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security; }; @@ -9566,7 +9543,7 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; ligo = - let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in + let ocaml_p = ocaml-ng.ocamlPackages_4_14; in callPackage ../development/compilers/ligo { coq = coq_8_13.override { customOCamlPackages = ocaml_p; @@ -10143,9 +10120,7 @@ with pkgs; libite = callPackage ../development/libraries/libite { }; - liblangtag = callPackage ../development/libraries/liblangtag { - inherit (gnome) gnome-common; - }; + liblangtag = callPackage ../development/libraries/liblangtag { }; liblouis = callPackage ../development/libraries/liblouis { }; @@ -10824,11 +10799,8 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackages ../servers/nextcloud {}) - nextcloud27 nextcloud28 nextcloud29; + nextcloud28 nextcloud29; - nextcloud27Packages = callPackage ../servers/nextcloud/packages { - apps = lib.importJSON ../servers/nextcloud/packages/27.json; - }; nextcloud28Packages = callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/28.json; }; @@ -11625,8 +11597,6 @@ with pkgs; pdf-quench = callPackage ../applications/misc/pdf-quench { }; - pdfarranger = callPackage ../applications/misc/pdfarranger { }; - briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { }; @@ -11899,8 +11869,6 @@ with pkgs; pretender = callPackage ../tools/security/pretender { }; - prettierd = callPackage ../development/tools/prettierd { }; - pretty-simple = callPackage ../development/tools/pretty-simple { }; prettyping = callPackage ../tools/networking/prettyping { }; @@ -12180,7 +12148,7 @@ with pkgs; raider = callPackage ../applications/misc/raider { }; railway = callPackage ../development/tools/railway { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; quota = if stdenv.isLinux then linuxquota else unixtools.quota; @@ -12696,6 +12664,8 @@ with pkgs; seehecht = callPackage ../tools/text/seehecht { }; + segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; }; + selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { }; semantic-release = callPackage ../development/tools/semantic-release { @@ -13004,8 +12974,6 @@ with pkgs; solvespace = callPackage ../applications/graphics/solvespace { }; - sonarr = callPackage ../servers/sonarr { }; - sonata = callPackage ../applications/audio/sonata { }; sony-headphones-client = callPackage ../applications/audio/sony-headphones-client { }; @@ -13187,8 +13155,6 @@ with pkgs; staticjinja = with python3.pkgs; toPythonApplication staticjinja; - stevenblack-blocklist = callPackage ../tools/networking/stevenblack-blocklist { }; - stress = callPackage ../tools/system/stress { }; stress-ng = callPackage ../tools/system/stress-ng { }; @@ -13377,7 +13343,7 @@ with pkgs; inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }) teleport_14 teleport_15 teleport; + }) teleport_14 teleport_15 teleport_16 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; @@ -14561,7 +14527,7 @@ with pkgs; clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; clipbuzz = callPackage ../tools/misc/clipbuzz { - zig = zig_0_12; + zig = buildPackages.zig_0_12; }; xclip = callPackage ../tools/misc/xclip { }; @@ -14641,20 +14607,6 @@ with pkgs; xvfb-run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; - - # xvfb-run is used by a bunch of things to run tests - # and doesn't support hardware accelerated rendering - # so remove it from the rebuild heavy path for mesa - xorgserver = xorg.xorgserver.overrideAttrs(old: { - buildInputs = lib.filter (pkg: lib.getName pkg != "mesa") old.buildInputs; - configureFlags = old.configureFlags ++ [ - "--disable-glamor" - "--disable-glx" - "--disable-dri" - "--disable-dri2" - "--disable-dri3" - ]; - }); }; xvkbd = callPackage ../tools/X11/xvkbd { }; @@ -14972,6 +14924,9 @@ with pkgs; ### DEVELOPMENT / COMPILERS + temurin-bin-22 = javaPackages.compiler.temurin-bin.jdk-22; + temurin-jre-bin-22 = javaPackages.compiler.temurin-bin.jre-22; + temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21; temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21; @@ -14993,8 +14948,8 @@ with pkgs; temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8; temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8; - temurin-bin = temurin-bin-21; - temurin-jre-bin = temurin-jre-bin-21; + temurin-bin = temurin-bin-22; + temurin-jre-bin = temurin-jre-bin-22; semeru-bin-21 = javaPackages.compiler.semeru-bin.jdk-21; semeru-jre-bin-21 = javaPackages.compiler.semeru-bin.jre-21; @@ -15180,8 +15135,6 @@ with pkgs; clean = callPackage ../development/compilers/clean { }; - clickable = python3Packages.callPackage ../development/tools/clickable { }; - closurecompiler = callPackage ../development/compilers/closure { }; cmdstan = callPackage ../development/compilers/cmdstan { }; @@ -16019,8 +15972,7 @@ with pkgs; openjdk = jdk; openjdk_headless = jdk_headless; - graalvmCEPackages = - recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition { }); + graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { }; graalvm-ce = graalvmCEPackages.graalvm-ce; buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image { graalvmDrv = graalvm-ce; @@ -16170,7 +16122,7 @@ with pkgs; else if platform.isLinux then 17 else if platform.isWasm then 16 # For unknown systems, assume the latest version is required. - else 17; + else 18; # We take the "max of the mins". Why? Since those are lower bounds of the # supported version set, this is like intersecting those sets and then # taking the min bound of that. @@ -16450,7 +16402,9 @@ with pkgs; makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { }; - buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; + buildRustCrate = callPackage ../build-support/rust/build-rust-crate ({ } // lib.optionalAttrs (stdenv.hostPlatform.libc == null) { + stdenv = stdenvNoCC; # Some build targets without libc will fail to evaluate with a normal stdenv. + }); buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; cargo2junit = callPackage ../development/tools/rust/cargo2junit { }; @@ -16574,7 +16528,7 @@ with pkgs; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { - zig = zig_0_12; + zig = buildPackages.zig_0_12; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; @@ -16641,13 +16595,11 @@ with pkgs; cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { }; cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { - zig = zig_0_12; + zig = buildPackages.zig_0_12; }; cauwugo = callPackage ../development/tools/rust/cauwugo { }; - crate2nix = callPackage ../development/tools/rust/crate2nix { }; - critcmp = callPackage ../development/tools/rust/critcmp { }; devspace = callPackage ../development/tools/misc/devspace { }; @@ -17296,11 +17248,11 @@ with pkgs; # available as `pythonPackages.tkinter` and can be used as any other Python package. # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python2 = python27; - python3 = python311; + python3 = python312; # pythonPackages further below, but assigned here because they need to be in sync python2Packages = dontRecurseIntoAttrs python27Packages; - python3Packages = dontRecurseIntoAttrs python311Packages; + python3Packages = dontRecurseIntoAttrs python312Packages; pypy = pypy2; pypy2 = pypy27; @@ -17861,14 +17813,11 @@ with pkgs; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; ant = apacheAnt; - apacheKafka = apacheKafka_3_5; - apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; - apacheKafka_3_0 = callPackage ../servers/apache-kafka { majorVersion = "3.0"; }; - apacheKafka_3_1 = callPackage ../servers/apache-kafka { majorVersion = "3.1"; }; - apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; }; - apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; - apacheKafka_3_4 = callPackage ../servers/apache-kafka { majorVersion = "3.4"; }; - apacheKafka_3_5 = callPackage ../servers/apache-kafka { majorVersion = "3.5"; }; + inherit (callPackages ../servers/apache-kafka { }) + apacheKafka_3_6 + apacheKafka_3_7; + + apacheKafka = apacheKafka_3_7; apng2gif = callPackage ../tools/graphics/apng2gif { }; @@ -18006,11 +17955,13 @@ with pkgs; binutils-unwrapped = callPackage ../development/tools/misc/binutils { autoreconfHook = autoreconfHook269; + inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; }; binutils-unwrapped-all-targets = callPackage ../development/tools/misc/binutils { autoreconfHook = if targetPlatform.isiOS then autoreconfHook269 else autoreconfHook; + inherit (darwin.apple_sdk.frameworks) CoreServices; # FHS sys dirs presumably only have stuff for the build platform noSysDirs = (stdenv.targetPlatform != stdenv.hostPlatform) || noSysDirs; withAllTargets = true; @@ -18320,8 +18271,6 @@ with pkgs; cov-build = callPackage ../development/tools/analysis/cov-build { }; - cppcheck = callPackage ../development/tools/analysis/cppcheck { }; - cpplint = callPackage ../development/tools/analysis/cpplint { }; credstash = with python3Packages; toPythonApplication credstash; @@ -19040,10 +18989,6 @@ with pkgs; nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { - jre_headless = jre8_headless; - }; - nexusmods-app-unfree = callPackage ../by-name/ne/nexusmods-app/package.nix { enableUnfree = true; }; @@ -19989,7 +19934,7 @@ with pkgs; babl = callPackage ../development/libraries/babl { }; backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix { - zig = zig_0_11; + zig = buildPackages.zig_0_11; }; backward-cpp = callPackage ../development/libraries/backward-cpp { }; @@ -20021,7 +19966,7 @@ with pkgs; bicpl = callPackage ../development/libraries/science/biology/bicpl { }; - bicgl = callPackage ../development/libraries/science/biology/bicgl { inherit (darwin.apple_sdk.frameworks) GLUT; }; + bicgl = callPackage ../development/libraries/science/biology/bicgl { }; # TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt @@ -20458,7 +20403,9 @@ with pkgs; # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013 emanote = haskellPackages.emanote; - enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; + enchant2 = callPackage ../development/libraries/enchant/2.x.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; enchant = enchant2; enet = callPackage ../development/libraries/enet { }; @@ -20569,8 +20516,6 @@ with pkgs; flint3 = callPackage ../development/libraries/flint/3.nix { }; - flite = callPackage ../development/libraries/flite { }; - fltk13 = callPackage ../development/libraries/fltk { inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL; }; @@ -20829,7 +20774,7 @@ with pkgs; glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {}; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; }; glibc = callPackage ../development/libraries/glibc { @@ -21332,7 +21277,7 @@ with pkgs; icu74 ; - icu = icu73; + icu = icu74; id3lib = callPackage ../development/libraries/id3lib { }; @@ -21978,9 +21923,6 @@ with pkgs; libglibutil = callPackage ../development/libraries/libglibutil { }; - libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome.libgnome-keyring; - libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { }; libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { }; @@ -22210,7 +22152,8 @@ with pkgs; liblc3 = callPackage ../development/libraries/liblc3 { }; - libliftoff = callPackage ../development/libraries/libliftoff { }; + inherit (callPackage ../development/libraries/libliftoff { }) libliftoff_0_4 libliftoff_0_5; + libliftoff = libliftoff_0_5; liblqr1 = callPackage ../development/libraries/liblqr-1 { inherit (darwin.apple_sdk.frameworks) Carbon AppKit; @@ -23145,26 +23088,59 @@ with pkgs; ## libGL/libGLU/Mesa stuff - # Default libGL implementation, should provide headers and - # libGL.so/libEGL.so/... to link agains them. Android NDK provides - # an OpenGL implementation, we can just use that. - libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv - else callPackage ../development/libraries/mesa/stubs.nix { - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; + # Default libGL implementation. + # + # Android NDK provides an OpenGL implementation, we can just use that. + # + # On macOS, we use the OpenGL framework. Packages that still need GLX + # specifically can pull in libGLX instead. If you have a package that + # should work without X11 but it can’t find the library, it may help + # to add the path to `NIX_CFLAGS_COMPILE`: + # + # -L${libGL}/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries + # + # If you still can’t get it working, please don’t hesitate to ping + # @NixOS/darwin-maintainers to ask an expert to take a look. + libGL = + if stdenv.hostPlatform.useAndroidPrebuilt then + stdenv + else if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk.frameworks.OpenGL + else + libglvnd; - # Default libGLU - libGLU = mesa_glu; + # On macOS, we use the OpenGL framework. Packages that use libGLX on + # macOS may need to depend on mesa_glu directly if this doesn’t work. + libGLU = + if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk.frameworks.OpenGL + else + mesa_glu; + + # libglvnd does not work (yet?) on macOS. + libGLX = + if stdenv.hostPlatform.isDarwin then + mesa + else + libglvnd; + + # On macOS, we use the GLUT framework. Packages that use libGLX on + # macOS may need to depend on freeglut directly if this doesn’t work. + libglut = + if stdenv.hostPlatform.isDarwin then + darwin.apple_sdk.frameworks.GLUT + else + freeglut; + + mesa = if stdenv.isDarwin + then darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa/darwin.nix { + inherit (darwin.apple_sdk_11_0.libs) Xplugin; + } + else callPackage ../development/libraries/mesa {}; - mesa = darwin.apple_sdk_11_0.callPackage ../development/libraries/mesa { - inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; - inherit (darwin.apple_sdk_11_0.libs) Xplugin; - }; mesa_i686 = pkgsi686Linux.mesa; # make it build on Hydra - mesa_glu = callPackage ../development/libraries/mesa-glu { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + mesa_glu = callPackage ../development/libraries/mesa-glu {}; ## End libGL/libGLU/Mesa stuff @@ -23387,16 +23363,10 @@ with pkgs; nuspell = callPackage ../development/libraries/nuspell { }; nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; - # splicing magic - nv-codec-headers-versions = callPackages ../development/libraries/nv-codec-headers { }; - inherit (nv-codec-headers-versions) - nv-codec-headers-9 - nv-codec-headers-10 - nv-codec-headers-11 - nv-codec-headers-12 - ; - # A default nv-codec-headers to make people happy - nv-codec-headers = nv-codec-headers-versions.nv-codec-headers-9; + nv-codec-headers-9 = nv-codec-headers.override { majorVersion = "9"; }; + nv-codec-headers-10 = nv-codec-headers.override { majorVersion = "10"; }; + nv-codec-headers-11 = nv-codec-headers.override { majorVersion = "11"; }; + nv-codec-headers-12 = nv-codec-headers.override { majorVersion = "12"; }; nvidiaCtkPackages = callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix @@ -23761,8 +23731,7 @@ with pkgs; flatbuffers = callPackage ../development/libraries/flatbuffers { }; - nanopb = callPackage ../development/libraries/nanopb { }; - nanopbMalloc = callPackage ../development/libraries/nanopb { mallocBuild = true; }; + nanopbMalloc = callPackage ../by-name/na/nanopb/package.nix { enableMalloc = true; }; gnupth = callPackage ../development/libraries/pth { }; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; @@ -24818,8 +24787,6 @@ with pkgs; xlslib = callPackage ../development/libraries/xlslib { }; - xsimd = callPackage ../development/libraries/xsimd { }; - xtensor = callPackage ../development/libraries/xtensor { }; xtl = callPackage ../development/libraries/xtl { }; @@ -24992,6 +24959,7 @@ with pkgs; mockobjects = callPackage ../development/libraries/java/mockobjects { }; saxonb = saxonb_8_8; + saxon-he = saxon_12-he; inherit (callPackages ../development/libraries/java/saxon { jre = jre_headless; @@ -25001,12 +24969,12 @@ with pkgs; saxonb_8_8 saxonb_9_1 saxon_9-he - saxon-he; + saxon_11-he + saxon_12-he; smack = callPackage ../development/libraries/java/smack { }; - swt = callPackage ../development/libraries/java/swt { }; - swt_jdk8 = callPackage ../development/libraries/java/swt { + swt_jdk8 = callPackage ../by-name/sw/swt/package.nix { jdk = jdk8; }; @@ -25155,17 +25123,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.4"; }; + sbcl_2_4_5 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_5 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; + sbcl_2_4_6 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.6"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_5; + sbcl = sbcl_2_4_6; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25263,39 +25231,26 @@ with pkgs; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; - mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { }; - - # Redwax collection mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; - mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_cspnonce = callPackage ../servers/http/apache-modules/mod_cspnonce { }; - mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; - mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; - mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; - mod_spkac= callPackage ../servers/http/apache-modules/mod_spkac { }; - mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; - + mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; - - - mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; - mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; - + mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; + mod_jk = callPackage ../servers/http/apache-modules/mod_jk { }; + mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; + mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp { }; + mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; + mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - + mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; + mod_spkac = callPackage ../servers/http/apache-modules/mod_spkac { }; mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; - + mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; - - mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; - - mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; - php = pkgs.php.override { inherit apacheHttpd; }; - subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; } // lib.optionalAttrs config.allowAliases { mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; @@ -25515,6 +25470,7 @@ with pkgs; freeradius = callPackage ../servers/freeradius { }; freshrss = callPackage ../servers/web-apps/freshrss { }; + freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { }); freeswitch = callPackage ../servers/sip/freeswitch { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; @@ -25977,8 +25933,6 @@ with pkgs; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; - tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; - tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; pies = callPackage ../servers/pies { }; @@ -26781,7 +26735,7 @@ with pkgs; criu = callPackage ../os-specific/linux/criu { }; cryptomator = callPackage ../tools/security/cryptomator { - jdk = jdk21.override { enableJavaFX = true; }; + jdk = jdk22.override { enableJavaFX = true; }; }; cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; @@ -27493,7 +27447,7 @@ with pkgs; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { + odin = callPackage ../by-name/od/odin/package.nix { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; llvmPackages = llvmPackages_18; @@ -27674,6 +27628,8 @@ with pkgs; sddm-chili-theme = libsForQt5.callPackage ../data/themes/chili-sddm { }; + sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { }; + sdparm = callPackage ../os-specific/linux/sdparm { }; sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { @@ -28080,6 +28036,8 @@ with pkgs; dracula-theme = callPackage ../data/themes/dracula-theme { }; + dracula-qt5-theme = callPackage ../data/themes/dracula-qt5-theme { }; + ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { }; arc-icon-theme = callPackage ../data/icons/arc-icon-theme { }; @@ -28510,7 +28468,6 @@ with pkgs; kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; @@ -28629,11 +28586,9 @@ with pkgs; martian-mono = callPackage ../data/fonts/martian-mono { }; - marwaita = callPackage ../data/themes/marwaita { }; - - marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; - - marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; + marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix { + inherit (kdePackages) breeze-icons; + }; marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { }; @@ -28751,7 +28706,6 @@ with pkgs; }; numix-icon-theme = callPackage ../data/icons/numix-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (plasma5Packages) breeze-icons; }; @@ -28858,9 +28812,7 @@ with pkgs; pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; - pop-icon-theme = callPackage ../data/icons/pop-icon-theme { - inherit (gnome) adwaita-icon-theme; - }; + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; @@ -29018,9 +28970,7 @@ with pkgs; recursive = callPackage ../data/fonts/recursive { }; - reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { - inherit (gnome) adwaita-icon-theme; - }; + reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { }; rubik = callPackage ../data/fonts/rubik { }; @@ -29104,7 +29054,6 @@ with pkgs; the-neue-black = callPackage ../data/fonts/the-neue-black { }; tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme { - inherit (gnome) adwaita-icon-theme; inherit (libsForQt5) breeze-icons; }; @@ -29412,6 +29361,10 @@ with pkgs; android-studio = androidStudioPackages.stable; android-studio-full = android-studio.full; + androidStudioForPlatformPackages = recurseIntoAttrs + (callPackage ../applications/editors/android-studio-for-platform { }); + android-studio-for-platform = androidStudioForPlatformPackages.stable; + antfs-cli = callPackage ../applications/misc/antfs-cli { }; antimony = libsForQt5.callPackage ../applications/graphics/antimony { }; @@ -29599,8 +29552,6 @@ with pkgs; awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; - inherit (gnome) baobab; - badwolf = callPackage ../applications/networking/browsers/badwolf { }; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -29938,10 +29889,6 @@ with pkgs; coreth = callPackage ../applications/networking/coreth { }; - coriander = callPackage ../applications/video/coriander { - inherit (gnome2) libgnomeui GConf; - }; - cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { }; csa = callPackage ../applications/audio/csa { }; @@ -30121,7 +30068,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_24 docker_25 docker_26; + docker_24 docker_25 docker_26 docker_27; docker = docker_24; docker-client = docker.override { clientOnly = true; }; @@ -30201,9 +30148,7 @@ with pkgs; dvd-slideshow = callPackage ../applications/video/dvd-slideshow { }; - dvdstyler = callPackage ../applications/video/dvdstyler { - inherit (gnome2) libgnomeui; - }; + dvdstyler = callPackage ../applications/video/dvdstyler { }; dyff = callPackage ../development/tools/dyff { }; @@ -30280,7 +30225,7 @@ with pkgs; em = callPackage ../applications/editors/em { }; - inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { })) + inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) emacs28 emacs28-gtk2 emacs28-gtk3 @@ -30328,8 +30273,6 @@ with pkgs; epgstation = callPackage ../applications/video/epgstation { }; - inherit (gnome) epiphany; - ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; epic5 = callPackage ../applications/networking/irc/epic5 { }; @@ -30417,8 +30360,6 @@ with pkgs; keeweb = callPackage ../applications/misc/keeweb { }; - inherit (gnome) evince; - evolution-data-server = gnome.evolution-data-server; evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; }; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; @@ -30755,8 +30696,6 @@ with pkgs; gthumb = callPackage ../applications/graphics/gthumb { }; - inherit (gnome) gucharmap; - guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; }; @@ -30863,7 +30802,6 @@ with pkgs; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - inherit (gnome) adwaita-icon-theme; channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; }; @@ -30873,7 +30811,6 @@ with pkgs; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { - inherit (gnome) adwaita-icon-theme; channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; }; @@ -30884,7 +30821,6 @@ with pkgs; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - inherit (gnome) adwaita-icon-theme; channel = "developer-edition"; generated = import ../applications/networking/browsers/firefox-bin/developer-edition_sources.nix; }; @@ -31033,8 +30969,6 @@ with pkgs; gitolite = callPackage ../applications/version-management/gitolite { }; - inherit (gnome) gitg; - gmrun = callPackage ../applications/misc/gmrun { }; gnucash = callPackage ../applications/office/gnucash { }; @@ -31112,8 +31046,8 @@ with pkgs; metacubexd = callPackage ../by-name/me/metacubexd/package.nix { pnpm = callPackage ../development/tools/pnpm/generic.nix { - version = "9.1.4"; - hash = "sha256-MKGAGsTnI3ee/tE6IfTDn562yfu0ztEBvOBrQiWT18k="; + version = "9.4.0"; + hash = "sha256-tv0L/aVV5+WErX5WswxosB1aBPnuk5ifS5PKhHPEnHQ="; }; }; @@ -31216,9 +31150,7 @@ with pkgs; gnomecast = callPackage ../applications/video/gnomecast { }; - gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome) gnome-autoar; - }; + gnome-recipes = callPackage ../applications/misc/gnome-recipes { }; gollum = callPackage ../applications/misc/gollum { }; @@ -31647,8 +31579,6 @@ with pkgs; id3v2 = callPackage ../applications/audio/id3v2 { }; - identity = callPackage ../applications/graphics/identity { }; - ifenslave = callPackage ../os-specific/linux/ifenslave { }; ii = callPackage ../applications/networking/irc/ii { @@ -31979,23 +31909,10 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreFoundation CoreServices CoreText CoreGraphics - CoreMedia OpenGL AudioUnit ApplicationServices Foundation AGL Security SystemConfiguration - Carbon AudioToolbox VideoToolbox VideoDecodeAcceleration AVFoundation CoreAudio CoreVideo - CoreMediaIO QuartzCore AppKit CoreWLAN WebKit IOKit GSS MediaPlayer IOSurface Metal MetalKit; - + kotatogram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { stdenv = if stdenv.isDarwin - then overrideSDK llvmPackages_14.stdenv "11.0" + then overrideSDK stdenv "11.0" else stdenv; - - # telegram-desktop has random crashes when jemalloc is built with gcc. - # Apparently, it triggers some bug due to usage of gcc's builtin - # functions like __builtin_ffsl by jemalloc when it's built with gcc. - jemalloc = (jemalloc.override { stdenv = clangStdenv; }).overrideAttrs { - # no idea how to fix the tests :( - doCheck = false; - }; }; kotatogram-desktop-with-webkit = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix { }; @@ -32513,9 +32430,7 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { - inherit (gnome) zenity; - }; + mepo = callPackage ../applications/misc/mepo { }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -32643,13 +32558,6 @@ with pkgs; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; - moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - SDL2 = buildPackages.SDL2.override { - drmSupport = stdenv.isLinux; - }; - }; - mooSpace = callPackage ../applications/audio/mooSpace { }; mop = callPackage ../applications/misc/mop { }; @@ -32830,14 +32738,12 @@ with pkgs; avahi = avahi-compat; pulseSupport = config.pulseaudio or false; iceSupport = config.murmur.iceSupport or true; - protobuf = protobuf_21; }).murmur; mumble = (callPackages ../applications/networking/mumble { avahi = avahi-compat; jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; - protobuf = protobuf_21; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { @@ -32867,8 +32773,6 @@ with pkgs; pythonPackages = python3Packages; }; - n8n = callPackage ../applications/networking/n8n { }; - neomutt = darwin.apple_sdk_11_0.callPackage ../applications/networking/mailreaders/neomutt { }; neosay = callPackage ../applications/networking/instant-messengers/neosay { }; @@ -33168,7 +33072,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; ncdu = callPackage ../tools/misc/ncdu { - zig = zig_0_12; + zig = buildPackages.zig_0_12; }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -33778,7 +33682,6 @@ with pkgs; quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { }; quodlibet = callPackage ../applications/audio/quodlibet { - inherit (gnome) adwaita-icon-theme; kakasi = null; keybinder3 = null; libappindicator-gtk3 = null; @@ -33895,8 +33798,6 @@ with pkgs; rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { }; - remnote = callPackage ../applications/misc/remnote { }; - remotebox = callPackage ../applications/virtualization/remotebox { }; restique = libsForQt5.callPackage ../applications/backup/restique { }; @@ -33990,9 +33891,7 @@ with pkgs; rusty-psn-gui = rusty-psn.override { withGui = true; }; - rymcast = callPackage ../applications/audio/rymcast { - inherit (gnome) zenity; - }; + rymcast = callPackage ../applications/audio/rymcast { }; rymdport = callPackage ../applications/networking/rymdport { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; @@ -34073,8 +33972,6 @@ with pkgs; sic-image-cli = callPackage ../tools/graphics/sic-image-cli { }; - simple-scan = gnome.simple-scan; - sioyek = libsForQt5.callPackage ../applications/misc/sioyek { }; siproxd = callPackage ../applications/networking/siproxd { }; @@ -34372,7 +34269,6 @@ with pkgs; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; surge = callPackage ../applications/audio/surge { - inherit (gnome) zenity; git = gitMinimal; }; @@ -34601,7 +34497,6 @@ with pkgs; desktopName = "Thunderbird"; }; thunderbird-bin-unwrapped = callPackage ../applications/networking/mailreaders/thunderbird-bin { - inherit (gnome) adwaita-icon-theme; generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix; }; @@ -34896,9 +34791,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; }; - verbiste = callPackage ../applications/misc/verbiste { - inherit (gnome2) libgnomeui; - }; + verbiste = callPackage ../applications/misc/verbiste { }; veusz = libsForQt5.callPackage ../applications/graphics/veusz { }; @@ -34908,7 +34801,11 @@ with pkgs; vimiv-qt = callPackage ../applications/graphics/vimiv-qt { }; - macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; + macvim = let + macvimUtils = callPackage ../applications/editors/vim/macvim-configurable.nix { }; + in macvimUtils.makeCustomizable (callPackage ../applications/editors/vim/macvim.nix { + stdenv = clangStdenv; + }); vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; @@ -34958,14 +34855,10 @@ with pkgs; }; neovim = wrapNeovim neovim-unwrapped { }; - neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { }; - gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { }; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; - viw = callPackage ../applications/editors/viw { }; virter = callPackage ../applications/virtualization/virter { }; @@ -35098,6 +34991,10 @@ with pkgs; vscode-extensions = recurseIntoAttrs (callPackage ../applications/editors/vscode/extensions { }); + vscode-js-debug = callPackage ../by-name/vs/vscode-js-debug/package.nix { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; + vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; vscodium-fhs = vscodium.fhs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; @@ -35614,8 +35511,6 @@ with pkgs; yeetgif = callPackage ../applications/graphics/yeetgif { }; - inherit (gnome) yelp; - yelp-tools = callPackage ../development/misc/yelp-tools { }; yewtube = callPackage ../applications/misc/yewtube { }; @@ -35739,7 +35634,6 @@ with pkgs; alfis = callPackage ../applications/blockchains/alfis { inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit; - inherit (gnome) zenity; }; alfis-nogui = alfis.override { withGui = false; @@ -36348,11 +36242,11 @@ with pkgs; construoBase = lowPrio (callPackage ../games/construo { libGL = null; libGLU = null; - freeglut = null; + libglut = null; }); construo = construoBase.override { - inherit libGL libGLU freeglut; + inherit libGL libGLU libglut; }; crack_attack = callPackage ../games/crack-attack { }; @@ -36581,10 +36475,6 @@ with pkgs; graphwar = callPackage ../games/graphwar { }; - gtetrinet = callPackage ../games/gtetrinet { - inherit (gnome2) GConf libgnome libgnomeui; - }; - gtypist = callPackage ../games/gtypist { }; gweled = callPackage ../games/gweled { }; @@ -36677,8 +36567,6 @@ with pkgs; left4gore-bin = callPackage ../games/left4gore { }; - lgogdownloader = libsForQt5.callPackage ../games/lgogdownloader { }; - liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; liberation-circuit = callPackage ../games/liberation-circuit { }; @@ -36905,12 +36793,6 @@ with pkgs; principia = callPackage ../games/principia { }; - prismlauncher-unwrapped = kdePackages.callPackage ../games/prismlauncher { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - - prismlauncher = kdePackages.callPackage ../games/prismlauncher/wrapper.nix { }; - pong3d = callPackage ../games/pong3d { }; pokerth = libsForQt5.callPackage ../games/pokerth { @@ -37498,8 +37380,6 @@ with pkgs; latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - gnome-themes-extra = gnome.gnome-themes-extra; - xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; ### SCIENCE/CHEMISTY @@ -38048,8 +37928,6 @@ with pkgs; p4est-sc = p4est-sc-dbg; }; - petsc = callPackage ../development/libraries/science/math/petsc { }; - parmetis = callPackage ../development/libraries/science/math/parmetis { }; QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { }; @@ -38238,6 +38116,7 @@ with pkgs; coqPackages_8_17 coq_8_17 coqPackages_8_18 coq_8_18 coqPackages_8_19 coq_8_19 + coqPackages_8_20 coq_8_20 coqPackages coq ; @@ -39958,8 +39837,6 @@ with pkgs; buildGoModule = buildGo122Module; }; - vnote = libsForQt5.callPackage ../applications/office/vnote { }; - sshportal = callPackage ../servers/sshportal { }; ssh-audit = callPackage ../tools/security/ssh-audit { }; @@ -40329,8 +40206,6 @@ with pkgs; dart = callPackage ../development/compilers/dart { }; - dart-sass = callPackage ../development/tools/misc/dart-sass { }; - pub2nix = recurseIntoAttrs (callPackage ../build-support/dart/pub2nix { }); buildDartApplication = callPackage ../build-support/dart/build-dart-application { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 5cea3d663b421..5998f4234eb6a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -38,6 +38,8 @@ let coq-bits = callPackage ../development/coq-modules/coq-bits {}; coq-elpi = callPackage ../development/coq-modules/coq-elpi {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + coq-hammer = callPackage ../development/coq-modules/coq-hammer { }; + coq-hammer-tactics = callPackage ../development/coq-modules/coq-hammer/tactics.nix { }; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; coq-lsp = callPackage ../development/coq-modules/coq-lsp {}; coq-record-update = callPackage ../development/coq-modules/coq-record-update { }; @@ -198,6 +200,7 @@ in rec { coq_8_17 = mkCoq "8.17"; coq_8_18 = mkCoq "8.18"; coq_8_19 = mkCoq "8.19"; + coq_8_20 = mkCoq "8.20"; coqPackages_8_5 = mkCoqPackages coq_8_5 // { __attrsFailEvaluation = true; }; coqPackages_8_6 = mkCoqPackages coq_8_6 // { __attrsFailEvaluation = true; }; @@ -214,6 +217,7 @@ in rec { coqPackages_8_17 = mkCoqPackages coq_8_17 // { __attrsFailEvaluation = true; }; coqPackages_8_18 = mkCoqPackages coq_8_18 // { __attrsFailEvaluation = true; }; coqPackages_8_19 = mkCoqPackages coq_8_19 // { __attrsFailEvaluation = true; }; + coqPackages_8_20 = mkCoqPackages coq_8_20 // { __attrsFailEvaluation = true; }; coqPackages = let cp = recurseIntoAttrs coqPackages_8_19; in cp // { coqPackages = cp.coqPackages // { __attrsFailEvaluation = true; }; } // { __recurseIntoDerivationForReleaseJobs = true; }; diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix index 3c6ed65e92868..e7cae57831fd4 100644 --- a/pkgs/top-level/cubocore-packages.nix +++ b/pkgs/top-level/cubocore-packages.nix @@ -74,7 +74,7 @@ let }; coreterminal = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreterminal { - inherit (lxqt) qtermwidget; + qtermwidget = lxqt.qtermwidget_1_4; inherit libcprime libcsys; }; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index d34a37294ae0a..7f01f4310c9ec 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -77,6 +77,8 @@ let saxpy = final.callPackage ../development/cuda-modules/saxpy { }; nccl = final.callPackage ../development/cuda-modules/nccl { }; nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { }; + + writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-python-test.nix { }; }); mkVersionedPackageName = diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index cca74e047dbdd..69d22c8b9625e 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -83,8 +83,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { }; binutils-unwrapped = callPackage ../os-specific/darwin/binutils { - inherit (pkgs) binutils-unwrapped; - inherit (pkgs.llvmPackages) llvm clang-unwrapped; + inherit (self) cctools; + inherit (pkgs.llvmPackages) clang-unwrapped llvm llvm-manpages; }; binutils = pkgs.wrapBintoolsWith { @@ -95,17 +95,29 @@ impure-cmds // appleSourcePackages // chooseLibs // { bintools = self.binutils-unwrapped; }; - binutilsDualAs-unwrapped = callPackage ../os-specific/darwin/binutils { - inherit (pkgs) binutils-unwrapped; - inherit (pkgs.llvmPackages) llvm clang-unwrapped; - dualAs = true; + # x86-64 Darwin gnat-bootstrap emits assembly + # with MOVQ as the mnemonic for quadword interunit moves + # such as `movq %rbp, %xmm0`. + # The clang integrated assembler recognises this as valid, + # but unfortunately the cctools.gas GNU assembler does not; + # it instead uses MOVD as the mnemonic. + # The assembly that a GCC build emits is determined at build time + # and cannot be changed afterwards. + # + # To build GNAT on x86-64 Darwin, therefore, + # we need both the clang _and_ the cctools.gas assemblers to be available: + # the former to build at least the stage1 compiler, + # and the latter at least to be detectable + # as the target for the final compiler. + binutilsDualAs-unwrapped = pkgs.buildEnv { + name = "${lib.getName self.binutils-unwrapped}-dualas-${lib.getVersion self.binutils-unwrapped}"; + paths = [ + self.binutils-unwrapped + (lib.getOutput "gas" self.cctools) + ]; }; - binutilsDualAs = pkgs.wrapBintoolsWith { - libc = - if stdenv.targetPlatform != stdenv.hostPlatform - then pkgs.libcCross - else pkgs.stdenv.cc.libc; + binutilsDualAs = self.binutils.override { bintools = self.binutilsDualAs-unwrapped; }; @@ -114,7 +126,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { bintools = self.binutils-unwrapped; }; - cctools = self.cctools-llvm; + cctools = self.cctools-port; cctools-apple = callPackage ../os-specific/darwin/cctools/apple.nix { stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index a14f53d535284..383ba5d73008e 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -47,7 +47,7 @@ let inherit lib pkgs; }; - emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../build-support/emacs/wrapper.nix { + emacsWithPackages = { pkgs, lib }: pkgs.callPackage ../applications/editors/emacs/build-support/wrapper.nix { inherit (pkgs.xorg) lndir; inherit lib; }; @@ -77,11 +77,11 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ }; }); - trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix { + trivialBuild = pkgs.callPackage ../applications/editors/emacs/build-support/trivial.nix { inherit (self) emacs; }; - melpaBuild = pkgs.callPackage ../build-support/emacs/melpa.nix { + melpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/melpa.nix { inherit (self) emacs; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b924a29f26162..ad8a4b9479643 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -78,7 +78,8 @@ in { packages.ghc865Binary else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -94,7 +95,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr; buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; @@ -106,7 +108,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -120,7 +123,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -134,7 +138,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -148,7 +153,8 @@ in { packages.ghc810 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -172,7 +178,8 @@ in { packages.ghc902 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. @@ -196,7 +203,8 @@ in { packages.ghc902 else packages.ghc8107Binary; - inherit (buildPackages.python3Packages) sphinx; + inherit (buildPackages.python311Packages) sphinx; # a distutils issue with 3.12 + python3 = buildPackages.python311; # so that we don't have two of them # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 2d59c358863b2..c80d6c28f840f 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -227,7 +227,7 @@ in { ../development/compilers/openjdk/22.nix ../development/compilers/zulu/22.nix { - openjdk22-bootstrap = temurin-bin.jdk-21; + openjdk22-bootstrap = temurin-bin.jdk-22; openjfx = openjfx22; }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 104d8821ff6a4..bc80ec658846c 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -343,7 +343,7 @@ in { dddvb = callPackage ../os-specific/linux/dddvb { }; - decklink = callPackage ../os-specific/linux/decklink { }; + decklink = throw "The decklink kernel module has been removed due to being unmaintained"; # Module removed on 2024-07-02 digimend = callPackage ../os-specific/linux/digimend { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e39b990ecae10..4b47c2d974dc6 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -173,7 +173,7 @@ rec { }) {}; nfd = callPackage ../development/lua-modules/nfd { - inherit (pkgs.gnome) zenity; + inherit (pkgs) zenity; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 259864f22a789..e996cb41cf0cd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -610,6 +610,10 @@ let github-jsoo = callPackage ../development/ocaml-modules/github/jsoo.nix { }; github-unix = callPackage ../development/ocaml-modules/github/unix.nix { }; + gitlab = callPackage ../development/ocaml-modules/gitlab { }; + gitlab-jsoo = callPackage ../development/ocaml-modules/gitlab/jsoo.nix { }; + gitlab-unix = callPackage ../development/ocaml-modules/gitlab/unix.nix { }; + gluon = callPackage ../development/ocaml-modules/gluon { }; gluten = callPackage ../development/ocaml-modules/gluten { }; @@ -2036,13 +2040,6 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages = ocamlPackages_5_1; - # This is a nasty way to replace toplevel janestreet attributes in the scope, - # so that modules outside of ocamlPackages that depend on JS OCaml libraries - # *and* non-JS OCaml libraries can pull in the same version of JS transitive - # dependencies. Remove this once ligo and stanc can be compiled against - # janestreet 0.16 libraries. - ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope (self: super: super // super.janeStreet_0_15); - # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series. ocamlPackages_4_14_unsafe_string = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c2f17f4557ee0..76a44d4ec4165 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10916,68 +10916,6 @@ with self; { }; }; - Gnome2 = buildPerlPackage { - pname = "Gnome2"; - version = "1.048"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.048.tar.gz"; - hash = "sha256-ZPzDgnFKvY1XaSrDdjKMOiDGy8i81zKwB9FMv5ooLd0="; - }; - buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; - propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; - meta = { - description = "(DEPRECATED) Perl interface to the 2.x series of the GNOME libraries"; - homepage = "https://gtk2-perl.sourceforge.net"; - license = with lib.licenses; [ lgpl21Plus ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gnome2Canvas.x86_64-darwin - }; - }; - - Gnome2Canvas = buildPerlPackage { - pname = "Gnome2-Canvas"; - version = "1.006"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Canvas-1.006.tar.gz"; - hash = "sha256-aQZnxziSHeLWUWtOtjlVOlceSoMQ2AMfFYZYU23lq0I="; - }; - buildInputs = [ pkgs.gnome2.libgnomecanvas ]; - propagatedBuildInputs = [ Gtk2 ]; - doCheck = !stdenv.isDarwin; - meta = { - description = "(DEPRECATED) A structured graphics canvas"; - license = with lib.licenses; [ lgpl2Plus ]; - }; - }; - - Gnome2VFS = buildPerlPackage { - pname = "Gnome2-VFS"; - version = "1.084"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.084.tar.gz"; - hash = "sha256-PI2Mlca2XCN9ueiJx57bK7gIvzfAhKvfu9mFn+93h8w="; - }; - propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; - meta = { - description = "(DEPRECATED) Perl interface to the 2.x series of the GNOME VFS"; - license = with lib.licenses; [ lgpl21Plus ]; - }; - }; - - Gnome2Wnck = buildPerlPackage { - pname = "Gnome2-Wnck"; - version = "0.18"; - src = fetchurl { - url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-Wnck-0.18.tar.gz"; - hash = "sha256-RL7OyLLX9B8ngKc7CSJp/bec1JJluuDI/zkQN8RWSjU="; - }; - buildInputs = [ pkgs.libwnck2 pkgs.glib pkgs.gtk2 ]; - propagatedBuildInputs = [ Gtk2 ]; - meta = { - description = "(DEPRECATED) Perl interface to the Window Navigator"; - license = with lib.licenses; [ lgpl21Plus ]; - }; - }; - GnuPG = buildPerlPackage { pname = "GnuPG"; version = "0.19"; @@ -13021,6 +12959,19 @@ with self; { }; }; + IOSocketSocks = buildPerlPackage { + pname = "IO-Socket-Socks"; + version = "0.74"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLEG/IO-Socket-Socks-0.74.tar.gz"; + hash = "sha256-N/Bxos9LqPCQoil8ZIK3osUJ61Lc1s5dgDXU7ixoJLE="; + }; + meta = { + description = "Provides a way to create socks client or server both 4 and 5 version"; + license = lib.licenses.free; + }; + }; + IOSocketTimeout = buildPerlModule { pname = "IO-Socket-Timeout"; version = "0.32"; @@ -15919,10 +15870,10 @@ with self; { Minion = buildPerlPackage { pname = "Minion"; - version = "10.25"; + version = "10.30"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.25.tar.gz"; - hash = "sha256-C+CoN1N2iJ2gRgRpY4TAz5iyYh0mUNnrAwf25LlAra0="; + url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.30.tar.gz"; + hash = "sha256-twS9ZuxK8cAzlGifAsCsBIDr0GzpzKFykVAbkgLG7Rw="; }; propagatedBuildInputs = [ Mojolicious YAMLLibYAML ]; meta = { @@ -19640,7 +19591,7 @@ with self; { }; # FIXME: try with libGL + libGLU instead of libGLU libGL - buildInputs = [ pkgs.libGLU pkgs.libGL pkgs.libGLU pkgs.freeglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; + buildInputs = [ pkgs.libGLU pkgs.libGL pkgs.libGLU pkgs.libglut pkgs.xorg.libX11 pkgs.xorg.libXi pkgs.xorg.libXmu pkgs.xorg.libXext pkgs.xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -20344,10 +20295,11 @@ with self; { --replace 'WITH_PROJ => undef' 'WITH_PROJ => 0' ''; - nativeBuildInputs = with pkgs; [ autoPatchelfHook libGL.dev glibc.dev mesa_glu.dev ]; + # FIXME: Why are these libraries in `nativeBuildInputs`? + nativeBuildInputs = with pkgs; [ autoPatchelfHook (lib.getDev libGL) (lib.getDev glibc) (lib.getDev mesa_glu) ]; buildInputs = [ DevelChecklib TestDeep TestException TestWarn ] ++ - (with pkgs; [ gsl freeglut xorg.libXmu xorg.libXi ]); + (with pkgs; [ gsl libglut xorg.libXmu xorg.libXi ]); propagatedBuildInputs = [ AstroFITSHeader @@ -20368,7 +20320,7 @@ with self; { homepage = "https://pdl.perl.org"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "pdl2"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }; @@ -29122,10 +29074,10 @@ with self; { YAMLPP = buildPerlPackage { pname = "YAML-PP"; - version = "0.036"; + version = "0.38.0"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.036.tar.gz"; - hash = "sha256-yLTlBYSt+S73Vz9rsB1u1Y5iF2MsV0J7cnTPp8pG/Bs="; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-v0.38.0.tar.gz"; + hash = "sha256-qBlGXFL2o0EEmjlCdCwI4E8olLKmZILkOn9AfOELTqA="; }; buildInputs = [ TestDeep TestWarn ]; meta = { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a10f40d615f62..e0e30fa1b1e6c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -132,6 +132,7 @@ mapAliases ({ django_hijack_admin = django-hijack-admin; # added 2023-05-16 django-hijack-admin = throw "django-hijack-admin has been removed, since it is no longer compatible to django-hijack"; # added 2023-06-21 django_modelcluster = django-modelcluster; # added 2022-04-02 + django-mysql = throw "django-mysql has been removed, since it was an unused leaf package"; # added 2024-07-02 django_nose = django-nose; # added 2023-07-25 django-nose = throw "django-nose has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21 django_reversion = django-reversion; # added 2022-06-18 @@ -160,6 +161,7 @@ mapAliases ({ face_recognition_models = face-recognition-models; # added 2022-10-15 factory_boy = factory-boy; # added 2023-10-08 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 + faster-fifo = throw "faster-fifo has been removed since it was an unused leaf package"; # added 2024-07-02 fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03 fastpair = throw "fastpair is unmaintained upstream and has therefore been removed"; # added 2024-05-01 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 @@ -421,6 +423,7 @@ mapAliases ({ pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 pytest-ordering = throw "pytest-ordering has been removed, since it is no longer maintained and broken"; # added 2023-06-22 + pytest-openfiles = throw "pytest-openfiles has been removed, since it is unmaintained and archived"; # added 2024-06-19 pytest-pep8 = pytestpep8; # added 2021-01-04 pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12 pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09 @@ -504,6 +507,7 @@ mapAliases ({ sharkiqpy = sharkiq; # added 2022-05-21 shouldbe = throw "shouldbe was removed, because it was disabled on all python version since 3.8 and last updated in 2019."; # added 2024-05-12 sip_4 = sip4; # added 2024-01-07 + slackclient = slack-sdk; # added 2024-06-27 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff5188e5e6496..64f128d1cca87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -253,6 +253,8 @@ self: super: with self; { aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + aiohttp-middlewares = callPackage ../development/python-modules/aiohttp-middlewares { }; + aiohttp-oauthlib = callPackage ../development/python-modules/aiohttp-oauthlib { }; aiohttp-openmetrics = callPackage ../development/python-modules/aiohttp-openmetrics { }; @@ -489,6 +491,8 @@ self: super: with self; { alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + albucore = callPackage ../development/python-modules/albucore { }; + albumentations = callPackage ../development/python-modules/albumentations { }; ale-py = callPackage ../development/python-modules/ale-py { }; @@ -1393,6 +1397,8 @@ self: super: with self; { backports-strenum = callPackage ../development/python-modules/backports-strenum { }; + backports-tarfile = callPackage ../development/python-modules/backports-tarfile { }; + backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { }; bacpypes = callPackage ../development/python-modules/bacpypes { }; @@ -2503,6 +2509,8 @@ self: super: with self; { convertdate = callPackage ../development/python-modules/convertdate { }; + convertertools = callPackage ../development/python-modules/convertertools { }; + cookiecutter = callPackage ../development/python-modules/cookiecutter { }; cookies = callPackage ../development/python-modules/cookies { }; @@ -2583,7 +2591,7 @@ self: super: with self; { criticality-score = callPackage ../development/python-modules/criticality-score { }; - crocoddyl = toPythonModule (callPackage ../development/libraries/crocoddyl { + crocoddyl = toPythonModule (pkgs.crocoddyl.override { pythonSupport = true; python3Packages = self; }); @@ -2857,8 +2865,12 @@ self: super: with self; { dbglib = callPackage ../development/python-modules/dbglib { }; + dbt-adapters = callPackage ../development/python-modules/dbt-adapters { }; + dbt-bigquery = callPackage ../development/python-modules/dbt-bigquery { }; + dbt-common = callPackage ../development/python-modules/dbt-common { }; + dbt-core = callPackage ../development/python-modules/dbt-core { }; dbt-extractor = callPackage ../development/python-modules/dbt-extractor { }; @@ -2971,6 +2983,8 @@ self: super: with self; { deltachat2 = callPackage ../development/python-modules/deltachat2 { }; + deltalake = callPackage ../development/python-modules/deltalake { }; + deluge-client = callPackage ../development/python-modules/deluge-client { }; demes = callPackage ../development/python-modules/demes { }; @@ -3319,8 +3333,6 @@ self: super: with self; { django-mptt = callPackage ../development/python-modules/django-mptt { }; - django-mysql = callPackage ../development/python-modules/django-mysql { }; - django-ninja = callPackage ../development/python-modules/django-ninja { }; django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; @@ -4147,6 +4159,8 @@ self: super: with self; { fastapi = callPackage ../development/python-modules/fastapi { }; + fastapi-cli = callPackage ../development/python-modules/fastapi-cli { }; + fastapi-mail = callPackage ../development/python-modules/fastapi-mail { }; fastapi-sso = callPackage ../development/python-modules/fastapi-sso { }; @@ -4175,8 +4189,6 @@ self: super: with self; { fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; - faster-fifo = callPackage ../development/python-modules/faster-fifo { }; - faster-whisper = callPackage ../development/python-modules/faster-whisper { }; fastimport = callPackage ../development/python-modules/fastimport { }; @@ -4455,8 +4467,12 @@ self: super: with self; { flet-runtime = callPackage ../development/python-modules/flet-runtime { }; + flexcache = callPackage ../development/python-modules/flexcache { }; + flexmock = callPackage ../development/python-modules/flexmock { }; + flexparser = callPackage ../development/python-modules/flexparser { }; + flickrapi = callPackage ../development/python-modules/flickrapi { }; flipr-api = callPackage ../development/python-modules/flipr-api { }; @@ -4465,6 +4481,8 @@ self: super: with self; { flit-core = callPackage ../development/python-modules/flit-core { }; + flit-gettext = callPackage ../development/python-modules/flit-gettext { }; + flit-scm = callPackage ../development/python-modules/flit-scm { }; floret = callPackage ../development/python-modules/floret { }; @@ -4580,6 +4598,8 @@ self: super: with self; { freebox-api = callPackage ../development/python-modules/freebox-api { }; + freertos-gdb = callPackage ../development/python-modules/freertos-gdb { }; + freetype-py = callPackage ../development/python-modules/freetype-py { }; freezegun = callPackage ../development/python-modules/freezegun { }; @@ -4922,7 +4942,8 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = toPythonModule (pkgs.gmsh.override { + inherit (self) python; enablePython = true; }); @@ -5512,9 +5533,7 @@ self: super: with self; { homepluscontrol = callPackage ../development/python-modules/homepluscontrol { }; - hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { - inherit python; - }); + hoomd-blue = callPackage ../development/python-modules/hoomd-blue { }; hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; @@ -5617,6 +5636,8 @@ self: super: with self; { huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { }; + huepy = callPackage ../development/python-modules/huepy { }; + huey = callPackage ../development/python-modules/huey { }; hug = callPackage ../development/python-modules/hug { }; @@ -6112,13 +6133,14 @@ self: super: with self; { IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; }; - jaxlib = self.jaxlib-build; + # Use the -bin on macOS since the source build doesn't support it (see #323154) + jaxlib = if jaxlib-build.meta.unsupported then jaxlib-bin else jaxlib-build; - jaxlibWithCuda = self.jaxlib-build.override { + jaxlibWithCuda = self.jaxlib.override { cudaSupport = true; }; - jaxlibWithoutCuda = self.jaxlib-build.override { + jaxlibWithoutCuda = self.jaxlib.override { cudaSupport = false; }; @@ -6166,6 +6188,8 @@ self: super: with self; { jishaku = callPackage ../development/python-modules/jishaku { }; + jiter = callPackage ../development/python-modules/jiter { }; + jiwer = callPackage ../development/python-modules/jiwer { }; jmespath = callPackage ../development/python-modules/jmespath { }; @@ -6200,10 +6224,14 @@ self: super: with self; { jschema-to-python = callPackage ../development/python-modules/jschema-to-python { }; + jschon = callPackage ../development/python-modules/jschon { }; + jsmin = callPackage ../development/python-modules/jsmin { }; json5 = callPackage ../development/python-modules/json5 { }; + jsonxs = callPackage ../development/python-modules/jsonxs { }; + jsonargparse = callPackage ../development/python-modules/jsonargparse { }; jsonconversion = callPackage ../development/python-modules/jsonconversion { }; @@ -6503,6 +6531,7 @@ self: super: with self; { kmsxx = toPythonModule (pkgs.kmsxx.override { withPython = true; + python3Packages = self; }); knack = callPackage ../development/python-modules/knack { }; @@ -7621,6 +7650,8 @@ self: super: with self; { mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; + mkdocs-get-deps = callPackage ../development/python-modules/mkdocs-get-deps { }; + mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { }; mkdocs-git-revision-date-localized-plugin = callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin { }; @@ -7807,6 +7838,8 @@ self: super: with self; { mox3 = callPackage ../development/python-modules/mox3 { }; + mozilla-django-oidc = callPackage ../development/python-modules/mozilla-django-oidc { }; + mpd2 = callPackage ../development/python-modules/mpd2 { }; mpegdash = callPackage ../development/python-modules/mpegdash { }; @@ -8855,7 +8888,7 @@ self: super: with self; { neuron-full = pkgs.neuron-full.override { python3 = python; }; - neuronpy = python.pkgs.toPythonModule neuron-full; + neuronpy = toPythonModule neuron-full; nevow = callPackage ../development/python-modules/nevow { }; @@ -9059,7 +9092,9 @@ self: super: with self; { numpydoc = callPackage ../development/python-modules/numpydoc { }; - numpy = callPackage ../development/python-modules/numpy { }; + numpy_1 = callPackage ../development/python-modules/numpy/1.nix { }; + numpy_2 = callPackage ../development/python-modules/numpy/2.nix { }; + numpy = if self.pythonOlder "3.13" then numpy_1 else numpy_2; numpy-stl = callPackage ../development/python-modules/numpy-stl { }; @@ -9081,6 +9116,8 @@ self: super: with self; { plugp100 = callPackage ../development/python-modules/plugp100 {}; + python-hcl2 = callPackage ../development/python-modules/python-hcl2 { }; + python-ndn = callPackage ../development/python-modules/python-ndn { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; @@ -9667,7 +9704,7 @@ self: super: with self; { pbs-installer = callPackage ../development/python-modules/pbs-installer { }; - pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); + pc-ble-driver-py = callPackage ../development/python-modules/pc-ble-driver-py { }; pcapy-ng = callPackage ../development/python-modules/pcapy-ng { inherit (pkgs) libpcap; # Avoid confusion with python package of the same name @@ -10699,7 +10736,7 @@ self: super: with self; { py2bit = callPackage ../development/python-modules/py2bit { }; - py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); + py3buddy = callPackage ../development/python-modules/py3buddy { }; py3exiv2 = callPackage ../development/python-modules/py3exiv2 { inherit (pkgs) exiv2; @@ -11615,9 +11652,7 @@ self: super: with self; { phonemizer = callPackage ../development/python-modules/phonemizer { }; - pyopencl = callPackage ../development/python-modules/pyopencl { - mesa_drivers = pkgs.mesa.drivers; - }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; pyopengl = callPackage ../development/python-modules/pyopengl { }; @@ -12275,6 +12310,8 @@ self: super: with self; { pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; + pytest-lazy-fixtures = callPackage ../development/python-modules/pytest-lazy-fixtures { }; + pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; pytest-logdog = callPackage ../development/python-modules/pytest-logdog { }; @@ -12297,8 +12334,6 @@ self: super: with self; { pytest-notebook = callPackage ../development/python-modules/pytest-notebook { }; - pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; - pytest-order = callPackage ../development/python-modules/pytest-order { }; pytest-param-files = callPackage ../development/python-modules/pytest-param-files { }; @@ -12345,6 +12380,8 @@ self: super: with self; { pytest-resource-path = callPackage ../development/python-modules/pytest-resource-path { }; + pytest-responses = callPackage ../development/python-modules/pytest-responses { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner { }; pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; @@ -12544,6 +12581,8 @@ self: super: with self; { python-linux-procfs = callPackage ../development/python-modules/python-linux-procfs { }; + python-logging-loki = callPackage ../development/python-modules/python-logging-loki { }; + python-logstash = callPackage ../development/python-modules/python-logstash { }; python-louvain = callPackage ../development/python-modules/python-louvain { }; @@ -12767,7 +12806,9 @@ self: super: with self; { pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; - pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { + inherit (pkgs.config) cudaSupport; + }; pytorch-msssim = callPackage ../development/python-modules/pytorch-msssim { }; @@ -12813,7 +12854,7 @@ self: super: with self; { inherit (pkgs) udev; }; - pyunbound = toPythonModule (callPackage ../tools/networking/unbound/python.nix { }); + pyunbound = callPackage ../development/python-modules/pyunbound { }; pyunifi = callPackage ../development/python-modules/pyunifi { }; @@ -13857,9 +13898,9 @@ self: super: with self; { segno = callPackage ../development/python-modules/segno { }; - segyio = toPythonModule (callPackage ../development/python-modules/segyio { + segyio = callPackage ../development/python-modules/segyio { inherit (pkgs) cmake ninja; - }); + }; selectors2 = callPackage ../development/python-modules/selectors2 { }; @@ -13899,7 +13940,9 @@ self: super: with self; { sentinels = callPackage ../development/python-modules/sentinels { }; - sentry-sdk = callPackage ../development/python-modules/sentry-sdk { }; + sentry-sdk_1 = callPackage ../development/python-modules/sentry-sdk/1.nix { }; + sentry-sdk_2 = callPackage ../development/python-modules/sentry-sdk/default.nix { }; + sentry-sdk = sentry-sdk_1; sepaxml = callPackage ../development/python-modules/sepaxml { }; @@ -14161,8 +14204,6 @@ self: super: with self; { slack-sdk = callPackage ../development/python-modules/slack-sdk { }; - slackclient = callPackage ../development/python-modules/slackclient { }; - sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; sleepyq = callPackage ../development/python-modules/sleepyq { }; @@ -14311,6 +14352,8 @@ self: super: with self; { solc-select = callPackage ../development/python-modules/solc-select { }; + solidpython2 = callPackage ../development/python-modules/solidpython2 { }; + solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); somajo = callPackage ../development/python-modules/somajo { }; @@ -15369,7 +15412,7 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; - tokenize-rt = toPythonModule (callPackage ../development/python-modules/tokenize-rt { }); + tokenize-rt = callPackage ../development/python-modules/tokenize-rt { }; tokenlib = callPackage ../development/python-modules/tokenlib { }; @@ -16834,7 +16877,9 @@ self: super: with self; { vidstab = callPackage ../development/python-modules/vidstab { }; - viennarna = toPythonModule pkgs.viennarna; + viennarna = toPythonModule (pkgs.viennarna.override { + python3 = self.python; + }); viewstate = callPackage ../development/python-modules/viewstate { }; @@ -17333,9 +17378,7 @@ self: super: with self; { xtensor-python = callPackage ../development/python-modules/xtensor-python { }; - xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { - inherit (pkgs.xorg) xorgserver; - }; + xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper {}; xxhash = callPackage ../development/python-modules/xxhash { }; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index a80b40d360605..489c378abf049 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -52,6 +52,7 @@ let pkgsMusl = true; pkgsStatic = true; pkgsCross = true; + pkgsx86_64Darwin = true; pkgsi686Linux = true; pkgsLinux = true; pkgsExtraHardening = true; @@ -70,9 +71,11 @@ let override = true; __functor = true; __functionArgs = true; + __splicedPackages = true; newScope = true; scope = true; pkgs = true; + test-pkgs = true; buildHaskellPackages = true; buildPackages = true; diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index f9577b9b72c71..365e306455ac1 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -1,60 +1,163 @@ /* Test CUDA packages. - This release file will not be tested on hydra.nixos.org - because it requires unfree software. + This release file is currently not tested on hydra.nixos.org + because it requires unfree software, but it is tested by + https://hydra.nix-community.org/jobset/nixpkgs/cuda-nixos-unstable. - Test for example like this: + Cf. https://github.com/nix-community/infra/pull/1335 - $ hydra-eval-jobs pkgs/top-level/release-cuda.nix --option restrict-eval false -I foo=. --arg nixpkgs '{ outPath = ./.; revCount = 0; shortRev = "aabbcc"; }' + Test for example like this: + $ hydra-eval-jobs pkgs/top-level/release-cuda.nix -I . */ -{ # The platforms for which we build Nixpkgs. +let + ensureList = x: if builtins.isList x then x else [ x ]; + allowUnfreePredicate = + p: + builtins.all ( + license: + license.free + || license.redistributable + || builtins.elem license.shortName [ + "CUDA EULA" + "cuDNN EULA" + "NVidia OptiX EULA" + ] + ) (ensureList p.meta.license); +in + +{ + # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" - ] -, # Attributes passed to nixpkgs. - nixpkgsArgs ? { config = { allowUnfree = true; inHydra = true; }; } + "aarch64-linux" + ], + variant ? "cuda", + # Attributes passed to nixpkgs. + nixpkgsArgs ? { + config = { + inherit allowUnfreePredicate; + "${variant}Support" = true; + inHydra = true; + }; + }, }: +assert builtins.elem variant [ + "cuda" + "rocm" + null +]; + let - release-lib = import ./release-lib.nix { - inherit supportedSystems nixpkgsArgs; - }; - - inherit (release-lib) linux mapTestOn packagePlatforms pkgs; - - inherit (release-lib.lib) genAttrs; - - # Package sets to evaluate - packageSets = [ - "cudaPackages_10_0" - "cudaPackages_10_1" - "cudaPackages_10_2" - "cudaPackages_10" - "cudaPackages_11_0" - "cudaPackages_11_1" - "cudaPackages_11_2" - "cudaPackages_11_3" - "cudaPackages_11_4" - "cudaPackages_11_5" - "cudaPackages_11_6" - "cudaPackages_11" - "cudaPackages" - ]; + release-lib = import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; + inherit (release-lib) lib; + inherit (release-lib) + linux + mapTestOn + packagePlatforms + pkgs + ; + + # Package sets to evaluate whole + packageSets = builtins.filter (lib.strings.hasPrefix "cudaPackages") (builtins.attrNames pkgs); evalPackageSet = pset: mapTestOn { ${pset} = packagePlatforms pkgs.${pset}; }; - jobs = (mapTestOn ({ - # Packages to evaluate - python3.pkgs.caffeWithCuda = linux; - python3.pkgs.jaxlibWithCuda = linux; - python3.pkgs.libgpuarray = linux; - python3.pkgs.tensorflowWithCuda = linux; - python3.pkgs.pyrealsense2WithCuda = linux; - python3.pkgs.torchWithCuda = linux; - python3.pkgs.jaxlib = linux; - }) // (genAttrs packageSets evalPackageSet)); - -in jobs + jobs = + mapTestOn { + blas = linux; + blender = linux; + faiss = linux; + lapack = linux; + magma = linux; + mpich = linux; + openmpi = linux; + ucx = linux; + + opencv = linux; + cctag = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581 + + cholmod-extra = linux; + colmap = linux; + ctranslate2 = linux; + deepin.image-editor = linux; + ffmpeg-full = linux; + gimp = linux; + gpu-screen-recorder = linux; + gst_all_1.gst-plugins-bad = linux; + lightgbm = linux; + llama-cpp = linux; + meshlab = linux; + monado = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581 + noisetorch = linux; + obs-studio-plugins.obs-backgroundremoval = linux; + ollama = linux; + onnxruntime = linux; + openmvg = linux; + openmvs = linux; + opentrack = linux; + openvino = linux; + pixinsight = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581 + qgis = linux; + rtabmap = linux; + saga = linux; + suitesparse = linux; + truecrack-cuda = linux; + tts = linux; + ueberzugpp = linux; # Failed in https://github.com/NixOS/nixpkgs/pull/233581 + wyoming-faster-whisper = linux; + xgboost = linux; + + python3Packages = { + boxx = linux; + bpycv = linux; + caffe = linux; + catboost = linux; + chainer = linux; + cupy = linux; + faiss = linux; + faster-whisper = linux; + flax = linux; + gpt-2-simple = linux; + grad-cam = linux; + jaxlib = linux; + jax = linux; + Keras = linux; + kornia = linux; + libgpuarray = linux; + mmcv = linux; + mxnet = linux; + numpy = linux; # Only affected by MKL? + onnx = linux; + openai-triton = linux; + openai-whisper = linux; + opencv4 = linux; + opensfm = linux; + pycuda = linux; + pymc = linux; + pyrealsense2WithCuda = linux; + pytorch-lightning = linux; + pytorch = linux; + scikitimage = linux; + scikit-learn = linux; # Only affected by MKL? + scipy = linux; # Only affected by MKL? + spacy-transformers = linux; + tensorflow = linux; + tensorflow-probability = linux; + tesserocr = linux; + Theano = linux; + tiny-cuda-nn = linux; + torchaudio = linux; + torch = linux; + torchvision = linux; + transformers = linux; + ttstokenizer = linux; + vidstab = linux; + }; + } + // (lib.genAttrs packageSets evalPackageSet); +in +jobs diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index bb4ead25066d0..40a42dd49978b 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -45,11 +45,12 @@ let constituents = [ jobs.nixos-render-docs.x86_64-linux # Used in nixos manual jobs.remarshal.x86_64-linux # Used in pkgs.formats helper - jobs.python311Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert - jobs.python311Packages.colorama.x86_64-linux # Used in nixos test-driver - jobs.python311Packages.ptpython.x86_64-linux # Used in nixos test-driver - jobs.python311Packages.requests.x86_64-linux # Almost ubiquous package - jobs.python311Packages.sphinx.x86_64-linux # Document creation for many packages + jobs.python312Packages.afdko.x86_64-linux # Used in noto-fonts-color-emoji + jobs.python312Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert + jobs.python312Packages.colorama.x86_64-linux # Used in nixos test-driver + jobs.python312Packages.ptpython.x86_64-linux # Used in nixos test-driver + jobs.python312Packages.requests.x86_64-linux # Almost ubiquous package + jobs.python312Packages.sphinx.x86_64-linux # Document creation for many packages ]; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 087b43c3cb145..b0c7ec03827b4 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -292,7 +292,7 @@ let pkgsExtraHardening = super'; stdenv = super'.withDefaultHardeningFlags ( super'.stdenv.cc.defaultHardeningFlags ++ [ - "zerocallusedregs" + "stackclashprotection" "trivialautovarinit" ] ) super'.stdenv; |