nix: remove upstreamed patch

Flake lock file updates:

• Updated input 'nixos':
    'github:SuperSandro2000/nixpkgs/31f8ea978d06f0c1a5cd82de2412c6437b7f90a0' (2023-12-08)
  → 'github:SuperSandro2000/nixpkgs/b8d59831723cbfbcdaf4a6ef83e3134c40d3325a' (2023-12-09)

flake.lock

@@ -362,11 +362,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1702032371,
-        "narHash": "sha256-sEy8dPGumK2QU5hpx7wJ/49LGuszB3VSgQqGSu7IW3c=",
+        "lastModified": 1702154542,
+        "narHash": "sha256-2tCm7wJg8ihQTPI/QxONcHk9yhsM+od+yqwihllWz4o=",
         "owner": "SuperSandro2000",
         "repo": "nixpkgs",
-        "rev": "31f8ea978d06f0c1a5cd82de2412c6437b7f90a0",
+        "rev": "b8d59831723cbfbcdaf4a6ef83e3134c40d3325a",
         "type": "github"
       },
       "original": {

hosts/broker/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   mymqttui = pkgs.writeScriptBin "mqttui" ''
@@ -132,11 +132,11 @@ in
     };
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = [
     mymqttui
   ];
 
-  users.motdFile = ./motd;
+  users.motdFile = lib.mkForce ./motd;
 
   system.stateVersion = "22.05";
 }

hosts/home-assistant/default.nix

@@ -87,11 +87,13 @@ in
         };
       };
       extraComponents = [
-        # extra things we use
+        "esphome"
+        "met"
+        "radio_browser"
         "wled"
       ];
       ldap.enable = true;
-      package = (pkgs.home-assistant.override {
+      package = pkgs.home-assistant.override {
         # those tests take a long(er) time and can't be sped up with pytest-xdist
         packageOverrides = _: prev: let
           noTests.doCheck = false;
@@ -99,7 +101,7 @@ in
           aws-sam-translator = prev.aws-sam-translator.overridePythonAttrs (_: noTests);
           moto = prev.moto.overridePythonAttrs (_: noTests);
         };
-      });
+      };
     };
 
     nginx = {

hosts/matrix/default.nix

@@ -9,11 +9,9 @@
 
   networking.hostName = "matrix";
 
-  #
   nixpkgs.overlays = [
     (final: prev: {
-      # NOTE: using config.services.matrix-synapse.package does not work because it does not override the matrix-synapse used in matrix-synapse.plugins.matrix-synapse-ldap3
-      matrix-synapse = prev.matrix-synapse.overridePythonAttrs (_: {
+      matrix-synapse = prev.matrix-synapse.overrideAttrs (_: {
         # fail and take a good amount of time
         doCheck = false;
       });

hosts/mediawiki/default.nix

@@ -91,6 +91,9 @@ in
 
         $wgFavicon = "https://c3d2.de/favicon.ico";
         $wgLogos = [
+          '1x' => "https://www.c3d2.de/images/ck.png",
+          '1.5x' => "https://www.c3d2.de/images/ck.png",
+          '2x' => "https://www.c3d2.de/images/ck.png",
           'icon' => "https://www.c3d2.de/images/ck.png",
         ];
         $wgEmergencyContact = "wiki@c3d2.de";

overlays/default.nix

@@ -79,19 +79,6 @@ with final; {
 
   mlat-client = python3Packages.callPackage ./mlat-client.nix { };
 
-  nixVersions = prev.nixVersions // {
-    stable = (prev.nixVersions.stable.override { withAWS = false; }).overrideAttrs ({ patches ? [ ], ...}: {
-      patches = patches ++ [
-        # request compression
-        # TODO: drop with 23.11
-        (fetchpatch {
-          url = "https://github.com/NixOS/nix/pull/7712.patch";
-          sha256 = "sha256-mAx2h0/r7HayvTjMMxmewaD+L4OOB2gRJaQb3JEb0rk=";
-        })
-      ];
-    });
-  };
-
   openssh = prev.openssh.overrideAttrs (_: {
     # takes 30 minutes
     doCheck = false;