disable grocy on metis

Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@gmail.com>

flake.lock

@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759163198,
+        "lastModified": 1790351001,
-        "narHash": "sha256-+iEF1sJaJtDXhzQcPG9IL9we7W0hfuG3lmqKIjxRVqA=",
+        "narHash": "sha256-yI8V3XX8vVVyMx7+yp4MEn/AWP9E14AaIklVXJAEVNE=",
         "owner": "nix-community",
         "repo": "comma",
-        "rev": "0ba771882bb07a769c04de4e2a9209e811eabab9",
+        "rev": "e73b22dc00d74adfed9ac534867caaa40563a065",
         "type": "github"
       },
       "original": {
@@ -42,6 +42,21 @@
         "type": "github"
       }
     },
+    "dried-nix-flakes": {
+      "locked": {
+        "lastModified": 1756139350,
+        "narHash": "sha256-pObQv94NclXVXjJV8sTiKwFes4fGEWpkNzDsXw5DqnY=",
+        "owner": "cyberus-technology",
+        "repo": "dried-nix-flakes",
+        "rev": "1b2ba62710c6c1d9eba0e8e3adc029cc2e9291a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cyberus-technology",
+        "repo": "dried-nix-flakes",
+        "type": "github"
+      }
+    },
     "emacs-overlay": {
       "inputs": {
         "nixpkgs": [
@@ -50,11 +65,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1761150419,
+        "lastModified": 1792763954,
-        "narHash": "sha256-oiXbhsUQ9Dd4zu1MTNQW7dq6kodiCPli0LtbXaSyFPY=",
+        "narHash": "sha256-CpL4HvFgJdmMCNZki2A9MDGKh6V0QVKe1aFmQGqol7M=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "d25fc7e60a935d562b5b0dac8c79554a5eed9d67",
+        "rev": "46e212732a78ac53e0b9792c457dee9e3a15fe91",
         "type": "github"
       },
       "original": {
@@ -89,11 +104,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
+        "lastModified": 1767039857,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
@@ -141,11 +156,11 @@
         "flake-utils": "flake-utils"
       },
       "locked": {
-        "lastModified": 1738591040,
+        "lastModified": 1779563444,
-        "narHash": "sha256-4WNeriUToshQ/L5J+dTSWC5OJIwT39SEP7V7oylndi8=",
+        "narHash": "sha256-+rEagECcF6BhWfLs8VCkPqsBuxxSSIRxMlgjXj6G8UQ=",
         "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
-        "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1",
+        "rev": "a00f6f51907b5c74d2fde086b10b19d446d15717",
         "type": "github"
       },
       "original": {
@@ -237,19 +252,17 @@
     },
     "glpi-inventory": {
       "inputs": {
+        "dried-nix-flakes": "dried-nix-flakes",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": [
-          "flake-utils-plus"
         ]
       },
       "locked": {
-        "lastModified": 1748281236,
+        "lastModified": 1779975055,
-        "narHash": "sha256-t8/FElqfjCJy0spewRK0IjC+Y+K6bkprMjpA6Uy2Nws=",
+        "narHash": "sha256-xQbn3lL8xj25wRXswN0c4CnIk88rEV/wjP3YKnP6GN0=",
         "owner": "mmarx",
         "repo": "glpi-inventory",
-        "rev": "23c74136a320804c3f737219cf3522b3ebb4b4cf",
+        "rev": "24b5ced6766fa6d712cb5b07c3a7fd580745a850",
         "type": "github"
       },
       "original": {
@@ -265,11 +278,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
+        "lastModified": 1763992789,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3",
         "type": "github"
       },
       "original": {
@@ -282,11 +295,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1753306924,
+        "lastModified": 1777914952,
-        "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=",
+        "narHash": "sha256-H94I3Z9PgI0utJ56Ma+DLNPNjVyKfIrOBLYDQkw+zUU=",
-        "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77",
+        "rev": "c2dbb0f5bfffa2562ae9f84040e5bb3503c6b011",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c2dbb0f5bfffa2562ae9f84040e5bb3503c6b011.tar.gz?rev=c2dbb0f5bfffa2562ae9f84040e5bb3503c6b011"
       },
       "original": {
         "type": "tarball",
@@ -303,11 +316,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756125859,
+        "lastModified": 1778183118,
-        "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=",
+        "narHash": "sha256-fWYOWhACIzdj8YC4pG9yjaH1B4kjKT/RdH7lxwTr9MQ=",
-        "rev": "d3292125035b04df00d01549a26e948631fabe1e",
+        "rev": "573e44683c02018534d1d9c281518d62db9efa67",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d3292125035b04df00d01549a26e948631fabe1e.tar.gz?rev=d3292125035b04df00d01549a26e948631fabe1e"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/573e44683c02018534d1d9c281518d62db9efa67.tar.gz?rev=573e44683c02018534d1d9c281518d62db9efa67"
       },
       "original": {
         "type": "tarball",
@@ -323,11 +336,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752689277,
+        "lastModified": 1782220280,
-        "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=",
+        "narHash": "sha256-thLTFbp9D5Qknmh8q/v4FRpLGphUSijT3E86cbLYTXo=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "0e72363d0938b0208d6c646d10649164c43f4d64",
+        "rev": "9aa07bb0256d300219b30622d2454e85f7f3667e",
         "type": "github"
       },
       "original": {
@@ -338,12 +351,15 @@
       }
     },
     "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
       "locked": {
-        "lastModified": 1760958188,
+        "lastModified": 1792697326,
-        "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
+        "narHash": "sha256-2UBK0jdmPANGaeAIoVOZY+hSPB2Gy13ZuZeSxP3vF8k=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
+        "rev": "1b418b8f203e49a92f250f8babdd19af1b6f7a7f",
         "type": "github"
       },
       "original": {
@@ -355,18 +371,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761016216,
+        "lastModified": 1789546076,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+        "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=",
-        "owner": "NixOS",
+        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
-        "repo": "nixpkgs",
+        "type": "tarball",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz"
-        "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "type": "tarball",
-        "ref": "nixos-25.05",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-        "repo": "nixpkgs",
-        "type": "github"
       }
     },
     "nixpkgs-25_05": {
@@ -387,27 +400,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1760862643,
+        "lastModified": 1792615934,
-        "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
+        "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
+        "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1760878510,
+        "lastModified": 1792502884,
-        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
+        "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
+        "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe",
         "type": "github"
       },
       "original": {
@@ -417,6 +430,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1767313136,
+        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "comma": "comma",
@@ -426,7 +455,7 @@
         "home-manager": "home-manager",
         "lix-module": "lix-module",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "sops-nix": "sops-nix"
@@ -460,11 +489,11 @@
         "nixpkgs-25_05": "nixpkgs-25_05"
       },
       "locked": {
-        "lastModified": 1755110674,
+        "lastModified": 1763302796,
-        "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=",
+        "narHash": "sha256-mEc3SBjRYfMcbNFLxmCc5tRtlu3j+1q7zRz+nRraSFE=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "f5936247dbdb8501221978562ab0b302dd75456c",
+        "rev": "5b38fb599f50e9d78325d1d2706e36303c166047",
         "type": "gitlab"
       },
       "original": {
@@ -481,11 +510,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760998189,
+        "lastModified": 1792655475,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "narHash": "sha256-4ChDjNgJM5uKwTuecLHxGlafAtoyKo5a7ip23J5IG3M=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "rev": "e80b8b733d8452a751a25d0063abc9683b6c8185",
         "type": "github"
       },
       "original": {

flake.nix

@@ -36,7 +36,7 @@
     };
 
     sops-nix = {
-      url = "github:Mic92/sops-nix/master";
+      url = "github:Mic92/sops-nix/5a7d18b5c55642df5c432aadb757140edfeb70b3";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -103,6 +103,7 @@
       channels.nixpkgs.overlaysBuilder = channels:
         [
           (final: prev: {unstable = channels.nixpkgs-unstable;})
+	  inputs.self.outputs.overlays.php-security-fix
           (flake-utils-plus.lib.genPkgOverlay inputs.comma "comma")
           #inputs.nix.overlay
           inputs.emacs-overlay.overlay
@@ -159,6 +160,34 @@
         emacs-overlay = inputs.emacs-overlay.overlay;
         flake-utils-plus = genPkgOverlay inputs.flake-utils-plus "fup-repl";
         glpi-inventory = inputs.glpi-inventory.overlays.default;
+        php-security-fix = final: prev: let
+          lib = prev.lib;
+
+          patchPhp = php: version: sha256:
+            (php.override {
+              packageOverrides = pfinal: pprev: {
+                extensions = pprev.extensions // (lib.mapAttrs
+                  (name: ext:
+                    if lib.isDerivation ext
+                    then ext.overrideAttrs (_: { doCheck = false; })
+                    else ext)
+                  pprev.extensions);
+              };
+            }).overrideAttrs (old: {
+              inherit version;
+              doCheck = false;
+              src = prev.fetchurl {
+                url = "https://www.php.net/distributions/php-${version}.tar.xz";
+                inherit sha256;
+              };
+            });
+        in {
+          php83 = patchPhp prev.php83 "8.3.36"
+            "1zcj2qxkmjc9aw81sv4al583fiy2haq9dvls5vbw9i9llcx6jm6x";
+          php84 = patchPhp prev.php84 "8.4.4"
+            "1b41jr2v7ncdcjn6zjq21ig6v20inchv5jlyf6zdhkc9rjick9h5";
+          php = final.php83;
+        };
       };
 
       outputsBuilder = channels: {

machines/metis/default.nix

@@ -42,6 +42,7 @@
       enable = true;
       acme.staging = false;
       wordpress.enable = false;
+      grocy.enable = false;
     };
 
     # enable wireguard

packages/emacs/default.nix

@@ -87,7 +87,7 @@ with lib; let
         diminish
         direnv
         dockerfile-mode
-        docker-compose-mode
+        #docker-compose-mode
         flycheck
         free-keys
         haskell-mode
@@ -101,7 +101,7 @@ with lib; let
         helm-projectile
         helm-rg
         json-mode
-        less-css-mode
+        #less-css-mode
         lsp-haskell
         lsp-mode
         lsp-ui
@@ -140,4 +140,3 @@ in
 #    url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
 #  }))
 #];
-