diff options
Diffstat (limited to 'pkgs/top-level')
30 files changed, 1646 insertions, 1489 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 23949c22c4701..1755693169c25 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -34,6 +34,12 @@ let dontDistribute alias else alias; + transmission3Warning = { prefix ? "", suffix ? "" }: let + p = "${prefix}transmission${suffix}"; + p3 = "${prefix}transmission_3${suffix}"; + p4 = "${prefix}transmission_4${suffix}"; + in "${p} has been renamed to ${p3} since ${p4} is also available. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; + # Make sure that we are not shadowing something from all-packages.nix. checkInPkgs = n: alias: if builtins.hasAttr n super @@ -59,7 +65,9 @@ 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 + acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04 adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; + adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09 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 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 @@ -80,6 +88,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 appthreat-depscan = dep-scan; # Added 2024-04-10 + arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07 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 @@ -96,6 +105,7 @@ mapAliases ({ 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 + aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11 ### B ### @@ -106,6 +116,7 @@ mapAliases ({ bash_5 = bash; # Added 2021-08-20 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23 + BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 @@ -131,6 +142,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 + boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 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 @@ -172,6 +184,10 @@ mapAliases ({ chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30 chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08 chocolateDoom = chocolate-doom; # Added 2023-05-01 + ChowCentaur = chow-centaur; # Added 2024-06-12 + ChowPhaser = chow-phaser; # Added 2024-06-12 + ChowKick = chow-kick; # Added 2024-06-12 + CHOWTapeModel = chow-tape-model; # Added 2024-06-12 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 @@ -181,6 +197,8 @@ mapAliases ({ clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 clpm = throw "'clpm' has been removed from nixpkgs"; # Added 2024-04-01 + clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + CoinMP = coinmp; # Added 2024-06-12 collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cope = throw "'cope' has been removed, as it is broken in nixpkgs since it was added, and fixing it is not trivial"; # Added 2024-04-12 @@ -198,6 +216,7 @@ mapAliases ({ compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10 concurrencykit = libck; # Added 2021-03 connmanPackages = throw "'connmanPackages' was removed and their subpackages/attributes were promoted to top level."; # Added 2023-10-08 + containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09 convoy = throw "'convoy' has been removed from nixpkgs, as it was archived upstream"; # Added 2023-12-27 crda = throw "'crda' has been removed from nixpkgs, as it is needed only for kernels before 4.16"; # Added 2024-02-06 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 @@ -216,6 +235,7 @@ mapAliases ({ clang15Stdenv = lowPrio llvmPackages_15.stdenv; clang16Stdenv = lowPrio llvmPackages_16.stdenv; clang17Stdenv = lowPrio llvmPackages_17.stdenv; + clang18Stdenv = lowPrio llvmPackages_18.stdenv; clang-tools_6 = throw "clang-tools_6 has been removed from nixpkgs"; # Added 2024-01-08 clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 @@ -230,12 +250,23 @@ mapAliases ({ clang_10 = throw "clang_10 has been removed from nixpkgs"; # Added 2024-01-26 clang_11 = throw "clang_11 has been removed from nixpkgs"; # Added 2023-01-24 + clang-tools_12 = llvmPackages_12.clang-tools; # Added 2024-04-22 + clang-tools_13 = llvmPackages_13.clang-tools; # Added 2024-04-22 + clang-tools_14 = llvmPackages_14.clang-tools; # Added 2024-04-22 + clang-tools_15 = llvmPackages_15.clang-tools; # Added 2024-04-22 + clang-tools_16 = llvmPackages_16.clang-tools; # Added 2024-04-22 + clang-tools_17 = llvmPackages_17.clang-tools; # Added 2024-04-22 + clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22 + + cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13 + ### D ### dagger = throw "'dagger' has been removed from nixpkgs, as the trademark policy of the upstream project is incompatible"; # Added 2023-10-16 dart_stable = dart; # Added 2020-01-15 dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as is now included in Dart Sass itself."; dat = nodePackages.dat; + dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16 deadcode = throw "'deadcode' has been removed, as upstream is abandoned since 2019-04-27. Use the official deadcode from 'gotools' package."; # Added 2023-12-28 deadpixi-sam = deadpixi-sam-unstable; @@ -246,8 +277,11 @@ mapAliases ({ dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26 devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dfeet = throw "'dfeet' has been removed because it is archived upstream. Please use 'd-spy' instead"; # Added 2024-03-07 + dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 + dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dnnl = oneDNN; # Added 2020-04-22 + docker-distribution = distribution; # Added 2023-12-26 docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 docker-machine-xhyve = throw "'docker-machine-xhyve' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 @@ -330,13 +364,21 @@ mapAliases ({ enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18 enyo-doom = enyo-launcher; # Added 2022-09-09 epoxy = libepoxy; # Added 2021-11-11 - inherit (beam.interpreters) erlangR26 erlangR25 erlangR24; # added 2023-03-21 - erlang_21 = throw "erlangR21 has been removed in favor of newer versions."; # added 2023-03-21 - erlangR21 = erlang_21; - erlang_22 = throw "erlangR22 has been removed in favor of newer versions."; # added 2023-03-21 - erlangR22 = erlang_22; - erlang_23 = throw "erlangR23 has been removed in favor of newer versions."; # added 2023-09-11 - erlangR23 = erlang_23; + + erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20 + erlangR24 = throw "erlangR24 has been removed in favor of erlang_24"; # added 2024-05-24 + erlangR24_odbc = throw "erlangR24_odbc has been removed in favor of erlang_24_odbc"; # added 2024-05-24 + erlangR24_javac = throw "erlangR24_javac has been removed in favor of erlang_24_javac"; # added 2024-05-24 + erlangR24_odbc_javac = throw "erlangR24_odbc_javac has been removed in favor of erlang_24_odbc_javac"; # added 2024-05-24 + erlangR25 = throw "erlangR25 has been removed in favor of erlang_25"; # added 2024-05-24 + erlangR25_odbc = throw "erlangR25_odbc has been removed in favor of erlang_25_odbc"; # added 2024-05-24 + erlangR25_javac = throw "erlangR25_javac has been removed in favor of erlang_25_javac"; # added 2024-05-24 + erlangR25_odbc_javac = throw "erlangR25_odbc_javac has been removed in favor of erlang_25_odbc_javac"; # added 2024-05-24 + erlangR26 = throw "erlangR26 has been removed in favor of erlang_26"; # added 2024-05-24 + erlangR26_odbc = throw "erlangR26_odbc has been removed in favor of erlang_26_odbc"; # added 2024-05-24 + erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24 + erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24 + etcd_3_3 = throw "etcd_3_3 has been removed because upstream no longer maintains it"; # Added 2023-09-29 etcher = throw "'etcher' has been removed because it depended on an insecure version of Electron"; # Added 2024-03-14 eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 @@ -350,8 +392,10 @@ mapAliases ({ faustStk = faustPhysicalModeling; # Added 2023-05-16 fastnlo = fastnlo-toolkit; # Added 2021-04-24 fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 + fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19 inherit (luaPackages) fennel; # Added 2022-09-24 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve + FIL-plugins = fil-plugins; # Added 2024-06-12 findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; @@ -375,6 +419,7 @@ mapAliases ({ fractal-next = fractal; # added 2023-11-25 framework-system-tools = framework-tool; # added 2023-12-09 fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 + frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17 fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too. futuresql = libsForQt5.futuresql; # added 2023-11-11 fx_cast_bridge = fx-cast-bridge; # added 2023-07-26 @@ -403,6 +448,7 @@ mapAliases ({ ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 + git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20 git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { @@ -475,6 +521,8 @@ mapAliases ({ godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 + gdtoolkit = throw "gdtoolkit has been renamed to gdtoolkit_3 to distinguish from version 4"; # Added 2024-02-17 + google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 @@ -492,6 +540,7 @@ mapAliases ({ grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12 gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 + grafana_reporter = grafana-reporter; # Added 2024-06-09 gr-ais = throw "'gr-ais' has been renamed to/replaced by 'gnuradio3_7.pkgs.ais'"; # Converted to throw 2023-09-10 graylog = throw "graylog is now available in versions 3.3 up to 5.0. Please mind the upgrade path and choose the appropriate version. Direct upgrading from 3.3 to 4.3 or above is not supported"; # Added 2023-04-24 graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 @@ -508,6 +557,7 @@ mapAliases ({ grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 gtkcord4 = dissent; # Added 2024-03-10 gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 + guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 guile-disarchive = disarchive; # Added 2023-10-27 guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16 @@ -515,6 +565,7 @@ mapAliases ({ haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 + HentaiAtHome = hentai-at-home; # Added 2024-06-12 hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 hikari = throw "hikari has been removed from nixpkgs, it was unmaintained and required wlroots_0_15 at the time of removal"; # Added 2024-03-28 hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 @@ -530,6 +581,7 @@ mapAliases ({ hip-amd = throw "'hip-amd' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hip-common = throw "'hip-common' has been replaced with 'rocmPackages.hip-common'"; # Added 2023-10-08 hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 + hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 ht-rust = xh; # Added 2021-02-13 hydra-unstable = hydra_unstable; # added 2022-05-10 hyper-haskell = throw "'hyper-haskell' has been removed. reason: has been broken for a long time and depends on an insecure electron version"; # Added 2024-03-14 @@ -548,6 +600,7 @@ mapAliases ({ imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04 indiepass-desktop = throw "indiepass-desktop has been dropped because it does not work with recent Electron versions"; # Added 2024-03-14 indigenous-desktop = throw "'indigenous-desktop' has been renamed to/replaced by 'indiepass-desktop'"; # Added 2023-11-08 + input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21 instead-launcher = throw "instead-launcher has been removed, because it depended on qt4"; # Added 2023-07-26 insync-v3 = throw "insync-v3 has been merged into the insync package; use insync instead"; #Added 2023-05-13 index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17 @@ -577,15 +630,20 @@ mapAliases ({ julia_18 = throw "'julia_18' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 julia_18-bin = throw "'julia_18-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-11 + jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28 + ### K ### k3s_1_24 = throw "'k3s_1_24' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 k3s_1_25 = throw "'k3s_1_25' has been removed from nixpkgs as it has reached end of life"; # Added 2024-03-14 + k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20 + k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01 # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04 # now kube3d/k3d will take it's place kube3d = k3d; # Added 2022-0705 kafkacat = kcat; # Added 2021-10-07 kak-lsp = kakoune-lsp; # Added 2024-04-01 + kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06 kdeconnect = plasma5Packages.kdeconnect-kde; # Added 2020-10-28 keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 @@ -612,11 +670,14 @@ mapAliases ({ ### L ### larynx = piper-tts; # Added 2023-05-09 + LASzip = laszip; # Added 2024-06-12 + LASzip2 = laszip_2; # Added 2024-06-12 latinmodern-math = lmmath; ldgallery = throw "'ldgallery' has been removed from nixpkgs. Use the Flake provided by ldgallery instead"; # Added 2023-07-26 ledger_agent = ledger-agent; # Added 2024-01-07 lfs = dysk; # Added 2023-07-03 llvmPackages_rocm = throw "'llvmPackages_rocm' has been replaced with 'rocmPackages.llvm'"; # Added 2023-10-08 + libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01 libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18 libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18 libbencodetools = bencodetools; # Added 2022-07-30 @@ -636,8 +697,11 @@ mapAliases ({ libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libquotient = libsForQt5.libquotient; # Added 2023-11-11 + librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as it's upstream is unmaintained"; # Added 2024-06-10 libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30 librdf = lrdf; # Added 2020-03-22 + LibreArp = librearp; # Added 2024-06-12 + LibreArp-lv2 = librearp-lv2; # Added 2024-06-12 libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07 librtlsdr = rtl-sdr; # Added 2023-02-18 librewolf-wayland = librewolf; # Added 2022-11-15 @@ -656,6 +720,10 @@ mapAliases ({ libxkbcommon_7 = throw "libxkbcommon_7 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libxkbcommon'"; # Added 2023-01-03 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; + lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + Literate = literate; # Added 2024-06-12 llama = walk; # Added 2023-01-23 # Linux kernels @@ -680,6 +748,7 @@ mapAliases ({ linuxPackages_6_6 = linuxKernel.packages.linux_6_6; linuxPackages_6_7 = linuxKernel.packages.linux_6_7; linuxPackages_6_8 = linuxKernel.packages.linux_6_8; + linuxPackages_6_9 = linuxKernel.packages.linux_6_9; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -707,6 +776,7 @@ mapAliases ({ linux_6_6 = linuxKernel.kernels.linux_6_6; linux_6_7 = linuxKernel.kernels.linux_6_7; linux_6_8 = linuxKernel.kernels.linux_6_8; + linux_6_9 = linuxKernel.kernels.linux_6_9; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; @@ -765,6 +835,7 @@ mapAliases ({ lobster-two = google-fonts; # Added 2021-07-22 luxcorerender = throw "'luxcorerender' has been removed as it's unmaintained and broken in nixpkgs since a while ago"; # Added 2023-06-07 + lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18 lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01 lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01 lzma = xz; # moved from top-level 2021-03-14 @@ -772,6 +843,7 @@ mapAliases ({ ### M ### MACS2 = macs2; # Added 2023-06-12 + mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 @@ -786,6 +858,7 @@ mapAliases ({ meme = meme-image-generator; # Added 2021-04-21 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 + MIDIVisualizer = midivisualizer; # Added 2024-06-12 migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 @@ -821,6 +894,8 @@ mapAliases ({ mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 + mpdevil = plattenalbum; # Added 2024-05-22 + mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 mutt-with-sidebar = mutt; # Added 2022-09-17 @@ -863,13 +938,12 @@ mapAliases ({ ); nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10 nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20 + nix-top = throw "The nix-top package was dropped since it was unmaintained."; # Added 2024-06-21 + nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21 nixFlakes = nixVersions.stable; # Added 2021-05-21 nixStable = nixVersions.stable; # Added 2022-01-24 - nixUnstable = nixVersions.unstable; # Added 2022-01-26 + nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22 nix_2_3 = nixVersions.nix_2_3; - nix_2_4 = nixVersions.nix_2_4; - nix_2_5 = nixVersions.nix_2_5; - nix_2_6 = nixVersions.nix_2_6; nixfmt = lib.warn "nixfmt was renamed to nixfmt-classic. The nixfmt attribute may be used for the new RFC 166-style formatter in the future, which is currently available as nixfmt-rfc-style" nixfmt-classic; # Added 2024-03-31 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 @@ -896,6 +970,7 @@ mapAliases ({ noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09 noto-fonts-extra = noto-fonts; # Added 2023-04-08 NSPlist = nsplist; # Added 2024-01-05 + nushellFull = lib.warn "`nushellFull` has has been replaced by `nushell` as it's features no longer exist" nushell; # Added 2024-05-30 nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated; use cudaPackages.cuda_cccl"; nvtop = lib.warn "nvtop has been renamed to nvtopPackages.full" nvtopPackages.full; # Added 2024-02-25 nvtop-amd = lib.warn "nvtop-amd has been renamed to nvtopPackages.amd" nvtopPackages.amd; # Added 2024-02-25 @@ -914,16 +989,19 @@ mapAliases ({ octorpki = throw "octorpki has been removed, upstream says to use rpki-client instead"; # Added 2024-03-19 ogre1_9 = throw "ogre1_9 has been removed, use ogre instead"; # Added 2023-03-22 ogre1_10 = throw "ogre1_10 has been removed, use ogre instead"; # Added 2023-07-20 + onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 opa = throw "opa has been removed from nixpkgs as upstream has abandoned the project"; # Added 2023-03-21 opam_1_2 = throw "'opam_1_2' has been renamed to/replaced by 'opam'"; # Added 2023-03-08 openafs_1_8 = openafs; # Added 2022-08-22 openapi-generator-cli-unstable = throw "openapi-generator-cli-unstable was removed as it was not being updated; consider openapi-generator-cli instead"; # Added 2024-01-02 openbangla-keyboard = throw "openbangla-keyboard has been replaced by ibus-engines.openbangla-keyboard and fcitx5-openbangla-keyboard"; # added 2023-10-10 opencascade = throw "'opencascade' has been removed as it is unmaintained; consider opencascade-occt instead'"; # Added 2023-09-18 + opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12 openconnect_head = openconnect_unstable; # Added 2022-03-29 openconnect_gnutls = openconnect; # Added 2022-03-29 openconnect_unstable = throw "openconnect_unstable was removed from nixpkgs as it was not being updated"; # Added 2023-06-01 openelec-dvb-firmware = libreelec-dvb-firmware; # Added 2021-05-10 + openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13 openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07 openimageio2 = openimageio; # Added 2023-01-05 openimageio_1 = throw "'openimageio_1' has been removed, please update to 'openimageio' 2"; # Added 2023-06-14 @@ -951,7 +1029,7 @@ mapAliases ({ paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03 paperless = paperless-ngx; # Added 2021-06-06 paperless-ng = paperless-ngx; # Added 2022-04-11 - parity = openethereum; # Added 2020-08-01 + parity = throw "parity, renamed to openethereum, has been terminated by upstream"; # Added 2020-08-01 partition-manager = libsForQt5.partitionmanager; # Added 2024-01-08 pash = throw "'pash' has been removed: abandoned by upstream. Use 'powershell' instead"; # Added 2023-09-16 patchelfStable = patchelf; # Added 2024-01-25 @@ -959,8 +1037,11 @@ mapAliases ({ pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 + percona-server_8_0 = percona-server_lts; # Added 2024-05-07 + percona-xtrabackup_8_0 = percona-xtrabackup_lts; # Added 2024-05-07 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; perldevelPackages = perldevel; + petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 pgadmin = pgadmin4; pharo-spur64 = pharo; # Added 2022-08-03 phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 @@ -980,6 +1061,7 @@ mapAliases ({ pltScheme = racket; # just to be sure pmdk = throw "'pmdk' is discontinued, no further support or maintenance is planned by upstream"; # Added 2023-02-06 pomotroid = throw "pomotroid has been removed from nixpkgs, because it depended on an insecure version of electron"; # Added 2023-09-12 + poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03 powerdns = pdns; # Added 2022-03-28 # postgresql plugins @@ -1022,9 +1104,11 @@ mapAliases ({ 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 = probe-rs-tools; # Added 2024-05-23 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 + prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 @@ -1061,12 +1145,22 @@ mapAliases ({ qtcurve = libsForQt5.qtcurve; # Added 2020-11-07 qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12 quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23 + quicklispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesABCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesCCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesClisp = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesECL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19 quvi = throw "'quvi' has been removed, as it was broken and unmaintained"; # Added 2023-11-25 ### R ### radare2-cutter = cutter; # Added 2021-03-30 + radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04 + radicle-upstream = throw "'radicle-upstream' was sunset, see <https://community.radworks.org/t/2962>"; # Added 2024-05-04 railway-travel = diebahn; # Added 2024-04-01 rambox-pro = rambox; # Added 2022-12-12 rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 @@ -1132,6 +1226,7 @@ mapAliases ({ ### S ### s2n = s2n-tls; # Added 2021-03-03 + sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06 sane-backends-git = sane-backends; # Added 2021-02-19 scantailor = scantailor-advanced; # Added 2022-05-26 schildichat-web = throw '' @@ -1158,6 +1253,7 @@ mapAliases ({ shipyard = jumppad; # Added 2023-06-06 signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 + SkypeExport = skypeexport; # Added 2024-06-12 slack-dark = slack; # Added 2020-03-27 slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 slurm-llnl = slurm; # renamed July 2017 @@ -1167,6 +1263,8 @@ mapAliases ({ solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 soundOfSorting = sound-of-sorting; # Added 2023-07-07 soundux = throw "'soundux' has been removed, as it is unmaintained."; # Added on 2024-02-14 + SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12 + SPAdes = spades; # Added 2024-06-12 spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 @@ -1215,6 +1313,7 @@ mapAliases ({ supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 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 + Sylk = sylk; # Added 2024-06-12 syncthing-cli = syncthing; # Added 2021-04-06 syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 @@ -1228,6 +1327,7 @@ mapAliases ({ telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 teleport_11 = throw "teleport 11 has been removed as it is EOL. Please upgrade to Teleport 12 or later"; # Added 2023-11-27 teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04 + teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26 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 @@ -1243,6 +1343,10 @@ mapAliases ({ tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tootle = throw "'tootle' has been removed as it is not maintained upstream. Consider using 'tuba' instead"; # Added 2024-02-11 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 + transmission = lib.warn (transmission3Warning {}) transmission_3; # Added 2024-06-10 + transmission-gtk = lib.warn (transmission3Warning {suffix = "-gtk";}) transmission_3-gtk; # Added 2024-06-10 + transmission-qt = lib.warn (transmission3Warning {suffix = "-qt";}) transmission_3-qt; # Added 2024-06-10 + libtransmission = lib.warn (transmission3Warning {prefix = "lib";}) libtransmission_3; # Added 2024-06-10 transfig = fig2dev; # Added 2022-02-15 transifex-client = transifex-cli; # Added 2023-12-29 trezor_agent = trezor-agent; # Added 2024-01-07 @@ -1257,6 +1361,7 @@ mapAliases ({ uberwriter = apostrophe; # Added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 ue4 = throw "ue4 has been removed, because the package was broken for years"; # Added 2023-11-22 + uefi-firmware-parser = throw "The uefi-firmware-parser package was dropped since it was unmaintained."; # Added 2024-06-21 uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07 uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21 unicorn-emu = unicorn; # Added 2020-10-29 @@ -1286,6 +1391,7 @@ mapAliases ({ v4l_utils = throw "'v4l_utils' has been renamed to/replaced by 'v4l-utils'"; # Converted to throw 2023-09-10 vamp = { vampSDK = vamp-plugin-sdk; }; # Added 2020-03-26 vaapiIntel = intel-vaapi-driver; # Added 2023-05-31 + vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05 vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13 vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 ventoy-bin = ventoy; # Added 2023-04-12 @@ -1310,6 +1416,7 @@ mapAliases ({ volatility = throw "'volatility' has been removed, as it was broken and unmaintained"; # Added 2023-12-10 ### W ### + wakatime = wakatime-cli; # 2024-05-30 waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 wayfireApplications-unwrapped = throw '' 'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire' @@ -1329,7 +1436,9 @@ mapAliases ({ wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 wordpress6_2 = throw "'wordpress6_2' has been removed in favor of the latest version"; # Added 2023-10-10 wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name + wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 wmii_hg = wmii; + wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26 wxGTK30 = throw "wxGTK30 has been removed from nixpkgs as it has reached end of life"; # Added 2023-03-22 wxGTK30-gtk2 = wxGTK30; # Added 2022-12-03 wxGTK30-gtk3 = wxGTK30; # Added 2022-12-03 @@ -1344,7 +1453,7 @@ mapAliases ({ xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 xmlada = gnatPackages.xmlada; # Added 2024-02-25 - xonsh-unwrapped = throw "'xonsh-unwrapped' was incorporated into xonsh code; call xonsh directly instead."; # Added 2024-01-20 + xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07 @@ -1354,6 +1463,8 @@ mapAliases ({ yacc = bison; # moved from top-level 2021-03-14 yafaray-core = libyafaray; # Added 2022-09-23 yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 + yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 + yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 ytmdesktop = throw "ytmdesktop was removed because upstream vanished"; # added 2024-03-24 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 = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 @@ -1370,6 +1481,7 @@ mapAliases ({ 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 + zz = throw "'zz' has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10 ### UNSORTED ### @@ -1387,8 +1499,12 @@ mapAliases ({ inherit (stdenv.hostPlatform) system; # Added 2021-10-22 inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09 + freebsdCross = freebsd; # Added 2024-06-18 + netbsdCross = netbsd; # Added 2024-06-18 + openbsdCross = openbsd; # Added 2024-06-18 + # LLVM packages for (integration) testing that should not be used inside Nixpkgs: - llvmPackages_latest = llvmPackages_17; + llvmPackages_latest = llvmPackages_18; llvmPackages_git = recurseIntoAttrs (callPackage ../development/compilers/llvm/git { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_git.tools; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffe55bb47fc77..0c0a7ef9da360 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -61,7 +61,7 @@ with pkgs; }; stdenvNoLibs = - if stdenv.hostPlatform != stdenv.buildPlatform && (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.useLLVM or false) + if stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform && (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.useLLVM or false) then # We cannot touch binutils or cc themselves, because that will cause # infinite recursion. So instead, we just choose a libc based on the @@ -193,7 +193,6 @@ with pkgs; pythonInterpreter = "${python3.withPackages (ps: [ ps.pyelftools ])}/bin/python"; autoPatchelfScript = ../build-support/setup-hooks/auto-patchelf.py; }; - meta.platforms = lib.platforms.linux; } ../build-support/setup-hooks/auto-patchelf.sh; tomato-c = callPackage ../applications/misc/tomato-c { }; @@ -231,8 +230,6 @@ with pkgs; # Post 24.11 branch-off, this should throw an error in aliases.nix. addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { }; - quickemu = callPackage ../development/quickemu { }; - quickgui = callPackage ../applications/virtualization/quickgui { }; adcli = callPackage ../os-specific/linux/adcli { }; @@ -311,8 +308,6 @@ with pkgs; asn1c = callPackage ../development/compilers/asn1c { }; - assemblyscript = callPackage ../development/compilers/assemblyscript { }; - authz0 = callPackage ../tools/security/authz0 { }; auth0-cli = callPackage ../tools/admin/auth0-cli { }; @@ -408,8 +403,6 @@ with pkgs; buildFHSEnvChroot = callPackage ../build-support/build-fhsenv-chroot { }; # Deprecated; use buildFHSEnv/buildFHSEnvBubblewrap buildFHSEnvBubblewrap = callPackage ../build-support/build-fhsenv-bubblewrap { }; - buildMaven = callPackage ../build-support/build-maven.nix { }; - c64-debugger = callPackage ../applications/emulators/c64-debugger { }; camunda-modeler = callPackage ../applications/misc/camunda-modeler { }; @@ -422,22 +415,14 @@ with pkgs; castget = callPackage ../applications/networking/feedreaders/castget { }; - castxml = callPackage ../development/tools/castxml { }; - catatonit = callPackage ../applications/virtualization/catatonit { }; - catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { }; - - catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { }; - catppuccin-kde = callPackage ../data/themes/catppuccin-kde { }; catppuccin-kvantum = callPackage ../data/themes/catppuccin-kvantum { }; catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { }; - catppuccin-plymouth = callPackage ../data/themes/catppuccin-plymouth { }; - btdu = callPackage ../tools/misc/btdu { }; ccal = callPackage ../tools/misc/ccal { }; @@ -504,10 +489,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - codeberg-cli = callPackage ../applications/version-management/codeberg-cli { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; - }; - conftest = callPackage ../development/tools/conftest { }; coldsnap = callPackage ../tools/admin/coldsnap { @@ -542,12 +523,8 @@ with pkgs; containerlab = callPackage ../tools/networking/containerlab { }; - containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; - coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); - coost = callPackage ../development/libraries/coost { }; - confetty = callPackage ../applications/misc/confetty { }; confy = callPackage ../applications/misc/confy { }; @@ -719,7 +696,7 @@ with pkgs; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; - probe-rs = callPackage ../development/tools/rust/probe-rs { + probe-rs-tools = callPackage ../by-name/pr/probe-rs-tools/package.nix { inherit (darwin.apple_sdk.frameworks) AppKit; inherit (darwin) DarwinTools; }; @@ -763,16 +740,6 @@ with pkgs; protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; - protoc-gen-prost = callPackage ../development/tools/protoc-gen-prost { }; - - protoc-gen-prost-crate = callPackage ../development/tools/protoc-gen-prost-crate { }; - - protoc-gen-prost-serde = callPackage ../development/tools/protoc-gen-prost-serde { }; - - protoc-gen-rust = callPackage ../development/tools/protoc-gen-rust { }; - - protoc-gen-tonic = callPackage ../development/tools/protoc-gen-tonic { }; - protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; @@ -835,7 +802,8 @@ with pkgs; oletools = with python3.pkgs; toPythonApplication oletools; - ollama = callPackage ../tools/misc/ollama { }; + ollama-rocm = callPackage ../by-name/ol/ollama/package.nix { acceleration = "rocm"; }; + ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; }; ots = callPackage ../tools/security/ots { }; @@ -1084,8 +1052,6 @@ with pkgs; mod = callPackage ../development/tools/mod { }; - mods = callPackage ../tools/misc/mods { }; - mongosh = callPackage ../development/tools/mongosh { }; mya = callPackage ../applications/misc/mya { }; @@ -1096,15 +1062,15 @@ with pkgs; antlr = antlr4_10; boost = boost177; # Configure checks for specific version. icu = icu73; - protobuf = protobuf_21; + protobuf = protobuf_24; }; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { inherit (darwin) cctools DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; antlr = antlr4_10; - icu = icu69; - protobuf = protobuf_21; + icu = icu73; + protobuf = protobuf_24; }; broadlink-cli = callPackage ../tools/misc/broadlink-cli { }; @@ -1161,7 +1127,7 @@ with pkgs; fetchurl = stdenv.fetchurlBoot; }; }); - perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; + perl = buildPackages.perl.override { inherit zlib; fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { fetchurl = stdenv.fetchurlBoot; buildPackages = { @@ -1169,7 +1135,7 @@ with pkgs; fetchurl = stdenv.fetchurlBoot; inherit perl; xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; - gmp = null; + gmpSupport = false; aclSupport = false; attrSupport = false; }; @@ -1308,7 +1274,9 @@ with pkgs; makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { }; - compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware-xz.nix { }; + compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware.nix { type = "xz"; }; + + compressFirmwareZstd = callPackage ../build-support/kernel/compress-firmware.nix { type = "zstd"; }; makeModulesClosure = { kernel, firmware, rootModules, allowMissing ? false }: callPackage ../build-support/kernel/modules-closure.nix { @@ -1434,13 +1402,18 @@ with pkgs; name = "find-xml-catalogs-hook"; } ../build-support/setup-hooks/find-xml-catalogs.sh; - wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { - makeWrapper = makeBinaryWrapper; + wrapGAppsHook3 = wrapGAppsNoGuiHook.override { + isGraphical = true; }; - wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = __splicedPackages.gtk4; }; + wrapGAppsHook4 = wrapGAppsNoGuiHook.override { + isGraphical = true; + gtk3 = __splicedPackages.gtk4; + }; - wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; + wrapGAppsNoGuiHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { + makeWrapper = makeBinaryWrapper; + }; separateDebugInfo = makeSetupHook { name = "separate-debug-info-hook"; @@ -1490,6 +1463,7 @@ with pkgs; _6tunnel = callPackage ../tools/networking/6tunnel { }; _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { }; + _7zz-rar = _7zz.override { enableUnfree = true; }; _9pfs = callPackage ../tools/filesystems/9pfs { }; @@ -1509,8 +1483,6 @@ with pkgs; abduco = callPackage ../tools/misc/abduco { }; - ablog = callPackage ../applications/misc/ablog { }; - acct = callPackage ../tools/system/acct { }; accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { }; @@ -1519,8 +1491,6 @@ with pkgs; acme-sh = callPackage ../tools/admin/acme-sh { }; - acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { }; - alsaequal = callPackage ../tools/audio/alsaequal { }; acpica-tools = callPackage ../tools/system/acpica-tools { }; @@ -1765,8 +1735,6 @@ with pkgs; donkey = callPackage ../tools/security/donkey { }; - dualsensectl = callPackage ../tools/games/dualsensectl { }; - dwarfs = callPackage ../tools/filesystems/dwarfs { }; dysk = callPackage ../tools/filesystems/dysk { }; @@ -1775,8 +1743,6 @@ with pkgs; copier = callPackage ../tools/misc/copier { }; - gabutdm = callPackage ../applications/networking/gabutdm { }; - gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; @@ -1837,8 +1803,6 @@ with pkgs; gh-dash = callPackage ../tools/misc/gh-dash { }; - gh-eco = callPackage ../tools/misc/gh-eco { }; - gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; ghostie = callPackage ../tools/misc/ghostie { }; @@ -1851,8 +1815,6 @@ with pkgs; goflow = callPackage ../tools/networking/goflow { }; - goflow2 = callPackage ../tools/networking/goflow2 { }; - gofu = callPackage ../applications/misc/gofu { }; godspeed = callPackage ../tools/networking/godspeed { }; @@ -1980,12 +1942,14 @@ with pkgs; node-glob = callPackage ../tools/misc/node-glob { }; nominatim = callPackage ../servers/nominatim { - postgresql = postgresql_12; + postgresql = postgresql_14; }; npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; - ntpd-rs = callPackage ../tools/networking/ntpd-rs { }; + ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { + inherit (darwin.apple_sdk_11_0.frameworks) Security; + }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; @@ -2020,8 +1984,6 @@ with pkgs; ronin = callPackage ../tools/security/ronin { }; - s0ix-selftest-tool = callPackage ../tools/system/s0ix-selftest-tool { }; - scarab = callPackage ../tools/games/scarab { }; sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; @@ -2172,7 +2134,9 @@ with pkgs; archi = callPackage ../tools/misc/archi { }; - breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + breitbandmessung = callPackage ../applications/networking/breitbandmessung { + electron = electron_29; + }; ### APPLICATIONS/VERSION-MANAGEMENT @@ -2346,9 +2310,7 @@ with pkgs; git-crecord = callPackage ../applications/version-management/git-crecord { }; - git-credential-1password = callPackage ../applications/version-management/git-credential-1password { }; - - git-credential-keepassxc = callPackage ../applications/version-management/git-credential-keepassxc { + git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; }; @@ -2453,8 +2415,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-standup = callPackage ../applications/version-management/git-standup { }; - git-stree = callPackage ../applications/version-management/git-stree { }; git-subrepo = callPackage ../applications/version-management/git-subrepo { }; @@ -2507,8 +2467,6 @@ with pkgs; gitnr = callPackage ../applications/version-management/gitnr { }; - gitprompt-rs = callPackage ../applications/version-management/gitprompt-rs/default.nix { }; - gitsign = callPackage ../applications/version-management/gitsign { }; gitstats = callPackage ../applications/version-management/gitstats { }; @@ -2561,13 +2519,6 @@ with pkgs; qgit = qt5.callPackage ../applications/version-management/qgit { }; - radicle-cli = callPackage ../applications/version-management/radicle-cli { - inherit (darwin) DarwinTools; - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - - radicle-upstream = callPackage ../applications/version-management/radicle-upstream { }; - rs-git-fsmonitor = callPackage ../applications/version-management/rs-git-fsmonitor { }; scmpuff = callPackage ../applications/version-management/scmpuff { }; @@ -2634,8 +2585,6 @@ with pkgs; cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cemu = callPackage ../applications/emulators/cemu { }; - cen64 = callPackage ../applications/emulators/cen64 { }; citations = callPackage ../applications/misc/citations { }; @@ -2665,8 +2614,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa; }; - duckstation = qt6Packages.callPackage ../applications/emulators/duckstation { }; - dynamips = callPackage ../applications/emulators/dynamips { }; emu2 = callPackage ../applications/emulators/emu2 { }; @@ -2750,24 +2697,40 @@ with pkgs; pcem = callPackage ../applications/emulators/pcem { }; - pcsx2 = qt6Packages.callPackage ../applications/emulators/pcsx2 { }; - pcsxr = callPackage ../applications/emulators/pcsxr { }; - ppsspp-sdl = ppsspp.override { - enableQt = false; - enableVulkan = true; - }; - - ppsspp-sdl-wayland = ppsspp.override { - forceWayland = true; - enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845 - }; - - ppsspp-qt = ppsspp.override { - enableQt = true; - enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 - }; + ppsspp-sdl = let + argset = { + ffmpeg = ffmpeg_4; + glew = glew.override { enableEGL = argset.forceWayland; }; + enableQt = false; + enableVulkan = true; + forceWayland = false; + }; + in + ppsspp.override argset; + + ppsspp-sdl-wayland = let + argset = { + ffmpeg = ffmpeg_4; + glew = glew.override { enableEGL = argset.forceWayland; }; + enableQt = false; + enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845 + forceWayland = true; + }; + in + ppsspp.override argset; + + ppsspp-qt = let + argset = { + ffmpeg = ffmpeg_4; + glew = glew.override { enableEGL = argset.forceWayland; }; + enableQt = true; + enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 + forceWayland = false; + }; + in + ppsspp.override argset; proton-caller = callPackage ../applications/emulators/proton-caller { }; @@ -2781,6 +2744,10 @@ with pkgs; ripes = qt6Packages.callPackage ../applications/emulators/ripes { }; + rmg-wayland = callPackage ../by-name/rm/rmg/package.nix { + withWayland = true; + }; + rpcemu = callPackage ../applications/emulators/rpcemu { }; ruffle = callPackage ../applications/emulators/ruffle { }; @@ -2833,6 +2800,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/DOLPHIN-EMU dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; }; @@ -2906,8 +2874,6 @@ with pkgs; inherit (qt5) wrapQtAppsHook; }; - felix-fm = callPackage ../applications/file-managers/felix-fm { }; - krusader = libsForQt5.callPackage ../applications/file-managers/krusader { }; lesscpy = callPackage ../development/compilers/lesscpy { }; @@ -2930,6 +2896,8 @@ with pkgs; portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { }; + pot = callPackage ../by-name/po/pot/package.nix { pnpm = pnpm_8; }; + potreeconverter = callPackage ../applications/graphics/potreeconverter { }; ranger = callPackage ../applications/file-managers/ranger { }; @@ -2977,8 +2945,6 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - darklua = callPackage ../development/tools/darklua { }; - darktile = callPackage ../applications/terminal-emulators/darktile { }; dterm = callPackage ../applications/terminal-emulators/dterm { }; @@ -3084,8 +3050,6 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; - logseq = callPackage ../applications/misc/logseq { }; - natls = callPackage ../tools/misc/natls { }; notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; @@ -3139,7 +3103,7 @@ with pkgs; inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; - ammonite = if scala == scala_2_12 then ammonite_2_12 else ammonite_2_13; + ammonite = ammonite_2_13; amp = callPackage ../applications/editors/amp { }; @@ -3225,8 +3189,6 @@ with pkgs; arangodb = callPackage ../servers/nosql/arangodb { }; - arcanist = callPackage ../development/tools/misc/arcanist { php = php81; }; - arduino = arduino-core.override { withGui = true; }; arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { }; @@ -3291,8 +3253,6 @@ with pkgs; async = callPackage ../development/tools/async { }; - async-profiler = callPackage ../development/tools/async-profiler { }; - atheme = callPackage ../servers/irc/atheme { }; atinout = callPackage ../tools/networking/atinout { }; @@ -3339,8 +3299,6 @@ with pkgs; aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; - aws-env = callPackage ../tools/admin/aws-env { }; - aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { }; @@ -3389,8 +3347,6 @@ with pkgs; bitwise = callPackage ../tools/misc/bitwise { }; - blanket = callPackage ../applications/audio/blanket { }; - blisp = darwin.apple_sdk_11_0.callPackage ../development/embedded/blisp { inherit (darwin.apple_sdk_11_0.frameworks) IOKit; }; @@ -3499,8 +3455,6 @@ with pkgs; bazarr = callPackage ../servers/bazarr { }; - bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; - bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { openjdk11 = openjdk11.override { enableJavaFX = true; }; }; @@ -3668,6 +3622,7 @@ with pkgs; dell-command-configure = callPackage ../tools/system/dell-command-configure { }; deltachat-desktop = callPackage ../applications/networking/instant-messengers/deltachat-desktop { + electron = electron_30; inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -3677,6 +3632,8 @@ with pkgs; deterministic-uname = callPackage ../build-support/deterministic-uname { }; + deterministic-host-uname = deterministic-uname.override { forPlatform = stdenv.hostPlatform; }; + dfmt = callPackage ../tools/text/dfmt { }; diopser = callPackage ../applications/audio/diopser { }; @@ -3691,8 +3648,6 @@ with pkgs; djmount = callPackage ../tools/filesystems/djmount { }; - dgsh = callPackage ../shells/dgsh { }; - dkimpy = with python3Packages; toPythonApplication dkimpy; dl-librescore = callPackage ../tools/audio/dl-librescore { }; @@ -3941,8 +3896,6 @@ with pkgs; mobilecoin-wallet = callPackage ../applications/misc/mobilecoin-wallet { }; - mpdevil = callPackage ../applications/audio/mpdevil { }; - pacparser = callPackage ../tools/networking/pacparser { }; pairdrop = callPackage ../applications/misc/pairdrop { }; @@ -4098,7 +4051,7 @@ with pkgs; adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { }; adb-sync = callPackage ../development/mobile/adb-sync { - inherit (androidenv.androidPkgs_9_0) platform-tools; + inherit (androidenv.androidPkgs) platform-tools; }; amoco = callPackage ../tools/security/amoco { }; @@ -4109,12 +4062,14 @@ with pkgs; androidenv = callPackage ../development/mobile/androidenv { }; - androidndkPkgs = androidndkPkgs_21; + androidndkPkgs = androidndkPkgs_26; androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21"; androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b"; androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24"; + androidndkPkgs_25 = (callPackage ../development/androidndk-pkgs {})."25"; + androidndkPkgs_26 = (callPackage ../development/androidndk-pkgs {})."26"; - androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; + androidsdk = androidenv.androidPkgs.androidsdk; webos = recurseIntoAttrs { cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { }; @@ -4135,8 +4090,6 @@ with pkgs; aptdec = callPackage ../development/libraries/aptdec { }; - argc = callPackage ../development/tools/argc { }; - aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4153,9 +4106,7 @@ with pkgs; atftp = callPackage ../tools/networking/atftp { }; - atlas = callPackage ../development/tools/database/atlas { - buildGoModule = buildGo122Module; - }; + atlas = callPackage ../development/tools/database/atlas { }; authoscope = callPackage ../tools/security/authoscope { inherit (darwin.apple_sdk.frameworks) Security; @@ -4231,8 +4182,6 @@ with pkgs; beats = callPackage ../tools/misc/beats { }; - BeatSaberModManager = callPackage ../games/BeatSaberModManager/default.nix { }; - beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -4426,8 +4375,6 @@ with pkgs; bundletool = callPackage ../development/tools/bundletool { }; - bustle = haskellPackages.bustle; - bwm_ng = callPackage ../tools/networking/bwm-ng { }; bwbasic = callPackage ../development/interpreters/bwbasic { }; @@ -4485,10 +4432,6 @@ with pkgs; ''; }); - caddy = callPackage ../servers/caddy { }; - - xcaddy = callPackage ../servers/caddy/xcaddy { }; - traefik = callPackage ../servers/traefik { }; traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { }; @@ -4702,8 +4645,6 @@ with pkgs; shotman = callPackage ../tools/wayland/shotman { }; - slurp = callPackage ../tools/wayland/slurp { }; - sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { wlroots = wlroots_0_17; }; @@ -4720,9 +4661,7 @@ with pkgs; wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { - ocamlPackages = ocaml-ng.ocamlPackages_5_0; - }; + wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; waylogout = callPackage ../tools/wayland/waylogout { }; @@ -4772,14 +4711,10 @@ with pkgs; wob = callPackage ../tools/wayland/wob { }; - wpaperd = callPackage ../tools/wayland/wpaperd { }; - wshowkeys = callPackage ../tools/wayland/wshowkeys { }; wtype = callPackage ../tools/wayland/wtype { }; - ydotool = callPackage ../tools/wayland/ydotool { }; - cambalache = callPackage ../development/tools/cambalache { }; cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { }; @@ -4844,6 +4779,8 @@ with pkgs; crudini = callPackage ../tools/misc/crudini { }; + csv2md = with python3Packages; toPythonApplication csv2md; + csv2odf = callPackage ../applications/office/csv2odf { }; csv2parquet = callPackage ../tools/misc/csv2parquet { }; @@ -4858,8 +4795,6 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; - csvq = callPackage ../development/tools/csvq { }; - csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { }; @@ -4880,8 +4815,6 @@ with pkgs; dante = callPackage ../servers/dante { }; - dapr-cli = callPackage ../development/tools/dapr/cli { }; - dasel = callPackage ../applications/misc/dasel { }; dasher = callPackage ../applications/accessibility/dasher { }; @@ -4948,16 +4881,12 @@ with pkgs; dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { }; - dibbler = callPackage ../tools/networking/dibbler { }; - dieharder = callPackage ../tools/security/dieharder { }; diesel-cli = callPackage ../development/tools/diesel-cli { inherit (darwin.apple_sdk.frameworks) Security; }; - refinery-cli = callPackage ../development/tools/refinery-cli { }; - digitemp = callPackage ../tools/misc/digitemp { }; dijo = callPackage ../tools/misc/dijo { @@ -5024,8 +4953,6 @@ with pkgs; dolibarr = callPackage ../servers/web-apps/dolibarr { }; - doppler = callPackage ../tools/security/doppler { }; - dosage = callPackage ../applications/graphics/dosage { }; dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { @@ -5084,6 +5011,8 @@ with pkgs; easyabc = callPackage ../applications/audio/easyabc { }; + easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync {}; + easycrypt = callPackage ../applications/science/logic/easycrypt { why3 = pkgs.why3.override { ideSupport = false; }; }; @@ -5114,7 +5043,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_29; + electron = electron_30; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -5160,7 +5089,7 @@ with pkgs; eschalot = callPackage ../tools/security/eschalot { }; espanso = callPackage ../applications/office/espanso { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation IOKit Kernel AVFoundation Carbon QTKit AVKit WebKit; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation IOKit Kernel AVFoundation Carbon QTKit AVKit WebKit System; }; espanso-wayland = espanso.override { x11Support = false; @@ -5327,7 +5256,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); + texlivePackages = recurseIntoAttrs (lib.mapAttrs (_: v: v.build) texlive.pkgs); fop = callPackage ../tools/typesetting/fop { }; @@ -5371,8 +5300,6 @@ with pkgs; gb-backup = callPackage ../tools/backup/gamerbackup { }; - gbsplay = callPackage ../applications/audio/gbsplay { }; - gdrive = callPackage ../applications/networking/gdrive { }; gdrive3 = callPackage ../applications/networking/gdrive3 { }; @@ -5417,6 +5344,8 @@ with pkgs; protobuf = protobuf_21; }; + ghidra-extensions = recurseIntoAttrs (callPackage ../tools/security/ghidra/extensions.nix { }); + ghidra-bin = callPackage ../tools/security/ghidra { }; gh2md = callPackage ../tools/backup/gh2md { }; @@ -5441,8 +5370,6 @@ with pkgs; globalarrays = callPackage ../development/libraries/globalarrays { }; - glock = callPackage ../development/tools/glock { }; - glslviewer = callPackage ../development/tools/glslviewer { inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -5549,8 +5476,6 @@ with pkgs; hr = callPackage ../applications/misc/hr { }; - humioctl = callPackage ../applications/logging/humioctl { }; - huniq = callPackage ../tools/text/huniq { }; hunt = callPackage ../tools/misc/hunt { }; @@ -5558,11 +5483,6 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - wlroots-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; - udis86-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; - }; - hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { }; @@ -5571,13 +5491,11 @@ with pkgs; hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; - hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { - wlroots = wlroots_0_16; - }; + hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { }; hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; - hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland/plugins.nix { }); + hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland-plugins { }); hysteria = callPackage ../tools/networking/hysteria { }; @@ -5615,10 +5533,6 @@ with pkgs; jellycli = callPackage ../applications/audio/jellycli { }; - jellyfin = callPackage ../servers/jellyfin { - ffmpeg = jellyfin-ffmpeg; - }; - jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { }; jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { @@ -5627,8 +5541,6 @@ with pkgs; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; - jellyfin-web = callPackage ../servers/jellyfin/web.nix { }; - jellyseerr = callPackage ../servers/jellyseerr { }; jiten = callPackage ../applications/misc/jiten { }; @@ -5671,7 +5583,7 @@ with pkgs; klipper = callPackage ../servers/klipper { }; - klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-11; }; + klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { gcc-arm-embedded = gcc-arm-embedded-13; }; klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { }; @@ -5685,8 +5597,6 @@ with pkgs; klog = qt5.callPackage ../applications/radio/klog { }; - knxd = callPackage ../servers/knxd { }; - komga = callPackage ../servers/komga { }; komorebi = callPackage ../applications/graphics/komorebi { }; @@ -5774,6 +5684,11 @@ with pkgs; loccount = callPackage ../development/tools/misc/loccount { }; + logseq = callPackage ../by-name/lo/logseq/package.nix { + # electron version from: https://github.com/logseq/logseq/blob/d8c6ca264bdf9a6a0f03c46dbf3509210367624a/package.json#L116 + electron = electron_28; + }; + long-shebang = callPackage ../misc/long-shebang { }; lssecret = callPackage ../misc/lssecret {}; @@ -6047,9 +5962,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Security; }; - odoo = callPackage ../applications/finance/odoo { }; - odoo15 = callPackage ../applications/finance/odoo/odoo15.nix { }; - odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { }; oil-buku = callPackage ../applications/misc/oil-buku { }; @@ -6088,10 +6000,6 @@ with pkgs; pcp = callPackage ../tools/misc/pcp { }; - persepolis = python3Packages.callPackage ../tools/networking/persepolis { - wrapQtAppsHook = qt5.wrapQtAppsHook; - }; - pev = callPackage ../development/tools/analysis/pev { }; phd2 = callPackage ../applications/science/astronomy/phd2 { }; @@ -6124,8 +6032,6 @@ with pkgs; poweralertd = callPackage ../tools/misc/poweralertd { }; - ps_mem = callPackage ../tools/system/ps_mem { }; - pscale = callPackage ../development/tools/pscale { }; pulsarctl = callPackage ../tools/admin/pulsarctl { }; @@ -6182,8 +6088,6 @@ with pkgs; rex = callPackage ../tools/system/rex { }; - river = callPackage ../applications/window-managers/river { }; - rivercarro = callPackage ../applications/misc/rivercarro { }; river-luatile = callPackage ../applications/misc/river-luatile{ }; @@ -6248,8 +6152,6 @@ with pkgs; socklog = callPackage ../tools/system/socklog { }; - soju = callPackage ../applications/networking/soju { }; - spacevim = callPackage ../applications/editors/spacevim { }; srvc = callPackage ../applications/version-management/srvc { }; @@ -6298,10 +6200,6 @@ with pkgs; rainloop-community rainloop-standard; - rav1e = callPackage ../tools/video/rav1e { - inherit (darwin.apple_sdk.frameworks) Security; - }; - raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { }; razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; @@ -6502,8 +6400,6 @@ with pkgs; bfs = callPackage ../tools/system/bfs { }; - bevelbar = callPackage ../tools/X11/bevelbar { }; - bgs = callPackage ../tools/X11/bgs { }; bibclean = callPackage ../tools/typesetting/bibclean { }; @@ -6609,8 +6505,6 @@ with pkgs; ccze = callPackage ../tools/misc/ccze { }; - cdecl = callPackage ../development/tools/cdecl { }; - cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; cdist = python3Packages.callPackage ../tools/admin/cdist { }; @@ -6722,8 +6616,9 @@ with pkgs; citrix_workspace_23_09_0 citrix_workspace_23_11_0 citrix_workspace_24_02_0 + citrix_workspace_24_05_0 ; - citrix_workspace = citrix_workspace_24_02_0; + citrix_workspace = citrix_workspace_24_05_0; clima = callPackage ../tools/text/clima { }; @@ -6812,9 +6707,7 @@ with pkgs; unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; - unparam = callPackage ../tools/misc/unparam { - buildGoModule = buildGo121Module; - }; + unparam = callPackage ../tools/misc/unparam { }; inherit (nodePackages) uppy-companion; @@ -7028,7 +6921,8 @@ with pkgs; ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clamav = darwin.apple_sdk_11_0.callPackage ../tools/security/clamav { + clamav = callPackage ../tools/security/clamav { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) Foundation; }; @@ -7158,10 +7052,6 @@ with pkgs; cudaPackages_12_3 = callPackage ./cuda-packages.nix { cudaVersion = "12.3"; }; cudaPackages_12 = cudaPackages_12_2; # Latest supported by cudnn - # Use the older cudaPackages for tensorflow and jax, as determined by cudnn - # compatibility: https://www.tensorflow.org/install/source#gpu - cudaPackagesGoogle = cudaPackages_11; - cudaPackages = recurseIntoAttrs cudaPackages_12; # TODO: move to alias @@ -7240,8 +7130,6 @@ with pkgs; davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { }; - dbench = callPackage ../development/tools/misc/dbench { }; dclxvi = callPackage ../development/libraries/dclxvi { }; @@ -7454,8 +7342,6 @@ with pkgs; dorkscout = callPackage ../tools/security/dorkscout { }; - downonspot = callPackage ../applications/misc/downonspot { }; - sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { }; drive = callPackage ../applications/networking/drive { }; @@ -7485,7 +7371,7 @@ with pkgs; dropbear = callPackage ../tools/networking/dropbear { }; - dsview = qt6Packages.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; @@ -7493,8 +7379,6 @@ with pkgs; dt-schema = callPackage ../development/tools/dt-schema { }; - dub = callPackage ../development/tools/build-managers/dub { }; - inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; }) buildDubPackage dub-to-nix; @@ -7671,9 +7555,7 @@ with pkgs; tracker = callPackage ../development/libraries/tracker { }; - tracker-miners = callPackage ../development/libraries/tracker-miners { }; - - tracy = callPackage ../development/tools/tracy { }; + tracy-x11 = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; }; trivy = callPackage ../tools/admin/trivy { }; @@ -7784,8 +7666,6 @@ with pkgs; emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; }; - efibootmgr = callPackage ../tools/system/efibootmgr { }; - efivar = callPackage ../tools/system/efivar { }; eget = callPackage ../tools/misc/eget { }; @@ -7831,8 +7711,6 @@ with pkgs; endlessh = callPackage ../servers/endlessh { }; - endlessh-go = callPackage ../servers/endlessh-go { }; - ericw-tools = callPackage ../applications/misc/ericw-tools { }; cryfs = callPackage ../tools/filesystems/cryfs { }; @@ -7843,7 +7721,7 @@ with pkgs; enscript = callPackage ../tools/text/enscript { }; - ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { stdenv = gcc8Stdenv; }; + ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { }; entr = callPackage ../tools/misc/entr { }; @@ -7980,7 +7858,7 @@ with pkgs; ferm = callPackage ../tools/networking/ferm { }; feroxbuster = callPackage ../tools/security/feroxbuster { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; ffsend = callPackage ../tools/misc/ffsend { @@ -7994,8 +7872,6 @@ with pkgs; flashbench = callPackage ../os-specific/linux/flashbench { }; - flatpak = callPackage ../development/libraries/flatpak { }; - flatpak-builder = callPackage ../development/tools/flatpak-builder { binutils = binutils-unwrapped; }; @@ -8107,8 +7983,6 @@ with pkgs; fim = callPackage ../tools/graphics/fim { }; - flac123 = callPackage ../applications/audio/flac123 { }; - flamegraph = callPackage ../development/tools/flamegraph { }; flawfinder = callPackage ../development/tools/flawfinder { }; @@ -8121,8 +7995,6 @@ with pkgs; flowblade = callPackage ../applications/video/flowblade { }; - fontfor = callPackage ../tools/misc/fontfor { }; - fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; python = python3; @@ -8206,7 +8078,6 @@ with pkgs; frigate = callPackage ../applications/video/frigate { }; - frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; ftgl = callPackage ../development/libraries/ftgl { }; @@ -8225,8 +8096,6 @@ with pkgs; fuseiso = callPackage ../tools/filesystems/fuseiso { }; - fusuma = callPackage ../tools/inputmethods/fusuma { }; - fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { }); inherit (fdbPackages) @@ -8324,8 +8193,6 @@ with pkgs; gdmap = callPackage ../tools/system/gdmap { }; - gdtoolkit = callPackage ../development/tools/gdtoolkit { }; - gef = callPackage ../development/tools/misc/gef { }; gelasio = callPackage ../data/fonts/gelasio { }; @@ -8348,8 +8215,6 @@ with pkgs; geteltorito = callPackage ../tools/misc/geteltorito { }; - getmail6 = callPackage ../tools/networking/getmail6 { }; - getopt = callPackage ../tools/misc/getopt { }; getoptions = callPackage ../tools/misc/getoptions { }; @@ -8425,8 +8290,6 @@ with pkgs; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; - gitea = callPackage ../applications/version-management/gitea { }; - gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; gokart = callPackage ../development/tools/gokart { }; @@ -8460,8 +8323,6 @@ with pkgs; gnome-extension-manager = callPackage ../applications/misc/gnome-extension-manager { }; - gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds { }; - gnome-frog = callPackage ../applications/misc/gnome-frog { }; gnome-keysign = callPackage ../tools/security/gnome-keysign { }; @@ -8637,6 +8498,10 @@ with pkgs; gparted = callPackage ../tools/misc/gparted { }; + gpt4all-cuda = gpt4all.override { + cudaSupport = true; + }; + gpt2tc = callPackage ../tools/text/gpt2tc { }; gptcommit = callPackage ../development/tools/gptcommit { @@ -8928,8 +8793,6 @@ with pkgs; haste-server = callPackage ../servers/haste-server { }; - hatch = python3Packages.callPackage ../development/tools/hatch { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; @@ -8950,8 +8813,6 @@ with pkgs; hardinfo = callPackage ../tools/system/hardinfo { }; - harmonia = callPackage ../tools/package-management/harmonia { }; - hayagriva = callPackage ../tools/typesetting/hayagriva { }; hcl2json = callPackage ../applications/misc/hcl2json { }; @@ -9087,8 +8948,6 @@ with pkgs; httpie = with python3Packages; toPythonApplication httpie; - httping = callPackage ../tools/networking/httping { }; - httplz = callPackage ../tools/networking/httplz { }; httpfs2 = callPackage ../tools/filesystems/httpfs { }; @@ -9103,8 +8962,6 @@ with pkgs; hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { }; - hurl = callPackage ../tools/networking/hurl { }; - hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; humanfriendly = with python3Packages; toPythonApplication humanfriendly; @@ -9246,8 +9103,6 @@ with pkgs; input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { }; - input-utils = callPackage ../os-specific/linux/input-utils { }; - inql = callPackage ../tools/security/inql { }; intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; @@ -9256,10 +9111,7 @@ with pkgs; internetarchive = with python3Packages; toPythonApplication internetarchive; - invidious = callPackage ../servers/invidious { - # normally video.js is downloaded at build time - videojs = callPackage ../servers/invidious/videojs.nix { }; - }; + invidious = callPackage ../servers/invidious { }; invoice2data = callPackage ../tools/text/invoice2data { }; @@ -9335,8 +9187,6 @@ with pkgs; iroh = callPackage ../applications/networking/iroh { }; - irrd = callPackage ../servers/misc/irrd { }; - ised = callPackage ../tools/misc/ised { }; isl = isl_0_20; @@ -9429,8 +9279,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - stalwart-mail = callPackage ../servers/mail/stalwart { }; - jmespath = callPackage ../development/tools/jmespath { }; juicefs = callPackage ../tools/filesystems/juicefs { }; @@ -9586,8 +9434,6 @@ with pkgs; kdoctor = callPackage ../development/tools/kdoctor { }; - kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; - kdigger = callPackage ../tools/security/kdigger { }; kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { }; @@ -9598,17 +9444,7 @@ with pkgs; kestrel = callPackage ../tools/security/kestrel { }; - kexec-tools = callPackage ../os-specific/linux/kexec-tools { - # clangStdenv fails with - # purgatory/arch/i386/entry32-16.S:23:2: error: unknown directive - # .arch i386 - # ^ - # purgatory/arch/i386/entry32-16.S:115:11: error: unknown token in expression - # ljmp %cs:*(realdest - entry16) - # ^ - # make: *** [Makefile:128: purgatory/arch/i386/entry32-16.o] Error 1 - stdenv = gccStdenv; - }; + kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; keepkey-agent = with python3Packages; toPythonApplication keepkey-agent; @@ -9727,8 +9563,6 @@ with pkgs; last-resort = callPackage ../data/fonts/last-resort { }; - ldc = callPackage ../development/compilers/ldc { }; - ligo = let ocaml_p = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; in callPackage ../development/compilers/ligo { @@ -10086,8 +9920,6 @@ with pkgs; withCloud = !stdenv.isDarwin; withCloudUi = true; }; - # Exposed here so the bots can auto-upgrade it - netdata-go-plugins = callPackage ../tools/system/netdata/go.d.plugin.nix { }; netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { }); netsurf-browser = netsurf.browser; @@ -10502,10 +10334,6 @@ with pkgs; lv = callPackage ../tools/text/lv { }; - lv_img_conv = callPackage ../development/tools/lv_img_conv { - inherit (darwin.apple_sdk.frameworks) CoreText; - }; - lwc = callPackage ../tools/misc/lwc { }; lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { }; @@ -10585,8 +10413,6 @@ with pkgs; mandoc = callPackage ../tools/misc/mandoc { }; - mangareader = libsForQt5.callPackage ../applications/graphics/mangareader { }; - mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; mangohud32 = pkgsi686Linux.mangohud; @@ -10766,7 +10592,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_28; + electron = electron_29; }; mosh = callPackage ../tools/networking/mosh { }; @@ -10911,7 +10737,7 @@ with pkgs; netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { }; netcdffortran = callPackage ../development/libraries/netcdf-fortran { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration; }; networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { }; @@ -11039,6 +10865,7 @@ with pkgs; nomad_1_5 nomad_1_6 nomad_1_7 + nomad_1_8 ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; @@ -11085,8 +10912,6 @@ with pkgs; mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { }; - mpack = callPackage ../tools/networking/mpack { }; - mtm = callPackage ../tools/misc/mtm { }; op-geth = callPackage ../applications/blockchains/optimism/geth.nix { @@ -11257,7 +11082,7 @@ with pkgs; nylon = callPackage ../tools/networking/nylon { }; - nym = callPackage ../applications/networking/nym { + nym = darwin.apple_sdk_11_0.callPackage ../applications/networking/nym { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; @@ -11328,8 +11153,6 @@ with pkgs; ogdf = callPackage ../development/libraries/ogdf { }; - oh-my-posh = callPackage ../development/tools/oh-my-posh { }; - oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { }; ola = callPackage ../applications/misc/ola { @@ -11367,8 +11190,6 @@ with pkgs; opencc = callPackage ../tools/text/opencc { }; - opencl-info = callPackage ../tools/system/opencl-info { }; - opencryptoki = callPackage ../tools/security/opencryptoki { }; opendbx = callPackage ../development/libraries/opendbx { }; @@ -11456,12 +11277,21 @@ with pkgs; etcDir = "/etc/ssh"; }; + opensshWithKerberos = openssh.override { + withKerberos = true; + }; + openssh_hpn = opensshPackages.openssh_hpn.override { etcDir = "/etc/ssh"; }; + openssh_hpnWithKerberos = openssh_hpn.override { + withKerberos = true; + }; + openssh_gssapi = opensshPackages.openssh_gssapi.override { etcDir = "/etc/ssh"; + withKerberos = true; }; ssh-copy-id = callPackage ../tools/networking/openssh/copyid.nix { }; @@ -11615,6 +11445,7 @@ with pkgs; }; p7zip = callPackage ../tools/archivers/p7zip { }; + p7zip-rar = p7zip.override { enableUnfree = true; }; packagekit = callPackage ../tools/package-management/packagekit { }; @@ -11708,17 +11539,10 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - percona-server_8_0 = callPackage ../servers/sql/percona-server/8.0.x.nix { - inherit (darwin) cctools developer_cmds DarwinTools; - inherit (darwin.apple_sdk.frameworks) CoreServices; - boost = boost177; # Configure checks for specific version. - icu = icu69; - protobuf = protobuf_21; - }; - percona-xtrabackup = percona-xtrabackup_8_0; - percona-xtrabackup_8_0 = callPackage ../tools/backup/percona-xtrabackup/8_0.nix { - boost = boost177; - }; + inherit (import ../servers/sql/percona-server pkgs) percona-server_lts percona-server_innovation; + percona-server = percona-server_lts; + inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_lts percona-xtrabackup_innovation; + percona-xtrabackup = percona-xtrabackup_lts; pick = callPackage ../tools/misc/pick { }; @@ -12003,6 +11827,10 @@ with pkgs; pngquant = callPackage ../tools/graphics/pngquant { }; + inherit (callPackages ../development/tools/pnpm { }) + pnpm_8 pnpm_9; + pnpm = pnpm_9; + po4a = perlPackages.Po4a; poac = callPackage ../development/tools/poac { @@ -12035,8 +11863,6 @@ with pkgs; polipo = callPackage ../servers/polipo { }; - polkit_gnome = callPackage ../tools/security/polkit-gnome { }; - poly2tri-c = callPackage ../development/libraries/poly2tri-c { }; polypane = callPackage ../applications/networking/browsers/polypane { }; @@ -12047,8 +11873,6 @@ with pkgs; popfile = callPackage ../tools/text/popfile { }; - poretools = callPackage ../applications/science/biology/poretools { }; - porsmo = callPackage ../applications/misc/porsmo { }; pantum-driver = callPackage ../misc/drivers/pantum-driver { }; @@ -12057,7 +11881,11 @@ with pkgs; postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { }; - povray = callPackage ../tools/graphics/povray { }; + povray = callPackage ../tools/graphics/povray { + # https://github.com/POV-Ray/povray/issues/460 + # https://github.com/NixOS/nixpkgs/issues/311017 + stdenv = gcc12Stdenv; + }; power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; @@ -12227,8 +12055,6 @@ with pkgs; raysession = python3Packages.callPackage ../applications/audio/raysession {}; - revolt-desktop = callPackage ../applications/networking/instant-messengers/revolt-desktop { }; - rbw = callPackage ../tools/security/rbw { }; remarshal = with python3Packages; toPythonApplication remarshal; @@ -12441,8 +12267,6 @@ with pkgs; redsocks = callPackage ../tools/networking/redsocks { }; - renpy = callPackage ../development/interpreters/renpy { }; - rep = callPackage ../development/tools/rep { }; repseek = callPackage ../applications/science/biology/repseek { }; @@ -12804,8 +12628,6 @@ with pkgs; sanctity = callPackage ../tools/misc/sanctity { }; - sandboxfs = callPackage ../tools/filesystems/sandboxfs { }; - sanjuuni = callPackage ../tools/graphics/sanjuuni { }; sasquatch = callPackage ../tools/filesystems/sasquatch { }; @@ -12971,8 +12793,6 @@ with pkgs; shout = nodePackages.shout; - showmethekey = callPackage ../applications/video/showmethekey { }; - shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; @@ -12985,8 +12805,6 @@ with pkgs; sigal = callPackage ../applications/misc/sigal { }; - sigi = callPackage ../applications/misc/sigi { }; - sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signalbackup-tools = darwin.apple_sdk_11_0.callPackage @@ -13467,8 +13285,6 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper { }; - Sylk = callPackage ../applications/networking/Sylk { }; - privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; }; @@ -13521,8 +13337,6 @@ with pkgs; tarssh = callPackage ../servers/tarssh { }; - tartan = callPackage ../development/tools/analysis/tartan { }; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { @@ -13571,7 +13385,7 @@ with pkgs; inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }) teleport_13 teleport_14 teleport_15 teleport; + }) teleport_14 teleport_15 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; @@ -13736,8 +13550,6 @@ with pkgs; pkgs = pkgs.__splicedPackages; }); - tmsu = callPackage ../tools/filesystems/tmsu { }; - tncattach = callPackage ../applications/radio/tncattach { }; to-html = callPackage ../tools/text/to-html { }; @@ -13831,7 +13643,7 @@ with pkgs; trunk-io = callPackage ../development/tools/trunk-io { }; trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; tthsum = callPackage ../applications/misc/tthsum { }; @@ -13842,7 +13654,7 @@ with pkgs; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; - kernelshark = libsForQt5.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; + kernelshark = qt6Packages.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { }; traceroute = callPackage ../tools/networking/traceroute { }; @@ -14078,8 +13890,6 @@ with pkgs; up = callPackage ../tools/misc/up { }; - upbound = callPackage ../development/tools/upbound { }; - upterm = callPackage ../tools/misc/upterm { }; upx = callPackage ../tools/compression/upx { }; @@ -14194,6 +14004,8 @@ with pkgs; viking = callPackage ../applications/misc/viking { }; + vikunja = callPackage ../by-name/vi/vikunja/package.nix { pnpm = pnpm_8; }; + vim-vint = callPackage ../development/tools/vim-vint { }; vimer = callPackage ../tools/misc/vimer { }; @@ -14242,10 +14054,9 @@ with pkgs; vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { }; - vp = callPackage ../applications/misc/vp { - # Enable next line for console graphics. Note that - # it requires `sixel` enabled terminals such as mlterm - # or xterm -ti 340 + vpWithSixel = vp.override { + # Enable next line for console graphics. Note that it requires `sixel` + # enabled terminals such as mlterm or xterm -ti 340 SDL = SDL_sixel; }; @@ -14279,8 +14090,6 @@ with pkgs; wakapi = callPackage ../tools/misc/wakapi { }; - wakatime = callPackage ../tools/misc/wakatime { }; - wambo = callPackage ../development/tools/wambo { }; weather = callPackage ../applications/misc/weather { }; @@ -14373,8 +14182,6 @@ with pkgs; woodpecker-cli = callPackage ../development/tools/continuous-integration/woodpecker/cli.nix { }; - woodpecker-pipeline-transform = callPackage ../development/tools/continuous-integration/woodpecker-pipeline-transform { }; - woodpecker-plugin-git = callPackage ../development/tools/continuous-integration/woodpecker-plugin-git { }; woodpecker-server = callPackage ../development/tools/continuous-integration/woodpecker/server.nix { }; @@ -14391,8 +14198,6 @@ with pkgs; wsmancli = callPackage ../tools/system/wsmancli { }; - wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel; - wolfebin = callPackage ../tools/networking/wolfebin { }; wthrr = callPackage ../applications/misc/wthrr { }; @@ -14496,8 +14301,6 @@ with pkgs; unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { }; - unbound = callPackage ../tools/networking/unbound { }; - unbound-with-systemd = unbound.override { withSystemd = true; }; @@ -14617,9 +14420,9 @@ with pkgs; valum = callPackage ../development/web/valum { }; inherit (callPackages ../servers/varnish { }) - varnish60 varnish74; + varnish60 varnish74 varnish75; inherit (callPackages ../servers/varnish/packages.nix { }) - varnish60Packages varnish74Packages; + varnish60Packages varnish74Packages varnish75Packages; varnishPackages = varnish74Packages; varnish = varnishPackages.varnish; @@ -14908,11 +14711,6 @@ with pkgs; ytfzf = callPackage ../tools/misc/ytfzf { }; - # To expose more packages for Yi, override the extraPackages arg. - yi = callPackage ../applications/editors/yi/wrapper.nix { - haskellPackages = haskell.packages.ghc810; - }; - yaydl = callPackage ../tools/video/yaydl { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -15152,8 +14950,6 @@ with pkgs; ion = callPackage ../shells/ion { }; - jush = callPackage ../shells/jush { }; - ksh = callPackage ../shells/ksh { }; liquidprompt = callPackage ../shells/liquidprompt { }; @@ -15208,6 +15004,8 @@ with pkgs; temurin-bin = temurin-bin-21; temurin-jre-bin = temurin-jre-bin-21; + semeru-bin-21 = javaPackages.compiler.semeru-bin.jdk-21; + semeru-jre-bin-21 = javaPackages.compiler.semeru-bin.jre-21; semeru-bin-17 = javaPackages.compiler.semeru-bin.jdk-17; semeru-jre-bin-17 = javaPackages.compiler.semeru-bin.jre-17; semeru-bin-16 = javaPackages.compiler.semeru-bin.jdk-16; @@ -15217,8 +15015,8 @@ with pkgs; semeru-bin-8 = javaPackages.compiler.semeru-bin.jdk-8; semeru-jre-bin-8 = javaPackages.compiler.semeru-bin.jre-8; - semeru-bin = semeru-bin-17; - semeru-jre-bin = semeru-jre-bin-17; + semeru-bin = semeru-bin-21; + semeru-jre-bin = semeru-jre-bin-21; adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; }; adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; @@ -15371,31 +15169,7 @@ with pkgs; clang_16 = llvmPackages_16.clang; clang_17 = llvmPackages_17.clang; - clang-tools = callPackage ../development/tools/clang-tools { }; - - clang-tools_12 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_12; - }; - - clang-tools_13 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_13; - }; - - clang-tools_14 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_14; - }; - - clang-tools_15 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_15; - }; - - clang-tools_16 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_16; - }; - - clang-tools_17 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_17; - }; + clang-tools = llvmPackages.clang-tools; clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { llvmPackages = llvmPackages_14; @@ -15523,8 +15297,12 @@ with pkgs; fluidd = callPackage ../applications/misc/fluidd { }; - flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); + flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); + flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; }); + flutterPackages = flutterPackages-bin; flutter = flutterPackages.stable; + flutter323 = flutterPackages.v3_23; + flutter322 = flutterPackages.v3_22; flutter319 = flutterPackages.v3_19; flutter316 = flutterPackages.v3_16; flutter313 = flutterPackages.v3_13; @@ -15587,6 +15365,7 @@ with pkgs; gcc11Stdenv = overrideCC gccStdenv buildPackages.gcc11; gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13; + gcc14Stdenv = overrideCC gccStdenv buildPackages.gcc14; # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking @@ -15636,7 +15415,7 @@ with pkgs; dontStrip = true; })); - gccCrossLibcStdenv = overrideCC stdenv buildPackages.gccWithoutTargetLibc; + gccCrossLibcStdenv = overrideCC stdenvNoCC buildPackages.gccWithoutTargetLibc; crossLibcStdenv = if stdenv.hostPlatform.useLLVM or false || stdenv.hostPlatform.isDarwin @@ -15677,9 +15456,9 @@ with pkgs; }; inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; }) - gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13; + gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; - gcc_latest = gcc13; + gcc_latest = gcc14; # Use the same GCC version as the one from stdenv by default gfortran = wrapCC (gcc.cc.override { @@ -15770,6 +15549,14 @@ with pkgs; profiledCompiler = false; }); + gfortran14 = wrapCC (gcc14.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + libgccjit = gcc.cc.override { name = "libgccjit"; langFortran = false; @@ -15808,6 +15595,13 @@ with pkgs; && stdenv.buildPlatform == stdenv.hostPlatform then buildPackages.gnat-bootstrap11 else buildPackages.gnat11; + stdenv = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + && stdenv.buildPlatform.isDarwin + && stdenv.buildPlatform.isx86_64 + then overrideCC stdenv gnat-bootstrap11 + else stdenv; }); gnat12 = wrapCC (gcc12.cc.override { @@ -15856,6 +15650,29 @@ with pkgs; else stdenv; }); + gnat14 = wrapCC (gcc14.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + # As per upstream instructions building a cross compiler + # should be done with a (native) compiler of the same version. + # If we are cross-compiling GNAT, we may as well do the same. + gnat-bootstrap = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + then buildPackages.gnat-bootstrap12 + else buildPackages.gnat13; + stdenv = + if stdenv.hostPlatform == stdenv.targetPlatform + && stdenv.buildPlatform == stdenv.hostPlatform + && stdenv.buildPlatform.isDarwin + && stdenv.buildPlatform.isx86_64 + then overrideCC stdenv gnat-bootstrap12 + else stdenv; + }); + gnat-bootstrap = gnat-bootstrap12; gnat-bootstrap11 = wrapCC (callPackage ../development/compilers/gnat-bootstrap { majorVersion = "11"; }); gnat-bootstrap12 = wrapCCWith ({ @@ -15910,6 +15727,18 @@ with pkgs; meta.broken = stdenv.hostPlatform.isDarwin; }); + gccgo14 = wrapCC (gcc14.cc.override { + name = "gccgo"; + langCC = true; #required for go. + langC = true; + langGo = true; + langJit = true; + profiledCompiler = false; + } // { + # not supported on darwin: https://github.com/golang/go/issues/463 + meta.broken = stdenv.hostPlatform.isDarwin; + }); + ghdl = ghdl-mcode; ghdl-mcode = callPackage ../development/compilers/ghdl { @@ -15990,7 +15819,10 @@ with pkgs; cabal-install = haskell.lib.compose.justStaticExecutables haskellPackages.cabal-install; - stack = haskell.lib.compose.justStaticExecutables haskellPackages.stack; + stack = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.stack; hlint = haskell.lib.compose.justStaticExecutables haskellPackages.hlint; @@ -16073,10 +15905,6 @@ with pkgs; gocover-cobertura = callPackage ../development/tools/gocover-cobertura { }; - gobang = callPackage ../development/tools/database/gobang { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - }; - goblob = callPackage ../tools/security/goblob { }; gogetdoc = callPackage ../development/tools/gogetdoc { }; @@ -16093,8 +15921,6 @@ with pkgs; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - hvm = darwin.apple_sdk_11_0.callPackage ../development/compilers/hvm { }; - iay = callPackage ../tools/misc/iay { inherit (darwin.apple_sdk.frameworks) AppKit Security Foundation Cocoa; }; @@ -16159,8 +15985,6 @@ with pkgs; jdk17 = openjdk17; jdk17_headless = openjdk17_headless; - openjdk16-bootstrap = javaPackages.compiler.openjdk16-bootstrap; - openjdk19 = javaPackages.compiler.openjdk19; openjdk19_headless = javaPackages.compiler.openjdk19.headless; jdk19 = openjdk19; @@ -16262,8 +16086,6 @@ with pkgs; julia-stable-bin = julia_110-bin; julia-bin = julia-stable-bin; - jwasm = callPackage ../development/compilers/jwasm { }; - kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; kingstvis = callPackage ../applications/science/electronics/kingstvis { }; @@ -16350,7 +16172,8 @@ with pkgs; # assumption is that or any later version is good. choose = platform: /**/ if platform.isDarwin then 16 - else if platform.isFreeBSD then 12 + else if platform.isFreeBSD then 16 + else if platform.isOpenBSD then 18 else if platform.isAndroid then 12 else if platform.isLinux then 17 else if platform.isWasm then 16 @@ -16419,17 +16242,12 @@ with pkgs; lld_18 = llvmPackages_18.lld; lldb_18 = llvmPackages_18.lldb; llvm_18 = llvmPackages_18.llvm; - - clang-tools_18 = callPackage ../development/tools/clang-tools { - llvmPackages = llvmPackages_18; - }; }) llvmPackages_18 clang_18 lld_18 lldb_18 - llvm_18 - clang-tools_18; + llvm_18; lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; @@ -16544,11 +16362,14 @@ with pkgs; ocaml-crunch = ocamlPackages.crunch.bin; + inherit (ocaml-ng.ocamlPackages_4_14) + ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 + ocamlformat_0_22_4; + inherit (ocamlPackages) ocamlformat # latest version - ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 - ocamlformat_0_26_0 ocamlformat_0_26_1; + ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 ocamlformat_0_26_0 + ocamlformat_0_26_1 ocamlformat_0_26_2; inherit (ocamlPackages) odig; @@ -16599,8 +16420,6 @@ with pkgs; qbe = callPackage ../development/compilers/qbe { }; - rasm = callPackage ../development/compilers/rasm { }; - replibyte = callPackage ../development/tools/database/replibyte { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -16620,11 +16439,11 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_77 = callPackage ../development/compilers/rust/1_77.nix { + rust_1_78 = callPackage ../development/compilers/rust/1_78.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_17 = llvmPackages_17.libllvm; + llvm_18 = llvmPackages_18.libllvm; }; - rust = rust_1_77; + rust = rust_1_78; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16632,8 +16451,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_77 = rust_1_77.packages.stable; - rustPackages = rustPackages_1_77; + rustPackages_1_78 = rust_1_78.packages.stable; + rustPackages = rustPackages_1_78; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -16663,9 +16482,7 @@ with pkgs; }; cargo-benchcmp = callPackage ../development/tools/rust/cargo-benchcmp { }; cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { }; - cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { }; cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { }; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -16755,7 +16572,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; - cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { }; cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 { inherit (darwin.apple_sdk.frameworks) AppKit; @@ -16783,10 +16599,6 @@ with pkgs; cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; - cargo-profiler = callPackage ../development/tools/rust/cargo-profiler { }; - cargo-raze = callPackage ../development/tools/rust/cargo-raze { - inherit (darwin.apple_sdk.frameworks) Security; - }; cargo-rdme = callPackage ../by-name/ca/cargo-rdme/package.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -16821,9 +16633,6 @@ with pkgs; cargo-vet = callPackage ../development/tools/rust/cargo-vet { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-wasi = callPackage ../development/tools/rust/cargo-wasi { - inherit (darwin.apple_sdk.frameworks) Security; - }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) Foundation Cocoa; }; @@ -16908,7 +16717,7 @@ with pkgs; scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; }; scala_3 = callPackage ../development/compilers/scala { }; - scala = scala_2_13; + scala = scala_3; scala-runners = callPackage ../development/compilers/scala-runners { coursier = coursier.override { jre = jdk8; }; }; @@ -16989,6 +16798,7 @@ with pkgs; swiPrologWithGui = swiProlog.override { withGui = true; }; tbb_2020_3 = callPackage ../development/libraries/tbb/2020_3.nix { }; + tbb_2021_5 = callPackage ../development/libraries/tbb/2021_5.nix { } ; tbb_2021_11 = callPackage ../development/libraries/tbb { }; # many packages still fail with latest version tbb = tbb_2020_3; @@ -17066,7 +16876,7 @@ with pkgs; # want the C++ library to be explicitly chosen by the caller, and null by # default. libcxx ? null - , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) ((threadsCrossFor cc.version).package) + , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross.package , nixSupport ? {} , ... } @ extraArgs: @@ -17141,7 +16951,7 @@ with pkgs; # BQN interpreters and compilers - mbqn = callPackage ../development/interpreters/bqn/mlochbaum-bqn { }; + mbqn = bqn; cbqn = cbqn-bootstrap.phase2; cbqn-replxx = cbqn-bootstrap.phase2-replxx; @@ -17166,43 +16976,46 @@ with pkgs; phase0 = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = false; - bqn-path = null; + generateBytecode = false; + # Not really used, but since null can be dangerous... + bqn-interpreter = "${lib.getExe' buildPackages.mbqn "bqn"}"; }; phase0-replxx = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = false; - bqn-path = null; enableReplxx = true; + generateBytecode = false; + # Not really used, but since null can be dangerous... + bqn-interpreter = "${lib.getExe' buildPackages.mbqn "bqn"}"; }; phase1 = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = true; - bqn-path = "${buildPackages.cbqn-bootstrap.phase0}/bin/cbqn"; + generateBytecode = true; + bqn-interpreter = "${lib.getExe' buildPackages.cbqn-bootstrap.phase0 "cbqn"}"; }; phase2 = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = true; - bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn"; + generateBytecode = true; + bqn-interpreter = "${lib.getExe' buildPackages.cbqn-bootstrap.phase0 "cbqn"}"; }; phase2-replxx = callPackage ../development/interpreters/bqn/cbqn { inherit (cbqn-bootstrap) mbqn-source stdenv; - genBytecode = true; - bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn"; + generateBytecode = true; enableReplxx = true; + bqn-interpreter = "${lib.getExe' buildPackages.cbqn-bootstrap.phase0 "cbqn"}"; }; }; - dbqn = callPackage ../development/interpreters/bqn/dzaima-bqn { + dbqn = callPackage ../by-name/db/dbqn/package.nix { buildNativeImage = false; - stdenv = stdenvNoCC; jdk = jre; + stdenv = stdenvNoCC; }; - dbqn-native = callPackage ../development/interpreters/bqn/dzaima-bqn { + + dbqn-native = dbqn.override { buildNativeImage = true; jdk = graalvm-ce; }; @@ -17234,8 +17047,6 @@ with pkgs; jdk = jdk21; }; - clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; - clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; dhall = haskell.lib.compose.justStaticExecutables haskellPackages.dhall; @@ -17275,9 +17086,8 @@ with pkgs; }; inherit (beam.interpreters) - 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 + erlang erlang_27 erlang_26 erlang_25 erlang_24 + elixir elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls; erlang_nox = beam_nox.interpreters.erlang; @@ -17758,10 +17568,6 @@ with pkgs; waagent = callPackage ../applications/networking/cluster/waagent { }; - wapm-cli = callPackage ../tools/package-management/wapm/cli { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - wasm = ocamlPackages.wasm; wasm3 = callPackage ../development/interpreters/wasm3 { }; @@ -17832,7 +17638,7 @@ with pkgs; guile-reader = callPackage ../development/guile-modules/guile-reader { }; - guile-sdl = callPackage ../development/guile-modules/guile-sdl { + guile-sdl = callPackage ../by-name/gu/guile-sdl/package.nix { guile = guile_2_2; }; @@ -18006,10 +17812,10 @@ with pkgs; nil = callPackage ../development/tools/language-servers/nil { }; - nixd = callPackage ../development/tools/language-servers/nixd { + inherit (callPackages ../development/tools/language-servers/nixd { llvmPackages = llvmPackages_16; nix = nixVersions.nix_2_19; - }; + }) nixf nixt nixd; openscad-lsp = callPackage ../development/tools/language-servers/openscad-lsp { }; @@ -18039,6 +17845,10 @@ with pkgs; ansible-lint = callPackage ../tools/admin/ansible/lint.nix { }; + antares = callPackage ../by-name/an/antares/package.nix { + electron = electron_29; + }; + antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; @@ -18097,17 +17907,19 @@ with pkgs; electron-source = callPackage ../development/tools/electron { }; inherit (callPackages ../development/tools/electron/binary { }) - electron-bin electron_24-bin electron_27-bin electron_28-bin - electron_29-bin; + electron_29-bin + electron_30-bin; electron_24 = electron_24-bin; - electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; - electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; + electron_27 = electron_27-bin; + electron_28 = electron_28-bin; electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; - electron = electron_29; + electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; + electron = electron_30; + electron-bin = electron_30-bin; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -18135,8 +17947,6 @@ with pkgs; b4 = callPackage ../development/tools/b4 { }; - babeltrace = callPackage ../development/tools/misc/babeltrace { }; - bam = callPackage ../development/tools/build-managers/bam { }; bandit = with python3Packages; toPythonApplication bandit; @@ -18350,14 +18160,6 @@ with pkgs; bpftools = callPackage ../os-specific/linux/bpftools { }; - bcc = callPackage ../os-specific/linux/bcc { - llvmPackages = llvmPackages_16; - }; - - bpftrace = callPackage ../os-specific/linux/bpftrace { - llvmPackages = llvmPackages_16; - }; - bpm-tools = callPackage ../tools/audio/bpm-tools { }; byacc = callPackage ../development/tools/parsing/byacc { }; @@ -18563,8 +18365,6 @@ with pkgs; libcxx = llvmPackages.libcxx; - librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { }; - libgcc = stdenv.cc.cc.libgcc or null; # This is for e.g. LLVM libraries on linux. @@ -18587,8 +18387,6 @@ with pkgs; sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { }; - cli11 = callPackage ../development/tools/misc/cli11 { }; - datree = callPackage ../development/tools/datree { }; detekt = callPackage ../development/tools/detekt { }; @@ -18647,15 +18445,7 @@ with pkgs; doclifter = callPackage ../development/tools/misc/doclifter { }; - docutils = with python3Packages; toPythonApplication ( - docutils.overridePythonAttrs (attrs: rec { - version = "0.20.1"; - src = attrs.src.override { - inherit version; - hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs="; - }; - }) - ); + docutils = with python3Packages; toPythonApplication docutils; doctl = callPackage ../development/tools/doctl { }; @@ -18686,12 +18476,8 @@ with pkgs; dwz = callPackage ../development/tools/misc/dwz { }; - eask = callPackage ../development/tools/eask { }; - easypdkprog = callPackage ../development/embedded/easypdkprog { }; - eclint = callPackage ../development/tools/eclint { }; - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -18744,8 +18530,6 @@ with pkgs; license-scanner = callPackage ../development/tools/license-scanner { }; - Literate = callPackage ../development/tools/literate-programming/Literate { }; - md-tangle = callPackage ../development/tools/literate-programming/md-tangle { }; # NOTE: Override and set useIcon = false to use Awk instead of Icon. @@ -18936,7 +18720,10 @@ with pkgs; guile = guile_2_2; }; - hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint; + hadolint = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.hadolint; halfempty = callPackage ../development/tools/halfempty { }; @@ -19174,8 +18961,8 @@ with pkgs; math-preview = callPackage ../tools/text/math-review { }; - maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + maven3 = maven; + inherit (maven) buildMaven; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; @@ -19193,7 +18980,7 @@ with pkgs; python-matter-server = with python3Packages; toPythonApplication ( python-matter-server.overridePythonAttrs (oldAttrs: { - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ oldAttrs.passthru.optional-dependencies.server; + dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.server; }) ); @@ -19216,7 +19003,7 @@ with pkgs; modd = callPackage ../development/tools/modd { }; - mold = callPackage ../development/tools/mold { + mold = callPackage ../by-name/mo/mold/package.nix { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; tbb = tbb_2021_11; }; @@ -19237,7 +19024,10 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; - haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci; + haskell-ci = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.haskell-ci; nailgun = callPackage ../development/tools/nailgun { }; @@ -19245,8 +19035,6 @@ with pkgs; nex = callPackage ../development/tools/parsing/nex { }; - ninja = callPackage ../development/tools/build-managers/ninja { }; - nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; gn = callPackage ../development/tools/build-managers/gn { }; @@ -19264,6 +19052,10 @@ with pkgs; jre_headless = jre8_headless; }; + nexusmods-app-unfree = callPackage ../by-name/ne/nexusmods-app/package.nix { + enableUnfree = true; + }; + nmrpflash = callPackage ../development/embedded/nmrpflash { }; norminette = callPackage ../development/tools/norminette { }; @@ -19324,8 +19116,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pahole = callPackage ../development/tools/misc/pahole { }; - panopticon = callPackage ../development/tools/analysis/panopticon { }; parinfer-rust = callPackage ../development/tools/parinfer-rust { }; @@ -19581,8 +19371,6 @@ with pkgs; scala-cli = callPackage ../development/tools/build-managers/scala-cli { }; - scc = callPackage ../development/tools/misc/scc { }; - scss-lint = callPackage ../development/tools/scss-lint { }; segger-ozone = callPackage ../development/tools/misc/segger-ozone { }; @@ -19593,7 +19381,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - shake = haskell.lib.compose.justStaticExecutables haskellPackages.shake; + shake = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.shake; shallot = callPackage ../tools/misc/shallot { }; @@ -19874,8 +19665,6 @@ with pkgs; udis86 = callPackage ../development/tools/udis86 { }; - uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; - uhd = callPackage ../applications/radio/uhd { }; uhdMinimal = uhd.override { enableUtils = false; @@ -19999,6 +19788,10 @@ with pkgs; yodl = callPackage ../development/tools/misc/yodl { }; + yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix { + jre = jdk17; + }; + yq = python3.pkgs.toPythonApplication python3.pkgs.yq; yq-go = callPackage ../development/tools/yq-go { }; @@ -20272,8 +20065,6 @@ with pkgs; boost = boost181; - boost_process = callPackage ../development/libraries/boost-process { }; - bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { }; botan2 = callPackage ../development/libraries/botan/2.0.nix { @@ -20363,6 +20154,7 @@ with pkgs; ccrtp = callPackage ../development/libraries/ccrtp { }; cctag = callPackage ../development/libraries/cctag { + stdenv = clangStdenv; tbb = tbb_2021_11; }; @@ -20460,8 +20252,6 @@ with pkgs; soxt = callPackage ../development/libraries/soxt { }; - CoinMP = callPackage ../development/libraries/CoinMP { }; - coinlive = callPackage ../tools/misc/coinlive { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -20511,7 +20301,10 @@ with pkgs; ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; additional_buildInputs = [ openssl ]; }; - ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; }; + ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { + ssl_implementation = mbedtls_2; + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; uri = callPackage ../development/libraries/uri { }; @@ -20527,8 +20320,6 @@ with pkgs; cre2 = callPackage ../development/libraries/cre2 { }; - criterion = callPackage ../development/libraries/criterion { }; - croaring = callPackage ../development/libraries/croaring { }; crocoddyl = callPackage ../development/libraries/crocoddyl { }; @@ -20559,9 +20350,7 @@ with pkgs; cypress = callPackage ../development/web/cypress { }; - cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { - libkrb5 = if stdenv.isFreeBSD then heimdal else libkrb5; - }; + cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { }; cyrus-sasl-xoauth2 = callPackage ../development/libraries/cyrus-sasl-xoauth2 { }; @@ -20606,16 +20395,8 @@ with pkgs; digiham = callPackage ../applications/radio/digiham { }; - dillo = callPackage ../applications/networking/browsers/dillo { - fltk = fltk13; - }; - - dillong = callPackage ../applications/networking/browsers/dillong { }; - directfb = callPackage ../development/libraries/directfb { }; - discord-gamesdk = callPackage ../development/libraries/discord-gamesdk { }; - discord-rpc = callPackage ../development/libraries/discord-rpc { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -20628,8 +20409,6 @@ with pkgs; docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; - docopts = callPackage ../development/tools/misc/docopts { }; - dotconf = callPackage ../development/libraries/dotconf { }; draco = callPackage ../development/libraries/draco { @@ -20643,8 +20422,8 @@ with pkgs; intel-media-driver intel-vaapi-driver mesa + libva-vdpau-driver libvdpau-va-gl - vaapiVdpau glxinfo vdpauinfo; }; @@ -20696,7 +20475,8 @@ with pkgs; elfio = callPackage ../development/libraries/elfio { }; - emanote = haskell.lib.compose.justStaticExecutables haskellPackages.emanote; + # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013 + emanote = haskellPackages.emanote; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; enchant = enchant2; @@ -20705,8 +20485,6 @@ with pkgs; entt = callPackage ../development/libraries/entt { }; - epoll-shim = callPackage ../development/libraries/epoll-shim { }; - libepoxy = callPackage ../development/libraries/libepoxy { inherit (darwin.apple_sdk.frameworks) Carbon OpenGL; }; @@ -20947,7 +20725,7 @@ with pkgs; gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - geph = recurseIntoAttrs (callPackages ../applications/networking/geph { }); + geph = recurseIntoAttrs (callPackages ../applications/networking/geph { pnpm = pnpm_8; }); gephi = callPackage ../applications/science/misc/gephi { }; @@ -21010,6 +20788,7 @@ with pkgs; }; gdcm = callPackage ../development/libraries/gdcm { + inherit (darwin) DarwinTools; inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa; }; @@ -21029,7 +20808,7 @@ with pkgs; ghcid = haskellPackages.ghcid.bin; - gr-framework = libsForQt5.callPackage ../development/libraries/gr-framework { + gr-framework = callPackage ../by-name/gr/gr-framework/package.nix { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; @@ -21131,24 +20910,21 @@ with pkgs; if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries or darwin.iosSdkPkgs.libraries else targetPackages.darwin.LibsystemCross or (throw "don't yet have a `targetPackages.darwin.LibsystemCross for ${stdenv.targetPlatform.config}`") - else if name == "fblibc" then targetPackages.freebsdCross.libc or freebsdCross.libc - else if name == "nblibc" then targetPackages.netbsdCross.libc or netbsdCross.libc + else if name == "fblibc" then targetPackages.freebsd.libc or freebsd.libc + else if name == "oblibc" then targetPackages.openbsd.libc or openbsd.libc + else if name == "nblibc" then targetPackages.netbsd.libc or netbsd.libc else if name == "wasilibc" then targetPackages.wasilibc or wasilibc else if name == "relibc" then targetPackages.relibc or relibc else throw "Unknown libc ${name}"; libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; - threadsCross = threadsCrossFor null; - threadsCrossFor = cc_version: + threadsCross = lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) { # other possible values: win32 or posix model = "mcf"; # For win32 or posix set this to null - package = - if cc_version == null || lib.versionAtLeast cc_version "13" - then targetPackages.windows.mcfgthreads or windows.mcfgthreads - else targetPackages.windows.mcfgthreads_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13; + package = targetPackages.windows.mcfgthreads or windows.mcfgthreads; }; wasilibc = callPackage ../development/libraries/wasilibc { @@ -21251,7 +21027,7 @@ with pkgs; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = newScope (gst_all_1 // { libav = pkgs.ffmpeg-headless; }); - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security VideoToolbox; + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Cocoa CoreFoundation CoreMedia CoreServices CoreVideo DiskArbitration Foundation IOKit MediaToolbox OpenGL Security SystemConfiguration VideoToolbox; }); gusb = callPackage ../development/libraries/gusb { }; @@ -21590,7 +21366,9 @@ with pkgs; ilmbase = callPackage ../development/libraries/ilmbase { }; - imgui = callPackage ../development/libraries/imgui { }; + imgui = callPackage ../development/libraries/imgui { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; imtui = callPackage ../development/libraries/imtui { }; @@ -21669,7 +21447,7 @@ with pkgs; ispc = callPackage ../development/compilers/ispc { xcode = darwin.xcode_14; - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_17; }; isso = callPackage ../servers/isso { @@ -21787,9 +21565,6 @@ with pkgs; LAStools = callPackage ../development/libraries/LAStools { }; - LASzip = callPackage ../development/libraries/LASzip { }; - LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; - laurel = callPackage ../servers/monitoring/laurel/default.nix { }; lcm = callPackage ../development/libraries/lcm { }; @@ -21834,8 +21609,6 @@ with pkgs; lib3mf = callPackage ../development/libraries/lib3mf { }; - libAfterImage = callPackage ../development/libraries/libAfterImage { }; - libaacs = callPackage ../development/libraries/libaacs { }; libaal = callPackage ../development/libraries/libaal { }; @@ -22326,7 +22099,8 @@ with pkgs; libfabric = callPackage ../development/libraries/libfabric { }; - libfive = qt6Packages.callPackage ../development/libraries/libfive { + libfive = libsForQt5.callPackage ../development/libraries/libfive { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; }; @@ -22581,18 +22355,18 @@ with pkgs; # GNU libc provides libiconv so systems with glibc don't need to # build libiconv separately. Additionally, Apple forked/repackaged - # libiconv so we use that instead of the vanilla version on that OS, + # libiconv, so build and use the upstream one with a compatible ABI, # and BSDs include libiconv in libc. # # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" ] + if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" "fblibc" ] then libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc) else if stdenv.hostPlatform.isDarwin - then darwin.libiconv + then libiconv-darwin else libiconvReal; libcIconv = libc: let @@ -22609,7 +22383,9 @@ with pkgs; if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" ] then lib.getBin stdenv.cc.libc else if stdenv.hostPlatform.isDarwin then - lib.getBin darwin.libiconv + lib.getBin libiconv + else if stdenv.hostPlatform.isFreeBSD then + lib.getBin freebsd.iconv else lib.getBin libiconvReal; @@ -22789,12 +22565,8 @@ with pkgs; libopenglrecorder = callPackage ../development/libraries/libopenglrecorder { }; - libopus = callPackage ../development/libraries/libopus { }; - libopusenc = callPackage ../development/libraries/libopusenc { }; - liboqs = callPackage ../development/libraries/liboqs { }; - libosinfo = callPackage ../development/libraries/libosinfo { }; libosip = callPackage ../development/libraries/osip { }; @@ -23333,7 +23105,10 @@ with pkgs; matio = callPackage ../development/libraries/matio { }; - matterhorn = haskell.lib.compose.justStaticExecutables haskellPackages.matterhorn; + matterhorn = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.matterhorn; maxflow = callPackage ../development/libraries/maxflow { }; @@ -23435,7 +23210,7 @@ with pkgs; micropython = callPackage ../development/interpreters/micropython { }; - MIDIVisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midi-visualizer { + midivisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midivisualizer { inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel; }; @@ -23690,8 +23465,6 @@ with pkgs; ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { }; - open62541 = callPackage ../development/libraries/open62541 { }; - openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; @@ -23707,6 +23480,17 @@ with pkgs; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; + opencascade-occt_7_6 = opencascade-occt.overrideAttrs rec { + pname = "opencascade-occt"; + version = "7.6.2"; + commit = "V${builtins.replaceStrings ["."] ["_"] version}"; + src = fetchurl { + name = "occt-${commit}.tar.gz"; + url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; + hash = "sha256-n3KFrN/mN1SVXfuhEUAQ1fJzrCvhiclxfEIouyj9Z18="; + }; + }; + opencl-headers = callPackage ../development/libraries/opencl-headers { }; opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; @@ -23731,6 +23515,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate; ffmpeg = ffmpeg_4; + # OpenCV3 won't build with anything newer than CUDA 11 due to API changes. + cudaPackages = cudaPackages_11; }; opencv4 = callPackage ../development/libraries/opencv/4.x.nix { @@ -23770,10 +23556,6 @@ with pkgs; openpa = callPackage ../development/libraries/openpa { }; - openpgp-card-tools = callPackage ../tools/security/openpgp-card-tools { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; - opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { @@ -23792,7 +23574,7 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb { }; - openvr = callPackage ../development/libraries/openvr { + openvr = callPackage ../by-name/op/openvr/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation AppKit; }; @@ -23826,10 +23608,6 @@ with pkgs; opensupaplex = callPackage ../games/opensupaplex { }; - openturns = callPackage ../development/libraries/openturns { - inherit (darwin.apple_sdk.frameworks) Accelerate; - }; - open-wbo = callPackage ../applications/science/logic/open-wbo { }; openwsman = callPackage ../development/libraries/openwsman { }; @@ -23970,10 +23748,11 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf_24; + protobuf = protobuf_25; inherit ({ + protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { }; protobuf_26 = callPackage ../development/libraries/protobuf/26.nix { }; protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { }; protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; @@ -23987,6 +23766,7 @@ with pkgs; abseil-cpp = abseil-cpp_202103; }; }) + protobuf_27 protobuf_26 protobuf_25 protobuf_24 @@ -24202,6 +23982,17 @@ with pkgs; rocksdb = callPackage ../development/libraries/rocksdb { }; + rocksdb_8_11 = rocksdb.overrideAttrs rec { + pname = "rocksdb"; + version = "8.11.4"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ZrU7G3xeimF3H2LRGBDHOq936u5pH/3nGecM4XEoWc8="; + }; + }; + rocksdb_8_3 = rocksdb.overrideAttrs rec { pname = "rocksdb"; version = "8.3.2"; @@ -24293,28 +24084,6 @@ with pkgs; SDL = SDL_classic; - SDL_audiolib = callPackage ../development/libraries/SDL_audiolib { }; - - SDL_sixel = callPackage ../development/libraries/SDL_sixel { }; - - SDL_gfx = callPackage ../development/libraries/SDL_gfx { }; - - SDL_gpu = callPackage ../development/libraries/SDL_gpu { }; - - SDL_image = callPackage ../development/libraries/SDL_image { }; - - SDL_mixer = callPackage ../development/libraries/SDL_mixer { }; - - SDL_net = callPackage ../development/libraries/SDL_net { }; - - SDL_Pango = callPackage ../development/libraries/SDL_Pango { }; - - SDL_sound = callPackage ../development/libraries/SDL_sound { }; - - SDL_stretch= callPackage ../development/libraries/SDL_stretch { }; - - SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; - SDL2 = callPackage ../development/libraries/SDL2 { inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; @@ -24340,22 +24109,10 @@ with pkgs; }; }); - SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { - inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; - }; - # SDL2_mixer_2_0 pinned for lzwolf - SDL2_mixer_2_0 = callPackage ../development/libraries/SDL2_mixer/2_0.nix { }; - - SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; - - SDL2_sound = callPackage ../development/libraries/SDL2_sound { - inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; - }; - - SDL2_ttf = callPackage ../development/libraries/SDL2_ttf { }; - sdrplay = callPackage ../applications/radio/sdrplay { }; + sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { }; + sdrpp = callPackage ../applications/radio/sdrpp { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -24674,8 +24431,6 @@ with pkgs; swiftclient = with python3Packages; toPythonApplication python-swiftclient; - sword = callPackage ../development/libraries/sword { }; - biblesync = callPackage ../development/libraries/biblesync { }; szip = callPackage ../development/libraries/szip { }; @@ -24819,9 +24574,7 @@ with pkgs; umockdev = callPackage ../development/libraries/umockdev { }; - unconvert = callPackage ../development/tools/unconvert { - buildGoModule = buildGo121Module; - }; + unconvert = callPackage ../development/tools/unconvert { }; uncover = callPackage ../tools/security/uncover { }; @@ -24839,8 +24592,6 @@ with pkgs; unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { }); - ustr = callPackage ../development/libraries/ustr { }; - usrsctp = callPackage ../development/libraries/usrsctp { }; usbredir = callPackage ../development/libraries/usbredir { }; @@ -24861,7 +24612,7 @@ with pkgs; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; - vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; + libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { }; vale = callPackage ../tools/text/vale { }; @@ -24888,6 +24639,8 @@ with pkgs; vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; }; + vesktop = callPackage ../by-name/ve/vesktop/package.nix { pnpm = pnpm_8; }; + vid-stab = callPackage ../development/libraries/vid-stab { inherit (llvmPackages) openmp; }; @@ -24896,8 +24649,6 @@ with pkgs; hdf5 = hdf5.override { usev110Api = true; }; }; - vkd3d = callPackage ../development/libraries/vkd3d {}; - vkd3d-proton = callPackage ../development/libraries/vkd3d-proton {}; vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { }; @@ -25005,7 +24756,7 @@ with pkgs; whereami = callPackage ../development/libraries/whereami { }; wildmidi = callPackage ../development/libraries/wildmidi { - inherit (darwin.apple_sdk.frameworks) OpenAL; + inherit (darwin.apple_sdk.frameworks) OpenAL CoreAudioKit; }; wiredtiger = callPackage ../development/libraries/wiredtiger { }; @@ -25087,8 +24838,6 @@ with pkgs; xml-security-c = callPackage ../development/libraries/xml-security-c { }; - xml-tooling-c = callPackage ../development/libraries/xml-tooling-c { }; - xlslib = callPackage ../development/libraries/xlslib { }; xsimd = callPackage ../development/libraries/xsimd { }; @@ -25161,24 +24910,26 @@ with pkgs; libzra = callPackage ../development/libraries/libzra { }; # requires a newer Apple SDK - zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9.nix { + zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9 { llvmPackages = llvmPackages_13; }; # requires a newer Apple SDK - zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10.nix { + zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10 { llvmPackages = llvmPackages_15; }; # requires a newer Apple SDK - zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11.nix { + zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11 { llvmPackages = llvmPackages_16; }; # requires a newer Apple SDK - zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12.nix { + zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12 { llvmPackages = llvmPackages_17; }; - zig = zig_0_12; - - zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { }; + # requires a newer Apple SDK + zig_0_13 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.13 { + llvmPackages = llvmPackages_18; + }; + zig = zig_0_13; zimlib = callPackage ../development/libraries/zimlib { }; @@ -25192,8 +24943,6 @@ with pkgs; zix = callPackage ../development/libraries/audio/zix { }; - zz = callPackage ../development/compilers/zz { }; - zziplib = callPackage ../development/libraries/zziplib { }; glpng = callPackage ../development/libraries/glpng { }; @@ -25325,6 +25074,10 @@ with pkgs; leaps = callPackage ../development/tools/leaps { }; + ### DEVELOPMENT / HARE + + hareHook = callPackage ../by-name/ha/hare/hook.nix { }; + ### DEVELOPMENT / JAVA MODULES javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { }); @@ -25348,36 +25101,6 @@ with pkgs; texLive = null; }; - ## DEPRECATED, will be removed in a future release - - clwrapperFunction = callPackage ../development/lisp-modules-obsolete/clwrapper; - - wrapLisp_old = lisp: clwrapperFunction { inherit lisp; }; - - lispPackagesFor = clwrapper: callPackage ../development/lisp-modules-obsolete/lisp-packages.nix { - inherit clwrapper; - }; - - lispPackages = quicklispPackages // - (lispPackagesFor (wrapLisp_old sbcl)) // { __attrsFailEvaluation = true; }; - - quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules-obsolete/quicklisp-to-nix.nix { - inherit clwrapper; - } // { __attrsFailEvaluation = true; }; - quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old clisp)); - quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old sbcl)); - quicklispPackagesECL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old ecl)); - quicklispPackagesCCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old ccl)); - quicklispPackagesABCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old abcl)); - quicklispPackagesGCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp_old gcl)); - quicklispPackages = quicklispPackagesSBCL; - - # Alternative lisp-modules implementation - lispPackages_new = callPackage ../development/lisp-modules-new-obsolete/lisp-packages.nix {} - // { __attrsFailEvaluation = true; }; - - ## End of DEPRECATED - wrapLisp = callPackage ../development/lisp-modules/nix-cl.nix {}; # Armed Bear Common Lisp @@ -25397,7 +25120,7 @@ with pkgs; # Clasp Common Lisp clasp-common-lisp = wrapLisp { pkg = callPackage ../development/compilers/clasp { }; - faslExt = "fasp"; + faslExt = "fasl"; }; # CLISP @@ -25439,17 +25162,17 @@ with pkgs; }; # Steel Bank Common Lisp - 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_2_4_4 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.4"; }; + sbcl_2_4_5 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_4; + sbcl = sbcl_2_4_5; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -25534,8 +25257,6 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - allmark = callPackage ../servers/allmark { }; - alps = callPackage ../servers/alps { }; anuko-time-tracker = callPackage ../servers/web-apps/anuko-time-tracker { }; @@ -25798,8 +25519,6 @@ with pkgs; inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird; - flashmq = callPackage ../servers/mqtt/flashmq { }; - freeradius = callPackage ../servers/freeradius { }; freshrss = callPackage ../servers/web-apps/freshrss { }; @@ -25840,8 +25559,6 @@ with pkgs; phlare = callPackage ../servers/monitoring/phlare { }; - grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; - grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; grafana-dash-n-grab = callPackage ../servers/monitoring/grafana-dash-n-grab { }; @@ -25978,7 +25695,7 @@ with pkgs; leafnode1 = callPackage ../servers/news/leafnode/1.nix { }; lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { @@ -26005,8 +25722,6 @@ with pkgs; inherit (mailmanPackages) mailman mailman-hyperkitty; mailman-web = mailmanPackages.web; - mailman-rss = callPackage ../tools/misc/mailman-rss { }; - listadmin = callPackage ../applications/networking/listadmin { }; maker-panel = callPackage ../tools/misc/maker-panel { }; @@ -26025,7 +25740,7 @@ with pkgs; matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { }; - mattermost = callPackage ../servers/mattermost { buildGoModule = buildGo122Module; }; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -26162,8 +25877,6 @@ with pkgs; olaris-server = callPackage ../servers/olaris { }; - onagre = callPackage ../applications/misc/onagre { }; - onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { }; outline = callPackage ../servers/web-apps/outline (lib.fix (super: { @@ -26355,7 +26068,9 @@ with pkgs; buildGoModule = buildGo122Module; }; - mir = callPackage ../servers/mir { }; + inherit (callPackage ../servers/mir { }) + mir + mir_2_15; miriway = callPackage ../applications/window-managers/miriway { }; @@ -26504,7 +26219,6 @@ with pkgs; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-dcgm-exporter = callPackage ../servers/monitoring/prometheus/dcgm-exporter { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; - prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; prometheus-fastly-exporter = callPackage ../servers/monitoring/prometheus/fastly-exporter.nix { }; prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; @@ -26596,13 +26310,11 @@ with pkgs; rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; - elixir = elixir_1_14; + erlang = erlang_26; }; radicale2 = callPackage ../servers/radicale/2.x.nix { }; - radicale3 = callPackage ../servers/radicale/3.x.nix { }; - - radicale = radicale3; + radicale3 = radicale; qcal = callPackage ../tools/networking/qcal/default.nix { }; @@ -26810,8 +26522,6 @@ with pkgs; urserver = callPackage ../servers/urserver { }; - uxplay = callPackage ../servers/uxplay { }; - vouch-proxy = callPackage ../servers/vouch-proxy { }; virtiofsd = callPackage ../servers/misc/virtiofsd { }; @@ -26820,8 +26530,6 @@ with pkgs; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; - vmagent = callPackage ../servers/monitoring/vmagent { }; - vsftpd = callPackage ../servers/ftp/vsftpd { }; wallabag = callPackage ../servers/web-apps/wallabag { }; @@ -26928,8 +26636,6 @@ with pkgs; pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; - tile38 = callPackage ../servers/geospatial/tile38 { }; - ### OS-SPECIFIC airbuddy = callPackage ../os-specific/darwin/airbuddy { }; @@ -27177,9 +26883,7 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { - inherit (linuxPackages) kernel; - }; + ffado = libsForQt5.callPackage ../os-specific/linux/ffado { }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -27310,8 +27014,6 @@ with pkgs; itpp = callPackage ../development/libraries/science/math/itpp { }; - iw = callPackage ../os-specific/linux/iw { }; - iwd = callPackage ../os-specific/linux/iwd { }; jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; @@ -27472,6 +27174,10 @@ with pkgs; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; + linuxPackages_6_8_hardened = linuxKernel.packages.linux_6_8_hardened; + linux_6_8_hardened = linuxKernel.kernels.linux_6_8_hardened; + linuxPackages_6_9_hardened = linuxKernel.packages.linux_6_9_hardened; + linux_6_9_hardened = linuxKernel.kernels.linux_6_9_hardened; # GNU Linux-libre kernels linuxPackages-libre = linuxKernel.packages.linux_libre; @@ -27639,8 +27345,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; }; - nushellFull = nushell.override { additionalFeatures = p: p ++ ["dataframe"]; }; - nu_scripts = callPackage ../shells/nushell/nu_scripts { }; nushellPlugins = recurseIntoAttrs (callPackage ../shells/nushell/plugins { @@ -27705,8 +27409,6 @@ with pkgs; go-protobuf = callPackage ../development/tools/go-protobuf { }; - go-symbols = callPackage ../development/tools/go-symbols { }; - go-toml = callPackage ../development/tools/go-toml { }; go-outline = callPackage ../development/tools/go-outline { }; @@ -27745,8 +27447,6 @@ with pkgs; gotraceui = callPackage ../development/tools/gotraceui { }; - govers = callPackage ../development/tools/govers { }; - goverview = callPackage ../tools/security/goverview { }; go-tools = callPackage ../development/tools/go-tools { @@ -27803,6 +27503,8 @@ with pkgs; odin = callPackage ../development/compilers/odin { inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; + llvmPackages = llvmPackages_18; }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; @@ -27815,8 +27517,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - ols = callPackage ../development/tools/ols { }; - openpam = callPackage ../development/libraries/openpam { }; openbsm = callPackage ../development/libraries/openbsm { }; @@ -27869,8 +27569,6 @@ with pkgs; perf-tools = callPackage ../os-specific/linux/perf-tools { }; - pgrok = callPackage ../tools/networking/pgrok { }; - picoprobe-udev-rules = callPackage ../os-specific/linux/picoprobe-udev-rules { }; pipes = callPackage ../misc/screensavers/pipes { }; @@ -27986,7 +27684,9 @@ with pkgs; sdparm = callPackage ../os-specific/linux/sdparm { }; - sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { }; + sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; setools = callPackage ../os-specific/linux/setools { }; @@ -28268,8 +27968,6 @@ with pkgs; vendir = callPackage ../development/tools/vendir { }; - vndr = callPackage ../development/tools/vndr { }; - vdo = callPackage ../os-specific/linux/vdo { }; windows = callPackages ../os-specific/windows {}; @@ -28367,10 +28065,6 @@ with pkgs; ananicy = callPackage ../misc/ananicy { }; - ananicy-cpp = callPackage ../misc/ananicy-cpp { }; - - ananicy-rules-cachyos = callPackage ../misc/ananicy-rules-cachyos { }; - andagii = callPackage ../data/fonts/andagii { }; andika = callPackage ../data/fonts/andika { }; @@ -28435,8 +28129,6 @@ with pkgs; brise = callPackage ../data/misc/brise { }; - apl386 = callPackage ../data/fonts/apl386 { }; - bqn386 = callPackage ../data/fonts/bqn386 { }; cacert = callPackage ../data/misc/cacert { }; @@ -28455,8 +28147,6 @@ with pkgs; cascadia-code = callPackage ../data/fonts/cascadia-code { }; - catppuccin-cursors = callPackage ../data/icons/catppuccin-cursors { }; - ccsymbols = callPackage ../data/fonts/ccsymbols { }; charis-sil = callPackage ../data/fonts/charis-sil { }; @@ -28495,8 +28185,6 @@ with pkgs; comixcursors = callPackage ../data/icons/comixcursors { }; - corefonts = callPackage ../data/fonts/corefonts { }; - courier-prime = callPackage ../data/fonts/courier-prime { }; cozette = callPackage ../data/fonts/cozette { }; @@ -28652,8 +28340,6 @@ with pkgs; flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { }; flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { }; - fluent-gtk-theme = callPackage ../data/themes/fluent-gtk-theme { }; - fluent-icon-theme = callPackage ../data/icons/fluent-icon-theme { }; font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4; @@ -28817,7 +28503,7 @@ with pkgs; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono { }; - kde-rounded-corners = libsForQt5.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; + kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; khmeros = callPackage ../data/fonts/khmeros { }; @@ -29174,7 +28860,7 @@ with pkgs; poly = callPackage ../data/fonts/poly { }; - polychromatic = libsForQt5.callPackage ../applications/misc/polychromatic { }; + polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { }; polytopes_db = callPackage ../data/misc/polytopes_db { }; @@ -29216,6 +28902,10 @@ with pkgs; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix { + protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178 + }; + rime-data = callPackage ../data/misc/rime-data { }; roapi-http = callPackage ../servers/roapi/http.nix { }; @@ -29366,6 +29056,8 @@ with pkgs; siji = callPackage ../data/fonts/siji { }; + smc-chilanka = callPackage ../data/fonts/smc-chilanka { }; + sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; source-code-pro = callPackage ../data/fonts/source-code-pro { }; @@ -29494,7 +29186,10 @@ with pkgs; unscii = callPackage ../data/fonts/unscii { }; - utterly-nord-plasma = libsForQt5.callPackage ../data/themes/utterly-nord-plasma { }; + utterly-nord-plasma = kdePackages.callPackage ../data/themes/utterly-nord-plasma { + # renamed in KF6 + plasma-framework = kdePackages.libplasma; + }; utterly-round-plasma-style = callPackage ../data/themes/utterly-round-plasma-style { }; @@ -29723,6 +29418,7 @@ with pkgs; androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { }); android-studio = androidStudioPackages.stable; + android-studio-full = android-studio.full; antfs-cli = callPackage ../applications/misc/antfs-cli { }; @@ -29753,10 +29449,6 @@ with pkgs; appgate-sdp = callPackage ../applications/networking/appgate-sdp { }; - apostrophe = callPackage ../applications/editors/apostrophe { - pythonPackages = python3Packages; - }; - ardour = callPackage ../applications/audio/ardour { }; ardour_7 = callPackage ../applications/audio/ardour/7.nix { }; @@ -29788,12 +29480,8 @@ with pkgs; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; - pulsar = callPackage ../applications/editors/pulsar { }; - asap = callPackage ../tools/audio/asap { }; - aseprite = callPackage ../applications/editors/aseprite { }; - assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; astroid = callPackage ../applications/networking/mailreaders/astroid { @@ -30187,14 +29875,6 @@ with pkgs; cgif = callPackage ../tools/graphics/cgif { }; - ChowCentaur = callPackage ../applications/audio/ChowCentaur { }; - - ChowKick = callPackage ../applications/audio/ChowKick { }; - - ChowPhaser = callPackage ../applications/audio/ChowPhaser { }; - - CHOWTapeModel = callPackage ../applications/audio/CHOWTapeModel { }; - chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {}); chuck = callPackage ../applications/audio/chuck { @@ -30214,6 +29894,8 @@ with pkgs; clight = callPackage ../applications/misc/clight { }; + clight-gui = libsForQt5.callPackage ../applications/misc/clight/clight-gui.nix { }; + clightd = callPackage ../applications/misc/clight/clightd.nix { }; clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { }; @@ -30303,14 +29985,10 @@ with pkgs; coursera-dl = callPackage ../applications/misc/coursera-dl { }; - coyim = callPackage ../applications/networking/instant-messengers/coyim { }; - cozy-drive = callPackage ../applications/networking/cozy-drive { }; cplay-ng = callPackage ../applications/audio/cplay-ng { }; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; - cqrlog = callPackage ../applications/radio/cqrlog { hamlib = hamlib_4; }; @@ -30460,8 +30138,6 @@ with pkgs; docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; - docker-distribution = callPackage ../applications/virtualization/docker/distribution.nix { }; - dockfmt = callPackage ../development/tools/dockfmt { }; afterburn = callPackage ../tools/admin/afterburn { }; @@ -30586,10 +30262,6 @@ with pkgs; edlin = callPackage ../applications/editors/edlin { }; - orbiton = callPackage ../applications/editors/orbiton { - buildGoModule = buildGo122Module; - }; - oed = callPackage ../applications/editors/oed { }; ekho = callPackage ../applications/audio/ekho { @@ -30709,12 +30381,6 @@ with pkgs; expenses = callPackage ../applications/misc/expenses { }; - flowtime = callPackage ../applications/misc/flowtime { }; - - furnace = callPackage ../applications/audio/furnace { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - furtherance = callPackage ../applications/misc/furtherance { }; gigalixir = callPackage ../tools/misc/gigalixir { }; @@ -30817,8 +30483,6 @@ with pkgs; fig2dev = callPackage ../applications/graphics/fig2dev { }; - FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; - finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -30873,7 +30537,10 @@ with pkgs; fondo = callPackage ../applications/graphics/fondo { }; - font-manager = callPackage ../applications/misc/font-manager { }; + font-manager = callPackage ../by-name/fo/font-manager/package.nix { + libsoup = libsoup_3; + webkitgtk = webkitgtk_4_1; + }; fontfinder = callPackage ../applications/misc/fontfinder { }; @@ -31279,8 +30946,6 @@ with pkgs; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - fragments = callPackage ../applications/networking/p2p/fragments { }; - freedv = callPackage ../applications/radio/freedv { inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; codec2 = codec2.override { @@ -31295,9 +30960,9 @@ with pkgs; freenet = callPackage ../applications/networking/p2p/freenet { gradle = gradle_7; - jdk = jdk_headless; + jdk = jdk17_headless; # Reduce closure size - jre = pkgs.jre_minimal.override { + jre = pkgs.jre17_minimal.override { modules = [ "java.base" "java.logging" @@ -31306,14 +30971,12 @@ with pkgs; "java.desktop" "java.management" ]; - jdk = jdk_headless; + jdk = jdk17_headless; }; }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; - freeplane = callPackage ../applications/misc/freeplane { }; - freepv = callPackage ../applications/graphics/freepv { }; xfontsel = callPackage ../applications/misc/xfontsel { }; @@ -31323,10 +30986,20 @@ with pkgs; pulseaudio-module-xrdp = callPackage ../applications/networking/remote/xrdp/pulseaudio-module-xrdp { }; - freerdp = callPackage ../applications/networking/remote/freerdp { - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; - }; + inherit + ({ + freerdp = callPackage ../applications/networking/remote/freerdp { + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; + }; + freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; + }; + }) + freerdp + freerdp3 + ; freerdpUnstable = freerdp; @@ -31334,8 +31007,6 @@ with pkgs; python3Packages = python39Packages; }; - fte = callPackage ../applications/editors/fte { }; - g933-utils = callPackage ../tools/misc/g933-utils { }; gavrasm = callPackage ../development/compilers/gavrasm { }; @@ -31396,9 +31067,19 @@ with pkgs; vmopts = config.jetbrains.vmopts or null; jdk = jetbrains.jdk; }) // { - jdk-no-jcef = callPackage ../development/compilers/jetbrains-jdk { withJcef = false; }; - jdk = callPackage ../development/compilers/jetbrains-jdk { }; - jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix { }; + jdk-no-jcef = callPackage ../development/compilers/jetbrains-jdk { + jdk = jdk21; + withJcef = false; + }; + jdk-no-jcef-17 = callPackage ../development/compilers/jetbrains-jdk/17.nix { + withJcef = false; + }; + jdk = callPackage ../development/compilers/jetbrains-jdk { + jdk = jdk21; + }; + jcef = callPackage ../development/compilers/jetbrains-jdk/jcef.nix { + jdk = jdk21; + }; }); jmusicbot = callPackage ../applications/audio/jmusicbot { }; @@ -31407,10 +31088,6 @@ with pkgs; lemonade = callPackage ../applications/misc/lemonade { }; - LibreArp = callPackage ../applications/audio/LibreArp { }; - - LibreArp-lv2 = callPackage ../applications/audio/LibreArp/lv2.nix { }; - librespot = callPackage ../applications/audio/librespot { withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; @@ -31441,6 +31118,15 @@ with pkgs; manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; + metacubexd = callPackage ../by-name/me/metacubexd/package.nix { + pnpm = callPackage ../development/tools/pnpm/generic.nix { + version = "9.1.4"; + hash = "sha256-MKGAGsTnI3ee/tE6IfTDn562yfu0ztEBvOBrQiWT18k="; + }; + }; + + minari = python3Packages.toPythonApplication python3Packages.minari; + mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly { }; @@ -31550,8 +31236,6 @@ with pkgs; googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { }; - go-graft = callPackage ../applications/networking/go-graft { }; gostatic = callPackage ../applications/misc/gostatic { }; @@ -31567,8 +31251,6 @@ with pkgs; gpsd = callPackage ../servers/gpsd { }; - gpsprune = callPackage ../applications/misc/gpsprune { }; - gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { }; gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { }; @@ -31595,8 +31277,6 @@ with pkgs; gtklock-userinfo-module = callPackage ../tools/wayland/gtklock/userinfo-module.nix { }; - guardian-agent = callPackage ../tools/networking/guardian-agent { }; - gv = callPackage ../applications/misc/gv { }; guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; @@ -31655,8 +31335,6 @@ with pkgs; hexdino = callPackage ../applications/editors/hexdino { }; - hexedit = callPackage ../applications/editors/hexedit { }; - hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { }; hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix { @@ -31670,7 +31348,10 @@ with pkgs; hledger-iadd = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-iadd; hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest; hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui; - hledger-web = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-web; + hledger-web = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.hledger-web; hledger-utils = with python3.pkgs; toPythonApplication hledger-utils; hmm = callPackage ../applications/misc/hmm { }; @@ -31805,7 +31486,7 @@ with pkgs; pixeluvo = callPackage ../applications/graphics/pixeluvo { }; - pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { }; planner = callPackage ../applications/office/planner { }; @@ -31813,8 +31494,6 @@ with pkgs; protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { }; - pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; - pokeget-rs = callPackage ../tools/misc/pokeget-rs { }; popura = callPackage ../tools/networking/popura { }; @@ -31828,8 +31507,6 @@ with pkgs; singularity-overriden-nixos ; - sfwbar = callPackage ../applications/misc/sfwbar { }; - skate = callPackage ../applications/misc/skate { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -31867,8 +31544,6 @@ with pkgs; srain = callPackage ../applications/networking/irc/srain { }; - streamdeck-ui = callPackage ../applications/misc/streamdeck-ui { }; - super-productivity = callPackage ../applications/office/super-productivity { }; inherit (callPackages ../development/libraries/wlroots {}) @@ -31892,14 +31567,10 @@ with pkgs; waycorner = callPackage ../applications/misc/waycorner { }; - waylock = callPackage ../applications/misc/waylock { }; - wayshot = callPackage ../tools/misc/wayshot { }; waylevel = callPackage ../tools/misc/waylevel { }; - wbg = callPackage ../applications/misc/wbg { }; - i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; @@ -32090,8 +31761,6 @@ with pkgs; img2pdf = with python3Packages; toPythonApplication img2pdf; - imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { }; - imgcat = callPackage ../applications/graphics/imgcat { }; img-cat = callPackage ../applications/graphics/img-cat { }; @@ -32162,8 +31831,10 @@ with pkgs; }; jabref = callPackage ../applications/office/jabref { - jdk = jdk21.override { enableJavaFX = true; }; - gradle = gradle_8; + jdk = jdk.override { + enableJavaFX = true; + openjfx = openjfx22.override { withWebKit = true; }; + }; }; jack_capture = callPackage ../applications/audio/jack-capture { }; @@ -32209,8 +31880,6 @@ with pkgs; johnny = callPackage ../applications/misc/johnny { }; - josm = callPackage ../applications/misc/josm { }; - js8call = qt5.callPackage ../applications/radio/js8call { }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -32219,8 +31888,13 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/k3s { buildGoModule = buildGo121Module; - }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29; - k3s = k3s_1_29; + go = go_1_21; + }) k3s_1_28 k3s_1_29; + inherit (callPackage ../applications/networking/cluster/k3s { + buildGoModule = buildGo122Module; + go = go_1_22; + }) k3s_1_30; + k3s = k3s_1_30; k3sup = callPackage ../applications/networking/cluster/k3sup { }; @@ -32287,6 +31961,8 @@ with pkgs; kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; + kiwitalk = callPackage ../by-name/ki/kiwitalk/package.nix { pnpm = pnpm_8; }; + kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { }; @@ -32295,11 +31971,9 @@ with pkgs; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; - klee = callPackage ../applications/science/logic/klee (with llvmPackages_13; { - clang = clang; - llvm = llvm; - stdenv = stdenv; - }); + klee = callPackage ../applications/science/logic/klee { + llvmPackages = llvmPackages_13; + }; kmetronome = qt6Packages.callPackage ../applications/audio/kmetronome { }; @@ -32445,8 +32119,6 @@ with pkgs; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; - linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; linkerd_stable = linkerd; @@ -32564,63 +32236,57 @@ with pkgs; libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; libreoffice = hiPrio libreoffice-still; + libreoffice-unwrapped = libreoffice.unwrapped; libreoffice-qt = hiPrio libreoffice-qt-still; - libreoffice-qt-unwrapped = libreoffice-qt.unwrapped; - libreoffice-unwrapped = libreoffice.unwrapped; - - libreoffice-args = { - inherit (perlPackages) ArchiveZip IOCompress; - zip = zip.override { enableNLS = false; }; - fontsConf = makeFontsConf { - fontDirectories = [ - carlito dejavu_fonts - freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1 - liberation_ttf_v2 - ]; - }; - clucene_core = clucene_core_2; - lcms = lcms2; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - boost = boost179; - }; - libreoffice-qt-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = libsForQt5.callPackage ../applications/office/libreoffice - (libreoffice-args // { - kdeIntegration = true; - variant = "fresh"; - }); + unwrapped = libsForQt5.callPackage ../applications/office/libreoffice { + kdeIntegration = true; + variant = "fresh"; + }; }); libreoffice-qt-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; libreoffice-qt-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = libsForQt5.callPackage ../applications/office/libreoffice - (libreoffice-args // { - kdeIntegration = true; - variant = "still"; - }); + unwrapped = libsForQt5.callPackage ../applications/office/libreoffice { + kdeIntegration = true; + variant = "still"; + }; }); libreoffice-qt-still-unwrapped = libreoffice-qt-still.unwrapped; + libreoffice-qt6 = hiPrio libreoffice-qt6-still; + libreoffice-qt6-unwrapped = libreoffice-qt6.unwrapped; + + libreoffice-qt6-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + unwrapped = kdePackages.callPackage ../applications/office/libreoffice { + kdeIntegration = true; + variant = "fresh"; + }; + }); + libreoffice-qt6-fresh-unwrapped = libreoffice-qt6-fresh.unwrapped; + + libreoffice-qt6-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + unwrapped = kdePackages.callPackage ../applications/office/libreoffice { + kdeIntegration = true; + variant = "still"; + }; + }); + libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = callPackage ../applications/office/libreoffice - (libreoffice-args // { - variant = "fresh"; - }); + unwrapped = callPackage ../applications/office/libreoffice { + variant = "fresh"; + }; }); libreoffice-fresh-unwrapped = libreoffice-fresh.unwrapped; libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - unwrapped = callPackage ../applications/office/libreoffice - (libreoffice-args // { - variant = "still"; - }); + unwrapped = callPackage ../applications/office/libreoffice { + variant = "still"; + }; }); libreoffice-still-unwrapped = libreoffice-still.unwrapped; @@ -32777,8 +32443,6 @@ with pkgs; makeself = callPackage ../applications/misc/makeself { }; - mako = callPackage ../applications/misc/mako { }; - mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; @@ -32815,8 +32479,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - media-downloader = libsForQt5.callPackage ../applications/video/media-downloader { }; - mediaelch = mediaelch-qt5; mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { }; mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { }; @@ -33032,8 +32694,6 @@ with pkgs; motif = callPackage ../development/libraries/motif { }; - mousai = callPackage ../applications/audio/mousai { }; - mozjpeg = callPackage ../applications/graphics/mozjpeg { }; edgetx = libsForQt5.callPackage ../applications/misc/edgetx { }; @@ -33060,8 +32720,6 @@ with pkgs; withConplay = false; }; - mpg321 = callPackage ../applications/audio/mpg321 { }; - mpc-cli = callPackage ../applications/audio/mpc { inherit (python3Packages) sphinx; }; @@ -33153,15 +32811,14 @@ with pkgs; inherit lua; }; - shaka-packager = callPackage ../applications/video/shaka-packager { }; + # Wrap avoiding rebuild + mpv = mpv-unwrapped.wrapper { mpv = mpv-unwrapped; }; - # Wraps without triggering a rebuild - wrapMpv = callPackage ../applications/video/mpv/wrapper.nix { }; - mpv = wrapMpv mpv-unwrapped { }; + mpvScripts = mpv-unwrapped.scripts; - mpvpaper = callPackage ../tools/wayland/mpvpaper { }; + shaka-packager = callPackage ../applications/video/shaka-packager { }; - mpvScripts = callPackage ../applications/video/mpv/scripts { }; + mpvpaper = callPackage ../tools/wayland/mpvpaper { }; open-in-mpv = callPackage ../applications/video/open-in-mpv { }; @@ -33269,8 +32926,6 @@ with pkgs; nwg-menu = callPackage ../applications/misc/nwg-menu { }; - nwg-panel = callPackage ../applications/misc/nwg-panel { }; - nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { }; ocm = callPackage ../applications/networking/cluster/ocm { }; @@ -33399,8 +33054,6 @@ with pkgs; protobuf = protobuf_21; }; - smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt5.callPackage ../applications/video/smtube { }; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { }; @@ -33549,7 +33202,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation; }; - nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; + nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { }; notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; @@ -33596,9 +33249,7 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; - obsidian = callPackage ../applications/misc/obsidian { - electron = electron_28; - }; + obsidian = callPackage ../applications/misc/obsidian { }; octoprint = callPackage ../applications/misc/octoprint { }; @@ -33639,8 +33290,6 @@ with pkgs; openexr = openexr_3; }; - openjump = callPackage ../applications/misc/openjump { }; - open-music-kontrollers = lib.recurseIntoAttrs { eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { }; @@ -33675,10 +33324,6 @@ with pkgs; oranda = callPackage ../applications/misc/oranda { }; - orca = python3Packages.callPackage ../applications/misc/orca { - inherit pkg-config; - }; - orca-c = callPackage ../applications/audio/orca-c { }; organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { }; @@ -33963,8 +33608,6 @@ with pkgs; premid = callPackage ../applications/misc/premid { }; - process-cpp = callPackage ../development/libraries/process-cpp { }; - processing = callPackage ../applications/graphics/processing { jdk = jdk17; }; @@ -34084,8 +33727,6 @@ with pkgs; qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { }; - qrcode = callPackage ../tools/graphics/qrcode { }; - qsampler = libsForQt5.callPackage ../applications/audio/qsampler { }; qscreenshot = libsForQt5.callPackage ../applications/graphics/qscreenshot { }; @@ -34289,7 +33930,15 @@ with pkgs; rke = callPackage ../applications/networking/cluster/rke { }; - rke2 = callPackage ../applications/networking/cluster/rke2 { }; + inherit (callPackage ../applications/networking/cluster/rke2 { + buildGoModule = buildGo121Module; + go = go_1_21; + }) rke2_stable; + inherit (callPackage ../applications/networking/cluster/rke2 { + buildGoModule = buildGo122Module; + go = go_1_22; + }) rke2_latest rke2_testing; + rke2 = rke2_stable; rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { }; @@ -34448,8 +34097,6 @@ with pkgs; skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; - slingshot = callPackage ../tools/misc/slingshot { }; slop = callPackage ../tools/misc/slop { }; @@ -34596,8 +34243,6 @@ with pkgs; peru = callPackage ../applications/version-management/peru { }; - petrinizer = haskellPackages.callPackage ../applications/science/logic/petrinizer { }; - pmidi = callPackage ../applications/audio/pmidi { }; printrun = callPackage ../applications/misc/printrun { }; @@ -34677,13 +34322,7 @@ with pkgs; psst = callPackage ../applications/audio/psst { }; - squeezelite = darwin.apple_sdk_11_0.callPackage ../applications/audio/squeezelite { - inherit (darwin.apple_sdk_11_0.frameworks) CoreVideo VideoDecodeAcceleration CoreAudio AudioToolbox AudioUnit Carbon; - }; - - squeezelite-pulse = darwin.apple_sdk_11_0.callPackage ../applications/audio/squeezelite { - inherit (darwin.apple_sdk_11_0.frameworks) CoreVideo VideoDecodeAcceleration CoreAudio AudioToolbox AudioUnit Carbon; - + squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix { audioBackend = "pulse"; }; @@ -34734,8 +34373,6 @@ with pkgs; pythonBindings = true; }; - sublime-music = callPackage ../applications/audio/sublime-music { }; - subtitlr = callPackage ../applications/audio/subtitlr { }; subunit = callPackage ../development/libraries/subunit { }; @@ -34786,8 +34423,6 @@ with pkgs; stc-cli = callPackage ../applications/networking/stc-cli { }; - syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; - syncthingtray = kdePackages.callPackage ../applications/misc/syncthingtray { # renamed in KF5 -> KF6 plasma-framework = kdePackages.libplasma; @@ -34915,9 +34550,9 @@ with pkgs; termimage = callPackage ../tools/graphics/termimage { }; - terminal-notifier = callPackage ../applications/misc/terminal-notifier { }; + terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects ; - textpieces = callPackage ../tools/text/textpieces { }; + terminal-notifier = callPackage ../applications/misc/terminal-notifier { }; textplots = callPackage ../tools/graphics/textplots { }; @@ -35017,7 +34652,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - tipp10 = qt5.callPackage ../applications/misc/tipp10 { }; + tipp10 = qt6.callPackage ../applications/misc/tipp10 { }; tkrev = callPackage ../applications/version-management/tkrev { }; @@ -35084,15 +34719,14 @@ with pkgs; transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { }; - libtransmission = transmission.override { + libtransmission_3 = transmission_3.override { installLib = true; enableDaemon = false; enableCli = false; }; - transmission-gtk = transmission.override { enableGTK3 = true; }; - transmission-qt = transmission.override { enableQt = true; }; - transmission_noSystemd = transmission.override { enableSystemd = false; }; + transmission_3-gtk = transmission_3.override { enableGTK3 = true; }; + transmission_3-qt = transmission_3.override { enableQt = true; }; + transmission_3_noSystemd = transmission_3.override { enableSystemd = false; }; # Needs macOS >= 10.14.6 transmission_4 = darwin.apple_sdk_11_0.callPackage ../applications/networking/p2p/transmission/4.nix { @@ -35135,8 +34769,6 @@ with pkgs; tremc = callPackage ../applications/networking/p2p/tremc { }; - tribler = callPackage ../applications/networking/p2p/tribler { }; - trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { }; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; @@ -35230,8 +34862,6 @@ with pkgs; unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { }; - unipicker = callPackage ../applications/misc/unipicker { }; - unpaper = callPackage ../tools/graphics/unpaper { }; unison-ucm = callPackage ../development/compilers/unison { }; @@ -35317,8 +34947,6 @@ with pkgs; qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { }; - qtile = callPackage ../development/python-modules/qtile/wrapper.nix { }; - vimgolf = callPackage ../games/vimgolf { }; vimpc = callPackage ../applications/audio/vimpc { }; @@ -35328,7 +34956,7 @@ with pkgs; # so expect breakage. use wrapNeovim instead if you want a stable alternative wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); - neovim-unwrapped = callPackage ../applications/editors/neovim { + neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix { CoreServices = darwin.apple_sdk.frameworks.CoreServices; lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1; }; @@ -35340,15 +34968,10 @@ with pkgs; neovim-gtk = callPackage ../applications/editors/neovim/neovim-gtk.nix { }; - neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { }; - neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; - gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim { }; gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; - neovide = callPackage ../applications/editors/neovim/neovide { }; - neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; viw = callPackage ../applications/editors/viw { }; @@ -35368,7 +34991,7 @@ with pkgs; }; virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { - qtermwidget = lxqt.qtermwidget; + qtermwidget = lxqt.qtermwidget_1_4; }; virtscreen = callPackage ../tools/admin/virtscreen { }; @@ -35378,7 +35001,9 @@ with pkgs; virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; - jdk = openjdk17; + + # VirtualBox uses wsimport, which was removed after JDK 8. + jdk = jdk8; }; virtualboxKvm = lowPrio (virtualbox.override { @@ -35585,9 +35210,9 @@ with pkgs; webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; - webcord = callPackage ../applications/networking/instant-messengers/webcord { }; + webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_30; }; - webcord-vencord = callPackage ../applications/networking/instant-messengers/webcord/webcord-vencord { }; + webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_29; }; webex = callPackage ../applications/networking/instant-messengers/webex { }; @@ -35597,9 +35222,7 @@ with pkgs; webssh = with python3Packages; toPythonApplication webssh; - webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { - electron = electron_27; - }; + webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { }; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; @@ -35884,9 +35507,7 @@ with pkgs; xlife = callPackage ../applications/graphics/xlife { }; - xmobar = haskellPackages.xmobar; - - xmonad-log = callPackage ../tools/misc/xmonad-log { }; + xmobar = haskellPackages.xmobar.bin; xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { inherit (haskellPackages) ghcWithPackages; @@ -36017,7 +35638,9 @@ with pkgs; youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light; - youtube-music = callPackage ../applications/audio/youtube-music { }; + youtube-music = callPackage ../applications/audio/youtube-music { + pnpm = pnpm_9; + }; youtube-tui = callPackage ../applications/video/youtube-tui { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; @@ -36095,7 +35718,7 @@ with pkgs; zotero = callPackage ../applications/office/zotero { }; - zotero_7 = callPackage ../applications/office/zotero/zotero_7.nix { }; + zotero_7 = pkgs.zotero-beta; zscroll = callPackage ../applications/misc/zscroll { }; @@ -36353,8 +35976,6 @@ with pkgs; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; - openethereum = callPackage ../applications/blockchains/openethereum { }; - polkadot = callPackage ../applications/blockchains/polkadot { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -36373,9 +35994,14 @@ with pkgs; beancount-black = with python3.pkgs; toPythonApplication beancount-black; + beanhub-cli = with python3.pkgs; toPythonApplication beanhub-cli; + bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; - bench = haskell.lib.compose.justStaticExecutables haskellPackages.bench; + bench = + # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 + (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables) + haskellPackages.bench; cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { }; cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { }; @@ -36432,11 +36058,11 @@ with pkgs; ballerburg = callPackage ../games/ballerburg { } ; - blockattack = callPackage ../games/blockattack { } ; - colobot = callPackage ../games/colobot { }; - corsix-th = callPackage ../games/corsix-th { }; + corsix-th = callPackage ../games/corsix-th { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreVideo; + }; enigma = callPackage ../games/enigma { }; @@ -36476,7 +36102,9 @@ with pkgs; keeperrl = callPackage ../games/keeperrl { }; - shipwright = callPackage ../games/shipwright { }; + shipwright = callPackage ../games/shipwright { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; wipeout-rewrite = callPackage ../games/wipeout-rewrite { inherit (darwin.apple_sdk.frameworks) Foundation; @@ -36610,8 +36238,6 @@ with pkgs; abuse = callPackage ../games/abuse { }; - adom = callPackage ../games/adom { }; - airshipper = callPackage ../games/airshipper { }; airstrike = callPackage ../games/airstrike { }; @@ -36684,10 +36310,9 @@ with pkgs; bsdgames = callPackage ../games/bsdgames { }; - btanks = callPackage ../games/btanks { }; - bugdom = callPackage ../games/bugdom { - inherit (darwin.apple_sdk.frameworks) IOKit Foundation; + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL; }; bzflag = callPackage ../games/bzflag { @@ -37192,8 +36817,6 @@ with pkgs; oilrush = callPackage ../games/oilrush { }; - onscripter-en = callPackage ../games/onscripter-en { }; - openarena = callPackage ../games/openarena { }; opendungeons = callPackage ../games/opendungeons { }; @@ -37522,8 +37145,8 @@ with pkgs; tcl2048 = callPackage ../games/tcl2048 { }; - the-powder-toy = callPackage ../games/the-powder-toy { - lua = lua5_1; + the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix { + lua = lua5_2; inherit (darwin.apple_sdk.frameworks) Cocoa; }; @@ -37633,8 +37256,6 @@ with pkgs; vitetris = callPackage ../games/vitetris { }; - vms-empire = callPackage ../games/vms-empire { }; - voxelands = callPackage ../games/voxelands { }; vvvvvv = callPackage ../by-name/vv/vvvvvv/package.nix { @@ -37795,7 +37416,11 @@ with pkgs; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); - expidus = recurseIntoAttrs (callPackage ../desktops/expidus {}); + expidus = recurseIntoAttrs (callPackages ../desktops/expidus { + # Use the Nix built Flutter Engine for testing. + # Also needed when we eventually package Genesis Shell. + flutterPackages = flutterPackages-source; + }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); @@ -37810,6 +37435,7 @@ with pkgs; gnome43Extensions gnome44Extensions gnome45Extensions + gnome46Extensions ; gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; @@ -37854,8 +37480,6 @@ with pkgs; pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); - pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; - wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; rox-filer = callPackage ../desktops/rox/rox-filer { @@ -37912,6 +37536,8 @@ with pkgs; marvin = callPackage ../applications/science/chemistry/marvin { }; + molbar = with python3Packages; toPythonApplication molbar; + molden = callPackage ../applications/science/chemistry/molden { }; mopac = callPackage ../applications/science/chemistry/mopac { }; @@ -38106,7 +37732,7 @@ with pkgs; minia = callPackage ../applications/science/biology/minia { }; - mirtk = callPackage ../development/libraries/science/biology/mirtk { }; + mirtk = callPackage ../development/libraries/science/biology/mirtk { itk = itk_5_2; }; muscle = callPackage ../applications/science/biology/muscle { }; @@ -38204,8 +37830,6 @@ with pkgs; seaview = callPackage ../applications/science/biology/seaview { }; - SPAdes = callPackage ../applications/science/biology/spades { }; - svaba = callPackage ../applications/science/biology/svaba { }; tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; @@ -38397,6 +38021,8 @@ with pkgs; version = "11"; }; + mathmod = libsForQt5.callPackage ../applications/science/math/mathmod { }; + metis = callPackage ../development/libraries/science/math/metis { }; nauty = callPackage ../applications/science/math/nauty { }; @@ -38404,6 +38030,7 @@ with pkgs; osi = callPackage ../development/libraries/science/math/osi { }; or-tools = callPackage ../development/libraries/science/math/or-tools { + inherit (darwin) DarwinTools; stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; python = python3; protobuf = protobuf_21; @@ -39331,11 +38958,7 @@ with pkgs; epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { }; - foomatic-db = callPackage ../misc/cups/drivers/foomatic-db { }; - foomatic-db-engine = callPackage ../misc/cups/drivers/foomatic-db-engine { }; - foomatic-db-nonfree = callPackage ../misc/cups/drivers/foomatic-db-nonfree { }; - foomatic-db-ppds = callPackage ../misc/cups/drivers/foomatic-db-ppds { }; - foomatic-db-ppds-withNonfreeDb = callPackage ../misc/cups/drivers/foomatic-db-ppds { withNonfreeDb = true; }; + foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; }; gutenprint = callPackage ../misc/drivers/gutenprint { }; @@ -39524,8 +39147,6 @@ with pkgs; velero = callPackage ../applications/networking/cluster/velero { }; - HentaiAtHome = callPackage ../applications/misc/HentaiAtHome { }; - hplip = callPackage ../misc/drivers/hplip { }; hplipWithPlugin = hplip.override { withPlugin = true; }; @@ -39623,8 +39244,6 @@ with pkgs; fmt = fmt_8; }; - kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; - # In general we only want keep the last three minor versions around that # correspond to the last three supported kubernetes versions: # https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions @@ -39634,8 +39253,9 @@ with pkgs; kops_1_26 kops_1_27 kops_1_28 + kops_1_29 ; - kops = kops_1_28; + kops = kops_1_29; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -39712,6 +39332,16 @@ with pkgs; nixStatic = pkgsStatic.nix; + lixVersions = recurseIntoAttrs (callPackage ../tools/package-management/lix { + storeDir = config.nix.storeDir or "/nix/store"; + stateDir = config.nix.stateDir or "/nix/var"; + inherit (darwin.apple_sdk.frameworks) Security; + }); + + lix = lixVersions.stable; + + lixStatic = pkgsStatic.lix; + inherit (callPackages ../applications/networking/cluster/nixops { }) nixops_unstable_minimal @@ -39825,7 +39455,7 @@ with pkgs; dnadd = callPackage ../tools/nix/dnadd { }; nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { - nix = nixVersions.nix_2_21; + nix = nixVersions.nix_2_22; }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -39884,12 +39514,8 @@ with pkgs; nix-script = callPackage ../tools/nix/nix-script { }; - nix-top = callPackage ../tools/package-management/nix-top { }; - nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree); - nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { }; - nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; nix-serve = callPackage ../tools/package-management/nix-serve { }; @@ -39970,7 +39596,6 @@ with pkgs; }; mysql = mysql; pcre = pcre-cpp; - jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); r128gain = callPackage ../applications/audio/r128gain { }; @@ -39993,8 +39618,6 @@ with pkgs; sndio = callPackage ../misc/sndio { }; - SP800-90B_EntropyAssessment = callPackage ../tools/misc/SP800-90B_EntropyAssessment { }; - sticky = callPackage ../applications/misc/sticky { }; stork = darwin.apple_sdk_11_0.callPackage ../applications/misc/stork { @@ -40083,7 +39706,7 @@ with pkgs; rfc-bibtex = callPackage ../tools/typesetting/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { - inherit glib gtk3 gobject-introspection wrapGAppsHook; + inherit glib gtk3 gobject-introspection wrapGAppsHook3; }; rpl = callPackage ../tools/text/rpl { }; @@ -40094,8 +39717,6 @@ with pkgs; roadrunner = callPackage ../servers/roadrunner { }; - rmfakecloud = callPackage ../servers/rmfakecloud { }; - rmfuse = callPackage ../tools/filesystems/rmfuse { }; rmount = callPackage ../tools/filesystems/rmount { }; @@ -40152,8 +39773,6 @@ with pkgs; canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { }; - hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { }; - mfc465cncupswrapper = callPackage ../misc/cups/drivers/brother/mfc465cncupswrapper { }; mfc465cnlpr = callPackage ../misc/cups/drivers/brother/mfc465cnlpr { }; @@ -40355,8 +39974,6 @@ with pkgs; ssh-tools = callPackage ../applications/misc/ssh-tools { }; - auto-cpufreq = callPackage ../tools/system/auto-cpufreq { }; - thermald = callPackage ../tools/system/thermald { }; therion = callPackage ../applications/misc/therion { }; @@ -40383,8 +40000,6 @@ with pkgs; twitch-cli = callPackage ../development/tools/twitch-cli { }; - twiggy = callPackage ../development/tools/twiggy { }; - uacme = callPackage ../tools/admin/uacme { }; ufiformat = callPackage ../tools/system/ufiformat { }; @@ -40430,7 +40045,7 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - veilid = callPackage ../tools/networking/veilid { + veilid = darwin.apple_sdk_11_0.callPackage ../tools/networking/veilid { inherit (darwin.apple_sdk.frameworks) AppKit Security; }; @@ -40524,6 +40139,15 @@ with pkgs; winePackagesFor = wineBuild: lib.makeExtensible (self: with self; { callPackage = newScope self; + stdenv = + if pkgs.stdenv.isDarwin then + # Match upstream, which builds with the latest SDK and a 10.7 deployment target. + overrideSDK pkgs.stdenv { + darwinMinVersion = "10.7"; + darwinSdkVersion = "11.0"; + } + else + pkgs.stdenv; inherit wineBuild; @@ -40553,8 +40177,6 @@ with pkgs; with-shell = callPackage ../applications/misc/with-shell { }; - wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer { }; - wmutils-core = callPackage ../tools/X11/wmutils-core { }; wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; @@ -40801,7 +40423,7 @@ with pkgs; nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; - nitrokey-app2 = callPackage ../tools/security/nitrokey-app2 { }; + nitrokey-app2 = qt6Packages.callPackage ../tools/security/nitrokey-app2 { }; fpm2 = callPackage ../tools/security/fpm2 { }; @@ -40904,16 +40526,10 @@ with pkgs; } ../os-specific/bsd/setup-hook.sh; freebsd = callPackage ../os-specific/bsd/freebsd { }; - freebsdCross = callPackage ../os-specific/bsd/freebsd { - stdenv = crossLibcStdenv; - }; netbsd = callPackage ../os-specific/bsd/netbsd { }; - netbsdCross = callPackage ../os-specific/bsd/netbsd { - stdenv = crossLibcStdenv; - }; - yrd = callPackage ../tools/networking/yrd { }; + openbsd = callPackage ../os-specific/bsd/openbsd { }; powershell = callPackage ../shells/powershell { }; @@ -40998,8 +40614,6 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { }; - yor = callPackage ../applications/networking/cluster/yor { }; wifi-password = callPackage ../os-specific/darwin/wifi-password { }; @@ -41061,8 +40675,6 @@ with pkgs; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; - navidrome = callPackage ../servers/misc/navidrome { }; - zalgo = callPackage ../tools/misc/zalgo { }; inherit (callPackage ../applications/misc/zettlr { }) zettlr; @@ -41073,8 +40685,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - treefmt = callPackage ../development/tools/treefmt { }; - nufmt = callPackage ../development/tools/nufmt { }; bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; @@ -41195,8 +40805,6 @@ with pkgs; dict-cc-py = callPackage ../applications/misc/dict-cc-py { }; - sirikali = libsForQt5.callPackage ../tools/security/sirikali { }; - wpm = callPackage ../applications/misc/wpm { }; weggli = callPackage ../tools/security/weggli { }; @@ -41212,4 +40820,8 @@ with pkgs; insulator2 = callPackage ../applications/misc/insulator2 {}; animdl = python3Packages.callPackage ../applications/video/animdl { }; + + dillo = callPackage ../by-name/di/dillo/package.nix { + fltk = fltk13; + }; } diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 24b162ec577ff..45900c8b06e2a 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -12,18 +12,6 @@ let self = beam; - # Aliases added 2023-03-21 - versionLoop = f: lib.lists.foldr (version: acc: (f version) // acc) { } [ "26" "25" "24" ]; - - interpretersAliases = versionLoop (version: { - "erlangR${version}" = self.interpreters."erlang_${version}"; - "erlangR${version}_odbc" = self.interpreters."erlang_${version}_odbc"; - "erlangR${version}_javac" = self.interpreters."erlang_${version}_javac"; - "erlangR${version}_odbc_javac" = self.interpreters."erlang_${version}_odbc_javac"; - }); - - packagesAliases = versionLoop (version: { "erlangR${version}" = self.packages."erlang_${version}"; }); - in { @@ -35,13 +23,10 @@ in interpreters = { erlang = self.interpreters.${self.latestVersion}; - erlang_odbc = self.interpreters."${self.latestVersion}_odbc"; - erlang_javac = self.interpreters."${self.latestVersion}_javac"; - erlang_odbc_javac = self.interpreters."${self.latestVersion}_odbc_javac"; # Standard Erlang versions, using the generic builder. - erlang_27-rc3 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc3.nix { + erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix { wxGTK = wxGTK32; parallelBuild = true; autoconf = buildPackages.autoconf269; @@ -56,12 +41,6 @@ in autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlang_26_odbc = self.interpreters.erlang_26.override { odbcSupport = true; }; - erlang_26_javac = self.interpreters.erlang_26.override { javacSupport = true; }; - erlang_26_odbc_javac = self.interpreters.erlang_26.override { - javacSupport = true; - odbcSupport = true; - }; erlang_25 = self.beamLib.callErlang ../development/interpreters/erlang/25.nix { wxGTK = wxGTK32; @@ -69,12 +48,6 @@ in autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlang_25_odbc = self.interpreters.erlang_25.override { odbcSupport = true; }; - erlang_25_javac = self.interpreters.erlang_25.override { javacSupport = true; }; - erlang_25_odbc_javac = self.interpreters.erlang_25.override { - javacSupport = true; - odbcSupport = true; - }; erlang_24 = self.beamLib.callErlang ../development/interpreters/erlang/24.nix { wxGTK = wxGTK32; @@ -83,19 +56,13 @@ in autoconf = buildPackages.autoconf269; inherit wxSupport systemdSupport; }; - erlang_24_odbc = self.interpreters.erlang_24.override { odbcSupport = true; }; - erlang_24_javac = self.interpreters.erlang_24.override { javacSupport = true; }; - erlang_24_odbc_javac = self.interpreters.erlang_24.override { - javacSupport = true; - odbcSupport = true; - }; # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlang_24.elixir`. inherit (self.packages.erlang) - elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls lfe lfe_2_1; - } // interpretersAliases; + elixir elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir-ls lfe lfe_2_1; + }; # Helper function to generate package set with a specific Erlang version. packagesWith = erlang: @@ -105,11 +72,11 @@ in # appropriate Erlang/OTP version. packages = { erlang = self.packages.${self.latestVersion}; - + erlang_27 = self.packagesWith self.interpreters.erlang_27; erlang_26 = self.packagesWith self.interpreters.erlang_26; erlang_25 = self.packagesWith self.interpreters.erlang_25; erlang_24 = self.packagesWith self.interpreters.erlang_24; - } // packagesAliases; + }; __attrsFailEvaluation = true; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 1964f666a86ba..5cea3d663b421 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -117,6 +117,7 @@ let simple-io = callPackage ../development/coq-modules/simple-io { }; smpl = callPackage ../development/coq-modules/smpl { }; smtcoq = callPackage ../development/coq-modules/smtcoq { }; + ssprove = callPackage ../development/coq-modules/ssprove {}; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; tlc = callPackage ../development/coq-modules/tlc {}; @@ -135,7 +136,7 @@ let (lib.versionAtLeast self.coq.version "8.14") { compcert = self.compcert.override { version = with lib.versions; lib.switch self.coq.version [ - { case = range "8.15" "8.17"; out = "3.13.1"; } + { case = range "8.15" "8.19"; out = "3.13.1"; } { case = isEq "8.14"; out = "3.11"; } ] null; }; diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index d43f0502064e8..c9799351f4e6c 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -54,4 +54,13 @@ mapAliases ({ ### I ### insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 + + ### L ### + + libauto = throw "'darwin.libauto' has been removed, as it was broken and unmaintained"; # added 2024-05-10 + libiconv = pkgs.libiconv; # 2024-03-27 + + ### O ### + + opencflite = pkgs.opencflite; # added 2024-05-02 }) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index eef19ac6ef725..cca74e047dbdd 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -172,9 +172,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { inherit (apple_sdk_11_0.libs) simd; }; - openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith { - inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers; - }; + openwith = callPackage ../os-specific/darwin/openwith { }; stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index b9e30abb645f7..b6dc7bf5300db 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -154,7 +154,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { buildInputs = [ pkgs.gtk-sharp-2_0 ]; meta = { - description = "A generic framework for creating extensible applications"; + description = "Generic framework for creating extensible applications"; homepage = "https://www.mono-project.com/Mono.Addins"; longDescription = '' A generic framework for creating extensible applications, diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ec050d7431780..b924a29f26162 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -360,6 +360,32 @@ in { llvmPackages = pkgs.llvmPackages_15; }; ghc98 = compiler.ghc982; + ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix { + bootPkgs = + # For GHC 9.6 no armv7l bindists are available. + if stdenv.hostPlatform.isAarch32 then + packages.ghc963 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc963 + else if stdenv.hostPlatform.isDarwin then + # it seems like the GHC 9.6.* bindists are built with a different + # toolchain than we are using (which I'm guessing from the fact + # that 9.6.4 bindists pass linker flags our ld doesn't support). + # With both 9.6.3 and 9.6.4 binary it is impossible to link against + # the clock package (probably a hsc2hs problem). + packages.ghc963 + else + packages.ghc963Binary; + inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; + # 2023-01-15: Support range >= 11 && < 16 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; + llvmPackages = pkgs.llvmPackages_15; + }; + ghc910 = compiler.ghc9101; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. @@ -525,6 +551,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; }; ghc98 = packages.ghc982; + ghc9101 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc9101; + ghc = bh.compiler.ghc9101; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { }; + }; + ghc910 = packages.ghc9101; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; @@ -536,7 +568,7 @@ in { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs810; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs-8.x.nix { }; }; # The integer-simple attribute set contains package sets for all the GHC compilers diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index c9c8fe3b6a671..d82b6d150a8bc 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -61,6 +61,8 @@ let controller-topology-project = callPackage ../applications/video/kodi/addons/controller-topology-project { }; + formula1 = callPackage ../applications/video/kodi/addons/formula1 { }; + iagl = callPackage ../applications/video/kodi/addons/iagl { }; invidious = callPackage ../applications/video/kodi/addons/invidious { }; @@ -97,6 +99,10 @@ let radioparadise = callPackage ../applications/video/kodi/addons/radioparadise { }; + raiplay = callPackage ../applications/video/kodi/addons/raiplay { }; + + skyvideoitalia = callPackage ../applications/video/kodi/addons/skyvideoitalia { }; + svtplay = callPackage ../applications/video/kodi/addons/svtplay { }; steam-controller = callPackage ../applications/video/kodi/addons/steam-controller { }; @@ -119,6 +125,8 @@ let osmc-skin = callPackage ../applications/video/kodi/addons/osmc-skin { }; + upnext = callPackage ../applications/video/kodi/addons/upnext { }; + vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { }; vfs-rar = callPackage ../applications/video/kodi/addons/vfs-rar { }; @@ -175,6 +183,8 @@ let myconnpy = callPackage ../applications/video/kodi/addons/myconnpy { }; + plugin-cache = callPackage ../applications/video/kodi/addons/plugin-cache { }; + requests = callPackage ../applications/video/kodi/addons/requests { }; requests-cache = callPackage ../applications/video/kodi/addons/requests-cache { }; @@ -185,6 +195,8 @@ let signals = callPackage ../applications/video/kodi/addons/signals { }; + simplecache = callPackage ../applications/video/kodi/addons/simplecache { }; + simplejson = callPackage ../applications/video/kodi/addons/simplejson { }; six = callPackage ../applications/video/kodi/addons/six { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 91a8c2f539267..cf4d860a82326 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -40,6 +40,7 @@ let }; argsOverride = { inherit version; + pname = "linux-hardened"; modDirVersion = modDirVersion' + kernelPatches.hardened.${kernel.meta.branch}.extra; src = fetchurl { url = "mirror://kernel/linux/kernel/v${major}.x/linux-${version}.tar.xz"; @@ -193,6 +194,17 @@ in { kernelPatches.rust_1_75 kernelPatches.rust_1_76 kernelPatches.rust_1_77-6_8 + kernelPatches.rust_1_78 + ]; + }; + + linux_6_9 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.9"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.rust_1_77-6_9 + kernelPatches.rust_1_78 ]; }; @@ -204,7 +216,6 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.rust_1_77-6_9 ]; }; latest = packageAliases.linux_latest.kernel; @@ -260,6 +271,8 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; + linux_6_8_hardened = hardenedKernelFor kernels.linux_6_8 { }; + linux_6_9_hardened = hardenedKernelFor kernels.linux_6_9 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -305,8 +318,6 @@ in { akvcam = callPackage ../os-specific/linux/akvcam { }; - amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; - apfs = callPackage ../os-specific/linux/apfs { }; ax99100 = callPackage ../os-specific/linux/ax99100 {}; @@ -406,6 +417,7 @@ in { nvidia_x11_legacy340 = nvidiaPackages.legacy_340; nvidia_x11_legacy390 = nvidiaPackages.legacy_390; nvidia_x11_legacy470 = nvidiaPackages.legacy_470; + nvidia_x11_legacy535 = nvidiaPackages.legacy_535; nvidia_x11_production = nvidiaPackages.production; nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; nvidia_dc = nvidiaPackages.dc; @@ -538,7 +550,7 @@ in { virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - vm-tools = callPackage ../os-specific/linux/vm-tools { }; + mm-tools = callPackage ../os-specific/linux/mm-tools { }; vmm_clock = callPackage ../os-specific/linux/vmm_clock { }; @@ -578,6 +590,8 @@ in { hid-ite8291r3 = callPackage ../os-specific/linux/hid-ite8291r3 { }; + hid-t150 = callPackage ../os-specific/linux/hid-t150 { }; + hid-tmff2 = callPackage ../os-specific/linux/hid-tmff2 { }; drbd = callPackage ../os-specific/linux/drbd/driver.nix { }; @@ -587,7 +601,9 @@ in { hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14 rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14 + vm-tools = self.mm-tools; xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18"; + amdgpu-pro = throw "amdgpu-pro was removed due to lack of maintenance"; # Added 2024-06-16 }); hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides); @@ -601,6 +617,7 @@ in { linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_8 = recurseIntoAttrs (packagesFor kernels.linux_6_8); + linux_6_9 = recurseIntoAttrs (packagesFor kernels.linux_6_9); __attrsFailEvaluation = true; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 @@ -646,6 +663,8 @@ in { linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened); + linux_6_8_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_8_hardened); + linux_6_9_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_9_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); @@ -668,9 +687,9 @@ in { packageAliases = { linux_default = packages.linux_6_6; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_8; + linux_latest = packages.linux_6_9; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; - linux_rt_default = packages.linux_rt_5_4; + linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; } // { __attrsFailEvaluation = true; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 0fadeba75fd0f..e39b990ecae10 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -42,7 +42,7 @@ rec { getLuaCPath = drv: getPath drv luaLib.luaCPathList; inherit (callPackage ../development/interpreters/lua-5/hooks { }) - luarocksMoveDataFolder luarocksCheckHook lua-setup-hook; + luarocksMoveDataFolder luarocksCheckHook; inherit lua; inherit buildLuaPackage buildLuarocksPackage buildLuaApplication; @@ -54,7 +54,7 @@ rec { inherit (pkgs.buildPackages) makeSetupHook makeWrapper; }; - luarocks = toLuaModule (callPackage ../development/tools/misc/luarocks/default.nix { }); + luarocks_bootstrap = toLuaModule (callPackage ../development/tools/misc/luarocks/default.nix { }); # a fork of luarocks used to generate nix lua derivations from rockspecs luarocks-nix = toLuaModule (callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { }); @@ -197,7 +197,7 @@ rec { ''; meta = with lib; { - description = "A modular widget library for the awesome window manager"; + description = "Modular widget library for the awesome window manager"; homepage = "https://vicious.rtfd.io"; changelog = "https://vicious.rtfd.io/en/v${version}/changelog.html"; license = licenses.gpl2Plus; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 78b90082547be..2fb6e97a711e6 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -55,6 +55,8 @@ pkgs.releaseTools.sourceTarball { echo "file json-br $packages" >> $out/nix-support/hydra-build-products ''; + # --hard-dereference: reproducibility for src if auto-optimise-store = true + # Some context: https://github.com/NixOS/infra/issues/438 distPhase = '' mkdir -p $out/tarballs XZ_OPT="-T0" tar \ @@ -71,6 +73,7 @@ pkgs.releaseTools.sourceTarball { --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --mode=ug+w \ + --hard-dereference \ $src $(pwd)/{.version-suffix,.git-revision} ''; } diff --git a/pkgs/top-level/nim-overrides.nix b/pkgs/top-level/nim-overrides.nix index 34db79a6a4ead..61717562e89e8 100644 --- a/pkgs/top-level/nim-overrides.nix +++ b/pkgs/top-level/nim-overrides.nix @@ -11,22 +11,21 @@ , xorg }: -# The following is list of overrides that take three arguments each: +# The following is list of overrides that take two arguments each: # - lockAttrs: - an attrset from a Nim lockfile, use this for making constraints on the locked library -# - finalAttrs: - final arguments to the depender package # - prevAttrs: - preceding arguments to the depender package { - jester = lockAttrs: finalAttrs: + jester = lockAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ [ openssl ]; }; - hts = lockAttrs: finalAttrs: + hts = lockAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ [ htslib ]; }; - getdns = lockAttrs: finalAttrs: + getdns = lockAttrs: { nativeBuildInputs ? [ ], buildInputs ? [ ], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ pkg-config ]; buildInputs = buildInputs ++ [ getdns ]; @@ -38,35 +37,35 @@ "the selected version of the hashlib Nim library is hardware specific" # https://github.com/khchen/hashlib/pull/4 # remove when fixed upstream - (_: _: { }); + (_: { }); - nimraylib_now = lockAttrs: finalAttrs: + nimraylib_now = lockAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ [ raylib ]; }; - sass = lockAttrs: finalAttrs: + sass = lockAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ [ libsass ]; }; - sdl2 = lockAttrs: finalAttrs: + sdl2 = lockAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ [ SDL2 ]; }; - tkrzw = lockAttrs: finalAttrs: + tkrzw = lockAttrs: { nativeBuildInputs ? [ ], buildInputs ? [ ], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ pkg-config ]; buildInputs = buildInputs ++ [ tkrzw ]; }; - x11 = lockAttrs: finalAttrs: + x11 = lockAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ (with xorg; [ libX11 libXft libXinerama ]); }; - zippy = lockAttrs: finalAttrs: + zippy = lockAttrs: { nimFlags ? [ ], ... }: { nimFlags = nimFlags ++ lib.optionals stdenv.hostPlatform.isx86_64 [ "--passC:-msse4.1" diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix index ea18890903281..8d746001c5d64 100644 --- a/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -12,7 +12,7 @@ pkgs.runCommand "nixpkgs-release-checks" export NIX_STORE_DIR=$TMPDIR/store export NIX_STATE_DIR=$TMPDIR/state export NIX_PATH=nixpkgs=$TMPDIR/barf.nix - opts=(--option build-users-group "") + opts=() nix-store --init echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8a7ad8a70aeb3..46866fd883610 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -119,6 +119,8 @@ let bwd = callPackage ../development/ocaml-modules/bwd { }; + bytestring = callPackage ../development/ocaml-modules/bytestring { }; + bz2 = callPackage ../development/ocaml-modules/bz2 { }; ### C ### @@ -231,6 +233,8 @@ let color = callPackage ../development/ocaml-modules/color { }; + colors = callPackage ../development/ocaml-modules/colors { }; + conduit = callPackage ../development/ocaml-modules/conduit { }; conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; @@ -241,6 +245,8 @@ let conduit-mirage = callPackage ../development/ocaml-modules/conduit/mirage.nix { }; + config = callPackage ../development/ocaml-modules/config { }; + config-file = callPackage ../development/ocaml-modules/config-file { }; containers = callPackage ../development/ocaml-modules/containers { }; @@ -474,6 +480,8 @@ let ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { }; + ezjsonm-encoding = callPackage ../development/ocaml-modules/ezjsonm-encoding { }; + ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { }; ### F ### @@ -566,7 +574,8 @@ let gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; - gd4o = callPackage ../development/ocaml-modules/gd4o { }; + gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; + gd = callPackage ../development/ocaml-modules/gd { inherit (pkgs) gd; }; gen = callPackage ../development/ocaml-modules/gen { }; @@ -599,6 +608,8 @@ let github-jsoo = callPackage ../development/ocaml-modules/github/jsoo.nix { }; github-unix = callPackage ../development/ocaml-modules/github/unix.nix { }; + gluon = callPackage ../development/ocaml-modules/gluon { }; + gluten = callPackage ../development/ocaml-modules/gluten { }; gluten-eio = callPackage ../development/ocaml-modules/gluten/eio.nix { }; gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { }; @@ -949,6 +960,8 @@ let letsencrypt-mirage = callPackage ../development/ocaml-modules/letsencrypt/mirage.nix { }; + libc = callPackage ../development/ocaml-modules/libc { }; + lilv = callPackage ../development/ocaml-modules/lilv { inherit (pkgs) lilv; }; @@ -1037,6 +1050,8 @@ let mec = callPackage ../development/ocaml-modules/mec { }; + memprof-limits = callPackage ../development/ocaml-modules/memprof-limits { }; + memtrace = callPackage ../development/ocaml-modules/memtrace { }; menhir = callPackage ../development/ocaml-modules/menhir { }; @@ -1292,6 +1307,7 @@ let ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; }; ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; }; + ocamlformat_0_26_2 = ocamlformat.override { version = "0.26.2"; }; ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; @@ -1632,6 +1648,8 @@ let ringo = callPackage ../development/ocaml-modules/ringo { }; + rio = callPackage ../development/ocaml-modules/rio { }; + riot = callPackage ../development/ocaml-modules/riot { }; rock = callPackage ../development/ocaml-modules/rock { }; @@ -1710,6 +1728,8 @@ let spelll = callPackage ../development/ocaml-modules/spelll { }; + spices = callPackage ../development/ocaml-modules/spices { }; + srt = callPackage ../development/ocaml-modules/srt { inherit (pkgs) srt; }; @@ -2010,7 +2030,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_5_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.2.nix { }); - ocamlPackages_latest = ocamlPackages_5_1; + ocamlPackages_latest = ocamlPackages_5_2; ocamlPackages = ocamlPackages_5_1; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index cd148cd6df10e..bd88c98df9604 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -18,8 +18,6 @@ nodePackages nodePackages_latest platformioPackages - quicklispPackagesClisp - quicklispPackagesSBCL rPackages roundcubePlugins sourceHanPackages diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a247be4c7d330..45e3ec186596b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -110,7 +110,7 @@ with self; { doCheck = false; meta = { - description = "A grep-like tool tailored to working with large trees of source code"; + description = "Grep-like tool tailored to working with large trees of source code"; homepage = "https://beyondgrep.com"; license = with lib.licenses; [ artistic2 ]; }; @@ -183,7 +183,7 @@ with self; { hash = "sha256-qvSEZ3Zd7qbkgFS8fUPkbk1Ay82hZVLGKdN74Jgokwk="; }; meta = { - description = "A module for merging hierarchies using the C3 algorithm"; + description = "Module for merging hierarchies using the C3 algorithm"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -256,7 +256,7 @@ with self; { buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ AlienBuild ArchiveExtract CaptureTiny Filechdir PathTiny ShellConfigGenerate ShellGuess SortVersions URI ]; meta = { - description = "A Module::Build subclass for building Alien:: modules and their libraries"; + description = "Module::Build subclass for building Alien:: modules and their libraries"; homepage = "https://metacpan.org/pod/Alien::Base::ModuleBuild"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -505,7 +505,7 @@ with self; { }; buildInputs = [ CanaryStability ]; meta = { - description = "The DBI of event loop programming"; + description = "DBI of event loop programming"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -586,10 +586,10 @@ with self; { AnyEventI3 = buildPerlPackage { pname = "AnyEvent-I3"; - version = "0.17"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.17.tar.gz"; - hash = "sha256-U4LJhMnxODlfKfDACvgaoMj0t2VYIFXHPt5LE/BKbWM="; + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.19.tar.gz"; + hash = "sha256-G807YNs9VWAUjeeRNT6K8RciZPWoXncZe5/8BB2sSDo="; }; propagatedBuildInputs = [ AnyEvent JSONXS ]; meta = { @@ -607,7 +607,7 @@ with self; { }; propagatedBuildInputs = [ AnyEvent ObjectEvent commonsense ]; meta = { - description = "An event based IRC protocol client API"; + description = "Event based IRC protocol client API"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -622,7 +622,7 @@ with self; { buildInputs = [ FileShareDirInstall TestException ]; propagatedBuildInputs = [ AnyEvent DevelGlobalDestruction FileShareDir ListMoreUtils NetAMQP Readonly namespaceclean ]; meta = { - description = "An asynchronous and multi channel Perl AMQP client"; + description = "Asynchronous and multi channel Perl AMQP client"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -729,7 +729,7 @@ with self; { }; buildInputs = [ TestDeep TestException ]; meta = { - description = "A persistence framework for session data"; + description = "Persistence framework for session data"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -815,7 +815,7 @@ with self; { }; buildInputs = [ TestPod ]; meta = { - description = "A bundle of Perl5 modules for reading configuration files and parsing command line arguments"; + description = "Bundle of Perl5 modules for reading configuration files and parsing command line arguments"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -872,7 +872,7 @@ with self; { shortenPerlShebang $out/bin/cpm ''; meta = { - description = "A fast CPAN module installer"; + description = "Fast CPAN module installer"; homepage = "https://github.com/skaji/cpm"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; @@ -918,7 +918,7 @@ with self; { rm $out/bin/wxchordpro # Wx not supported on darwin ''; meta = { - description = "A lyrics and chords formatting program"; + description = "Lyrics and chords formatting program"; homepage = "https://www.chordpro.org"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "chordpro"; @@ -938,6 +938,23 @@ with self; { }; }; + Apppapersway = buildPerlPackage rec { + pname = "App-papersway"; + version = "1.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SP/SPWHITTON/App-papersway-${version}.tar.gz"; + hash = "sha256-61OMfvEhgwFbNlOFjm9p3QxDOn31jQZdN8i1nIsWlns="; + }; + buildInputs = [ AnyEvent AnyEventI3 GetoptLong JSON ]; + meta = { + description = "PaperWM-like scrollable tiling window management for Sway/i3wm"; + homepage = "https://spwhitton.name/tech/code/papersway/"; + license = lib.licenses.gpl3Plus; + mainProgram = "papersway"; + maintainers = with lib.maintainers; [ fgaz ]; + }; + }; + Appperlbrew = buildPerlModule { pname = "App-perlbrew"; version = "0.98"; @@ -1059,7 +1076,7 @@ with self; { propagatedBuildInputs = [ ArchiveLibarchive Filechdir PathTiny RefUtil ]; meta = { homepage = "https://metacpan.org/pod/Archive::Libarchive::Extract"; - description = "An archive extracting mechanism (using libarchive)"; + description = "Archive extracting mechanism (using libarchive)"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ tomasajt ]; }; @@ -1123,7 +1140,7 @@ with self; { buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { - description = "A Simple limitable FIFO array, with sum and average methods"; + description = "Simple limitable FIFO array, with sum and average methods"; homepage = "https://github.com/dwburke/perl-Array-FIFO"; license = with lib.licenses; [ artistic2 ]; }; @@ -1476,7 +1493,7 @@ with self; { buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ UnicodeStringprep ]; meta = { - description = "A Stringprep Profile for User Names and Passwords (RFC 4013)"; + description = "Stringprep Profile for User Names and Passwords (RFC 4013)"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; @@ -2089,7 +2106,7 @@ with self; { hash = "sha256-A9lntfgoRpCRN9WrmYSsVwrBCkQB4MYC89IgjEZayYI="; }; meta = { - description = "A tiny Perl extension to generate cryptographically-secure random bytes"; + description = "Tiny Perl extension to generate cryptographically-secure random bytes"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; @@ -2105,7 +2122,7 @@ with self; { propagatedBuildInputs = [ DigestSHA1 Error IPCShareLite ]; doCheck = false; # randomly fails meta = { - description = "The Cache Interface"; + description = "Cache Interface"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2192,7 +2209,7 @@ with self; { hash = "sha256-Tni35N0jG1VxpIzQ7htjlT9eNHkMnQIOFZWnx9Crvkk="; }; meta = { - description = "A lightweight cache with timed expiration"; + description = "Lightweight cache with timed expiration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2293,7 +2310,7 @@ with self; { }; propagatedBuildInputs = [ HTMLTiny LWP ]; meta = { - description = "A Perl implementation of the reCAPTCHA API"; + description = "Perl implementation of the reCAPTCHA API"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2564,7 +2581,7 @@ with self; { hash = "sha256-s54zllkDwAWD4BgOPdUopUkg9SB83wUmBcoTgoz6wTw="; }; meta = { - description = "The Catalyst developer's manual"; + description = "Catalyst developer's manual"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -2594,7 +2611,7 @@ with self; { buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; meta = { - description = "The Catalyst Framework Runtime"; + description = "Catalyst Framework Runtime"; homepage = "http://dev.catalyst.perl.org"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "catalyst.pl"; @@ -2771,7 +2788,7 @@ with self; { buildInputs = [ HTTPMessage Plack SubOverride TestDeep ]; propagatedBuildInputs = [ CatalystRuntime Moose PrometheusTiny PrometheusTinyShared ]; meta = { - description = "A tiny Prometheus client"; + description = "Tiny Prometheus client"; homepage = "https://github.com/robn/Prometheus-Tiny"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -2930,7 +2947,7 @@ with self; { }; buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ]; meta = { - description = "A view module to help in the convenience of downloading data into many supportable formats"; + description = "View module to help in the convenience of downloading data into many supportable formats"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3051,7 +3068,7 @@ with self; { propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate UUIDTiny YAMLLibYAML namespaceclean ]; buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; meta = { - description = "A data toolkit"; + description = "Data toolkit"; homepage = "https://github.com/LibreCat/Catmandu"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "catmandu"; @@ -3201,7 +3218,7 @@ with self; { hash = "sha256-uU1QghsCYR2m7lQjGTFFB4xNuygvKxYqSw1YCUmXvEc="; }; meta = { - description = "A lightweight CGI form processing package"; + description = "Lightweight CGI form processing package"; homepage = "https://github.com/JerilynFranz/perl-CGI-Minimal"; license = with lib.licenses; [ mit ]; }; @@ -3244,7 +3261,7 @@ with self; { }; buildInputs = [ TestException TestNoWarnings ]; meta = { - description = "A Simple totally OO CGI interface that is CGI.pm compliant"; + description = "Simple totally OO CGI interface that is CGI.pm compliant"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3292,7 +3309,7 @@ with self; { buildInputs = [ TestWarn ]; propagatedBuildInputs = [ GD GraphicsToolkitColor ]; meta = { - description = "A series of charting modules"; + description = "Series of charting modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3312,6 +3329,9 @@ with self; { "-Wno-error=implicit-int" "-Wno-error=int-conversion" ]); + postPatch = '' + substituteInPlace Makefile.PL --replace pkg-config $PKG_CONFIG + ''; NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.pcsclite}/lib -lpcsclite"; # tests fail; look unfinished doCheck = false; @@ -3402,7 +3422,7 @@ with self; { hash = "sha256-dbO47I7+aHZ3tj8KEO75ZuAfYHNcVmVs51y7RMq6M1o="; }; meta = { - description = "A minimalistic variant of Class::Accessor"; + description = "Minimalistic variant of Class::Accessor"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3443,7 +3463,7 @@ with self; { }; propagatedBuildInputs = [ AlgorithmC3 ]; meta = { - description = "A pragma to use the C3 method resolution order algorithm"; + description = "Pragma to use the C3 method resolution order algorithm"; homepage = "https://metacpan.org/release/Class-C3"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3488,7 +3508,7 @@ with self; { hash = "sha256-m2XUG5kVOJkugWsyzE+ptKSguz6cEOfuvv+CZY27yPY="; }; meta = { - description = "Simplifies creation, manipulation and usage of complex objects."; + description = "Simplifies creation, manipulation and usage of complex objects"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "classgen"; }; @@ -3665,7 +3685,7 @@ with self; { hash = "sha256-p1KK8in6OhIF3NJakd59dKxvp9lSgbmTtV6Lb0+HuZE="; }; meta = { - description = "A set of modules to make the module developement easier"; + description = "Set of modules to make the module developement easier"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3680,7 +3700,7 @@ with self; { # Remove unnecessary, non-autoconf, configure script. prePatch = "rm configure"; meta = { - description = "A module for creating generic methods"; + description = "Module for creating generic methods"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3766,7 +3786,7 @@ with self; { hash = "sha256-3JoR4Nq1bcIg3qjJT+PEfbXn3Xwe0E3IF4qlu3v7vM4="; }; meta = { - description = "A minimal lightweight exception class"; + description = "Minimal lightweight exception class"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -3795,7 +3815,7 @@ with self; { buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ DataOptList PackageStash ]; meta = { - description = "A working (require \"Class::Name\") and more"; + description = "Working (require \"Class::Name\") and more"; homepage = "https://github.com/moose/Class-Load"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4039,7 +4059,7 @@ with self; { buildInputs = [ TestMost TestWarn TestException TestDeep TestDifferences ModulePluggable ]; propagatedBuildInputs = [ ClassAccessor ClassDataInheritable ]; meta = { - description = "An easy-to-use and comprehensive named-color library"; + description = "Easy-to-use and comprehensive named-color library"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -4221,7 +4241,7 @@ with self; { }; propagatedBuildInputs = [ CaptureTiny ]; meta = { - description = "A module to implement some of AutoConf macros in pure perl"; + description = "Module to implement some of AutoConf macros in pure perl"; homepage = "https://metacpan.org/release/Config-AutoConf"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4263,7 +4283,7 @@ with self; { hash = "sha256-qLOjosnIxDuS3EAb8nCdZRTxW0Z/1PcsSNNWM1dx1uM="; }; meta = { - description = "A grammar-based, user-friendly config parser"; + description = "Grammar-based, user-friendly config parser"; homepage = "https://github.com/schweikert/Config-Grammar"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4309,7 +4329,7 @@ with self; { }; propagatedBuildInputs = [ IOStringy ]; meta = { - description = "A module for reading .ini-style configuration files"; + description = "Module for reading .ini-style configuration files"; homepage = "https://metacpan.org/release/Config-IniFiles"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = teams.deshaw.members; @@ -4371,7 +4391,7 @@ with self; { }; propagatedBuildInputs = [ ConfigINI ConfigMVP ]; meta = { - description = "An MVP config reader for .ini files"; + description = "MVP config reader for .ini files"; homepage = "https://github.com/rjbs/Config-MVP-Reader-INI"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4466,7 +4486,7 @@ with self; { rm t/01-builtin-password-scheme.t ''; meta = { - description = "A generic connection to a hierarchical-structured data set"; + description = "Generic connection to a hierarchical-structured data set"; homepage = "https://github.com/whiterabbitsecurity/connector"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4664,7 +4684,7 @@ with self; { propagatedBuildInputs = [ AnyEvent Guard commonsense ]; buildInputs = [ CanaryStability ]; meta = { - description = "The only real threads in perl"; + description = "Only real threads in perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5081,7 +5101,7 @@ with self; { propagatedBuildInputs = [ ClassMix ]; perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { - description = "The Eksblowfish block cipher"; + description = "Eksblowfish block cipher"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5115,7 +5135,7 @@ with self; { ''; meta = { - description = "A secure memorable password generator"; + description = "Secure memorable password generator"; homepage = "http://www.bartb.ie/hsxkpasswd"; license = with lib.licenses; [ bsd2 ]; maintainers = [ maintainers.dannixon ]; @@ -5162,7 +5182,7 @@ with self; { }; propagatedBuildInputs = [ CryptURandom ]; meta = { - description = "A module for managing passwords in a cryptographically agile manner"; + description = "Module for managing passwords in a cryptographically agile manner"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5176,7 +5196,7 @@ with self; { }; propagatedBuildInputs = with perlPackages; [ CryptArgon2 CryptPassphrase ]; meta = { - description = "An Argon2 encoder for Crypt::Passphrase"; + description = "Argon2 encoder for Crypt::Passphrase"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5190,7 +5210,7 @@ with self; { }; propagatedBuildInputs = [ CryptBcrypt CryptPassphrase ]; meta = { - description = "A bcrypt encoder for Crypt::Passphrase"; + description = "Bcrypt encoder for Crypt::Passphrase"; homepage = "https://github.com/Leont/crypt-passphrase-bcrypt"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5437,7 +5457,7 @@ with self; { hash = "sha256-WIFVXWGHlyojgqoNTbLXTJcLBndMYhtspSNzkjbS1QE="; }; meta = { - description = "The Twofish Encryption Algorithm"; + description = "Twofish Encryption Algorithm"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; @@ -5582,7 +5602,7 @@ with self; { buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DigestHMAC DigestSHA3 Moo TypeTiny namespaceautoclean strictures ]; meta = { - description = "The PBKDF2 password hash algorithm"; + description = "PBKDF2 password hash algorithm"; homepage = "https://metacpan.org/release/Crypt-PBKDF2"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; @@ -5734,7 +5754,7 @@ with self; { }; propagatedBuildInputs = [ Curses TermReadKey ]; meta = { - description = "A curses based OO user interface framework"; + description = "Curses based OO user interface framework"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -5820,7 +5840,7 @@ with self; { }; propagatedBuildInputs = [ DataIEEE754 DevelStackTrace ScalarType StringBinaryInterpolation TestDifferences TestException ]; meta = { - description = "A Compact Read Only Database that consumes very little memory"; + description = "Compact Read Only Database that consumes very little memory"; license = with lib.licenses; [ artistic1 gpl2Only ]; }; }; @@ -6033,7 +6053,7 @@ with self; { }; buildInputs = [ ModuleBuildXSUtil TestRequires ]; meta = { - description = "A grep-like program for searching source code"; + description = "Grep-like program for searching source code"; homepage = "https://github.com/msgpack/msgpack-perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; @@ -6313,7 +6333,7 @@ with self; { buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { - description = "A selection of utilities for data and data types"; + description = "Selection of utilities for data and data types"; homepage = "https://github.com/gfx/Perl-Data-Util"; license = with lib.licenses; [ artistic1 gpl1Plus ]; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataUtil.x86_64-darwin @@ -6498,7 +6518,7 @@ with self; { hash = "sha256-KaGSYxTOFoGjEtYVXClZDHcd2s+Rt0hYc85EnvIJ3QQ="; }; meta = { - description = "A simple date object"; + description = "Simple date object"; license = with lib.licenses; [ artistic1 gpl2Plus ]; }; }; @@ -6513,7 +6533,7 @@ with self; { buildInputs = [ CPANMetaCheck TestFatal TestWarnings TestWithoutModule ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; meta = { - description = "A date and time object for Perl"; + description = "Date and time object for Perl"; homepage = "https://metacpan.org/release/DateTime"; license = with lib.licenses; [ artistic2 ]; }; @@ -6855,7 +6875,7 @@ with self; { }; propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; meta = { - description = "A collection of handy debugging routines for displaying the values of variables with a minimum of coding"; + description = "Collection of handy debugging routines for displaying the values of variables with a minimum of coding"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -6946,6 +6966,22 @@ with self; { }; }; + DevelCover = buildPerlPackage { + pname = "Devel-Cover"; + version = "1.44"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PJ/PJCJ/Devel-Cover-1.44.tar.gz"; + hash = "sha256-9AwVQ5kuXWWm94AD1GLVms15rm0w04BHscadmZ0rH9g="; + }; + propagatedBuildInputs = [ HTMLParser ]; + doCheck = false; + meta = { + description = "Code coverage metrics for Perl"; + homepage = "http://www.pjcj.net/perl.html"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelDeprecationsEnvironmental = buildPerlPackage { pname = "Devel-Deprecations-Environmental"; version = "1.101"; @@ -6955,7 +6991,7 @@ with self; { }; propagatedBuildInputs = [ DevelCheckOS DevelHide TestException TestTime ]; meta = { - description = "A framework for managing deprecations"; + description = "Framework for managing deprecations"; homepage = "https://github.com/DrHyde/perl-modules-Devel-Deprecations-Environmental"; license = with lib.licenses; [ gpl2Only artistic1 ]; }; @@ -7543,7 +7579,7 @@ with self; { }; buildInputs = [ TestDeep TestException TestPod TestPodCoverage TestWarn ]; meta = { - description = "A pure perl multi-level hash/array DBM that supports transactions"; + description = "Pure perl multi-level hash/array DBM that supports transactions"; homepage = "https://github.com/robkinyon/dbm-deep"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7761,7 +7797,7 @@ with self; { hash = "sha256-zTwD7VR9PULGH6WBTJgpYTk5LnlxwJLgmkMfLJ9daFU="; }; meta = { - description = "An object representing a stack trace"; + description = "Object representing a stack trace"; homepage = "https://metacpan.org/release/Devel-StackTrace"; license = with lib.licenses; [ artistic2 ]; }; @@ -7968,7 +8004,7 @@ with self; { hash = "sha256-4lGlGrx9m6PnCPc8KqII4J1HoMUo1iVHEPp4zI1ohbU="; }; meta = { - description = "A __DIR__ constant for the directory your source file is in"; + description = "__DIR__ constant for the directory your source file is in"; homepage = "https://github.com/mauke/Dir-Self"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8544,7 +8580,7 @@ with self; { }; buildInputs = [ CaptureTiny ]; meta = { - description = "A unified interface to MIME encoding and decoding"; + description = "Unified interface to MIME encoding and decoding"; homepage = "https://github.com/rjbs/Email-MIME-Encodings"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8577,7 +8613,7 @@ with self; { preCheck = "rm t/internals.t t/plain_jpeg_attached.t"; # these tests expect EmailMIME version 1.946 and fail with 1.949 (the output difference in benign) meta = { homepage = "https://www.matijs.net/software/msgconv/"; - description = "A .MSG to mbox converter"; + description = ".MSG to mbox converter"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ peterhoeg ]; mainProgram = "msgconvert"; @@ -8601,7 +8637,7 @@ with self; { shortenPerlShebang util/sendmail ''; meta = { - description = "A library for sending email"; + description = "Library for sending email"; homepage = "https://github.com/rjbs/Email-Sender"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8632,7 +8668,7 @@ with self; { buildInputs = [ Moo TestFatal ]; propagatedBuildInputs = [ EmailMIME EmailSender ModuleRuntime ParamsUtil ]; meta = { - description = "A more casual approach to creating and sending Email:: emails"; + description = "More casual approach to creating and sending Email:: emails"; homepage = "https://github.com/rjbs/Email-Stuffer"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; @@ -8708,7 +8744,7 @@ with self; { }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; meta = { - description = "An Encode::Encoding subclass that detects the encoding of data"; + description = "Encode::Encoding subclass that detects the encoding of data"; license = with lib.licenses; [ mpl11 gpl2Plus lgpl2Plus ]; # taken from fedora }; }; @@ -8987,7 +9023,7 @@ with self; { }; propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; meta = { - description = "An Exception Object Class"; + description = "Exception Object Class"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9059,7 +9095,7 @@ with self; { hash = "sha256-byleLL/7HbwVvbna3DQWccHgzSvfLTErF1Jic8MiY40="; }; meta = { - description = "An exporter with the features of Sub::Exporter but only core dependencies"; + description = "Exporter with the features of Sub::Exporter but only core dependencies"; homepage = "https://metacpan.org/release/Exporter-Tiny"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9115,7 +9151,7 @@ with self; { hash = "sha256-rlEE9jRlDc6KebftE/tZ1no5whOmd2z9qj7nSeYvGow="; }; meta = { - description = "A wrapper for perl's configuration"; + description = "Wrapper for perl's configuration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9176,7 +9212,7 @@ with self; { buildInputs = [ pkgs.gfortran ]; propagatedBuildInputs = [ FileWhich ]; meta = { - description = "A simple interface to F77 libs"; + description = "Simple interface to F77 libs"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9231,7 +9267,7 @@ with self; { }; perlPreHook = "export LD=$CC"; meta = { - description = "A tool to build C libraries"; + description = "Tool to build C libraries"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9318,7 +9354,7 @@ with self; { hash = "sha256-Pfr1g36/3AB4lb/KhMPC521Ymn0zZADo37MkPYGCFd4="; }; meta = { - description = "A set of useful typemaps"; + description = "Set of useful typemaps"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9408,7 +9444,7 @@ with self; { hash = "sha256-4clYwEJCehdeBR4ACPICXo7IBhPTx3UFl7+OUpsEQg4="; }; meta = { - description = "A perl-based FastCGI process manager"; + description = "Perl-based FastCGI process manager"; license = with lib.licenses; [ gpl2Plus ]; }; }; @@ -9566,7 +9602,7 @@ with self; { hash = "sha256-Mev5Et9I1daB3vdLmIDXix86ykNRoO0f41cLjgOvbHk="; }; meta = { - description = "A more sensible way to change directories"; + description = "More sensible way to change directories"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9740,7 +9776,7 @@ with self; { buildInputs = [ FileTreeCreate TestFile ]; propagatedBuildInputs = [ ClassXSAccessor ]; meta = { - description = "An object oriented File::Find replacement"; + description = "Object oriented File::Find replacement"; homepage = "https://metacpan.org/release/File-Find-Object"; license = with lib.licenses; [ artistic2 ]; }; @@ -10190,7 +10226,7 @@ with self; { hash = "sha256-/onLtCfg4F8c2Xwt1tOGasayG8eoVzTt4Vm9w1R5VSo="; }; meta = { - description = "Perl extension for filesystem disk space information."; + description = "Perl extension for filesystem disk space information"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10247,7 +10283,7 @@ with self; { }; buildInputs = [ TestWarnings ]; meta = { - description = "A simple, sane and efficient module to slurp a file"; + description = "Simple, sane and efficient module to slurp a file"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10260,7 +10296,7 @@ with self; { hash = "sha256-RSmVvuq/DpI+Zf3GJ6cl27EsnhDADYAYwW0QumJ1fx4="; }; meta = { - description = "A simple, sane and efficient file slurper [DISCOURAGED]"; + description = "Simple, sane and efficient file slurper [DISCOURAGED]"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10394,10 +10430,10 @@ with self; { FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.60"; + version = "1.62"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-UXrYQNvOhzdVjnMxNJ/fa7J5u7sMobV+3SN7T5jVw34="; + hash = "sha256-DTEzsL89d5WCxWaFDVd/K76OGsvRFJeDHNQ9jzFgZII="; }; buildInputs = [ DateManip DateRange DateSimple DateTime DateTimeFormatISO8601 StringUtil TestKwalitee TestPerlCritic TestPod TestPodCoverage ]; propagatedBuildInputs = [ DateManip DateTimeFormatStrptime Encode HTMLTableExtract HTMLTokeParserSimple HTMLTree HTMLTreeBuilderXPath HTTPCookies HTTPCookieJar JSON IOCompress IOString LWPProtocolHttps Readonly StringUtil SpreadsheetXLSX TextTemplate TryTiny WebScraper XMLLibXML libwwwperl ]; @@ -10582,7 +10618,7 @@ with self; { buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ Future ]; meta = { - description = "A FIFO queue of values that uses L<Future>s"; + description = "FIFO queue of values that uses L<Future>s"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -10802,7 +10838,7 @@ with self; { propagatedBuildInputs = [ ArchiveExtract ConfigGitLike DataStreamBulk DateTime FileFindRule IODigest MooseXStrictConstructor MooseXTypesPathClass ]; doCheck = false; meta = { - description = "A Pure Perl interface to Git repositories"; + description = "Pure Perl interface to Git repositories"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -11354,7 +11390,7 @@ with self; { }; propagatedBuildInputs = [ Gtk3 ]; meta = { - description = "A simple interface to Gtk3's complex MVC list widget"; + description = "Simple interface to Gtk3's complex MVC list widget"; homepage = "https://github.com/soig/Gtk3-SimpleList"; license = with lib.licenses; [ lgpl21Plus ]; }; @@ -11408,7 +11444,7 @@ with self; { shortenPerlShebang $out/bin/hailo ''; meta = { - description = "A pluggable Markov engine analogous to MegaHAL"; + description = "Pluggable Markov engine analogous to MegaHAL"; homepage = "https://hailo.org"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "hailo"; @@ -11518,7 +11554,7 @@ with self; { buildInputs = [ TestDeep TestFailWarnings TestFatal ]; meta = { homepage = "https://github.com/dagolden/Hash-Ordered"; - description = "A fast, pure-Perl ordered hash class"; + description = "Fast, pure-Perl ordered hash class"; license = lib.licenses.asl20; }; }; @@ -12131,7 +12167,7 @@ with self; { # Broken on Hydra since 2021-06-17: https://hydra.nixos.org/build/146507373 doCheck = false; meta = { - description = "A minimalist HTTP user agent cookie jar"; + description = "Minimalist HTTP user agent cookie jar"; homepage = "https://github.com/dagolden/HTTP-CookieJar"; license = with lib.licenses; [ asl20 ]; }; @@ -12162,7 +12198,7 @@ with self; { buildInputs = [ ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { - description = "A simple http server class"; + description = "Simple http server class"; homepage = "https://github.com/libwww-perl/HTTP-Daemon"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12237,7 +12273,7 @@ with self; { hash = "sha256-qeAP/7PYmRoUqq/dxh1tFoxP8U4xSuPbstTaMAjXRu8="; }; meta = { - description = "An XS extension for processing HTTP headers"; + description = "XS extension for processing HTTP headers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; broken = stdenv.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) @@ -12327,7 +12363,7 @@ with self; { hash = "sha256-eU5oM+MmsQ0kNp+c2/wWZxBe9lkej0HlYaPUGnAnqAk="; }; meta = { - description = "A fast, primitive HTTP request parser"; + description = "Fast, primitive HTTP request parser"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12343,7 +12379,7 @@ with self; { # tests fail because they require network access doCheck = false; meta = { - description = "A pure Perl HTTP proxy"; + description = "Pure Perl HTTP proxy"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12415,7 +12451,7 @@ with self; { }; propagatedBuildInputs = [ HTMLMason HTTPServerSimple HookLexWrap ]; meta = { - description = "A simple mason server"; + description = "Simple mason server"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12581,7 +12617,7 @@ with self; { }; buildInputs = [ ModuleBuild ]; meta = { - description = "A library to extract height/width from images"; + description = "Library to extract height/width from images"; homepage = "https://search.cpan.org/dist/Image-Size"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "imgsize"; @@ -12828,6 +12864,7 @@ with self; { url = "mirror://cpan/authors/id/L/LD/LDS/IO-Interface-1.09.tar.gz"; hash = "sha256-5j6BxS6x4OYOwtmD9VUtJJPhFxeZJclnV/I8S9n6cTo="; }; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.ld-is-cc-hook ]; meta = { description = "Access and modify network interface card configuration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -13721,7 +13758,7 @@ with self; { propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookieJar HTTPCookies HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP TryTiny URI WWWRobotRules ]; meta = { homepage = "https://github.com/libwww-perl/libwww-perl"; - description = "The World-Wide Web library for Perl"; + description = "World-Wide Web library for Perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14163,7 +14200,7 @@ with self; { }; buildInputs = [ TestInter ]; meta = { - description = "A distribution of modules to handle locale codes"; + description = "Distribution of modules to handle locale codes"; homepage = "https://github.com/SBECK-github/Locale-Codes"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14488,7 +14525,7 @@ with self; { hash = "sha256-6JEdM4ePoWmeQ+jQpU7V1WEEA4Z/9cM5+TQQPRfsZLA="; }; meta = { - description = "A lightweight, flexible logging framework"; + description = "Lightweight, flexible logging framework"; homepage = "https://metacpan.org/release/Log-ger"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; @@ -14604,7 +14641,7 @@ with self; { buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; meta = { - description = "A simple wrapper around Log::Dispatch"; + description = "Simple wrapper around Log::Dispatch"; homepage = "https://github.com/rjbs/Log-Dispatchouli"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14675,7 +14712,7 @@ with self; { doCheck = !stdenv.isDarwin; nativeCheckInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ]; meta = { - description = "The World-Wide Web library for Perl"; + description = "World-Wide Web library for Perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14797,7 +14834,7 @@ with self; { }; propagatedBuildInputs = [ LWP ]; meta = { - description = "A virtual browser that retries errors"; + description = "Virtual browser that retries errors"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -14961,7 +14998,7 @@ with self; { buildInputs = [ FileSlurper TestCompile TestPod TestPodCoverage TextDiff UNIVERSALrequire URI ]; propagatedBuildInputs = [ FileHandleUnget ]; meta = { - description = "A fast and simple mbox folder reader"; + description = "Fast and simple mbox folder reader"; homepage = "https://github.com/coppit/mail-mbox-messageparser"; license = with lib.licenses; [ gpl2Only ]; maintainers = with maintainers; [ romildo ]; @@ -15008,7 +15045,7 @@ with self; { }; propagatedBuildInputs = [ ParseRecDescent ]; meta = { - description = "An IMAP Client API"; + description = "IMAP Client API"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -15091,7 +15128,7 @@ with self; { doCheck = false; # The main test performs network access meta = { - description = "An object-oriented implementation of Sender Policy Framework"; + description = "Object-oriented implementation of Sender Policy Framework"; license = with lib.licenses; [ bsd3 ]; mainProgram = "spfquery"; }; @@ -15629,6 +15666,36 @@ with self; { }; }; + MemoryProcess = buildPerlPackage { + pname = "Memory-Process"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKIM/Memory-Process-0.06.tar.gz"; + hash = "sha256-NYFEiP/SnJdiFiXqOz1wCvv6YO0FW9dZ1OWNnI/UTk4="; + }; + buildInputs = [ CaptureTiny TestNoWarnings ]; + propagatedBuildInputs = [ MemoryUsage Readonly ]; + meta = { + description = "Memory process reporting"; + homepage = "https://github.com/michal-josef-spacek/Memory-Process"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + }; + }; + + MemoryUsage = buildPerlPackage { + pname = "Memory-Usage"; + version = "0.201"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DONEILL/Memory-Usage-0.201.tar.gz"; + hash = "sha256-jyr60h5Ap0joHIwPPkDKcYwU3bn7LYgL+9KK6RPOU0k="; + }; + meta = { + description = "Tools to determine actual memory usage"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Menlo = buildPerlPackage { pname = "Menlo"; version = "1.9019"; @@ -15638,7 +15705,7 @@ with self; { }; propagatedBuildInputs = [ CPANCommonIndex CPANMetaCheck CaptureTiny ExtUtilsHelpers ExtUtilsInstallPaths Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote Win32ShellQuote locallib ]; meta = { - description = "A CPAN client"; + description = "CPAN client"; homepage = "https://github.com/miyagawa/cpanminus"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15691,7 +15758,7 @@ with self; { buildInputs = [ LWPProtocolHttps TestFatal TestNeeds ]; propagatedBuildInputs = [ IOSocketSSL JSONMaybeXS Moo RefUtil SafeIsa TypeTiny URI ]; meta = { - description = "A comprehensive, DWIM-featured client to the MetaCPAN API"; + description = "Comprehensive, DWIM-featured client to the MetaCPAN API"; homepage = "https://github.com/metacpan/metacpan-client"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; @@ -15742,7 +15809,7 @@ with self; { meta = { homepage = "https://www.mhonarc.org/"; - description = "A mail-to-HTML converter"; + description = "Mail-to-HTML converter"; mainProgram = "mhonarc"; license = with lib.licenses; [ gpl2Only ]; }; @@ -15859,7 +15926,7 @@ with self; { }; propagatedBuildInputs = [ Mojolicious YAMLLibYAML ]; meta = { - description = "A high performance job queue for Perl"; + description = "High performance job queue for Perl"; homepage = "https://github.com/mojolicious/minion"; license = with lib.licenses; [ artistic2 ]; maintainers = [ maintainers.sgo ]; @@ -16044,7 +16111,7 @@ with self; { }; doCheck = false; meta = { - description = "A collection of modules removed from Module-Build"; + description = "Collection of modules removed from Module-Build"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16106,7 +16173,7 @@ with self; { buildInputs = [ FileShareDir ]; propagatedBuildInputs = [ ExtUtilsHelpers ExtUtilsInstallPaths ]; meta = { - description = "A tiny replacement for Module::Build"; + description = "Tiny replacement for Module::Build"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -16136,7 +16203,7 @@ with self; { propagatedBuildInputs = [ DevelCheckCompiler ]; perlPreHook = "export LD=$CC"; meta = { - description = "A Module::Build class for building XS modules"; + description = "Module::Build class for building XS modules"; homepage = "https://github.com/hideo55/Module-Build-XSUtil"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16314,7 +16381,7 @@ with self; { buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ ModuleInstall ]; meta = { - description = "A Module::Install extension to include GitHub meta information in META.yml"; + description = "Module::Install extension to include GitHub meta information in META.yml"; homepage = "https://github.com/bingos/module-install-githubmeta"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; @@ -16331,7 +16398,7 @@ with self; { buildInputs = [ TestInDistDir ]; propagatedBuildInputs = [ CaptureTiny IOAll ModuleInstall PodMarkdown ]; meta = { - description = "A Module::Install extension to automatically convert POD to a README"; + description = "Module::Install extension to automatically convert POD to a README"; homepage = "https://github.com/bingos/module-install-readmefrompod"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; @@ -16731,7 +16798,7 @@ with self; { }; propagatedBuildInputs = [ Mojolicious ]; meta = { - description = "A plugin for enabling a Mojolicious app to log to syslog"; + description = "Plugin for enabling a Mojolicious app to log to syslog"; homepage = "https://github.com/jhthorsen/mojolicious-plugin-syslog"; license = with lib.licenses; [ artistic2 ]; maintainers = [ maintainers.sgo ]; @@ -16813,7 +16880,7 @@ with self; { buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CryptOpenSSLRSA CryptOpenSSLX509 DataGUID Mojolicious XMLCanonicalizeXML ]; meta = { - description = "A SAML2 toolkit using the Mojo toolkit"; + description = "SAML2 toolkit using the Mojo toolkit"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; }; @@ -16829,7 +16896,7 @@ with self; { buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ DBDSQLite Mojolicious SQLAbstractPg URIdb URI ]; meta = { - description = "A tiny Mojolicious wrapper for SQLite"; + description = "Tiny Mojolicious wrapper for SQLite"; homepage = "https://github.com/Grinnz/Mojo-SQLite"; license = with lib.licenses; [ artistic2 ]; maintainers = [ maintainers.sgo ]; @@ -17018,7 +17085,7 @@ with self; { export LD=$CC ''; meta = { - description = "A postmodern object system for Perl 5"; + description = "Postmodern object system for Perl 5"; homepage = "http://moose.perl.org"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.eelco ]; @@ -17239,7 +17306,7 @@ with self; { buildInputs = [ Moose TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; propagatedBuildInputs = [ JSON MooseXRoleParameterized MooseXStorage namespaceautoclean ]; meta = { - description = "A format role for MooseX::Storage using JSON.pm"; + description = "Format role for MooseX::Storage using JSON.pm"; homepage = "https://github.com/rjbs/MooseX-Storage-Format-JSONpm"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17316,7 +17383,7 @@ with self; { }; propagatedBuildInputs = [ ConfigAny MouseXConfigFromFile ]; meta = { - description = "A Mouse role for setting attributes from a simple configfile"; + description = "Mouse role for setting attributes from a simple configfile"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17424,7 +17491,7 @@ with self; { buildInputs = [ TestUseAllModules ]; propagatedBuildInputs = [ MouseXTypesPathClass ]; meta = { - description = "An abstract Mouse role for setting attributes from a configfile"; + description = "Abstract Mouse role for setting attributes from a configfile"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17442,7 +17509,7 @@ with self; { buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { - description = "A Mouse role for processing command line options"; + description = "Mouse role for processing command line options"; homepage = "https://github.com/gfx/mousex-getopt"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17503,7 +17570,7 @@ with self; { buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestRequires TestWithoutModule ]; propagatedBuildInputs = [ MooseXTypesPathTiny ]; meta = { - description = "An abstract Moose role for setting attributes from a configfile"; + description = "Abstract Moose role for setting attributes from a configfile"; homepage = "https://github.com/moose/MooseX-ConfigFromFile"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17550,7 +17617,7 @@ with self; { buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ]; propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; meta = { - description = "A Moose role for processing command line options"; + description = "Moose role for processing command line options"; homepage = "https://github.com/moose/MooseX-Getopt"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17689,7 +17756,7 @@ with self; { buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DevelCaller Moose ParamsValidate ]; meta = { - description = "An extension of Params::Validate using Moose's types"; + description = "Extension of Params::Validate using Moose's types"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -17796,7 +17863,7 @@ with self; { buildInputs = [ TestDeep TestDeepType TestFatal TestNeeds TestDeepJSON TestWithoutModule DigestHMAC MooseXTypes ]; propagatedBuildInputs = [ ModuleRuntime Moose MooseXRoleParameterized PodCoverage StringRewritePrefix namespaceautoclean IOStringy JSON JSONXS JSONMaybeXS CpanelJSONXS YAML YAMLOld YAMLTiny YAMLLibYAML YAMLSyck ]; meta = { - description = "A serialization framework for Moose classes"; + description = "Serialization framework for Moose classes"; homepage = "https://github.com/moose/MooseX-Storage"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17875,7 +17942,7 @@ with self; { buildInputs = [ ModuleBuildTiny TestDeep TestWarnings ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { - description = "A library of commonly used type constraints"; + description = "Library of commonly used type constraints"; homepage = "https://github.com/moose/MooseX-Types-Common"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17939,7 +18006,7 @@ with self; { propagatedBuildInputs = [ MooseXTypes PathClass ]; buildInputs = [ ModuleBuildTiny TestNeeds ]; meta = { - description = "A Path::Class type library for Moose"; + description = "Path::Class type library for Moose"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18213,7 +18280,7 @@ with self; { }; propagatedBuildInputs = [ YAMLLibYAML ]; meta = { - description = "A simple Mustache Renderer"; + description = "Simple Mustache Renderer"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -18673,7 +18740,7 @@ with self; { propagatedBuildInputs = [ BitVector ClassGomor NetIPv6Addr ]; preCheck = "rm t/13-gethostsubs.t"; # it performs DNS queries meta = { - description = "The base framework for frame crafting"; + description = "Base framework for frame crafting"; license = with lib.licenses; [ artistic1 ]; }; }; @@ -18967,7 +19034,7 @@ with self; { buildInputs = [ TestWarn ]; propagatedBuildInputs = [ ClassAccessor ClassDataInheritable DigestHMAC DigestSHA1 LWP ]; meta = { - description = "An implementation of the OAuth protocol"; + description = "Implementation of the OAuth protocol"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19088,7 +19155,7 @@ with self; { }; propagatedBuildInputs = [ Coro NetServer ]; meta = { - description = "A co-operative multithreaded server using Coro"; + description = "Co-operative multithreaded server using Coro"; license = with lib.licenses; [ mit ]; }; }; @@ -19106,7 +19173,7 @@ with self; { buildInputs = [ ModuleInstall ]; propagatedBuildInputs = [ NetServer ServerStarter ]; meta = { - description = "A hot-deployable variant of Net::Server::PreFork"; + description = "Hot-deployable variant of Net::Server::PreFork"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19134,7 +19201,7 @@ with self; { }; propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; meta = { - description = "An SMTP client supporting TLS and AUTH"; + description = "SMTP client supporting TLS and AUTH"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19148,7 +19215,7 @@ with self; { }; propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; meta = { - description = "An SMTP client supporting TLS and AUTH (DEPRECATED, use Net::SMTPS instead)"; + description = "SMTP client supporting TLS and AUTH (DEPRECATED, use Net::SMTPS instead)"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19276,7 +19343,7 @@ with self; { propagatedBuildInputs = [ JSON LWPProtocolHttps ]; doCheck = false; meta = { - description = "A perl API library for the Twitter API"; + description = "Perl API library for the Twitter API"; homepage = "https://github.com/semifor/net-twitter-lite"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19428,7 +19495,7 @@ with self; { }; propagatedBuildInputs = [ DigestHMAC ]; meta = { - description = "An NTLM authentication module"; + description = "NTLM authentication module"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.pSub ]; }; @@ -19456,7 +19523,7 @@ with self; { }; propagatedBuildInputs = [ AnyEvent commonsense ]; meta = { - description = "A class that provides an event callback interface"; + description = "Class that provides an event callback interface"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -19486,7 +19553,7 @@ with self; { perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; propagatedBuildInputs = [ XSParseKeyword XSParseSublike ]; meta = { - description = "A simple syntax for lexical field-based objects"; + description = "Simple syntax for lexical field-based objects"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; @@ -19557,7 +19624,7 @@ with self; { }; propagatedBuildInputs = [ MojoliciousPluginOpenAPI ]; meta = { - description = "A client for talking to an Open API powered server"; + description = "Client for talking to an Open API powered server"; homepage = "https://github.com/jhthorsen/openapi-client"; license = with lib.licenses; [ artistic2 ]; maintainers = [ maintainers.sgo ]; @@ -19602,7 +19669,7 @@ with self; { }; propagatedBuildInputs = [ ArchiveZip XMLTwig ]; meta = { - description = "The Perl Open OpenDocument Connector"; + description = "Perl Open OpenDocument Connector"; license = with lib.licenses; [ lgpl21Only ]; maintainers = [ maintainers.wentasah ]; }; @@ -19782,7 +19849,7 @@ with self; { buildInputs = [ TestWarn ]; propagatedBuildInputs = [ Moo ]; meta = { - description = "A simple parallel processing fork manager"; + description = "Simple parallel processing fork manager"; homepage = "https://github.com/dluxhu/perl-parallel-forkmanager"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19830,7 +19897,7 @@ with self; { buildInputs = [ TestRequires TestSharedFork ]; propagatedBuildInputs = [ ClassAccessorLite ListMoreUtils ProcWait3 ScopeGuard SignalMask ]; meta = { - description = "A simple prefork server framework"; + description = "Simple prefork server framework"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -20022,7 +20089,7 @@ with self; { hash = "sha256-RXsJiX8304pwVPlWMkc2VCf+JBAWIu1MfwVHI6RbWNU="; }; meta = { - description = "A parser for the IRC protocol"; + description = "Parser for the IRC protocol"; homepage = "https://github.com/bingos/parse-irc"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ sgo ]; @@ -20543,7 +20610,7 @@ with self; { }; buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; meta = { - description = "A PerlIO layer that adds read & write timeout to a handle"; + description = "PerlIO layer that adds read & write timeout to a handle"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21172,7 +21239,7 @@ with self; { }; buildInputs = [ HTTPMessage Plack TestException TestWarn ]; meta = { - description = "A tiny Prometheus client"; + description = "Tiny Prometheus client"; homepage = "https://github.com/robn/Prometheus-Tiny"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -21188,7 +21255,7 @@ with self; { buildInputs = [ DataRandom HTTPMessage Plack TestDifferences TestException TestWarn ]; propagatedBuildInputs = [ HashSharedMem JSONXS PrometheusTiny ]; meta = { - description = "A tiny Prometheus client with a shared database behind it"; + description = "Tiny Prometheus client with a shared database behind it"; homepage = "https://github.com/robn/Prometheus-Tiny-Shared"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -21320,7 +21387,7 @@ with self; { buildInputs = [ TryTiny ]; propagatedBuildInputs = [ GetoptLongDescriptive ModulePath Moo ParamsUtil PPI StringRewritePrefix TypeTiny namespaceautoclean ]; meta = { - description = "A tool to scan your Perl code for its prerequisites"; + description = "Tool to scan your Perl code for its prerequisites"; homepage = "https://github.com/rjbs/Perl-PrereqScanner"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "scan-perl-prereqs"; @@ -21337,7 +21404,7 @@ with self; { propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie URIcpan ]; buildInputs = [ ExtUtilsMakeMakerCPANfile ParseDistname TestFailWarnings TestUseAllModules ]; meta = { - description = "A tool to scan your Perl code for its prerequisites"; + description = "Tool to scan your Perl code for its prerequisites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "scan-perl-prereqs-nqlite"; }; @@ -21367,7 +21434,7 @@ with self; { }; propagatedBuildInputs = [ IOString TaskWeaken PodParser ]; meta = { - description = "An abstract, tree-based interface to perl POD documents"; + description = "Abstract, tree-based interface to perl POD documents"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "paf"; }; @@ -21443,7 +21510,7 @@ with self; { buildInputs = [ TestDifferences ]; propagatedBuildInputs = [ PPI PodElemental ]; meta = { - description = "A thing that takes a string of Perl and rewrites its documentation"; + description = "Thing that takes a string of Perl and rewrites its documentation"; homepage = "https://github.com/rjbs/Pod-Elemental-PerlMunger"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -21672,7 +21739,7 @@ with self; { propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny PodParser ]; buildInputs = [ FileShareDirInstall TestDeep ]; meta = { - description = "A formatter for spellchecking Pod"; + description = "Formatter for spellchecking Pod"; homepage = "https://github.com/perl-pod/Pod-Spell"; license = with lib.licenses; [ artistic2 ]; mainProgram = "podspell"; @@ -21703,7 +21770,7 @@ with self; { propagatedBuildInputs = [ EncodeNewlines IOString PodWrap TextGlob ]; buildInputs = [ TestCmd ]; meta = { - description = "A reformatting Pod Processor"; + description = "Reformatting Pod Processor"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "podtidy"; }; @@ -22013,7 +22080,7 @@ with self; { }; propagatedBuildInputs = [ LWPProtocolHttps ]; meta = { - description = "A simple client for interacting with RESTful http/https resources"; + description = "Simple client for interacting with RESTful http/https resources"; homepage = "https://github.com/milescrawford/cpan-rest-client"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -22086,7 +22153,7 @@ with self; { }; propagatedBuildInputs = [ MooseXRoleParameterized StringErrf ]; meta = { - description = "A thing with a message method"; + description = "Thing with a message method"; homepage = "https://github.com/rjbs/Role-HasMessage"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -22117,7 +22184,7 @@ with self; { }; propagatedBuildInputs = [ Moose ]; meta = { - description = "A thing you can identify somehow"; + description = "Thing you can identify somehow"; homepage = "https://github.com/rjbs/Role-Identifiable"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -22145,7 +22212,7 @@ with self; { }; propagatedBuildInputs = [ AnyEvent DataSExpression ]; meta = { - description = "An Asynchronous Remote Procedure Stack"; + description = "Asynchronous Remote Procedure Stack"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22177,7 +22244,7 @@ with self; { propagatedBuildInputs = [ locallib ]; doCheck = false; /* creates files in HOME */ meta = { - description = "A simple pure perl RSS parser"; + description = "Simple pure perl RSS parser"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22385,7 +22452,7 @@ with self; { hash = "sha256-05JWfLObTqYGwOCsr9jtcjIDEbmVM27OX878+bFQ6dc="; }; meta = { - description = "Linux/POSIX emulation of Win32::SerialPort functions."; + description = "Linux/POSIX emulation of Win32::SerialPort functions"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "modemtest"; }; @@ -22401,7 +22468,7 @@ with self; { buildInputs = [ TestRequires TestSharedFork TestTCP ]; doCheck = false; # Tests are slow and unstable meta = { - description = "A superdaemon for hot-deploying server programs"; + description = "Superdaemon for hot-deploying server programs"; homepage = "https://github.com/kazuho/p5-Server-Starter"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "start_server"; @@ -22626,7 +22693,7 @@ with self; { hash = "sha256-7WpMz6sJTJzRZPVkAk6YvSHZT0MSzKxNYkbSKzQIGs8="; }; meta = { - description = "The fastest way to sort anything in Perl"; + description = "Fastest way to sort anything in Perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22639,7 +22706,7 @@ with self; { hash = "sha256-v18zB0BuviWBI38CWYLoyE9vZiXdd05FfAP4mU79Lqo="; }; meta = { - description = "A perl 5 module for sorting of revision-like numbers"; + description = "Perl 5 module for sorting of revision-like numbers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22850,7 +22917,7 @@ with self; { hash = "sha256-+qhpvEJlc2QVNqCfU1AuVA1ePjrWp6oaxiXT9pdrQuE="; }; meta = { - description = "A simple SQL tokenizer"; + description = "Simple SQL tokenizer"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22922,7 +22989,7 @@ with self; { propagatedBuildInputs = [ ParallelPrefork Plack ServerStarter ]; doCheck = !stdenv.isDarwin; meta = { - description = "A simple, high-performance PSGI/Plack HTTP server"; + description = "Simple, high-performance PSGI/Plack HTTP server"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -22959,7 +23026,7 @@ with self; { }; propagatedBuildInputs = [ NumberFormat ]; meta = { - description = "A collection of very basic statistics modules"; + description = "Collection of very basic statistics modules"; license = with lib.licenses; [ lgpl2Only ]; }; }; @@ -23158,7 +23225,7 @@ with self; { buildInputs = [ JSONMaybeXS TimeDate ]; propagatedBuildInputs = [ StringFormatter ]; meta = { - description = "A simple sprintf-like dialect"; + description = "Simple sprintf-like dialect"; homepage = "https://github.com/rjbs/String-Errf"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -23228,7 +23295,7 @@ with self; { }; meta = { # https://metacpan.org/pod/String::Interpolate - description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine."; + description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine"; license = with lib.licenses; [ gpl1Plus ]; }; propagatedBuildInputs = [ PadWalker SafeHole ]; @@ -23385,7 +23452,7 @@ with self; { }; propagatedBuildInputs = [ SubExporter ]; meta = { - description = "A module for when strings are too long to be displayed in..."; + description = "Module for when strings are too long to be displayed in..."; homepage = "https://github.com/rjbs/String-Truncate"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -23446,7 +23513,7 @@ with self; { }; propagatedBuildInputs = [ DataOptList ]; meta = { - description = "A sophisticated exporter for custom-built routines"; + description = "Sophisticated exporter for custom-built routines"; homepage = "https://github.com/rjbs/Sub-Exporter"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -23635,7 +23702,7 @@ with self; { }; propagatedBuildInputs = [ (pkgs.subversionClient.override { inherit perl; }) ]; meta = { - description = "A simple interface to subversion's editor interface"; + description = "Simple interface to subversion's editor interface"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23680,7 +23747,7 @@ with self; { }; doCheck = false; # FIXME: 2/293 test failures meta = { - description = "A switch statement for Perl, do not use if you can use given/when"; + description = "Switch statement for Perl, do not use if you can use given/when"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -23767,9 +23834,9 @@ with self; { }; buildInputs = [ Test2Suite ]; propagatedBuildInputs = [ XSParseKeyword ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { - description = "A try/catch/finally syntax for perl"; + description = "Try/catch/finally syntax for perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; }; @@ -23825,7 +23892,7 @@ with self; { buildInputs = lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; doCheck = !stdenv.isAarch64; meta = { - description = "Perl extension for getting CPU information. Currently only number of CPU's supported."; + description = "Perl extension for getting CPU information. Currently only number of CPU's supported"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -24277,7 +24344,7 @@ with self; { perl.perlOnBuild.pkgs.TermReadKey ]; meta = { - description = "A perl module for simple terminal control"; + description = "Perl module for simple terminal control"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -24325,7 +24392,7 @@ with self; { outputs = [ "out" ]; meta = { - description = "A Term::ReadLine driver based on Term::ReadLine::Perl, with special features for microblogging and the TTYtter client (q.v)"; + description = "Term::ReadLine driver based on Term::ReadLine::Perl, with special features for microblogging and the TTYtter client (q.v)"; homepage = "https://www.floodgap.com/software/ttytter"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -24357,7 +24424,7 @@ with self; { propagatedBuildInputs = [ TermReadKey TextAutoformat ]; meta = { homepage = "https://metacpan.org/release/Term-Shell"; - description = "A simple command-line shell framework"; + description = "Simple command-line shell framework"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -24370,7 +24437,7 @@ with self; { hash = "sha256-MnnAHHYiczXu/wkDKkD0sCsoUVGzV2wEys0VvgWUK9s="; }; meta = { - description = "A fully-featured shell-like command line environment"; + description = "Fully-featured shell-like command line environment"; license = with lib.licenses; [ mit ]; }; }; @@ -24451,7 +24518,7 @@ with self; { hash = "sha256-+VTgMQlB1FwPw+tKQPXToA1oEZ4nfTA6HmrxHe1vvZQ="; }; meta = { - description = "A class to emulate a DEC VT102 terminal"; + description = "Class to emulate a DEC VT102 terminal"; license = with lib.licenses; [ artistic2 ]; }; }; @@ -24465,7 +24532,7 @@ with self; { }; propagatedBuildInputs = [ TermVT102 ]; meta = { - description = "A Term::VT102 that grows automatically to accommodate whatever you print to it"; + description = "Term::VT102 that grows automatically to accommodate whatever you print to it"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -24500,7 +24567,7 @@ with self; { propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite YAMLTiny gotofile ]; meta = { - description = "A new and improved test harness with better Test2 integration"; + description = "New and improved test harness with better Test2 integration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "yath"; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Test2Harness.x86_64-darwin @@ -24640,7 +24707,7 @@ with self; { }; propagatedBuildInputs = [ LogTrace ]; meta = { - description = "A simple set of building blocks for both unit and runtime testing"; + description = "Simple set of building blocks for both unit and runtime testing"; license = with lib.licenses; [ gpl2Only ]; }; }; @@ -24671,7 +24738,7 @@ with self; { propagatedBuildInputs = [ Spiffy ]; buildInputs = [ AlgorithmDiff TextDiff ]; meta = { - description = "A Data Driven Testing Framework"; + description = "Data Driven Testing Framework"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -24877,7 +24944,7 @@ with self; { buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ TestDeep TryTiny ]; meta = { - description = "A Test::Deep plugin for validating type constraints"; + description = "Test::Deep plugin for validating type constraints"; homepage = "https://github.com/karenetheridge/Test-Deep-Type"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -25008,7 +25075,7 @@ with self; { propagatedBuildInputs = [ HTTPDaemon Plack ]; buildInputs = [ LWP ModuleBuildTiny TestException TestSharedFork TestTCP TestUseAllModules ]; meta = { - description = "A fake HTTP server"; + description = "Fake HTTP server"; homepage = "https://github.com/masaki/Test-Fake-HTTPD"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -25225,7 +25292,7 @@ with self; { propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ]; meta = { - description = "A LWP::UserAgent suitable for simulating and testing network calls"; + description = "LWP::UserAgent suitable for simulating and testing network calls"; homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -25873,7 +25940,7 @@ with self; { moreInputs = [ TestTrap ]; # Added because tests were failing without it doCheck=true; meta = { - description = "A Test::Run plugin that"; + description = "Test::Run plugin that"; homepage = "https://web-cpan.shlomifish.org/modules/Test-Run"; license = with lib.licenses; [ mit ]; }; @@ -26384,7 +26451,7 @@ with self; { hash = "sha256-qhuFhBz5/G/jODZrvIcKTpMEonZB5j+Sof2Wvujr9kw="; }; meta = { - description = "An implementation of the Brew edit distance"; + description = "Implementation of the Brew edit distance"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -27145,7 +27212,7 @@ with self; { }; propagatedBuildInputs = [ DevelStackTrace Moo ]; meta = { - description = "A role for classes that can be thrown"; + description = "Role for classes that can be thrown"; homepage = "https://github.com/rjbs/Throwable"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -27160,7 +27227,7 @@ with self; { }; propagatedBuildInputs = [ ClassVirtual enum ]; meta = { - description = "A Least-Recently Used cache"; + description = "Least-Recently Used cache"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -27309,7 +27376,7 @@ with self; { hash = "sha256-KeniEzlRBGx48gXxs+jfYskOEU8OCPoGuBd2ag+AixI="; }; meta = { - description = "Variable ties made much easier: much, much, much easier.."; + description = "Variable ties made much easier: much, much, much easier."; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -27448,7 +27515,7 @@ with self; { hash = "sha256-0H+lgFKb6sapyCdMa/IgtMOq3mhd9lwWadUzOb9u8eg="; }; meta = { - description = "A Perl module to deal with time periods"; + description = "Perl module to deal with time periods"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.winpat ]; }; @@ -27503,7 +27570,7 @@ with self; { buildInputs = [ Tk ]; doCheck = false; # Expects working X11. meta = { - description = "A toolbar widget for Perl/Tk"; + description = "Toolbar widget for Perl/Tk"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -27517,7 +27584,7 @@ with self; { }; propagatedBuildInputs = [ FileSlurpTiny ]; meta = { - description = "An N-ary tree"; + description = "N-ary tree"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -27531,7 +27598,7 @@ with self; { }; buildInputs = [ TestException ]; meta = { - description = "A simple tree object"; + description = "Simple tree object"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -27546,7 +27613,7 @@ with self; { propagatedBuildInputs = [ TreeSimple ]; buildInputs = [ TestException ]; meta = { - description = "A factory object for dispensing Visitor objects"; + description = "Factory object for dispensing Visitor objects"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -28210,7 +28277,7 @@ with self; { hash = "sha256-tOR0C41Mt4NZEnPGNr1oMEiS4o2J6Iq/knOx3hf1Uvc="; }; meta = { - description = "A generalisation of wantarray"; + description = "Generalisation of wantarray"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -28416,7 +28483,7 @@ with self; { }; propagatedBuildInputs = [ XMLParser ]; meta = { - description = "A perl module for parsing XML encoding maps"; + description = "Perl module for parsing XML encoding maps"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -28584,7 +28651,7 @@ with self; { }; propagatedBuildInputs = [ XMLLibXML ]; meta = { - description = "An API for simple XML files"; + description = "API for simple XML files"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -28626,7 +28693,7 @@ with self; { hash = "sha256-R+mVhZ+N0EE6o/ItNQxKYtplLoVCZ6oFhq5USuK65e8="; }; meta = { - description = "A simple generic namespace processor"; + description = "Simple generic namespace processor"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -28647,7 +28714,7 @@ with self; { makeMakerFlags = [ "EXPATLIBPATH=${pkgs.expat.out}/lib" "EXPATINCPATH=${pkgs.expat.dev}/include" ]; propagatedBuildInputs = [ LWP ]; meta = { - description = "A perl module for parsing XML documents"; + description = "Perl module for parsing XML documents"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -28690,7 +28757,7 @@ with self; { hash = "sha256-0v57y70L66FET0pzNAHnuKpSgvrUJm1Cc13XRYKy4mQ="; }; meta = { - description = "A re-usable XPath engine for DOM-like trees"; + description = "Re-usable XPath engine for DOM-like trees"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -28838,7 +28905,7 @@ with self; { }; propagatedBuildInputs = [ XMLSAXExpat ]; meta = { - description = "An API for simple XML files"; + description = "API for simple XML files"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -28885,7 +28952,7 @@ with self; { propagatedBuildInputs = [ XMLParser ]; doCheck = false; # requires lots of extra packages meta = { - description = "A Perl module for processing huge XML documents in tree mode"; + description = "Perl module for processing huge XML documents in tree mode"; license = with lib.licenses; [ artistic1 gpl1Plus ]; mainProgram = "xml_grep"; }; @@ -28941,7 +29008,7 @@ with self; { hash = "sha256-JQDEeGnPXKjGHdI8Z7rav2a48e+14nkgdlfBzmk+IR4="; }; buildInputs = [ ExtUtilsCChecker Test2Suite ]; - perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -29042,10 +29109,10 @@ with self; { YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.88"; + version = "0.89"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IN/INGY/YAML-LibYAML-0.88.tar.gz"; - hash = "sha256-qKJzjMzDMqj3VJxMJ/PgCQyasR7vD2yFZEUXc5gTVng="; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.89.tar.gz"; + hash = "sha256-FVq4NnU0XFCt0DMRrPndkVlVcH+Qmiq9ixfXeShZsuw="; }; meta = { description = "Perl YAML Serialization using XS and libyaml"; @@ -29078,7 +29145,7 @@ with self; { propagatedBuildInputs = [ ClassMethodModifiers JSONValidator Mojolicious MojoliciousPluginI18N MojoliciousPluginOpenAPI RoleTiny ]; meta = { homepage = "http://preaction.me/yancy/"; - description = "The Best Web Framework Deserves the Best CMS"; + description = "Best Web Framework Deserves the Best CMS"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -29093,7 +29160,7 @@ with self; { buildInputs = [ NetHTTP TestFailWarnings TestFatal ]; propagatedBuildInputs = [ HTTPHeadersActionPack HTTPMessage HashMultiValue IOHandleUtil ModuleRuntime Plack SubExporter TryTiny ]; meta = { - description = "A Perl port of Webmachine"; + description = "Perl port of Webmachine"; homepage = "https://metacpan.org/release/Web-Machine"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -29183,7 +29250,7 @@ with self; { propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketINET6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP NetIPXS Readonly TextCSV ZonemasterLDNS libintl-perl ]; meta = { - description = "A tool to check the quality of a DNS zone"; + description = "Tool to check the quality of a DNS zone"; license = with lib.licenses; [ bsd3 ]; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 62ffa53e54ead..7377f60da7d38 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -16,7 +16,7 @@ , gettext , gmp , html-tidy -, icu64 +, icu73 , libffi , libiconv , libkrb5 @@ -46,15 +46,18 @@ , fetchpatch }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: let + inherit (self) buildPecl callPackage mkExtension php; + + builders = import ../build-support/php/builders { + inherit callPackages callPackage buildPecl; + }; +in { buildPecl = callPackage ../build-support/php/build-pecl.nix { php = php.unwrapped; }; - composerHooks = callPackages ../build-support/php/hooks { }; - - mkComposerRepository = callPackage ../build-support/php/build-composer-repository.nix { }; - buildComposerProject = callPackage ../build-support/php/build-composer-project.nix { }; + inherit (builders.v1) buildComposerProject buildComposerWithPlugin composerHooks mkComposerRepository; # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. @@ -188,6 +191,10 @@ lib.makeScope pkgs.newScope (self: with self; { composer = callPackage ../development/php-packages/composer { }; + composer-local-repo-plugin = callPackage ../development/php-packages/composer-local-repo-plugin { }; + + cyclonedx-php-composer = callPackage ../development/php-packages/cyclonedx-php-composer { }; + deployer = callPackage ../development/php-packages/deployer { }; grumphp = callPackage ../development/php-packages/grumphp { }; @@ -425,10 +432,9 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "iconv"; - configureFlags = [ - "--with-iconv${lib.optionalString stdenv.isDarwin "=${libiconv}"}" - ]; - doCheck = false; + buildInputs = [ libiconv ]; + configureFlags = [ "--with-iconv" ]; + doCheck = stdenv.isLinux; } { name = "imap"; @@ -437,7 +443,7 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "intl"; - buildInputs = [ icu64 ]; + buildInputs = [ icu73 ]; } { name = "ldap"; @@ -614,6 +620,7 @@ lib.makeScope pkgs.newScope (self: with self; { "--enable-soap" ]; doCheck = false; + internalDeps = [ php.extensions.session ]; } { name = "sockets"; @@ -672,7 +679,11 @@ lib.makeScope pkgs.newScope (self: with self; { env.NIX_CFLAGS_COMPILE = toString [ "-I../.." "-DHAVE_DOM" ]; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } - { name = "zend_test"; } + { + name = "zend_test"; + internalDeps = [ php.extensions.dom ]; + env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + } { name = "zip"; buildInputs = [ libzip pcre2 ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e75f863bbcbce..a10f40d615f62 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,11 +36,13 @@ mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute name: `pkgs.adafruit-nrfutil`."; # Added 2023-11-19 + aioaladdinconnect = throw "aioaladdinconnect has been removed, as the API is supported was obsoleted on 2024-01-24."; # Added 2024-06-07 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16 amazon_kclpy = amazon-kclpy; # added 2023-08-08 + ambiclimate = throw "ambiclimate has been removed, because the service has been terminated after 2024-03-31."; # Added 2024-06-07 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute name: `pkgs.ansible-doctor`"; # Added 2023-05-16 ansible-later = throw "ansible-later has been promoted to a top-level attribute name: `pkgs.ansible-later`"; # Added 2023-05-16 @@ -80,9 +82,12 @@ mapAliases ({ bt_proximity = bt-proximity; # added 2021-07-02 BTrees = btrees; # added 2023-02-19 cacheyou = throw "cacheyou has been removed, as it was no longer used for the only consumer pdm"; # added 2023-12-21 + cadquery = throw "cadquery was removed, because it was disabled on all python version since 3.8 and marked as broken"; # added 2024-05-13 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 cchardet = faust-cchardet; # added 2023-03-02 + cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07 class-registry = phx-class-registry; # added 2021-10-05 + cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20 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 name: `pkgs.codespell`"; # Added 2022-10-02 ColanderAlchemy = colanderalchemy; # added 2023-02-19 @@ -90,8 +95,10 @@ mapAliases ({ 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 - covCore = cov-core; # added 2024-01-03 + covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20 + cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 + cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 cx_Freeze = cx-freeze; # added 2023-08-02 cx_oracle = cx-oracle; # added 2024-01-03 @@ -126,15 +133,19 @@ mapAliases ({ django-hijack-admin = throw "django-hijack-admin has been removed, since it is no longer compatible to django-hijack"; # added 2023-06-21 django_modelcluster = django-modelcluster; # added 2022-04-02 django_nose = django-nose; # added 2023-07-25 + django-nose = throw "django-nose has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21 django_reversion = django-reversion; # added 2022-06-18 django_polymorphic = django-polymorphic; # added 2022-05-24 django_redis = django-redis; # added 2021-10-11 django_silk = django-silk; # added 2023-07-25 + django-sr = throw "django-sr has been removed since it has been unmaintained for 10 years"; # added 2024-05-26 django_tagging = django-tagging; # added 2023-07-25 django_taggit = django-taggit; # added 2021-10-11 django_treebeard = django-treebeard; # added 2023-07-25 dns = dnspython; # added 2017-12-10 docker_pycreds = docker-pycreds; # added 2024-01-03 + docker-py = throw "docker-py was renamed to docker in version 2.0.0 back in 2016"; # added 2024-05-29 + doctest-ignore-unicode = throw "doctest-ignore-unicode has been removed since it has been unmaintained for 11 years"; # added 2024-05-20 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 @@ -181,6 +192,7 @@ mapAliases ({ foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01 + functools32 = throw "functool32 was removed from nixpkgs, because python 2.7 has reach end of life in early 2020"; # added 2024-05-16 fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05 garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04 garminconnect-ha = garminconnect; # added 2022-02-05 @@ -192,6 +204,7 @@ mapAliases ({ GitPython = gitpython; # added 2022-10-28 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 glasgow = throw "glasgow has been promoted to a top-level attribute name: `pkgs.glasgow`"; # added 2023-02-05 + globre = throw "globre was removed, because it was disabled on all python version since 3.7 and last updated in 2020."; # added 2024-05-13 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 google-apitools = throw "google-apitools was removed because it is deprecated and unsupported by upstream"; # added 2023-02-25 @@ -213,6 +226,7 @@ mapAliases ({ hglib = python-hglib; # added 2023-10-13 homeassistant-bring-api = bring-api; # added 2024-04-11 homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05 + htmllaundry = throw "htmllaundry has been removed because it is abandoned"; # added 2024-06-04 HTSeq = htseq; # added 2023-02-19 hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08 @@ -222,6 +236,7 @@ mapAliases ({ imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 + ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years"; # added 2024-05-21 ipython_genutils = ipython-genutils; # added 2023-10-12 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 itanium_demangler = itanium-demangler; # added 2022-10-17 @@ -254,6 +269,7 @@ mapAliases ({ lazr_config = lazr-config; # added 2023-11-03 lazr_delegates = lazr-delegates; # added 2023-11-03 lazy_import = lazy-import; # added 2024-01-07 + lazy-import = throw "lazy-import has been removed because it was unused."; # added 2024-05-20 lazy_imports = lazy-imports; # added 2023-10-13 ledger_agent = ledger-agent; # Added 2024-01-07 lektor = throw "lektor has been promoted to a top-level attribute name: `pkgs.lektor`"; # added 2023-08-01 @@ -278,6 +294,7 @@ mapAliases ({ mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29 mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29 manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20 + marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10 markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19 memory_profiler = memory-profiler; # added 2023-10-09 mir_eval = mir-eval; # added 2024-01-07 @@ -292,7 +309,13 @@ mapAliases ({ net2grid = gridnet; # add 2022-04-22 nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08 ninja-python = ninja; # add 2022-08-03 + nosejs = throw "nosejs has been removed since it has not been maintained for 15 years and there are no dependent packages"; # added 2024-05-21 + nose-cov = throw "nose-cov has been removed, it was archived and unmaintained since 2012"; # added 2024-05-21 + nosexcover = throw "nosexcover has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 + nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21 + nose-exclude = throw "nose-exclude has been removed since it has not been maintained since 2016"; # added 2024-05-21 + nose-randomly = throw "nose-randomly has been removed, it was archived and unmaintained since 2019"; # added 2024-05-22 nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21 nose_warnings_filters = nose-warnings-filters; # added 2024-01-07 notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02 @@ -305,6 +328,7 @@ mapAliases ({ pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 + pathlib = throw "pathlib was removed as it has been integrated in python standard library in version 3.4"; # added 2024-05-13 pathpy = path; # added 2022-04-12 pcbnew-transition = pcbnewtransition; # added 2024-03-21 pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29 @@ -318,6 +342,7 @@ mapAliases ({ postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29 powerlineMemSegment = powerline-mem-segment; # added 2021-10-08 privacyidea-ldap-proxy = throw "privacyidea-ldap-proxy has been removed from nixpkgs"; # added 2023-10-31 + proboscis = throw "proboscis has been removed since it has not been maintained for 11 years"; # added 2024-05-20 prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 protonup = protonup-ng; # Added 2022-11-06 @@ -325,12 +350,14 @@ mapAliases ({ pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 Pweave = pweave; # added 2023-02-19 + pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13 py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07 py_stringmatching = py-stringmatching; # added 2023-11-12 pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02 pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23 pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 + pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10 pygame_sdl2 = pygame-sdl2; # added 2024-01-07 pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20 PyGithub = pygithub; # added 2023-02-19 @@ -339,14 +366,15 @@ mapAliases ({ pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14 PyChromecast = pychromecast; # added 2023-02-19 pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 + pyfftw = throw "pyfftw has been removed because it is unmaintained and broken."; # Added 2024-06-17 pyflunearyou = pyoutbreaksnearme; # added 2023-02-11 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 PyICU = pyicu; # Added 2022-12-22 - pyjson5 = json5; # added 2022-08-28 pyhs100 = throw "pyhs100 has been removed in favor of python-kasa."; # added 2024-01-05 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 + pylti = throw "pylti has been removed because it is unmaintained since 2019"; # added 2024-05-21 pymaging = throw "pymaging has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 pymaging_png = throw "pymaging_png has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20 @@ -369,6 +397,7 @@ mapAliases ({ pyramid_multiauth = pyramid-multiauth; # added 2023-08-24 pyreadability = readability-lxml; # added 2022-05-24 pyres = throw "pyres has been removed, since it is abandoned and broken"; # added 2023-06-20 + pygeos = throw "pygeos has been removed, since it was merged with shapely 2.0"; # added 2024-05-26 pyRFC3339 = pyrfc3339; # added 2024-01-07 pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pyroute2-ethtool = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 @@ -426,6 +455,7 @@ mapAliases ({ PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05 + pyzufall = throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qds_sdk = qds-sdk; # added 2023-10-21 Quandl = quandl; # added 2023-02-19 @@ -465,12 +495,14 @@ mapAliases ({ sapi-python-client = kbcstorage; # added 2022-04-20 scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 + scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_dso = setuptools-dso; # added 2024-03-03 setuptools_scm = setuptools-scm; # added 2021-06-03 setuptoolsTrial = setuptools-trial; # added 2023-11-11 sharkiqpy = sharkiq; # added 2022-05-21 + shouldbe = throw "shouldbe was removed, because it was disabled on all python version since 3.8 and last updated in 2019."; # added 2024-05-12 sip_4 = sip4; # added 2024-01-07 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 @@ -491,6 +523,7 @@ mapAliases ({ sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 + sqlsoup = throw "sqlsoup has been removed as it is incompatible with modern SQLAlchemy and unmaintained"; # added 2024-05-13 subdownloader = throw "subdownloader has been removed, because it depended on pyqt4"; # added 2022-06-09 suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27 supervise_api = supervise-api; # added 2023-10-11 @@ -505,7 +538,12 @@ mapAliases ({ Theano = theano; # added 2023-02-19 TheanoWithCuda = theanoWithCuda; # added 2023-02-19 TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19 + theano = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20 + theanoWithCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20 + theanoWithoutCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20 + theano-pymc = throw "theano-pymc has been removed because it is no longer maintained"; # added 2024-05-20 thumborPexif = throw "thumborPexif has been removed, because it was unused."; # added 2024-01-07 + torchgpipe = throw "torchgpipe has been removed, because it appears unmaintained and Pytorch now includes pipeline parallelism support"; # added 2024-05-18 torrent_parser = torrent-parser; # added 2023-11-04 transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 py-tree-sitter = throw "Was merged with tree-sitter."; # added 2024-03-20 @@ -546,6 +584,7 @@ mapAliases ({ zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; zc-buildout221 = zc-buildout; # added 2021-07-21 zc_lockfile = zc-lockfile; # added 2024-01-06 + zipstream = throw "zipstream has been removed, because it has been unmaintained for 6 years and there are no dependent packages"; # added 2024-05-26 zipstream-new = throw "zipstream-new has been removed, because it was packaged as a dependency for octoprint, which has switched to zipstream-ng since."; # added 2024-01-05 zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26 zope_component = zope-component; # added 2023-07-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 754a18310412c..3067e18baed06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -153,8 +153,6 @@ self: super: with self; { aioairq = callPackage ../development/python-modules/aioairq { }; - aioaladdinconnect = callPackage ../development/python-modules/aioaladdinconnect { }; - aioambient = callPackage ../development/python-modules/aioambient { }; aioapcaccess = callPackage ../development/python-modules/aioapcaccess { }; @@ -249,6 +247,10 @@ self: super: with self; { aiohttp-fast-url-dispatcher = callPackage ../development/python-modules/aiohttp-fast-url-dispatcher { }; + aiohttp-fast-zlib = callPackage ../development/python-modules/aiohttp-fast-zlib { }; + + aiohttp-isal = callPackage ../development/python-modules/aiohttp-isal { }; + aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; aiohttp-oauthlib = callPackage ../development/python-modules/aiohttp-oauthlib { }; @@ -259,6 +261,8 @@ self: super: with self; { aiohttp-retry = callPackage ../development/python-modules/aiohttp-retry { }; + aiohttp-session = callPackage ../development/python-modules/aiohttp-session { }; + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; @@ -307,6 +311,10 @@ self: super: with self; { aiolyric = callPackage ../development/python-modules/aiolyric { }; + aiomcache = callPackage ../development/python-modules/aiomcache { }; + + aiomealie = callPackage ../development/python-modules/aiomealie { }; + aiomisc = callPackage ../development/python-modules/aiomisc { }; aiomisc-pytest = callPackage ../development/python-modules/aiomisc-pytest { }; @@ -457,6 +465,8 @@ self: super: with self; { aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + aiozoneinfo = callPackage ../development/python-modules/aiozoneinfo { }; + airium = callPackage ../development/python-modules/airium { }; airly = callPackage ../development/python-modules/airly { }; @@ -533,8 +543,6 @@ self: super: with self; { amberelectric = callPackage ../development/python-modules/amberelectric { }; - ambiclimate = callPackage ../development/python-modules/ambiclimate { }; - amcrest = callPackage ../development/python-modules/amcrest { }; amiibo-py = callPackage ../development/python-modules/amiibo-py { }; @@ -781,10 +789,16 @@ self: super: with self; { asdf = callPackage ../development/python-modules/asdf { }; + asdf-astropy = callPackage ../development/python-modules/asdf-astropy { }; + + asdf-coordinates-schemas = callPackage ../development/python-modules/asdf-coordinates-schemas { }; + asdf-standard = callPackage ../development/python-modules/asdf-standard { }; asdf-transform-schemas = callPackage ../development/python-modules/asdf-transform-schemas { }; + asdf-wcs-schemas = callPackage ../development/python-modules/asdf-wcs-schemas { }; + ase = callPackage ../development/python-modules/ase { }; asf-search = callPackage ../development/python-modules/asf-search { }; @@ -925,6 +939,8 @@ self: super: with self; { atsim-potentials = callPackage ../development/python-modules/atsim-potentials { }; + attacut = callPackage ../development/python-modules/attacut { }; + attrdict = callPackage ../development/python-modules/attrdict { }; attrs = callPackage ../development/python-modules/attrs { }; @@ -997,6 +1013,8 @@ self: super: with self; { autoslot = callPackage ../development/python-modules/autoslot { }; + autotrash = callPackage ../development/python-modules/autotrash { }; + avahi = toPythonModule (pkgs.avahi.override { inherit python; withPython = true; @@ -1016,6 +1034,8 @@ self: super: with self; { avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + avwx-engine = callPackage ../development/python-modules/avwx-engine { }; + aw-client = callPackage ../development/python-modules/aw-client { }; aw-core = callPackage ../development/python-modules/aw-core { }; @@ -1318,6 +1338,17 @@ self: super: with self; { babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; + babeltrace = toPythonModule (pkgs.babeltrace.override { + pythonPackages = self; + enablePython = true; + }); + + babeltrace2 = toPythonModule (pkgs.babeltrace2.override { + inherit (self) python; + pythonPackages = self; + enablePython = true; + }); + bambi = callPackage ../development/python-modules/bambi { }; pad4pi = callPackage ../development/python-modules/pad4pi { }; @@ -1330,6 +1361,8 @@ self: super: with self; { paddlepaddle = callPackage ../development/python-modules/paddlepaddle { }; + pcffont = callPackage ../development/python-modules/pcffont { }; + pueblo = callPackage ../development/python-modules/pueblo { }; pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; @@ -1455,6 +1488,14 @@ self: super: with self; { beancount-docverif = callPackage ../development/python-modules/beancount-docverif { }; + beanhub-cli = callPackage ../development/python-modules/beanhub-cli { }; + + beanhub-extract = callPackage ../development/python-modules/beanhub-extract { }; + + beanhub-forms = callPackage ../development/python-modules/beanhub-forms { }; + + beanhub-import = callPackage ../development/python-modules/beanhub-import { }; + beanstalkc = callPackage ../development/python-modules/beanstalkc { }; beartype = callPackage ../development/python-modules/beartype { }; @@ -1481,6 +1522,8 @@ self: super: with self; { bentoml = callPackage ../development/python-modules/bentoml { }; + berkeleydb = callPackage ../development/python-modules/berkeleydb { }; + bespon = callPackage ../development/python-modules/bespon { }; betacode = callPackage ../development/python-modules/betacode { }; @@ -1503,10 +1546,14 @@ self: super: with self; { biliass = callPackage ../development/python-modules/biliass { }; + bilibili-api-python = callPackage ../development/python-modules/bilibili-api-python { }; + billiard = callPackage ../development/python-modules/billiard { }; bimmer-connected = callPackage ../development/python-modules/bimmer-connected { }; + binance-connector = callPackage ../development/python-modules/binance-connector { }; + binary = callPackage ../development/python-modules/binary { }; binary2strings = callPackage ../development/python-modules/binary2strings { }; @@ -1523,6 +1570,8 @@ self: super: with self; { binwalk-full = self.binwalk.override { visualizationSupport = true; }; + biom-format = callPackage ../development/python-modules/biom-format { }; + biopandas = callPackage ../development/python-modules/biopandas { }; biopython = callPackage ../development/python-modules/biopython { }; @@ -1844,10 +1893,6 @@ self: super: with self; { cachy = callPackage ../development/python-modules/cachy { }; - cadquery = callPackage ../development/python-modules/cadquery { - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - }; - caffe = toPythonModule (pkgs.caffe.override { pythonSupport = true; inherit (self) python numpy boost; @@ -1921,6 +1966,8 @@ self: super: with self; { cashaddress = callPackage ../development/python-modules/cashaddress { }; + cashews = callPackage ../development/python-modules/cashews { }; + cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; castepxbin = callPackage ../development/python-modules/castepxbin { }; @@ -1992,8 +2039,6 @@ self: super: with self; { coqpit = callPackage ../development/python-modules/coqpit { }; - cepa = callPackage ../development/python-modules/cepa { }; - cerberus = callPackage ../development/python-modules/cerberus { }; cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { }; @@ -2064,6 +2109,8 @@ self: super: with self; { chameleon = callPackage ../development/python-modules/chameleon { }; + changefinder = callPackage ../development/python-modules/changefinder { }; + channels = callPackage ../development/python-modules/channels { }; channels-redis = callPackage ../development/python-modules/channels-redis { }; @@ -2170,8 +2217,6 @@ self: super: with self; { classify-imports = callPackage ../development/python-modules/classify-imports { }; - cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; - cle = callPackage ../development/python-modules/cle { }; clean-fid = callPackage ../development/python-modules/clean-fid { }; @@ -2184,6 +2229,8 @@ self: super: with self; { clf = callPackage ../development/python-modules/clf { }; + cli-ui = callPackage ../development/python-modules/cli-ui { }; + clip = callPackage ../development/python-modules/clip { }; clip-anytorch = callPackage ../development/python-modules/clip-anytorch { }; @@ -2342,6 +2389,8 @@ self: super: with self; { collidoscope = callPackage ../development/python-modules/collidoscope { }; + color-operations = callPackage ../development/python-modules/color-operations { }; + colorama = callPackage ../development/python-modules/colorama { }; colorcet = callPackage ../development/python-modules/colorcet { }; @@ -2478,8 +2527,6 @@ self: super: with self; { courlan = callPackage ../development/python-modules/courlan { }; - cov-core = callPackage ../development/python-modules/cov-core { }; - coverage = callPackage ../development/python-modules/coverage { }; coveralls = callPackage ../development/python-modules/coveralls { }; @@ -2549,6 +2596,8 @@ self: super: with self; { crontab = callPackage ../development/python-modules/crontab { }; + crossandra = callPackage ../development/python-modules/crossandra { }; + crossplane = callPackage ../development/python-modules/crossplane { }; crownstone-cloud = callPackage ../development/python-modules/crownstone-cloud { }; @@ -2559,14 +2608,11 @@ self: super: with self; { crownstone-uart = callPackage ../development/python-modules/crownstone-uart { }; - cryptacular = callPackage ../development/python-modules/cryptacular { }; - cryptg = callPackage ../development/python-modules/cryptg { }; cryptodatahub = callPackage ../development/python-modules/cryptodatahub { }; cryptography = callPackage ../development/python-modules/cryptography { - inherit (pkgs.darwin) libiconv; inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; @@ -2591,7 +2637,6 @@ self: super: with self; { css-html-js-minify = callPackage ../development/python-modules/css-html-js-minify { }; css-inline = callPackage ../development/python-modules/css-inline { - inherit (pkgs.darwin) libiconv; inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -2605,6 +2650,8 @@ self: super: with self; { cstruct = callPackage ../development/python-modules/cstruct { }; + csv2md = callPackage ../development/python-modules/csv2md { }; + csvw = callPackage ../development/python-modules/csvw { }; ctap-keyring-device = callPackage ../development/python-modules/ctap-keyring-device { }; @@ -2615,6 +2662,8 @@ self: super: with self; { cu2qu = callPackage ../development/python-modules/cu2qu { }; + customtkinter = callPackage ../development/python-modules/customtkinter { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; cufflinks = callPackage ../development/python-modules/cufflinks { }; @@ -2626,10 +2675,14 @@ self: super: with self; { curlify = callPackage ../development/python-modules/curlify { }; + curl-cffi = callPackage ../development/python-modules/curl-cffi { }; + curtsies = callPackage ../development/python-modules/curtsies { }; curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; + curvefitgui = callPackage ../development/python-modules/curvefitgui { }; + cvelib = callPackage ../development/python-modules/cvelib { }; cvss = callPackage ../development/python-modules/cvss { }; @@ -2656,6 +2709,8 @@ self: super: with self; { cyclonedx-python-lib = callPackage ../development/python-modules/cyclonedx-python-lib { }; + cyclopts = callPackage ../development/python-modules/cyclopts { }; + cymem = callPackage ../development/python-modules/cymem { }; cypari2 = callPackage ../development/python-modules/cypari2 { }; @@ -2680,6 +2735,8 @@ self: super: with self; { daff = callPackage ../development/python-modules/daff { }; + dahlia = callPackage ../development/python-modules/dahlia { }; + daiquiri = callPackage ../development/python-modules/daiquiri { }; dalle-mini = callPackage ../development/python-modules/dalle-mini { }; @@ -2694,6 +2751,8 @@ self: super: with self; { dash = callPackage ../development/python-modules/dash { }; + dash-bootstrap-components = callPackage ../development/python-modules/dash-bootstrap-components { }; + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; dash-html-components = callPackage ../development/python-modules/dash-html-components { }; @@ -2910,6 +2969,8 @@ self: super: with self; { deltachat = callPackage ../development/python-modules/deltachat { }; + deltachat2 = callPackage ../development/python-modules/deltachat2 { }; + deluge-client = callPackage ../development/python-modules/deluge-client { }; demes = callPackage ../development/python-modules/demes { }; @@ -2948,6 +3009,8 @@ self: super: with self; { detectron2 = callPackage ../development/python-modules/detectron2 { }; + devgoldyutils = callPackage ../development/python-modules/devgoldyutils { }; + devialet = callPackage ../development/python-modules/devialet { }; devito = callPackage ../development/python-modules/devito { }; @@ -3024,6 +3087,8 @@ self: super: with self; { dissect = callPackage ../development/python-modules/dissect { }; + dissect-archive = callPackage ../development/python-modules/dissect-archive { }; + dissect-btrfs = callPackage ../development/python-modules/dissect-btrfs { }; dissect-cim = callPackage ../development/python-modules/dissect-cim { }; @@ -3258,8 +3323,6 @@ self: super: with self; { django-ninja = callPackage ../development/python-modules/django-ninja { }; - django-nose = callPackage ../development/python-modules/django-nose { }; - django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; django-otp = callPackage ../development/python-modules/django-otp { }; @@ -3300,6 +3363,8 @@ self: super: with self; { django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; + django-ratelimit = callPackage ../development/python-modules/django-ratelimit { }; + django-raster = callPackage ../development/python-modules/django-raster { }; django-redis = callPackage ../development/python-modules/django-redis { }; @@ -3344,7 +3409,7 @@ self: super: with self; { django-sites = callPackage ../development/python-modules/django-sites { }; - django-sr = callPackage ../development/python-modules/django-sr { }; + django-soft-delete = callPackage ../development/python-modules/django-soft-delete { }; django-statici18n = callPackage ../development/python-modules/django-statici18n { }; @@ -3408,6 +3473,8 @@ self: super: with self; { dmenu-python = callPackage ../development/python-modules/dmenu { }; + dm-control = callPackage ../development/python-modules/dm-control { }; + dm-env = callPackage ../development/python-modules/dm-env { }; dm-haiku = callPackage ../development/python-modules/dm-haiku { }; @@ -3446,8 +3513,6 @@ self: super: with self; { docker-pycreds = callPackage ../development/python-modules/docker-pycreds { }; - docker-py = callPackage ../development/python-modules/docker-py { }; - dockerspawner = callPackage ../development/python-modules/dockerspawner { }; docloud = callPackage ../development/python-modules/docloud { }; @@ -3466,8 +3531,6 @@ self: super: with self; { docrep = callPackage ../development/python-modules/docrep { }; - doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; - docutils = callPackage ../development/python-modules/docutils { }; docx2python = callPackage ../development/python-modules/docx2python { }; @@ -3530,6 +3593,8 @@ self: super: with self; { drawilleplot = callPackage ../development/python-modules/drawilleplot { }; + drawsvg = callPackage ../development/python-modules/drawsvg { }; + dremel3dpy = callPackage ../development/python-modules/dremel3dpy { }; drf-jwt = callPackage ../development/python-modules/drf-jwt { }; @@ -3556,6 +3621,8 @@ self: super: with self; { dropmqttapi = callPackage ../development/python-modules/dropmqttapi { }; + dscribe = callPackage ../development/python-modules/dscribe { }; + ds-store = callPackage ../development/python-modules/ds-store { }; ds4drv = callPackage ../development/python-modules/ds4drv { }; @@ -3725,7 +3792,7 @@ self: super: with self; { eggdeps = callPackage ../development/python-modules/eggdeps { }; - eigenpy = toPythonModule (callPackage ../development/python-modules/eigenpy { }); + eigenpy = callPackage ../development/python-modules/eigenpy { }; einops = callPackage ../development/python-modules/einops { }; @@ -3863,6 +3930,8 @@ self: super: with self; { espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { }; + esper = callPackage ../development/python-modules/esper { }; + esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { }; esprima = callPackage ../development/python-modules/esprima { }; @@ -3982,6 +4051,8 @@ self: super: with self; { exitcode = callPackage ../development/python-modules/exitcode { }; + extension-helpers = callPackage ../development/python-modules/extension-helpers { }; + extract-msg = callPackage ../development/python-modules/extract-msg { }; extractcode = callPackage ../development/python-modules/extractcode { }; @@ -4012,6 +4083,11 @@ self: super: with self; { ezyrb = callPackage ../development/python-modules/ezyrb { }; + f3d = toPythonModule (pkgs.f3d.override { + withPythonBinding = true; + python3Packages = self; + }); + f5-icontrol-rest = callPackage ../development/python-modules/f5-icontrol-rest { }; f5-sdk = callPackage ../development/python-modules/f5-sdk { }; @@ -4173,6 +4249,8 @@ self: super: with self; { filecheck = callPackage ../development/python-modules/filecheck { }; + filedate = callPackage ../development/python-modules/filedate { }; + filedepot = callPackage ../development/python-modules/filedepot { }; filelock = callPackage ../development/python-modules/filelock { }; @@ -4504,6 +4582,8 @@ self: super: with self; { frelatage = callPackage ../development/python-modules/frelatage { }; + freud = callPackage ../development/python-modules/freud { }; + frida-python = callPackage ../development/python-modules/frida-python { }; frigidaire = callPackage ../development/python-modules/frigidaire { }; @@ -4544,8 +4624,6 @@ self: super: with self; { functiontrace = callPackage ../development/python-modules/functiontrace { }; - functools32 = callPackage ../development/python-modules/functools32 { }; - funcy = callPackage ../development/python-modules/funcy { }; funsor = callPackage ../development/python-modules/funsor { }; @@ -4667,6 +4745,8 @@ self: super: with self; { generic = callPackage ../development/python-modules/generic { }; + genie-partner-sdk = callPackage ../development/python-modules/genie-partner-sdk { }; + geniushub-client = callPackage ../development/python-modules/geniushub-client { }; genome-collector = callPackage ../development/python-modules/genome-collector { }; @@ -4687,6 +4767,8 @@ self: super: with self; { geocoder = callPackage ../development/python-modules/geocoder { }; + geodatasets = callPackage ../development/python-modules/geodatasets { }; + geographiclib = callPackage ../development/python-modules/geographiclib { }; geoip2 = callPackage ../development/python-modules/geoip2 { }; @@ -4753,6 +4835,8 @@ self: super: with self; { gfsubsets = callPackage ../development/python-modules/gfsubsets { }; + gguf = callPackage ../development/python-modules/gguf { }; + ghapi = callPackage ../development/python-modules/ghapi { }; ghdiff = callPackage ../development/python-modules/ghdiff { }; @@ -4778,6 +4862,8 @@ self: super: with self; { git-filter-repo = callPackage ../development/python-modules/git-filter-repo { }; + git-find-repos = callPackage ../development/python-modules/git-find-repos { }; + git-revise = callPackage ../development/python-modules/git-revise { }; git-sweep = callPackage ../development/python-modules/git-sweep { }; @@ -4820,8 +4906,6 @@ self: super: with self; { glob2 = callPackage ../development/python-modules/glob2 { }; - globre = callPackage ../development/python-modules/globre { }; - globus-sdk = callPackage ../development/python-modules/globus-sdk { }; glom = callPackage ../development/python-modules/glom { }; @@ -4852,6 +4936,8 @@ self: super: with self; { goodwe = callPackage ../development/python-modules/goodwe { }; + gophish = callPackage ../development/python-modules/gophish { }; + google = callPackage ../development/python-modules/google { }; google-ai-generativelanguage = callPackage ../development/python-modules/google-ai-generativelanguage { }; @@ -5208,6 +5294,8 @@ self: super: with self; { gviz-api = callPackage ../development/python-modules/gviz-api { }; + gwcs = callPackage ../development/python-modules/gwcs { }; + gym = callPackage ../development/python-modules/gym { }; gym-notices = callPackage ../development/python-modules/gym-notices { }; @@ -5256,6 +5344,8 @@ self: super: with self; { hahomematic = callPackage ../development/python-modules/hahomematic { }; + hakuin = callPackage ../development/python-modules/hakuin { }; + halo = callPackage ../development/python-modules/halo { }; halohome = callPackage ../development/python-modules/halohome { }; @@ -5276,10 +5366,14 @@ self: super: with self; { hatch-jupyter-builder = callPackage ../development/python-modules/hatch-jupyter-builder { }; + hatch-odoo = callPackage ../development/python-modules/hatch-odoo { }; + hatch-vcs = callPackage ../development/python-modules/hatch-vcs { }; hatch-nodejs-version = callPackage ../development/python-modules/hatch-nodejs-version { }; + hatch-regex-commit = callPackage ../development/python-modules/hatch-regex-commit { }; + hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { }; haversine = callPackage ../development/python-modules/haversine { }; @@ -5358,6 +5452,8 @@ self: super: with self; { hikari = callPackage ../development/python-modules/hikari { }; + hikari-lightbulb = callPackage ../development/python-modules/hikari-lightbulb { }; + hikvision = callPackage ../development/python-modules/hikvision { }; hiredis = callPackage ../development/python-modules/hiredis { }; @@ -5455,8 +5551,6 @@ self: super: with self; { htmldate = callPackage ../development/python-modules/htmldate { }; - htmllaundry = callPackage ../development/python-modules/htmllaundry { }; - htmllistparse = callPackage ../development/python-modules/htmllistparse { }; htmlmin = callPackage ../development/python-modules/htmlmin { }; @@ -5515,6 +5609,8 @@ self: super: with self; { httpx-sse = callPackage ../development/python-modules/httpx-sse { }; + httpx-ws = callPackage ../development/python-modules/httpx-ws { }; + huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { }; huey = callPackage ../development/python-modules/huey { }; @@ -5737,6 +5833,8 @@ self: super: with self; { indexed-zstd = callPackage ../development/python-modules/indexed-zstd { inherit (pkgs) zstd; }; + inequality = callPackage ../development/python-modules/inequality { }; + infinity = callPackage ../development/python-modules/infinity { }; inflect = callPackage ../development/python-modules/inflect { }; @@ -5763,6 +5861,8 @@ self: super: with self; { inkex = callPackage ../development/python-modules/inkex { }; + inline-snapshot = callPackage ../development/python-modules/inline-snapshot { }; + inlinestyler = callPackage ../development/python-modules/inlinestyler { }; inotify = callPackage ../development/python-modules/inotify { }; @@ -5841,8 +5941,6 @@ self: super: with self; { ipdb = callPackage ../development/python-modules/ipdb { }; - ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - ipfshttpclient = callPackage ../development/python-modules/ipfshttpclient { }; i-pi = callPackage ../development/python-modules/i-pi { }; @@ -5895,9 +5993,13 @@ self: super: with self; { irctokens = callPackage ../development/python-modules/irctokens { }; + isal = callPackage ../development/python-modules/isal { }; + isbnlib = callPackage ../development/python-modules/isbnlib { }; - islpy = callPackage ../development/python-modules/islpy { }; + islpy = callPackage ../development/python-modules/islpy { + isl = pkgs.isl_0_24; + }; iso3166 = callPackage ../development/python-modules/iso3166 { }; @@ -5931,10 +6033,14 @@ self: super: with self; { itemloaders = callPackage ../development/python-modules/itemloaders { }; + iterable-io = callPackage ../development/python-modules/iterable-io { }; + iteration-utilities = callPackage ../development/python-modules/iteration-utilities { }; iterative-telemetry = callPackage ../development/python-modules/iterative-telemetry { }; + iterfzf = callPackage ../development/python-modules/iterfzf { }; + iterm2 = callPackage ../development/python-modules/iterm2 { }; itsdangerous = callPackage ../development/python-modules/itsdangerous { }; @@ -5945,6 +6051,8 @@ self: super: with self; { iwlib = callPackage ../development/python-modules/iwlib { }; + ixia = callPackage ../development/python-modules/ixia { }; + j2cli = callPackage ../development/python-modules/j2cli { }; jaconv = callPackage ../development/python-modules/jaconv { }; @@ -6070,10 +6178,6 @@ self: super: with self; { joserfc = callPackage ../development/python-modules/joserfc { }; - journalwatch = callPackage ../tools/system/journalwatch { - inherit (self) systemd pytest; - }; - jplephem = callPackage ../development/python-modules/jplephem { }; jproperties = callPackage ../development/python-modules/jproperties { }; @@ -6441,6 +6545,8 @@ self: super: with self; { langchain = callPackage ../development/python-modules/langchain { }; + langchain-chroma = callPackage ../development/python-modules/langchain-chroma { }; + langchain-community = callPackage ../development/python-modules/langchain-community { }; langchain-core = callPackage ../development/python-modules/langchain-core { }; @@ -6451,6 +6557,8 @@ self: super: with self; { langdetect = callPackage ../development/python-modules/langdetect { }; + langfuse = callPackage ../development/python-modules/langfuse { }; + langid = callPackage ../development/python-modules/langid { }; langsmith = callPackage ../development/python-modules/langsmith { }; @@ -6467,10 +6575,13 @@ self: super: with self; { laszip = callPackage ../development/python-modules/laszip { inherit (pkgs) cmake ninja; + inherit (pkgs.__splicedPackages) laszip; }; latex2mathml = callPackage ../development/python-modules/latex2mathml { }; + latex2pydata = callPackage ../development/python-modules/latex2pydata { }; + latexcodec = callPackage ../development/python-modules/latexcodec { }; latexify-py = callPackage ../development/python-modules/latexify-py { }; @@ -6491,8 +6602,6 @@ self: super: with self; { lazy = callPackage ../development/python-modules/lazy { }; - lazy-import = callPackage ../development/python-modules/lazy-import { }; - lazy-imports = callPackage ../development/python-modules/lazy-imports { }; lazy-loader = callPackage ../development/python-modules/lazy-loader { }; @@ -6562,6 +6671,8 @@ self: super: with self; { pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; + lib4sbom = callPackage ../development/python-modules/lib4sbom { }; + libais = callPackage ../development/python-modules/libais { }; libarchive-c = callPackage ../development/python-modules/libarchive-c { @@ -6616,6 +6727,8 @@ self: super: with self; { inherit (pkgs.config) cudaSupport; }; + libgravatar = callPackage ../development/python-modules/libgravatar { }; + libiio = (toPythonModule (pkgs.libiio.override { pythonSupport = true; inherit python; @@ -6652,6 +6765,11 @@ self: super: with self; { inherit (pkgs) libsodium; }; + libnbd = toPythonModule (pkgs.libnbd.override { + buildPythonBindings = true; + python3 = python; + }); + libpcap = callPackage ../development/python-modules/libpcap { pkgsLibpcap = pkgs.libpcap; # Needs the C library }; @@ -6660,6 +6778,8 @@ self: super: with self; { libpyfoscam = callPackage ../development/python-modules/libpyfoscam { }; + libpysal = callPackage ../development/python-modules/libpysal { }; + libpyvivotek = callPackage ../development/python-modules/libpyvivotek { }; libpwquality = lib.pipe pkgs.libpwquality [ @@ -6911,6 +7031,8 @@ self: super: with self; { llm = callPackage ../development/python-modules/llm { }; + llmx = callPackage ../development/python-modules/llmx { }; + llvmlite = callPackage ../development/python-modules/llvmlite { # llvmlite always requires a specific version of llvm. llvm = pkgs.llvm_14; @@ -6972,6 +7094,8 @@ self: super: with self; { loguru = callPackage ../development/python-modules/loguru { }; + loguru-logging-intercept = callPackage ../development/python-modules/loguru-logging-intercept { }; + logutils = callPackage ../development/python-modules/logutils { redis-server = pkgs.redis; }; @@ -6998,6 +7122,8 @@ self: super: with self; { lsprotocol = callPackage ../development/python-modules/lsprotocol { }; + lsp-tree-sitter = callPackage ../development/python-modules/lsp-tree-sitter { }; + ltpycld2 = callPackage ../development/python-modules/ltpycld2 { }; lttng = callPackage ../development/python-modules/lttng { }; @@ -7138,6 +7264,8 @@ self: super: with self; { mapbox-earcut = callPackage ../development/python-modules/mapbox-earcut { }; + mapclassify = callPackage ../development/python-modules/mapclassify { }; + mariadb = callPackage ../development/python-modules/mariadb { }; marimo = callPackage ../development/python-modules/marimo { }; @@ -7170,8 +7298,6 @@ self: super: with self; { marshmallow-dataclass = callPackage ../development/python-modules/marshmallow-dataclass { }; - marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; - marshmallow-oneofschema = callPackage ../development/python-modules/marshmallow-oneofschema { }; marshmallow-polyfield = callPackage ../development/python-modules/marshmallow-polyfield { }; @@ -7192,6 +7318,8 @@ self: super: with self; { mathlibtools = callPackage ../development/python-modules/mathlibtools { }; + mathutils = callPackage ../development/python-modules/mathutils { }; + matlink-gpapi = callPackage ../development/python-modules/matlink-gpapi { }; matplotlib = callPackage ../development/python-modules/matplotlib { @@ -7204,6 +7332,8 @@ self: super: with self; { matplotlib-sixel = callPackage ../development/python-modules/matplotlib-sixel { }; + matplotlib-venn = callPackage ../development/python-modules/matplotlib-venn { }; + matplotx = callPackage ../development/python-modules/matplotx { }; matrix-api-async = callPackage ../development/python-modules/matrix-api-async { }; @@ -7229,7 +7359,8 @@ self: super: with self; { maya = callPackage ../development/python-modules/maya { }; mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { - inherit (self) buildPythonPackage pythonOlder pythonAtLeast pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; + inherit buildPythonPackage pythonOlder pythonAtLeast; + inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; }; mayim = callPackage ../development/python-modules/mayim { }; @@ -7371,6 +7502,8 @@ self: super: with self; { mhcgnomes = callPackage ../development/python-modules/mhcgnomes { }; + miasm = callPackage ../development/python-modules/miasm { }; + miauth = callPackage ../development/python-modules/miauth { }; micawber = callPackage ../development/python-modules/micawber { }; @@ -7409,6 +7542,8 @@ self: super: with self; { millheater = callPackage ../development/python-modules/millheater { }; + minari = callPackage ../development/python-modules/minari { }; + mindsdb-evaluator = callPackage ../development/python-modules/mindsdb-evaluator { }; minexr = callPackage ../development/python-modules/minexr { }; @@ -7579,6 +7714,8 @@ self: super: with self; { model-bakery = callPackage ../development/python-modules/model-bakery { }; + model-checker = callPackage ../development/python-modules/model-checker { }; + modelcif = callPackage ../development/python-modules/modelcif { }; modeled = callPackage ../development/python-modules/modeled { }; @@ -7591,10 +7728,14 @@ self: super: with self; { mohawk = callPackage ../development/python-modules/mohawk { }; + molbar = callPackage ../development/python-modules/molbar { }; + molecule = callPackage ../development/python-modules/molecule { }; molecule-plugins = callPackage ../development/python-modules/molecule/plugins.nix { }; + momepy = callPackage ../development/python-modules/momepy { }; + monai = callPackage ../development/python-modules/monai { }; monai-deploy = callPackage ../development/python-modules/monai-deploy { }; @@ -7622,6 +7763,8 @@ self: super: with self; { monty = callPackage ../development/python-modules/monty { }; + monzopy = callPackage ../development/python-modules/monzopy { }; + moonraker-api = callPackage ../development/python-modules/moonraker-api { }; mopeka-iot-ble = callPackage ../development/python-modules/mopeka-iot-ble { }; @@ -7630,6 +7773,8 @@ self: super: with self; { more-properties = callPackage ../development/python-modules/more-properties { }; + morecantile = callPackage ../development/python-modules/morecantile { }; + moreorless = callPackage ../development/python-modules/moreorless { }; moretools = callPackage ../development/python-modules/moretools { }; @@ -7644,6 +7789,8 @@ self: super: with self; { motionblinds = callPackage ../development/python-modules/motionblinds { }; + motionblindsble = callPackage ../development/python-modules/motionblindsble { }; + motioneye-client = callPackage ../development/python-modules/motioneye-client { }; moto = callPackage ../development/python-modules/moto { }; @@ -7658,6 +7805,8 @@ self: super: with self; { mpd2 = callPackage ../development/python-modules/mpd2 { }; + mpegdash = callPackage ../development/python-modules/mpegdash { }; + mpi4py = callPackage ../development/python-modules/mpi4py { }; mpldatacursor = callPackage ../development/python-modules/mpldatacursor { }; @@ -8544,6 +8693,8 @@ self: super: with self; { names = callPackage ../development/python-modules/names { }; + namex = callPackage ../development/python-modules/namex { }; + name-that-hash = callPackage ../development/python-modules/name-that-hash { }; nameko = callPackage ../development/python-modules/nameko { }; @@ -8560,8 +8711,12 @@ self: super: with self; { natasha = callPackage ../development/python-modules/natasha { }; + natural = callPackage ../development/python-modules/natural { }; + nomadnet = callPackage ../development/python-modules/nomadnet { }; + noneprompt = callPackage ../development/python-modules/noneprompt { }; + nox = callPackage ../development/python-modules/nox { }; nanomsg-python = callPackage ../development/python-modules/nanomsg-python { @@ -8612,6 +8767,8 @@ self: super: with self; { nbformat = callPackage ../development/python-modules/nbformat { }; + nbmake = callPackage ../development/python-modules/nbmake { }; + nbmerge = callPackage ../development/python-modules/nbmerge { }; nbsmoke = callPackage ../development/python-modules/nbsmoke { }; @@ -8674,6 +8831,8 @@ self: super: with self; { netdata = callPackage ../development/python-modules/netdata { }; + netdata-pandas = callPackage ../development/python-modules/netdata-pandas { }; + netdisco = callPackage ../development/python-modules/netdisco { }; nethsm = callPackage ../development/python-modules/nethsm { }; @@ -8710,10 +8869,9 @@ self: super: with self; { nfcpy = callPackage ../development/python-modules/nfcpy { }; - nftables = toPythonModule (pkgs.nftables.override { - python3 = python; - withPython = true; - }); + nftables = callPackage ../os-specific/linux/nftables/python.nix { + inherit (pkgs) nftables; + }; nh3 = callPackage ../development/python-modules/nh3 { }; @@ -8819,23 +8977,13 @@ self: super: with self; { nose3 = callPackage ../development/python-modules/nose3 { }; - nose-cov = callPackage ../development/python-modules/nose-cov { }; - - nose-cprof = callPackage ../development/python-modules/nose-cprof { }; - - nose-exclude = callPackage ../development/python-modules/nose-exclude { }; - nose-timer = callPackage ../development/python-modules/nose-timer { }; - nosejs = callPackage ../development/python-modules/nosejs { }; - nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; - nose-randomly = callPackage ../development/python-modules/nose-randomly { }; - nose-warnings-filters = callPackage ../development/python-modules/nose-warnings-filters { }; - nosexcover = callPackage ../development/python-modules/nosexcover { }; + nose-xunitmp = callPackage ../development/python-modules/nose-xunitmp { }; notebook = callPackage ../development/python-modules/notebook { }; @@ -8927,6 +9075,8 @@ self: super: with self; { nxt-python = callPackage ../development/python-modules/nxt-python { }; + plugp100 = callPackage ../development/python-modules/plugp100 {}; + python-ndn = callPackage ../development/python-modules/python-ndn { }; python-nvd3 = callPackage ../development/python-modules/python-nvd3 { }; @@ -9239,6 +9389,8 @@ self: super: with self; { optimum = callPackage ../development/python-modules/optimum { }; + optree = callPackage ../development/python-modules/optree { }; + optuna = callPackage ../development/python-modules/optuna { }; opuslib = callPackage ../development/python-modules/opuslib { }; @@ -9329,6 +9481,8 @@ self: super: with self; { outcome = callPackage ../development/python-modules/outcome { }; + outspin = callPackage ../development/python-modules/outspin { }; + ovh = callPackage ../development/python-modules/ovh { }; ovmfvartool = callPackage ../development/python-modules/ovmfvartool { }; @@ -9391,6 +9545,8 @@ self: super: with self; { panphon = callPackage ../development/python-modules/panphon { }; + paperbush = callPackage ../development/python-modules/paperbush { }; + papermill = callPackage ../development/python-modules/papermill { }; openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { }; @@ -9475,8 +9631,6 @@ self: super: with self; { pathlib2 = callPackage ../development/python-modules/pathlib2 { }; - pathlib = callPackage ../development/python-modules/pathlib { }; - pathlib-abc = callPackage ../development/python-modules/pathlib-abc { }; pathos = callPackage ../development/python-modules/pathos { }; @@ -9565,6 +9719,8 @@ self: super: with self; { peco = callPackage ../development/python-modules/peco { }; + pettingzoo = callPackage ../development/python-modules/pettingzoo { }; + peewee = callPackage ../development/python-modules/peewee { }; peewee-migrate = callPackage ../development/python-modules/peewee-migrate { }; @@ -9623,6 +9779,8 @@ self: super: with self; { pins = callPackage ../development/python-modules/pins { }; + pipetools = callPackage ../development/python-modules/pipetools { }; + pg8000 = callPackage ../development/python-modules/pg8000 { }; pgcli = callPackage ../development/python-modules/pgcli { }; @@ -9647,6 +9805,8 @@ self: super: with self; { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + photutils = callPackage ../development/python-modules/photutils { }; + pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { }; pkg-about = callPackage ../development/python-modules/pkg-about { }; @@ -9719,6 +9879,8 @@ self: super: with self; { phpserialize = callPackage ../development/python-modules/phpserialize { }; + phunspell = callPackage ../development/python-modules/phunspell { }; + phx-class-registry = callPackage ../development/python-modules/phx-class-registry { }; pi1wire = callPackage ../development/python-modules/pi1wire { }; @@ -9845,6 +10007,8 @@ self: super: with self; { ppdeep = callPackage ../development/python-modules/ppdeep { }; + private-gpt = callPackage ../development/python-modules/private-gpt { }; + prodict = callPackage ../development/python-modules/prodict { }; prometheus-pandas = callPackage ../development/python-modules/prometheus-pandas { }; @@ -9871,6 +10035,8 @@ self: super: with self; { pycketcasts = callPackage ../development/python-modules/pycketcasts { }; + pycomm3 = callPackage ../development/python-modules/pycomm3 { }; + pycomposefile = callPackage ../development/python-modules/pycomposefile { }; pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; @@ -9882,6 +10048,8 @@ self: super: with self; { pycrdt-websocket = callPackage ../development/python-modules/pycrdt-websocket { }; + pycycling = callPackage ../development/python-modules/pycycling { }; + pyfibaro = callPackage ../development/python-modules/pyfibaro { }; pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { }; @@ -9928,6 +10096,8 @@ self: super: with self; { pylddwrap = callPackage ../development/python-modules/pylddwrap { }; + pyloadapi = callPackage ../development/python-modules/pyloadapi { }; + pyngo = callPackage ../development/python-modules/pyngo { }; pyngrok = callPackage ../development/python-modules/pyngrok { }; @@ -9950,6 +10120,8 @@ self: super: with self; { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pyogrio = callPackage ../development/python-modules/pyogrio { }; + pyorthanc = callPackage ../development/python-modules/pyorthanc { }; pyoutbreaksnearme = callPackage ../development/python-modules/pyoutbreaksnearme { }; @@ -9968,12 +10140,16 @@ self: super: with self; { pyrender = callPackage ../development/python-modules/pyrender { }; + pyreqwest-impersonate = callPackage ../development/python-modules/pyreqwest-impersonate { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; pyrogram = callPackage ../development/python-modules/pyrogram { }; + pyrympro = callPackage ../development/python-modules/pyrympro { }; + pysabnzbd = callPackage ../development/python-modules/pysabnzbd { }; pysbd = callPackage ../development/python-modules/pysbd { }; @@ -9998,6 +10174,8 @@ self: super: with self; { pysolcast = callPackage ../development/python-modules/pysolcast { }; + pystac = callPackage ../development/python-modules/pystac { }; + pysubs2 = callPackage ../development/python-modules/pysubs2 { }; pysuez = callPackage ../development/python-modules/pysuez { }; @@ -10225,6 +10403,8 @@ self: super: with self; { portend = callPackage ../development/python-modules/portend { }; + portion = callPackage ../development/python-modules/portion { }; + port-for = callPackage ../development/python-modules/port-for { }; portpicker = callPackage ../development/python-modules/portpicker { }; @@ -10285,6 +10465,8 @@ self: super: with self; { pretend = callPackage ../development/python-modules/pretend { }; + pretty-errors = callPackage ../development/python-modules/pretty-errors { }; + prettytable = callPackage ../development/python-modules/prettytable { }; primecountpy = callPackage ../development/python-modules/primecountpy { }; @@ -10299,8 +10481,6 @@ self: super: with self; { prison = callPackage ../development/python-modules/prison { }; - proboscis = callPackage ../development/python-modules/proboscis { }; - process-tests = callPackage ../development/python-modules/process-tests { }; procmon-parser = callPackage ../development/python-modules/procmon-parser { }; @@ -10471,6 +10651,8 @@ self: super: with self; { pweave = callPackage ../development/python-modules/pweave { }; + pwkit = callPackage ../development/python-modules/pwkit { }; + pwlf = callPackage ../development/python-modules/pwlf { }; pwndbg = callPackage ../development/python-modules/pwndbg { }; @@ -10479,8 +10661,6 @@ self: super: with self; { debugger = pkgs.gdb; }; - pxml = callPackage ../development/python-modules/pxml { }; - py-air-control = callPackage ../development/python-modules/py-air-control { }; py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { }; @@ -10547,6 +10727,8 @@ self: super: with self; { pyairvisual = callPackage ../development/python-modules/pyairvisual { }; + pyais = callPackage ../development/python-modules/pyais { }; + pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; pyamg = callPackage ../development/python-modules/pyamg { }; @@ -10931,8 +11113,6 @@ self: super: with self; { pyfcm = callPackage ../development/python-modules/pyfcm { }; - pyfftw = callPackage ../development/python-modules/pyfftw { }; - pyfido = callPackage ../development/python-modules/pyfido { }; pyfiglet = callPackage ../development/python-modules/pyfiglet { }; @@ -10996,8 +11176,6 @@ self: super: with self; { pygeoip = callPackage ../development/python-modules/pygeoip { }; - pygeos = callPackage ../development/python-modules/pygeos { }; - pygetwindow = callPackage ../development/python-modules/pygetwindow { }; pygit2 = callPackage ../development/python-modules/pygit2 { }; @@ -11109,12 +11287,12 @@ self: super: with self; { pyisbn = callPackage ../development/python-modules/pyisbn { }; - pyjet = callPackage ../development/python-modules/pyjet { }; - pyjks = callPackage ../development/python-modules/pyjks { }; pyjnius = callPackage ../development/python-modules/pyjnius { }; + pyjson5 = callPackage ../development/python-modules/pyjson5 { }; + pyjsparser = callPackage ../development/python-modules/pyjsparser { }; pyjwkest = callPackage ../development/python-modules/pyjwkest { }; @@ -11239,8 +11417,6 @@ self: super: with self; { pylpsd = callPackage ../development/python-modules/pylpsd { }; - pylti = callPackage ../development/python-modules/pylti { }; - pylutron = callPackage ../development/python-modules/pylutron { }; pylutron-caseta = callPackage ../development/python-modules/pylutron-caseta { }; @@ -11445,6 +11621,8 @@ self: super: with self; { pyopenuv = callPackage ../development/python-modules/pyopenuv { }; + pyopenweathermap = callPackage ../development/python-modules/pyopenweathermap { }; + pyopnsense = callPackage ../development/python-modules/pyopnsense { }; pyoppleio = callPackage ../development/python-modules/pyoppleio { }; @@ -11640,9 +11818,7 @@ self: super: with self; { pyreaderwriterlock = callPackage ../development/python-modules/pyreaderwriterlock { }; - pyreadstat = callPackage ../development/python-modules/pyreadstat { - inherit (pkgs.darwin) libiconv; - }; + pyreadstat = callPackage ../development/python-modules/pyreadstat { }; pyrealsense2 = toPythonModule (pkgs.librealsense.override { enablePython = true; @@ -12097,6 +12273,8 @@ self: super: with self; { pytest-logdog = callPackage ../development/python-modules/pytest-logdog { }; + pytest-markdown-docs = callPackage ../development/python-modules/pytest-markdown-docs { }; + pytest-md-report = callPackage ../development/python-modules/pytest-md-report { }; pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; @@ -12430,6 +12608,7 @@ self: super: with self; { inherit (pkgs) fontconfig rapidjson; inherit (pkgs.xorg) libX11 libXi libXmu libXext; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + opencascade-occt = pkgs.opencascade-occt_7_6; }); python-olm = callPackage ../development/python-modules/python-olm { }; @@ -12608,6 +12787,8 @@ self: super: with self; { pytube = callPackage ../development/python-modules/pytube { }; + pytubefix = callPackage ../development/python-modules/pytubefix { }; + pytun = callPackage ../development/python-modules/pytun { }; pyturbojpeg = callPackage ../development/python-modules/pyturbojpeg { }; @@ -12733,7 +12914,7 @@ self: super: with self; { pywizlight = callPackage ../development/python-modules/pywizlight { }; pywlroots = callPackage ../development/python-modules/pywlroots { - wlroots = pkgs.wlroots_0_16; + wlroots = pkgs.wlroots_0_17; }; pyws66i = callPackage ../development/python-modules/pyws66i { }; @@ -12772,8 +12953,6 @@ self: super: with self; { pyzmq = callPackage ../development/python-modules/pyzmq { }; - pyzufall = callPackage ../development/python-modules/pyzufall { }; - qbittorrent-api = callPackage ../development/python-modules/qbittorrent-api { }; qasync = callPackage ../development/python-modules/qasync { }; @@ -12838,6 +13017,8 @@ self: super: with self; { qrcode = callPackage ../development/python-modules/qrcode { }; + qrcode-terminal = callPackage ../development/python-modules/qrcode-terminal { }; + qreactor = callPackage ../development/python-modules/qreactor { }; qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { @@ -12861,7 +13042,7 @@ self: super: with self; { qtconsole = callPackage ../development/python-modules/qtconsole { }; qtile = callPackage ../development/python-modules/qtile { - wlroots = pkgs.wlroots_0_16; + wlroots = pkgs.wlroots_0_17; }; qtile-extras = callPackage ../development/python-modules/qtile-extras { }; @@ -12939,6 +13120,8 @@ self: super: with self; { ramlfications = callPackage ../development/python-modules/ramlfications { }; + random-user-agent = callPackage ../development/python-modules/random-user-agent { }; + random2 = callPackage ../development/python-modules/random2 { }; randomfiletree = callPackage ../development/python-modules/randomfiletree { }; @@ -12957,6 +13140,8 @@ self: super: with self; { rapidgzip = callPackage ../development/python-modules/rapidgzip { inherit (pkgs) nasm; }; + rapidocr-onnxruntime = callPackage ../development/python-modules/rapidocr-onnxruntime { }; + rapt-ble = callPackage ../development/python-modules/rapt-ble { }; rarfile = callPackage ../development/python-modules/rarfile { @@ -12981,6 +13166,8 @@ self: super: with self; { ray = callPackage ../development/python-modules/ray { }; + raylib-python-cffi = callPackage ../development/python-modules/raylib-python-cffi {}; + razdel = callPackage ../development/python-modules/razdel { }; rbtools = callPackage ../development/python-modules/rbtools { }; @@ -13096,12 +13283,16 @@ self: super: with self; { repeated-test = callPackage ../development/python-modules/repeated-test { }; + repl-python-wakatime = callPackage ../development/python-modules/repl-python-wakatime { }; + repocheck = callPackage ../development/python-modules/repocheck { }; reportengine = callPackage ../development/python-modules/reportengine { }; reportlab = callPackage ../development/python-modules/reportlab { }; + reportlab-qrcode = callPackage ../development/python-modules/reportlab-qrcode { }; + repoze-lru = callPackage ../development/python-modules/repoze-lru { }; repoze-sphinx-autointerface = callPackage ../development/python-modules/repoze-sphinx-autointerface { }; @@ -13212,6 +13403,8 @@ self: super: with self; { rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + rfc8785 = callPackage ../development/python-modules/rfc8785 { }; + rfcat = callPackage ../development/python-modules/rfcat { }; rflink = callPackage ../development/python-modules/rflink { }; @@ -13230,6 +13423,10 @@ self: super: with self; { ring-doorbell = callPackage ../development/python-modules/ring-doorbell { }; + rio-tiler = callPackage ../development/python-modules/rio-tiler { }; + + rioxarray = callPackage ../development/python-modules/rioxarray { }; + ripe-atlas-cousteau = callPackage ../development/python-modules/ripe-atlas-cousteau { }; ripe-atlas-sagan = callPackage ../development/python-modules/ripe-atlas-sagan { }; @@ -13262,6 +13459,8 @@ self: super: with self; { rlax = callPackage ../development/python-modules/rlax { }; + rlcard = callPackage ../development/python-modules/rlcard { }; + rlp = callPackage ../development/python-modules/rlp { }; rmcl = callPackage ../development/python-modules/rmcl { }; @@ -13346,6 +13545,8 @@ self: super: with self; { rova = callPackage ../development/python-modules/rova { }; + rowan = callPackage ../development/python-modules/rowan { }; + rpcq = callPackage ../development/python-modules/rpcq { }; rpdb = callPackage ../development/python-modules/rpdb { }; @@ -13356,8 +13557,6 @@ self: super: with self; { rpi-gpio = callPackage ../development/python-modules/rpi-gpio { }; - rpi-gpio2 = callPackage ../development/python-modules/rpi-gpio2 { }; - rplcd = callPackage ../development/python-modules/rplcd { }; rply = callPackage ../development/python-modules/rply { }; @@ -13420,6 +13619,8 @@ self: super: with self; { rubymarshal = callPackage ../development/python-modules/rubymarshal { }; + ruff-api = callPackage ../development/python-modules/ruff-api { }; + ruffus = callPackage ../development/python-modules/ruffus { }; rules = callPackage ../development/python-modules/rules { }; @@ -13506,6 +13707,8 @@ self: super: with self; { sarif-om = callPackage ../development/python-modules/sarif-om { }; + sarif-tools = callPackage ../development/python-modules/sarif-tools { }; + sarge = callPackage ../development/python-modules/sarge { }; sasmodels = callPackage ../development/python-modules/sasmodels { }; @@ -13566,10 +13769,6 @@ self: super: with self; { scikits-odes = callPackage ../development/python-modules/scikits-odes { }; - scikits-samplerate = callPackage ../development/python-modules/scikits-samplerate { - inherit (pkgs) libsamplerate; - }; - scikit-tda = callPackage ../development/python-modules/scikit-tda { }; scipy = callPackage ../development/python-modules/scipy { }; @@ -13796,6 +13995,8 @@ self: super: with self; { inherit (pkgs) cmake llvmPackages; }); + shimmy = callPackage ../development/python-modules/shimmy { }; + shippai = callPackage ../development/python-modules/shippai { }; shiv = callPackage ../development/python-modules/shiv { }; @@ -13804,8 +14005,6 @@ self: super: with self; { shortuuid = callPackage ../development/python-modules/shortuuid { }; - shouldbe = callPackage ../development/python-modules/shouldbe { }; - should-dsl = callPackage ../development/python-modules/should-dsl { }; show-in-file-manager = callPackage ../development/python-modules/show-in-file-manager { }; @@ -13986,6 +14185,8 @@ self: super: with self; { slugid = callPackage ../development/python-modules/slugid { }; + py-slvs = callPackage ../development/python-modules/py-slvs { }; + sly = callPackage ../development/python-modules/sly { }; smart-meter-texas = callPackage ../development/python-modules/smart-meter-texas { }; @@ -14234,6 +14435,8 @@ self: super: with self; { sphinx-togglebutton = callPackage ../development/python-modules/sphinx-togglebutton { }; + sphinxawesome-theme = callPackage ../development/python-modules/sphinxawesome-theme { }; + sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { }; @@ -14254,6 +14457,8 @@ self: super: with self; { sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { }; + sphinxcontrib-ditaa = callPackage ../development/python-modules/sphinxcontrib-ditaa { }; + sphinxcontrib-excel-table = callPackage ../development/python-modules/sphinxcontrib-excel-table { }; sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; @@ -14388,6 +14593,8 @@ self: super: with self; { sqlglot = callPackage ../development/python-modules/sqlglot { }; + sqlite-anyio = callPackage ../development/python-modules/sqlite-anyio { }; + sqlitedict = callPackage ../development/python-modules/sqlitedict { }; sqlite-migrate = callPackage ../development/python-modules/sqlite-migrate { }; @@ -14406,8 +14613,6 @@ self: super: with self; { sqlparse = callPackage ../development/python-modules/sqlparse { }; - sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - sqltrie = callPackage ../development/python-modules/sqltrie { }; squarify = callPackage ../development/python-modules/squarify { }; @@ -14672,6 +14877,11 @@ self: super: with self; { syncer = callPackage ../development/python-modules/syncer { }; + syndication-domination = toPythonModule (pkgs.syndication-domination.override { + enablePython = true; + python3Packages = self; + }); + synergy = callPackage ../development/python-modules/synergy { }; synologydsm-api = callPackage ../development/python-modules/synologydsm-api { }; @@ -14815,6 +15025,8 @@ self: super: with self; { tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { inherit (pkgs.config) cudaSupport; + # https://www.tensorflow.org/install/source#gpu + cudaPackages = pkgs.cudaPackages_11; }; tensorflow-build = let @@ -14822,6 +15034,8 @@ self: super: with self; { protobufTF = pkgs.protobuf_21.override { abseil-cpp = pkgs.abseil-cpp_202301; }; + # https://www.tensorflow.org/install/source#gpu + cudaPackagesTF = pkgs.cudaPackages_11; grpcTF = (pkgs.grpc.overrideAttrs ( oldAttrs: rec { # nvcc fails on recent grpc versions, so we use the latest patch level @@ -14867,6 +15081,7 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; flatbuffers-core = pkgs.flatbuffers; flatbuffers-python = self.flatbuffers; + cudaPackages = compat.cudaPackagesTF; protobuf-core = compat.protobufTF; protobuf-python = compat.protobuf-pythonTF; grpc = compat.grpcTF; @@ -14918,6 +15133,8 @@ self: super: with self; { terminaltables = callPackage ../development/python-modules/terminaltables { }; + terminaltexteffects = callPackage ../development/python-modules/terminaltexteffects { }; + termplotlib = callPackage ../development/python-modules/termplotlib { }; termstyle = callPackage ../development/python-modules/termstyle { }; @@ -14990,6 +15207,8 @@ self: super: with self; { textx = callPackage ../development/python-modules/textx { }; + tf-keras = callPackage ../development/python-modules/tf-keras { }; + tf2onnx = callPackage ../development/python-modules/tf2onnx { }; tflearn = callPackage ../development/python-modules/tflearn { }; @@ -14998,23 +15217,6 @@ self: super: with self; { tgcrypto = callPackage ../development/python-modules/tgcrypto { }; - theano-pymc = callPackage ../development/python-modules/theano-pymc { }; - - theano = callPackage ../development/python-modules/theano rec { - inherit (pkgs.config) cudaSupport; - cudnnSupport = cudaSupport; - }; - - theanoWithCuda = self.theano.override { - cudaSupport = true; - cudnnSupport = true; - }; - - theanoWithoutCuda = self.theano.override { - cudaSupport = false; - cudnnSupport = false; - }; - thefuzz = callPackage ../development/python-modules/thefuzz { }; thelogrus = callPackage ../development/python-modules/thelogrus { }; @@ -15101,6 +15303,8 @@ self: super: with self; { timm = callPackage ../development/python-modules/timm { }; + timy = callPackage ../development/python-modules/timy { }; + tiny-cuda-nn = toPythonModule (pkgs.tiny-cuda-nn.override { cudaPackages = self.torch.cudaPackages; python3Packages = self; @@ -15123,6 +15327,8 @@ self: super: with self; { tinysegmenter = callPackage ../development/python-modules/tinysegmenter { }; + tinytuya = callPackage ../development/python-modules/tinytuya { }; + tissue = callPackage ../development/python-modules/tissue { }; titlecase = callPackage ../development/python-modules/titlecase { }; @@ -15194,6 +15400,8 @@ self: super: with self; { openai-triton = self.openai-triton-bin; }; + torchsnapshot = callPackage ../development/python-modules/torchsnapshot { }; + torchWithCuda = self.torch.override { openai-triton = self.openai-triton-cuda; cudaSupport = true; @@ -15224,8 +15432,6 @@ self: super: with self; { torchdiffeq = callPackage ../development/python-modules/torchdiffeq { }; - torchgpipe = callPackage ../development/python-modules/torchgpipe { }; - torchmetrics = callPackage ../development/python-modules/torchmetrics { }; torchio = callPackage ../development/python-modules/torchio { }; @@ -15238,6 +15444,8 @@ self: super: with self; { torchsde = callPackage ../development/python-modules/torchsde { }; + torchsummary = callPackage ../development/python-modules/torchsummary { }; + torchvision = callPackage ../development/python-modules/torchvision { }; torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { @@ -15320,6 +15528,20 @@ self: super: with self; { tree-sitter = callPackage ../development/python-modules/tree-sitter { }; + tree-sitter0_21 = callPackage ../development/python-modules/tree-sitter0_21 { }; + + tree-sitter-html = callPackage ../development/python-modules/tree-sitter-html { }; + + tree-sitter-python = callPackage ../development/python-modules/tree-sitter-python { }; + + tree-sitter-rust = callPackage ../development/python-modules/tree-sitter-rust { }; + + tree-sitter-javascript = callPackage ../development/python-modules/tree-sitter-javascript { }; + + tree-sitter-json = callPackage ../development/python-modules/tree-sitter-json { }; + + tree-sitter-languages = callPackage ../development/python-modules/tree-sitter-languages { }; + treelib = callPackage ../development/python-modules/treelib { }; treelog = callPackage ../development/python-modules/treelog { }; @@ -15358,6 +15580,8 @@ self: super: with self; { trueskill = callPackage ../development/python-modules/trueskill { }; + truncnorm = callPackage ../development/python-modules/truncnorm { }; + trustme = callPackage ../development/python-modules/trustme { }; truststore = callPackage ../development/python-modules/truststore { }; @@ -15476,6 +15700,8 @@ self: super: with self; { typer = callPackage ../development/python-modules/typer { }; + typer-shell = callPackage ../development/python-modules/typer-shell { }; + type-infer = callPackage ../development/python-modules/type-infer { }; types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { }; @@ -16336,6 +16562,8 @@ self: super: with self; { uhi = callPackage ../development/python-modules/uhi { }; + uiprotect = callPackage ../development/python-modules/uiprotect { }; + ujson = callPackage ../development/python-modules/ujson { }; ukkonen = callPackage ../development/python-modules/ukkonen { }; @@ -16504,6 +16732,10 @@ self: super: with self; { utils = callPackage ../development/python-modules/utils { }; + uv = toPythonModule (pkgs.uv.override { + python3Packages = self; + }); + uvcclient = callPackage ../development/python-modules/uvcclient { }; uvicorn = callPackage ../development/python-modules/uvicorn { }; @@ -16512,6 +16744,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; + uxsim = callPackage ../development/python-modules/uxsim { }; + vaa = callPackage ../development/python-modules/vaa { }; vacuum-map-parser-base = callPackage ../development/python-modules/vacuum-map-parser-base { }; @@ -16616,6 +16850,8 @@ self: super: with self; { virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; + visions = callPackage ../development/python-modules/visions { }; + visitor = callPackage ../development/python-modules/visitor { }; vispy = callPackage ../development/python-modules/vispy { }; @@ -16632,6 +16868,8 @@ self: super: with self; { vncdo = callPackage ../development/python-modules/vncdo { }; + vnoise = callPackage ../development/python-modules/vnoise { }; + vobject = callPackage ../development/python-modules/vobject { }; volatile = callPackage ../development/python-modules/volatile { }; @@ -16640,6 +16878,8 @@ self: super: with self; { voluptuous = callPackage ../development/python-modules/voluptuous { }; + voluptuous-openapi = callPackage ../development/python-modules/voluptuous-openapi { }; + voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; voluptuous-stubs = callPackage ../development/python-modules/voluptuous-stubs { }; @@ -16752,6 +16992,8 @@ self: super: with self; { wavinsentio = callPackage ../development/python-modules/wavinsentio { }; + waybackpy = callPackage ../development/python-modules/waybackpy {}; + wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { }; wcag-contrast-ratio = callPackage ../development/python-modules/wcag-contrast-ratio { }; @@ -16764,6 +17006,8 @@ self: super: with self; { weasyprint = callPackage ../development/python-modules/weasyprint { }; + weatherflow4py = callPackage ../development/python-modules/weatherflow4py { }; + weaviate-client = callPackage ../development/python-modules/weaviate-client { }; web3 = callPackage ../development/python-modules/web3 { }; @@ -17043,10 +17287,16 @@ self: super: with self; { xmodem = callPackage ../development/python-modules/xmodem { }; + xmpppy = callPackage ../development/python-modules/xmpppy { }; + xnatpy = callPackage ../development/python-modules/xnatpy { }; xnd = callPackage ../development/python-modules/xnd { }; + xonsh = toPythonModule (pkgs.xonsh.override { + python3Packages = self; + }); + xpath-expressions = callPackage ../development/python-modules/xpath-expressions { }; xpybutil = callPackage ../development/python-modules/xpybutil { }; @@ -17141,6 +17391,8 @@ self: super: with self; { yacs = callPackage ../development/python-modules/yacs { }; + ydata-profiling = callPackage ../development/python-modules/ydata-profiling { }; + ydiff = callPackage ../development/python-modules/ydiff { }; yeelight = callPackage ../development/python-modules/yeelight { }; @@ -17281,8 +17533,6 @@ self: super: with self; { zipp = callPackage ../development/python-modules/zipp { }; - zipstream = callPackage ../development/python-modules/zipstream { }; - zipstream-ng = callPackage ../development/python-modules/zipstream-ng { }; zlib-ng = callPackage ../development/python-modules/zlib-ng { diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index cd48453fa0eea..a80b40d360605 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -76,6 +76,7 @@ let buildHaskellPackages = true; buildPackages = true; + buildFreebsd = true; generateOptparseApplicativeCompletions = true; callPackage = true; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 93d1eaa9a83ae..4b41dc5bdcd27 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -93,7 +93,6 @@ let windowsCommon = recursiveUpdate gnuCommon { boehmgc = nativePlatforms; - guile_1_8 = nativePlatforms; libffi = nativePlatforms; libtool = nativePlatforms; libunistring = nativePlatforms; @@ -259,6 +258,7 @@ in x86_64-freebsd = mapTestOnCross systems.examples.x86_64-freebsd common; x86_64-netbsd = mapTestOnCross systems.examples.x86_64-netbsd common; + x86_64-openbsd = mapTestOnCross systems.examples.x86_64-openbsd common; # we test `embedded` instead of `linuxCommon` because very few packages # successfully cross-compile to Redox so far diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 5ebc1c78a89fe..d2e9e58e4ba9f 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -74,6 +74,7 @@ let ghc965 ghc981 ghc982 + ghc9101 ]; # packagePlatforms applied to `haskell.packages.*` @@ -264,14 +265,16 @@ let # top-level packages that depend on haskellPackages inherit (pkgsPlatforms) agda + alex arion bench - bustle blucontrol cabal-install cabal2nix cachix # carp broken on 2024-04-09 + changelog-d + cornelis cedille client-ip-echo darcs @@ -282,7 +285,10 @@ let dhall-lsp-server dhall-json dhall-nix + dhall-nixpkgs + dhall-yaml diagrams-builder + echidna elm2nix emanote fffuu @@ -293,6 +299,7 @@ let gitit glirc hadolint + happy haskell-ci haskell-language-server hasura-graphql-engine @@ -308,10 +315,12 @@ let hledger-web hlint hpack + hscolour icepeak ihaskell jacinda jl + json2yaml koka krank lambdabot @@ -338,12 +347,13 @@ let ormolu # pakcs broken by set-extra on 2024-03-15 pandoc - petrinizer place-cursor-at pinboard-notes-backup pretty-simple + purenix shake shellcheck + shellcheck-minimal sourceAndTags spacecookie spago @@ -368,7 +378,6 @@ let xmobar xmonadctl xmonad-with-packages - yi zsh-git-prompt ; @@ -378,7 +387,7 @@ let elm elm-format elm-instrument - # elmi-to-json broken by hashable-time on 2024-03-16 + elmi-to-json ; }; @@ -502,24 +511,19 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; Cabal_3_10_3_0 = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; Cabal-syntax_3_10_3_0 = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; cabal2nix = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; cabal2nix-unstable = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; funcmp = released; haskell-language-server = lib.subtractLists [ @@ -527,33 +531,30 @@ let compilerNames.ghc8107 # Support ceased as of 2.5.0.0 compilerNames.ghc902 + # No support yet (2024-05-12) + compilerNames.ghc9101 ] released; hoogle = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; hlint = lib.subtractLists [ compilerNames.ghc902 - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; hpack = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; hsdns = released; jailbreak-cabal = released; language-nix = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; large-hashable = [ compilerNames.ghc928 ]; nix-paths = released; titlecase = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; ghc-api-compat = [ compilerNames.ghc8107 @@ -563,37 +564,31 @@ let compilerNames.ghc8107 ]; ghc-lib = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; ghc-lib-parser = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; ghc-lib-parser-ex = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; ghc-source-gen = [ # Feel free to remove these as they break, - # ghc-source-gen currently doesn't support GHC 9.4 compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc928 ]; - # broken on 2024-03-16 - # ghc-tags = lib.subtractLists [ - # compilerNames.ghc981 - # compilerNames.ghc982 - # ] released; + ghc-tags = lib.subtractLists [ + compilerNames.ghc9101 + ] released; hashable = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 + ] released; + primitive = lib.subtractLists [ + compilerNames.ghc9101 ] released; - primitive = released; weeder = lib.subtractLists [ - compilerNames.ghc981 - compilerNames.ghc982 + compilerNames.ghc9101 ] released; }) { diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 9f28868956899..a1dcc3e9f3349 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,4 +1,5 @@ { supportedSystems +, system ? builtins.currentSystem , packageSet ? (import ../..) , scrubJobs ? true , # Attributes passed to nixpkgs. Don't build packages marked as unfree. @@ -33,7 +34,7 @@ let systems ; - pkgs = packageSet (recursiveUpdate { system = "x86_64-linux"; config.allowUnsupportedSystem = true; } nixpkgsArgs); + pkgs = packageSet (recursiveUpdate { inherit system; config.allowUnsupportedSystem = true; } nixpkgsArgs); hydraJob' = if scrubJobs then hydraJob else id; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 81ea4d3403a7a..bb4ead25066d0 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -12,12 +12,6 @@ nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; - permittedInsecurePackages = [ - # Keep evaluating home-assistant, which is transitively affected - # by home-assistant-chip-core consuming OpenSSL 1.1. Affects roughly - # 800 jobs. - "openssl-1.1.1w" - ]; }; } }: diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d11d1d1dbd43b..8df22c6ced83a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -9,6 +9,7 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; } +, system ? builtins.currentSystem , officialRelease ? false # The platform doubles for which we build Nixpkgs. , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ] @@ -28,14 +29,6 @@ , nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; - permittedInsecurePackages = [ - # *Exceptionally*, those packages will be cached with their *secure* dependents - # because they will reach EOL in the middle of the 23.05 release - # and it will be too much painful for our users to recompile them - # for no real reason. - # Remove them for 23.11. - "openssl-1.1.1w" - ]; }; } # This flag, if set to true, will inhibit the use of `mapTestOn` @@ -54,7 +47,7 @@ let release-lib = import ./release-lib.nix { - inherit supportedSystems scrubJobs nixpkgsArgs; + inherit supportedSystems scrubJobs nixpkgsArgs system; }; inherit (release-lib) mapTestOn pkgs; @@ -124,7 +117,8 @@ let jobs.gimp.x86_64-darwin jobs.emacs.x86_64-darwin jobs.wireshark.x86_64-darwin - jobs.transmission-gtk.x86_64-darwin + jobs.transmission_3-gtk.x86_64-darwin + jobs.transmission_4-gtk.x86_64-darwin # Tests /* diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 0528d45bef84e..386b8506c73ca 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2872,10 +2872,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185zq5r9g56sfks852992bm0xf2vm9569jyiz5jyww3vx1jply1d"; + sha256 = "sha256-On/KnfdO5kHcHom4MCrG0D8iiD3nceeGoOnzCU5apq0="; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.4"; }; rails-dom-testing = { dependencies = ["activesupport" "minitest" "nokogiri"]; @@ -3127,10 +3127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "0428ady49qssmnmwnafzrjvyba8mzbridsgblv7c7kmd0vqgfn99"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.0"; }; rmagick = { dependencies = ["observer" "pkg-config"]; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index 9ac0fe2200f92..c477d797795ae 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -148,17 +148,23 @@ in makeScopeWithSplicing' = lib.makeScopeWithSplicing' { inherit splicePackages; inherit (pkgs) newScope; }; # generate 'otherSplices' for 'makeScopeWithSplicing' - generateSplicesForMkScope = attr: + generateSplicesForMkScope = attrs: let - split = X: lib.splitString "." "${X}.${attr}"; + split = X: [ X ] ++ ( + if builtins.isList attrs + then attrs + else if builtins.isString attrs + then lib.splitString "." attrs + else throw "generateSplicesForMkScope must be passed a list of string or string" + ); + bad = throw "attribute should be found"; in { - # nulls should never be reached - selfBuildBuild = lib.attrByPath (split "pkgsBuildBuild") null pkgs; - selfBuildHost = lib.attrByPath (split "pkgsBuildHost") null pkgs; - selfBuildTarget = lib.attrByPath (split "pkgsBuildTarget") null pkgs; - selfHostHost = lib.attrByPath (split "pkgsHostHost") null pkgs; - selfHostTarget = lib.attrByPath (split "pkgsHostTarget") null pkgs; + selfBuildBuild = lib.attrByPath (split "pkgsBuildBuild") bad pkgs; + selfBuildHost = lib.attrByPath (split "pkgsBuildHost") bad pkgs; + selfBuildTarget = lib.attrByPath (split "pkgsBuildTarget") bad pkgs; + selfHostHost = lib.attrByPath (split "pkgsHostHost") bad pkgs; + selfHostTarget = lib.attrByPath (split "pkgsHostTarget") bad pkgs; selfTargetTarget = lib.attrByPath (split "pkgsTargetTarget") { } pkgs; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 3b84026b46963..087b43c3cb145 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -57,9 +57,7 @@ in , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for files # in standard system directories (/usr/include, etc.) - noSysDirs ? stdenv.buildPlatform.system != "x86_64-freebsd" - && stdenv.buildPlatform.system != "i686-freebsd" - && stdenv.buildPlatform.system != "x86_64-solaris" + noSysDirs ? stdenv.buildPlatform.system != "x86_64-solaris" && stdenv.buildPlatform.system != "x86_64-kfreebsd-gnu" , # The configuration attribute set @@ -283,8 +281,8 @@ let if stdenv.isLinux then makeMuslParsedPlatform stdenv.hostPlatform.parsed else stdenv.hostPlatform.parsed; - } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { - gcc.abi = "elfv2"; + gcc = lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { abi = "elfv2"; } // + stdenv.hostPlatform.gcc or {}; }; }); diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 454c4802dc915..428a37363d7e3 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -1,4 +1,4 @@ -{ pkgs, buildEnv, runCommand, lib, stdenv }: +{ pkgs, buildEnv, runCommand, lib, stdenv, freebsd }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with @@ -59,6 +59,7 @@ let arp = { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; + freebsd = pkgs.freebsd.arp; }; col = { linux = pkgs.util-linux; @@ -80,6 +81,7 @@ let linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.getent else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; + freebsd = pkgs.freebsd.getent; }; getopt = { linux = pkgs.util-linux; @@ -88,6 +90,7 @@ let fdisk = { linux = pkgs.util-linux; darwin = pkgs.darwin.diskdev_cmds; + freebsd = pkgs.freebsd.fdisk; }; fsck = { linux = pkgs.util-linux; @@ -100,10 +103,12 @@ let hostname = { linux = pkgs.nettools; darwin = pkgs.darwin.shell_cmds; + freebsd = pkgs.freebsd.bin; }; ifconfig = { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; + freebsd = pkgs.freebsd.ifconfig; }; killall = { linux = pkgs.psmisc; @@ -112,6 +117,7 @@ let locale = { linux = pkgs.glibc; darwin = pkgs.darwin.adv_cmds; + freebsd = pkgs.freebsd.locale; }; logger = { linux = pkgs.util-linux; @@ -123,18 +129,22 @@ let mount = { linux = pkgs.util-linux; darwin = pkgs.darwin.diskdev_cmds; + freebsd = freebsd.mount; }; netstat = { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; + freebsd = pkgs.freebsd.netstat; }; ping = { linux = pkgs.iputils; darwin = pkgs.darwin.network_cmds; + freebsd = freebsd.ping; }; ps = { linux = pkgs.procps; darwin = pkgs.darwin.ps; + freebsd = pkgs.freebsd.bin; }; quota = { linux = pkgs.linuxquota; @@ -143,6 +153,7 @@ let route = { linux = pkgs.nettools; darwin = pkgs.darwin.network_cmds; + freebsd = pkgs.freebsd.route; }; script = { linux = pkgs.util-linux; @@ -151,10 +162,12 @@ let sysctl = { linux = pkgs.procps; darwin = pkgs.darwin.system_cmds; + freebsd = pkgs.freebsd.sysctl; }; top = { linux = pkgs.procps; darwin = pkgs.darwin.top; + freebsd = pkgs.freebsd.top; }; umount = { linux = pkgs.util-linux; @@ -171,8 +184,9 @@ let linux = pkgs.procps; # watch is the only command from procps that builds currently on - # Darwin. Unfortunately no other implementations exist currently! + # Darwin/FreeBSD. Unfortunately no other implementations exist currently! darwin = pkgs.callPackage ../os-specific/linux/procps-ng {}; + freebsd = pkgs.callPackage ../os-specific/linux/procps-ng {}; }; write = { linux = pkgs.util-linux; @@ -181,6 +195,7 @@ let xxd = { linux = pkgs.vim.xxd; darwin = pkgs.vim.xxd; + freebsd = pkgs.vim.xxd; }; }; |