diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 4fda57e8214c..8bfb3d70a6e6 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -459,7 +459,8 @@ in "~@privileged" "~@resources" "~@setuid" - "~@timer" + # NB: pv after 1.11.0 uses timer syscalls (specifically setitimer) + # "~@timer" ]; SystemCallArchitectures = "native"; # This is for BindPaths= and BindReadOnlyPaths= diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index 6046b2005858..bb0ab5f2751c 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -836,12 +836,18 @@ in ${ if (cfg.databaseUrl == "local") then '' - export DATABASE_URL="''${DATABASE_URL:-${lib.escapeShellArg localPostgresqlUrl}}" + if [ -z "''${DATABASE_URL:-}" ]; then + DATABASE_URL=${lib.escapeShellArg localPostgresqlUrl} + fi + export DATABASE_URL export PGSSLMODE="''${PGSSLMODE:-disable}" '' else '' - export DATABASE_URL="''${DATABASE_URL:-${lib.escapeShellArg cfg.databaseUrl}}" + if [ -z "''${DATABASE_URL:-}" ]; then + DATABASE_URL=${lib.escapeShellArg cfg.databaseUrl} + fi + export DATABASE_URL '' } diff --git a/nixos/tests/nginx-auth.nix b/nixos/tests/nginx-auth.nix index 97ea8a157b6b..1042eee2e0ab 100644 --- a/nixos/tests/nginx-auth.nix +++ b/nixos/tests/nginx-auth.nix @@ -1,7 +1,8 @@ +{ pkgs, ... }: { name = "nginx-auth"; - containers = { + nodes = { webserver = { pkgs, lib, ... }: { diff --git a/nixos/tests/nginx-etag-compression.nix b/nixos/tests/nginx-etag-compression.nix index 4604d7c23e64..a194c6fd26b4 100644 --- a/nixos/tests/nginx-etag-compression.nix +++ b/nixos/tests/nginx-etag-compression.nix @@ -2,7 +2,7 @@ { name = "nginx-etag-compression"; - containers.machine = + nodes.machine = { pkgs, lib, ... }: { services.nginx = { @@ -28,7 +28,7 @@ }; testScript = - { containers, ... }: + { nodes, ... }: '' machine.wait_for_unit("nginx") machine.wait_for_open_port(80) diff --git a/nixos/tests/nginx-globalredirect.nix b/nixos/tests/nginx-globalredirect.nix index 2a6d4722114f..ba1c0623593b 100644 --- a/nixos/tests/nginx-globalredirect.nix +++ b/nixos/tests/nginx-globalredirect.nix @@ -2,7 +2,7 @@ { name = "nginx-globalredirect"; - containers = { + nodes = { webserver = { pkgs, lib, ... }: { diff --git a/nixos/tests/nginx-http3.nix b/nixos/tests/nginx-http3.nix index 29a191a8d712..5a301f3a06b5 100644 --- a/nixos/tests/nginx-http3.nix +++ b/nixos/tests/nginx-http3.nix @@ -13,7 +13,7 @@ builtins.listToAttrs ( name = "nginx-http3-${pkgs.lib.getName nginxPackage}"; meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; - containers = { + nodes = { server = { lib, pkgs, ... }: { diff --git a/nixos/tests/nginx-lua.nix b/nixos/tests/nginx-lua.nix index af4a4a33d4af..8159882a7d5c 100644 --- a/nixos/tests/nginx-lua.nix +++ b/nixos/tests/nginx-lua.nix @@ -4,7 +4,7 @@ meta.maintainers = [ lib.maintainers.kranzes ]; - containers.machine = { + nodes.machine = { services.nginx = { enable = true; lua = { diff --git a/nixos/tests/nginx-mime.nix b/nixos/tests/nginx-mime.nix index 17572eb18286..9752fc01370b 100644 --- a/nixos/tests/nginx-mime.nix +++ b/nixos/tests/nginx-mime.nix @@ -1,9 +1,9 @@ -{ pkgs, ... }: +{ lib, pkgs, ... }: { name = "nginx-mime"; meta.maintainers = with pkgs.lib.maintainers; [ izorkin ]; - containers = { + nodes = { server = { pkgs, ... }: { diff --git a/nixos/tests/nginx-modsecurity.nix b/nixos/tests/nginx-modsecurity.nix index 6f298f055ef6..f6aa58b79859 100644 --- a/nixos/tests/nginx-modsecurity.nix +++ b/nixos/tests/nginx-modsecurity.nix @@ -2,7 +2,7 @@ { name = "nginx-modsecurity"; - containers.machine = + nodes.machine = { config, lib, diff --git a/nixos/tests/nginx-moreheaders.nix b/nixos/tests/nginx-moreheaders.nix index 0f33d3b71e67..446f0ed179e2 100644 --- a/nixos/tests/nginx-moreheaders.nix +++ b/nixos/tests/nginx-moreheaders.nix @@ -2,7 +2,7 @@ { name = "nginx-more-headers"; - containers = { + nodes = { webserver = { pkgs, ... }: { diff --git a/nixos/tests/nginx-njs.nix b/nixos/tests/nginx-njs.nix index 64955c86f995..a64bbad08e10 100644 --- a/nixos/tests/nginx-njs.nix +++ b/nixos/tests/nginx-njs.nix @@ -1,7 +1,8 @@ +{ pkgs, lib, ... }: { name = "nginx-njs"; - containers.machine = + nodes.machine = { config, lib, diff --git a/nixos/tests/nginx-pubhtml.nix b/nixos/tests/nginx-pubhtml.nix index 44f88d1a53f8..a8eb87ab3db4 100644 --- a/nixos/tests/nginx-pubhtml.nix +++ b/nixos/tests/nginx-pubhtml.nix @@ -2,7 +2,7 @@ { name = "nginx-pubhtml"; - containers.machine = + nodes.machine = { pkgs, ... }: { systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; diff --git a/nixos/tests/nginx-redirectcode.nix b/nixos/tests/nginx-redirectcode.nix index 83d596a6ce29..a48b1021bb80 100644 --- a/nixos/tests/nginx-redirectcode.nix +++ b/nixos/tests/nginx-redirectcode.nix @@ -3,7 +3,7 @@ name = "nginx-redirectcode"; meta.maintainers = with lib.maintainers; [ misterio77 ]; - containers = { + nodes = { webserver = { pkgs, lib, ... }: { diff --git a/nixos/tests/nginx-sso.nix b/nixos/tests/nginx-sso.nix index 2d1bd991b643..9926b61ae6a8 100644 --- a/nixos/tests/nginx-sso.nix +++ b/nixos/tests/nginx-sso.nix @@ -5,7 +5,7 @@ maintainers = with pkgs.lib.maintainers; [ ambroisie ]; }; - containers.machine = { + nodes.machine = { services.nginx.sso = { enable = true; configuration = { diff --git a/nixos/tests/nginx-status-page.nix b/nixos/tests/nginx-status-page.nix index e273d23b5ff7..312cfadfd4a8 100644 --- a/nixos/tests/nginx-status-page.nix +++ b/nixos/tests/nginx-status-page.nix @@ -5,13 +5,12 @@ maintainers = [ h7x4 ]; }; - containers = { + nodes = { webserver = { ... }: { virtualisation.vlans = [ 1 ]; - services.resolved.enable = false; networking = { useNetworkd = true; useDHCP = false; @@ -37,7 +36,6 @@ { virtualisation.vlans = [ 1 ]; - services.resolved.enable = false; networking = { useNetworkd = true; useDHCP = false; diff --git a/nixos/tests/nginx-tmpdir.nix b/nixos/tests/nginx-tmpdir.nix index a05770910102..d9dd2adefdfb 100644 --- a/nixos/tests/nginx-tmpdir.nix +++ b/nixos/tests/nginx-tmpdir.nix @@ -5,7 +5,7 @@ in { name = "nginx-tmpdir"; - containers.machine = + nodes.machine = { pkgs, ... }: { environment.etc."tmpfiles.d/nginx-uploads.conf".text = "d ${dst-dir} 0755 nginx nginx 1d"; diff --git a/nixos/tests/nginx-unix-socket.nix b/nixos/tests/nginx-unix-socket.nix index 693a20d3017f..d6949227d3be 100644 --- a/nixos/tests/nginx-unix-socket.nix +++ b/nixos/tests/nginx-unix-socket.nix @@ -6,7 +6,7 @@ in { name = "nginx-unix-socket"; - containers = { + nodes = { webserver = { pkgs, lib, ... }: { diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix index b858de483865..a3994ad83247 100644 --- a/nixos/tests/nginx-variants.nix +++ b/nixos/tests/nginx-variants.nix @@ -1,4 +1,4 @@ -{ runTest, ... }: +{ pkgs, runTest, ... }: builtins.listToAttrs ( map (packageName: { @@ -6,7 +6,7 @@ builtins.listToAttrs ( value = runTest { name = "nginx-variant-${packageName}"; - containers.machine = + nodes.machine = { pkgs, ... }: { services.nginx = { diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix index 15abc22270d4..0956d2607f7b 100644 --- a/nixos/tests/outline.nix +++ b/nixos/tests/outline.nix @@ -7,10 +7,7 @@ xanderio ]; - node.pkgsReadOnly = false; - - nodes.outline = { - virtualisation.memorySize = 2 * 1024; + containers.outline = { services.outline = { enable = true; forceHttps = false; diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 1772fb6ac6f4..4f07b067b5ce 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.91.175"; + version = "1.91.180"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-7O7cK9Y0nqn60G/4J7Tit0Z1ndsEgs9WtwS1yrDGZ0Y="; + hash = "sha256-HdmJBLANsmlBi3EtzeuMn4USmW8x/LaYKUWDlqw3a2I="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-/+xaqBCYzo4bvYASoRgDHDIUb2aWX1DGxqfDifeWKSQ="; + hash = "sha256-mM2SOn6V1KQJEjxR0KH1lXJMLSzpx/IiZDeSrJtIFt0="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-alVhPVmXZ41CI5ou77xk0QepFvyyJqJs8yexDVo1rzY="; + hash = "sha256-WkBudj8I0/pIzhA4fynkfY4t6M/6d1zPTZPSQeX3d5Y="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-18l3fS7O/lieRpFtlZPmhICTVywrRCgD2ntoRrABmQA="; + hash = "sha256-mxKhtUiLoloUvYK0hv1WHpVytadHPLGN8IePrscxWxs="; }; }; diff --git a/pkgs/by-name/cl/classads/package.nix b/pkgs/by-name/cl/classads/package.nix deleted file mode 100644 index 9e15be4e8591..000000000000 --- a/pkgs/by-name/cl/classads/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - autoreconfHook, - pcre, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "classads"; - version = "1.0.10"; - - src = fetchurl { - url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${finalAttrs.version}.tar.gz"; - sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ pcre ]; - - configureFlags = [ - "--enable-namespace" - "--enable-flexible-member" - ]; - - # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? - env.NIX_CFLAGS_COMPILE = lib.optionalString ( - stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 - ) "-Dfinite=isfinite"; - - meta = { - homepage = "http://www.cs.wisc.edu/condor/classad/"; - description = "Classified Advertisements library provides a generic means for matching resources"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix index 78a2f375b132..53d0363ffe9a 100644 --- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix +++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix @@ -29,7 +29,6 @@ mbedtls, miniupnpc, openal, - pcre, portaudio, readline, SDL2, @@ -99,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: { mbedtls miniupnpc openal - pcre portaudio qt6.qtbase qt6.qtsvg diff --git a/pkgs/by-name/go/google-lighthouse/package.nix b/pkgs/by-name/go/google-lighthouse/package.nix index b5daf05fd3a7..143b2a52ca96 100644 --- a/pkgs/by-name/go/google-lighthouse/package.nix +++ b/pkgs/by-name/go/google-lighthouse/package.nix @@ -13,18 +13,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "google-lighthouse"; - version = "13.3.0"; + version = "13.4.0"; src = fetchFromGitHub { owner = "GoogleChrome"; repo = "lighthouse"; tag = "v${finalAttrs.version}"; - hash = "sha256-5GFaM6R836Z/EKTvDLF0/aLox5VltcwgLSWzAmn77EY="; + hash = "sha256-diZT1SOCSpuiQfAS7kjGxea2imVAJyKYxf2WFBsE/H0="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-tzN0rAHahBs4n6KCCAS2xoCxXmaZVtmB4WSNxia9TME="; + hash = "sha256-Rp+LCYRZ5jVGiR1L8Wyd5juw8GPrwnUH2chrxrrwE6k="; }; yarnBuildScript = "build-report"; diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 0c117faed086..1312abf903dc 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -58,16 +58,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "34.4.0"; + version = "34.7.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; tag = "v${version}"; - hash = "sha256-eOh1jdrgaMYhqxP+QSCBxqhkJUGYrWLTkYwGmKSNrRA="; + hash = "sha256-OwCtp/WufMCzuaPTDCr2siorUC52zgM2e80DyshzsZw="; }; - npmDepsHash = "sha256-9v4PKlS8FNuhnhdJmu3J1Bl+uSPS4KqE3PBrOhf9jQw="; + npmDepsHash = "sha256-tlBxO9K0itXO6Mac4jcygZ6+9kj1gTdmu+rtbL2qdcE="; nativeBuildInputs = [ go-toml diff --git a/pkgs/by-name/ke/ketch/package.nix b/pkgs/by-name/ke/ketch/package.nix index ae54c19e9545..03aba1cf4743 100644 --- a/pkgs/by-name/ke/ketch/package.nix +++ b/pkgs/by-name/ke/ketch/package.nix @@ -7,7 +7,7 @@ }: buildGoModule (finalAttrs: { pname = "ketch"; - version = "0.9.3"; + version = "0.9.4"; __structuredAttrs = true; strictDeps = true; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "1broseidon"; repo = "ketch"; tag = "v${finalAttrs.version}"; - hash = "sha256-bcmSPslW/k5OO+Zce6N0S3NoQeXGOM6DcZ4Cj2W2C14="; + hash = "sha256-Ww92Y+v+u0YttjGPK7mF2mFGWHSuPCdKP6MTd/Jj0LI="; }; vendorHash = "sha256-m3IwAYsczsxcVk9fay+f2AsNjmXoPk7NS0abES6b594="; diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix index caf368fc0579..554b7bf8dcba 100644 --- a/pkgs/by-name/li/libgedit-gfls/package.nix +++ b/pkgs/by-name/li/libgedit-gfls/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gfls"; - version = "0.4.1"; + version = "0.4.2"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "libgedit-gfls"; tag = finalAttrs.version; forceFetchGit = true; # To avoid occasional 501 failures. - hash = "sha256-61jq7tcAAzYuhKM4OlH/GniGTfiWg/Pcznb03+vaLvw="; + hash = "sha256-8nr8rBvSBLadhxHipZiWOJj663R9jP6kFurSKp3n0U0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 2cf2b2e58b33..4b9b52c7a3eb 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.219.0", + "version": "3.223.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_linux_x86_64", - "hash": "sha256-zqVPuAsgsYAFuB+5lfUOl8MaiAVc3iLbhnmiPVCQ9po=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.223.0/mirrord_linux_x86_64", + "hash": "sha256-sYNabfYZsJrciNHlXsIz5qfkUwo4E6Y4HYLqupr0ELs=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_linux_aarch64", - "hash": "sha256-xeiPf9hEKU75VgPeS2fiIx8WEC0DQwadMaA8Yp/shpU=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.223.0/mirrord_linux_aarch64", + "hash": "sha256-ScCJo1BDJoIbGbTR0iLYUhJORaWNB4vFq1dhtx4geVA=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_mac_universal", - "hash": "sha256-v0idU5+NmFcSxdwGKUT+09BsNuzJKv0tuj4uaqMzqU4=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.223.0/mirrord_mac_universal", + "hash": "sha256-BUjC4vqZOBa8Pd0ZtV7GeEJ1wkxFY8G0xFtivZxHv60=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.219.0/mirrord_mac_universal", - "hash": "sha256-v0idU5+NmFcSxdwGKUT+09BsNuzJKv0tuj4uaqMzqU4=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.223.0/mirrord_mac_universal", + "hash": "sha256-BUjC4vqZOBa8Pd0ZtV7GeEJ1wkxFY8G0xFtivZxHv60=" } } } diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix index 5f3c81a0a0e7..5ed5dcfd2bbd 100644 --- a/pkgs/by-name/ne/nelm/package.nix +++ b/pkgs/by-name/ne/nelm/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "nelm"; - version = "1.24.0"; + version = "1.25.2"; src = fetchFromGitHub { owner = "werf"; repo = "nelm"; tag = "v${finalAttrs.version}"; - hash = "sha256-2+jkNOCmxgFJ1hXk2/Q96JgbrFrIxu9USbWtM49znJ8="; + hash = "sha256-2YIxnuHbY9zCVZer+b7JD0fbmUC/ZYyaWmHts7s5ldw="; }; - vendorHash = "sha256-jPc96Sehy1xv+G9GA6bUA3qfrgTaUt7ybK76ELyx4to="; + vendorHash = "sha256-rIiphGjE/a5IwF6Fkk3Ffq36AfEkfAZb12ZljlYP6X4="; subPackages = [ "cmd/nelm" ]; diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix index eb27ba77e7c6..d2c0dac50ad5 100644 --- a/pkgs/by-name/op/opengist/package.nix +++ b/pkgs/by-name/op/opengist/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "opengist"; - version = "1.12.2"; + version = "1.13.1"; src = fetchFromGitHub { owner = "thomiceli"; repo = "opengist"; tag = "v${finalAttrs.version}"; - hash = "sha256-MZ7aKT4qmWH4NyT32ZUpBmqqLJYCtLpdlSJHh+h7IPI="; + hash = "sha256-jMB6TudICAjX0DGw62qP8X39q3OOT2Bvg70LJbFWqkE="; }; frontend = buildNpmPackage { @@ -36,10 +36,10 @@ buildGoModule (finalAttrs: { cp -R public $out ''; - npmDepsHash = "sha256-KDdXBE5X+fOuXF/hIkyRHscMmBQ/E0PCUednfEm5i8k="; + npmDepsHash = "sha256-Ci25S0kgT5C46xTzNTs0kn8QEvYqJuj/yU33Ymfci68="; }; - vendorHash = "sha256-lhDga5shastI7BfnEnekFnUc2L8Ju6LazeqvD7+CK/o="; + vendorHash = "sha256-MRY677UiZg7j5HTFejvuzIJwEMczbhi6sIbGYjRnWeM="; tags = [ "fs_embed" ]; diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 20e6d3947fa8..85d0c618d72e 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -13,7 +13,7 @@ curl, dbus, draco, - eigen, + eigen_5, expat, ffmpeg, gcc-unwrapped, @@ -36,7 +36,7 @@ systemd, onetbb, webkitgtk_4_1, - wxwidgets_3_1, + wxwidgets_3_3, libx11, libnoise, withSystemd ? stdenv.hostPlatform.isLinux, @@ -44,8 +44,7 @@ }: let wxGTK' = - (wxwidgets_3_1.override { - withCurl = true; + (wxwidgets_3_3.override { withPrivateFonts = true; withWebKit = true; withEGL = false; @@ -61,13 +60,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "orca-slicer"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "OrcaSlicer"; repo = "OrcaSlicer"; tag = "v${finalAttrs.version}"; - hash = "sha256-c1WTODLrXGtyJWkEueOz5jHhPbA/JFcMeAwhpvoKnKo="; + hash = "sha256-ogo+Xuz7yBz9POVKfLofnxwIQavkApPzTIdp/Phu/UU="; }; nativeBuildInputs = [ @@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus draco - eigen + eigen_5 expat ffmpeg gcc-unwrapped @@ -132,11 +131,11 @@ stdenv.mkDerivation (finalAttrs: { ./patches/dont-link-opencv-world-orca.patch # The changeset from https://github.com/OrcaSlicer/OrcaSlicer/pull/7650, can be removed when that PR gets merged # Allows disabling the update nag screen - (fetchpatch { - name = "pr-7650-configurable-update-check.patch"; - url = "https://github.com/OrcaSlicer/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch"; - hash = "sha256-t4own5AwPsLYBsGA15id5IH1ngM0NSuWdFsrxMRXmTk="; - }) + #(fetchpatch { + # name = "pr-7650-configurable-update-check.patch"; + # url = "https://github.com/OrcaSlicer/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch"; + # hash = "sha256-t4own5AwPsLYBsGA15id5IH1ngM0NSuWdFsrxMRXmTk="; + #}) # Pick https://github.com/prusa3d/PrusaSlicer/pull/14207 to remove unused and insecure ilmbase dependency ./patches/no-ilmbase.patch diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 456460f1c94d..90886869446b 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phel"; - version = "0.34.1"; + version = "0.45.1"; src = fetchFromGitHub { owner = "phel-lang"; repo = "phel-lang"; tag = "v${finalAttrs.version}"; - hash = "sha256-xopkED6wnbLm3O/ZpuewwHEHWzugO5eght3o/w3vQVE="; + hash = "sha256-+4sseXsHXnOYC4I6ntDdloPYxhrusVT5D7S6h/NWdCs="; }; - vendorHash = "sha256-WrevFD9DErVPw6RyKMyTJMCG9j9BNnuAYEYPji0JjZU="; + vendorHash = "sha256-GYBriug9CmIsZkyG1xEmqyu1K3NDiskDnxeHWIZzM7o="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix index 621925dcb881..1e89613cf82e 100644 --- a/pkgs/by-name/pv/pv/package.nix +++ b/pkgs/by-name/pv/pv/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { @@ -13,6 +14,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/ALJ/CuCsgqSzI2Y+ES+Y/IqvZh1Go5KvIdeHYA2Yus="; }; + # pv is used by syncoid (part of the sanoid package) by default + passthru.tests = nixosTests.sanoid; + meta = { homepage = "https://www.ivarch.com/programs/pv.shtml"; description = "Tool for monitoring the progress of data through a pipeline"; diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix index 9204f07b18c4..6875b37b7c4e 100644 --- a/pkgs/by-name/re/resterm/package.nix +++ b/pkgs/by-name/re/resterm/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "resterm"; - version = "0.42.1"; + version = "0.44.3"; src = fetchFromGitHub { owner = "unkn0wn-root"; repo = "resterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-NyUSV5vsksr9LgwcN6f4f+1ol3304l0SalHzRI9R5mQ="; + hash = "sha256-zb7JPgV78162NAWu0v5J+EbWt0AFdFrQfL1G63RDd7A="; }; vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84="; diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix index 3c5bd47709db..4d61443b4844 100644 --- a/pkgs/by-name/so/solanum/package.nix +++ b/pkgs/by-name/so/solanum/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "solanum"; - version = "0-unstable-2026-05-24"; + version = "0-unstable-2026-06-23"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "eb62eb9cab93ce0519c0ca2c8fa10e688054434d"; - hash = "sha256-ujSNxSc7HT55YaN4RKD4gDfqt3joVBPGgEzFgLJS5as="; + rev = "a17cc145a7de564e49b84807d335289f30b12d00"; + hash = "sha256-tlocAC1U5WM3AKPxmBqqGGN05t+rwgA3p2im0NKKBuQ="; }; postPatch = '' diff --git a/pkgs/by-name/tm/tmuxp/package.nix b/pkgs/by-name/tm/tmuxp/package.nix index 1eca86be3018..af15e89c0bdc 100644 --- a/pkgs/by-name/tm/tmuxp/package.nix +++ b/pkgs/by-name/tm/tmuxp/package.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "tmuxp"; - version = "1.70.0"; + version = "1.71.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-XanIOOlZjN5K4hTyd/n0mFotB7GAreQhp6UimdQp+Vw="; + hash = "sha256-+Nsr4gNem/gB6ZMre53rfuM8Kwkiu86aGJmrxiFRorY="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/to/tokscale/package.nix b/pkgs/by-name/to/tokscale/package.nix index 737180372cc4..2dc4ff0393bd 100644 --- a/pkgs/by-name/to/tokscale/package.nix +++ b/pkgs/by-name/to/tokscale/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tokscale"; - version = "2.0.26"; + version = "4.0.4"; __structuredAttrs = true; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "junhoyeo"; repo = "tokscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-MxRtawDzPX9cW09Ju+Jc0O6eiJ+b58bQREBoom+qVpA="; + hash = "sha256-vFBIq7z0+bmMk2teDORrUVWrv7N3w1CsDrT2s85k6/U="; }; - cargoHash = "sha256-j/tenWrBcUux3X/aQSmrdigLcRonChIL2e5IyInZhY4="; + cargoHash = "sha256-iXHriY+Kyn5pSx3uwouH2rkMBXkJX6zH5/xiFeCMqbQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 595c864f4f26..8fc30b2a8e1d 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "1.1.5"; + version = "1.1.6"; __structuredAttrs = true; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-leBXWOzUcCQItRV6e3NW2Y2HCRbSoH9C5e7jt24D/iY="; + hash = "sha256-h8P93ZgrTh5xgsvIDrbJPF1C4JJiovRht2oGLtWnyio="; }; # Tests relies on the presence of network diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix index be8899dea103..078dc6706c1d 100644 --- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix @@ -27,6 +27,8 @@ compat32 ? true, withMesa ? !stdenv.hostPlatform.isDarwin, withWebKit ? true, + withEGL ? true, + withPrivateFonts ? false, webkitgtk_4_1, }: @@ -85,6 +87,8 @@ stdenv.mkDerivation (finalAttrs: { (if compat32 then "--enable-compat32" else "--disable-compat32") ] ++ lib.optional withMesa "--with-opengl" + ++ lib.optional (!withEGL) "--disable-glcanvasegl" + ++ lib.optional withPrivateFonts "--enable-privatefonts" ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-version-min=${stdenv.hostPlatform.darwinMinVersion}" "--with-osx_cocoa" @@ -115,7 +119,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru = { - inherit compat30 compat32; + inherit + compat30 + compat32 + withEGL + withPrivateFonts + ; }; meta = { diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 560e80f954dc..416fb261fd12 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -318,8 +318,8 @@ let src = pkgs.fetchFromGitHub { owner = "bohonghuang"; repo = "cl-gtk4"; - rev = "ff60e3495cdbba5c09d0bb8aa49f3184cc060c8e"; - hash = "sha256-06cyPf+5z+GE3YvZEJ67kC281nkwRz/hoaykTISsni0="; + rev = "b3e69daf2f96e69881b053046bbe8544a54e087f"; + hash = "sha256-9bRxxc3LtDR7gE0jorsrguRYaIq2InVOys27W7Im050="; }; lispLibs = with self; [ cl-gobject-introspection-wrapper @@ -377,6 +377,44 @@ let }; }; + cl-gtk4_dot_sourceview = build-asdf-system { + pname = "cl-gtk4.sourceview"; + version = self.cl-gtk4.version; + src = self.cl-gtk4.src; + lispLibs = with self; [ + cl-gobject-introspection-wrapper + cl-gtk4 + ]; + nativeBuildInputs = [ + pkgs.gtksourceview5 + ]; + nativeLibs = [ + pkgs.gtksourceview5 + ]; + meta = { + homepage = "https://github.com/bohonghuang/cl-gtk4"; + }; + }; + + cl-gdk4 = build-asdf-system { + pname = "cl-gdk4"; + version = self.cl-gtk4.version; + src = self.cl-gtk4.src; + lispLibs = with self; [ + cl-gobject-introspection-wrapper + ]; + nativeBuildInputs = [ + pkgs.gobject-introspection + pkgs.gtk4 + ]; + nativeLibs = [ + pkgs.gtk4 + ]; + meta = { + homepage = "https://github.com/bohonghuang/cl-gtk4"; + }; + }; + cl-avro = build-asdf-system { pname = "cl-avro"; version = "trunk"; diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index f3c33e6c3b9c..de0f61e0afc3 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -9,16 +9,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "castor"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; tag = "v${finalAttrs.version}"; - hash = "sha256-C/Pdw4bGJmt94wPCKFAAPq4w9Gh5eEjOLoqZG5PDQT8="; + hash = "sha256-3a0LJTlXTX28DYcHTfaUek2WzIuOhx6DaDm3RVu/rXA="; }; - vendorHash = "sha256-QEaz11lWQVnQi5AoouFCQsDomRFVAg0v5xx/4TwVoXA="; + vendorHash = "sha256-k2Yx4aV07PTqMu2yKUvGumXDMPzDaIKkwtWnkhCBOYc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index e2acb0595a2a..3f73a039480f 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -8,16 +8,16 @@ (php.withExtensions ({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject2 (finalAttrs: { pname = "phan"; - version = "6.0.5"; + version = "6.0.7"; src = fetchFromGitHub { owner = "phan"; repo = "phan"; tag = finalAttrs.version; - hash = "sha256-R49f3SljQjNywDi7AsOHbce+4RhC59ugL5ClY8XBQho="; + hash = "sha256-etqvZM1YWBXUapL+OIxuB1iVoY6kbS0fgLWVNx5Nb2A="; }; - vendorHash = "sha256-pzMsPFN3PXLEEWyjPTMdDCsAv6VDsIYGpma84Mu/Gos="; + vendorHash = "sha256-4PJWNPIikfWwIbrHr1c3yPOP68+bNlwjT9GkJJZoOFc="; composerStrictValidation = false; doInstallCheck = true; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 05c6cd05319c..8a648f904396 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "libtmux"; - version = "0.58.1"; + version = "0.59.0"; pyproject = true; src = fetchFromGitHub { owner = "tmux-python"; repo = "libtmux"; tag = "v${finalAttrs.version}"; - hash = "sha256-+ipLzjdP5zqtJ5e+QqgUHiPVpp3BgJ3/qxbNNgh2mv8="; + hash = "sha256-RsK3nVGpgNX05tCc5kK5GFLUS5vVoe8NRKgg7Y/DzwM="; }; patches = [ ./0001-fix-test_control_mode_stdout_preserves_non_ascii_out.patch ]; diff --git a/pkgs/development/python-modules/moyopy/default.nix b/pkgs/development/python-modules/moyopy/default.nix index 45086f5076b5..ef26d9beeab1 100644 --- a/pkgs/development/python-modules/moyopy/default.nix +++ b/pkgs/development/python-modules/moyopy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { pname = "moyopy"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; __structuredAttrs = true; @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { owner = "spglib"; repo = "moyo"; tag = "v${finalAttrs.version}"; - hash = "sha256-PnDE47R+OyJ5byBzjssHStTPtCZP9NUgIIO6065dLhI="; + hash = "sha256-obGrnXu1ldYAR5SL6ghaQAUFsNX68kXQJwGpskAriX4="; }; sourceRoot = "${finalAttrs.src.name}/moyopy"; @@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: { sourceRoot cargoRoot ; - hash = "sha256-5/l3VL3CYTdTCrDXy8tg2hVXk9ZcUBoKtXPPIQcuAuc="; + hash = "sha256-7tdPpQ/BL5j1M+sAEyVBeIobto8csEO6lUmEhbQdZK8="; }; build-system = [ diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 7cf28d3e1022..e09f5cba6ee6 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -2,7 +2,7 @@ let version = "3.16.0"; vendorHash = "sha256-z87enzlH2jVq/BI6uVbpLG6jKsO5Wr2alJOcFjt/+MM="; - nodeModulesHash = "sha256-6sWSybiSJj7G1KO2iv81yylmOV6DBVN1D15PFYpilC0="; + nodeModulesHash = "sha256-3Ezkm/jDIIeufADCj7w+FGQljSYHNG/09YQyXcpSlMg="; in { inherit version vendorHash nodeModulesHash; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix index a4b8f9312f3e..47e21ae3a5eb 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix @@ -5,12 +5,12 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm_10, + pnpm_11, }: let common = callPackage ./common.nix { }; - pnpm = pnpm_10; + pnpm = pnpm_11; in stdenv.mkDerivation (finalAttrs: { pname = "woodpecker-webui"; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 46dd217568c8..17dadd967c92 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.18.35"; - hash = "sha256-as5IBHZlphht6LqSzLdUaNAGxvGsgtTWNtwoCj12FNA="; + version = "6.18.37"; + hash = "sha256-8H8V9z8fizt/2DCTTCme0DVYOfJ4431SFs0iubUHONE="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "7.0.12"; - hash = "sha256-yqyHkdSLSyTrhnwsWJ0jq4bhqaCrJ+qzkUzxdrVJP6A="; + version = "7.0.14"; + hash = "sha256-9vb4ORzAppq5S/ukEhDHohNQBW+jWwGnjhv21HztWdk="; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 171fbaccca1c..4587070ee2df 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -530,6 +530,7 @@ mapAliases { clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09 clashmi = throw "'clashmi' has been removed, as it is unmaintained in nixpkgs"; # Added 2026-01-31 clasp = throw "'clasp' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27 + classads = throw "'classads' has been removed, as it is unmaintained both upstream and in nixpkgs"; # Added 2026-06-27 claude-code-acp = warnAlias "'claude-code-acp' has been renamed to 'claude-agent-acp'" claude-agent-acp; # Added 2026-03-31 claude-code-bin = warnAlias "'claude-code-bin' has been merged into 'claude-code'" claude-code; # Added 2026-04-18 clearlyU = clearly-u; # Added 2026-02-08