Merge master into staging-next

NixOS · Jan 13, 2025 · c67c39e · c67c39e
2 parents 71c2fcc + a55d4e6
commit c67c39e
Show file tree

Hide file tree

Showing 109 changed files with 2,266 additions and 860 deletions.
diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml
@@ -35,19 +35,19 @@ env:
 
 jobs:
   get-merge-commit:
+    if: github.repository_owner == 'NixOS'
     uses: ./.github/workflows/get-merge-commit.yml
 
   # Check that code owners is valid
   check:
     name: Check
     runs-on: ubuntu-24.04
     needs: get-merge-commit
-    if: needs.get-merge-commit.outputs.mergedSha
+    if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha
     steps:
       - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
 
       - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
-        if: github.repository_owner == 'NixOS'
         with:
           # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
           name: nixpkgs-ci
@@ -88,6 +88,7 @@ jobs:
   request:
     name: Request
     runs-on: ubuntu-24.04
+    if: github.repository_owner == 'NixOS'
     steps:
       - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
 

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
@@ -53,7 +53,7 @@ jobs:
           echo "systems=$(<result/systems.json)" >> "$GITHUB_OUTPUT"
 
       - name: Upload the list of all attributes
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: paths
           path: result/*
@@ -122,7 +122,7 @@ jobs:
           # If it uses too much memory, slightly decrease chunkSize
 
       - name: Upload the output paths and eval stats
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: intermediate-${{ matrix.system }}
           path: result/*
@@ -159,7 +159,7 @@ jobs:
             -o prResult
 
       - name: Upload the combined results
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: result
           path: prResult/*
@@ -223,7 +223,7 @@ jobs:
 
       - name: Upload the combined results
         if: steps.targetRunId.outputs.targetRunId
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: comparison
           path: comparison/*

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -16699,10 +16699,16 @@
     githubId = 99221043;
   };
   numinit = {
-    email = "[email protected]";
+    email = "[email protected]";
+    name = "Morgan Jones";
     github = "numinit";
     githubId = 369111;
-    name = "Morgan Jones";
+    keys = [
+      # >=2025
+      { fingerprint = "FD28 F9C9 81C5 D78E 56E8  8311 5C3E B94D 198F 1491"; }
+      # <=2024
+      { fingerprint = "190B DA97 F616 DE35 6899  ED17 F819 F1AF 2FC1 C1FF"; }
+    ];
   };
   numkem = {
     name = "Sebastien Bariteau";

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -198,6 +198,8 @@
 
 - `sm64ex-coop` has been removed as it was archived upstream. Consider migrating to `sm64coopdx`.
 
+- `tldr` now uses [`tldr-python-client`](https://github.com/tldr-pages/tldr-python-client) instead of [`tldr-c-client`](https://github.com/tldr-pages/tldr-c-client) which is unmaintained.
+
 - `renovate` was updated to v39. See the [upstream release notes](https://docs.renovatebot.com/release-notes-for-major-versions/#version-39) for breaking changes.
   Like upstream's docker images, renovate now runs on NodeJS 22.
 

diff --git a/nixos/modules/image/images.nix b/nixos/modules/image/images.nix
@@ -9,59 +9,52 @@ let
   inherit (lib) types;
 
   imageModules = {
-    amazon = [ ../../maintainers/scripts/ec2/amazon-image.nix ];
-    azure = [ ../virtualisation/azure-image.nix ];
-    digital-ocean = [ ../virtualisation/digital-ocean-image.nix ];
-    google-compute = [ ../virtualisation/google-compute-image.nix ];
-    hyperv = [ ../virtualisation/hyperv-image.nix ];
-    linode = [ ../virtualisation/linode-image.nix ];
-    lxc = [ ../virtualisation/lxc-container.nix ];
-    lxc-metadata = [ ../virtualisation/lxc-image-metadata.nix ];
-    oci = [ ../virtualisation/oci-image.nix ];
-    openstack = [ ../../maintainers/scripts/openstack/openstack-image.nix ];
-    openstack-zfs = [ ../../maintainers/scripts/openstack/openstack-image-zfs.nix ];
-    proxmox = [ ../virtualisation/proxmox-image.nix ];
-    proxmox-lxc = [ ../virtualisation/proxmox-lxc.nix ];
-    qemu-efi = [ ../virtualisation/disk-image.nix ];
-    qemu = [
-      ../virtualisation/disk-image.nix
-      {
-        image.efiSupport = false;
-      }
-    ];
-    raw-efi = [
-      ../virtualisation/disk-image.nix
-      {
-        image.format = "raw";
-      }
-    ];
-    raw = [
-      ../virtualisation/disk-image.nix
-      {
-        image.format = "raw";
-        image.efiSupport = false;
-      }
-    ];
-    kubevirt = [ ../virtualisation/kubevirt.nix ];
-    vagrant-virtualbox = [ ../virtualisation/vagrant-virtualbox-image.nix ];
-    virtualbox = [ ../virtualisation/virtualbox-image.nix ];
-    vmware = [ ../virtualisation/vmware-image.nix ];
-    iso = [ ../installer/cd-dvd/iso-image.nix ];
-    iso-installer = [ ../installer/cd-dvd/installation-cd-base.nix ];
-    sd-card = [
-      (
+    amazon = ../../maintainers/scripts/ec2/amazon-image.nix;
+    azure = ../virtualisation/azure-image.nix;
+    digital-ocean = ../virtualisation/digital-ocean-image.nix;
+    google-compute = ../virtualisation/google-compute-image.nix;
+    hyperv = ../virtualisation/hyperv-image.nix;
+    linode = ../virtualisation/linode-image.nix;
+    lxc = ../virtualisation/lxc-container.nix;
+    lxc-metadata = ../virtualisation/lxc-image-metadata.nix;
+    oci = ../virtualisation/oci-image.nix;
+    openstack = ../../maintainers/scripts/openstack/openstack-image.nix;
+    openstack-zfs = ../../maintainers/scripts/openstack/openstack-image-zfs.nix;
+    proxmox = ../virtualisation/proxmox-image.nix;
+    proxmox-lxc = ../virtualisation/proxmox-lxc.nix;
+    qemu-efi = ../virtualisation/disk-image.nix;
+    qemu = {
+      imports = [ ../virtualisation/disk-image.nix ];
+      image.efiSupport = false;
+    };
+    raw-efi = {
+      imports = [ ../virtualisation/disk-image.nix ];
+      image.format = "raw";
+    };
+    raw = {
+      imports = [ ../virtualisation/disk-image.nix ];
+      image.format = "raw";
+      image.efiSupport = false;
+    };
+    kubevirt = ../virtualisation/kubevirt.nix;
+    vagrant-virtualbox = ../virtualisation/vagrant-virtualbox-image.nix;
+    virtualbox = ../virtualisation/virtualbox-image.nix;
+    vmware = ../virtualisation/vmware-image.nix;
+    iso = ../installer/cd-dvd/iso-image.nix;
+    iso-installer = ../installer/cd-dvd/installation-cd-base.nix;
+    sd-card = {
+      imports =
         let
           module = ../. + "/installer/sd-card/sd-image-${pkgs.targetPlatform.linuxArch}.nix";
         in
-        if builtins.pathExists module then module else throw "The module ${module} does not exist."
-      )
-    ];
-    kexec = [ ../installer/netboot/netboot-minimal.nix ];
+        if builtins.pathExists module then [ module ] else throw "The module ${module} does not exist.";
+    };
+    kexec = ../installer/netboot/netboot-minimal.nix;
   };
   imageConfigs = lib.mapAttrs (
-    name: modules:
+    name: module:
     extendModules {
-      inherit modules;
+      modules = [ module ];
     }
   ) config.image.modules;
 in
@@ -77,7 +70,7 @@ in
       };
     };
     image.modules = lib.mkOption {
-      type = types.attrsOf (types.listOf types.deferredModule);
+      type = types.attrsOf types.deferredModule;
       description = ''
         image-specific NixOS Modules used for `system.build.images`.
       '';

diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix
@@ -708,6 +708,9 @@ in {
           "zha"
           "zwave"
           "zwave_js"
+
+          # Custom components, maintained manually.
+          "amshan"
         ];
       in {
         ExecStart = escapeSystemdExecArgs ([

diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix
@@ -273,7 +273,8 @@ in
             ProtectKernelTunables = true;
             ProtectControlGroups = true;
             ProtectProc = "invisible";
-            ProcSubset = "pid";
+            # "all" is required because faster-whisper accesses /proc/cpuinfo to determine cpu capabilities
+            ProcSubset = "all";
             RestrictAddressFamilies = [
               "AF_INET"
               "AF_INET6"

diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix
@@ -32,9 +32,9 @@ in
 
       dataDir = mkOption {
         type = types.str;
-        default = "calibre-web";
+        default = "/var/lib/calibre-web";
         description = ''
-          The directory below {file}`/var/lib` where Calibre-Web stores its data.
+          The directory where Calibre-Web stores its data.
         '';
       };
 
@@ -107,9 +107,14 @@ in
   };
 
   config = mkIf cfg.enable {
+    systemd.tmpfiles.settings."10-calibre-web".${cfg.dataDir}.d = {
+      inherit (cfg) user group;
+      mode = "0700";
+    };
+
     systemd.services.calibre-web = let
-      appDb = "/var/lib/${cfg.dataDir}/app.db";
-      gdriveDb = "/var/lib/${cfg.dataDir}/gdrive.db";
+      appDb = "${cfg.dataDir}/app.db";
+      gdriveDb = "${cfg.dataDir}/gdrive.db";
       calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}";
 
       settings = concatStringsSep ", " (
@@ -134,7 +139,6 @@ in
           User = cfg.user;
           Group = cfg.group;
 
-          StateDirectory = cfg.dataDir;
           ExecStartPre = pkgs.writeShellScript "calibre-web-pre-start" (
             ''
               __RUN_MIGRATIONS_AND_EXIT=1 ${calibreWebCmd}

diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -35,14 +35,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = if withGui then "bitcoin" else "bitcoind";
-  version = "28.0";
+  version = "28.1";
 
   src = fetchurl {
     urls = [
       "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
     ];
     # hash retrieved from signed SHA256SUMS
-    sha256 = "700ae2d1e204602eb07f2779a6e6669893bc96c0dca290593f80ff8e102ff37f";
+    sha256 = "c5ae2dd041c7f9d9b7c722490ba5a9d624f7e9a089c67090615e1ba4ad0883ba";
   };
 
   nativeBuildInputs =

diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abracadabra";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "KejPi";
     repo = "AbracaDABra";
     rev = "v${version}";
-    hash = "sha256-PPG71W5HeLr4R8je88K4VXPiSbJn5T7dP3M05C+bkv0=";
+    hash = "sha256-T2l5wjE62xBb55IzKzInf/K4VPOuZ68vp5VxS0vIn+I=";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "alt-tab-macos";
-  version = "7.18.0";
+  version = "7.18.1";
 
   src = fetchurl {
     url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip";
-    hash = "sha256-9+XK+rDyV2V4RIAfMR2EUcSf6AEpQKAOLDp6RXb5Wb8=";
+    hash = "sha256-PMnA0G/CuofKR7mlWkcbQ+JVdGf91yQf7q8znFCIujY=";
   };
 
   sourceRoot = ".";