diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 274 | ||||
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/config.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/java-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/lua-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/make-tarball.nix | 63 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 72 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 70 | ||||
-rw-r--r-- | pkgs/top-level/release-haskell.nix | 78 | ||||
-rw-r--r-- | pkgs/top-level/release-small.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/ruby-packages.nix | 21 |
18 files changed, 328 insertions, 329 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f879d9ca98f07..23949c22c4701 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -58,6 +58,7 @@ mapAliases ({ AusweisApp2 = ausweisapp; # Added 2023-11-08 a4term = a4; # Added 2023-10-06 + acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27 adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29 aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 @@ -92,6 +93,7 @@ mapAliases ({ atomEnv = throw "'atomEnv' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 + authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 awesome-4-0 = awesome; # Added 2022-05-05 @@ -129,6 +131,7 @@ mapAliases ({ boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08 boost17x = throw "boost17x has been deprecated in favor of the latest version"; # Added 2023-07-13 boost18x = throw "boost18x has been deprecated in favor of the latest version"; # Added 2023-07-13 + bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = bpftools; # Added 2021-05-03 bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16 bro = throw "'bro' has been renamed to/replaced by 'zeek'"; # Converted to throw 2023-09-10 @@ -836,16 +839,16 @@ 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 - nextcloud25 = throw '' - Nextcloud v25 has been removed from `nixpkgs` as the support for is dropped - by upstream in 2023-10. Please upgrade to at least Nextcloud v26 by declaring + 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 - services.nextcloud.package = pkgs.nextcloud26; + services.nextcloud.package = pkgs.nextcloud27; in your NixOS config. - WARNING: if you were on Nextcloud 24 you have to upgrade to Nextcloud 25 - first on 23.05 because Nextcloud doesn't support upgrades across multiple major versions! + 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 nagiosPluginsOfficial = monitoring-plugins; @@ -1016,6 +1019,8 @@ mapAliases ({ pocket-updater-utility = pupdate; # Added 2024-01-25 poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26 prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09 + prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20 + prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20 privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 @@ -1068,6 +1073,7 @@ mapAliases ({ rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08 rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08 readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 + redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 @@ -1224,6 +1230,7 @@ mapAliases ({ teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04 teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14 tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 + tepl = libgedit-tepl; # Added 2024-04-29 testVersion = testers.testVersion; # Added 2022-04-20 tfplugindocs = terraform-plugin-docs; # Added 2023-11-01 thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17 @@ -1310,6 +1317,7 @@ mapAliases ({ 'wayfireApplications-unwrapped.wcm' has been renamed to/replaced by 'wayfirePlugins.wcm' 'wayfireApplications-unwrapped.wlroots' has been removed ''; # Add 2023-07-29 + waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24 wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29 webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 wineWayland = wine-wayland; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc83c7246644f..ee250c1d0ce72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -313,8 +313,6 @@ with pkgs; assemblyscript = callPackage ../development/compilers/assemblyscript { }; - authy = callPackage ../applications/misc/authy { }; - authz0 = callPackage ../tools/security/authz0 { }; auth0-cli = callPackage ../tools/admin/auth0-cli { }; @@ -428,8 +426,6 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - catppuccin = callPackage ../data/themes/catppuccin { }; - catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { }; catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { }; @@ -442,8 +438,6 @@ with pkgs; catppuccin-plymouth = callPackage ../data/themes/catppuccin-plymouth { }; - catppuccin-sddm-corners = callPackage ../data/themes/catppuccin-sddm-corners { }; - btdu = callPackage ../tools/misc/btdu { }; ccal = callPackage ../tools/misc/ccal { }; @@ -1777,10 +1771,6 @@ with pkgs; dysk = callPackage ../tools/filesystems/dysk { }; - fastfetch = callPackage ../tools/misc/fastfetch { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; - fscan = callPackage ../tools/security/fscan { }; copier = callPackage ../tools/misc/copier { }; @@ -2746,10 +2736,6 @@ with pkgs; description = mame.meta.description + " (tools only)"; } (lib.getOutput "tools" mame); - melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; - - mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; - mupen64plus = callPackage ../applications/emulators/mupen64plus { }; np2kai = callPackage ../applications/emulators/np2kai { }; @@ -2805,9 +2791,7 @@ with pkgs; simplenes = callPackage ../applications/emulators/simplenes { }; - snes9x = callPackage ../applications/emulators/snes9x { }; - - snes9x-gtk = callPackage ../applications/emulators/snes9x { + snes9x-gtk = snes9x.override { withGtk = true; }; @@ -3555,8 +3539,6 @@ with pkgs; boulder = callPackage ../tools/admin/boulder { }; - btrfs-assistant = qt6.callPackage ../tools/misc/btrfs-assistant { }; - btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; bucklespring = bucklespring-x11; @@ -3588,8 +3570,6 @@ with pkgs; changelogger = callPackage ../tools/misc/changelogger { }; - chezmoi = callPackage ../tools/misc/chezmoi { }; - chipsec = callPackage ../tools/security/chipsec { kernel = null; withDriver = false; @@ -3633,8 +3613,6 @@ with pkgs; codespell = callPackage ../development/tools/codespell { }; - codux = callPackage ../applications/editors/codux { }; - conjure = callPackage ../applications/graphics/conjure { }; coolreader = libsForQt5.callPackage ../applications/misc/coolreader { }; @@ -3723,8 +3701,6 @@ with pkgs; dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; - dooit = callPackage ../tools/misc/dooit { }; - doona = callPackage ../tools/security/doona { }; dotter = callPackage ../tools/misc/dotter { @@ -4070,10 +4046,6 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { }; - skhd = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/skhd { - inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa; - }; - qes = callPackage ../os-specific/darwin/qes { inherit (darwin.apple_sdk.frameworks) Carbon; }; @@ -4088,8 +4060,6 @@ with pkgs; wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; - waypoint = callPackage ../applications/networking/cluster/waypoint { }; - xc = callPackage ../development/tools/xc { }; ios-webkit-debug-proxy = callPackage ../development/mobile/ios-webkit-debug-proxy { }; @@ -4310,8 +4280,6 @@ with pkgs; biliass = with python3.pkgs; toPythonApplication biliass; - bilibili = callPackage ../applications/video/bilibili { }; - bindfs = callPackage ../tools/filesystems/bindfs { }; binwalk = with python3Packages; toPythonApplication binwalk; @@ -4413,8 +4381,6 @@ with pkgs; bozohttpd = callPackage ../servers/http/bozohttpd { }; bozohttpd-minimal = callPackage ../servers/http/bozohttpd { minimal = true; }; - bpb = callPackage ../tools/security/bpb { inherit (darwin.apple_sdk.frameworks) Security; }; - brasero-original = lowPrio (callPackage ../tools/cd-dvd/brasero { }); brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; @@ -4774,8 +4740,6 @@ with pkgs; wlay = callPackage ../tools/wayland/wlay { }; - wl-clip-persist = callPackage ../tools/wayland/wl-clip-persist { }; - wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; wl-clipboard-x11 = callPackage ../tools/wayland/wl-clipboard-x11 { }; @@ -4826,9 +4790,7 @@ with pkgs; clipster = callPackage ../tools/misc/clipster { }; - clockify = callPackage ../applications/office/clockify { - electron = electron_24; - }; + clockify = callPackage ../applications/office/clockify { }; contrast = callPackage ../applications/accessibility/contrast { }; @@ -5365,6 +5327,7 @@ with pkgs; # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive texlive = callPackage ../tools/typesetting/tex/texlive { }; inherit (texlive.schemes) texliveBasic texliveBookPub texliveConTeXt texliveFull texliveGUST texliveInfraOnly texliveMedium texliveMinimal texliveSmall texliveTeTeX; + texlivePackages = recurseIntoAttrs (lib.filterAttrs (_: lib.isDerivation) texlive.pkgs); fop = callPackage ../tools/typesetting/fop { }; @@ -5398,8 +5361,6 @@ with pkgs; fx-cast-bridge = callPackage ../tools/misc/fx-cast-bridge { }; - fzf = callPackage ../tools/misc/fzf { }; - fzf-obc = callPackage ../shells/bash/fzf-obc { }; fzf-zsh = callPackage ../shells/zsh/fzf-zsh { }; @@ -6307,8 +6268,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) PCSC; }; - step-cli = callPackage ../tools/security/step-cli { }; - step-kms-plugin = callPackage ../tools/security/step-kms-plugin { }; string-machine = callPackage ../applications/audio/string-machine { }; @@ -8338,7 +8297,9 @@ with pkgs; gau = callPackage ../tools/security/gau { }; - gauge = callPackage ../development/tools/gauge { }; + gauge-unwrapped = callPackage ../development/tools/gauge { }; + gauge = callPackage ../development/tools/gauge/wrapper.nix { }; + gaugePlugins = recurseIntoAttrs (callPackage ../development/tools/gauge/plugins {}); gawd = python3Packages.toPythonApplication python3Packages.gawd; @@ -8468,8 +8429,6 @@ with pkgs; gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; - forgejo = callPackage ../applications/version-management/forgejo { }; - gokart = callPackage ../development/tools/gokart { }; gl2ps = callPackage ../development/libraries/gl2ps { }; @@ -8830,8 +8789,6 @@ with pkgs; gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { }; - grype = callPackage ../tools/security/grype { }; - gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest { }; @@ -10169,14 +10126,14 @@ with pkgs; nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; corepack_20 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; }); - nodejs_21 = callPackage ../development/web/nodejs/v21.nix { }; - nodejs-slim_21 = callPackage ../development/web/nodejs/v21.nix { enableNpm = false; }; - corepack_21 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_21; }); + nodejs_22 = callPackage ../development/web/nodejs/v22.nix { }; + nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; }; + corepack_22 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; }); # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs_21; - nodejs-slim_latest = nodejs-slim_21; - corepack_latest = hiPrio corepack_21; + nodejs_latest = nodejs_22; + nodejs-slim_latest = nodejs-slim_22; + corepack_latest = hiPrio corepack_22; buildNpmPackage = callPackage ../build-support/node/build-npm-package { }; @@ -10551,8 +10508,6 @@ with pkgs; lwc = callPackage ../tools/misc/lwc { }; - lxc = callPackage ../os-specific/linux/lxc { }; - lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; lzfse = callPackage ../tools/compression/lzfse { }; @@ -11045,17 +11000,18 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackages ../servers/nextcloud {}) - nextcloud26 nextcloud27 nextcloud28; + nextcloud27 nextcloud28 nextcloud29; - nextcloud26Packages = callPackage ../servers/nextcloud/packages { - apps = lib.importJSON ../servers/nextcloud/packages/26.json; - }; 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; }; + nextcloud29Packages = callPackage ../servers/nextcloud/packages { + apps = lib.importJSON ../servers/nextcloud/packages/29.json; + }; + nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -11567,9 +11523,7 @@ with pkgs; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; - openvswitch = callPackage ../os-specific/linux/openvswitch { }; - - openvswitch-lts = callPackage ../os-specific/linux/openvswitch/lts.nix { }; + openvswitch-lts = callPackage ../by-name/op/openvswitch/lts.nix { }; ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { }; @@ -12548,6 +12502,8 @@ with pkgs; recoll = libsForQt5.callPackage ../applications/search/recoll { }; + recoll-nox = recoll.override { withGui = false; }; + redoc-cli = callPackage ../development/tools/redoc-cli { }; reflex = callPackage ../development/tools/reflex { }; @@ -13087,12 +13043,6 @@ with pkgs; sixpair = callPackage ../tools/misc/sixpair { }; - sketchybar = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/sketchybar { - inherit (darwin.apple_sdk_11_0.frameworks) AppKit Carbon CoreAudio CoreWLAN CoreVideo DisplayServices IOKit MediaRemote SkyLight; - }; - - sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { }; - skippy-xd = callPackage ../tools/X11/skippy-xd { }; sks = callPackage ../servers/sks { @@ -13152,7 +13102,17 @@ with pkgs; smug = callPackage ../tools/misc/smug { }; - smpq = callPackage ../applications/misc/smpq { }; + smpq = callPackage ../by-name/sm/smpq/package.nix { + stormlib = stormlib.overrideAttrs (old: { + version = "9.22"; + src = fetchFromGitHub { + owner = "ladislav-zezula"; + repo = "StormLib"; + rev = "v9.22"; + hash = "sha256-jFUfxLzuRHAvFE+q19i6HfGcL6GX4vKL1g7l7LOhjeU="; + }; + }); + }; snabb = callPackage ../tools/networking/snabb { }; @@ -13507,8 +13467,6 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper { }; - syft = callPackage ../tools/admin/syft { }; - Sylk = callPackage ../applications/networking/Sylk { }; privoxy = callPackage ../tools/networking/privoxy { @@ -13537,9 +13495,6 @@ with pkgs; tailer = callPackage ../tools/misc/tailer { }; - inherit (callPackages ../applications/networking/taler { }) - taler-exchange taler-merchant; - tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; tango = callPackage ../applications/misc/tango { }; @@ -14444,11 +14399,8 @@ with pkgs; xl2tpd = callPackage ../tools/networking/xl2tpd { }; - xlights = callPackage ../applications/misc/xlights/default.nix { }; - xe = callPackage ../tools/system/xe { }; - xray = callPackage ../tools/networking/xray { }; xteve = callPackage ../servers/xteve { }; @@ -14811,7 +14763,9 @@ with pkgs; clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; - clipbuzz = callPackage ../tools/misc/clipbuzz { }; + clipbuzz = callPackage ../tools/misc/clipbuzz { + zig = zig_0_12; + }; xclip = callPackage ../tools/misc/xclip { }; @@ -15365,6 +15319,8 @@ with pkgs; colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; }; colmapWithCuda = colmap.override { cudaSupport = true; }; + opensplatWithCuda = opensplat.override { cudaSupport = true; }; + chickenPackages_4 = recurseIntoAttrs (callPackage ../development/compilers/chicken/4 { }); chickenPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/chicken/5 { }); chickenPackages = dontRecurseIntoAttrs chickenPackages_5; @@ -15494,6 +15450,7 @@ with pkgs; corretto11 = javaPackages.compiler.corretto11; corretto17 = javaPackages.compiler.corretto17; corretto19 = javaPackages.compiler.corretto19; + corretto21 = javaPackages.compiler.corretto21; cotton = callPackage ../development/tools/cotton { inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -16712,7 +16669,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; cargo-clone = callPackage ../development/tools/rust/cargo-clone { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; cargo-codspeed = callPackage ../development/tools/rust/cargo-codspeed { rustPlatform = makeRustPlatform { @@ -16748,19 +16705,6 @@ with pkgs; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration; }; - cargo-pgx_0_6_1 = callPackage ../development/tools/rust/cargo-pgx/0_6_1.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - cargo-pgx_0_7_1 = callPackage ../development/tools/rust/cargo-pgx/0_7_1.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - cargo-pgx_0_7_4 = callPackage ../development/tools/rust/cargo-pgx/0_7_4.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - cargo-pgx = cargo-pgx_0_7_4; - buildPgxExtension = callPackage ../development/tools/rust/cargo-pgx/buildPgxExtension.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) cargo-pgrx_0_10_2 cargo-pgrx_0_11_2 @@ -16820,6 +16764,7 @@ with pkgs; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { + zig = zig_0_12; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; @@ -16892,7 +16837,9 @@ with pkgs; cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { }; - cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { }; + cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { + zig = zig_0_12; + }; cauwugo = callPackage ../development/tools/rust/cauwugo { }; @@ -17326,7 +17273,7 @@ with pkgs; }; inherit (beam.interpreters) - erlang erlang_27-rc2 erlang_26 erlang_25 erlang_24 + erlang erlang_27-rc3 erlang_26 erlang_25 erlang_24 erlang_odbc erlang_javac erlang_odbc_javac elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; @@ -18059,7 +18006,7 @@ with pkgs; nixd = callPackage ../development/tools/language-servers/nixd { llvmPackages = llvmPackages_16; - nix = nixVersions.nix_2_16; + nix = nixVersions.nix_2_19; }; openscad-lsp = callPackage ../development/tools/language-servers/openscad-lsp { }; @@ -18206,7 +18153,7 @@ with pkgs; }; bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 { - inherit (darwin) cctools; + inherit (darwin) cctools sigtool; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; @@ -18963,8 +18910,6 @@ with pkgs; grail = callPackage ../development/libraries/grail { }; - graphene-hardened-malloc = callPackage ../development/libraries/graphene-hardened-malloc { }; - graphene = callPackage ../development/libraries/graphene { }; griffe = with python3Packages; toPythonApplication griffe; @@ -20268,6 +20213,10 @@ with pkgs; babl = callPackage ../development/libraries/babl { }; + backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix { + zig = zig_0_11; + }; + backward-cpp = callPackage ../development/libraries/backward-cpp { }; bamf = callPackage ../development/libraries/bamf { }; @@ -20387,10 +20336,6 @@ with pkgs; captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; catboost = callPackage ../development/libraries/catboost { - # catboost requires clang 12+ for build - # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. - inherit (llvmPackages_12) stdenv; - # https://github.com/catboost/catboost/issues/2540 cudaPackages = cudaPackages_11; }; @@ -23872,7 +23817,8 @@ with pkgs; inherit (callPackages ../development/libraries/openssl { }) openssl_1_1 openssl_3 - openssl_3_2; + openssl_3_2 + openssl_3_3; opensubdiv = callPackage ../development/libraries/opensubdiv { }; @@ -24071,16 +24017,7 @@ with pkgs; pylode = callPackage ../misc/pylode { }; - python-qt = (callPackage ../development/libraries/python-qt { - python = python3; - inherit (builtins.mapAttrs (_: pkg: pkg.override (previousArgs: lib.optionalAttrs (previousArgs ? stdenv) { stdenv = gcc12Stdenv; })) qt5) - qmake qttools qtwebengine qtxmlpatterns; - stdenv = gcc12Stdenv; - }) - .overrideAttrs(previousAttrs: { - NIX_CFLAGS_COMPILE = "-w"; - meta = previousAttrs.meta // { broken = true; }; - }); + python-qt = libsForQt5.callPackage ../development/libraries/python-qt { }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; @@ -24263,6 +24200,17 @@ with pkgs; rocksdb = callPackage ../development/libraries/rocksdb { }; + rocksdb_8_3 = rocksdb.overrideAttrs rec { + pname = "rocksdb"; + version = "8.3.2"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = "v${version}"; + hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg="; + }; + }; + rocksdb_7_10 = rocksdb.overrideAttrs rec { pname = "rocksdb"; version = "7.10.2"; @@ -24270,8 +24218,8 @@ with pkgs; owner = "facebook"; repo = pname; rev = "v${version}"; - hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs="; - }; + hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs="; + }; }; rocksdb_6_23 = rocksdb.overrideAttrs rec { @@ -24656,8 +24604,6 @@ with pkgs; stb = callPackage ../development/libraries/stb { }; - stduuid = callPackage ../development/libraries/stduuid { }; - steghide = callPackage ../tools/graphics/steghide { }; stegsolve = callPackage ../tools/graphics/stegsolve { }; @@ -24782,8 +24728,6 @@ with pkgs; harfbuzz = harfbuzzFull; }; - tepl = callPackage ../development/libraries/tepl { }; - termbench-pro = callPackage ../development/libraries/termbench-pro { fmt = fmt_8; }; telepathy-glib = callPackage ../development/libraries/telepathy/glib { }; @@ -25232,7 +25176,7 @@ with pkgs; zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12.nix { llvmPackages = llvmPackages_17; }; - zig = zig_0_11; + zig = zig_0_12; zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { }; @@ -25495,17 +25439,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_2 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.2"; }; + sbcl_2_4_3 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.3"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_3 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.3"; }; + sbcl_2_4_4 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.4"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_3; + sbcl = sbcl_2_4_4; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25695,8 +25639,6 @@ with pkgs; asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; }); - sabnzbd = callPackage ../servers/sabnzbd { }; - baserow = callPackage ../servers/baserow { }; bftpd = callPackage ../servers/ftp/bftpd { }; @@ -26020,8 +25962,6 @@ with pkgs; kamailio = callPackage ../servers/sip/kamailio { }; - kanidm = callPackage ../servers/kanidm { }; - kapowbang = callPackage ../servers/kapowbang { }; keycloak = callPackage ../servers/keycloak { }; @@ -26384,8 +26324,6 @@ with pkgs; if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; - nginx-sso = callPackage ../servers/nginx-sso { }; - immudb = callPackage ../servers/nosql/immudb { }; influxdb = callPackage ../servers/nosql/influxdb { }; @@ -27959,8 +27897,6 @@ with pkgs; dnsdist = callPackage ../servers/dns/dnsdist { }; - pdns-recursor = callPackage ../servers/dns/pdns-recursor { }; - powertop = callPackage ../os-specific/linux/powertop { }; pps-tools = callPackage ../os-specific/linux/pps-tools { }; @@ -29708,8 +29644,6 @@ with pkgs; requests requests-toolbelt setuptools sqlalchemy fusepy; }; - acorn = callPackage ../applications/networking/cluster/acorn { }; - inherit (qt6Packages.callPackage ../applications/office/activitywatch { }) aw-qt aw-server-rust @@ -30344,9 +30278,7 @@ with pkgs; csound-manual = callPackage ../applications/audio/csound/csound-manual { }; - csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { - python = python3; - }; + csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { }; codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; @@ -30433,6 +30365,7 @@ with pkgs; darktable = callPackage ../applications/graphics/darktable { lua = lua5_4; pugixml = pugixml.override { shared = true; }; + stdenv = if stdenv.isDarwin && stdenv.isx86_64 then overrideSDK llvmPackages_18.stdenv { darwinMinVersion = "10.14"; darwinSdkVersion = "11.0"; } else stdenv; }; das_watchdog = callPackage ../tools/system/das_watchdog { }; @@ -30770,8 +30703,6 @@ with pkgs; evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; - eww = callPackage ../applications/window-managers/eww { }; - exaile = callPackage ../applications/audio/exaile { }; exercism = callPackage ../applications/misc/exercism { }; @@ -31447,8 +31378,6 @@ with pkgs; goffice = callPackage ../development/libraries/goffice { }; - got = darwin.apple_sdk_11_0.callPackage ../applications/version-management/got { }; - gtkterm = callPackage ../tools/misc/gtkterm { }; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; @@ -31502,7 +31431,7 @@ with pkgs; m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; - manim = callPackage ../applications/video/manim { }; + manim = python3Packages.toPythonApplication python3Packages.manim; manim-slides = python3Packages.toPythonApplication ( python3Packages.manim-slides.override { @@ -31961,8 +31890,6 @@ with pkgs; rootbar = callPackage ../applications/misc/rootbar { }; - waybar = callPackage ../applications/misc/waybar { }; - waycorner = callPackage ../applications/misc/waycorner { }; waylock = callPackage ../applications/misc/waylock { }; @@ -32356,7 +32283,7 @@ with pkgs; kid3-qt = qt6Packages.callPackage ../applications/audio/kid3 { withCLI = true; withKDE = false; withQt = true; }; kid3 = kid3-kde; - kile = libsForQt5.callPackage ../applications/editors/kile { }; + kile = callPackage ../applications/editors/kile { }; kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; @@ -32547,8 +32474,6 @@ with pkgs; kiln = callPackage ../applications/misc/kiln { }; - karmor = callPackage ../applications/networking/cluster/karmor { }; - kubernetes-code-generator = callPackage ../development/tools/kubernetes-code-generator { }; kubernetes-controller-tools = callPackage ../development/tools/kubernetes-controller-tools { }; @@ -32902,8 +32827,6 @@ with pkgs; meld = callPackage ../applications/version-management/meld { }; - meli = callPackage ../applications/networking/mailreaders/meli { }; - melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; melody = callPackage ../tools/misc/melody { }; @@ -33599,7 +33522,9 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; - ncdu = callPackage ../tools/misc/ncdu { }; + ncdu = callPackage ../tools/misc/ncdu { + zig = zig_0_12; + }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -34493,8 +34418,6 @@ with pkgs; shavee = callPackage ../applications/misc/shavee { }; - shell_gpt = callPackage ../tools/llm/shell_gpt { }; - shfmt = callPackage ../tools/text/shfmt { }; shipments = callPackage ../applications/misc/shipments { }; @@ -34587,10 +34510,7 @@ with pkgs; wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { - elixir = elixir_1_14; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); - }; + sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; stag = callPackage ../applications/misc/stag { curses = ncurses; @@ -35431,8 +35351,6 @@ with pkgs; neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; - vis = callPackage ../applications/editors/vis { }; - viw = callPackage ../applications/editors/viw { }; virter = callPackage ../applications/virtualization/virter { }; @@ -35958,8 +35876,6 @@ with pkgs; xplugd = callPackage ../tools/X11/xplugd { }; - xpointerbarrier = callPackage ../tools/X11/xpointerbarrier { }; - xkb-switch = callPackage ../tools/X11/xkb-switch { }; xkb-switch-i3 = callPackage ../tools/X11/xkb-switch-i3 { }; @@ -37274,8 +37190,6 @@ with pkgs; nudoku = callPackage ../games/nudoku { }; - nxengine-evo = callPackage ../games/nxengine-evo { }; - oilrush = callPackage ../games/oilrush { }; onscripter-en = callPackage ../games/onscripter-en { }; @@ -37376,17 +37290,11 @@ with pkgs; principia = callPackage ../games/principia { }; - prismlauncher-qt5-unwrapped = libsForQt5.callPackage ../games/prismlauncher { + prismlauncher-unwrapped = kdePackages.callPackage ../games/prismlauncher { inherit (darwin.apple_sdk.frameworks) Cocoa; }; - prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher/wrapper.nix { prismlauncher-unwrapped = prismlauncher-qt5-unwrapped; }; - - prismlauncher-unwrapped = qt6Packages.callPackage ../games/prismlauncher { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - - prismlauncher = qt6Packages.callPackage ../games/prismlauncher/wrapper.nix { }; + prismlauncher = kdePackages.callPackage ../games/prismlauncher/wrapper.nix { }; pong3d = callPackage ../games/pong3d { }; @@ -38880,7 +38788,9 @@ with pkgs; stdenv = gccStdenv; }; - why3 = callPackage ../applications/science/logic/why3 { }; + why3 = callPackage ../applications/science/logic/why3 { + coqPackages = coqPackages_8_18; + }; wayback-machine-archiver = callPackage ../tools/misc/wayback-machine-archiver { }; @@ -39131,8 +39041,6 @@ with pkgs; scilla = callPackage ../tools/security/scilla { }; - scotch = callPackage ../applications/science/math/scotch { }; - mininet = callPackage ../tools/virtualization/mininet { }; msieve = callPackage ../applications/science/math/msieve { }; @@ -39917,7 +39825,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_19; + nix = nixVersions.nix_2_21; }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -40103,8 +40011,6 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - parsedmarc = with python3Packages; toPythonApplication parsedmarc; - pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin4 = callPackage ../tools/admin/pgadmin { }; @@ -40405,16 +40311,12 @@ with pkgs; terraform-backend-git = callPackage ../applications/networking/cluster/terraform-backend-git { }; - terraform-compliance = python3Packages.callPackage ../applications/networking/cluster/terraform-compliance { }; - terraform-docs = callPackage ../applications/networking/cluster/terraform-docs { }; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory { }; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { }; - terragrunt = callPackage ../applications/networking/cluster/terragrunt { }; - tfautomv = callPackage ../applications/networking/cluster/tfautomv { }; terranix = callPackage ../applications/networking/cluster/terranix { }; @@ -40745,10 +40647,6 @@ with pkgs; xzoom = callPackage ../tools/X11/xzoom { }; - yabai = darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/yabai { - inherit (darwin.apple_sdk_11_0.frameworks) SkyLight Cocoa Carbon ScriptingBridge; - }; - yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { }; yadm = callPackage ../applications/version-management/yadm { }; @@ -41299,8 +41197,6 @@ with pkgs; sirikali = libsForQt5.callPackage ../tools/security/sirikali { }; - wttrbar = callPackage ../applications/misc/wttrbar { }; - wpm = callPackage ../applications/misc/wpm { }; weggli = callPackage ../tools/security/weggli { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 8dbc9e1c07087..24b162ec577ff 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -41,7 +41,7 @@ in # Standard Erlang versions, using the generic builder. - erlang_27-rc2 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc2.nix { + erlang_27-rc3 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc3.nix { wxGTK = wxGTK32; parallelBuild = true; autoconf = buildPackages.autoconf269; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 5c538abcf5cef..67a9a60dbaeaa 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -1,5 +1,11 @@ # This file defines the structure of the `config` nixpkgs option. +# This file is tested in `pkgs/test/config.nix`. +# Run tests with: +# +# nix-build -A tests.config +# + { config, lib, ... }: let diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 256652f07b0cc..1964f666a86ba 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -214,7 +214,7 @@ in rec { coqPackages_8_18 = mkCoqPackages coq_8_18 // { __attrsFailEvaluation = true; }; coqPackages_8_19 = mkCoqPackages coq_8_19 // { __attrsFailEvaluation = true; }; coqPackages = - let cp = recurseIntoAttrs coqPackages_8_18; + let cp = recurseIntoAttrs coqPackages_8_19; in cp // { coqPackages = cp.coqPackages // { __attrsFailEvaluation = true; }; } // { __recurseIntoDerivationForReleaseJobs = true; }; coq = coqPackages.coq; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3a5481f45a905..ec050d7431780 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -308,7 +308,7 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc96 = compiler.ghc964; + ghc96 = compiler.ghc965; ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. @@ -513,7 +513,7 @@ in { ghc = bh.compiler.ghc965; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc96 = packages.ghc964; + ghc96 = packages.ghc965; ghc981 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc981; ghc = bh.compiler.ghc981; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 1028c2f62bae8..2d59c358863b2 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -99,6 +99,7 @@ in { corretto11 = callPackage ../development/compilers/corretto/11.nix { }; corretto17 = callPackage ../development/compilers/corretto/17.nix { }; corretto19 = callPackage ../development/compilers/corretto/19.nix { }; + corretto21 = callPackage ../development/compilers/corretto/21.nix { }; openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 ../development/compilers/openjdk/bootstrap.nix diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 31e5f88845440..91a8c2f539267 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -441,6 +441,10 @@ in { rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; + rtl8852au = callPackage ../os-specific/linux/rtl8852au { }; + + rtl8852bu = callPackage ../os-specific/linux/rtl8852bu { }; + rtl88xxau-aircrack = callPackage ../os-specific/linux/rtl88xxau-aircrack {}; rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index f4868822463b5..0fadeba75fd0f 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -100,13 +100,13 @@ rec { lua-resty-core = callPackage ({ fetchFromGitHub }: buildLuaPackage rec { pname = "lua-resty-core"; - version = "0.1.24"; + version = "0.1.28"; src = fetchFromGitHub { owner = "openresty"; repo = "lua-resty-core"; rev = "v${version}"; - sha256 = "sha256-obwyxHSot1Lb2c1dNqJor3inPou+UIBrqldbkNBCQQk="; + sha256 = "sha256-RJ2wcHTu447wM0h1fa2qCBl4/p9XL6ZqX9pktRW64RI="; }; propagatedBuildInputs = [ lua-resty-lrucache ]; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 17df40fa0fb16..78b90082547be 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -1,10 +1,5 @@ -/* Hydra job to build a tarball for Nixpkgs from a Git checkout. It - also builds the documentation and tests whether the Nix expressions - evaluate correctly. */ - { nixpkgs , officialRelease -, supportedSystems , pkgs ? import nixpkgs.outPath {} , nix ? pkgs.nix , lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; } @@ -32,54 +27,50 @@ pkgs.releaseTools.sourceTarball { echo "git-revision is $(cat .git-revision)" ''; - requiredSystemFeatures = [ "big-parallel" ]; # 1 thread but ~36G RAM (!) see #227945 + dontUnpack = true; dontBuild = false; doCheck = true; checkPhase = '' - set -o pipefail - - export NIX_STATE_DIR=$TMPDIR - export NIX_PATH=nixpkgs=$TMPDIR/barf.nix - opts=(--option build-users-group "") - nix-store --init + echo "generating packages.json" - echo "checking eval-release.nix" - nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null + ( + echo -n '{"version":2,"packages":' + NIX_STATE_DIR=$TMPDIR NIX_PATH= nix-env -f $src -qa --meta --json --show-trace --arg config 'import ${./packages-config.nix}' + echo -n '}' + ) | sed "s|$src/||g" | jq -c > packages.json - echo "checking find-tarballs.nix" - nix-instantiate --readonly-mode --eval --strict --show-trace --json \ - ./maintainers/scripts/find-tarballs.nix \ - --arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json - nrUrls=$(jq -r '.[].url' < $TMPDIR/tarballs.json | wc -l) - echo "found $nrUrls URLs" - if [ "$nrUrls" -lt 10000 ]; then - echo "suspiciously low number of URLs" + # Arbitrary number. The index has ~115k packages as of April 2024. + if [ $(jq -r '.packages | length' < packages.json) -lt 100000 ]; then + echo "ERROR: not enough packages in the search index, bailing out!" exit 1 fi - echo "generating packages.json" - mkdir -p $out/nix-support - echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=$src -qa --meta --json --show-trace --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp - echo -n '}' >> tmp packages=$out/packages.json.br - < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages - rm tmp + mkdir -p $out/nix-support + brotli -9 < packages.json > $packages echo "file json-br $packages" >> $out/nix-support/hydra-build-products ''; distPhase = '' mkdir -p $out/tarballs - mkdir ../$releaseName - cp -prd . ../$releaseName - (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false + XZ_OPT="-T0" tar \ + --create \ + --xz \ + --file=$out/tarballs/$releaseName.tar.xz \ + --absolute-names \ + --transform="s|^$src|$releaseName|g" \ + --transform="s|^$(pwd)|$releaseName|g" \ + --owner=0 \ + --group=0 \ + --numeric-owner \ + --format=gnu \ + --sort=name \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --mode=ug+w \ + $src $(pwd)/{.version-suffix,.git-revision} ''; - - meta = { - maintainers = [ ]; - }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 529e893894cf0..8a7ad8a70aeb3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -88,8 +88,12 @@ let biniou = callPackage ../development/ocaml-modules/biniou { }; + binning = callPackage ../development/ocaml-modules/binning { }; + biocaml = janeStreet_0_15.biocaml; + biotk = janeStreet_0_15.biotk; + bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; bistro = callPackage ../development/ocaml-modules/bistro { }; @@ -819,10 +823,18 @@ let cfstream = self.cfstream.override { inherit core_kernel; }; }; + biotk = let + angstrom = self.angstrom.override { inherit ppx_let; }; + in callPackage ../development/ocaml-modules/biotk { + angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; + ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; + uri = self.uri.override { inherit angstrom; }; + vg = self.vg.override { htmlcBackend = false; }; + }; + phylogenetics = let angstrom = self.angstrom.override { inherit ppx_let; }; in callPackage ../development/ocaml-modules/phylogenetics { - inherit biocaml; ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; }; @@ -830,16 +842,6 @@ let ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; })).overrideScope liftJaneStreet; - janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { - self = self.janeStreet_0_9_0; - super = self // { - janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { - defaultVersion = "0.9.0"; - }; - }; - inherit (pkgs) stdenv lib openssl; - }; - javalib = callPackage ../development/ocaml-modules/javalib { }; jingoo = callPackage ../development/ocaml-modules/jingoo { }; @@ -1182,7 +1184,6 @@ let msat = callPackage ../development/ocaml-modules/msat { }; - mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; mtime = callPackage ../development/ocaml-modules/mtime { }; multipart-form-data = callPackage ../development/ocaml-modules/multipart-form-data { }; @@ -1193,6 +1194,8 @@ let netchannel = callPackage ../development/ocaml-modules/netchannel { }; + ninja_utils = callPackage ../development/ocaml-modules/ninja_utils { }; + nonstd = callPackage ../development/ocaml-modules/nonstd { }; note = callPackage ../development/ocaml-modules/note { }; @@ -1383,7 +1386,7 @@ let inherit (pkgs) unzip; }; - opium = callPackage ../development/ocaml-modules/opium { mtime = mtime_1; }; + opium = callPackage ../development/ocaml-modules/opium { }; opti = callPackage ../development/ocaml-modules/opti { }; @@ -1725,6 +1728,8 @@ let stog_asy = callPackage ../applications/misc/stog/asy.nix { }; stog_markdown = callPackage ../applications/misc/stog/markdown.nix { }; + streaming = callPackage ../development/ocaml-modules/streaming { }; + stringext = callPackage ../development/ocaml-modules/stringext { }; syslog = callPackage ../development/ocaml-modules/syslog { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d2f882832c3b6..a247be4c7d330 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1253,7 +1253,7 @@ with self; { }; }; - AstroFITSHeader = buildPerlModule rec { + AstroFITSHeader = buildPerlModule { pname = "Astro-FITS-Header"; version = "3.09"; src = fetchurl { @@ -1358,7 +1358,7 @@ with self; { }; }; - AuthenKrb5Admin = buildPerlPackage rec { + AuthenKrb5Admin = buildPerlPackage { pname = "Authen-Krb5-Admin"; version = "0.17"; src = fetchurl { @@ -1836,7 +1836,7 @@ with self; { }; }; - BKeywords = buildPerlPackage rec { + BKeywords = buildPerlPackage { pname = "B-Keywords"; version = "1.26"; src = fetchurl { @@ -3627,7 +3627,7 @@ with self; { }; }; - ClassLoader = buildPerlPackage rec { + ClassLoader = buildPerlPackage { pname = "Class-Loader"; version = "2.03"; src = fetchurl { @@ -4529,7 +4529,7 @@ with self; { }; }; - ConvertBencode = buildPerlPackage rec { + ConvertBencode = buildPerlPackage { pname = "Convert-Bencode"; version = "1.03"; src = fetchurl { @@ -4557,7 +4557,7 @@ with self; { }; }; - ConvertUU = buildPerlPackage rec { + ConvertUU = buildPerlPackage { pname = "Convert-UU"; version = "0.5201"; src = fetchurl { @@ -5241,7 +5241,7 @@ with self; { }; }; - CryptRandom = buildPerlPackage rec { + CryptRandom = buildPerlPackage { pname = "Crypt-Random"; version = "1.54"; src = fetchurl { @@ -5552,7 +5552,7 @@ with self; { }; }; - CryptOpenSSLX509 = buildPerlPackage rec { + CryptOpenSSLX509 = buildPerlPackage { pname = "Crypt-OpenSSL-X509"; version = "1.915"; src = fetchurl { @@ -6961,7 +6961,7 @@ with self; { }; }; - DevelLeak = buildPerlPackage rec { + DevelLeak = buildPerlPackage { pname = "Devel-Leak"; version = "0.03"; src = fetchurl { @@ -9166,7 +9166,7 @@ with self; { }; }; - ExtUtilsF77 = buildPerlPackage rec { + ExtUtilsF77 = buildPerlPackage { pname = "ExtUtils-F77"; version = "1.26"; src = fetchurl { @@ -10538,7 +10538,7 @@ with self; { }; }; - FutureAsyncAwait = buildPerlModule rec { + FutureAsyncAwait = buildPerlModule { pname = "Future-AsyncAwait"; version = "0.66"; src = fetchurl { @@ -10772,7 +10772,7 @@ with self; { }; }; - GitAutofixup = buildPerlPackage rec { + GitAutofixup = buildPerlPackage { pname = "App-Git-Autofixup"; version = "0.004001"; src = fetchurl { @@ -11383,7 +11383,7 @@ with self; { propagatedBuildInputs = [ DateCalc ]; meta = { description = "Finnish APRS Parser (Fabulous APRS Parser)"; - maintainers = with maintainers; [ andrew-d ]; + maintainers = [ ]; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14610,7 +14610,7 @@ with self; { }; }; - LogJournald = buildPerlModule rec { + LogJournald = buildPerlModule { pname = "Log-Journald"; version = "0.30"; src = fetchurl { @@ -15727,7 +15727,7 @@ with self; { }; # TODO: use CPAN version - MHonArc = buildPerlPackage rec { + MHonArc = buildPerlPackage { pname = "MHonArc"; version = "2.6.24"; @@ -16142,7 +16142,7 @@ with self; { }; }; - ModuleCompile = buildPerlPackage rec { + ModuleCompile = buildPerlPackage { pname = "Module-Compile"; version = "0.38"; src = fetchurl { @@ -16598,16 +16598,16 @@ with self; { Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "9.35"; + version = "9.36"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.35.tar.gz"; - hash = "sha256-akpEbuB/ynxtty9dgXVA1oMwCcuN58zkxvskoV7n1Gs="; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.36.tar.gz"; + hash = "sha256-UX7Pb9hqC3xhadVRAiOL+YUWGNt2L7ANTPDZTGJSAV8="; }; meta = { description = "Real-time web framework"; homepage = "https://mojolicious.org"; license = with lib.licenses; [ artistic2 ]; - maintainers = with maintainers; [ thoughtpolice sgo ]; + maintainers = with maintainers; [ marcusramberg sgo thoughtpolice ]; mainProgram = "mojo"; }; }; @@ -16836,7 +16836,7 @@ with self; { }; }; - Mojomysql = buildPerlPackage rec { + Mojomysql = buildPerlPackage { pname = "Mojo-mysql"; version = "1.26"; src = fetchurl { @@ -18175,9 +18175,11 @@ with self; { url = "mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.06.tar.gz"; hash = "sha256-ugtu0JiX/1Y7pZhy7pNxW+83FXUVsZt8bW8obmVI7Ks="; }; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' - # Makefile.PL in this package uses which to find pkg-config -- make it use path instead - patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Makefile.PL''; + # Makefile.PL in this package uses which to find pkg-config -- make it use envvar instead + postPatch = '' + substituteInPlace Makefile.PL \ + --replace-fail '`which pkg-config`' "'$PKG_CONFIG'" + ''; doCheck = false; # The main test performs network access nativeBuildInputs = [ pkgs.pkg-config ]; propagatedBuildInputs = [ pkgs.libdiscid ]; @@ -18216,7 +18218,7 @@ with self; { }; }; - MySQLDiff = buildPerlPackage rec { + MySQLDiff = buildPerlPackage { pname = "MySQL-Diff"; version = "0.60"; src = fetchurl { @@ -19166,7 +19168,7 @@ with self; { }; }; - NetSNPP = buildPerlPackage rec { + NetSNPP = buildPerlPackage { pname = "Net-SNPP"; version = "1.17"; src = fetchurl { @@ -19546,7 +19548,7 @@ with self; { }; }; - OpenAPIClient = buildPerlPackage rec { + OpenAPIClient = buildPerlPackage { pname = "OpenAPI-Client"; version = "1.07"; src = fetchurl { @@ -20257,7 +20259,7 @@ with self; { }; }; - PDL = buildPerlPackage rec { + PDL = buildPerlPackage { pname = "PDL"; version = "2.025"; src = fetchurl { @@ -20602,7 +20604,7 @@ with self; { }; }; - PerlTidy = buildPerlPackage rec { + PerlTidy = buildPerlPackage { pname = "Perl-Tidy"; version = "20230912"; src = fetchurl { @@ -22311,7 +22313,7 @@ with self; { }; }; - SearchXapian = buildPerlPackage rec { + SearchXapian = buildPerlPackage { pname = "Search-Xapian"; version = "1.2.25.5"; src = fetchurl { @@ -22375,7 +22377,7 @@ with self; { }; }; - DeviceSerialPort = buildPerlPackage rec { + DeviceSerialPort = buildPerlPackage { pname = "Device-SerialPort"; version = "1.04"; src = fetchurl { @@ -22406,7 +22408,7 @@ with self; { }; }; - SessionToken = buildPerlPackage rec { + SessionToken = buildPerlPackage { pname = "Session-Token"; version = "1.503"; src = fetchurl { @@ -22481,7 +22483,7 @@ with self; { }; }; - SmartComments = buildPerlPackage rec { + SmartComments = buildPerlPackage { pname = "Smart-Comments"; version = "1.06"; src = fetchurl { @@ -22975,7 +22977,7 @@ with self; { }; }; - StatisticsChiSquare = buildPerlPackage rec { + StatisticsChiSquare = buildPerlPackage { pname = "Statistics-ChiSquare"; version = "1.0000"; src = fetchurl { @@ -25600,7 +25602,7 @@ with self; { }; }; - TestPerlTidy = buildPerlModule rec { + TestPerlTidy = buildPerlModule { pname = "Test-PerlTidy"; version = "20230226"; src = fetchurl { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4f0c0d4219cf0..e75f863bbcbce 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -150,6 +150,7 @@ mapAliases ({ 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 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 inherit (super.pkgs) fetchPypi; # added 2023-05-25 filebrowser_safe = filebrowser-safe; # added 2024-01-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 947e18d2d784d..754a18310412c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -467,6 +467,8 @@ self: super: with self; { airtouch4pyapi = callPackage ../development/python-modules/airtouch4pyapi { }; + airtouch5py = callPackage ../development/python-modules/airtouch5py { }; + ajpy = callPackage ../development/python-modules/ajpy { }; ajsonrpc = callPackage ../development/python-modules/ajsonrpc { }; @@ -2262,6 +2264,8 @@ self: super: with self; { clldutils = callPackage ../development/python-modules/clldutils { }; + cloudevents = callPackage ../development/python-modules/cloudevents { }; + cloudflare = callPackage ../development/python-modules/cloudflare { }; cloudpathlib = callPackage ../development/python-modules/cloudpathlib { }; @@ -2396,6 +2400,12 @@ self: super: with self; { conda = callPackage ../development/python-modules/conda { }; + conda-libmamba-solver = callPackage ../development/python-modules/conda-libmamba-solver { }; + + conda-package-handling = callPackage ../development/python-modules/conda-package-handling { }; + + conda-package-streaming = callPackage ../development/python-modules/conda-package-streaming { }; + confection = callPackage ../development/python-modules/confection { }; configargparse = callPackage ../development/python-modules/configargparse { }; @@ -2698,6 +2708,8 @@ self: super: with self; { dask-awkward = callPackage ../development/python-modules/dask-awkward { }; + dask-expr = callPackage ../development/python-modules/dask-expr { }; + dask-gateway = callPackage ../development/python-modules/dask-gateway { }; dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { }; @@ -3837,6 +3849,8 @@ self: super: with self; { epion = callPackage ../development/python-modules/epion { }; + epitran = callPackage ../development/python-modules/epitran { }; + epson-projector = callPackage ../development/python-modules/epson-projector { }; equinox = callPackage ../development/python-modules/equinox { }; @@ -4101,8 +4115,6 @@ self: super: with self; { fastnumbers = callPackage ../development/python-modules/fastnumbers { }; - fastpair = callPackage ../development/python-modules/fastpair { }; - fastparquet = callPackage ../development/python-modules/fastparquet { }; fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; @@ -4788,6 +4800,8 @@ self: super: with self; { gitpython = callPackage ../development/python-modules/gitpython { }; + git-versioner = callPackage ../development/python-modules/git-versioner { }; + glad = callPackage ../development/python-modules/glad { }; glad2 = callPackage ../development/python-modules/glad2 { }; @@ -5499,6 +5513,8 @@ self: super: with self; { httpx-socks = callPackage ../development/python-modules/httpx-socks { }; + httpx-sse = callPackage ../development/python-modules/httpx-sse { }; + huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { }; huey = callPackage ../development/python-modules/huey { }; @@ -6397,10 +6413,14 @@ self: super: with self; { kornia = callPackage ../development/python-modules/kornia { }; + kornia-rs = callPackage ../development/python-modules/kornia-rs { }; + krakenex = callPackage ../development/python-modules/krakenex { }; krfzf-py = callPackage ../development/python-modules/krfzf-py { }; + kserve = callPackage ../development/python-modules/kserve { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; kurbopy = callPackage ../development/python-modules/kurbopy { }; @@ -6611,6 +6631,8 @@ self: super: with self; { inherit (pkgs) lzfse; }; + libmambapy = callPackage ../development/python-modules/libmambapy { }; + libmodulemd = lib.pipe pkgs.libmodulemd [ toPythonModule (p: @@ -7088,8 +7110,12 @@ self: super: with self; { mandown = callPackage ../development/python-modules/mandown { }; + manga-ocr = callPackage ../development/python-modules/manga-ocr { }; + manhole = callPackage ../development/python-modules/manhole { }; + manim = callPackage ../development/python-modules/manim { }; + manimpango = callPackage ../development/python-modules/manimpango { inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; @@ -7482,8 +7508,6 @@ self: super: with self; { mkdocs-rss-plugin = callPackage ../development/python-modules/mkdocs-rss-plugin { }; - mkdocs-simple-hooks = callPackage ../development/python-modules/mkdocs-simple-hooks { }; - mkdocs-swagger-ui-tag = callPackage ../development/python-modules/mkdocs-swagger-ui-tag { }; mkdocstrings = callPackage ../development/python-modules/mkdocstrings { }; @@ -8526,6 +8550,8 @@ self: super: with self; { nampa = callPackage ../development/python-modules/nampa { }; + nanobind = callPackage ../development/python-modules/nanobind { }; + nanoid = callPackage ../development/python-modules/nanoid { }; nanoleaf = callPackage ../development/python-modules/nanoleaf { }; @@ -9363,6 +9389,8 @@ self: super: with self; { panflute = callPackage ../development/python-modules/panflute { }; + panphon = callPackage ../development/python-modules/panphon { }; + papermill = callPackage ../development/python-modules/papermill { }; openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { }; @@ -9762,6 +9790,8 @@ self: super: with self; { pipdeptree = callPackage ../development/python-modules/pipdeptree { }; + pipe = callPackage ../development/python-modules/pipe { }; + pipenv-poetry-migrate = callPackage ../development/python-modules/pipenv-poetry-migrate { }; piper-phonemize = callPackage ../development/python-modules/piper-phonemize { @@ -9775,6 +9805,8 @@ self: super: with self; { pip-requirements-parser = callPackage ../development/python-modules/pip-requirements-parser { }; + pip-system-certs = callPackage ../development/python-modules/pip-system-certs { }; + pipx = callPackage ../development/python-modules/pipx { }; pivy = callPackage ../development/python-modules/pivy { @@ -9908,6 +9940,8 @@ self: super: with self; { pynose = callPackage ../development/python-modules/pynose { }; + pynotifier = callPackage ../development/python-modules/pynotifier { }; + pynuki = callPackage ../development/python-modules/pynuki { }; pynut2 = callPackage ../development/python-modules/pynut2 { }; @@ -10944,6 +10978,12 @@ self: super: with self; { SDL2_image = pkgs.SDL2_image_2_0; }; + pygame-ce = callPackage ../development/python-modules/pygame-ce { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; + SDL2_image = pkgs.SDL2_image_2_0; + SDL2_mixer = pkgs.SDL2_mixer_2_0; + }; + pygame-sdl2 = callPackage ../development/python-modules/pygame-sdl2 { }; pygame-gui = callPackage ../development/python-modules/pygame-gui { }; @@ -12285,6 +12325,8 @@ self: super: with self; { python-hglib = callPackage ../development/python-modules/python-hglib { }; + python-homeassistant-analytics = callPackage ../development/python-modules/python-homeassistant-analytics { }; + python-homewizard-energy = callPackage ../development/python-modules/python-homewizard-energy { }; python-hosts = callPackage ../development/python-modules/python-hosts { }; @@ -12658,6 +12700,8 @@ self: super: with self; { pywaterkotte = callPackage ../development/python-modules/pywaterkotte { }; + pywavefront = callPackage ../development/python-modules/pywavefront { }; + pywavelets = callPackage ../development/python-modules/pywavelets { }; pywayland = callPackage ../development/python-modules/pywayland { }; @@ -12831,6 +12875,8 @@ self: super: with self; { quandl = callPackage ../development/python-modules/quandl { }; + quantile-forest = callPackage ../development/python-modules/quantile-forest { }; + quantities = callPackage ../development/python-modules/quantities { }; quantiphy = callPackage ../development/python-modules/quantiphy { }; @@ -12859,6 +12905,8 @@ self: super: with self; { quil = callPackage ../development/python-modules/quil { }; + quixote = callPackage ../development/python-modules/quixote { }; + qutip = callPackage ../development/python-modules/qutip { }; qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; @@ -13368,6 +13416,8 @@ self: super: with self; { ruamel-yaml-clib = callPackage ../development/python-modules/ruamel-yaml-clib { }; + rubicon-objc = callPackage ../development/python-modules/rubicon-objc { }; + rubymarshal = callPackage ../development/python-modules/rubymarshal { }; ruffus = callPackage ../development/python-modules/ruffus { }; @@ -13450,6 +13500,8 @@ self: super: with self; { sanic-testing = callPackage ../development/python-modules/sanic-testing { }; + sanix = callPackage ../development/python-modules/sanix { }; + sansio-multipart = callPackage ../development/python-modules/sansio-multipart { }; sarif-om = callPackage ../development/python-modules/sarif-om { }; @@ -14304,6 +14356,8 @@ self: super: with self; { spyder-kernels = callPackage ../development/python-modules/spyder-kernels { }; + spylls = callPackage ../development/python-modules/spylls { }; + spyse-python = callPackage ../development/python-modules/spyse-python { }; spython = callPackage ../development/python-modules/spython { }; @@ -14394,6 +14448,8 @@ self: super: with self; { sslib = callPackage ../development/python-modules/sslib { }; + ssg = callPackage ../development/python-modules/ssg { }; + stack-data = callPackage ../development/python-modules/stack-data { }; stanio = callPackage ../development/python-modules/stanio { }; @@ -15041,6 +15097,8 @@ self: super: with self; { timezonefinder = callPackage ../development/python-modules/timezonefinder { }; + timing-asgi = callPackage ../development/python-modules/timing-asgi { }; + timm = callPackage ../development/python-modules/timm { }; tiny-cuda-nn = toPythonModule (pkgs.tiny-cuda-nn.override { @@ -16242,6 +16300,8 @@ self: super: with self; { uarray = callPackage ../development/python-modules/uarray { }; + uart-devices = callPackage ../development/python-modules/uart-devices { }; + uasiren = callPackage ../development/python-modules/uasiren { }; ubelt = callPackage ../development/python-modules/ubelt { }; @@ -16340,8 +16400,6 @@ self: super: with self; { unique-log-filter = callPackage ../development/python-modules/unique-log-filter { }; - units = callPackage ../development/python-modules/units { }; - unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index ed1d3240d1cf7..5ebc1c78a89fe 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -319,6 +319,7 @@ let madlang mailctl matterhorn + mkjson mueval naproche niv @@ -330,6 +331,8 @@ let nix-script nix-tree nixfmt + nixfmt-classic + nixfmt-rfc-style nota nvfetcher ormolu @@ -470,6 +473,15 @@ let inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskellPackages) ghc hello + microlens + ; + }; + + haskell.packages.ghc98 = { + inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghc98) + ghc + hello + microlens ; }; @@ -477,6 +489,7 @@ let inherit (packagePlatforms pkgs.pkgsCross.ghcjs.haskell.packages.ghcHEAD) ghc hello + microlens ; }; }; @@ -594,42 +607,35 @@ let maintainers = lib.teams.haskell.members; }; constituents = - let - # Filter out all Darwin derivations. We don't want flakey Darwin - # derivations and flakey Hydra Darwin builders to block the - # mergeable job from successfully building. - filterInLinux = - lib.filter (drv: drv.system == "x86_64-linux" || drv.system == "aarch64-linux"); - in - filterInLinux - (accumulateDerivations [ - # haskell specific tests - jobs.tests.haskell - # important top-level packages - jobs.cabal-install - jobs.cabal2nix - jobs.cachix - jobs.darcs - jobs.haskell-language-server - jobs.hledger - jobs.hledger-ui - jobs.hpack - jobs.niv - jobs.pandoc - jobs.stack - jobs.stylish-haskell - # important haskell (library) packages - jobs.haskellPackages.cabal-plan - jobs.haskellPackages.distribution-nixpkgs - jobs.haskellPackages.hackage-db - jobs.haskellPackages.xmonad - jobs.haskellPackages.xmonad-contrib - # haskell packages maintained by @peti - # imported from the old hydra jobset - jobs.haskellPackages.hopenssl - jobs.haskellPackages.hsemail - jobs.haskellPackages.hsyslog - ]); + accumulateDerivations [ + # haskell specific tests + jobs.tests.haskell + # important top-level packages + jobs.cabal-install + jobs.cabal2nix + jobs.cachix + jobs.darcs + jobs.haskell-language-server + jobs.hledger + jobs.hledger-ui + jobs.hpack + jobs.niv + jobs.pandoc + jobs.stack + jobs.stylish-haskell + jobs.shellcheck + # important haskell (library) packages + jobs.haskellPackages.cabal-plan + jobs.haskellPackages.distribution-nixpkgs + jobs.haskellPackages.hackage-db + jobs.haskellPackages.xmonad + jobs.haskellPackages.xmonad-contrib + # haskell packages maintained by @peti + # imported from the old hydra jobset + jobs.haskellPackages.hopenssl + jobs.haskellPackages.hsemail + jobs.haskellPackages.hsyslog + ]; }; maintained = pkgs.releaseTools.aggregate { name = "maintained-haskell-packages"; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 2b143248948fa..0212464acb62d 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -18,7 +18,7 @@ in { tarball = import ./make-tarball.nix { - inherit nixpkgs supportedSystems; + inherit nixpkgs; officialRelease = false; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2da2d7d64675c..d11d1d1dbd43b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -78,7 +78,7 @@ let ] (arch: elem "${arch}-darwin" supportedSystems); nonPackageJobs = - { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease supportedSystems; }; + { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; release-checks = import ./nixpkgs-basic-release-checks.nix { inherit pkgs nixpkgs supportedSystems; }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index c220d1275051b..0528d45bef84e 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2549,6 +2549,16 @@ }; version = "1.0.1"; }; + os = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; + type = "gem"; + }; + version = "1.1.4"; + }; ovirt-engine-sdk = { dependencies = ["json"]; groups = ["default"]; @@ -3452,6 +3462,17 @@ }; version = "3.0.7"; }; + seccomp-tools = { + dependencies = ["os"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v5zyby5glih0prddxm8wp6gn2glrnvf7y4r64k4iqfpdazdpsa3"; + type = "gem"; + }; + version = "1.6.1"; + }; semian = { groups = ["default"]; platforms = []; |