Rename php forward-ports to ports

diff --git a/deploy/flake.lock b/deploy/flake.lock
index afa2ec54b6b2c9f4a264d53f6b285d6844eeddbf..388971696dbd87e6e191a7fc34ce173965a6ce4b 100644 (file)
--- a/deploy/flake.lock
+++ b/deploy/flake.lock
@@ -2798,7 +2798,7 @@
         "s-private-openldap": "s-private-openldap",
         "s-private-paste": "s-private-paste",
         "s-private-peertube": "s-private-peertube",
-        "s-private-php": "s-private-php",
+        "s-private-ports": "s-private-ports",
         "s-private-ssh": "s-private-ssh",
         "s-private-system": "s-private-system",
         "s-rsync_backup": "s-rsync_backup",
@@ -2811,7 +2811,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LBw8FCxHXW6b1WFvsEnmLmNpZjow6+N4Q+3zAfcudIU=",
+        "narHash": "sha256-cDb2U1QUwzcphvzJo9ZnmKu6z65RwbZ0i2kbI03TDHc=",
         "path": "../flakes",
         "type": "path"
       },
@@ -3908,7 +3908,7 @@
         "private-openldap": "private-openldap",
         "private-paste": "private-paste",
         "private-peertube": "private-peertube",
-        "private-php": "private-php",
+        "private-ports": "private-ports",
         "private-ssh": "private-ssh",
         "private-system": "private-system",
         "public-copanier": "public-copanier",
@@ -3932,7 +3932,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-g9f3SCavl9ssNr8Xw9Z8KkpeEwCYv+47dqwoIPneMSs=",
+        "narHash": "sha256-NF9G+Esbe6vLYivkpuYU0qfsA6zHtnVcr/qUttYY8t4=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3952,13 +3952,13 @@
         "my-lib": "my-lib_4",
         "myuids": "myuids_23",
         "nixpkgs": "nixpkgs_55",
-        "php": "php",
+        "ports": "ports",
         "secrets": "secrets_17",
         "system": "system_3"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-kLIVhZAxEWcN3W1AaF/gmopYuRdq0U43jkA4hliY50I=",
+        "narHash": "sha256-kGiAFiEq880Rccq6xXOICbBBH7z2eIj7yp59nKlkvXk=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3977,13 +3977,13 @@
         "my-lib": "my-lib_5",
         "myuids": "myuids_26",
         "nixpkgs": "nixpkgs_63",
-        "php": "php_2",
+        "ports": "ports_2",
         "secrets": "secrets_19",
         "system": "system_4"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-FtjFgqcSXs0dTkbUggbPwaDeCoOoYZragHCUkcyq538=",
+        "narHash": "sha256-7DdYPYmehN/m/WfHoklW+b/jOYLG3Rr44tqM8RmAlJ4=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -7499,7 +7499,7 @@
         "type": "path"
       }
     },
-    "php": {
+    "ports": {
       "inputs": {
         "flake-utils": "flake-utils_33",
         "nixpkgs": "nixpkgs_56",
@@ -7507,16 +7507,16 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
-    "php_2": {
+    "ports_2": {
       "inputs": {
         "flake-utils": "flake-utils_36",
         "nixpkgs": "nixpkgs_64",
@@ -7524,12 +7524,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -7704,7 +7704,7 @@
         "type": "path"
       }
     },
-    "private-php": {
+    "private-ports": {
       "inputs": {
         "flake-utils": "flake-utils_19",
         "nixpkgs": "nixpkgs_33",
@@ -7712,12 +7712,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -8574,7 +8574,7 @@
         "type": "path"
       }
     },
-    "s-private-php": {
+    "s-private-ports": {
       "inputs": {
         "flake-utils": "flake-utils_60",
         "nixpkgs": "nixpkgs_100",
@@ -8582,12 +8582,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "./private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "./private/ports",
         "type": "path"
       },
       "original": {
-        "path": "./private/php",
+        "path": "./private/ports",
         "type": "path"
       }
     },
@@ -8990,11 +8990,11 @@
         "nixpkgs": "nixpkgs_107"
       },
       "locked": {
-        "lastModified": 1696144631,
-        "narHash": "sha256-zV7tbNrrrUpPkaATkc6OsQC8n75QybaBKsaD7d5kQGA=",
+        "lastModified": 1696378030,
+        "narHash": "sha256-P86mzoiD2yFQc/TYuaTn/ceT2RG5JNgm9UXbynGj+0Y=",
         "ref": "master",
-        "rev": "ae51ac0227647e30348256067934b8c9eb7e3f06",
-        "revCount": 688,
+        "rev": "ed67fbe50812c3f768f5adb73364653b0bd22f8d",
+        "revCount": 694,
         "type": "git",
         "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets"
       },

diff --git a/flake.lock b/flake.lock
index b109986db9042d491aaa2792b58c97a737f3a561..058b0106f734cc299946f39b39f427151f06a481 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -2681,7 +2681,7 @@
         "s-private-openldap": "s-private-openldap",
         "s-private-paste": "s-private-paste",
         "s-private-peertube": "s-private-peertube",
-        "s-private-php": "s-private-php",
+        "s-private-ports": "s-private-ports",
         "s-private-ssh": "s-private-ssh",
         "s-private-system": "s-private-system",
         "s-rsync_backup": "s-rsync_backup",
@@ -2692,7 +2692,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-LBw8FCxHXW6b1WFvsEnmLmNpZjow6+N4Q+3zAfcudIU=",
+        "narHash": "sha256-cDb2U1QUwzcphvzJo9ZnmKu6z65RwbZ0i2kbI03TDHc=",
         "path": "./flakes",
         "type": "path"
       },
@@ -3924,7 +3924,7 @@
         "private-openldap": "private-openldap",
         "private-paste": "private-paste",
         "private-peertube": "private-peertube",
-        "private-php": "private-php",
+        "private-ports": "private-ports",
         "private-ssh": "private-ssh",
         "private-system": "private-system",
         "public-copanier": "public-copanier",
@@ -3948,7 +3948,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-g9f3SCavl9ssNr8Xw9Z8KkpeEwCYv+47dqwoIPneMSs=",
+        "narHash": "sha256-NF9G+Esbe6vLYivkpuYU0qfsA6zHtnVcr/qUttYY8t4=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3968,13 +3968,13 @@
         "my-lib": "my-lib_4",
         "myuids": "myuids_23",
         "nixpkgs": "nixpkgs_55",
-        "php": "php",
+        "ports": "ports",
         "secrets": "secrets_17",
         "system": "system_3"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-kLIVhZAxEWcN3W1AaF/gmopYuRdq0U43jkA4hliY50I=",
+        "narHash": "sha256-kGiAFiEq880Rccq6xXOICbBBH7z2eIj7yp59nKlkvXk=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3993,13 +3993,13 @@
         "my-lib": "my-lib_5",
         "myuids": "myuids_26",
         "nixpkgs": "nixpkgs_63",
-        "php": "php_2",
+        "ports": "ports_2",
         "secrets": "secrets_19",
         "system": "system_4"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-FtjFgqcSXs0dTkbUggbPwaDeCoOoYZragHCUkcyq538=",
+        "narHash": "sha256-7DdYPYmehN/m/WfHoklW+b/jOYLG3Rr44tqM8RmAlJ4=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -7515,7 +7515,7 @@
         "type": "path"
       }
     },
-    "php": {
+    "ports": {
       "inputs": {
         "flake-utils": "flake-utils_33",
         "nixpkgs": "nixpkgs_56",
@@ -7523,16 +7523,16 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
-    "php_2": {
+    "ports_2": {
       "inputs": {
         "flake-utils": "flake-utils_36",
         "nixpkgs": "nixpkgs_64",
@@ -7540,12 +7540,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -7720,7 +7720,7 @@
         "type": "path"
       }
     },
-    "private-php": {
+    "private-ports": {
       "inputs": {
         "flake-utils": "flake-utils_19",
         "nixpkgs": "nixpkgs_33",
@@ -7728,12 +7728,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -8590,7 +8590,7 @@
         "type": "path"
       }
     },
-    "s-private-php": {
+    "s-private-ports": {
       "inputs": {
         "flake-utils": "flake-utils_60",
         "nixpkgs": "nixpkgs_100",
@@ -8598,12 +8598,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "./private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "./private/ports",
         "type": "path"
       },
       "original": {
-        "path": "./private/php",
+        "path": "./private/ports",
         "type": "path"
       }
     },

diff --git a/flakes/flake.lock b/flakes/flake.lock
index c65312ce4f44232abc64c9708ac50ac64e68f841..4a52d175b999e2f3a560f12762d977dbbb3f9bb4 100644 (file)
--- a/flakes/flake.lock
+++ b/flakes/flake.lock
@@ -3828,7 +3828,7 @@
         "private-openldap": "private-openldap",
         "private-paste": "private-paste",
         "private-peertube": "private-peertube",
-        "private-php": "private-php",
+        "private-ports": "private-ports",
         "private-ssh": "private-ssh",
         "private-system": "private-system",
         "public-copanier": "public-copanier",
@@ -3852,7 +3852,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-g9f3SCavl9ssNr8Xw9Z8KkpeEwCYv+47dqwoIPneMSs=",
+        "narHash": "sha256-NF9G+Esbe6vLYivkpuYU0qfsA6zHtnVcr/qUttYY8t4=",
         "path": "../systems/eldiron",
         "type": "path"
       },
@@ -3872,13 +3872,13 @@
         "my-lib": "my-lib_4",
         "myuids": "myuids_23",
         "nixpkgs": "nixpkgs_54",
-        "php": "php",
+        "ports": "ports",
         "secrets": "secrets_17",
         "system": "system_3"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-kLIVhZAxEWcN3W1AaF/gmopYuRdq0U43jkA4hliY50I=",
+        "narHash": "sha256-kGiAFiEq880Rccq6xXOICbBBH7z2eIj7yp59nKlkvXk=",
         "path": "../systems/monitoring-1",
         "type": "path"
       },
@@ -3897,13 +3897,13 @@
         "my-lib": "my-lib_5",
         "myuids": "myuids_26",
         "nixpkgs": "nixpkgs_62",
-        "php": "php_2",
+        "ports": "ports_2",
         "secrets": "secrets_19",
         "system": "system_4"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-FtjFgqcSXs0dTkbUggbPwaDeCoOoYZragHCUkcyq538=",
+        "narHash": "sha256-7DdYPYmehN/m/WfHoklW+b/jOYLG3Rr44tqM8RmAlJ4=",
         "path": "../systems/quatresaisons",
         "type": "path"
       },
@@ -7341,7 +7341,7 @@
         "type": "path"
       }
     },
-    "php": {
+    "ports": {
       "inputs": {
         "flake-utils": "flake-utils_33",
         "nixpkgs": "nixpkgs_55",
@@ -7349,16 +7349,16 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
-    "php_2": {
+    "ports_2": {
       "inputs": {
         "flake-utils": "flake-utils_36",
         "nixpkgs": "nixpkgs_63",
@@ -7366,12 +7366,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -7546,7 +7546,7 @@
         "type": "path"
       }
     },
-    "private-php": {
+    "private-ports": {
       "inputs": {
         "flake-utils": "flake-utils_19",
         "nixpkgs": "nixpkgs_32",
@@ -7554,12 +7554,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -7955,7 +7955,7 @@
         "s-private-openldap": "s-private-openldap",
         "s-private-paste": "s-private-paste",
         "s-private-peertube": "s-private-peertube",
-        "s-private-php": "s-private-php",
+        "s-private-ports": "s-private-ports",
         "s-private-ssh": "s-private-ssh",
         "s-private-system": "s-private-system",
         "s-rsync_backup": "s-rsync_backup",
@@ -8456,7 +8456,7 @@
         "type": "path"
       }
     },
-    "s-private-php": {
+    "s-private-ports": {
       "inputs": {
         "flake-utils": "flake-utils_60",
         "nixpkgs": "nixpkgs_99",
@@ -8464,12 +8464,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "./private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "./private/ports",
         "type": "path"
       },
       "original": {
-        "path": "./private/php",
+        "path": "./private/ports",
         "type": "path"
       }
     },

diff --git a/flakes/flake.nix b/flakes/flake.nix
index aecff57460b9e8babd04c3cba6746849bc425be4..d996b454d1b90f94f5e19e7db200df0699da4206 100644 (file)
--- a/flakes/flake.nix
+++ b/flakes/flake.nix
@@ -36,7 +36,7 @@
     s-private-openldap.url = "path:./private/openldap";
     s-private-paste.url = "path:./private/paste";
     s-private-peertube.url = "path:./private/peertube";
-    s-private-php.url = "path:./private/php";
+    s-private-ports.url = "path:./private/ports";
     s-private-ssh.url = "path:./private/ssh";
     s-private-system.url = "path:./private/system";
 

diff --git a/flakes/private/php/flake.lock b/flakes/private/ports/flake.lock
similarity index 100%
rename from flakes/private/php/flake.lock
rename to flakes/private/ports/flake.lock

diff --git a/flakes/private/php/flake.nix b/flakes/private/ports/flake.nix
similarity index 93%
rename from flakes/private/php/flake.nix
rename to flakes/private/ports/flake.nix
index a730b6868bc8059977d66d6ee932e99ea2144fec..42aae30bb3e75c4a1f918a3b3e29ec9a2303c5c8 100644 (file)
--- a/flakes/private/php/flake.nix
+++ b/flakes/private/ports/flake.nix
@@ -22,11 +22,10 @@
         python37Packages = (import nixpkgs-4 { inherit system; overlays = []; }).python37Packages;
         telegram-purple = (import nixpkgs-4 { inherit system; overlays = []; }).telegram-purple;
       };
-      defaultPackage = packages.php73;
       legacyPackages = packages;
     }) // rec {
       overlays = {
-        php = final: prev: {
+        ports = final: prev: {
           php72 = self.packages."${final.system}".php72;
           php73 = self.packages."${final.system}".php73;
           php74 = self.packages."${final.system}".php74;
@@ -35,6 +34,6 @@
           telegram-purple = self.packages."${final.system}".telegram-purple;
         };
       };
-      overlay = overlays.php;
+      overlay = overlays.ports;
     };
 }

diff --git a/systems/eldiron/base.nix b/systems/eldiron/base.nix
index 1f894a564d31b19cf096b133fa7c44e6c5c7b418..24e05fe7d3f6b5a21a14e3d518d9f52692a1c9fa 100644 (file)
--- a/systems/eldiron/base.nix
+++ b/systems/eldiron/base.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, php, name, secrets, ... }:
+{ config, pkgs, lib, ports, name, secrets, ... }:
 {
   # ssh-keyscan eldiron | nix-shell -p ssh-to-age --run ssh-to-age
   secrets.ageKeys = [ "age1dxr5lhvtnjssfaqpnf6qx80h8gfwkxg3tdf35m6n9wljmk7wadfs3kmahj" ];
@@ -28,9 +28,7 @@
     "nodejs-16.20.2" # for landing page building
   ];
 
-  nixpkgs.overlays = [
-    php.overlays.php
-  ];
+  nixpkgs.overlays = builtins.attrValues ports.overlays;
   powerManagement.cpuFreqGovernor = "powersave";
 
   security.acme.certs."${name}".postRun = builtins.concatStringsSep "\n" [

diff --git a/systems/eldiron/flake.lock b/systems/eldiron/flake.lock
index 99a5c92b967c61a182fcfde2e2b697fc00815165..661163950e579dee6a3c953fc2d3f1aa9540a4f4 100644 (file)
--- a/systems/eldiron/flake.lock
+++ b/systems/eldiron/flake.lock
@@ -2141,7 +2141,7 @@
         "type": "path"
       }
     },
-    "private-php": {
+    "private-ports": {
       "inputs": {
         "flake-utils": "flake-utils_11",
         "nixpkgs": "nixpkgs_14",
@@ -2149,12 +2149,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -2496,7 +2496,7 @@
         "private-openldap": "private-openldap",
         "private-paste": "private-paste",
         "private-peertube": "private-peertube",
-        "private-php": "private-php",
+        "private-ports": "private-ports",
         "private-ssh": "private-ssh",
         "private-system": "private-system",
         "public-copanier": "public-copanier",

diff --git a/systems/eldiron/flake.nix b/systems/eldiron/flake.nix
index 790b638c6bc4c612403fe89c9a8de9d4c3164d98..c126d0b92d2a06e51a0d64fa3588197ae1f2c076 100644 (file)
--- a/systems/eldiron/flake.nix
+++ b/systems/eldiron/flake.nix
@@ -27,7 +27,7 @@
 
     private-peertube.url = "path:../../flakes/private/peertube";
     private-buildbot.url = "path:../../flakes/private/buildbot";
-    private-php.url = "path:../../flakes/private/php";
+    private-ports.url = "path:../../flakes/private/ports";
     private-environment.url = "path:../../flakes/private/environment";
     private-openarc.url = "path:../../flakes/private/openarc";
     private-openldap.url = "path:../../flakes/private/openldap";
@@ -84,7 +84,7 @@
         openldap = private-openldap;
         monitoring = private-monitoring;
         peertube = private-peertube.packages.x86_64-linux;
-        php = private-php;
+        ports = private-ports;
       };
     };
 }

diff --git a/systems/monitoring-1/base.nix b/systems/monitoring-1/base.nix
index 2d8139e152faa75b4af0603ea1fabfc0e404bce7..6784ef891a2111b262140cab57e1f9c3b254cee1 100644 (file)
--- a/systems/monitoring-1/base.nix
+++ b/systems/monitoring-1/base.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, nixpkgs, php, secrets, ... }:
+{ config, pkgs, lib, nixpkgs, ports, secrets, ... }:
 {
   # ssh-keyscan monitoring-1 | nix-shell -p ssh-to-age --run ssh-to-age
   secrets.ageKeys = [ "age1dn4lzhgxusqrpjjnzm7w8ml39ptf326htuzmpqdqs2gg3wq7cqzqxuvx8k" ];
@@ -13,7 +13,7 @@
     ./status_engine.nix
   ];
 
-  nixpkgs.overlays = builtins.attrValues php.overlays;
+  nixpkgs.overlays = builtins.attrValues ports.overlays;
   nixpkgs.config.permittedInsecurePackages = [
     "python-2.7.18.6" # for nagios-cli
   ];

diff --git a/systems/monitoring-1/flake.lock b/systems/monitoring-1/flake.lock
index d4a2c8d3a559de33d890704c1793210e798e5ca9..84d51bc0c79ae15e86362b59e185dbe5457e3904 100644 (file)
--- a/systems/monitoring-1/flake.lock
+++ b/systems/monitoring-1/flake.lock
@@ -628,7 +628,7 @@
         "type": "github"
       }
     },
-    "php": {
+    "ports": {
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_6",
@@ -636,12 +636,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -656,7 +656,7 @@
         "my-lib": "my-lib",
         "myuids": "myuids",
         "nixpkgs": "nixpkgs_5",
-        "php": "php",
+        "ports": "ports",
         "secrets": "secrets_3",
         "system": "system"
       }

diff --git a/systems/monitoring-1/flake.nix b/systems/monitoring-1/flake.nix
index e97cb053f8ba87084031d274d685275fd3abf355..18330532eed1b00506c98dd99813286560edf39f 100644 (file)
--- a/systems/monitoring-1/flake.nix
+++ b/systems/monitoring-1/flake.nix
@@ -9,7 +9,7 @@
     chatons.url = "path:../../flakes/private/chatons";
     environment.url = "path:../../flakes/private/environment";
     system.url = "path:../../flakes/private/system";
-    php.url = "path:../../flakes/private/php";
+    ports.url = "path:../../flakes/private/ports";
 
     myuids.url = "path:../../flakes/myuids";
     secrets.url = "path:../../flakes/secrets";
@@ -39,7 +39,7 @@
       moduleArgs = {
         nixpkgs = inputs.nixpkgs;
         monitoring = inputs.monitoring;
-        php = inputs.php;
+        ports = inputs.ports;
       };
     };
 }

diff --git a/systems/quatresaisons/flake.lock b/systems/quatresaisons/flake.lock
index 6f2ccca5e6be55b2b690b4fa20185245b44d9259..15c4f56e80e5ac65cc2f4f9bc24b099e616f50bc 100644 (file)
--- a/systems/quatresaisons/flake.lock
+++ b/systems/quatresaisons/flake.lock
@@ -618,7 +618,7 @@
         "type": "github"
       }
     },
-    "php": {
+    "ports": {
       "inputs": {
         "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_6",
@@ -626,12 +626,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=",
-        "path": "../../flakes/private/php",
+        "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
+        "path": "../../flakes/private/ports",
         "type": "path"
       },
       "original": {
-        "path": "../../flakes/private/php",
+        "path": "../../flakes/private/ports",
         "type": "path"
       }
     },
@@ -645,7 +645,7 @@
         "my-lib": "my-lib",
         "myuids": "myuids_2",
         "nixpkgs": "nixpkgs_5",
-        "php": "php",
+        "ports": "ports",
         "secrets": "secrets_2",
         "system": "system"
       }

diff --git a/systems/quatresaisons/flake.nix b/systems/quatresaisons/flake.nix
index 8b269f61bad38dd6bb47c25706d8824a4b8d7b3c..a0e8ff7bd44f6b624d44dfe807ea11e44ea2cdb9 100644 (file)
--- a/systems/quatresaisons/flake.nix
+++ b/systems/quatresaisons/flake.nix
@@ -6,7 +6,7 @@
 
     monitoring.url = "path:../../flakes/private/monitoring";
     environment.url = "path:../../flakes/private/environment";
-    php.url = "path:../../flakes/private/php";
+    ports.url = "path:../../flakes/private/ports";
     system.url = "path:../../flakes/private/system";
 
     myuids.url = "path:../../flakes/myuids";
@@ -41,7 +41,7 @@
       };
       moduleArgs = {
         monitoring = inputs.monitoring;
-        php = inputs.php;
+        ports = inputs.ports;
         landing-page = inputs.landing-page;
         pkgs-no-overlay = inputs.nixpkgs.legacyPackages.x86_64-linux;
       };