Merge master into staging-next

2025-06-14 06:05:15 +00:00
parent 7001d06792 f117875f61
commit 3029e20133
19 changed files with 595 additions and 538 deletions
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
      sources = {
        "x86_64-linux" = {
          arch = "linux-x64";
-          hash = "sha256-tnZh8WioZ4EtooQlM5RYQkvWO35PPeNTAyCbMQ4raXE=";
+          hash = "sha256-3JEqkFY1vuI11HdM+X1rZkbVOrFpykAy7CdYxtyfu+0=";
        };
        "x86_64-darwin" = {
          arch = "darwin-x64";
-          hash = "sha256-tkZRGO1W0QA/aEW2BqyPhmGt06yTvrsQ4Xp8jmbzPP0=";
+          hash = "sha256-yqb0PdhSpCecUxEO2ZUpFzn1wZcaDcfvFPXJW0gYgh4=";
        };
        "aarch64-linux" = {
          arch = "linux-arm64";
-          hash = "sha256-hoZf3ofcPHkqyWwfL79Hnu5pzcLKRHD5PVOBjTXq828=";
+          hash = "sha256-CUpfezfvhVSROFBV8ZI9W+DpwxyH6QLvhOOO8O5PYag=";
        };
        "aarch64-darwin" = {
          arch = "darwin-arm64";
-          hash = "sha256-qZnHSdcby7FNb1+EUB4O8dK30xtZWS4m07m8je0/CHI=";
+          hash = "sha256-AGc6wI15C7tZJAJ8yfx1xlQ8wQj/f8S3xHKwp+C/5x4=";
        };
      };
    in
    {
      name = "visualjj";
      publisher = "visualjj";
-      version = "0.15.0";
+      version = "0.15.1";
    }
    // sources.${stdenvNoCC.hostPlatform.system}
      or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
@@ -11,6 +11,7 @@
  qtserialport,
  qtsvg,
  wrapQtAppsHook,
+  wrapGAppsHook3,
 }:

 let
@@ -48,8 +49,15 @@ stdenv.mkDerivation (finalAttrs: {
    qmake
    qttools
    wrapQtAppsHook
+    wrapGAppsHook3
  ];

+  dontWrapGApps = true;
+
+  preFixup = ''
+    qtWrapperArgs+=(''${gappsWrapperArgs[@]})
+  '';
+
  preConfigure = ''
    lrelease gpxsee.pro
  '';
@@ -1,48 +1,38 @@
 {
  lib,
-  stdenv,
  fetchFromGitHub,
  rustPlatform,
-  openssl,
-  pkg-config,
-  python3,
-  xorg,
-  cmake,
-  libgit2,
-  curl,
+  pkgsBuildBuild,
+  stdenv,
+  zlib,
  writableTmpDirAsHomeHook,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "amp";
-  version = "0.7.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "jmacdonald";
    repo = "amp";
-    tag = version;
-    hash = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M=";
+    tag = finalAttrs.version;
+    hash = "sha256-YK+HSWTtSVLK8n7NDiif3bBqp/dQW2UTYo3yYcZ5cIA=";
  };

-  cargoPatches = [ ./update_time_crate.patch ];
-
  useFetchCargoVendor = true;
-  cargoHash = "sha256-4lYywaPTfoOHEYHy+h7HfWn+OaDdk166tQ8ZFx9XZK0=";
+  cargoHash = "sha256-6enFOmIAYOgOdoeA+pk37+BobI5AGPBxjp73Gd4C+gI=";

  nativeBuildInputs = [
-    cmake
-    pkg-config
-    python3
+    # git rev-parse --short HEAD
+    (pkgsBuildBuild.writeShellScriptBin "git" "echo 0000000")
  ];
-  buildInputs =
-    [
-      openssl
-      xorg.libxcb
-      libgit2
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      curl
-    ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    zlib
+  ];
+
+  # Needing libgit2 <=1.8.0
+  #env.LIBGIT2_NO_VENDOR = 1;

  nativeCheckInputs = [
    writableTmpDirAsHomeHook
@@ -58,4 +48,4 @@ rustPlatform.buildRustPackage rec {
    ];
    mainProgram = "amp";
  };
-}
+})
@@ -1,56 +0,0 @@
-From 4ce866de7a2e1613951002ff61563a80e19a5c0c Mon Sep 17 00:00:00 2001
-From: Drewry Pope <drewrypope@gmail.com>
-Date: Wed, 28 Aug 2024 18:45:41 -0500
-Subject: [PATCH] update time
-
---
- Cargo.lock | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 0e1b8ff6..bd8b5814 100644
--- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -864,6 +864,12 @@ dependencies = [
-  "minimal-lexical",
- ]
- 
-+[[package]]
-+name = "num-conv"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-+
- [[package]]
- name = "num-traits"
- version = "0.2.16"
-@@ -1372,12 +1378,13 @@ dependencies = [
- 
- [[package]]
- name = "time"
-version = "0.3.31"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-+ "num-conv",
-  "powerfmt",
-  "serde",
-  "time-core",
-@@ -1392,10 +1399,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
- 
- [[package]]
- name = "time-macros"
-version = "0.2.16"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-+ "num-conv",
-  "time-core",
- ]
- 
@@ -9,6 +9,7 @@
  callPackage,
  fetchFromGitiles,
  fetchFromGitHub,
+  buildPackages,
 }:

 let
@@ -43,7 +44,7 @@ let
    makeSetupHook {
      name = "gclient-unpack-hook";
      substitutions = {
-        jq = lib.getExe jq;
+        jq = lib.getExe buildPackages.jq;
      };
    } ./gclient-unpack-hook.sh
  ) { };
@@ -0,0 +1,35 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "gofaxip";
+  version = "1.4-2";
+
+  src = fetchFromGitHub {
+    owner = "gonicus";
+    repo = "gofaxip";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Fo/sNXE/GdTImg0Kd3QxWDlpJgN2OJNxX2YjL50kzW0=";
+  };
+
+  vendorHash = null;
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${finalAttrs.version}"
+  ];
+
+  env.CI = "1";
+
+  meta = {
+    description = "T.38 backend for HylaFAX using FreeSWITCH";
+    homepage = "https://github.com/gonicus/gofaxip";
+    changelog = "https://github.com/gonicus/gofaxip/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ annaaurora ];
+  };
+})
@@ -19,14 +19,14 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "home-manager";
-  version = "0-unstable-2025-06-02";
+  version = "0-unstable-2025-06-13";

  src = fetchFromGitHub {
    name = "home-manager-source";
    owner = "nix-community";
    repo = "home-manager";
-    rev = "cb809ec1ff15cf3237c6592af9bbc7e4d983e98c";
-    hash = "sha256-BJ0qRIdvt5aeqm3zg/5if7b5rruG05zrSX3UpLqjDRk=";
+    rev = "79dfd9aa295e53773aad45480b44c131da29f35b";
+    hash = "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=";
  };

  nativeBuildInputs = [
@@ -4,7 +4,7 @@
  fetchFromGitHub,
  nixosTests,
  nix-update-script,
-  version ? "1.14.0",
+  version ? "1.15.2",
 }:

 let
@@ -15,11 +15,11 @@ let
  # the meilisearch module accordingly and to remove the meilisearch_1_11
  # attribute from all-packages.nix at that point too.
  hashes = {
-    "1.14.0" = "sha256-nPOhiJJbZCr9PBlR6bsZ9trSn/2XCI2O+nXeYbZEQpU=";
+    "1.15.2" = "sha256-aTgfgPuyRcjr/DxxyuKOFXfBcDponVmKz5PpGbnsmd0=";
    "1.11.3" = "sha256-CVofke9tOGeDEhRHEt6EYwT52eeAYNqlEd9zPpmXQ2U=";
  };
  cargoHashes = {
-    "1.14.0" = "sha256-8fcOXAzheG9xm1v7uD3T+6oc/dD4cjtu3zzBBh2EkcE=";
+    "1.15.2" = "sha256-eBGxVtE25txA17zxXdlSC6Vbrm+/v1fA7iTIBDvQ71M=";
    "1.11.3" = "sha256-cEJTokDJQuc9Le5+3ObMDNJmEhWEb+Qh0TV9xZkD9D8=";
  };
 in
@@ -17,18 +17,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "n8n";
-  version = "1.95.2";
+  version = "1.97.1";

  src = fetchFromGitHub {
    owner = "n8n-io";
    repo = "n8n";
    tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-MFREFqDuT7xTCOJ6s6bcDG8jjTSckyqJTvAFSukV5x0=";
+    hash = "sha256-3tQx3yfs4LrNMSzHz4jnUduWu9uagvU8G/aGU22Fxq8=";
  };

  pnpmDeps = pnpm_10.fetchDeps {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-ikGRHuAy9kmpxhu0Aawk6qL2vMYygSgf3YPdfs7OwOM=";
+    hash = "sha256-yO5wOGCZmpiBRuw7wwi1YqllzYPIwLv2SEvWwNufNYM=";
  };

  nativeBuildInputs =
@@ -0,0 +1,26 @@
+diff --git a/data/resources/plugins/meson.build b/data/resources/plugins/meson.build
+index ac60edd..9e055b8 100644
+--- a/data/resources/plugins/meson.build
+++ b/data/resources/plugins/meson.build
+@@ -1,6 +1,7 @@
+ plugins_conf = configuration_data()
+ plugins_conf.set('APP_ID', application_id)
+ plugins_conf.set('LOCALE_DOMAIN', gettext_package)
+plugins_conf.set('LOCALE_DIR', localedir)
+ 
+ configure_file(
+   input: 'packet_nautilus.py.in',
+diff --git a/data/resources/plugins/packet_nautilus.py.in b/data/resources/plugins/packet_nautilus.py.in
+index 9c5e71e..7288ee9 100755
+--- a/data/resources/plugins/packet_nautilus.py.in
+++ b/data/resources/plugins/packet_nautilus.py.in
+@@ -23,7 +23,8 @@ def log(*vals: Any):
+ # TODO: Maybe have a separate gettext package for plugin scripts that gets
+ # copied over alongside the script. Seems more robust?
+ def init_i18n() -> gettext.NullTranslations | gettext.GNUTranslations:
+-    locale_dirs: List[Path | None] = [None]  # None for system default locale dir
+    # `None` is for system default locale dir
+    locale_dirs: List[Path | None] = [None, Path("@LOCALE_DIR@")]
+     (lang, enc) = locale.getlocale()
+ 
+     flatpak_info = None
@@ -20,21 +20,27 @@
  blueprint-compiler,
  desktop-file-utils,
  appstream,
+  python3Packages,
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "packet";
-  version = "0.4.0";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "nozwock";
    repo = "packet";
    tag = finalAttrs.version;
-    hash = "sha256-MnDXwgzSnz8bLEAZE4PORKKIP8Ao5ZiImRqRzlQzYU8=";
+    hash = "sha256-MZdZf4fLtUd30LncPLVkcNdjuzw+Wi33A1MJqQbEurk=";
  };

+  patches = [
+    # let nautilus find the locale directory
+    ./nautilus-extension-locale.patch
+  ];
+
  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-LlqJoxAWHAQ47VlYB/sOtk/UkNa+E5CQS/3FQnAYFsI=";
+    hash = "sha256-ODrM8oGQpi+DpG4YQYibtVHbicuHOjZAlZ1wW2Gulec=";
  };

  nativeBuildInputs = [
@@ -59,8 +65,17 @@ stdenv.mkDerivation (finalAttrs: {
    gdk-pixbuf
    libadwaita
    pango
+    python3Packages.wrapPython
  ];

+  postFixup = ''
+    buildPythonPath ${python3Packages.dbus-python}
+    patchPythonScript $out/share/packet/plugins/packet_nautilus.py
+    # install the nautilus extension in the expected location
+    mkdir -p $out/share/nautilus-python
+    ln -s $out/share/packet/plugins $out/share/nautilus-python/extensions
+  '';
+
  meta = {
    description = "Quick Share client for Linux";
    homepage = "https://github.com/nozwock/packet";
@@ -28,6 +28,10 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = kernel.moduleBuildDependencies ++ [ kmod ];

+  patches = lib.optionals (lib.versionAtLeast kernel.version "6.15") [
+    ./kernel_6.15_fix.patch
+  ];
+
  postPatch = ''
    substituteInPlace src/Makefile \
      --replace-fail "sudo ls -l" "ls -l" \
@@ -0,0 +1,28 @@
+diff --git a/src/fuxi-gmac-net.c b/src/fuxi-gmac-net.c
+index d5baa9c..1667cc9 100755
+--- a/src/fuxi-gmac-net.c
+++ b/src/fuxi-gmac-net.c
+@@ -870,9 +870,9 @@ static void fxgmac_stop_timers(struct fxgmac_pdata *pdata)
+             if (!channel->tx_ring)
+                 break;
+ 
+-            del_timer_sync(&channel->tx_timer);
+            timer_delete_sync(&channel->tx_timer);
+ #if FXGMAC_TX_HANG_TIMER_ENABLED
+-            del_timer_sync(&channel->tx_hang_timer);
+            timer_delete_sync(&channel->tx_hang_timer);
+             channel->tx_hang_timer_active = 0;
+ #endif
+         }
+diff --git a/src/fuxi-gmac-phy.c b/src/fuxi-gmac-phy.c
+index b2e9455..8123d41 100755
+--- a/src/fuxi-gmac-phy.c
+++ b/src/fuxi-gmac-phy.c
+@@ -368,6 +368,6 @@ int fxgmac_phy_timer_init(struct fxgmac_pdata *pdata)
+ 
+ void fxgmac_phy_timer_destroy(struct fxgmac_pdata *pdata)
+ {
+-    del_timer_sync(&pdata->expansion.phy_poll_tm);
+    timer_delete_sync(&pdata->expansion.phy_poll_tm);
+     DPRINTK("fxgmac_phy_timer removed\n");
+ }
@@ -1,33 +1,33 @@
 {
  callPackage,
-  kernel ? null,
-  stdenv,
  lib,
  nixosTests,
+  stdenv,
  ...
 }@args:

-let
-  stdenv' = if kernel == null then stdenv else kernel.stdenv;
-in
 callPackage ./generic.nix args {
  # You have to ensure that in `pkgs/top-level/linux-kernels.nix`
  # this attribute is the correct one for this package.
  kernelModuleAttribute = "zfs_2_2";
  # check the release notes for compatible kernels
-  kernelCompatible = kernel: kernel.kernelOlder "6.13";
+  kernelCompatible = kernel: kernel.kernelOlder "6.16";

  # this package should point to the latest release.
-  version = "2.2.7";
+  version = "2.2.8";

-  tests = {
-    inherit (nixosTests.zfs) installer series_2_2;
-  };
+  tests =
+    {
+      inherit (nixosTests.zfs) series_2_2;
+    }
+    // lib.optionalAttrs stdenv.isx86_64 {
+      inherit (nixosTests.zfs) installer;
+    };

  maintainers = with lib.maintainers; [
    adamcstephens
    amarshall
  ];

-  hash = "sha256-nFOB0/7YK4e8ODoW9A+RQDkZHG/isp2EBOE48zTaMP4=";
+  hash = "sha256-ZYgC8L4iI9ewaC7rkMFSRAKeTWr72N5aRP98VLL4oqo=";
 }
@@ -1,15 +1,11 @@
 {
  callPackage,
-  kernel ? null,
-  stdenv,
  lib,
  nixosTests,
+  stdenv,
  ...
 }@args:

-let
-  stdenv' = if kernel == null then stdenv else kernel.stdenv;
-in
 callPackage ./generic.nix args {
  # You have to ensure that in `pkgs/top-level/linux-kernels.nix`
  # this attribute is the correct one for this package.
@@ -20,9 +16,13 @@ callPackage ./generic.nix args {
  # this package should point to the latest release.
  version = "2.3.2";

-  tests = {
-    inherit (nixosTests.zfs) installer series_2_3;
-  };
+  tests =
+    {
+      inherit (nixosTests.zfs) series_2_3;
+    }
+    // lib.optionalAttrs stdenv.isx86_64 {
+      inherit (nixosTests.zfs) installer;
+    };

  maintainers = with lib.maintainers; [
    adamcstephens
@@ -31,6 +31,7 @@ let
      pkg-config,
      curl,
      pam,
+      nix-update-script,

      # Kernel dependencies
      kernel ? null,
@@ -269,22 +270,31 @@ let

      outputs = [ "out" ] ++ optionals buildUser [ "dev" ];

-      passthru = {
-        inherit kernel;
-        inherit enableMail kernelModuleAttribute;
-        latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages;
+      passthru =
+        {
+          inherit kernel;
+          inherit enableMail kernelModuleAttribute;
+          latestCompatibleLinuxPackages = lib.warn "zfs.latestCompatibleLinuxPackages is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention." linuxPackages;

-        # The corresponding userspace tools to this instantiation
-        # of the ZFS package set.
-        userspaceTools = genericBuild (
-          outerArgs
-          // {
-            configFile = "user";
-          }
-        ) innerArgs;
+          # The corresponding userspace tools to this instantiation
+          # of the ZFS package set.
+          userspaceTools = genericBuild (
+            outerArgs
+            // {
+              configFile = "user";
+            }
+          ) innerArgs;

-        inherit tests;
-      };
+          inherit tests;
+        }
+        // lib.optionalAttrs (kernelModuleAttribute != "zfs_unstable") {
+          updateScript = nix-update-script {
+            extraArgs = [
+              "--version-regex=^zfs-(${lib.versions.major version}\\.${lib.versions.minor version}\\.[0-9]+)"
+              "--override-filename=pkgs/os-specific/linux/zfs/${lib.versions.major version}_${lib.versions.minor version}.nix"
+            ];
+          };
+        };

      meta = {
        description = "ZFS Filesystem Linux" + (if buildUser then " Userspace Tools" else " Kernel Module");
@@ -1,14 +1,9 @@
 {
  callPackage,
-  kernel ? null,
-  stdenv,
  nixosTests,
  ...
 }@args:

-let
-  stdenv' = if kernel == null then stdenv else kernel.stdenv;
-in
 callPackage ./generic.nix args {
  # You have to ensure that in `pkgs/top-level/linux-kernels.nix`
  # this attribute is the correct one for this package.
@@ -1,10 +1,11 @@
 {
  lib,
  bundlerApp,
+  ruby_3_4,
  bundlerUpdateScript,
 }:

-bundlerApp {
+(bundlerApp.override { ruby = ruby_3_4; }) {
  pname = "lolcat";
  gemdir = ./.;
  exes = [ "lolcat" ];