diff options
Diffstat (limited to 'nixpkgs/pkgs/top-level')
| -rw-r--r-- | nixpkgs/pkgs/top-level/aliases.nix | 34 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 300 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/kodi-packages.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/linux-kernels.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/ocaml-packages.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/perl-packages.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/python-aliases.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/python-packages.nix | 68 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/qt5-packages.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/qt6-packages.nix | 11 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/release-attrpaths-superset.nix | 1 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/stage.nix | 11 |
12 files changed, 267 insertions, 195 deletions
diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index cce25da849d9..e4d03b291663 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -76,6 +76,7 @@ mapAliases ({ apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 antimicroX = antimicrox; # Added 2021-10-31 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 + archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 @@ -160,7 +161,9 @@ mapAliases ({ chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 - citra = citra-nightly; # added 2022-05-17 + citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 + citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 + citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 collada-dom = opencollada; # added 2024-02-21 @@ -299,6 +302,7 @@ mapAliases ({ firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 + flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 @@ -320,6 +324,12 @@ mapAliases ({ fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13 fcitx-configtool = throw "fcitx-configtool is deprecated, please use fcitx5 instead."; # Added 2023-03-13 + fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01 + fcitx5-configtool = libsForQt5.fcitx5-configtool; # Added 2024-03-01 + fcitx5-skk-qt = libsForQt5.fcitx5-skk-qt; # Added 2024-03-01 + fcitx5-unikey = libsForQt5.fcitx5-unikey; # Added 2024-03-01 + fcitx5-with-addons = libsForQt5.fcitx5-with-addons; # Added 2024-03-01 + ### G ### g4py = python3Packages.geant4; # Added 2020-06-06 @@ -740,6 +750,7 @@ mapAliases ({ net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 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 @@ -754,6 +765,7 @@ mapAliases ({ nextcloud25Packages = throw "Nextcloud25 is EOL!"; # Added 2023-10-13 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 nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 nix-direnv-flakes = nix-direnv; nix-repl = throw ( @@ -770,8 +782,12 @@ mapAliases ({ nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; - nixops = throw "'nixops' has been removed. Please use 'nixops_unstable' for the time being."; # Added 2023-10-26 + nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 + + # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable. + nixops_unstable = throw "nixops_unstable has been replaced. Please use for example 'nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ps.nixops-encrypted-links ])' instead"; # Added 2024-02-28 + nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = nmap; # Added 2021-04-06 nodejs_14 = throw "nodejs_14 has been removed as it is EOL."; # Added 2023-10-30 @@ -1082,6 +1098,7 @@ mapAliases ({ swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swtpm-tpm2 = swtpm; # Added 2021-02-26 syncthing-cli = syncthing; # Added 2021-04-06 + syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 ### T ### @@ -1149,6 +1166,8 @@ mapAliases ({ ventoy-bin = ventoy; # Added 2023-04-12 ventoy-bin-full = ventoy-full; # Added 2023-04-12 ViennaRNA = viennarna; # Added 2023-08-23 + vikunja-api = throw "'vikunja-api' has been replaced by 'vikunja'"; # Added 2024-02-19 + vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 @@ -1208,14 +1227,17 @@ mapAliases ({ yafaray-core = libyafaray; # Added 2022-09-23 yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 yubikey-manager4 = throw "yubikey-manager4 has been removed, since it is no longer required by yubikey-manager-qt. Please update to yubikey-manager."; # Added 2024-01-14 - yuzu-ea = yuzuPackages.early-access; # Added 2022-08-18 - yuzu-early-access = yuzuPackages.early-access; # Added 2023-12-29 - yuzu = yuzuPackages.mainline; # Added 2021-01-25 - yuzu-mainline = yuzuPackages.mainline; # Added 2023-12-29 + yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 ### Z ### zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07 + zfsStable = zfs; # Added 2024-02-26 + zfsUnstable = zfs_unstable; # Added 2024-02-26 zinc = zincsearch; # Added 2023-05-28 zkg = throw "'zkg' has been replaced by 'zeek'"; zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 06b9098ee7b2..1ea476d022e0 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -559,6 +559,8 @@ with pkgs; containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; + coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); + coost = callPackage ../development/libraries/coost { }; confetty = callPackage ../applications/misc/confetty { }; @@ -1561,8 +1563,8 @@ with pkgs; adminer = callPackage ../servers/adminer { }; akkoma = callPackage ../servers/akkoma { - elixir = elixir_1_14; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); + elixir = elixir_1_16; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_16; }); }; akkoma-frontends = recurseIntoAttrs { akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; @@ -2646,14 +2648,6 @@ with pkgs; webfontkitgenerator = callPackage ../applications/misc/webfontkitgenerator { }; - citra-canary = callPackage ../applications/emulators/citra { - branch = "canary"; - }; - - citra-nightly = callPackage ../applications/emulators/citra { - branch = "nightly"; - }; - collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { }; coltrane = callPackage ../applications/misc/coltrane { }; @@ -2810,8 +2804,6 @@ with pkgs; ruffle = callPackage ../applications/emulators/ruffle { }; - ryujinx = callPackage ../applications/emulators/ryujinx { }; - sameboy = callPackage ../applications/emulators/sameboy { }; simh = callPackage ../applications/emulators/simh { }; @@ -2916,9 +2908,6 @@ with pkgs; kodi-retroarch-advanced-launchers = callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; - ### APPLICATIONS/EMULATORS/YUZU - yuzuPackages = callPackage ../applications/emulators/yuzu {}; - # Aliases kept here because they are easier to use x16-emulator = x16.emulator; x16-rom = x16.rom; @@ -4378,7 +4367,9 @@ with pkgs; charles4 ; - quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; + quaternion-qt5 = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; + quaternion-qt6 = qt6Packages.callPackage ../applications/networking/instant-messengers/quaternion { }; + quaternion = quaternion-qt6; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; @@ -4829,8 +4820,6 @@ with pkgs; wleave = callPackage ../tools/wayland/wleave { }; - wlogout = callPackage ../tools/wayland/wlogout { }; - wlopm = callPackage ../tools/wayland/wlopm { }; wlprop = callPackage ../tools/wayland/wlprop { }; @@ -6439,7 +6428,7 @@ with pkgs; routersploit = callPackage ../tools/security/routersploit { }; routinator = callPackage ../servers/routinator { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; rsbep = callPackage ../tools/backup/rsbep { }; @@ -7373,6 +7362,8 @@ with pkgs; debugedit = callPackage ../development/tools/misc/debugedit { }; + decode-spam-headers = callPackage ../tools/networking/decode-spam-headers { }; + deer = callPackage ../shells/zsh/zsh-deer { }; deno = callPackage ../development/web/deno { }; @@ -7807,7 +7798,7 @@ with pkgs; (callPackage ../development/libraries/volk { }) ; - vorta = libsForQt5.callPackage ../applications/backup/vorta { }; + vorta = qt6Packages.callPackage ../applications/backup/vorta { }; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; @@ -8042,29 +8033,17 @@ with pkgs; chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; - fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { }; - - fcitx5-with-addons = callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; + fcitx5 = callPackage ../tools/inputmethods/fcitx5 { }; fcitx5-bamboo = callPackage ../tools/inputmethods/fcitx5/fcitx5-bamboo.nix { }; - fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; - fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { abseil-cpp = abseil-cpp.override { cxxStandard = "17"; }; }; - fcitx5-skk = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { }; - - fcitx5-skk-qt = fcitx5-skk.override { - enableQt = true; - }; - - fcitx5-unikey = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; - - fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { }; fcitx5-anthy = callPackage ../tools/inputmethods/fcitx5/fcitx5-anthy.nix { }; @@ -8172,8 +8151,6 @@ with pkgs; flashrom = callPackage ../tools/misc/flashrom { }; - flashrom-stable = callPackage ../tools/misc/flashrom-stable { }; - flent = python3Packages.callPackage ../applications/networking/flent { }; flexoptix-app = callPackage ../tools/misc/flexoptix-app { }; @@ -8417,7 +8394,7 @@ with pkgs; }) garage garage_0_8 garage_0_9 - garage_0_8_5 garage_0_9_1; + garage_0_8_7 garage_0_9_3; garmintools = callPackage ../development/libraries/garmintools { }; @@ -8730,11 +8707,11 @@ with pkgs; google-clasp = callPackage ../development/tools/google-clasp { }; - google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine; + google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; - google-cloud-cpp = disable-warnings-if-gcc13 (callPackage ../development/libraries/google-cloud-cpp { }); + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; google-java-format = callPackage ../development/tools/google-java-format { }; @@ -10285,6 +10262,8 @@ with pkgs; inherit (callPackages ../build-support/node/fetch-npm-deps { }) fetchNpmDeps prefetch-npm-deps; + importNpmLock = callPackages ../build-support/node/import-npm-lock { }; + nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs // { __attrsFailEvaluation = true; }; nodePackages = dontRecurseIntoAttrs nodejs.pkgs // { __attrsFailEvaluation = true; }; @@ -10747,8 +10726,6 @@ with pkgs; mbuffer = callPackage ../tools/misc/mbuffer { }; - mdsh = callPackage ../development/tools/documentation/mdsh { }; - mecab = let mecab-nodic = callPackage ../tools/text/mecab/nodic.nix { }; @@ -13040,8 +13017,6 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; - sequoia-sq = callPackage ../tools/security/sequoia-sq { }; - sequoia-sqv = callPackage ../tools/security/sequoia-sqv { }; sequoia-sqop = callPackage ../tools/security/sequoia-sqop { }; @@ -13715,7 +13690,9 @@ with pkgs; teip = callPackage ../tools/text/teip { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; + telegraf = callPackage ../servers/monitoring/telegraf { + buildGoModule = buildGo122Module; + }; teleport_12 = callPackage ../servers/teleport/12 { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; @@ -14872,8 +14849,6 @@ with pkgs; woeusb-ng = callPackage ../tools/misc/woeusb-ng { }; - wslu = callPackage ../tools/system/wslu { }; - chase = callPackage ../tools/system/chase { }; wimlib = callPackage ../tools/archivers/wimlib { }; @@ -16532,6 +16507,7 @@ with pkgs; llvm_16 = llvmPackages_16.llvm; llvm_17 = llvmPackages_17.llvm; + mlir_16 = llvmPackages_16.mlir; mlir_17 = llvmPackages_17.mlir; libllvm = llvmPackages.libllvm; @@ -16544,7 +16520,7 @@ with pkgs; /**/ if platform.isDarwin then 16 else if platform.isFreeBSD then 12 else if platform.isAndroid then 12 - else if platform.isLinux then 16 + else if platform.isLinux then 17 else if platform.isWasm then 16 # For unknown systems, assume the latest version is required. else 17; @@ -16805,11 +16781,11 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_75 = callPackage ../development/compilers/rust/1_75.nix { + rust_1_76 = callPackage ../development/compilers/rust/1_76.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_17 = llvmPackages_17.libllvm; }; - rust = rust_1_75; + rust = rust_1_76; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16817,8 +16793,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_75 = rust_1_75.packages.stable; - rustPackages = rustPackages_1_75; + rustPackages_1_76 = rust_1_76.packages.stable; + rustPackages = rustPackages_1_76; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -16927,7 +16903,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { }; - cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-bolero = callPackage ../development/tools/rust/cargo-bolero { }; cargo-bundle = callPackage ../development/tools/rust/cargo-bundle { }; cargo-bundle-licenses = callPackage ../development/tools/rust/cargo-bundle-licenses { }; @@ -17208,8 +17183,7 @@ with pkgs; tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { }; tinygo = callPackage ../development/compilers/tinygo { - llvmPackages = llvmPackages_16; - wasi-libc = pkgsCross.wasi32.wasilibc; + llvmPackages = llvmPackages_17; }; tinyscheme = callPackage ../development/interpreters/tinyscheme { }; @@ -17726,12 +17700,6 @@ with pkgs; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; - python38Full = python38.override { - self = python38Full; - pythonAttr = "python38Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; - }; python39Full = python39.override { self = python39Full; pythonAttr = "python39Full"; @@ -17764,13 +17732,12 @@ with pkgs; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; + inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; # Python package sets. python27Packages = python27.pkgs // { __attrsFailEvaluation = true; }; - python38Packages = python38.pkgs // { __attrsFailEvaluation = true; }; python39Packages = python39.pkgs // { __attrsFailEvaluation = true; }; python310Packages = python310.pkgs // { __attrsFailEvaluation = true; }; python311Packages = recurseIntoAttrs python311.pkgs // { pythonPackages = python311.pkgs // { __attrsFailEvaluation = true; }; }; @@ -19497,15 +19464,6 @@ with pkgs; haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci; - neoload = callPackage ../development/tools/neoload { - licenseAccepted = (config.neoload.accept_license or false); - fontsConf = makeFontsConf { - fontDirectories = [ - dejavu_fonts.minimal - ]; - }; - }; - nailgun = callPackage ../development/tools/nailgun { }; nap = callPackage ../development/tools/nap { }; @@ -20006,8 +19964,6 @@ with pkgs; swiftformat = callPackage ../development/tools/swiftformat { }; - symfony-cli = callPackage ../development/tools/symfony-cli { }; - swiftshader = callPackage ../development/libraries/swiftshader { }; systemfd = callPackage ../development/tools/systemfd { }; @@ -21343,7 +21299,7 @@ with pkgs; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; - graphia = libsForQt5.callPackage ../applications/science/misc/graphia { }; + graphia = qt6Packages.callPackage ../applications/science/misc/graphia { }; graphinder = callPackage ../tools/security/graphinder { }; @@ -22236,7 +22192,7 @@ with pkgs; libbacktrace = callPackage ../development/libraries/libbacktrace { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages_4_14) bap ocaml findlib ctypes; + inherit (ocaml-ng.ocamlPackages_4_14) bap ocaml findlib ctypes ctypes-foreign; }; libbaseencode = callPackage ../development/libraries/libbaseencode { }; @@ -22472,7 +22428,7 @@ with pkgs; dwarfdump = libdwarf.bin; libdwarf_20210528 = callPackage ../development/libraries/libdwarf/20210528.nix { }; - libe57format = disable-warnings-if-gcc13 (callPackage ../development/libraries/libe57format { }); + libe57format = callPackage ../development/libraries/libe57format { }; libeatmydata = callPackage ../development/libraries/libeatmydata { }; @@ -22482,8 +22438,6 @@ with pkgs; libebur128 = callPackage ../development/libraries/libebur128 { }; - libedit = callPackage ../development/libraries/libedit { }; - libei = callPackage ../development/libraries/libei { }; libelf = callPackage ../development/libraries/libelf { }; @@ -22972,9 +22926,7 @@ with pkgs; libjpeg = libjpeg_turbo; libjpeg8 = libjpeg_turbo.override { enableJpeg8 = true; }; - libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { - libmicrohttpd = libmicrohttpd_0_9_72; - }; + libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; libjwt = callPackage ../development/libraries/libjwt { }; @@ -23014,11 +22966,22 @@ with pkgs; libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { }; - libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { }; - libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { }; - libmicrohttpd_0_9_74 = callPackage ../development/libraries/libmicrohttpd/0.9.74.nix { }; - libmicrohttpd = libmicrohttpd_0_9_71; + inherit + ({ + libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { }; + libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { }; + libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { }; + libmicrohttpd_0_9_74 = callPackage ../development/libraries/libmicrohttpd/0.9.74.nix { }; + libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { }; + }) + libmicrohttpd_0_9_69 + libmicrohttpd_0_9_71 + libmicrohttpd_0_9_72 + libmicrohttpd_0_9_74 + libmicrohttpd_0_9_77 + ; + + libmicrohttpd = libmicrohttpd_0_9_77; libmikmod = callPackage ../development/libraries/libmikmod { inherit (darwin.apple_sdk.frameworks) CoreAudio; @@ -23808,10 +23771,6 @@ with pkgs; mqttmultimeter = callPackage ../tools/networking/mqttmultimeter { }; - mqttui = callPackage ../tools/networking/mqttui { - inherit (darwin.apple_sdk.frameworks) Security; - }; - msgpack = callPackage ../development/libraries/msgpack { }; msgpack-c = callPackage ../development/libraries/msgpack-c { }; @@ -23959,10 +23918,16 @@ with pkgs; nuspell = callPackage ../development/libraries/nuspell { }; nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; }; - nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { }; - nv-codec-headers-10 = callPackage ../development/libraries/nv-codec-headers/10_x.nix { }; - nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { }; - nv-codec-headers-12 = callPackage ../development/libraries/nv-codec-headers/12_x.nix { }; + # 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; nvidiaCtkPackages = callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix @@ -24054,7 +24019,7 @@ with pkgs; opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; - opencollada = disable-warnings-if-gcc13 (callPackage ../development/libraries/opencollada { }); + opencollada = callPackage ../development/libraries/opencollada { }; opencore-amr = callPackage ../development/libraries/opencore-amr { }; @@ -24302,9 +24267,9 @@ with pkgs; primesieve = callPackage ../applications/science/math/primesieve { }; - proj = disable-warnings-if-gcc13 (callPackage ../development/libraries/proj { + proj = callPackage ../development/libraries/proj { stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; - }); + }; proj_7 = callPackage ../development/libraries/proj/7.nix { }; @@ -24412,7 +24377,7 @@ with pkgs; qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { }); qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { - inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; + inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); @@ -25206,7 +25171,7 @@ with pkgs; vale = callPackage ../tools/text/vale { }; valhalla = callPackage ../development/libraries/valhalla { - boost = boost.override { enablePython = true; python = python38; }; + boost = boost.override { enablePython = true; python = python3; }; protobuf = protobuf_21.override { abseil-cpp = abseil-cpp_202103.override { cxxStandard = "17"; @@ -25790,17 +25755,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_0 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.0"; }; + sbcl_2_4_1 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.1"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_1 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.1"; }; + sbcl_2_4_2 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.2"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_1; + sbcl = sbcl_2_4_2; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25945,10 +25910,6 @@ with pkgs; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; - archiveopteryx = callPackage ../servers/mail/archiveopteryx { - openssl = openssl_1_1; - }; - asouldocs = callPackage ../servers/asouldocs { }; atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { }; @@ -26346,8 +26307,6 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; - listmonk = callPackage ../servers/mail/listmonk { }; - linx-server = callPackage ../servers/web-apps/linx-server { }; livepeer = callPackage ../servers/livepeer { }; @@ -26529,7 +26488,7 @@ with pkgs; outline = callPackage ../servers/web-apps/outline (lib.fix (super: { yarn = yarn.override { inherit (super) nodejs; }; - nodejs = nodejs_18; + nodejs = nodejs_20; })); openbgpd = callPackage ../servers/openbgpd { }; @@ -27003,9 +26962,9 @@ with pkgs; protobuf = protobuf_21; }; - rippled = disable-warnings-if-gcc13 (callPackage ../servers/rippled { + rippled = callPackage ../servers/rippled { boost = boost177; - }); + }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { }; @@ -27193,8 +27152,6 @@ with pkgs; vouch-proxy = callPackage ../servers/vouch-proxy { }; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; - virtiofsd = callPackage ../servers/misc/virtiofsd { }; virtualenv = with python3Packages; toPythonApplication virtualenv; @@ -27639,7 +27596,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - btop = disable-warnings-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../tools/system/btop { }); + btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { }; nmon = callPackage ../os-specific/linux/nmon { }; @@ -28675,6 +28632,8 @@ with pkgs; teensy-udev-rules = callPackage ../os-specific/linux/teensy-udev-rules { }; + sensible-side-buttons = callPackage ../os-specific/darwin/sensible-side-buttons { }; + wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; wpa_supplicant_ro_ssids = wpa_supplicant.override { @@ -28697,16 +28656,22 @@ with pkgs; zenmonitor = callPackage ../os-specific/linux/zenmonitor { }; - zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix { - configFile = "user"; - }; - zfsStable = callPackage ../os-specific/linux/zfs/stable.nix { - configFile = "user"; - }; - zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix { - configFile = "user"; - }; - zfs = zfsStable; + inherit + ({ + zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix { + configFile = "user"; + }; + zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { + configFile = "user"; + }; + zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix { + configFile = "user"; + }; + }) + zfs_2_1 + zfs_2_2 + zfs_unstable; + zfs = zfs_2_2; ### DATA @@ -28859,7 +28824,9 @@ with pkgs; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; - cnspec = callPackage ../tools/security/cnspec { }; + cnspec = callPackage ../tools/security/cnspec { + buildGoModule = buildGo122Module; + }; cnstrokeorder = callPackage ../data/fonts/cnstrokeorder { }; @@ -29416,8 +29383,6 @@ with pkgs; national-park-typeface = callPackage ../data/fonts/national-park { }; - netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; - nordic = libsForQt5.callPackage ../data/themes/nordic { }; nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; @@ -30257,7 +30222,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio Foundation; }; - ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; + ptcollab = callPackage ../by-name/pt/ptcollab/package.nix { + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; schismtracker = callPackage ../applications/audio/schismtracker { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -32681,7 +32648,7 @@ with pkgs; }) k3s_1_26 k3s_1_27 k3s_1_28; inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_29; - k3s = k3s_1_28; + k3s = k3s_1_29; k3sup = callPackage ../applications/networking/cluster/k3sup { }; @@ -33135,8 +33102,6 @@ with pkgs; loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; - lrzsz = callPackage ../tools/misc/lrzsz { }; lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php81; }; @@ -33910,7 +33875,7 @@ with pkgs; rep-gtk = callPackage ../development/libraries/rep-gtk { }; - reproc = disable-warnings-if-gcc13 (callPackage ../development/libraries/reproc { }); + reproc = callPackage ../development/libraries/reproc { }; sawfish = callPackage ../applications/window-managers/sawfish { }; @@ -33989,8 +33954,6 @@ with pkgs; nanorc = callPackage ../applications/editors/nano/nanorc { }; - nc4nix = callPackage ../development/tools/nc4nix { }; - netbeans = callPackage ../applications/editors/netbeans { jdk = jdk17; }; @@ -34024,8 +33987,6 @@ with pkgs; nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; - nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; - notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; @@ -34441,8 +34402,6 @@ with pkgs; potrace = callPackage ../applications/graphics/potrace { }; - pqiv = callPackage ../applications/graphics/pqiv { }; - qiv = callPackage ../applications/graphics/qiv { imlib2 = imlib2Full; }; @@ -35083,12 +35042,12 @@ with pkgs; slic3r = callPackage ../applications/misc/slic3r { }; - curaengine_stable = disable-warnings-if-gcc13 (callPackage ../applications/misc/curaengine/stable.nix { }); + curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; - curaengine = disable-warnings-if-gcc13 (callPackage ../applications/misc/curaengine { + curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; protobuf = protobuf_21; - }); + }; cura = libsForQt5.callPackage ../applications/misc/cura { }; @@ -35177,8 +35136,6 @@ with pkgs; spotify-player = callPackage ../applications/audio/spotify-player { }; - spotifywm = callPackage ../applications/audio/spotifywm { }; - psst = callPackage ../applications/audio/psst { }; squeezelite = darwin.apple_sdk_11_0.callPackage ../applications/audio/squeezelite { @@ -35292,18 +35249,17 @@ with pkgs; syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; - syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { }; - syncthingtray-minimal = libsForQt5.callPackage ../applications/misc/syncthingtray { + syncthingtray = kdePackages.callPackage ../applications/misc/syncthingtray { + # renamed in KF5 -> KF6 + plasma-framework = kdePackages.libplasma; + }; + syncthingtray-minimal = syncthingtray.override { webviewSupport = false; jsSupport = false; kioPluginSupport = false; plasmoidSupport = false; systemdSupport = true; }; - syncthingtray-qt6 = kdePackages.callPackage ../applications/misc/syncthingtray { - # renamed in KF5 -> KF6 - plasma-framework = kdePackages.libplasma; - }; synergy = libsForQt5.callPackage ../applications/misc/synergy { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; @@ -35619,7 +35575,9 @@ with pkgs; enableCli = false; }; transmission_4-gtk = transmission_4.override { enableGTK3 = true; }; - transmission_4-qt = transmission_4.override { enableQt = true; }; + transmission_4-qt5 = transmission_4.override { enableQt5 = true; }; + transmission_4-qt6 = transmission_4.override { enableQt6 = true; }; + transmission_4-qt = transmission_4-qt5; transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk { }; @@ -35888,9 +35846,13 @@ with pkgs; virtual-ans = callPackage ../applications/audio/virtual-ans { }; - virtualbox = disable-warnings-if-gcc13 (libsForQt5.callPackage ../applications/virtualization/virtualbox { + virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; + }; + + virtualboxKvm = lowPrio (virtualbox.override { + enableKvm = true; }); virtualboxHardened = lowPrio (virtualbox.override { @@ -36858,9 +36820,9 @@ with pkgs; vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { withGui = true; }; - vertcoind = disable-warnings-if-gcc13 (callPackage ../applications/blockchains/vertcoin { + vertcoind = callPackage ../applications/blockchains/vertcoin { withGui = false; - }); + }; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; @@ -37092,8 +37054,6 @@ with pkgs; lpairs2 = callPackage ../games/lgames/lpairs2 { }; - ltris = callPackage ../games/lgames/ltris { }; - maelstrom = callPackage ../games/maelstrom { }; mar1d = callPackage ../games/mar1d { } ; @@ -37440,8 +37400,6 @@ with pkgs; fsg = callPackage ../games/fsg { }; - galaxis = callPackage ../games/galaxis { }; - gambit-chess = callPackage ../games/gambit { }; garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; @@ -40147,7 +40105,7 @@ with pkgs; jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { }; jack_autoconnect = jack-autoconnect; - jacktrip = libsForQt5.callPackage ../applications/audio/jacktrip { }; + jacktrip = callPackage ../applications/audio/jacktrip { }; j2cli = with python3Packages; toPythonApplication j2cli; @@ -40260,7 +40218,14 @@ with pkgs; nixStatic = pkgsStatic.nix; - nixops_unstable = callPackage ../applications/networking/cluster/nixops { }; + inherit (callPackages ../applications/networking/cluster/nixops { }) + nixops_unstable_minimal + + # Not recommended; too fragile + nixops_unstable_full; + + # Useful with ofborg, e.g. commit prefix `nixops_unstablePlugins.nixops-aws: ...` to trigger automatically. + nixops_unstablePlugins = recurseIntoAttrs nixops_unstable_minimal.availablePlugins; /* Evaluate a NixOS configuration using this evaluation of Nixpkgs. @@ -40397,7 +40362,7 @@ with pkgs; nix-melt = callPackage ../tools/nix/nix-melt { }; nixos-option = callPackage ../tools/nix/nixos-option { - nix = nixVersions.nix_2_15; + nix = nixVersions.nix_2_18; }; nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -40691,6 +40656,8 @@ with pkgs; shellz = callPackage ../tools/security/shellz { }; + tableplus = callPackage ../applications/misc/tableplus { }; + timeloop = pkgs.darwin.apple_sdk_11_0.callPackage ../applications/science/computer-architecture/timeloop { }; canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { }; @@ -41002,9 +40969,6 @@ with pkgs; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; - vikunja-api = callPackage ../servers/web-apps/vikunja/api.nix { }; - vikunja-frontend = callPackage ../servers/web-apps/vikunja/frontend.nix { }; - vips = callPackage ../tools/graphics/vips { inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; @@ -41357,11 +41321,9 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; - pynitrokey = with python3Packages; toPythonApplication pynitrokey; - nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; - nitrokey-app2 = python3Packages.callPackage ../tools/security/nitrokey-app2 { }; + nitrokey-app2 = callPackage ../tools/security/nitrokey-app2 { }; fpm2 = callPackage ../tools/security/fpm2 { }; @@ -41729,7 +41691,7 @@ with pkgs; udict = callPackage ../applications/misc/udict { }; - duden = callPackage ../applications/misc/duden { }; + duden = python3Packages.toPythonApplication python3Packages.duden; zf = callPackage ../tools/misc/zf { }; diff --git a/nixpkgs/pkgs/top-level/kodi-packages.nix b/nixpkgs/pkgs/top-level/kodi-packages.nix index 76f254ba4ee6..0014a1ff53f3 100644 --- a/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -1,5 +1,4 @@ -{ config, lib, newScope, kodi, libretro -, disable-warnings-if-gcc13 }: +{ config, lib, newScope, kodi, libretro }: with lib; @@ -159,7 +158,7 @@ let self = rec { inputstream-adaptive = callPackage ../applications/video/kodi/addons/inputstream-adaptive { }; - inputstream-ffmpegdirect = disable-warnings-if-gcc13 (callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { }); + inputstream-ffmpegdirect = callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { }; inputstream-rtmp = callPackage ../applications/video/kodi/addons/inputstream-rtmp { }; diff --git a/nixpkgs/pkgs/top-level/linux-kernels.nix b/nixpkgs/pkgs/top-level/linux-kernels.nix index 659ef01910ab..5f0fe736d38a 100644 --- a/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -192,6 +192,7 @@ in { kernelPatches.request_key_helper kernelPatches.rust_1_74 kernelPatches.rust_1_75 + kernelPatches.rust_1_76 ]; }; @@ -204,6 +205,7 @@ in { kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rust_1_75 + kernelPatches.rust_1_76 ]; }; latest = packageAliases.linux_latest.kernel; @@ -557,15 +559,15 @@ in { configFile = "kernel"; inherit pkgs kernel; }; - zfsStable = callPackage ../os-specific/linux/zfs/stable.nix { + zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { configFile = "kernel"; inherit pkgs kernel; }; - zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix { + zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix { configFile = "kernel"; inherit pkgs kernel; }; - zfs = zfsStable; + zfs = zfs_2_2; can-isotp = callPackage ../os-specific/linux/can-isotp { }; diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index f9f1bc765850..d74746e08c59 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -283,6 +283,8 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; + ctypes-foreign = callPackage ../development/ocaml-modules/ctypes/foreign.nix { }; + ctypes_stubs_js = callPackage ../development/ocaml-modules/ctypes_stubs_js { inherit (pkgs) nodejs; }; @@ -786,7 +788,7 @@ let inherit conduit ipaddr-sexp; }; in { - inherit (self) dune-configurator alcotest re num octavius uutf ounit ctypes; + inherit (self) dune-configurator alcotest re num octavius uutf ounit ctypes ctypes-foreign; ppxlib = self.ppxlib.override { inherit (self') stdio; }; cohttp-async = self.cohttp-async.override { inherit (self') ppx_sexp_conv base async async_kernel async_unix core_unix sexplib0 core; @@ -824,8 +826,6 @@ let cfstream = self.cfstream.override { inherit core_kernel; }; }; - magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; - phylogenetics = let angstrom = self.angstrom.override { inherit ppx_let; }; in callPackage ../development/ocaml-modules/phylogenetics { @@ -1022,7 +1022,7 @@ let magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; - magic-trace = janeStreet_0_15.magic-trace; + magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; mariadb = callPackage ../development/ocaml-modules/mariadb { inherit (pkgs) mariadb; @@ -1871,6 +1871,8 @@ let vorbis = callPackage ../development/ocaml-modules/vorbis { }; + vpl-core = callPackage ../development/ocaml-modules/vpl-core { }; + ### W ### wasm = callPackage ../development/ocaml-modules/wasm { }; diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index f0e5dee3228e..a2c1cd476d14 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -9835,7 +9835,7 @@ with self; { meta = { description = "File locking with fcntl(2)"; license = with lib.licenses; [ artistic1 ]; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; [ das_j ]; }; }; diff --git a/nixpkgs/pkgs/top-level/python-aliases.nix b/nixpkgs/pkgs/top-level/python-aliases.nix index a79f097d53a4..c10b48c8421a 100644 --- a/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/nixpkgs/pkgs/top-level/python-aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ cntk = throw "cntk has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02 ColanderAlchemy = colanderalchemy; # added 2023-02-19 + command_runner = command-runner; # added 2024-03-06 CommonMark = commonmark; # added 2023-02-1 ConfigArgParse = configargparse; # added 2021-03-18 coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04 @@ -469,6 +470,7 @@ mapAliases ({ 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 + smpp_pdu = smpp-pdu; # added 2024-03-05 somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 sorl_thumbnail = sorl-thumbnail; # added 2023-11-12 SPARQLWrapper = sparqlwrapper; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index d2fceb9e64e6..377d5e2587d1 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -123,6 +123,8 @@ self: super: with self; { agent-py = callPackage ../development/python-modules/agent-py { }; + ago = callPackage ../development/python-modules/ago { }; + aggdraw = callPackage ../development/python-modules/aggdraw { }; aigpy = callPackage ../development/python-modules/aigpy { }; @@ -193,6 +195,8 @@ self: super: with self; { aiocurrencylayer = callPackage ../development/python-modules/aiocurrencylayer { }; + aiodhcpwatcher = callPackage ../development/python-modules/aiodhcpwatcher { }; + aiodiscover = callPackage ../development/python-modules/aiodiscover { }; aiodns = callPackage ../development/python-modules/aiodns { }; @@ -331,6 +335,8 @@ self: super: with self; { aiooss2 = callPackage ../development/python-modules/aiooss2 { }; + aiooui = callPackage ../development/python-modules/aiooui { }; + aiopegelonline = callPackage ../development/python-modules/aiopegelonline { }; aiopg = callPackage ../development/python-modules/aiopg { }; @@ -1310,6 +1316,8 @@ self: super: with self; { paddlepaddle = callPackage ../development/python-modules/paddlepaddle { }; + pueblo = callPackage ../development/python-modules/pueblo { }; + pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; pulumi-aws = callPackage ../development/python-modules/pulumi-aws { }; @@ -1931,9 +1939,9 @@ self: super: with self; { comicon = callPackage ../development/python-modules/comicon { }; - command_runner = callPackage ../development/python-modules/command_runner { }; + command-runner = callPackage ../development/python-modules/command-runner { }; - connect-box = callPackage ../development/python-modules/connect_box { }; + connect-box = callPackage ../development/python-modules/connect-box { }; connection-pool = callPackage ../development/python-modules/connection-pool { }; @@ -3500,6 +3508,8 @@ self: super: with self; { duct-py = callPackage ../development/python-modules/duct-py { }; + duden = callPackage ../development/python-modules/duden { }; + duecredit = callPackage ../development/python-modules/duecredit { }; duet = callPackage ../development/python-modules/duet { }; @@ -3558,6 +3568,8 @@ self: super: with self; { dynd = callPackage ../development/python-modules/dynd { }; + dsl2html = callPackage ../development/python-modules/dsl2html { }; + e3-core = callPackage ../development/python-modules/e3-core { }; e3-testsuite = callPackage ../development/python-modules/e3-testsuite { }; @@ -3595,7 +3607,7 @@ self: super: with self; { ecoaliface = callPackage ../development/python-modules/ecoaliface { }; - ecos = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/ecos { }); + ecos = callPackage ../development/python-modules/ecos { }; ecpy = callPackage ../development/python-modules/ecpy { }; @@ -4021,7 +4033,7 @@ self: super: with self; { fastrlock = callPackage ../development/python-modules/fastrlock { }; - fasttext = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/fasttext { }); + fasttext = callPackage ../development/python-modules/fasttext { }; fasttext-predict = callPackage ../development/python-modules/fasttext-predict { }; @@ -4207,7 +4219,7 @@ self: super: with self; { flask-principal = callPackage ../development/python-modules/flask-principal { }; - flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; + flask-pymongo = callPackage ../development/python-modules/flask-pymongo { }; flask-restful = callPackage ../development/python-modules/flask-restful { }; @@ -4710,9 +4722,9 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = pkgs.disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { enablePython = true; - })); + }); gntp = callPackage ../development/python-modules/gntp { }; @@ -5410,6 +5422,8 @@ self: super: with self; { hupper = callPackage ../development/python-modules/hupper { }; + hurry-filesize = callPackage ../development/python-modules/hurry-filesize { }; + huum = callPackage ../development/python-modules/huum { }; hvac = callPackage ../development/python-modules/hvac { }; @@ -5666,6 +5680,8 @@ self: super: with self; { intensity-normalization = callPackage ../development/python-modules/intensity-normalization { }; + interegular = callPackage ../development/python-modules/interegular { }; + interface-meta = callPackage ../development/python-modules/interface-meta { }; internetarchive = callPackage ../development/python-modules/internetarchive { }; @@ -6290,6 +6306,8 @@ self: super: with self; { langchain-core = callPackage ../development/python-modules/langchain-core { }; + langchain-text-splitters = callPackage ../development/python-modules/langchain-text-splitters { }; + langcodes = callPackage ../development/python-modules/langcodes { }; langdetect = callPackage ../development/python-modules/langdetect { }; @@ -7170,6 +7188,16 @@ self: super: with self; { microdata = callPackage ../development/python-modules/microdata { }; + microsoft-kiota-abstractions = callPackage ../development/python-modules/microsoft-kiota-abstractions { }; + + microsoft-kiota-authentication-azure = callPackage ../development/python-modules/microsoft-kiota-authentication-azure { }; + + microsoft-kiota-http = callPackage ../development/python-modules/microsoft-kiota-http { }; + + microsoft-kiota-serialization-json = callPackage ../development/python-modules/microsoft-kiota-serialization-json { }; + + microsoft-kiota-serialization-text = callPackage ../development/python-modules/microsoft-kiota-serialization-text { }; + midiutil = callPackage ../development/python-modules/midiutil { }; mido = callPackage ../development/python-modules/mido { }; @@ -7344,7 +7372,7 @@ self: super: with self; { moderngl = callPackage ../development/python-modules/moderngl { }; - moderngl-window = callPackage ../development/python-modules/moderngl_window { }; + moderngl-window = callPackage ../development/python-modules/moderngl-window { }; modestmaps = callPackage ../development/python-modules/modestmaps { }; @@ -9024,6 +9052,8 @@ self: super: with self; { osc = callPackage ../development/python-modules/osc { }; + osc-diagram = callPackage ../development/python-modules/osc-diagram { }; + osc-lib = callPackage ../development/python-modules/osc-lib { }; osc-sdk-python = callPackage ../development/python-modules/osc-sdk-python { }; @@ -9411,6 +9441,8 @@ self: super: with self; { alembic = pkgs.alembic; }; + outlines = callPackage ../development/python-modules/outlines { }; + overly = callPackage ../development/python-modules/overly { }; overpy = callPackage ../development/python-modules/overpy { }; @@ -10027,10 +10059,14 @@ self: super: with self; { progress = callPackage ../development/python-modules/progress { }; + prometheus-api-client = callPackage ../development/python-modules/prometheus-api-client { }; + prometheus-client = callPackage ../development/python-modules/prometheus-client { }; prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { }; + prometrix = callPackage ../development/python-modules/prometrix { }; + promise = callPackage ../development/python-modules/promise { }; prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit { }; @@ -11107,6 +11143,8 @@ self: super: with self; { pyocd = callPackage ../development/python-modules/pyocd { }; + pyocd-pemicro = callPackage ../development/python-modules/pyocd-pemicro { }; + pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; }; @@ -11799,6 +11837,8 @@ self: super: with self; { pytest-mypy-plugins = callPackage ../development/python-modules/pytest-mypy-plugins { }; + pytest-notebook = callPackage ../development/python-modules/pytest-notebook { }; + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; pytest-order = callPackage ../development/python-modules/pytest-order { }; @@ -13644,7 +13684,7 @@ self: super: with self; { smpplib = callPackage ../development/python-modules/smpplib { }; - smpp_pdu = callPackage ../development/python-modules/smpp.pdu { }; + smpp-pdu = callPackage ../development/python-modules/smpp.pdu { }; smtpdfix = callPackage ../development/python-modules/smtpdfix { }; @@ -14086,6 +14126,8 @@ self: super: with self; { statsmodels = callPackage ../development/python-modules/statsmodels { }; + std-uritemplate = callPackage ../development/python-modules/std-uritemplate { }; + std2 = callPackage ../development/python-modules/std2 { }; stdiomask = callPackage ../development/python-modules/stdiomask { }; @@ -14641,6 +14683,8 @@ self: super: with self; { throttler = callPackage ../development/python-modules/throttler { }; + thttp = callPackage ../development/python-modules/thttp { }; + tkinter = callPackage ../development/python-modules/tkinter { py = python.override { x11Support=true; }; }; @@ -16140,6 +16184,8 @@ self: super: with self; { verboselogs = callPackage ../development/python-modules/verboselogs { }; + verlib2 = callPackage ../development/python-modules/verlib2 { }; + versioneer = callPackage ../development/python-modules/versioneer { }; versionfinder = callPackage ../development/python-modules/versionfinder { }; @@ -16442,6 +16488,8 @@ self: super: with self; { wikipedia = callPackage ../development/python-modules/wikipedia { }; + wikipedia2vec = callPackage ../development/python-modules/wikipedia2vec { }; + wikipedia-api = callPackage ../development/python-modules/wikipedia-api { }; wikitextparser = callPackage ../development/python-modules/wikitextparser { }; @@ -16645,6 +16693,8 @@ self: super: with self; { xxhash = callPackage ../development/python-modules/xxhash { }; + xdxf2html = callPackage ../development/python-modules/xdxf2html { }; + xyzservices = callPackage ../development/python-modules/xyzservices { }; y-py = callPackage ../development/python-modules/y-py { }; diff --git a/nixpkgs/pkgs/top-level/qt5-packages.nix b/nixpkgs/pkgs/top-level/qt5-packages.nix index e6d5aab36956..0cf6ab88c323 100644 --- a/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -100,6 +100,16 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; + fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; + + fcitx5-configtool = callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + + fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; }; + + fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; + + fcitx5-with-addons = callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; + futuresql = callPackage ../development/libraries/futuresql { }; qgpgme = callPackage ../development/libraries/gpgme { }; diff --git a/nixpkgs/pkgs/top-level/qt6-packages.nix b/nixpkgs/pkgs/top-level/qt6-packages.nix index 68f73dad7634..07bff4a9c327 100644 --- a/nixpkgs/pkgs/top-level/qt6-packages.nix +++ b/nixpkgs/pkgs/top-level/qt6-packages.nix @@ -10,6 +10,7 @@ , generateSplicesForMkScope , stdenv , pkgsHostTarget +, kdePackages }: let @@ -32,8 +33,18 @@ makeScopeWithSplicing' { accounts-qt = callPackage ../development/libraries/accounts-qt { }; appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; + + fcitx5-configtool = kdePackages.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; + fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; }; + + fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; + + fcitx5-with-addons = callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; + kdsoap = callPackage ../development/libraries/kdsoap { }; kcolorpicker = callPackage ../development/libraries/kcolorpicker { }; diff --git a/nixpkgs/pkgs/top-level/release-attrpaths-superset.nix b/nixpkgs/pkgs/top-level/release-attrpaths-superset.nix index 55cce6101d71..cd48453fa0ee 100644 --- a/nixpkgs/pkgs/top-level/release-attrpaths-superset.nix +++ b/nixpkgs/pkgs/top-level/release-attrpaths-superset.nix @@ -53,6 +53,7 @@ let pkgsStatic = true; pkgsCross = true; pkgsi686Linux = true; + pkgsLinux = true; pkgsExtraHardening = true; }; diff --git a/nixpkgs/pkgs/top-level/stage.nix b/nixpkgs/pkgs/top-level/stage.nix index cbf0f585fe41..d8bf53af86aa 100644 --- a/nixpkgs/pkgs/top-level/stage.nix +++ b/nixpkgs/pkgs/top-level/stage.nix @@ -243,6 +243,16 @@ let }; } else throw "x86_64 Darwin package set can only be used on Darwin systems."; + # If already linux: the same package set unaltered + # Otherwise, return a natively built linux package set for the current cpu architecture string. + # (ABI and other details will be set to the default for the cpu/os pair) + pkgsLinux = + if stdenv.hostPlatform.isLinux + then self + else nixpkgsFun { + localSystem = lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux"; + }; + # Extend the package set with zero or more overlays. This preserves # preexisting overlays. Prefer to initialize with the right overlays # in one go when calling Nixpkgs, for performance and simplicity. @@ -284,6 +294,7 @@ let stdenv = super'.withDefaultHardeningFlags ( super'.stdenv.cc.defaultHardeningFlags ++ [ "zerocallusedregs" + "trivialautovarinit" ] ) super'.stdenv; }) |