Merge master into staging-next

Author: nixpkgs-ci[bot]

maintainers/scripts/luarocks-packages.csv

@@ -48,6 +48,7 @@ lrexlib-oniguruma,,,,,,junestepp
 lrexlib-pcre,,,,,,
 lrexlib-posix,,,,,,
 lsp-progress.nvim,,,,,5.1,gepbird
+lsqlite3,,,,,,
 lua-cjson,,,,,,
 lua-cmsgpack,,,,,,
 lua-curl,,,,,,
@@ -113,6 +114,7 @@ lzextras,,,,,,birdee
 lzn-auto-require,,,,,,mrcjkb
 magick,,,,,5.1,donovanglover
 markdown,,,,,,
+md5,,,,,,
 mediator_lua,,,,,,
 middleclass,,,,,,
 mimetypes,,,,,,
@@ -158,6 +160,7 @@ toml-edit,,,,,5.1,mrcjkb
 tree-sitter-http,,,,0.0.33-1,,
 tree-sitter-norg,,,,,5.1,mrcjkb
 tree-sitter-orgmode,,,,,5.1,
+utf8,,,,,,
 vstruct,,,,,,
 vusted,,,,,,
 xml2lua,,,,,,teto

nixos/modules/services/web-apps/calibre-web.nix

@@ -27,6 +27,8 @@ in
 
       package = lib.mkPackageOption pkgs "calibre-web" { };
 
+      calibrePackage = lib.mkPackageOption pkgs "calibre" { };
+
       listen = {
         ip = mkOption {
           type = types.str;
@@ -149,8 +151,8 @@ in
             cfg.options.calibreLibrary != null
           ) "config_calibre_dir = '${cfg.options.calibreLibrary}'"
           ++ optionals cfg.options.enableBookConversion [
-            "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'"
-            "config_binariesdir = '${pkgs.calibre}/bin/'"
+            "config_converterpath = '${cfg.calibrePackage}/bin/ebook-convert'"
+            "config_binariesdir = '${cfg.calibrePackage}/bin/'"
           ]
           ++ optional cfg.options.enableKepubify "config_kepubifypath = '${pkgs.kepubify}/bin/kepubify'"
         );

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

@@ -102,6 +102,7 @@ let
 
   finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''
     #!${pkgs.runtimeShell}
+    set -euo pipefail
     ${systemdBootBuilder}/bin/systemd-boot "$@"
     ${cfg.extraInstallCommands}
   '';

nixos/tests/bpf.nix

@@ -21,25 +21,19 @@
     # simple BEGIN probe (user probe on bpftrace itself)
     print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\\n\"); exit(); }'"))
     # tracepoint
-    # workaround: this needs more than the default of 1k FD to attach ~350 probes, bump fd limit
-    # see https://github.com/bpftrace/bpftrace/issues/2110
-    print(machine.succeed("""
-        ulimit -n 2048
-        bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'
-    """))
+    print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'"))
     # kprobe
     print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'"))
     # BTF
     print(machine.succeed("bpftrace -e 'kprobe:schedule { "
         "    printf(\"tgid: %d\\n\", ((struct task_struct*) curtask)->tgid); exit() "
         "}'"))
     # module BTF (bpftrace >= 0.17)
-    # test is currently disabled on aarch64 as kfunc does not work there yet
-    # https://github.com/iovisor/bpftrace/issues/2496
-    print(machine.succeed("uname -m | grep aarch64 || "
-        "bpftrace -e 'kfunc:nft_trans_alloc_gfp { "
+    print(machine.succeed(
+        "bpftrace -e 'fentry:nft_delchain { "
         "    printf(\"portid: %d\\n\", args->ctx->portid); "
-        "} BEGIN { exit() }'"))
+        "} BEGIN { exit() }'"
+    ))
     # glibc includes
     print(machine.succeed("bpftrace -e '#include <errno.h>\n"
         "BEGIN { printf(\"ok %d\\n\", EINVAL); exit(); }'"))

nixos/tests/radicle.nix

@@ -188,7 +188,7 @@ in
         )
       with subtest("bob can sync bob's repository from the seed"):
         bob.succeed(
-          "cd /tmp/repo && rad sync --fetch --seed ${seed-nid}",
+          "cd /tmp/repo && rad sync --seed ${seed-nid}",
           "cd /tmp/repo && git pull"
         )
         assert bob.succeed("cat /tmp/repo/testfile") == "hello bob\n"

nixos/tests/systemd-homed.nix

@@ -46,27 +46,25 @@ in
 
     with subtest("create systemd-homed user on first boot prompt"):
       machine.wait_for_unit("systemd-homed.service")
-      machine.wait_until_tty_matches("1", "-- Press any key to proceed --")
-      machine.send_chars(" ")
-      machine.wait_until_tty_matches("1", "Please enter user name")
+      machine.wait_until_tty_matches("1", "Please enter user name to create")
       machine.send_chars("${username}\n")
-      machine.wait_until_tty_matches("1", "Please enter an auxiliary group")
-      machine.send_chars("wheel\n")
-      machine.wait_until_tty_matches("1", "Please enter an auxiliary group")
-      machine.send_chars("\n")
-      machine.wait_until_tty_matches("1", "Please enter the shell to use")
-      machine.send_chars("/bin/sh\n")
-      machine.wait_until_tty_matches("1", "Please enter new password")
+      machine.wait_until_tty_matches("1", "Please enter new password for user ${username}:")
       machine.send_chars("${initialPassword}\n")
       machine.wait_until_tty_matches("1", "(repeat)")
       machine.send_chars("${initialPassword}\n")
+      machine.wait_for_unit("systemd-homed-firstboot.service")
+
+    # The firstboot wizard doesn't prompt for groups; add wheel here so the
+    # later sudo subtest works. Leaving the shell unset also exercises the
+    # NixOS default-user-shell meson option.
+    machine.succeed("homectl update ${username} --offline -G wheel")
 
     with subtest("login as homed user"):
       machine.wait_until_tty_matches("1", "login: ")
       machine.send_chars("${username}\n")
       machine.wait_until_tty_matches("1", "Password: ")
       machine.send_chars("${initialPassword}\n")
-      machine.wait_until_succeeds("pgrep -u ${username} -t tty1 sh")
+      machine.wait_until_succeeds("pgrep -u ${username} -t tty1 bash")
       machine.send_chars("whoami > /tmp/2\n")
       machine.wait_for_file("/tmp/2")
       assert "${username}" in machine.succeed("cat /tmp/2")
@@ -122,11 +120,11 @@ in
       sshClient.send_chars("ssh -o StrictHostKeyChecking=no -i /tmp/id_ed25519 ${username}@machine\n")
       sshClient.wait_until_tty_matches("1", "Please enter password for user")
       sshClient.send_chars("${newPassword}\n")
-      machine.wait_until_succeeds("pgrep -u ${username} sh")
+      machine.wait_until_succeeds("pgrep -u ${username} bash")
       sshClient.send_chars("whoami > /tmp/5\n")
       machine.wait_for_file("/tmp/5")
       assert "${username}" in machine.succeed("cat /tmp/5")
       sshClient.send_chars("exit\n") # ssh
-      sshClient.send_chars("exit\n") # sh
+      sshClient.send_chars("exit\n") # bash
   '';
 }

pkgs/applications/editors/eclipse/eclipses.json

@@ -1,90 +1,90 @@
 {
   "platform_major": "4",
-  "platform_minor": "38",
-  "version": "4.38",
-  "year": "2025",
-  "month": "12",
-  "buildmonth": "12",
-  "dayHourMinute": "010920",
+  "platform_minor": "39",
+  "version": "4.39",
+  "year": "2026",
+  "month": "03",
+  "buildmonth": "02",
+  "dayHourMinute": "260420",
   "eclipses": {
     "cpp": {
       "description": "Eclipse IDE for C/C++ Developers",
       "dropUrl": false,
       "hashes": {
-        "x86_64": "sha256-wlYGwfxKnF26qMSrUl0fsTDbECgXIL+ZIAr1BzwnK1Y=",
-        "aarch64": "sha256-xuTi++OZzj+jh7edNi3WQN0ie0HJB0Zrg023MT3px/c="
+        "x86_64": "sha256-2Mnh73FgzNjR4EU6KMG6MvGDeIIYXMj3mZFYR31pqfY=",
+        "aarch64": "sha256-kq94vQYN2CEHodme8V6V0EZ33Pf96fmj/zMD/vkJbp8="
       }
     },
     "dsl": {
       "description": "Eclipse IDE for Java and DSL Developers",
       "dropUrl": false,
       "hashes": {
-        "x86_64": "sha256-I6AcXthzv/uLlO5+Y27ZsbeftA3zzvUlApISsquS0sY=",
-        "aarch64": "sha256-j0gj5Tcfbyj3sQ6gHEexee6d4SNbOYMODTeZDbKbUBo="
+        "x86_64": "sha256-dOvQSOk4tPiLiNFHn4+a+gA69BhXjp9IbEZMJET7BfU=",
+        "aarch64": "sha256-EPLQccE19bYITjaWnZjcB9/c7M95/7gbfJVPHkrXAWM="
       }
     },
     "embedcpp": {
       "description": "Eclipse IDE for Embedded C/C++ Developers",
       "dropUrl": false,
       "hashes": {
-        "x86_64": "sha256-sPyqRadyBQ24oO38bEy4VP4dTj6V+FwMVjxyniyTn5o=",
-        "aarch64": "sha256-CahsB9yBC8bLzwdfOOaidsP1VXXiELoot+DN8Zz2QqU="
+        "x86_64": "sha256-zX0MMRGMANowMxWxCxpz2oQAXFEF8HRXQ0q76B4NnEY=",
+        "aarch64": "sha256-XRfs2dJL/mXMWF7akXBw1Plh8jabSvhULOrC7dWGg7Q="
       }
     },
     "modeling": {
       "description": "Eclipse Modeling Tools",
       "dropUrl": false,
       "hashes": {
-        "x86_64": "sha256-jw1Ij7HG8J9usWT6cKXeZbZDxQTWp2pBZtG2BdU2Guw=",
-        "aarch64": "sha256-e4ieVltHzhBLGEh3NNKrKcfOyUQd0avIrhUB1CYbQls="
+        "x86_64": "sha256-5yI90w7vJGCnUvYxTnQ19NzZYJpPPmKtjS/rXmowOTE=",
+        "aarch64": "sha256-SZE4f2CR/FuG1B08Zf0eKrMBKRy7d2CWISGKWVpwhDw="
       }
     },
     "platform": {
       "description": "Eclipse Platform ${year}-${month}",
       "dropUrl": true,
       "hashes": {
-        "x86_64": "sha256-gicPSSoWyisPTUQXu3ndWrcNiCTgIaCnVCZbTFWp6Cc=",
-        "aarch64": "sha256-WSs9Y7iwhd+Wd4RQ/DMFGqIR4RjlceJgPCE2BSa55so="
+        "x86_64": "sha256-VpV40IdWwUdePo1NqOrgnzta1x7jXDLkF+pZ4LWatew=",
+        "aarch64": "sha256-Q//rkfpyY319BW4w/sK3Bd7Qb4Oi88hnr0aGULquV3g="
       }
     },
     "SDK": {
       "description": "Eclipse ${year}-${month} Classic",
       "dropUrl": true,
       "hashes": {
-        "x86_64": "sha256-Vx8mnR81KpikZZikNwaHCz+KEfWd3Jvkzf9A6Chc0TE=",
-        "aarch64": "sha256-VMcPmucV+hZ88nnhdsklXqrrUFG5lrZLeYmC1XC5Wo4="
+        "x86_64": "sha256-ifXUPmZSvJP/LMCHFmX+01+qF75jVEGFmGxfElBz1K8=",
+        "aarch64": "sha256-grzJNEFvXhgrJM+hSiS29n0ardlmhM6kIffeWPh/vMs="
       }
     },
     "java": {
       "description": "Eclipse IDE for Java Developers",
       "dropUrl": false,
       "hashes": {
-        "x86_64": "sha256-Us5HNoQOt9OaTVAhVlFPMqAXD8hZkLs0IGppSpj2UuY=",
-        "aarch64": "sha256-SHgHlicA30Q7W6yNTGUgaovMYXIHohbhksbJKIRSFGk="
+        "x86_64": "sha256-DtRK/x4u7YQpjcKYh/9PdAeppjaxTEBTdL/AQhPFIlU=",
+        "aarch64": "sha256-Gu5d8qMig6cCc9JVnNDMsj+xsYfkbHrTl1MvlSIfmhE="
       }
     },
     "jee": {
       "description": "Eclipse IDE for Enterprise Java and Web Developers",
       "dropUrl": false,
       "hashes": {
-        "x86_64": "sha256-z0nj/7dmlqjEE+PQEjJngf3GmTIc6O8F8TJm7yBFrQE=",
-        "aarch64": "sha256-MDBT9OJWBRd0twY5XoBukQaBTG1IP3xKE0g9kc86a/8="
+        "x86_64": "sha256-86Qi1nZElwyo9gumtLUlsnOxsF2TE4DpXGmPS+C2l2M=",
+        "aarch64": "sha256-iAtto9kxFjbXo6KQmOlnY6TRskHkx20VJUeW7FO3lZI="
       }
     },
     "committers": {
       "description": "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers",
       "dropUrl": false,
       "hashes": {
-        "x86_64": "sha256-meelcKp5AgfVCi13scA0TbPgkK9XsPvtS8HkyAYcUZs=",
-        "aarch64": "sha256-c/FxP0Snx70bkhZ+owkg/DFXu3AWdJtrPCKyqIqKfPs="
+        "x86_64": "sha256-fq5dfqqqyxO1fZRMd5aygDWKN116Mx3VqglVsRiTAAE=",
+        "aarch64": "sha256-/6+0zMMVeARHldxOenRN16sxSkUP97g7ERmePdwxi78="
       }
     },
     "rcp": {
       "description": "Eclipse IDE for RCP and RAP Developers",
       "dropUrl": false,
       "hashes": {
-        "x86_64": "sha256-0OgiJ11wMGeR1UjoLd3yoApDMhy3oZ1y4P2OxSJyRQA=",
-        "aarch64": "sha256-IywPOyQlZXTrJdjiRDVAKwlxMZ1+FvN/uxYYoJ++ez8="
+        "x86_64": "sha256-VQTCGRqb6Fn7DdhM0S1gJX17Rv/H8Ych2rZmBYRiaq4=",
+        "aarch64": "sha256-o+Rd5vuhvSjs0oLkLnAgHpyq1EuYLZAJY5GTwBEmPog="
       }
     }
   }

pkgs/applications/graphics/gimp/default.nix

@@ -7,6 +7,7 @@
   ninja,
   pkg-config,
   babl,
+  bash-completion,
   cfitsio,
   gegl,
   gtk3,
@@ -41,6 +42,7 @@
   python3,
   libexif,
   gettext,
+  glibcLocales,
   wrapGAppsHook3,
   libxslt,
   gobject-introspection,
@@ -57,6 +59,7 @@
   llvmPackages,
   gexiv2,
   harfbuzz,
+  makeFontsConf,
   mypaint-brushes1,
   libwebp,
   libheif,
@@ -81,7 +84,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gimp";
-  version = "3.0.6";
+  version = "3.0.8";
 
   outputs = [
     "out"
@@ -92,17 +95,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://download.gimp.org/gimp/v${lib.versions.majorMinor finalAttrs.version}/gimp-${finalAttrs.version}.tar.xz";
-    hash = "sha256-JGwiU4PHLvnw3HcDt9cHCEu/F3vSkA6UzkZqYoYuKWs=";
+    hash = "sha256-/rSYrMAbJoJ8/x/5Wqj7gs3Wpg16v3c8/NGavq/KM4Y=";
   };
 
   patches = [
-    # https://gitlab.gnome.org/GNOME/gimp/-/issues/15257
-    (fetchpatch {
-      name = "fix-gegl-bevel-test.patch";
-      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/2fd12847496a9a242ca8edc448d400d3660b8009.patch";
-      hash = "sha256-pjOjyzZxxl+zRqThXBwCBfYHdGhgaMI/IMKaL3XGAMs=";
-    })
-
     # to remove compiler from the runtime closure, reference was retained via
     # gimp --version --verbose output
     (replaceVars ./remove-cc-reference.patch {
@@ -122,13 +118,39 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./tests-dbus-conf.patch {
       session_conf = "${dbus.out}/share/dbus-1/session.conf";
     })
+
+    # Allow calling tests from other directories.
+    # Required for the next patch.
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/fd58ab3bee7a79cb0a7870c6858f3b64c84a7917.patch";
+      hash = "sha256-fpysKWwt5rilqp7ukdWx7kutkDquL/6YhYjR1zQfu/Q=";
+    })
+
+    # Do not go through ui for save-and-export test.
+    # https://gitlab.gnome.org/GNOME/gimp/-/issues/15763
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/608ad0a528b5b31101c021d96aeb95558d207497.patch";
+      hash = "sha256-0oA5u+uAT0l3WT90fy0RGOR8xy/fGIHevBb69oUzfGs=";
+      excludes = [
+        # Other changes would prevent deletion, removing it from build is sufficient.
+        "app/tests/test-save-and-export.c"
+      ];
+    })
+
+    # Disable broken UI tests.
+    # https://gitlab.gnome.org/GNOME/gimp/-/issues/15763
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/c34fe3e94f1019eafcb38edf1c07bff12a57431e.patch";
+      hash = "sha256-yVauEpoGEOIfCXnGnWMGWjXbIDizDhJ3hipeCy3XSBM=";
+    })
   ];
 
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
     gettext
+    glibcLocales
     wrapGAppsHook3
     libxslt # for xsltproc
     gobject-introspection
@@ -152,6 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     appstream # for library
     babl
+    bash-completion
     cfitsio
     gegl
     gtk3
@@ -250,6 +273,11 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Check if librsvg was built with --disable-pixbuf-loader.
     PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
+
+    # Silence fontconfig warnings about missing config during tests
+    FONTCONFIG_FILE = makeFontsConf {
+      fontDirectories = [ ];
+    };
   };
 
   postPatch = ''
@@ -260,6 +288,16 @@ stdenv.mkDerivation (finalAttrs: {
     chmod +x plug-ins/python/{colorxhtml,file-openraster,foggify,gradients-save-as-css,histogram-export,palette-offset,palette-sort,palette-to-gradient,python-eval,spyro-plus}.py
     patchShebangs \
       plug-ins/python/{colorxhtml,file-openraster,foggify,gradients-save-as-css,histogram-export,palette-offset,palette-sort,palette-to-gradient,python-eval,spyro-plus}.py
+
+    # Use Python from environment not from Meson.
+    # https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2607
+    substituteInPlace meson.build \
+      --replace-fail "import('python').find_installation()" "import('python').find_installation('python3')"
+
+    # Broken test
+    # https://github.com/NixOS/nixpkgs/pull/484971#issuecomment-3846759517
+    substituteInPlace app/tests/meson.build \
+      --replace-fail "{${"\n"}    'name': 'save-and-export',${"\n"}  }${"\n"}" ""
   '';
 
   preBuild =