diff --git a/lib/default.nix b/lib/default.nix index 7dfa9354fa7f..661f76bed0ef 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -110,7 +110,7 @@ let const pipe concat - or + "or" and xor bitAnd diff --git a/lib/options.nix b/lib/options.nix index a36fc2220d21..1cf93d5bdf92 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -433,7 +433,7 @@ rec { else if all isAttrs list then foldl' lib.mergeAttrs { } list else if all isBool list then - foldl' lib.or false list + foldl' lib."or" false list else if all isString list then lib.concatStrings list else if all isInt list && all (x: x == head list) list then diff --git a/lib/trivial.nix b/lib/trivial.nix index 5e527a1614e2..be67e0f3d539 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -197,7 +197,7 @@ in : 2\. Function argument */ - or = x: y: x || y; + "or" = x: y: x || y; /** boolean “and” diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 2ca3ab752591..6f3bc9311b6f 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -566,7 +566,6 @@ }, "members": { "Ericson2314": 1055245, - "dtzWill": 817330, "emilazy": 18535642, "lovek323": 265084, "rrbutani": 7833358, @@ -934,7 +933,6 @@ "alyssais": 2768870, "basvandijk": 576355, "cdepillabout": 64804, - "dtzWill": 817330, "lorenzleutgeb": 542154, "matthewbauer": 19036, "r-burns": 52847440, diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b2855238b23c..b7ed26d679b6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7182,13 +7182,6 @@ name = "Tom van Dijk"; keys = [ { fingerprint = "D044 F07B 8863 B681 26BD 79FE 7A98 4C82 07AD BA51"; } ]; }; - dtzWill = { - email = "w@wdtz.org"; - github = "dtzWill"; - githubId = 817330; - name = "Will Dietz"; - keys = [ { fingerprint = "389A 78CB CD88 5E0C 4701 DEB9 FD42 C7D0 D414 94C8"; } ]; - }; dudeofawesome = { email = "tourist-04.iced@icloud.com"; github = "dudeofawesome"; @@ -9961,12 +9954,6 @@ githubId = 2490088; name = "Gregory Schwartz"; }; - gspia = { - email = "iahogsp@gmail.com"; - github = "gspia"; - githubId = 3320792; - name = "gspia"; - }; gtrunsec = { email = "gtrunsec@hardenedlinux.org"; github = "GTrunSec"; diff --git a/nixos/modules/hardware/glasgow.nix b/nixos/modules/hardware/glasgow.nix index 9f67937c5f86..8e478e5437d9 100644 --- a/nixos/modules/hardware/glasgow.nix +++ b/nixos/modules/hardware/glasgow.nix @@ -22,6 +22,7 @@ in }; config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.glasgow ]; services.udev.packages = [ pkgs.glasgow ]; users.groups.plugdev = { }; }; diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 63126123f532..9cb29c65ea98 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -26,6 +26,12 @@ in description = "Whether to enable the TLP power management daemon."; }; + pd = { + enable = lib.mkEnableOption "the power-rofiles-daemon like DBus interface for TLP"; + + package = lib.mkPackageOption pkgs "tlp-pd" { }; + }; + settings = lib.mkOption { type = with lib.types; @@ -80,6 +86,23 @@ in Set `services.tlp.settings.SATA_LINKPWR_ON_AC` and `services.tlp.settings.SATA_LINKPWR_ON_BAT` instead. ''; } + { + assertion = cfg.pd.enable -> !config.services.power-profiles-daemon.enable; + message = '' + `services.tlp.pd` and `services.power-profiles-daemon` cannot be enabled together, + because they are using the same dbus interface and have the same functionality. + Generally, `services.tlp.pd` should be preferred as upstream does not recommend + using tlp together with power-profiles-daemon. + Set `services.power-profiles-daemon.enable` to `false` to resolve this error. + ''; + } + { + assertion = cfg.pd.enable -> !(config.services.tuned.enable && config.services.tuned.ppdSupport); + message = '' + `services.tlp.pd` and `services.tuned.ppdSupport` cannot be enabled together, + because they are using the same dbus interface and have the same functionality. + ''; + } ]; environment.etc = { @@ -90,7 +113,10 @@ in "${cfg.package}/lib/NetworkManager/dispatcher.d/99tlp-rdw-nm"; }; - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ + cfg.package + ] + ++ lib.optionals cfg.pd.enable [ cfg.pd.package ]; services.tlp.settings = let @@ -112,7 +138,11 @@ in # use native tlp instead because it can also differentiate between AC/BAT services.cpufreq.enable = false; - packages = [ cfg.package ]; + packages = [ + cfg.package + ] + ++ lib.optionals cfg.pd.enable [ cfg.pd.package ]; + # XXX: These must always be disabled/masked according to [1]. # # [1]: https://github.com/linrunner/TLP/blob/a9ada09e0821f275ce5f93dc80a4d81a7ff62ae4/tlp-stat.in#L319 diff --git a/nixos/modules/services/misc/novacomd.nix b/nixos/modules/services/misc/novacomd.nix index c8c13df0b6cd..29b5dcee225b 100644 --- a/nixos/modules/services/misc/novacomd.nix +++ b/nixos/modules/services/misc/novacomd.nix @@ -30,5 +30,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ dtzWill ]; + meta.maintainers = [ ]; } diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index 32ebf4a859ab..cf8ff650eea0 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -92,5 +92,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ dtzWill ]; + meta.maintainers = [ ]; } diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix index fdf427291497..20c1e09f10c2 100644 --- a/nixos/tests/discourse.nix +++ b/nixos/tests/discourse.nix @@ -188,7 +188,7 @@ in ) client.wait_for_unit("postfix.service") - client.wait_for_unit("dovecot2.service") + client.wait_for_unit("dovecot.service") discourse.succeed( "sudo -u discourse discourse-rake api_key:create_master[master] >api_key", diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix index 2bbe30056055..25082b30b4e5 100644 --- a/nixos/tests/novacomd.nix +++ b/nixos/tests/novacomd.nix @@ -2,10 +2,7 @@ import ./make-test-python.nix ( { pkgs, ... }: { name = "novacomd"; - meta = with pkgs.lib.maintainers; { - maintainers = [ dtzWill ]; - }; - + meta.maintainers = [ ]; nodes.machine = { ... }: { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index ea1882506256..1af7eee86a52 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -12,12 +12,12 @@ pkgs, }: let - version = "0.0.27-unstable-2025-12-22"; + version = "0.0.27-unstable-2025-12-30"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "476f342fe6bc1e120ba3e334b5d9cf3ef66de56a"; - hash = "sha256-jnDANbe2PfCl375rK+goEu2LkwBpqvTaPBk6zq5ada0="; + rev = "7a9fbbd4ddc9affc6a33bff644b1af7c0f908e74"; + hash = "sha256-YpNNd9x6GFeWLxaShL6+g1Z29wUM/aJKZQ24/twXvAU="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index b6be35974dcd..6c9482c058a0 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2025-12-19"; + version = "0-unstable-2025-12-28"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "ee3e73cf7b3959ad75f01f30afde286d427a5bee"; - hash = "sha256-w0ADn4R7KzYokKtBDuKcdrTD/3XAZ1uz4LM2zPOhic8="; + rev = "b923925b4ec924d3b2051298ae9eb3ae654d99db"; + hash = "sha256-zwCDU94vixCQwVK7fLCdLobizt0nCf/0ZzkUaQLnYDs="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index 0b7f425f1ce8..b307f1480f41 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2025-12-12"; + version = "0-unstable-2025-12-29"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "37a9077304908196193b20d5f314dd86fe0578e1"; - hash = "sha256-zYQHP9DohTurAY4j1Vj73YvSHZHXFSsEa30UETORAyA="; + rev = "4886dcb1c20cd4a85627cc4970d9d01cdf1c2d7d"; + hash = "sha256-Lp0MCf8MbqfeSdp6qrWi+q1xgatKl+8HDbTSd5xuzLM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/freeintv.nix b/pkgs/applications/emulators/libretro/cores/freeintv.nix index e09316233333..ad2b5638a110 100644 --- a/pkgs/applications/emulators/libretro/cores/freeintv.nix +++ b/pkgs/applications/emulators/libretro/cores/freeintv.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "freeintv"; - version = "0-unstable-2025-11-11"; + version = "0-unstable-2025-12-26"; src = fetchFromGitHub { owner = "libretro"; repo = "freeintv"; - rev = "1b51f41238ef9691d9fe16722f7d093bb6a6e379"; - hash = "sha256-kuznjK9HnqR42Cuz6bmUhEUnerrWb5VIvkiU0p//ecw="; + rev = "df5a5312985b66b1ec71b496868641e40b7ad1c9"; + hash = "sha256-xpcDAvxHvnuiQiWBYSwPKGE+Zg1lcs/6L4hMhpb1G1g="; }; makefile = "Makefile"; diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 88d75a75fbe7..c4b9d33aed63 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Simple tool for visually comparing two PDF files"; license = lib.licenses.gpl2; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "diff-pdf"; }; } diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix index f395401a9b70..97bf67288744 100644 --- a/pkgs/by-name/ac/actionlint/package.nix +++ b/pkgs/by-name/ac/actionlint/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.7.9"; + version = "1.7.10"; subPackages = [ "cmd/actionlint" ]; @@ -19,10 +19,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; tag = "v${version}"; - hash = "sha256-QZVZ4pF69rtdXmFIMXooTpAjzPM4TTzUKVVMWYqmUvQ="; + hash = "sha256-KnvFzV1VDivt7JL1lavM9wgaxdsdnEiLAk/pmzkXi+c="; }; - vendorHash = "sha256-oejeEImMgNXnbDIFg7MslcisVJj4Pl150ZMJ0YqGdLM="; + vendorHash = "sha256-McXlYsJvANyPAXAaXM8/NCFxbDs9IgSgFvt68h8mGek="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 846b8df66115..30a3eeb62b89 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -11,7 +11,8 @@ nixosTests, }: let - yarn-berry = yarn-berry_4; + nodejs = nodejs_22; + yarn-berry = yarn-berry_4.override { inherit nodejs; }; version = "25.12.0"; src = fetchFromGitHub { name = "actualbudget-actual-source"; @@ -40,8 +41,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ yarn-berry - nodejs_22 - yarn-berry.yarnBerryConfigHook + nodejs + (yarn-berry.yarnBerryConfigHook.override { inherit nodejs; }) (python3.withPackages (ps: [ ps.setuptools ])) # Used by node-gyp makeWrapper ] @@ -120,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { rm -r node_modules/.bin cp -r ./node_modules $out/lib/actual/ - makeWrapper ${lib.getExe nodejs_22} "$out/bin/actual-server" \ + makeWrapper ${lib.getExe nodejs} "$out/bin/actual-server" \ --add-flags "$out/lib/actual/packages/sync-server/bin/actual-server.js" \ --set NODE_PATH "$out/actual/lib/node_modules" diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix index d8a3370426b0..e86b27abbfa3 100644 --- a/pkgs/by-name/au/audiobookshelf/package.nix +++ b/pkgs/by-name/au/audiobookshelf/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, runCommand, buildNpmPackage, - nodejs, + nodejs_22, ffmpeg-full, nunicode, util-linux, @@ -32,6 +32,8 @@ let pname = "audiobookshelf-client"; inherit (source) version; + nodejs = nodejs_22; + src = runCommand "cp-source" { } '' cp -r ${src}/client $out ''; @@ -59,6 +61,7 @@ buildNpmPackage { inherit src; inherit (source) npmDepsHash version; + nodejs = nodejs_22; buildInputs = [ util-linux ]; nativeBuildInputs = [ python3 ]; @@ -73,7 +76,7 @@ buildNpmPackage { mkdir $out/bin echo '${wrapper}' > $out/bin/audiobookshelf - echo " exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/audiobookshelf + echo " exec ${nodejs_22}/bin/node $out/opt/index.js" >> $out/bin/audiobookshelf chmod +x $out/bin/audiobookshelf ''; diff --git a/pkgs/by-name/az/azpainter/package.nix b/pkgs/by-name/az/azpainter/package.nix index 2ae82e143987..f5e740555e6c 100644 --- a/pkgs/by-name/az/azpainter/package.nix +++ b/pkgs/by-name/az/azpainter/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "Full color painting software for illustration drawing"; homepage = "http://azsky2.html.xdomain.jp/soft/azpainter.html"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = with lib.platforms; linux ++ darwin; mainProgram = "azpainter"; }; diff --git a/pkgs/by-name/ba/bashplotlib/package.nix b/pkgs/by-name/ba/bashplotlib/package.nix index 891a04b773aa..f4e19fdcfe3e 100644 --- a/pkgs/by-name/ba/bashplotlib/package.nix +++ b/pkgs/by-name/ba/bashplotlib/package.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication { meta = { homepage = "https://github.com/glamp/bashplotlib"; description = "Plotting in the terminal"; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/bi/bibclean/package.nix b/pkgs/by-name/bi/bibclean/package.nix index 710d0ed797be..7a32cdce0745 100644 --- a/pkgs/by-name/bi/bibclean/package.nix +++ b/pkgs/by-name/bi/bibclean/package.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://ftp.math.utah.edu/pub/bibclean"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/bi/biblatex-check/package.nix b/pkgs/by-name/bi/biblatex-check/package.nix index f7b7eee5d333..0cac66cc10c1 100644 --- a/pkgs/by-name/bi/biblatex-check/package.nix +++ b/pkgs/by-name/bi/biblatex-check/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Python2/3 script for checking BibLatex .bib files"; homepage = "https://github.com/Pezmc/BibLatex-Check"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "biblatex-check"; }; } diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix index 1e40d137f770..e48ae021f483 100644 --- a/pkgs/by-name/bl/bluesky-pds/package.nix +++ b/pkgs/by-name/bl/bluesky-pds/package.nix @@ -8,7 +8,7 @@ fetchPnpmDeps, pnpmConfigHook, fetchFromGitHub, - nodejs, + nodejs_22, vips, pkg-config, nixosTests, @@ -18,6 +18,9 @@ }: let + # build failure against better-sqlite3, so we use nodejs_22; upstream + # bluesky-pds uses 20 + nodejs = nodejs_22; nodeSources = srcOnly nodejs; pythonEnv = python3.withPackages (p: [ p.setuptools ]); in diff --git a/pkgs/by-name/ch/chelf/package.nix b/pkgs/by-name/ch/chelf/package.nix index addf2f4e49be..c331b418ad00 100644 --- a/pkgs/by-name/ch/chelf/package.nix +++ b/pkgs/by-name/ch/chelf/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Change or display the stack size of an ELF binary"; homepage = "https://github.com/Gottox/chelf"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "chelf"; }; } diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix index a370e2fb8643..945eba129ad6 100644 --- a/pkgs/by-name/ch/chirp/package.nix +++ b/pkgs/by-name/ch/chirp/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication { pname = "chirp"; - version = "0.4.0-unstable-2025-12-23"; + version = "0.4.0-unstable-2025-12-30"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "79cb755ff71afe2266da4a4aa40e573929d7b071"; - hash = "sha256-LyHS4LG2e70IAPKLFwAdcfjDyNJNU2etG7VzEnvQy6g="; + rev = "412685c82eecd3b05d43ffbd09b34466238d3e6e"; + hash = "sha256-bYpJrYQHP+/pXzikBJ0ZxQYThLeGo4UE88leJKbzVNo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix index 29534b23c2f1..c65f9c5a977a 100644 --- a/pkgs/by-name/cl/cloudlog/package.nix +++ b/pkgs/by-name/cl/cloudlog/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-7Ja/EcD2oiwD2xIdeZNAl+np2nd+6zluzQ87dmUgDVg="; + hash = "sha256-Di4x55EESuS6R8b0HeJHAKzqhl5JTzxputKx6SmX8CM="; }; postPatch = '' diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix index 66adaa95851b..c3aa9b2aa152 100644 --- a/pkgs/by-name/co/conan/package.nix +++ b/pkgs/by-name/co/conan/package.nix @@ -117,6 +117,8 @@ python3Packages.buildPythonApplication rec { "test/functional/util/test_cmd_args_to_string.py" "test/performance/test_large_graph.py" "test/unittests/tools/env/test_env_files.py" + # pipenv will attempt to access the network. + "test/functional/tools/system/pip_manager_test.py" ]; meta = { diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index b3939329e100..a57e07e1651d 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -22,6 +22,11 @@ buildGoModule rec { CGO_CFLAGS = "-I ${systemdLibs}/include"; + ldflags = [ + "-extldflags='-Wl,-z,lazy'" + "-X 'github.com/coroot/coroot-node-agent/flags.Version=${version}'" + ]; + meta = { description = "Prometheus exporter based on eBPF"; homepage = "https://github.com/coroot/coroot-node-agent"; diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index f8ae9f30b695..0817e99d435e 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -32,11 +32,6 @@ gtkmm3, }: -# Known issues: -# - The daemon can't be started from the GUI, because pkexec requires a shell -# registered in /etc/shells. The nix's bash is not in there when running -# cpu-x from nixpkgs. - stdenv.mkDerivation (finalAttrs: { pname = "cpu-x"; version = "5.4.0"; @@ -48,6 +43,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-db7NxoVZgnYb1MZKfiFINx00JqDnf/TvwumBp6qDooQ="; }; + postPatch = '' + # https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/pull/402 + # FIXME: remove in the next version + substituteInPlace src/core/bandwidth/{OOC/utility,routines}-x86-64bit.asm \ + --replace-fail "cpu ia64" "cpu default" + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/cr/crex/package.nix b/pkgs/by-name/cr/crex/package.nix index bf982f754d9d..c08d5e9254c5 100644 --- a/pkgs/by-name/cr/crex/package.nix +++ b/pkgs/by-name/cr/crex/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Explore, test, and check regular expressions in the terminal"; homepage = "https://octobanana.com/software/crex"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = lib.platforms.all; mainProgram = "crex"; }; diff --git a/pkgs/by-name/de/dedup/package.nix b/pkgs/by-name/de/dedup/package.nix index bbdeb9431016..fa5106966c9e 100644 --- a/pkgs/by-name/de/dedup/package.nix +++ b/pkgs/by-name/de/dedup/package.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { bsd0 isc ]; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index e03491fea2f0..f0dd5f01897f 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "dep-scan"; - version = "6.0.0b5"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "owasp-dep-scan"; repo = "dep-scan"; tag = "v${version}"; - hash = "sha256-D+ILgWifIV27CG4aJUHeI6F7ASomS0iyAG0beIIzJNk="; + hash = "sha256-velhNPw/sfiq+8ZP5jkRU0tAwowcVO/BkSn7KocqLQI="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix index 8a5b6700476d..2319a5576467 100644 --- a/pkgs/by-name/du/duckdb/package.nix +++ b/pkgs/by-name/du/duckdb/package.nix @@ -10,6 +10,7 @@ unixODBC, withJdbc ? false, withOdbc ? false, + versionCheckHook, }: let @@ -56,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + installCheckPhase = let excludes = map (pattern: "exclude:'${pattern}'") ( @@ -132,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.updateScript = ./update.sh; + passthru.pythonHash = versions.python_hash; meta = { changelog = "https://github.com/duckdb/duckdb/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/du/duckdb/update.sh b/pkgs/by-name/du/duckdb/update.sh index c440e2d5b1e2..fb0ed6ac93e3 100755 --- a/pkgs/by-name/du/duckdb/update.sh +++ b/pkgs/by-name/du/duckdb/update.sh @@ -35,3 +35,6 @@ json=$(nix-prefetch-github "${owner}" "${repo}" --rev "v${tag}") json_set ".version" "${tag}" json_set ".rev" "$(jq -r '.rev' <<< "${json}")" json_set ".hash" "$(jq -r '.hash' <<< "${json}")" + +python_json=$(nix-prefetch-github "${owner}" "${repo}-python" --rev "v${tag}") +json_set ".python_hash" "$(jq -r '.hash' <<< "${python_json}")" diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json index 0bbd61cd8bbc..17ef05c73cd5 100644 --- a/pkgs/by-name/du/duckdb/versions.json +++ b/pkgs/by-name/du/duckdb/versions.json @@ -1,5 +1,6 @@ { - "version": "1.4.1", - "rev": "b390a7c3760bd95926fe8aefde20d04b349b472e", - "hash": "sha256-w/mELyRs4B9hJngi1MLed0fHRq/ldkkFV+SDkSxs3O8=" + "version": "1.4.3", + "rev": "d1dc88f950d456d72493df452dabdcd13aa413dd", + "hash": "sha256-zYiyY/8mYCyKuSQYNxepGbZPVgdCgULLmhZlWAAW0QA=", + "python_hash": "sha256-qq8y1rdNixQ6oqjKtmIj8IG52gypmP3Qu9ldojPr+Cg=" } diff --git a/pkgs/by-name/dy/dyncall/package.nix b/pkgs/by-name/dy/dyncall/package.nix index 1a054088d248..dcede20c1d82 100644 --- a/pkgs/by-name/dy/dyncall/package.nix +++ b/pkgs/by-name/dy/dyncall/package.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Highly dynamic multi-platform foreign function call interface library"; homepage = "https://www.dyncall.org"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix index 72f4afab8b01..8f9679a0ee11 100644 --- a/pkgs/by-name/el/ell/package.nix +++ b/pkgs/by-name/el/ell/package.nix @@ -66,7 +66,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ mic92 - dtzWill ]; }; } diff --git a/pkgs/by-name/fi/firezone-server/0000-add-mua.patch b/pkgs/by-name/fi/firezone-server/0000-add-mua.patch index cee9e1ef64fc..17ee4bdf2d1f 100644 --- a/pkgs/by-name/fi/firezone-server/0000-add-mua.patch +++ b/pkgs/by-name/fi/firezone-server/0000-add-mua.patch @@ -14,7 +14,7 @@ diff --git a/elixir/mix.exs b/elixir/mix.exs index df90739df..5c53e4383 100644 --- a/elixir/mix.exs +++ b/elixir/mix.exs -@@ -50,7 +50,9 @@ defmodule Firezone.MixProject do +@@ -50,6 +50,8 @@ defmodule Firezone.MixProject do # Formatter doesn't track dependencies of children applications {:phoenix, "~> 1.7.0"}, {:phoenix_live_view, "~> 1.0.0-rc.0"}, @@ -24,7 +24,26 @@ index df90739df..5c53e4383 100644 + {:mail, "~> 0.3.0"} ] end - +diff --git a/elixir/config/runtime.exs b/elixir/config/runtime.exs +index abb3171bf77..f9d903e040f 100644 +--- a/elixir/config/runtime.exs ++++ b/elixir/config/runtime.exs +@@ -324,5 +324,12 @@ if config_env() == :prod do + Domain.Mailer, + [ + adapter: env_var_to_config!(:outbound_email_adapter), +- from_email: env_var_to_config!(:outbound_email_from) ++ from_email: env_var_to_config!(:outbound_email_from), ++ protocol: String.to_atom(System.get_env("OUTBOUND_EMAIL_SMTP_PROTOCOL")), ++ relay: System.get_env("OUTBOUND_EMAIL_SMTP_HOST"), ++ port: String.to_integer(System.get_env("OUTBOUND_EMAIL_SMTP_PORT")), ++ auth: [ ++ username: System.get_env("OUTBOUND_EMAIL_SMTP_USERNAME"), ++ password: System.get_env("OUTBOUND_EMAIL_SMTP_PASSWORD") ++ ] + ] ++ env_var_to_config!(:outbound_email_adapter_opts) + + config :workos, WorkOS.Client, diff --git a/elixir/mix.lock b/elixir/mix.lock index 0b03b58d0..eefb202f4 100644 --- a/elixir/mix.lock @@ -43,4 +62,3 @@ index 0b03b58d0..eefb202f4 100644 "multipart": {:hex, :multipart, "0.4.0", "634880a2148d4555d050963373d0e3bbb44a55b2badd87fa8623166172e9cda0", [:mix], [{:mime, "~> 1.2 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}], "hexpm", "3c5604bc2fb17b3137e5d2abdf5dacc2647e60c5cc6634b102cf1aef75a06f0a"}, "nimble_csv": {:hex, :nimble_csv, "1.3.0", "b7f998dc62b222bce9596e46f028c7a5af04cb5dde6df2ea197c583227c54971", [:mix], [], "hexpm", "41ccdc18f7c8f8bb06e84164fc51635321e80d5a3b450761c4997d620925d619"}, "nimble_options": {:hex, :nimble_options, "1.1.1", "e3a492d54d85fc3fd7c5baf411d9d2852922f66e69476317787a7b2bb000a61b", [:mix], [], "hexpm", "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"}, - diff --git a/pkgs/by-name/fi/firezone-server/package.nix b/pkgs/by-name/fi/firezone-server/package.nix index 44e7d26a8c08..f2d302a66f61 100644 --- a/pkgs/by-name/fi/firezone-server/package.nix +++ b/pkgs/by-name/fi/firezone-server/package.nix @@ -22,7 +22,7 @@ beamPackages.mixRelease rec { owner = "firezone"; repo = "firezone"; rev = "f86719db19b848ab757995361032c1f2b7927d13"; - hash = "sha256-YvPxLEE6pdILrABWCZs7ebf6i3Inm1k/YkotZgI7A2k="; + hash = "sha256-MrW+mnVMi3mOwkcWDsY84rVBaX1qJPmqkecdH8I2ng0="; # This is necessary to allow sending mails via SMTP, as the default # SMTP adapter is current broken: https://github.com/swoosh/swoosh/issues/785 diff --git a/pkgs/by-name/fo/foomatic-filters/fix-incompatible-pointer-types.patch b/pkgs/by-name/fo/foomatic-filters/fix-incompatible-pointer-types.patch new file mode 100644 index 000000000000..04c181c6d5ad --- /dev/null +++ b/pkgs/by-name/fo/foomatic-filters/fix-incompatible-pointer-types.patch @@ -0,0 +1,25 @@ +From 822bf358b1e47704365feb84cac8a0af08611ea5 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Thu, 1 Jan 2026 20:28:52 +0800 +Subject: [PATCH] fix incompatible pointer types + +--- + process.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/process.h b/process.h +index b95dcb4..58aa8bf 100644 +--- a/process.h ++++ b/process.h +@@ -28,7 +28,7 @@ + #include + #include + +-pid_t start_process(const char *name, int (*proc_func)(), void *user_arg, FILE **fdin, FILE **fdout); ++pid_t start_process(const char *name, int (*proc_func)(FILE *, FILE *, void *), void *user_arg, FILE **fdin, FILE **fdout); + pid_t start_system_process(const char *name, const char *command, FILE **fdin, FILE **fdout); + + /* returns command's return status (see waitpid(2)) */ +-- +2.51.2 + diff --git a/pkgs/by-name/fo/foomatic-filters/package.nix b/pkgs/by-name/fo/foomatic-filters/package.nix index 5f69ec334aa2..3a3eca5773a0 100644 --- a/pkgs/by-name/fo/foomatic-filters/package.nix +++ b/pkgs/by-name/fo/foomatic-filters/package.nix @@ -8,15 +8,16 @@ cups, dbus, enscript, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "foomatic-filters"; version = "4.0.17"; src = fetchurl { - url = "https://www.openprinting.org/download/foomatic/foomatic-filters-${version}.tar.gz"; - sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; + url = "https://www.openprinting.org/download/foomatic/foomatic-filters-${finalAttrs.version}.tar.gz"; + hash = "sha256-ouLlPlAlceiO65AQxFoNVGcfFXB+4QT1ycIrWep6M+M="; }; nativeBuildInputs = [ pkg-config ]; @@ -33,10 +34,14 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/foomatic-filters/raw/a3abbef2d2f8c7e62d2fe64f64afe294563fdf8f/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch"; sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4"; }) + # Fix build with gcc15 + # process.h:31:45: note: expected 'int (*)(void)' but argument is of type 'int (*)(FILE *, FILE *, void *)' + ./fix-incompatible-pointer-types.patch ]; preConfigure = '' - substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell} + substituteInPlace foomaticrip.c \ + --replace-fail /bin/bash ${stdenv.shell} ''; # Workaround build failure on -fno-common toolchains like upstream @@ -52,6 +57,9 @@ stdenv.mkDerivation rec { "CUPS_BACKENDS=$(out)/lib/cups/backend" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "Foomatic printing filters"; mainProgram = "foomatic-rip"; @@ -59,4 +67,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; -} +}) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index e3a367a0c37e..373efbc13b6f 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -48,17 +48,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "12.3.1"; + version = "12.4.0"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-Rw6/G4gbWKikYjeKYw2cHxLMw8ULqnbhqHQFDzHCMrY="; + hash = "sha256-e7IDkeeEz8uAZ8WbRnBjSGq3SXVt5NY5li/3s/kf6dY="; }; - vendorHash = "sha256-ReGxoPvW4G6DbFfR2OeeT3tupZkpLpX80zK824oeyVg="; + vendorHash = "sha256-oCSAehLC5NiL0Ttp+FeHQyTQYNh/59I1i0UfbwWPeRE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index 8fab5e56c3d6..f745cb78d999 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-0iqBAwSWcYJyu7YbFvlSzGvRKYAXyDzDzy0yWjL4eu0="; + hash = "sha256-7EmRC8qFN0q9O8FsQiSqYqEfvCg7yKKOxLca098867A="; }; - cargoHash = "sha256-1bPmSz20UOAGvIbWwsB6BoNxXcOxg+f0dpnLw3V80CM="; + cargoHash = "sha256-INxtgEg1a8PK0BofySwB2OsLFlVZaiz9nbXGNKB+icE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index a84b81799ce0..9c9a4c44f328 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "0-unstable-2025-07-28"; + version = "0-unstable-2025-12-22"; # Similar to `pdm show`, but without the commit counter pdmVersion = let @@ -18,16 +18,17 @@ python3.pkgs.buildPythonApplication rec { rev = lib.substring 0 7 src.rev; in "${tag}.1.dev0+g${rev}"; - # the latest commit ID touching the `firmware` directory, can differ from rev! - firmwareGitRev = "4fe35360"; + # The latest commit ID touching the `firmware` directory, before a "deploy firmware" commit. + # Differs from rev! + firmwareGitRev = "8b5afc70"; pyproject = true; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "18442e9684cdda4bb2cbd2be9c31b3c6dffc625a"; - hash = "sha256-b0kpgCHMk5Ylj4hY29sHRzY/zI1JXReHioHxHSO4h5E="; + rev = "ccee116d8b59f25ed0874d152f6b9f9974b185f1"; + hash = "sha256-2fF0lPfRtpci76q4fEhWAwLBXP0kfIP3dH5z8u/+yd8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/go-i18n/package.nix b/pkgs/by-name/go/go-i18n/package.nix index d1e42129ed00..cb5c3edb7ba8 100644 --- a/pkgs/by-name/go/go-i18n/package.nix +++ b/pkgs/by-name/go/go-i18n/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "go-i18n"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "nicksnyder"; repo = "go-i18n"; tag = "v${finalAttrs.version}"; - hash = "sha256-UrSECFbpCIg5avJ+f3LkJy/ncZFHa4q8sDqDIQ3YZJM="; + hash = "sha256-ag/8GBAwqkOyIVrdlaFYLxy9dgPOq7VbactrLmzxK7E="; }; - vendorHash = "sha256-4Kbdj2D6eJTjZtdsFMNES3AEZ0PEi01HS73uFNZsFMA="; + vendorHash = "sha256-HhSzcK5FdOL2itnO/9kPTExbq0ZvVbvkl+aFtbv//4c="; subPackages = [ "goi18n" diff --git a/pkgs/by-name/he/health-check/package.nix b/pkgs/by-name/he/health-check/package.nix index 4916f95d241a..098e979e50cc 100644 --- a/pkgs/by-name/he/health-check/package.nix +++ b/pkgs/by-name/he/health-check/package.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ColinIanKing/health-check"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix index 7682691c9a9f..2fcc086414cc 100644 --- a/pkgs/by-name/hy/hyprshell/package.nix +++ b/pkgs/by-name/hy/hyprshell/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprshell"; - version = "4.8.2"; + version = "4.8.3"; src = fetchFromGitHub { owner = "H3rmt"; repo = "hyprshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-2DXbiHdEMAu5kkaurwj8BVjwWnIopE1sMcfLGxe1LoU="; + hash = "sha256-MO3v5YTVRGp0k0WNZSmal2e9Un9EBCsKwl3NL5PyJUI="; }; - cargoHash = "sha256-kcuhDM7ukk5UlemADmCJPHodp/tHQVyt1ZAbZF60vpA="; + cargoHash = "sha256-4XlyVuePqB9hBNNOjnipA2FVJJwP/7dJR594o8u1rNQ="; nativeBuildInputs = [ wrapGAppsHook4 diff --git a/pkgs/by-name/iw/iwd/package.nix b/pkgs/by-name/iw/iwd/package.nix index 2422f0fc52f5..f99579a1d5da 100644 --- a/pkgs/by-name/iw/iwd/package.nix +++ b/pkgs/by-name/iw/iwd/package.nix @@ -113,7 +113,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ - dtzWill fpletz ]; }; diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix index 5479cd5ca1fb..9caad3650ee5 100644 --- a/pkgs/by-name/jr/jreleaser-cli/package.nix +++ b/pkgs/by-name/jr/jreleaser-cli/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { pname = "jreleaser-cli"; - version = "1.21.0"; + version = "1.22.0"; src = fetchurl { url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar"; - hash = "sha256-X3lepk3T/Bc55Xkj0rLRo5ALohxqh0NCuUYvac/uijY="; + hash = "sha256-3EMv+yzn8eNFf9UIkKRXH72UKrfH2XtXGZZ+scbpvSU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index 1f168d6013fb..70a2c7a40e7e 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/artoh/kitupiikki"; description = "Accounting tool suitable for Finnish associations and small business"; mainProgram = "kitsas"; - maintainers = with lib.maintainers; [ gspia ]; + maintainers = [ ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ku/kubectl-ktop/package.nix b/pkgs/by-name/ku/kubectl-ktop/package.nix index d419df11cb46..c44958d58e6c 100644 --- a/pkgs/by-name/ku/kubectl-ktop/package.nix +++ b/pkgs/by-name/ku/kubectl-ktop/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubectl-ktop"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "vladimirvivien"; repo = "ktop"; rev = "v${version}"; - sha256 = "sha256-5iFFYTZq5DcMYVnW90MKVDchVXzjXOPd5BeYcrqL9pQ="; + sha256 = "sha256-VNP66Mtzyd8U5ddP4n+VvT5ZrPDOqvDbylj3F0dMViM="; }; - vendorHash = "sha256-qNrjyMMsFE2FmIJc46fYq08b3XFFZeLlspth5anjMm8="; + vendorHash = "sha256-kSDbQFiZ8XMKyW7aYKe1s0pq038YC+RORCtMXFI+knA="; subPackages = [ "." ]; diff --git a/pkgs/by-name/lc/lcdf-typetools/package.nix b/pkgs/by-name/lc/lcdf-typetools/package.nix index afe4dcbb58ee..bddf45a1a78b 100644 --- a/pkgs/by-name/lc/lcdf-typetools/package.nix +++ b/pkgs/by-name/lc/lcdf-typetools/package.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "Utilities for manipulating OpenType, PostScript Type 1, and Multiple Master fonts"; homepage = "https://www.lcdf.org/type"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ld/ldns/package.nix b/pkgs/by-name/ld/ldns/package.nix index a076082fb91f..36bc1f114782 100644 --- a/pkgs/by-name/ld/ldns/package.nix +++ b/pkgs/by-name/ld/ldns/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { description = "Library with the aim of simplifying DNS programming in C"; homepage = "https://www.nlnetlabs.nl/projects/ldns/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "drill"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index a6283d9de9fa..711f3be6711c 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; mainProgram = "less"; maintainers = with lib.maintainers; [ - dtzWill # not active mdaniels5757 yiyu ]; diff --git a/pkgs/by-name/li/libgphoto2/package.nix b/pkgs/by-name/li/libgphoto2/package.nix index 407136cc63d0..5c3070a9e6ed 100644 --- a/pkgs/by-name/li/libgphoto2/package.nix +++ b/pkgs/by-name/li/libgphoto2/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.32"; + version = "2.5.33"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-gUw3D/bHnKoiTInJVAzMCs5urWz4UHWywTLZUuRROqw="; + sha256 = "sha256-gv84HD/ZjmAa0EpuYtUTGLcC7+BE8kWi4ut+RlvQvow="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/by-name/li/light/package.nix b/pkgs/by-name/li/light/package.nix index 6b1052e6fe6d..25d82ddb9425 100644 --- a/pkgs/by-name/li/light/package.nix +++ b/pkgs/by-name/li/light/package.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation { mainProgram = "light"; maintainers = with lib.maintainers; [ puffnfresh - dtzWill ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/lt/ltrace/package.nix b/pkgs/by-name/lt/ltrace/package.nix index 573f63608a53..6f560646c8e6 100644 --- a/pkgs/by-name/lt/ltrace/package.nix +++ b/pkgs/by-name/lt/ltrace/package.nix @@ -53,6 +53,11 @@ stdenv.mkDerivation { url = "https://github.com/gentoo/gentoo/raw/a2eb7e103ec985ff90f59e722e0a8a43373972a2/dev-debug/ltrace/files/ltrace-0.7.3-print-test-pie.patch"; hash = "sha256-QRsUoN3WLzfiY5GDPwVYXtJPFMJt6rcc6eE96SAtI6Q="; }) + # fix pointer conversion warning with Gcc15 + (fetchurl { + url = "https://gitlab.com/cespedes/ltrace/-/commit/d888b448740abd4d5846535ef1dc5ba1c74a134a.patch"; + hash = "sha256-9XAeulMUUvLh6Q9ppSL6d5kA2UPPyzCjwibcXH260Bo="; + }) ]; doCheck = true; diff --git a/pkgs/by-name/mu/musl/package.nix b/pkgs/by-name/mu/musl/package.nix index bef015a0756b..55afde78f596 100644 --- a/pkgs/by-name/mu/musl/package.nix +++ b/pkgs/by-name/mu/musl/package.nix @@ -207,7 +207,6 @@ stdenv.mkDerivation rec { ]; maintainers = with lib.maintainers; [ thoughtpolice - dtzWill ]; }; } diff --git a/pkgs/by-name/ni/nix-converter/package.nix b/pkgs/by-name/ni/nix-converter/package.nix index 73345f86b63c..318e181fcac2 100644 --- a/pkgs/by-name/ni/nix-converter/package.nix +++ b/pkgs/by-name/ni/nix-converter/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "nix-converter"; - version = "0-unstable-2025-04-14"; + version = "0-unstable-2025-12-29"; src = fetchFromGitHub { owner = "theobori"; repo = "nix-converter"; - rev = "d06af43bf578f2650417600250e68782478ce98d"; - hash = "sha256-/HEKbE1tLCGGu4xopky/02OWRt23UUTPKQCdi7ThCX8="; + rev = "6e5c00e94f078a1eea610e736e7e1fb8349b1ab5"; + hash = "sha256-Pdw/vUgfEws+EOyFT9WK8SjZP6DCVJkWWJgI01+5+KI="; }; vendorHash = "sha256-Ay1f9sk8RuJyOS7hl/lrscpxdlIgm9dMow/xTFoR+H4="; diff --git a/pkgs/by-name/nu/numatop/package.nix b/pkgs/by-name/nu/numatop/package.nix index 5f5a867baed4..138b49c73e43 100644 --- a/pkgs/by-name/nu/numatop/package.nix +++ b/pkgs/by-name/nu/numatop/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "numatop"; homepage = "https://01.org/numatop"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/by-name/nu/numr/package.nix b/pkgs/by-name/nu/numr/package.nix index fcf570fffbaa..b805bdb4aeee 100644 --- a/pkgs/by-name/nu/numr/package.nix +++ b/pkgs/by-name/nu/numr/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "numr"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "nasedkinpv"; repo = "numr"; rev = "v${finalAttrs.version}"; - hash = "sha256-VmI9GpmwDrR8LAH4OhbHeI2AnShx2K5Upg+CCBUpSsU="; + hash = "sha256-S/0xpxJAOHAZu3bLk3fzBWlfhmvxSmJcHOPnQqFj7Ww="; }; - cargoHash = "sha256-gVlZT3Buh8XQnR5kpknTuJ8nQPYKKGGqqCHve1JhFNA="; + cargoHash = "sha256-e2o2HFnXgFG+aprl/PLMAd2KskMsOGwhjEdoHWgBuAE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pa/paq/package.nix b/pkgs/by-name/pa/paq/package.nix index ef9125d814f5..43c9a9d073dc 100644 --- a/pkgs/by-name/pa/paq/package.nix +++ b/pkgs/by-name/pa/paq/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "paq"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "gregl83"; repo = "paq"; tag = "v${finalAttrs.version}"; - hash = "sha256-cG1xoe0mtijR5l1T2O/6C6yTdGhSXxYaGGugllOOZoE="; + hash = "sha256-L9hjTdpV7j1qKX9GSo9Nb+nA1mPKz2aftAquiBuUbn4="; }; - cargoHash = "sha256-M3UtXCX4caYYaXoS8F2kKheP5qX5xac2WPNCnw94B6Q="; + cargoHash = "sha256-LjAPCdPZI/qGISb4/kY2fRG0G0d/VwHeISAmfZSF4sI="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/po/polybar/package.nix b/pkgs/by-name/po/polybar/package.nix index 0d346aedb0a5..72b4c5017305 100644 --- a/pkgs/by-name/po/polybar/package.nix +++ b/pkgs/by-name/po/polybar/package.nix @@ -3,6 +3,7 @@ cairo, cmake, fetchFromGitHub, + fetchpatch, libuv, libXdmcp, libpthreadstubs, @@ -88,7 +89,16 @@ stdenv.mkDerivation (finalAttrs: { i3 ]; - patches = [ ./remove-hardcoded-etc.diff ]; + patches = [ + # FIXME: remove after version update + (fetchpatch { + name = "gcc15-cstdint-fix.patch"; + url = "https://github.com/polybar/polybar/commit/f99e0b1c7a5b094f5a04b14101899d0cb4ece69d.patch"; + sha256 = "sha256-Mf9R4u1Kq4yqLqTFD5ZoLjrK+GmlvtSsEyRFRCiQ72U="; + }) + + ./remove-hardcoded-etc.diff + ]; # Replace hardcoded /etc when copying and reading the default config. postPatch = '' diff --git a/pkgs/by-name/po/power-calibrate/package.nix b/pkgs/by-name/po/power-calibrate/package.nix index a1c7a8f6a10b..cb7487fac94e 100644 --- a/pkgs/by-name/po/power-calibrate/package.nix +++ b/pkgs/by-name/po/power-calibrate/package.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ColinIanKing/power-calibrate"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/re/reqable/package.nix b/pkgs/by-name/re/reqable/package.nix index 80d88007cb64..509387b79ae6 100644 --- a/pkgs/by-name/re/reqable/package.nix +++ b/pkgs/by-name/re/reqable/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "reqable"; - version = "3.0.30"; + version = "3.0.31"; src = fetchurl { url = "https://github.com/reqable/reqable-app/releases/download/${finalAttrs.version}/reqable-app-linux-x86_64.deb"; - hash = "sha256-tqeTcM0+RClOgWY72NJAFJAe62zbqAtdsIe//nZ3Kjs="; + hash = "sha256-GNxSGw00nnM9bN46sL7G4KcXnJ3gDXv8Xf3N0qbL/ao="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix index 408e3c67ff70..42d82834a8ec 100644 --- a/pkgs/by-name/ri/river-classic/package.nix +++ b/pkgs/by-name/ri/river-classic/package.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { the river 0.4.0 release. ''; changelog = "https://codeberg.org/river/river-classic/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ adamcstephens moni diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index c4e42b91fafb..df6437fe863f 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -166,6 +166,8 @@ flutter329.buildFlutterApplication rec { --replace-fail "libayatana-appindicator3.so.1" "${lib.getLib libayatana-appindicator}/lib/libayatana-appindicator3.so.1" # Disable static linking of ffmpeg since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84 sed -i 's/static=//g' $cargoDepsCopy/hwcodec-*/build.rs + sed -e '1i #include ' -i $cargoDepsCopy/webm-1.1.0/src/sys/libwebm/mkvparser/mkvparser.cc + sed -e '1i #include ' -i $cargoDepsCopy/webm-sys-1.0.4/libwebm/mkvparser/mkvparser.cc fi substituteInPlace ../Cargo.toml --replace-fail ", \"staticlib\", \"rlib\"" "" diff --git a/pkgs/by-name/rw/rw/package.nix b/pkgs/by-name/rw/rw/package.nix index d4fc0abff623..ec36ff41beaf 100644 --- a/pkgs/by-name/rw/rw/package.nix +++ b/pkgs/by-name/rw/rw/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { dd with standard style command line flags. ''; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "rw"; }; } diff --git a/pkgs/by-name/sa/samurai/package.nix b/pkgs/by-name/sa/samurai/package.nix index 37a879be2e56..02a5b537bf57 100644 --- a/pkgs/by-name/sa/samurai/package.nix +++ b/pkgs/by-name/sa/samurai/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { mit asl20 ]; # see LICENSE - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "samu"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index b09a3be81172..c765a02c6b9f 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -10,6 +10,7 @@ validatePkgConfig, libpng, libjpeg, + libjxl, nix-update-script, # Boolean flags enableTests ? true, @@ -19,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdl3-image"; - version = "3.2.4"; + version = "3.2.6"; outputs = [ "lib" @@ -31,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libsdl-org"; repo = "SDL_image"; tag = "release-${finalAttrs.version}"; - hash = "sha256-/orQ+YfH0CV8DOqXFMF9fOT4YaVpC1t55xM3j520Png="; + hash = "sha256-CnUCqFq9ZaM/WQcmaCpQdjtjR9l5ymzgeqEJx7ZW/s4="; }; strictDeps = true; @@ -46,8 +47,9 @@ stdenv.mkDerivation (finalAttrs: { sdl3 libtiff libwebp - libavif + libjxl ] + ++ (lib.optional (!stdenv.hostPlatform.isDarwin) libavif) ++ (lib.optionals (!enableSTB) [ libpng libjpeg @@ -64,6 +66,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDLIMAGE_BACKEND_IMAGEIO" enableImageIO) # enable tests (lib.cmakeBool "SDLIMAGE_TESTS" enableTests) + # enable jxl + (lib.cmakeBool "SDLIMAGE_JXL" true) + # disable avif on darwin (see https://github.com/NixOS/nixpkgs/issues/400910) + (lib.cmakeBool "SDLIMAGE_AVIF" (!stdenv.hostPlatform.isDarwin)) ]; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix index 2ee29303433e..b5f55aca31ce 100644 --- a/pkgs/by-name/st/stylelint/package.nix +++ b/pkgs/by-name/st/stylelint/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage rec { pname = "stylelint"; - version = "16.26.0"; + version = "16.26.1"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; tag = version; - hash = "sha256-Lw36rmGNoqobDoMdzYX7JaOFTyFGmjiBe55WI9RgAlY="; + hash = "sha256-klvYUuk1U6hClSWPQWwJv+uadjaEqkjOZv33PygyrCQ="; }; - npmDepsHash = "sha256-CCvyJzLCXbuipBXJrLdkAv/dT9RoZNhbwrUZhSaja8s="; + npmDepsHash = "sha256-S1BYJDap3kW/MWZyv7Acmx+rFdGrWLwBdKlGPgH1RsU="; dontNpmBuild = true; diff --git a/pkgs/by-name/tl/tlp-pd/package.nix b/pkgs/by-name/tl/tlp-pd/package.nix new file mode 100644 index 000000000000..239a467ecd0c --- /dev/null +++ b/pkgs/by-name/tl/tlp-pd/package.nix @@ -0,0 +1,60 @@ +{ + lib, + python3Packages, + tlp, + coreutils, +}: + +python3Packages.buildPythonApplication { + pname = "tlp-pd"; + inherit (tlp) + version + src + patches + postPatch + ; + + pyproject = false; # Built with make + + dependencies = with python3Packages; [ + pygobject3 + dbus-python + ]; + + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; + + installTargets = [ + "install-pd" + "install-man-pd" + ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ tlp ]}" ]; + + postInstall = '' + substituteInPlace $out/share/dbus-1/system-services/*.service \ + --replace-fail "/bin/false" "${coreutils}/false" + ''; + + checkPhase = '' + runHook preCheck + + # The program will error out but at least we are not missing python deps + ($out/bin/tlpctl --help 2>&1 || true) |\ + grep -q 'g-io-error-quark: Could not connect: No such file or directory' + $out/bin/tlp-pd --help + + runHook postCheck + ''; + + meta = { + inherit (tlp.meta) + homepage + changelog + platforms + maintainers + license + ; + description = "Power-rofiles-daemon like DBus interface for TLP"; + mainProgram = "tlp-pd"; + }; +} diff --git a/pkgs/by-name/tx/txr/package.nix b/pkgs/by-name/tx/txr/package.nix index 6e3d2cd71410..8951b5160e78 100644 --- a/pkgs/by-name/tx/txr/package.nix +++ b/pkgs/by-name/tx/txr/package.nix @@ -70,9 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://www.kylheku.com/cgit/txr/tree/RELNOTES?h=txr-${finalAttrs.version}"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ - dtzWill - ]; + maintainers = [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ve/vesktop/fix_read_only_settings.patch b/pkgs/by-name/ve/vesktop/fix_read_only_settings.patch deleted file mode 100644 index f36a7e928099..000000000000 --- a/pkgs/by-name/ve/vesktop/fix_read_only_settings.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/main/settings.ts b/src/main/settings.ts -index 6fad97f..dfc64e3 100644 ---- a/src/main/settings.ts -+++ b/src/main/settings.ts -@@ -26,8 +26,12 @@ function loadSettings(file: string, name: string) { - - const store = new SettingsStore(settings); - store.addGlobalChangeListener(o => { -- mkdirSync(dirname(file), { recursive: true }); -- writeFileSync(file, JSON.stringify(o, null, 4)); -+ try { -+ mkdirSync(dirname(file), { recursive: true }); -+ writeFileSync(file, JSON.stringify(o, null, 4)); -+ } catch (e) { -+ console.error("Nix: Failed to write settings.", e); -+ } - }); - - return store; diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index b72a7346ab3c..f6c9f3c1c639 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -26,13 +26,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZFAsyH+5duKerZissOR/lESLetqqEMLk86msLlQO1xU="; + hash = "sha256-Ceo66G9Dhz6cL4PlXXrM0Es9QrqFCvlaHgvP/c1aJfQ="; }; pnpmDeps = fetchPnpmDeps { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-7fYD4lTSLCMOa+CqGlL45Mjw6qMfIJddPcRF5/dGGrk="; + hash = "sha256-H5O08/2cWNj1KfYV1be+uYobDYGEdEfO0nlazbtiqvc="; }; nativeBuildInputs = [ @@ -72,10 +72,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.getLib stdenv.cc.cc) ]; - patches = [ - ./fix_read_only_settings.patch - ] - ++ lib.optional withSystemVencord ( + patches = lib.optional withSystemVencord ( replaceVars ./use_system_vencord.patch { inherit vencord; } diff --git a/pkgs/by-name/vi/vivid/package.nix b/pkgs/by-name/vi/vivid/package.nix index ea7fe8db1a41..a6d357aa81e0 100644 --- a/pkgs/by-name/vi/vivid/package.nix +++ b/pkgs/by-name/vi/vivid/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { asl20 # or mit ]; - maintainers = [ lib.maintainers.dtzWill ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "vivid"; }; diff --git a/pkgs/by-name/we/welkin/package.nix b/pkgs/by-name/we/welkin/package.nix deleted file mode 100644 index 8ccb5fb7de7d..000000000000 --- a/pkgs/by-name/we/welkin/package.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - stdenv, - fetchsvn, - jre, - makeWrapper, -}: - -stdenv.mkDerivation rec { - pname = "welkin"; - version = "1.1"; - - src = fetchsvn { - url = "http://simile.mit.edu/repository/welkin"; - rev = "9638"; - sha256 = "1bqh3vam7y805xrmdw7k0ckcfwjg88wypxgv3njkkwyn7kxnfnqp"; - }; - - sourceRoot = "${src.name}/tags/${version}"; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; - - installPhase = '' - mkdir -p $out/{bin,share} - cp -R . $out/share - cp $out/share/welkin.sh $out/bin/welkin - sed -e 's@\./lib/welkin\.jar@'"$out"'/share/lib/welkin.jar@' -i $out/bin/welkin - wrapProgram $out/bin/welkin \ - --set JAVA_HOME ${jre} - chmod a+x $out/bin/welkin - ''; - - meta = { - description = "RDF visualizer"; - maintainers = with lib.maintainers; [ - raskin - ]; - hydraPlatforms = [ ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.bsd3; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix index cf79497e1e4d..5b66db055e56 100644 --- a/pkgs/by-name/xb/xbps/package.nix +++ b/pkgs/by-name/xb/xbps/package.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation (finalAttrs: { description = "X Binary Package System"; platforms = lib.platforms.linux; # known to not work on Darwin, at least license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/xl/xlayoutdisplay/package.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix index f05f6834833f..5c1efac749b5 100644 --- a/pkgs/by-name/xl/xlayoutdisplay/package.nix +++ b/pkgs/by-name/xl/xlayoutdisplay/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement"; homepage = "https://github.com/alex-courtis/xlayoutdisplay"; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; license = lib.licenses.asl20; platforms = lib.platforms.linux; mainProgram = "xlayoutdisplay"; diff --git a/pkgs/by-name/xt/xtruss/package.nix b/pkgs/by-name/xt/xtruss/package.nix index 2545b275bf13..2a4c259431ca 100644 --- a/pkgs/by-name/xt/xtruss/package.nix +++ b/pkgs/by-name/xt/xtruss/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Easy-to-use X protocol tracing program"; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "xtruss"; }; } diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 4092c64ba713..82c59397cbb3 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -223,7 +223,7 @@ let else if format != null then format else - throw "${name} does not configure a `format`. To build with setuptools as before, set `pyproject = true` and `build-system = [ setuptools ]`.`"; + throw "${name} does not configure a `format`. To build with setuptools as before, set `pyproject = true` and `build-system = [ setuptools ]`."; withDistOutput = withDistOutput' format'; diff --git a/pkgs/development/libraries/readline/8.3.nix b/pkgs/development/libraries/readline/8.3.nix index c25c2007da03..bc28262304fd 100644 --- a/pkgs/development/libraries/readline/8.3.nix +++ b/pkgs/development/libraries/readline/8.3.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = lib.platforms.unix ++ lib.platforms.windows; branch = "8.3"; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 62274cc03916..2658a2b5d7f1 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation { description = "SQLite Archive utilities"; license = lib.licenses.bsd2; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/aioacaia/default.nix b/pkgs/development/python-modules/aioacaia/default.nix index 8d79e3d5b98c..2d07ffb4fba1 100644 --- a/pkgs/development/python-modules/aioacaia/default.nix +++ b/pkgs/development/python-modules/aioacaia/default.nix @@ -4,22 +4,19 @@ bleak-retry-connector, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "aioacaia"; - version = "0.1.17"; + version = "0.1.18"; pyproject = true; - disabled = pythonOlder "3.12"; - src = fetchFromGitHub { owner = "zweckj"; repo = "aioacaia"; tag = "v${version}"; - hash = "sha256-y9NSHiB66ICR+qJcLOdddnkm+f5hd9Zbqamr1UCzdlk="; + hash = "sha256-ltqY1n7Kvpf518q+cL8u+Cyg9BHySb0dopxKNtUdoA4="; }; build-system = [ setuptools ]; @@ -38,7 +35,7 @@ buildPythonPackage rec { description = "Async implementation of pyacaia"; homepage = "https://github.com/zweckj/aioacaia"; changelog = "https://github.com/zweckj/aioacaia/releases/tag/${src.tag}"; - license = lib.licenses.gpl3Only; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index d930a762fb6b..04ed03667916 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "6.4.4"; + version = "6.5.1"; pyproject = true; src = fetchFromGitHub { owner = "AppThreat"; repo = "vulnerability-db"; tag = "v${version}"; - hash = "sha256-bzr3RlTtWTH/P6hgiXjWvR1IbVtVSqbtrZHQ91o/V/E="; + hash = "sha256-SyUTDWi9t37Gw8qn7vCpW+l5jBAXFH5b/VACrFhgsRU="; }; pythonRelaxDeps = [ @@ -59,10 +59,6 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$(mktemp -d); - ''; - disabledTests = [ # Tests require network access "test_bulk_search" diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index c77191f806f3..27777bd680b9 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system setuptools, @@ -21,16 +22,24 @@ buildPythonPackage rec { pname = "blis"; - version = "1.3.0"; + version = "1.3.3"; pyproject = true; src = fetchFromGitHub { owner = "explosion"; repo = "cython-blis"; tag = "release-v${version}"; - hash = "sha256-mSIfFjnLhPLqSNLHMS5gTeAmqmNfXpcbyH7ejv4YgQU="; + hash = "sha256-CCy5vYjj4pCOfpKSEjdHsA6XTW7Wl3UVN8FHUsAhmVk="; }; + patches = [ + # TODO: remove after next update + (fetchpatch2 { + url = "https://github.com/explosion/cython-blis/commit/1498af063ea924e2e2334a3f5ab49ae1a66a8648.patch?full_index=1"; + hash = "sha256-zl+xIoYVjf13La53ocrL0ztx48sdJfWN1Y6px6Hgf9Q="; + }) + ]; + build-system = [ setuptools cython @@ -45,9 +54,14 @@ buildPythonPackage rec { # error: [Errno 2] No such file or directory: '/build/source/blis/_src/make/linux-cortexa57.jsonl' (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) - # clang: error: unknown argument '-mavx512pf'; did you mean '-mavx512f'? - # Patching blis/_src/config/knl/make_defs.mk to remove the said flag does not work - || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) + # cc1: error: bad value ‘knl’ for ‘-march=’ switch + # https://gcc.gnu.org/gcc-15/changes.html#x86 + || ( + stdenv.hostPlatform.isLinux + && stdenv.hostPlatform.isx86_64 + && stdenv.cc.isGNU + && lib.versionAtLeast stdenv.cc.version "15" + ) ) { BLIS_ARCH = "generic"; diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index 9ebe97b1be59..024b42ebbd2b 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "cryptolyzer"; - version = "1.0.0"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-rRiRaXONLMNirKsK+QZWMSvaGeSLrHN9BpM8dhxoaxY="; + hash = "sha256-c/cBOrvqyvdGfDKPRUhIu9FqtQUERb/fJBGmncZpbSM="; }; patches = [ diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index 178bda5a1ea1..5aa9eaf01b20 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "cymem"; tag = "release-v${version}"; - hash = "sha256-4srwdQS06KeBAIaJm6XxmsHEZto0eiXBznrCHgT/BAc="; + hash = "sha256-kZHnfUNbDyw+LD/7GgtXa6ZssTkJG2PkcM+6YLFK5RQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 57310f82d8c0..2f9287fd4b35 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { inherit (duckdb) pname - version + version # nixpkgs-update: no auto update ; pyproject = true; @@ -33,14 +33,13 @@ buildPythonPackage rec { owner = "duckdb"; repo = "duckdb-python"; tag = "v${version}"; - hash = "sha256-cZyiTqu5iW/cqEo42b/XnOG7hJqtQs1h2RXXL392ujA="; + hash = duckdb.passthru.pythonHash; }; postPatch = '' - # patch cmake to ignore absence of git submodule copy of duckdb - substituteInPlace cmake/duckdb_loader.cmake \ - --replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/external/duckdb"' \ - '"${duckdb.src}"' + # The build depends on a duckdb git submodule + rm -r external/duckdb + ln -s ${duckdb.src} external/duckdb # replace pybind11[global] with pybind11 substituteInPlace pyproject.toml \ diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 5f040fbb4d3c..f308641a42ef 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "fx2"; - version = "0.13"; + version = "0.14"; format = "setuptools"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; rev = "v${version}"; - hash = "sha256-PtWxjT+97+EeNMN36zOT1+ost/w3lRRkaON3Cl3dpp4="; + hash = "sha256-uMgf1VL3yvkLUfRlBn9NKcerfHfcFg9yEgHGWmwyh8I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix index 4ef6076c0b60..4d20b8ab00b6 100644 --- a/pkgs/development/python-modules/groq/default.nix +++ b/pkgs/development/python-modules/groq/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "groq"; - version = "0.37.1"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "groq"; repo = "groq-python"; tag = "v${version}"; - hash = "sha256-PWqJK150eIaNIBS8uIoiZwQypES8/i750yc/FrIGdbc="; + hash = "sha256-M/W06O2xBvn7iU+62AwvyM7W54arxXViPOK4Jj4uje0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix index d6fdece359b6..ad359bd41e8a 100644 --- a/pkgs/development/python-modules/langchain-anthropic/default.nix +++ b/pkgs/development/python-modules/langchain-anthropic/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-anthropic"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-anthropic==${version}"; - hash = "sha256-dmuDgKQW1yAz/8tjQx7LaUiuz5Sh4cAyd9nt33mCPbI="; + hash = "sha256-/CqnpeQXYdafkly8shen72dIZU3I9o/2TwM903Nw9DA="; }; sourceRoot = "${src.name}/libs/partners/anthropic"; @@ -57,10 +57,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # TypeError from Pydantic - # https://github.com/langchain-ai/langchain/issues/34068 - "test_creates_bash_tool" - "test_replaces_tool_with_claude_descriptor" + # Fails when langchain-core gets ahead of this + "test_serdes" ]; pythonImportsCheck = [ "langchain_anthropic" ]; diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index f58818ba37b2..993321ef59fc 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-aws"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-aws"; tag = "langchain-aws==${version}"; - hash = "sha256-vszpWFKuDZb7DvUhnCROgKJdbyA+slyIhCcIOEuPPhA="; + hash = "sha256-tFyVK7IjPy33Az16DhWO6wSL5hBAdyd+urhSvdb18Ww="; }; postPatch = '' @@ -67,6 +67,11 @@ buildPythonPackage rec { enabledTestPaths = [ "tests/unit_tests" ]; + disabledTests = [ + # Fails when langchain-core gets ahead of this package + "test_serdes" + ]; + pythonImportsCheck = [ "langchain_aws" ]; passthru = { diff --git a/pkgs/development/python-modules/langchain-classic/default.nix b/pkgs/development/python-modules/langchain-classic/default.nix index a2918077e6d5..55b1d910d58f 100644 --- a/pkgs/development/python-modules/langchain-classic/default.nix +++ b/pkgs/development/python-modules/langchain-classic/default.nix @@ -35,19 +35,21 @@ responses, syrupy, toml, + + # update + gitUpdater, }: buildPythonPackage rec { pname = "langchain-classic"; - version = "1.0.0-unstable-2025-11-11"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - # no tagged releases avaialble - rev = "3dfea96ec1d2dac4e506d287860ee943c183c9f1"; - hash = "sha256-U3UllSSa4tFz+nXAP6aNoYceU/xCPbwKSP2F2et+qgQ="; + tag = "langchain-classic==${version}"; + hash = "sha256-4DlKOxt5OoPm38szMEJpw6gDl247eRsx4LZpofUKpUk="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -103,10 +105,12 @@ buildPythonPackage rec { "test_socket_disabled" ]; - # Bulk updater selects wrong tag (there is no tag for this yet) + # Bulk updater selects wrong tag passthru = { skipBulkUpdate = true; - updateScript = false; + updateScript = gitUpdater { + rev-prefix = "langchain-classic=="; + }; }; pythonImportsCheck = [ "langchain_classic" ]; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 26127cddb86a..816bffad7642 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "1.2.2"; + version = "1.2.5"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-core==${version}"; - hash = "sha256-WJITm+8XIqezr/2U8HpE0J4hYdzg2Z6tw8b5s6SF6m0="; + hash = "sha256-gHIJO5O9AxtROdDuo2UhdkW6p3+4dOJaO6iKelA26gE="; }; sourceRoot = "${src.name}/libs/core"; diff --git a/pkgs/development/python-modules/langchain-fireworks/default.nix b/pkgs/development/python-modules/langchain-fireworks/default.nix index 0b5317257556..44324e662aef 100644 --- a/pkgs/development/python-modules/langchain-fireworks/default.nix +++ b/pkgs/development/python-modules/langchain-fireworks/default.nix @@ -60,6 +60,11 @@ buildPythonPackage rec { enabledTestPaths = [ "tests/unit_tests" ]; + disabledTests = [ + # Fails when langchain-core gets ahead of this package + "test_serdes" + ]; + pythonImportsCheck = [ "langchain_fireworks" ]; passthru = { diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix index 3871f30d7998..b4fd7b6a4e5b 100644 --- a/pkgs/development/python-modules/langchain-google-genai/default.nix +++ b/pkgs/development/python-modules/langchain-google-genai/default.nix @@ -68,7 +68,13 @@ buildPythonPackage rec { syrupy ]; - pytestFlagsArray = [ "tests/unit_tests" ]; + enabledTestPaths = [ "tests/unit_tests" ]; + + disabledTests = [ + # Fails when langchain-core gets ahead of this package + "test_serdes" + "test_serialize" + ]; pythonImportsCheck = [ "langchain_google_genai" ]; diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix index e22b989117bd..2d8b16a778c7 100644 --- a/pkgs/development/python-modules/langchain-groq/default.nix +++ b/pkgs/development/python-modules/langchain-groq/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "langchain-groq"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-groq==${version}"; - hash = "sha256-dmuDgKQW1yAz/8tjQx7LaUiuz5Sh4cAyd9nt33mCPbI="; + hash = "sha256-WpIP41eALPoWuYjm2ygEH7TwClKYwAG0uEd1ZbbqMTY="; }; sourceRoot = "${src.name}/libs/partners/groq"; @@ -38,6 +38,8 @@ buildPythonPackage rec { # Each component release requests the exact latest core. # That prevents us from updating individual components. "langchain-core" + # Requires groq api < 1.0.0, but 1.0.0 is backwards compatible + "groq" ]; dependencies = [ @@ -52,6 +54,12 @@ buildPythonPackage rec { enabledTestPaths = [ "tests/unit_tests" ]; + disabledTests = [ + # These tests fail when langchain-core gets ahead of the package + "test_groq_serialization" + "test_serdes" + ]; + pythonImportsCheck = [ "langchain_groq" ]; passthru = { diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index 94fcff8723c8..57e10b63dd9d 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "langchain-huggingface"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-huggingface==${version}"; - hash = "sha256-dmuDgKQW1yAz/8tjQx7LaUiuz5Sh4cAyd9nt33mCPbI="; + hash = "sha256-ucKhuu8J6XudIyjCniJixFq79wPfoCnNBUd6r1U2ieI="; }; sourceRoot = "${src.name}/libs/partners/huggingface"; @@ -78,6 +78,11 @@ buildPythonPackage rec { enabledTestPaths = [ "tests/unit_tests" ]; + disabledTests = [ + # Requires a circular dependency on langchain + "test_init_chat_model_huggingface" + ]; + pythonImportsCheck = [ "langchain_huggingface" ]; passthru = { diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix index 130f01f33fea..d387144d2a53 100644 --- a/pkgs/development/python-modules/langchain-mistralai/default.nix +++ b/pkgs/development/python-modules/langchain-mistralai/default.nix @@ -57,6 +57,8 @@ buildPythonPackage rec { disabledTests = [ # Comparison error due to message formatting differences "test__convert_dict_to_message_tool_call" + # Fails when langchain-core gets ahead of this package + "test_serdes" ]; pythonImportsCheck = [ "langchain_mistralai" ]; diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 41d4d63df586..ca02978305cf 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "1.1.1"; + version = "1.1.6"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-openai==${version}"; - hash = "sha256-WAYzgAWw0y86rBjb2JqLNeBCjVn3o7UfLoQvmQ4SKGU="; + hash = "sha256-Y+GV48rlqMfT4TrmoJFGqbHKfc8gxq61NhcUpwSsOwk="; }; sourceRoot = "${src.name}/libs/partners/openai"; @@ -80,6 +80,13 @@ buildPythonPackage rec { "test_get_num_tokens_from_messages" "test_get_token_ids" "test_embeddings_respects_token_limit" + + # Fail when langchain-core gets ahead of this package + "test_serdes" + "test_loads_openai_llm" + "test_load_openai_llm" + "test_loads_openai_chat" + "test_load_openai_chat" ]; pythonImportsCheck = [ "langchain_openai" ]; diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix index 6bb4125fba83..526ca96776a3 100644 --- a/pkgs/development/python-modules/langchain-tests/default.nix +++ b/pkgs/development/python-modules/langchain-tests/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "langchain-tests"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-tests==${version}"; - hash = "sha256-WJITm+8XIqezr/2U8HpE0J4hYdzg2Z6tw8b5s6SF6m0="; + hash = "sha256-g5s7zL4l/kIUoIu7/3+Ve3SXW3O9tj8f2N3bZ0gbBts="; }; sourceRoot = "${src.name}/libs/standard-tests"; diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 2740e682a1c8..242c1e726c5c 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-text-splitters==${version}"; - hash = "sha256-DOWd94Vx61OS1OI2uIZVonf6BiXkjbS2pTrzleKvifM="; + hash = "sha256-/mhgWYmnzzCnAlBzPFHo4yZLxgHIzmvxjS2BilGxww8="; }; sourceRoot = "${src.name}/libs/text-splitters"; diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix index 435a491a2b32..f9cec82314a6 100644 --- a/pkgs/development/python-modules/langchain-xai/default.nix +++ b/pkgs/development/python-modules/langchain-xai/default.nix @@ -61,12 +61,11 @@ buildPythonPackage rec { enabledTestPaths = [ "tests/unit_tests" ]; - disabledTests = - lib.optionals (stdenvNoCC.hostPlatform.isLinux && stdenvNoCC.hostPlatform.isAarch64) - [ - # Compares a diff to a string literal and misses platform differences - "test_serdes" - ]; + disabledTests = [ + # Breaks when langchain-core is updated + # Also: Compares a diff to a string literal and misses platform differences (aarch64-linux) + "test_serdes" + ]; pythonImportsCheck = [ "langchain_xai" ]; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index f0cc30d47699..edd0a43514cf 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -46,14 +46,14 @@ buildPythonPackage rec { pname = "langchain"; - version = "1.1.3"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain==${version}"; - hash = "sha256-oW1Gn7ChRwUThrnkNBcGKn96sqRO84rSf75J2bNdBMY="; + hash = "sha256-DximXCwrDSUVXZenUrubuGcxdnRCPCPMgdW9UJnkGnE="; }; sourceRoot = "${src.name}/libs/langchain_v1"; diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix index 05342e2fb68e..250ec8a11d89 100644 --- a/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/pkgs/development/python-modules/paddlepaddle/default.nix @@ -13,7 +13,7 @@ zlib, setuptools, cudaSupport ? config.cudaSupport or false, - cudaPackages, + cudaPackages_12_9, addDriverRunpath, # runtime dependencies httpx, @@ -23,6 +23,7 @@ decorator, astor, opt-einsum, + safetensors, typing-extensions, }: @@ -40,7 +41,7 @@ let src = if cudaSupport then (fetchurl { - url = "https://paddle-whl.bj.bcebos.com/stable/cu128/paddlepaddle-gpu/paddlepaddle-${version}-${pyShortVersion}-${pyShortVersion}-linux_x86_64.whl"; + url = "https://paddle-whl.bj.bcebos.com/stable/cu129/paddlepaddle-gpu/paddlepaddle_gpu-${version}-${pyShortVersion}-${pyShortVersion}-linux_x86_64.whl"; inherit hash; }) else @@ -81,6 +82,7 @@ buildPythonPackage { decorator astor opt-einsum + safetensors typing-extensions ]; @@ -99,7 +101,7 @@ buildPythonPackage { (lib.getLib stdenv.cc.cc) ] ++ lib.optionals cudaSupport ( - with cudaPackages; + with cudaPackages_12_9; [ cudatoolkit.lib cudatoolkit.out @@ -127,6 +129,8 @@ buildPythonPackage { sed -i 's/^INSTALLED_VERSION=.*/INSTALLED_VERSION="${version}"/' $out/bin/paddle ''; + passthru.updateScript = ./update.sh; + meta = { description = "Machine Learning Framework from Industrial Practice"; homepage = "https://github.com/PaddlePaddle/Paddle"; diff --git a/pkgs/development/python-modules/paddlepaddle/sources.nix b/pkgs/development/python-modules/paddlepaddle/sources.nix index 1f2588fd3aaa..13684502a438 100644 --- a/pkgs/development/python-modules/paddlepaddle/sources.nix +++ b/pkgs/development/python-modules/paddlepaddle/sources.nix @@ -1,28 +1,28 @@ { - version = "3.2.0"; + version = "3.2.2"; x86_64-linux = { platform = "manylinux1_x86_64"; cpu = { - cp312 = "sha256-LBf2daJevQZ19wP3uCd36pLbDDYL1Vpcay36rXvD8mA="; - cp313 = "sha256-+irs0GFCQ1D2dwqD3aB5aR9yJGNc/ydurvTj4XRAA50="; + cp312 = "sha256-9rO3PUesyCz1RYlublwxtVp/mibcCssoq8wkBp2Tlt0="; + cp313 = "sha256-xPSFWWpobqcqsN3/yeQRePRWMUqZ1FOPXRgaAVapJ/o="; }; gpu = { - cp312 = "sha256-YqxAWSvjhYOQUCiUPtjC3PdRxFeWGm/be8FxOrpaLZo="; - cp313 = "sha256-TdFx5Ut3iOTRg8USL2eIHyRYv8QT4KrLBPdiPkaK+Nc="; + cp312 = "sha256-t2beVNEfz+JcesM5+i9BVNKKXIsI3zvz1VrTSd/79+c="; + cp313 = "sha256-0thm6aAGpqSLfJdI0MZKuJPn2e4CsNU5S19ohzkukSs="; }; }; aarch64-linux = { platform = "manylinux2014_aarch64"; cpu = { - cp312 = "sha256-TOUUEUr3Zxh1/Ekn6gBa+51dD9d3rrVqEHjSL39Os/s="; - cp313 = "sha256-KqDlAvbdKE7aIcKH0yZFTfomrMqIwjqgrFgdHvmDGMU="; + cp312 = "sha256-pZ2QILoWD6f1rvyzDkpjKTkKY10aC1EfZFgTk3bAP5k="; + cp313 = "sha256-sDVpuhUaxQqnMJVcZd+lcf565x+UV0yU6L/l4JE6fZw="; }; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; cpu = { - cp312 = "sha256-rDNK9y0bDUnUyTPP1OtC1z7C3HpqryJIxihkPUGbbac="; - cp313 = "sha256-OBhOHqf9e/A4g+ph9FYZuXEtksE60foWk06p4NbT6ZE="; + cp312 = "sha256-xi2rDU323il4lggy8AFaFFwjzTeUGNky3dj1RmKdH+Q="; + cp313 = "sha256-9+m8BGnRPZmSXNdmxKbO61q2BDt5DdQVzgdvu+uzkHQ="; }; }; } diff --git a/pkgs/development/python-modules/py-madvr2/default.nix b/pkgs/development/python-modules/py-madvr2/default.nix index e7409d52d411..f31fa38fe957 100644 --- a/pkgs/development/python-modules/py-madvr2/default.nix +++ b/pkgs/development/python-modules/py-madvr2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-madvr2"; - version = "1.8.14"; + version = "1.9.1"; pyproject = true; src = fetchFromGitHub { owner = "iloveicedgreentea"; repo = "py-madvr"; tag = "v${version}"; - hash = "sha256-7zYvbEoPlY49YZ9Akq+SfzMmqClrr3xTszVW2FUx62Y="; + hash = "sha256-yW2w0XwTRRT0h2spblziAkayklYZZi1uU1FJdiTSr6Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sqlcipher3/default.nix b/pkgs/development/python-modules/sqlcipher3/default.nix index 536cf6479b90..ab7a0f063bb6 100644 --- a/pkgs/development/python-modules/sqlcipher3/default.nix +++ b/pkgs/development/python-modules/sqlcipher3/default.nix @@ -8,7 +8,7 @@ }: let pname = "sqlcipher3"; - version = "0.5.4"; + version = "0.6.0"; in buildPythonPackage { inherit pname version; @@ -16,7 +16,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-4w/1jWTdQ+Gezt3RARahonrR2YiMxCRcdfK9qbA4Tnc="; + hash = "sha256-o1GuYwvWFMLBDtiYtCD3vIF+Q4FT9oP4g0jERdazqbE="; }; build-system = [ diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index a1656b09588d..d44b307c51e0 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -93,10 +93,7 @@ let homepage = src.meta.homepage; license = lib.licenses.gpl3; mainProgram = "cutter"; - maintainers = with lib.maintainers; [ - mic92 - dtzWill - ]; + maintainers = with lib.maintainers; [ mic92 ]; inherit (rizin.meta) platforms; }; }; diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index b70ca26a24dc..6cefa8237e8d 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.mpl20; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index 0483fa2658d0..884edbd97d6c 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { inherit (fwts.meta) homepage license; description = fwts.meta.description + "(efi-runtime kernel module)"; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index d01fea8b7dde..bba4c914a951 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -53,13 +53,13 @@ }: let - version = "3.5.2"; + version = "3.5.3"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-8Uzb0cjC3PUrh6Nlu6OJ09GKD+8KZq/IUba2NXLm1JI="; + sha256 = "sha256-2lx6vFxio2CkMWa0vmzUGTljz1WC9OzpNgSxKjYPn8g="; }; ruby = ruby_3_3; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index db988be77b72..1f4e17fe1622 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -15,7 +15,6 @@ gem "activemodel", "~> 8.0.0" gem "activerecord", "~> 8.0.0" gem "activesupport", "~> 8.0.0" gem "railties", "~> 8.0.0" -gem "openssl", "~> 3.3.1" gem "propshaft" gem "json" diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index a4f1addb9a51..ff122cf2b84d 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -383,7 +383,7 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (3.3.2) + openssl (3.3.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) optimist (3.2.1) @@ -826,7 +826,6 @@ DEPENDENCIES omniauth-google-oauth2 omniauth-oauth2 omniauth-twitter - openssl (~> 3.3.1) parallel parallel_tests pdf-reader @@ -1079,7 +1078,7 @@ CHECKSUMS omniauth-oauth (1.2.1) sha256=25bf22c90234280fa825200490f03ff1ce7d76f1a4fbd6c882c6c5b169c58da8 omniauth-oauth2 (1.7.3) sha256=3f5a8f99fa72e0f91d2abd7475ceb972a4ae67ed59e049f314c0c1bad81f4745 omniauth-twitter (1.4.0) sha256=c5cc6c77cd767745ffa9ebbd5fbd694a3fa99d1d2d82a4d7def0bf3b6131b264 - openssl (3.3.2) sha256=7f4e01215dc9c4be1fca71d692406be3e6340b39c1f71a47fea9c497decd0f6c + openssl (3.3.0) sha256=ff3a573fc97ab30f69483fddc80029f91669bf36532859bd182d1836f45aee79 openssl-signature_algorithm (1.3.0) sha256=a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80 optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 5a8dea76201b..248c7b7f5dcc 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -2125,10 +2125,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz"; + sha256 = "0ygfbbs3c61d32ymja2k6sznj5pr540cip9z91lhzcvsr4zmffpz"; type = "gem"; }; - version = "3.3.2"; + version = "3.3.0"; }; openssl-signature_algorithm = { dependencies = [ "openssl" ]; diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix deleted file mode 100644 index 36b5a75298e4..000000000000 --- a/pkgs/tools/audio/video2midi/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - fetchFromGitHub, - pythonPackages, - opencv4, -}: - -let - opencv4_ = pythonPackages.toPythonModule ( - opencv4.override { - inherit pythonPackages; - enablePython = true; - enableFfmpeg = true; - } - ); -in -pythonPackages.buildPythonApplication rec { - pname = "video2midi"; - version = "0.4.9"; - - format = "other"; - - src = fetchFromGitHub { - owner = "svsdval"; - repo = pname; - tag = version; - sha256 = "sha256-mjqlNUCEiP5dQS0a8HAejOJyEvY6jGFJFpVcnzU2Vds="; - }; - - propagatedBuildInputs = with pythonPackages; [ - opencv4_ - midiutil - pygame - pyopengl - ]; - - installPhase = '' - install -Dm755 v2m.py $out/bin/v2m.py - ''; - - meta = { - description = "Youtube synthesia video to midi conversion tool"; - homepage = src.meta.homepage; - license = lib.licenses.gpl3Only; - maintainers = [ ]; - platforms = lib.platforms.linux; - mainProgram = "v2m.py"; - }; -} diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 4cc6f208a41a..e9e5f6efb85d 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format"; homepage = "https://birdfont.org"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; }) diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index a7ac65105866..83a219bc6487 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "XML parser for Vala and C programs"; homepage = "https://birdfont.org/xmlbird.php"; license = lib.licenses.lgpl3; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index b0309997542a..6e26f2991449 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -20,10 +20,12 @@ systemd, udevCheckHook, util-linux, + glib, x86_energy_perf_policy, # RDW only works with NetworkManager, and thus is optional with default off enableRDW ? false, networkmanager, + tlp-pd, }: stdenv.mkDerivation rec { pname = "tlp"; @@ -104,6 +106,7 @@ stdenv.mkDerivation rec { smartmontools systemd util-linux + glib # gdbus ] ++ lib.optional enableRDW networkmanager ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform x86_energy_perf_policy) x86_energy_perf_policy @@ -136,6 +139,10 @@ stdenv.mkDerivation rec { rm -rf $out/share/metainfo ''; + passthru.tests = { + inherit tlp-pd; + }; + meta = { description = "Advanced Power Management for Linux"; homepage = "https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html"; diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix index 19d3f30fc654..08bc79029321 100644 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -174,6 +174,17 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs --build tests + '' + # The ability to chmod the root filesystem only exist in filesystem namespacing capable Nix interpreters. + # At the time of writing, only Linux can do it. + + lib.optionalString stdenv.hostPlatform.isLinux '' + # The build system produces $HOME during the install check phase + # and will fail when ran without build user separation. + # This will surface as a FIFO synchronization deadlock. + # To avoid this, the $HOME directory is barred from being mkdir() + # by the build system here. + # https://github.com/NixOS/nix/issues/11295 + chmod 555 / ''; preConfigure = diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 072d1442da8f..9ab28f264f13 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1689,6 +1689,7 @@ mapAliases { ventoy-bin-full = throw "'ventoy-bin-full' has been renamed to/replaced by 'ventoy-full'"; # Converted to throw 2025-10-27 verilog = throw "'verilog' has been renamed to/replaced by 'iverilog'"; # Converted to throw 2025-10-27 veriT = verit; # Added 2025-08-21 + video2midi = throw "'video2midi' has been removed due to lack of maintenance"; # Added 2026-01-01 vieb = throw "'vieb' has been removed as it doesn't satisfy our security criteria for browsers."; # Added 2025-06-25 ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-27 vim_configurable = throw "'vim_configurable' has been renamed to/replaced by 'vim-full'"; # Converted to throw 2025-10-27 @@ -1725,6 +1726,7 @@ mapAliases { webfontkitgenerator = webfont-bundler; # Added 2025-07-27 webkitgtk = throw "'webkitgtk' attribute has been removed from nixpkgs, use attribute with ABI version set explicitly"; # Added 2025-06-11 webkitgtk_4_0 = throw "'webkitgtk_4_0' has been removed, port to `libsoup_3` and switch to `webkitgtk_4_1`"; # Added 2025-10-08 + welkin = throw "welkin was removed as it is unmaintained upstream"; # Added 2026-01-01 whatsapp-for-linux = throw "'whatsapp-for-linux' has been renamed to/replaced by 'wasistlos'"; # Converted to throw 2025-10-27 wifi-password = throw "'wifi-password' has been removed as it was unmaintained upstream"; # Added 2025-08-29 win-pvdrivers = throw "'win-pvdrivers' has been removed as it was subject to the Xen build machine compromise (XSN-01) and has open security vulnerabilities (XSA-468)"; # Added 2025-08-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85d4fa1b62d0..7b4a03b9e304 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3899,10 +3899,6 @@ with pkgs; vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum { }; - video2midi = callPackage ../tools/audio/video2midi { - pythonPackages = python3Packages; - }; - vimpager = callPackage ../tools/misc/vimpager { }; vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { };