From b48bbe83febd6a457fef9b43f270e3bd0191f21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 02:09:38 +0200 Subject: Rename php forward-ports to ports --- deploy/flake.lock | 56 ++++++++++++++++++------------------ flake.lock | 48 +++++++++++++++---------------- flakes/flake.lock | 46 ++++++++++++++--------------- flakes/flake.nix | 2 +- flakes/private/php/flake.lock | 62 ---------------------------------------- flakes/private/php/flake.nix | 40 -------------------------- flakes/private/ports/flake.lock | 62 ++++++++++++++++++++++++++++++++++++++++ flakes/private/ports/flake.nix | 39 +++++++++++++++++++++++++ systems/eldiron/base.nix | 6 ++-- systems/eldiron/flake.lock | 10 +++---- systems/eldiron/flake.nix | 4 +-- systems/monitoring-1/base.nix | 4 +-- systems/monitoring-1/flake.lock | 10 +++---- systems/monitoring-1/flake.nix | 4 +-- systems/quatresaisons/flake.lock | 10 +++---- systems/quatresaisons/flake.nix | 4 +-- 16 files changed, 202 insertions(+), 205 deletions(-) delete mode 100644 flakes/private/php/flake.lock delete mode 100644 flakes/private/php/flake.nix create mode 100644 flakes/private/ports/flake.lock create mode 100644 flakes/private/ports/flake.nix diff --git a/deploy/flake.lock b/deploy/flake.lock index afa2ec5..3889716 100644 --- 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 b109986..058b010 100644 --- 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 c65312c..4a52d17 100644 --- 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 aecff57..d996b45 100644 --- 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/php/flake.lock deleted file mode 100644 index c9af933..0000000 --- a/flakes/private/php/flake.lock +++ /dev/null @@ -1,62 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "flake": false, - "locked": { - "lastModified": 1596265691, - "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", - "type": "github" - } - }, - "nixpkgs-4": { - "flake": false, - "locked": { - "lastModified": 1646497237, - "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "nixpkgs-4": "nixpkgs-4" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flakes/private/php/flake.nix b/flakes/private/php/flake.nix deleted file mode 100644 index a730b68..0000000 --- a/flakes/private/php/flake.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - description = "Php old versions"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nixpkgs = { - url = "github:NixOS/nixpkgs/840c782d507d60aaa49aa9e3f6d0b0e780912742"; - flake = false; - }; - inputs.nixpkgs-4 = { - url = "github:NixOS/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026"; - flake = false; - }; - outputs = { self, nixpkgs, nixpkgs-4, flake-utils }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: - let - pkgs = import nixpkgs { inherit system; overlays = []; }; - in rec { - packages = { - php72 = pkgs.php72; - php73 = pkgs.php73; - php74 = (import nixpkgs-4 { inherit system; overlays = []; }).php74; - cryptpad = (import nixpkgs-4 { inherit system; overlays = []; }).cryptpad; - python37 = (import nixpkgs-4 { inherit system; overlays = []; }).python37; - 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: { - php72 = self.packages."${final.system}".php72; - php73 = self.packages."${final.system}".php73; - php74 = self.packages."${final.system}".php74; - cryptpad = self.packages."${final.system}".cryptpad; - python37 = self.packages."${final.system}".python37; - telegram-purple = self.packages."${final.system}".telegram-purple; - }; - }; - overlay = overlays.php; - }; -} diff --git a/flakes/private/ports/flake.lock b/flakes/private/ports/flake.lock new file mode 100644 index 0000000..c9af933 --- /dev/null +++ b/flakes/private/ports/flake.lock @@ -0,0 +1,62 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs-4": { + "flake": false, + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "nixpkgs-4": "nixpkgs-4" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flakes/private/ports/flake.nix b/flakes/private/ports/flake.nix new file mode 100644 index 0000000..42aae30 --- /dev/null +++ b/flakes/private/ports/flake.nix @@ -0,0 +1,39 @@ +{ + description = "Php old versions"; + inputs.flake-utils.url = "github:numtide/flake-utils"; + inputs.nixpkgs = { + url = "github:NixOS/nixpkgs/840c782d507d60aaa49aa9e3f6d0b0e780912742"; + flake = false; + }; + inputs.nixpkgs-4 = { + url = "github:NixOS/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026"; + flake = false; + }; + outputs = { self, nixpkgs, nixpkgs-4, flake-utils }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: + let + pkgs = import nixpkgs { inherit system; overlays = []; }; + in rec { + packages = { + php72 = pkgs.php72; + php73 = pkgs.php73; + php74 = (import nixpkgs-4 { inherit system; overlays = []; }).php74; + cryptpad = (import nixpkgs-4 { inherit system; overlays = []; }).cryptpad; + python37 = (import nixpkgs-4 { inherit system; overlays = []; }).python37; + python37Packages = (import nixpkgs-4 { inherit system; overlays = []; }).python37Packages; + telegram-purple = (import nixpkgs-4 { inherit system; overlays = []; }).telegram-purple; + }; + legacyPackages = packages; + }) // rec { + overlays = { + ports = final: prev: { + php72 = self.packages."${final.system}".php72; + php73 = self.packages."${final.system}".php73; + php74 = self.packages."${final.system}".php74; + cryptpad = self.packages."${final.system}".cryptpad; + python37 = self.packages."${final.system}".python37; + telegram-purple = self.packages."${final.system}".telegram-purple; + }; + }; + overlay = overlays.ports; + }; +} diff --git a/systems/eldiron/base.nix b/systems/eldiron/base.nix index 1f894a5..24e05fe 100644 --- 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 99a5c92..6611639 100644 --- 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 790b638..c126d0b 100644 --- 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 2d8139e..6784ef8 100644 --- 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 d4a2c8d..84d51bc 100644 --- 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 e97cb05..1833053 100644 --- 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 6f2ccca..15c4f56 100644 --- 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 8b269f6..a0e8ff7 100644 --- 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; }; -- cgit v1.2.3