Merge branch master into haskell-updates

NixOS · Nov 7, 2024 · df930b8 · df930b8
2 parents 7dfefc7 + 7a9a124
commit df930b8
Show file tree

Hide file tree

Showing 124 changed files with 5,410 additions and 1,760 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -8,6 +8,12 @@
         - pkgs/development/libraries/agda/**/*
         - pkgs/top-level/agda-packages.nix
 
+"6.topic: bsd":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/os-specific/bsd/**/*
+
 "6.topic: cinnamon":
   - any:
     - changed-files:
@@ -21,6 +27,55 @@
         - pkgs/by-name/ne/nemo/**/*
         - pkgs/by-name/ne/nemo-*/**/*
 
+"6.topic: continuous integration":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - .github/**/*
+        - ci/**/*
+
+"6.topic: coq":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/applications/science/logic/coq/**/*
+        - pkgs/development/coq-modules/**/*
+        - pkgs/top-level/coq-packages.nix
+
+"6.topic: crystal":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/development/compilers/crystal/**/*
+
+"6.topic: cuda":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/development/cuda-modules/**/*
+        - pkgs/top-level/cuda-packages.nix
+
+"6.topic: darwin":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/os-specific/darwin/**/*
+        - pkgs/top-level/darwin-aliases.nix
+        - pkgs/top-level/darwin-packages.nix
+
+"6.topic: deepin":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - nixos/modules/services/desktops/deepin/**/*
+        - pkgs/desktops/deepin/**/*
+
+"6.topic: docker tools":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/applications/virtualization/docker/**/*
+
 "6.topic: dotnet":
   - any:
     - changed-files:
@@ -86,6 +141,12 @@
         - pkgs/build-support/flutter/*.nix
         - pkgs/development/compilers/flutter/**/*.nix
 
+"6.topic: games":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/games/**/*
+
 "6.topic: GNOME":
   - any:
     - changed-files:
@@ -105,6 +166,12 @@
         - pkgs/build-support/go/**/*
         - pkgs/development/compilers/go/**/*
 
+"6.topic: hardware":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - nixos/modules/hardware/**/*
+
 "6.topic: haskell":
   - any:
     - changed-files:
@@ -118,6 +185,28 @@
         - pkgs/top-level/haskell-packages.nix
         - pkgs/top-level/release-haskell.nix
 
+"6.topic: java":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - nixos/modules/programs/java.nix
+        - pkgs/development/compilers/graalvm/**/*
+        - pkgs/development/compilers/openjdk/**/*
+        - pkgs/development/compilers/temurin-bin/**/*
+        - pkgs/development/compilers/zulu/**/*
+        - pkgs/development/java-modules/**/*
+        - pkgs/top-level/java-packages.nix
+
+"6.topic: jitsi":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - nixos/modules/services/networking/jitsi-videobridge.nix
+        - nixos/modules/services/web-apps/jitsi-meet.nix
+        - pkgs/servers/web-apps/jitsi-meet/**/*
+        - pkgs/servers/jitsi-videobridge/**/*
+        - pkgs/applications/networking/instant-messengers/jitsi/**/*
+
 "6.topic: julia":
   - any:
     - changed-files:
@@ -205,6 +294,12 @@
         - lib/tests/modules.sh
         - lib/tests/modules/**
 
+"6.topic: musl":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/os-specific/linux/musl/**/*
+
 "6.topic: nixos":
   - any:
     - changed-files:
@@ -213,6 +308,13 @@
         - pkgs/by-name/sw/switch-to-configuration-ng/**/*
         - pkgs/os-specific/linux/nixos-rebuild/**/*
 
+"6.topic: nixos-container":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - nixos/modules/virtualisation/nixos-containers.nix
+        - pkgs/tools/virtualization/nixos-container/**/*
+
 "6.topic: nim":
   - any:
     - changed-files:
@@ -234,6 +336,15 @@
         - pkgs/development/tools/pnpm/**/*
         - pkgs/development/web/nodejs/*
 
+"6.topic: nvidia":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - nixos/modules/hardware/video/nvidia.nix
+        - nixos/modules/services/hardware/nvidia-container-toolkit/**/*
+        - nixos/modules/services/hardware/nvidia-optimus.nix
+        - pkgs/os-specific/linux/nvidia-x11/**/*
+
 "6.topic: ocaml":
   - any:
     - changed-files:
@@ -306,6 +417,19 @@
         - pkgs/development/libraries/kde-frameworks/**/*
         - pkgs/development/libraries/qt-5/**/*
 
+"6.topic: R":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/applications/science/math/R/**/*
+        - pkgs/development/r-modules/**/*
+
+"6.topic: rocm":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/development/rocm-modules/**/*
+
 "6.topic: ruby":
   - any:
     - changed-files:
@@ -374,6 +498,12 @@
         - nixos/tests/make-test-python.nix  # legacy
         # lib/debug.nix has a test framework (runTests) but it's not the main focus
 
+"6.topic: updaters":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/common-updater/**/*
+
 "6.topic: vim":
   - any:
     - changed-files:
@@ -390,6 +520,12 @@
       - any-glob-to-any-file:
         - pkgs/applications/editors/vscode/**/*
 
+"6.topic: windows":
+  - any:
+    - changed-files:
+      - any-glob-to-any-file:
+        - pkgs/os-specific/windows/**/*
+
 "6.topic: xen-project":
   - any:
     - changed-files:

diff --git a/ci/OWNERS b/ci/OWNERS
@@ -232,11 +232,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /nixos/tests/postgresql.nix @NixOS/postgres
 
 # Hardened profile & related modules
-/nixos/modules/profiles/hardened.nix @joachifm
-/nixos/modules/security/lock-kernel-modules.nix @joachifm
-/nixos/modules/security/misc.nix @joachifm
-/nixos/tests/hardened.nix @joachifm
-/pkgs/os-specific/linux/kernel/hardened/config.nix @joachifm
+/nixos/modules/profiles/hardened.nix                       @joachifm
+/nixos/modules/security/lock-kernel-modules.nix            @joachifm
+/nixos/modules/security/misc.nix                           @joachifm
+/nixos/tests/hardened.nix                                  @joachifm
+/pkgs/os-specific/linux/kernel/hardened/        @fabianhjr @joachifm
 
 # Home Automation
 /nixos/modules/services/home-automation/home-assistant.nix @mweinelt

diff --git a/doc/build-helpers/images/appimagetools.section.md b/doc/build-helpers/images/appimagetools.section.md
@@ -117,7 +117,7 @@ in appimageTools.wrapType2 {
     install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/irccloud.png \
       $out/share/icons/hicolor/512x512/apps/irccloud.png
     substituteInPlace $out/share/applications/irccloud.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
+      --replace-fail 'Exec=AppRun' 'Exec=${pname}'
   '';
 }
 ```
@@ -147,7 +147,7 @@ let
   appimageContents = appimageTools.extract {
     inherit pname version src;
     postExtract = ''
-      substituteInPlace $out/irccloud.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
+      substituteInPlace $out/irccloud.desktop --replace-fail 'Exec=AppRun' 'Exec=${pname}'
     '';
   };
 in appimageTools.wrapType2 {

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -4447,6 +4447,12 @@
       { fingerprint = "D8CB 816A B678 A4E6 1EC7  5325 230F 4AC1 53F9 0F29"; }
     ];
   };
+  corbinwunderlich = {
+    email = "[email protected]";
+    github = "CorbinWunderlich";
+    githubId = 140280062;
+    name = "Corbin Wunderlich";
+  };
   corngood = {
     email = "[email protected]";
     github = "corngood";
@@ -8291,6 +8297,13 @@
     githubId = 201997;
     name = "Eric Seidel";
   };
+  griffi-gh = {
+    name = "Alex Prasol";
+    email = "[email protected]";
+    matrix = "@voxel:nyanbinary.rs";
+    github = "griffi-gh";
+    githubId = 45996170;
+  };
   grimmauld = {
     name = "Sören Bender";
     email = "[email protected]";