Merge master into staging-next

maintainers/maintainer-list.nix

@@ -5448,6 +5448,12 @@
     githubId = 62989;
     name = "Demyan Rogozhin";
   };
+  Denommus = {
+    email = "[email protected]";
+    github = "Denommus";
+    githubId = 721022;
+    name = "Yuri da Costa Albuquerque";
+  };
   denperidge = {
     email = "[email protected]";
     github = "Denperidge";
@@ -6991,6 +6997,12 @@
     githubId = 57543709;
     name = "Chris O'Brien";
   };
+  euxane = {
+    name = "euxane";
+    email = "[email protected]";
+    github = "pacien";
+    githubId = 1449319;
+  };
   evalexpr = {
     name = "Jonathan Wilkins";
     email = "[email protected]";
@@ -13665,7 +13677,7 @@
   };
   Makuru = {
     email = "[email protected]";
-    github = "makuru-dd";
+    github = "makuru-org";
     githubId = 58048293;
     name = "Makuru";
     keys = [ { fingerprint = "5B22 7123 362F DEF1 8F79  BF2B 4792 3A0F EEB5 51C7"; } ];
@@ -17031,12 +17043,6 @@
     githubId = 17091659;
     name = "Pablo Andres Dealbera";
   };
-  pacien = {
-    email = "[email protected]";
-    github = "pacien";
-    githubId = 1449319;
-    name = "Pacien Tran-Girard";
-  };
   pacman99 = {
     email = "[email protected]";
     matrix = "@pachumicchu:myrdd.info";

nixos/modules/programs/msmtp.nix

@@ -10,7 +10,7 @@ let
 
 in
 {
-  meta.maintainers = with lib.maintainers; [ pacien ];
+  meta.maintainers = with lib.maintainers; [ euxane ];
 
   options = {
     programs.msmtp = {

nixos/modules/services/backup/postgresql-wal-receiver.nix

@@ -210,5 +210,5 @@ in
       ) receivers;
     };
 
-  meta.maintainers = with lib.maintainers; [ pacien ];
+  meta.maintainers = with lib.maintainers; [ euxane ];
 }

nixos/modules/services/mail/stalwart-mail.nix

@@ -198,7 +198,7 @@ in
   meta = {
     maintainers = with lib.maintainers; [
       happysalada
-      pacien
+      euxane
       onny
     ];
   };

nixos/modules/services/matrix/appservice-discord.nix

@@ -159,5 +159,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ pacien ];
+  meta.maintainers = with lib.maintainers; [ euxane ];
 }

nixos/modules/services/matrix/mautrix-telegram.nix

@@ -200,7 +200,7 @@ in
   };
 
   meta.maintainers = with lib.maintainers; [
-    pacien
+    euxane
     vskilet
   ];
 }

nixos/modules/services/misc/rmfakecloud.nix

@@ -145,5 +145,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ pacien ];
+  meta.maintainers = with lib.maintainers; [ euxane ];
 }

nixos/tests/postgresql/postgresql-wal-receiver.nix

@@ -19,7 +19,7 @@ let
     in
     makeTest {
       name = "postgresql-wal-receiver-${package.name}";
-      meta.maintainers = with lib.maintainers; [ pacien ];
+      meta.maintainers = with lib.maintainers; [ euxane ];
 
       nodes.machine =
         { ... }:

nixos/tests/restic.nix

@@ -132,8 +132,15 @@ import ./make-test-python.nix (
           "cp -rT ${testDir} /opt",
           "touch /opt/excluded_file_1 /opt/excluded_file_2",
           "mkdir -p /root/restic-rclone-backup",
-          "restic-remote-noinit-backup init",
+      )
+
+      server.fail(
+          # test that noinit backup in fact does not initialize the repository
+          # and thus fails without a pre-initialized repository
+          "systemctl start restic-backups-remote-noinit-backup.service",
+      )
 
+      server.succeed(
           # test that remotebackup runs custom commands and produces a snapshot
           "timedatectl set-time '2016-12-13 13:45'",
           "systemctl start restic-backups-remotebackup.service",
@@ -152,7 +159,8 @@ import ./make-test-python.nix (
           "restic-remote-from-file-backup restore latest -t /tmp/restore-2",
           "diff -ru ${testDir} /tmp/restore-2/opt",
 
-          # test that remote-noinit-backup produces a snapshot
+          # test that remote-noinit-backup produces a snapshot once initialized
+          "restic-remote-noinit-backup init",
           "systemctl start restic-backups-remote-noinit-backup.service",
           'restic-remote-noinit-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
 

nixos/tests/stalwart-mail.nix

@@ -123,7 +123,7 @@ import ./make-test-python.nix (
     meta = {
       maintainers = with lib.maintainers; [
         happysalada
-        pacien
+        euxane
         onny
       ];
     };

pkgs/applications/editors/vim/plugins/avante-nvim/default.nix

@@ -10,18 +10,18 @@
   vimUtils,
 }:
 let
-  version = "0.0.13";
+  version = "0.0.14";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
     tag = "v${version}";
-    hash = "sha256-JTuVq5fil2bpkptpw+kj0PFOp9Rk7RpOxc0GN/blL6M=";
+    hash = "sha256-0dkPejvupXhVZY/5qT45f4LZ4MIVcz8uZam+9TmB+Yo=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-mCQm+ZBH5KehCbpKZ2zFl34sJh4yfKmA8GMcteK5SrA=";
+    cargoHash = "sha256-80++U7CIu6QtH1jQCHCEpv2tnYOuoWSczZIUmKyrqJE=";
 
     nativeBuildInputs = [
       pkg-config

pkgs/applications/editors/vim/plugins/blink-cmp/default.nix

@@ -7,12 +7,12 @@
   nix-update-script,
 }:
 let
-  version = "0.7.6";
+  version = "0.8.0";
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-fzAqUqMx4zqN9dtTYRAibhWd5CKh2pvai9g7E/xxnE8=";
+    tag = "v${version}";
+    hash = "sha256-YUADpn3kImYqlc96R3qMKC2V+ZD3+Na0WDP63dxKKbU=";
   };
   libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
   blink-fuzzy-lib = rustPlatform.buildRustPackage {

pkgs/applications/office/beamerpresenter/default.nix

@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
     ];
     platforms = platforms.all;
     maintainers = with maintainers; [
-      pacien
+      euxane
       dotlambda
     ];
     mainProgram = "beamerpresenter";

pkgs/applications/version-management/mercurial/default.nix

@@ -123,7 +123,7 @@ let
       license = licenses.gpl2Plus;
       maintainers = with maintainers; [
         lukegb
-        pacien
+        euxane
         techknowlogick
       ];
       platforms = platforms.unix;

pkgs/applications/video/mpv/scripts/sponsorblock.nix

@@ -47,6 +47,6 @@ buildLua {
     description = "Script for mpv to skip sponsored segments of YouTube videos";
     homepage = "https://github.com/po5/mpv_sponsorblock";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ pacien ];
+    maintainers = with maintainers; [ euxane ];
   };
 }

pkgs/applications/virtualization/singularity/packages.nix

@@ -15,7 +15,7 @@ let
         src = fetchFromGitHub {
           owner = "apptainer";
           repo = "apptainer";
-          rev = "refs/tags/v${version}";
+          tag = "v${version}";
           hash = "sha256-ZdSo9bKZ7Q1xwMe4SR840U3+fVpKwtiZQA5KDM5qF9M=";
         };
 
@@ -46,19 +46,19 @@ let
     callPackage
       (import ./generic.nix rec {
         pname = "singularity-ce";
-        version = "4.2.1";
+        version = "4.2.2";
         projectName = "singularity";
 
         src = fetchFromGitHub {
           owner = "sylabs";
           repo = "singularity";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-Go4um/bIgq2lCZvjJ2GR81XpA/JvjPholi1PzNG9Hz8=";
+          tag = "v${version}";
+          hash = "sha256-BW+oUZh82m2QDf0tUKRLcPk3mUpkukZkVzSIfXtQwio=";
         };
 
         # Override vendorHash with overrideAttrs.
         # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash
-        vendorHash = "sha256-CRZ42NdmJhAkV6bkl5n7rEV4Tu/h65qF5qaQ4W5wQ3w=";
+        vendorHash = "sha256-ed779LFPL38i/+pGlGIty9I/SvOtjF4/dOAx8zY7Y5E=";
 
         # Do not build conmon and squashfuse from the Git submodule sources,
         # Use Nixpkgs provided version

pkgs/applications/window-managers/i3/balance-workspace.nix

@@ -23,7 +23,7 @@ buildPythonPackage rec {
     description = "Balance windows and workspaces in i3wm";
     homepage = "https://pypi.org/project/i3-balance-workspace/";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ pacien ];
+    maintainers = with lib.maintainers; [ euxane ];
     mainProgram = "i3_balance_workspace";
   };
 }

pkgs/by-name/db/dbgate/package.nix

@@ -7,25 +7,25 @@
 }:
 let
   pname = "dbgate";
-  version = "6.0.0";
+  version = "6.1.0";
   src =
     fetchurl
       {
         aarch64-linux = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
-          hash = "sha256-HWjz3S8y0lRvhEcYNaNY89fLKvLOzwoLFD2RstWgFPI=";
+          hash = "sha256-gUACJGegHFhOd9t/MVt5imwsTnOKA9Q66dKtzLHzjSo=";
         };
         x86_64-linux = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
-          hash = "sha256-nUoncYH42maU5cAMkpvKeCnyE8SJTlcfdUCrO5WvhcY=";
+          hash = "sha256-hSqBwsroOWcyHuUimkiy13tdTKqdAjXOnECv5J9KRbw=";
         };
         x86_64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
-          hash = "sha256-ru+TzZ7c9NSOujsHoLxghmKgI4dEMlc45hTHsto2gIY=";
+          hash = "sha256-tUY9TM/wP7N1giZpBlzCQlF+01XT7HA4v/kTrT57jX8=";
         };
         aarch64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
-          hash = "sha256-H6RFzgnn/4HHdHrWedFLeLlXizC+TEbD8F/9C4rVMok=";
+          hash = "sha256-b5IJfpe3XnY1bSI6dzQro8PY4L72aFKy9GtolgFZzsA=";
         };
       }
       .${stdenv.system} or (throw "dbgate: ${stdenv.system} is unsupported.");

pkgs/by-name/gs/gscan2pdf/package.nix

@@ -161,7 +161,7 @@ perlPackages.buildPerlPackage rec {
     description = "GUI to produce PDFs or DjVus from scanned documents";
     homepage = "https://gscan2pdf.sourceforge.net/";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ pacien ];
+    maintainers = with maintainers; [ euxane ];
     mainProgram = "gscan2pdf";
   };
 }

pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix

@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ha-mqtt-discoverable-cli";
-  version = "0.4.1";
+  version = "0.16.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable-cli";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-rGRsB5kAtzI5KP4tMiQqLJQZs7z5k657V8Di0OzB6F8=";
+    tag = "v${version}";
+    hash = "sha256-RyAgwLMdeLZj+U7Ddp1t/Qy5K/U++3WssVHfzSQ7YoY=";
   };
 
   pythonRelaxDeps = [ "ha-mqtt-discoverable" ];

pkgs/by-name/hi/hidrd/package.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     description = "HID report descriptor I/O library and conversion tool";
     homepage = "https://github.com/DIGImend/hidrd";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ pacien ];
+    maintainers = with maintainers; [ euxane ];
     platforms = platforms.all;
     broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/hidrd.x86_64-darwin
     mainProgram = "hidrd-convert";

pkgs/by-name/ho/howl/package.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://howl.io/";
     description = "General purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface";
     license = licenses.mit;
-    maintainers = with maintainers; [ pacien ];
+    maintainers = with maintainers; [ euxane ];
     mainProgram = "howl";
 
     # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively

pkgs/by-name/iv/ivyterm/package.nix

@@ -4,46 +4,50 @@
   fetchFromGitHub,
   pkg-config,
   wrapGAppsHook4,
-  cairo,
-  gdk-pixbuf,
-  glib,
-  gtk4,
   libadwaita,
-  pango,
   vte-gtk4,
+  openssl,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
   pname = "ivyterm";
-  version = "0-unstable-2024-10-23";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "Tomiyou";
     repo = "ivyterm";
-    rev = "13ee76dfc88bc92807e328991c7a8586a5b13ac7";
-    hash = "sha256-RVHGDgaNYhR/eGTu4bhJvEfd14qFP+u8ApItVc00Bm8=";
+    tag = "v${version}";
+    hash = "sha256-2wOTUJRFtT7lJ8Km7J7qT6CIRi7wZmNAp1UHfrksyss=";
   };
 
-  cargoHash = "sha256-tdaI0diwRjqERmAiuKFhMw4AeqxgMq8YMsZWBjsmd0U=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-SyyXpV4BfXFm5SHsrXHVNXFm8xM1gBv9lBRXuHVN+lQ=";
 
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook4
   ];
 
   buildInputs = [
-    cairo
-    gdk-pixbuf
-    glib
-    gtk4
+    openssl
     libadwaita
-    pango
     vte-gtk4
   ];
 
+  postInstall = ''
+    install -D data/com.tomiyou.ivyTerm.desktop -t $out/share/applications
+    install -D data/com.tomiyou.ivyTerm.svg -t $out/share/icons
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Terminal emulator implemented in gtk4-rs and VTE4";
     homepage = "https://github.com/Tomiyou/ivyterm";
+    changelog = "https://github.com/Tomiyou/ivyterm/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ genga898 ];
     mainProgram = "ivyterm";