Merge branch staging-next into haskell-updates

Author: sternenseemann

doc/build-helpers/fetchers.chapter.md

@@ -1003,3 +1003,27 @@ fetchtorrent {
 
 - `config`: When using `transmission` as the `backend`, a json configuration can
   be supplied to transmission. Refer to the [upstream documentation](https://github.com/transmission/transmission/blob/main/docs/Editing-Configuration-Files.md) for information on how to configure.
+
+## `fetchItchIo` {#fetchitchio}
+
+`fetchItchIo` is a fetcher for downloading game assets from [itch.io](https://itch.io/). It accepts these arguments:
+
+- `gameUrl`: The store page URL of the game.
+- `upload`: The numerical ID of the asset to download. To find the upload ID of an asset, check the basename of the request URL when you download the asset using a browser.
+- `hash`.
+- `name` (optional): The derivation name, often the filename of the asset.
+- `extraMessage` (optional): Extra message printed if the API key is not provided or if the account did not purchase the game.
+
+For this fetcher to work, the environment variable `NIX_ITCHIO_API_KEY` must be set for the nix building process (which is nix-daemon in multi-user mode), and it must belong to an account that has bought the game if it is behind a paywall.
+To get your API key, go to the ["API key" section](https://itch.io/user/settings/api-keys) of your account settings on itch.io.
+
+```nix
+{ fetchItchIo }:
+
+fetchItchIo {
+  name = "DungeonDuelMonsters-linux-x64.zip";
+  hash = "sha256-gq2nGwpaStqaVI1pL63xygxOI/z53o+zLwiKizG98Ks=";
+  gameUrl = "https://mikaygo.itch.io/ddm";
+  upload = "13371354";
+}
+```

doc/redirects.json

@@ -1818,6 +1818,9 @@
   "fetchtorrent-parameters": [
     "index.html#fetchtorrent-parameters"
   ],
+  "fetchitchio": [
+    "index.html#fetchitchio"
+  ],
   "chap-trivial-builders": [
     "index.html#chap-trivial-builders"
   ],

lib/licenses.nix

@@ -1416,7 +1416,7 @@ lib.mapAttrs mkLicense (
 
     tsl = {
       shortName = "TSL";
-      fullName = "Timescale License Agreegment";
+      fullName = "Timescale License Agreement";
       url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE";
       free = false;
     };

maintainers/maintainer-list.nix

@@ -5799,12 +5799,6 @@
     name = "Daniil Berendeev";
     keys = [ { fingerprint = "60D7 0EE0 3BD4 A415 B255  1938 6556 0668 006B 4906"; } ];
   };
-  danbst = {
-    email = "abcz2.uprola@gmail.com";
-    github = "danbst";
-    githubId = 743057;
-    name = "Danylo Hlynskyi";
-  };
   danbulant = {
     name = "Daniel Bulant";
     email = "danbulant@gmail.com";
@@ -25294,6 +25288,11 @@
     githubId = 20484159;
     keys = [ { fingerprint = "F246 425A 7650 6F37 0552  BA8D DEA9 C405 09D9 65F5"; } ];
   };
+  squishykid = {
+    github = "squishykid";
+    githubId = 2177912;
+    name = "squishykid";
+  };
   srgom = {
     github = "SRGOM";
     githubId = 8103619;

nixos/modules/hardware/all-firmware.nix

@@ -73,7 +73,7 @@ in
         with pkgs;
         [
           linux-firmware
-          intel2200BGFirmware
+          ipw2200-firmware
           rtl8192su-firmware
           rt5677-firmware
           rtl8761b-firmware

nixos/modules/hardware/network/intel-2200bg.nix

@@ -27,7 +27,7 @@
 
   config = lib.mkIf config.networking.enableIntel2200BGFirmware {
 
-    hardware.firmware = [ pkgs.intel2200BGFirmware ];
+    hardware.firmware = [ pkgs.ipw2200-firmware ];
 
   };
 

nixos/modules/module-list.nix

@@ -1724,6 +1724,7 @@
   ./services/web-apps/peertube.nix
   ./services/web-apps/pgpkeyserver-lite.nix
   ./services/web-apps/photoprism.nix
+  ./services/web-apps/photoview.nix
   ./services/web-apps/phylactery.nix
   ./services/web-apps/pict-rs.nix
   ./services/web-apps/pihole-web.nix

nixos/modules/services/audio/spotifyd.nix

@@ -23,6 +23,8 @@ in
     services.spotifyd = {
       enable = lib.mkEnableOption "spotifyd, a Spotify playing daemon";
 
+      package = lib.mkPackageOption pkgs "spotifyd" { };
+
       config = lib.mkOption {
         default = "";
         type = lib.types.lines;
@@ -43,6 +45,7 @@ in
           <https://docs.spotifyd.rs/configuration/index.html#config-file>.
         '';
       };
+
     };
   };
 
@@ -64,7 +67,7 @@ in
       description = "spotifyd, a Spotify playing daemon";
       environment.SHELL = "/bin/sh";
       serviceConfig = {
-        ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
+        ExecStart = "${cfg.package}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}";
         Restart = "always";
         RestartSec = 12;
         DynamicUser = true;

nixos/modules/services/desktop-managers/plasma6.nix

@@ -168,6 +168,7 @@ in
           ffmpegthumbs
           krdp
           kconfig # required for xdg-terminal from xdg-utils
+          qtbase # for qtpaths which is required for xdg-mime from xdg-utils
         ]
         ++ lib.optionals config.hardware.sensor.iio.enable [
           # This is required for autorotation in Plasma 6

nixos/modules/services/misc/atuin.nix

@@ -104,7 +104,7 @@ in
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} server start";
+        ExecStart = "${lib.getExe' cfg.package "atuin-server"} start";
         RuntimeDirectory = "atuin";
         RuntimeDirectoryMode = "0700";
         DynamicUser = true;