Merge remote-tracking branch 'origin/master' into staging-next

NixOS · Nov 7, 2024 · a3600c0 · a3600c0
2 parents 271bc34 + 281f755
commit a3600c0
Show file tree

Hide file tree

Showing 69 changed files with 5,100 additions and 1,576 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/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
@@ -57,8 +57,8 @@ Available compilers are collected under `haskell.compiler`.
 Each of those compiler versions has a corresponding attribute set `packages` built with
 it. However, the non-standard package sets are not tested regularly and, as a
 result, contain fewer working packages. The corresponding package set for GHC
-9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias
-for `haskell.packages.ghc964`:
+9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias
+for `haskell.packages.ghc966`:
 
 Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`.
 

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
@@ -55,7 +55,7 @@ let
     "wasm64-wasi" "wasm32-wasi"
 
     # Windows
-    "x86_64-windows" "i686-windows"
+    "aarch64-windows" "x86_64-windows" "i686-windows"
   ];
 
   allParsed = map parse.mkSystemFromString all;

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
@@ -325,6 +325,13 @@ rec {
     libc = "ucrt"; # This distinguishes the mingw (non posix) toolchain
   };
 
+  # LLVM-based mingw-w64 for ARM
+  ucrtAarch64 = {
+    config = "aarch64-w64-mingw32";
+    libc = "ucrt";
+    useLLVM = true;
+  };
+
   # BSDs
 
   x86_64-freebsd = {

diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
@@ -60,7 +60,7 @@ lib.runTests (
   testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" ];
   testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
   testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
-  testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
+  testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "aarch64-windows" "i686-windows" "x86_64-windows" ];
   testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox);
 })
 

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -8297,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]";
@@ -11298,6 +11305,12 @@
     github = "keenanweaver";
     githubId = 37268985;
   };
+  kekschen = {
+    email = "[email protected]";
+    github = "kek5chen";
+    githubId = 52585984;
+    name = "Kek5chen";
+  };
   keksgesicht = {
     name = "Jan Braun";
     email = "[email protected]";

diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.section.md b/nixos/doc/manual/installation/installing-virtualbox-guest.section.md
@@ -1,10 +1,8 @@
 # Installing in a VirtualBox guest {#sec-installing-virtualbox-guest}
 
 Installing NixOS into a VirtualBox guest is convenient for users who
-want to try NixOS without installing it on bare metal. If you want to
-use a pre-made VirtualBox appliance, it is available at [the downloads
-page](https://nixos.org/download/#nixos-virtualbox). If you want to set
-up a VirtualBox guest manually, follow these instructions:
+want to try NixOS without installing it on bare metal. If you want to set
+up a VirtualBox guest, follow these instructions:
 
 1.  Add a New Machine in VirtualBox with OS Type "Linux / Other Linux"
 

diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix
@@ -52,7 +52,7 @@ let
   dbUser = if repoSettings.username != null then repoSettings.username else "mobilizon";
 
   postgresql = config.services.postgresql.package;
-  postgresqlSocketDir = "/var/run/postgresql";
+  postgresqlSocketDir = "/run/postgresql";
 
   secretEnvFile = "/var/lib/mobilizon/secret-env.sh";
 in

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
@@ -53,7 +53,6 @@ in rec {
         (onFullSupported "nixos.iso_plasma6")
         (onFullSupported "nixos.iso_gnome")
         (onFullSupported "nixos.manual")
-        (onSystems ["x86_64-linux"] "nixos.ova")
         (onSystems ["aarch64-linux"] "nixos.sd_image")
         (onFullSupported "nixos.tests.acme")
         (onSystems ["x86_64-linux"] "nixos.tests.boot.biosCdrom")

diff --git a/nixos/release.nix b/nixos/release.nix
@@ -230,21 +230,6 @@ in rec {
     inherit system;
   });
 
-  # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
-  ova = forMatchingSystems [ "x86_64-linux" ] (system:
-
-    with import ./.. { inherit system; };
-
-    hydraJob ((import lib/eval-config.nix {
-      inherit system;
-      modules =
-        [ versionModule
-          ./modules/installer/virtualbox-demo.nix
-        ];
-    }).config.system.build.virtualBoxOVA)
-
-  );
-
   # KVM image for proxmox in VMA format
   proxmoxImage = forMatchingSystems [ "x86_64-linux" ] (system:
     with import ./.. { inherit system; };

diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
@@ -0,0 +1,28 @@
+# To use this for hacking of your Yi config file, drop into a shell
+# with env attribute.
+{
+  lib,
+  stdenv,
+  makeWrapper,
+  haskellPackages,
+  extraPackages ? (s: [ ]),
+}:
+let
+  yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self);
+in
+stdenv.mkDerivation {
+  pname = "yi-custom";
+  dontUnpack = true;
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    makeWrapper ${haskellPackages.yi}/bin/yi $out/bin/yi \
+      --set NIX_GHC ${yiEnv}/bin/ghc
+  '';
+
+  # For hacking purposes
+  passthru.env = yiEnv;
+
+  inherit (haskellPackages.yi) meta version;
+}