aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deploy/flake.lock56
-rw-r--r--flake.lock48
-rw-r--r--flakes/flake.lock46
-rw-r--r--flakes/flake.nix2
-rw-r--r--flakes/private/ports/flake.lock (renamed from flakes/private/php/flake.lock)0
-rw-r--r--flakes/private/ports/flake.nix (renamed from flakes/private/php/flake.nix)5
-rw-r--r--systems/eldiron/base.nix6
-rw-r--r--systems/eldiron/flake.lock10
-rw-r--r--systems/eldiron/flake.nix4
-rw-r--r--systems/monitoring-1/base.nix4
-rw-r--r--systems/monitoring-1/flake.lock10
-rw-r--r--systems/monitoring-1/flake.nix4
-rw-r--r--systems/quatresaisons/flake.lock10
-rw-r--r--systems/quatresaisons/flake.nix4
14 files changed, 103 insertions, 106 deletions
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 @@
2798 "s-private-openldap": "s-private-openldap", 2798 "s-private-openldap": "s-private-openldap",
2799 "s-private-paste": "s-private-paste", 2799 "s-private-paste": "s-private-paste",
2800 "s-private-peertube": "s-private-peertube", 2800 "s-private-peertube": "s-private-peertube",
2801 "s-private-php": "s-private-php", 2801 "s-private-ports": "s-private-ports",
2802 "s-private-ssh": "s-private-ssh", 2802 "s-private-ssh": "s-private-ssh",
2803 "s-private-system": "s-private-system", 2803 "s-private-system": "s-private-system",
2804 "s-rsync_backup": "s-rsync_backup", 2804 "s-rsync_backup": "s-rsync_backup",
@@ -2811,7 +2811,7 @@
2811 }, 2811 },
2812 "locked": { 2812 "locked": {
2813 "lastModified": 1, 2813 "lastModified": 1,
2814 "narHash": "sha256-LBw8FCxHXW6b1WFvsEnmLmNpZjow6+N4Q+3zAfcudIU=", 2814 "narHash": "sha256-cDb2U1QUwzcphvzJo9ZnmKu6z65RwbZ0i2kbI03TDHc=",
2815 "path": "../flakes", 2815 "path": "../flakes",
2816 "type": "path" 2816 "type": "path"
2817 }, 2817 },
@@ -3908,7 +3908,7 @@
3908 "private-openldap": "private-openldap", 3908 "private-openldap": "private-openldap",
3909 "private-paste": "private-paste", 3909 "private-paste": "private-paste",
3910 "private-peertube": "private-peertube", 3910 "private-peertube": "private-peertube",
3911 "private-php": "private-php", 3911 "private-ports": "private-ports",
3912 "private-ssh": "private-ssh", 3912 "private-ssh": "private-ssh",
3913 "private-system": "private-system", 3913 "private-system": "private-system",
3914 "public-copanier": "public-copanier", 3914 "public-copanier": "public-copanier",
@@ -3932,7 +3932,7 @@
3932 }, 3932 },
3933 "locked": { 3933 "locked": {
3934 "lastModified": 1, 3934 "lastModified": 1,
3935 "narHash": "sha256-g9f3SCavl9ssNr8Xw9Z8KkpeEwCYv+47dqwoIPneMSs=", 3935 "narHash": "sha256-NF9G+Esbe6vLYivkpuYU0qfsA6zHtnVcr/qUttYY8t4=",
3936 "path": "../systems/eldiron", 3936 "path": "../systems/eldiron",
3937 "type": "path" 3937 "type": "path"
3938 }, 3938 },
@@ -3952,13 +3952,13 @@
3952 "my-lib": "my-lib_4", 3952 "my-lib": "my-lib_4",
3953 "myuids": "myuids_23", 3953 "myuids": "myuids_23",
3954 "nixpkgs": "nixpkgs_55", 3954 "nixpkgs": "nixpkgs_55",
3955 "php": "php", 3955 "ports": "ports",
3956 "secrets": "secrets_17", 3956 "secrets": "secrets_17",
3957 "system": "system_3" 3957 "system": "system_3"
3958 }, 3958 },
3959 "locked": { 3959 "locked": {
3960 "lastModified": 1, 3960 "lastModified": 1,
3961 "narHash": "sha256-kLIVhZAxEWcN3W1AaF/gmopYuRdq0U43jkA4hliY50I=", 3961 "narHash": "sha256-kGiAFiEq880Rccq6xXOICbBBH7z2eIj7yp59nKlkvXk=",
3962 "path": "../systems/monitoring-1", 3962 "path": "../systems/monitoring-1",
3963 "type": "path" 3963 "type": "path"
3964 }, 3964 },
@@ -3977,13 +3977,13 @@
3977 "my-lib": "my-lib_5", 3977 "my-lib": "my-lib_5",
3978 "myuids": "myuids_26", 3978 "myuids": "myuids_26",
3979 "nixpkgs": "nixpkgs_63", 3979 "nixpkgs": "nixpkgs_63",
3980 "php": "php_2", 3980 "ports": "ports_2",
3981 "secrets": "secrets_19", 3981 "secrets": "secrets_19",
3982 "system": "system_4" 3982 "system": "system_4"
3983 }, 3983 },
3984 "locked": { 3984 "locked": {
3985 "lastModified": 1, 3985 "lastModified": 1,
3986 "narHash": "sha256-FtjFgqcSXs0dTkbUggbPwaDeCoOoYZragHCUkcyq538=", 3986 "narHash": "sha256-7DdYPYmehN/m/WfHoklW+b/jOYLG3Rr44tqM8RmAlJ4=",
3987 "path": "../systems/quatresaisons", 3987 "path": "../systems/quatresaisons",
3988 "type": "path" 3988 "type": "path"
3989 }, 3989 },
@@ -7499,7 +7499,7 @@
7499 "type": "path" 7499 "type": "path"
7500 } 7500 }
7501 }, 7501 },
7502 "php": { 7502 "ports": {
7503 "inputs": { 7503 "inputs": {
7504 "flake-utils": "flake-utils_33", 7504 "flake-utils": "flake-utils_33",
7505 "nixpkgs": "nixpkgs_56", 7505 "nixpkgs": "nixpkgs_56",
@@ -7507,16 +7507,16 @@
7507 }, 7507 },
7508 "locked": { 7508 "locked": {
7509 "lastModified": 1, 7509 "lastModified": 1,
7510 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 7510 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
7511 "path": "../../flakes/private/php", 7511 "path": "../../flakes/private/ports",
7512 "type": "path" 7512 "type": "path"
7513 }, 7513 },
7514 "original": { 7514 "original": {
7515 "path": "../../flakes/private/php", 7515 "path": "../../flakes/private/ports",
7516 "type": "path" 7516 "type": "path"
7517 } 7517 }
7518 }, 7518 },
7519 "php_2": { 7519 "ports_2": {
7520 "inputs": { 7520 "inputs": {
7521 "flake-utils": "flake-utils_36", 7521 "flake-utils": "flake-utils_36",
7522 "nixpkgs": "nixpkgs_64", 7522 "nixpkgs": "nixpkgs_64",
@@ -7524,12 +7524,12 @@
7524 }, 7524 },
7525 "locked": { 7525 "locked": {
7526 "lastModified": 1, 7526 "lastModified": 1,
7527 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 7527 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
7528 "path": "../../flakes/private/php", 7528 "path": "../../flakes/private/ports",
7529 "type": "path" 7529 "type": "path"
7530 }, 7530 },
7531 "original": { 7531 "original": {
7532 "path": "../../flakes/private/php", 7532 "path": "../../flakes/private/ports",
7533 "type": "path" 7533 "type": "path"
7534 } 7534 }
7535 }, 7535 },
@@ -7704,7 +7704,7 @@
7704 "type": "path" 7704 "type": "path"
7705 } 7705 }
7706 }, 7706 },
7707 "private-php": { 7707 "private-ports": {
7708 "inputs": { 7708 "inputs": {
7709 "flake-utils": "flake-utils_19", 7709 "flake-utils": "flake-utils_19",
7710 "nixpkgs": "nixpkgs_33", 7710 "nixpkgs": "nixpkgs_33",
@@ -7712,12 +7712,12 @@
7712 }, 7712 },
7713 "locked": { 7713 "locked": {
7714 "lastModified": 1, 7714 "lastModified": 1,
7715 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 7715 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
7716 "path": "../../flakes/private/php", 7716 "path": "../../flakes/private/ports",
7717 "type": "path" 7717 "type": "path"
7718 }, 7718 },
7719 "original": { 7719 "original": {
7720 "path": "../../flakes/private/php", 7720 "path": "../../flakes/private/ports",
7721 "type": "path" 7721 "type": "path"
7722 } 7722 }
7723 }, 7723 },
@@ -8574,7 +8574,7 @@
8574 "type": "path" 8574 "type": "path"
8575 } 8575 }
8576 }, 8576 },
8577 "s-private-php": { 8577 "s-private-ports": {
8578 "inputs": { 8578 "inputs": {
8579 "flake-utils": "flake-utils_60", 8579 "flake-utils": "flake-utils_60",
8580 "nixpkgs": "nixpkgs_100", 8580 "nixpkgs": "nixpkgs_100",
@@ -8582,12 +8582,12 @@
8582 }, 8582 },
8583 "locked": { 8583 "locked": {
8584 "lastModified": 1, 8584 "lastModified": 1,
8585 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 8585 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
8586 "path": "./private/php", 8586 "path": "./private/ports",
8587 "type": "path" 8587 "type": "path"
8588 }, 8588 },
8589 "original": { 8589 "original": {
8590 "path": "./private/php", 8590 "path": "./private/ports",
8591 "type": "path" 8591 "type": "path"
8592 } 8592 }
8593 }, 8593 },
@@ -8990,11 +8990,11 @@
8990 "nixpkgs": "nixpkgs_107" 8990 "nixpkgs": "nixpkgs_107"
8991 }, 8991 },
8992 "locked": { 8992 "locked": {
8993 "lastModified": 1696144631, 8993 "lastModified": 1696378030,
8994 "narHash": "sha256-zV7tbNrrrUpPkaATkc6OsQC8n75QybaBKsaD7d5kQGA=", 8994 "narHash": "sha256-P86mzoiD2yFQc/TYuaTn/ceT2RG5JNgm9UXbynGj+0Y=",
8995 "ref": "master", 8995 "ref": "master",
8996 "rev": "ae51ac0227647e30348256067934b8c9eb7e3f06", 8996 "rev": "ed67fbe50812c3f768f5adb73364653b0bd22f8d",
8997 "revCount": 688, 8997 "revCount": 694,
8998 "type": "git", 8998 "type": "git",
8999 "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets" 8999 "url": "git+ssh://gitolite@git.immae.eu/perso/Immae/Config/Nix/Nixops/Secrets"
9000 }, 9000 },
diff --git a/flake.lock b/flake.lock
index b109986..058b010 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2681,7 +2681,7 @@
2681 "s-private-openldap": "s-private-openldap", 2681 "s-private-openldap": "s-private-openldap",
2682 "s-private-paste": "s-private-paste", 2682 "s-private-paste": "s-private-paste",
2683 "s-private-peertube": "s-private-peertube", 2683 "s-private-peertube": "s-private-peertube",
2684 "s-private-php": "s-private-php", 2684 "s-private-ports": "s-private-ports",
2685 "s-private-ssh": "s-private-ssh", 2685 "s-private-ssh": "s-private-ssh",
2686 "s-private-system": "s-private-system", 2686 "s-private-system": "s-private-system",
2687 "s-rsync_backup": "s-rsync_backup", 2687 "s-rsync_backup": "s-rsync_backup",
@@ -2692,7 +2692,7 @@
2692 }, 2692 },
2693 "locked": { 2693 "locked": {
2694 "lastModified": 1, 2694 "lastModified": 1,
2695 "narHash": "sha256-LBw8FCxHXW6b1WFvsEnmLmNpZjow6+N4Q+3zAfcudIU=", 2695 "narHash": "sha256-cDb2U1QUwzcphvzJo9ZnmKu6z65RwbZ0i2kbI03TDHc=",
2696 "path": "./flakes", 2696 "path": "./flakes",
2697 "type": "path" 2697 "type": "path"
2698 }, 2698 },
@@ -3924,7 +3924,7 @@
3924 "private-openldap": "private-openldap", 3924 "private-openldap": "private-openldap",
3925 "private-paste": "private-paste", 3925 "private-paste": "private-paste",
3926 "private-peertube": "private-peertube", 3926 "private-peertube": "private-peertube",
3927 "private-php": "private-php", 3927 "private-ports": "private-ports",
3928 "private-ssh": "private-ssh", 3928 "private-ssh": "private-ssh",
3929 "private-system": "private-system", 3929 "private-system": "private-system",
3930 "public-copanier": "public-copanier", 3930 "public-copanier": "public-copanier",
@@ -3948,7 +3948,7 @@
3948 }, 3948 },
3949 "locked": { 3949 "locked": {
3950 "lastModified": 1, 3950 "lastModified": 1,
3951 "narHash": "sha256-g9f3SCavl9ssNr8Xw9Z8KkpeEwCYv+47dqwoIPneMSs=", 3951 "narHash": "sha256-NF9G+Esbe6vLYivkpuYU0qfsA6zHtnVcr/qUttYY8t4=",
3952 "path": "../systems/eldiron", 3952 "path": "../systems/eldiron",
3953 "type": "path" 3953 "type": "path"
3954 }, 3954 },
@@ -3968,13 +3968,13 @@
3968 "my-lib": "my-lib_4", 3968 "my-lib": "my-lib_4",
3969 "myuids": "myuids_23", 3969 "myuids": "myuids_23",
3970 "nixpkgs": "nixpkgs_55", 3970 "nixpkgs": "nixpkgs_55",
3971 "php": "php", 3971 "ports": "ports",
3972 "secrets": "secrets_17", 3972 "secrets": "secrets_17",
3973 "system": "system_3" 3973 "system": "system_3"
3974 }, 3974 },
3975 "locked": { 3975 "locked": {
3976 "lastModified": 1, 3976 "lastModified": 1,
3977 "narHash": "sha256-kLIVhZAxEWcN3W1AaF/gmopYuRdq0U43jkA4hliY50I=", 3977 "narHash": "sha256-kGiAFiEq880Rccq6xXOICbBBH7z2eIj7yp59nKlkvXk=",
3978 "path": "../systems/monitoring-1", 3978 "path": "../systems/monitoring-1",
3979 "type": "path" 3979 "type": "path"
3980 }, 3980 },
@@ -3993,13 +3993,13 @@
3993 "my-lib": "my-lib_5", 3993 "my-lib": "my-lib_5",
3994 "myuids": "myuids_26", 3994 "myuids": "myuids_26",
3995 "nixpkgs": "nixpkgs_63", 3995 "nixpkgs": "nixpkgs_63",
3996 "php": "php_2", 3996 "ports": "ports_2",
3997 "secrets": "secrets_19", 3997 "secrets": "secrets_19",
3998 "system": "system_4" 3998 "system": "system_4"
3999 }, 3999 },
4000 "locked": { 4000 "locked": {
4001 "lastModified": 1, 4001 "lastModified": 1,
4002 "narHash": "sha256-FtjFgqcSXs0dTkbUggbPwaDeCoOoYZragHCUkcyq538=", 4002 "narHash": "sha256-7DdYPYmehN/m/WfHoklW+b/jOYLG3Rr44tqM8RmAlJ4=",
4003 "path": "../systems/quatresaisons", 4003 "path": "../systems/quatresaisons",
4004 "type": "path" 4004 "type": "path"
4005 }, 4005 },
@@ -7515,7 +7515,7 @@
7515 "type": "path" 7515 "type": "path"
7516 } 7516 }
7517 }, 7517 },
7518 "php": { 7518 "ports": {
7519 "inputs": { 7519 "inputs": {
7520 "flake-utils": "flake-utils_33", 7520 "flake-utils": "flake-utils_33",
7521 "nixpkgs": "nixpkgs_56", 7521 "nixpkgs": "nixpkgs_56",
@@ -7523,16 +7523,16 @@
7523 }, 7523 },
7524 "locked": { 7524 "locked": {
7525 "lastModified": 1, 7525 "lastModified": 1,
7526 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 7526 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
7527 "path": "../../flakes/private/php", 7527 "path": "../../flakes/private/ports",
7528 "type": "path" 7528 "type": "path"
7529 }, 7529 },
7530 "original": { 7530 "original": {
7531 "path": "../../flakes/private/php", 7531 "path": "../../flakes/private/ports",
7532 "type": "path" 7532 "type": "path"
7533 } 7533 }
7534 }, 7534 },
7535 "php_2": { 7535 "ports_2": {
7536 "inputs": { 7536 "inputs": {
7537 "flake-utils": "flake-utils_36", 7537 "flake-utils": "flake-utils_36",
7538 "nixpkgs": "nixpkgs_64", 7538 "nixpkgs": "nixpkgs_64",
@@ -7540,12 +7540,12 @@
7540 }, 7540 },
7541 "locked": { 7541 "locked": {
7542 "lastModified": 1, 7542 "lastModified": 1,
7543 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 7543 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
7544 "path": "../../flakes/private/php", 7544 "path": "../../flakes/private/ports",
7545 "type": "path" 7545 "type": "path"
7546 }, 7546 },
7547 "original": { 7547 "original": {
7548 "path": "../../flakes/private/php", 7548 "path": "../../flakes/private/ports",
7549 "type": "path" 7549 "type": "path"
7550 } 7550 }
7551 }, 7551 },
@@ -7720,7 +7720,7 @@
7720 "type": "path" 7720 "type": "path"
7721 } 7721 }
7722 }, 7722 },
7723 "private-php": { 7723 "private-ports": {
7724 "inputs": { 7724 "inputs": {
7725 "flake-utils": "flake-utils_19", 7725 "flake-utils": "flake-utils_19",
7726 "nixpkgs": "nixpkgs_33", 7726 "nixpkgs": "nixpkgs_33",
@@ -7728,12 +7728,12 @@
7728 }, 7728 },
7729 "locked": { 7729 "locked": {
7730 "lastModified": 1, 7730 "lastModified": 1,
7731 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 7731 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
7732 "path": "../../flakes/private/php", 7732 "path": "../../flakes/private/ports",
7733 "type": "path" 7733 "type": "path"
7734 }, 7734 },
7735 "original": { 7735 "original": {
7736 "path": "../../flakes/private/php", 7736 "path": "../../flakes/private/ports",
7737 "type": "path" 7737 "type": "path"
7738 } 7738 }
7739 }, 7739 },
@@ -8590,7 +8590,7 @@
8590 "type": "path" 8590 "type": "path"
8591 } 8591 }
8592 }, 8592 },
8593 "s-private-php": { 8593 "s-private-ports": {
8594 "inputs": { 8594 "inputs": {
8595 "flake-utils": "flake-utils_60", 8595 "flake-utils": "flake-utils_60",
8596 "nixpkgs": "nixpkgs_100", 8596 "nixpkgs": "nixpkgs_100",
@@ -8598,12 +8598,12 @@
8598 }, 8598 },
8599 "locked": { 8599 "locked": {
8600 "lastModified": 1, 8600 "lastModified": 1,
8601 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 8601 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
8602 "path": "./private/php", 8602 "path": "./private/ports",
8603 "type": "path" 8603 "type": "path"
8604 }, 8604 },
8605 "original": { 8605 "original": {
8606 "path": "./private/php", 8606 "path": "./private/ports",
8607 "type": "path" 8607 "type": "path"
8608 } 8608 }
8609 }, 8609 },
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 @@
3828 "private-openldap": "private-openldap", 3828 "private-openldap": "private-openldap",
3829 "private-paste": "private-paste", 3829 "private-paste": "private-paste",
3830 "private-peertube": "private-peertube", 3830 "private-peertube": "private-peertube",
3831 "private-php": "private-php", 3831 "private-ports": "private-ports",
3832 "private-ssh": "private-ssh", 3832 "private-ssh": "private-ssh",
3833 "private-system": "private-system", 3833 "private-system": "private-system",
3834 "public-copanier": "public-copanier", 3834 "public-copanier": "public-copanier",
@@ -3852,7 +3852,7 @@
3852 }, 3852 },
3853 "locked": { 3853 "locked": {
3854 "lastModified": 1, 3854 "lastModified": 1,
3855 "narHash": "sha256-g9f3SCavl9ssNr8Xw9Z8KkpeEwCYv+47dqwoIPneMSs=", 3855 "narHash": "sha256-NF9G+Esbe6vLYivkpuYU0qfsA6zHtnVcr/qUttYY8t4=",
3856 "path": "../systems/eldiron", 3856 "path": "../systems/eldiron",
3857 "type": "path" 3857 "type": "path"
3858 }, 3858 },
@@ -3872,13 +3872,13 @@
3872 "my-lib": "my-lib_4", 3872 "my-lib": "my-lib_4",
3873 "myuids": "myuids_23", 3873 "myuids": "myuids_23",
3874 "nixpkgs": "nixpkgs_54", 3874 "nixpkgs": "nixpkgs_54",
3875 "php": "php", 3875 "ports": "ports",
3876 "secrets": "secrets_17", 3876 "secrets": "secrets_17",
3877 "system": "system_3" 3877 "system": "system_3"
3878 }, 3878 },
3879 "locked": { 3879 "locked": {
3880 "lastModified": 1, 3880 "lastModified": 1,
3881 "narHash": "sha256-kLIVhZAxEWcN3W1AaF/gmopYuRdq0U43jkA4hliY50I=", 3881 "narHash": "sha256-kGiAFiEq880Rccq6xXOICbBBH7z2eIj7yp59nKlkvXk=",
3882 "path": "../systems/monitoring-1", 3882 "path": "../systems/monitoring-1",
3883 "type": "path" 3883 "type": "path"
3884 }, 3884 },
@@ -3897,13 +3897,13 @@
3897 "my-lib": "my-lib_5", 3897 "my-lib": "my-lib_5",
3898 "myuids": "myuids_26", 3898 "myuids": "myuids_26",
3899 "nixpkgs": "nixpkgs_62", 3899 "nixpkgs": "nixpkgs_62",
3900 "php": "php_2", 3900 "ports": "ports_2",
3901 "secrets": "secrets_19", 3901 "secrets": "secrets_19",
3902 "system": "system_4" 3902 "system": "system_4"
3903 }, 3903 },
3904 "locked": { 3904 "locked": {
3905 "lastModified": 1, 3905 "lastModified": 1,
3906 "narHash": "sha256-FtjFgqcSXs0dTkbUggbPwaDeCoOoYZragHCUkcyq538=", 3906 "narHash": "sha256-7DdYPYmehN/m/WfHoklW+b/jOYLG3Rr44tqM8RmAlJ4=",
3907 "path": "../systems/quatresaisons", 3907 "path": "../systems/quatresaisons",
3908 "type": "path" 3908 "type": "path"
3909 }, 3909 },
@@ -7341,7 +7341,7 @@
7341 "type": "path" 7341 "type": "path"
7342 } 7342 }
7343 }, 7343 },
7344 "php": { 7344 "ports": {
7345 "inputs": { 7345 "inputs": {
7346 "flake-utils": "flake-utils_33", 7346 "flake-utils": "flake-utils_33",
7347 "nixpkgs": "nixpkgs_55", 7347 "nixpkgs": "nixpkgs_55",
@@ -7349,16 +7349,16 @@
7349 }, 7349 },
7350 "locked": { 7350 "locked": {
7351 "lastModified": 1, 7351 "lastModified": 1,
7352 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 7352 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
7353 "path": "../../flakes/private/php", 7353 "path": "../../flakes/private/ports",
7354 "type": "path" 7354 "type": "path"
7355 }, 7355 },
7356 "original": { 7356 "original": {
7357 "path": "../../flakes/private/php", 7357 "path": "../../flakes/private/ports",
7358 "type": "path" 7358 "type": "path"
7359 } 7359 }
7360 }, 7360 },
7361 "php_2": { 7361 "ports_2": {
7362 "inputs": { 7362 "inputs": {
7363 "flake-utils": "flake-utils_36", 7363 "flake-utils": "flake-utils_36",
7364 "nixpkgs": "nixpkgs_63", 7364 "nixpkgs": "nixpkgs_63",
@@ -7366,12 +7366,12 @@
7366 }, 7366 },
7367 "locked": { 7367 "locked": {
7368 "lastModified": 1, 7368 "lastModified": 1,
7369 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 7369 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
7370 "path": "../../flakes/private/php", 7370 "path": "../../flakes/private/ports",
7371 "type": "path" 7371 "type": "path"
7372 }, 7372 },
7373 "original": { 7373 "original": {
7374 "path": "../../flakes/private/php", 7374 "path": "../../flakes/private/ports",
7375 "type": "path" 7375 "type": "path"
7376 } 7376 }
7377 }, 7377 },
@@ -7546,7 +7546,7 @@
7546 "type": "path" 7546 "type": "path"
7547 } 7547 }
7548 }, 7548 },
7549 "private-php": { 7549 "private-ports": {
7550 "inputs": { 7550 "inputs": {
7551 "flake-utils": "flake-utils_19", 7551 "flake-utils": "flake-utils_19",
7552 "nixpkgs": "nixpkgs_32", 7552 "nixpkgs": "nixpkgs_32",
@@ -7554,12 +7554,12 @@
7554 }, 7554 },
7555 "locked": { 7555 "locked": {
7556 "lastModified": 1, 7556 "lastModified": 1,
7557 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 7557 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
7558 "path": "../../flakes/private/php", 7558 "path": "../../flakes/private/ports",
7559 "type": "path" 7559 "type": "path"
7560 }, 7560 },
7561 "original": { 7561 "original": {
7562 "path": "../../flakes/private/php", 7562 "path": "../../flakes/private/ports",
7563 "type": "path" 7563 "type": "path"
7564 } 7564 }
7565 }, 7565 },
@@ -7955,7 +7955,7 @@
7955 "s-private-openldap": "s-private-openldap", 7955 "s-private-openldap": "s-private-openldap",
7956 "s-private-paste": "s-private-paste", 7956 "s-private-paste": "s-private-paste",
7957 "s-private-peertube": "s-private-peertube", 7957 "s-private-peertube": "s-private-peertube",
7958 "s-private-php": "s-private-php", 7958 "s-private-ports": "s-private-ports",
7959 "s-private-ssh": "s-private-ssh", 7959 "s-private-ssh": "s-private-ssh",
7960 "s-private-system": "s-private-system", 7960 "s-private-system": "s-private-system",
7961 "s-rsync_backup": "s-rsync_backup", 7961 "s-rsync_backup": "s-rsync_backup",
@@ -8456,7 +8456,7 @@
8456 "type": "path" 8456 "type": "path"
8457 } 8457 }
8458 }, 8458 },
8459 "s-private-php": { 8459 "s-private-ports": {
8460 "inputs": { 8460 "inputs": {
8461 "flake-utils": "flake-utils_60", 8461 "flake-utils": "flake-utils_60",
8462 "nixpkgs": "nixpkgs_99", 8462 "nixpkgs": "nixpkgs_99",
@@ -8464,12 +8464,12 @@
8464 }, 8464 },
8465 "locked": { 8465 "locked": {
8466 "lastModified": 1, 8466 "lastModified": 1,
8467 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 8467 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
8468 "path": "./private/php", 8468 "path": "./private/ports",
8469 "type": "path" 8469 "type": "path"
8470 }, 8470 },
8471 "original": { 8471 "original": {
8472 "path": "./private/php", 8472 "path": "./private/ports",
8473 "type": "path" 8473 "type": "path"
8474 } 8474 }
8475 }, 8475 },
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 @@
36 s-private-openldap.url = "path:./private/openldap"; 36 s-private-openldap.url = "path:./private/openldap";
37 s-private-paste.url = "path:./private/paste"; 37 s-private-paste.url = "path:./private/paste";
38 s-private-peertube.url = "path:./private/peertube"; 38 s-private-peertube.url = "path:./private/peertube";
39 s-private-php.url = "path:./private/php"; 39 s-private-ports.url = "path:./private/ports";
40 s-private-ssh.url = "path:./private/ssh"; 40 s-private-ssh.url = "path:./private/ssh";
41 s-private-system.url = "path:./private/system"; 41 s-private-system.url = "path:./private/system";
42 42
diff --git a/flakes/private/php/flake.lock b/flakes/private/ports/flake.lock
index c9af933..c9af933 100644
--- a/flakes/private/php/flake.lock
+++ b/flakes/private/ports/flake.lock
diff --git a/flakes/private/php/flake.nix b/flakes/private/ports/flake.nix
index a730b68..42aae30 100644
--- a/flakes/private/php/flake.nix
+++ b/flakes/private/ports/flake.nix
@@ -22,11 +22,10 @@
22 python37Packages = (import nixpkgs-4 { inherit system; overlays = []; }).python37Packages; 22 python37Packages = (import nixpkgs-4 { inherit system; overlays = []; }).python37Packages;
23 telegram-purple = (import nixpkgs-4 { inherit system; overlays = []; }).telegram-purple; 23 telegram-purple = (import nixpkgs-4 { inherit system; overlays = []; }).telegram-purple;
24 }; 24 };
25 defaultPackage = packages.php73;
26 legacyPackages = packages; 25 legacyPackages = packages;
27 }) // rec { 26 }) // rec {
28 overlays = { 27 overlays = {
29 php = final: prev: { 28 ports = final: prev: {
30 php72 = self.packages."${final.system}".php72; 29 php72 = self.packages."${final.system}".php72;
31 php73 = self.packages."${final.system}".php73; 30 php73 = self.packages."${final.system}".php73;
32 php74 = self.packages."${final.system}".php74; 31 php74 = self.packages."${final.system}".php74;
@@ -35,6 +34,6 @@
35 telegram-purple = self.packages."${final.system}".telegram-purple; 34 telegram-purple = self.packages."${final.system}".telegram-purple;
36 }; 35 };
37 }; 36 };
38 overlay = overlays.php; 37 overlay = overlays.ports;
39 }; 38 };
40} 39}
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 @@
1{ config, pkgs, lib, php, name, secrets, ... }: 1{ config, pkgs, lib, ports, name, secrets, ... }:
2{ 2{
3 # ssh-keyscan eldiron | nix-shell -p ssh-to-age --run ssh-to-age 3 # ssh-keyscan eldiron | nix-shell -p ssh-to-age --run ssh-to-age
4 secrets.ageKeys = [ "age1dxr5lhvtnjssfaqpnf6qx80h8gfwkxg3tdf35m6n9wljmk7wadfs3kmahj" ]; 4 secrets.ageKeys = [ "age1dxr5lhvtnjssfaqpnf6qx80h8gfwkxg3tdf35m6n9wljmk7wadfs3kmahj" ];
@@ -28,9 +28,7 @@
28 "nodejs-16.20.2" # for landing page building 28 "nodejs-16.20.2" # for landing page building
29 ]; 29 ];
30 30
31 nixpkgs.overlays = [ 31 nixpkgs.overlays = builtins.attrValues ports.overlays;
32 php.overlays.php
33 ];
34 powerManagement.cpuFreqGovernor = "powersave"; 32 powerManagement.cpuFreqGovernor = "powersave";
35 33
36 security.acme.certs."${name}".postRun = builtins.concatStringsSep "\n" [ 34 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 @@
2141 "type": "path" 2141 "type": "path"
2142 } 2142 }
2143 }, 2143 },
2144 "private-php": { 2144 "private-ports": {
2145 "inputs": { 2145 "inputs": {
2146 "flake-utils": "flake-utils_11", 2146 "flake-utils": "flake-utils_11",
2147 "nixpkgs": "nixpkgs_14", 2147 "nixpkgs": "nixpkgs_14",
@@ -2149,12 +2149,12 @@
2149 }, 2149 },
2150 "locked": { 2150 "locked": {
2151 "lastModified": 1, 2151 "lastModified": 1,
2152 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 2152 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
2153 "path": "../../flakes/private/php", 2153 "path": "../../flakes/private/ports",
2154 "type": "path" 2154 "type": "path"
2155 }, 2155 },
2156 "original": { 2156 "original": {
2157 "path": "../../flakes/private/php", 2157 "path": "../../flakes/private/ports",
2158 "type": "path" 2158 "type": "path"
2159 } 2159 }
2160 }, 2160 },
@@ -2496,7 +2496,7 @@
2496 "private-openldap": "private-openldap", 2496 "private-openldap": "private-openldap",
2497 "private-paste": "private-paste", 2497 "private-paste": "private-paste",
2498 "private-peertube": "private-peertube", 2498 "private-peertube": "private-peertube",
2499 "private-php": "private-php", 2499 "private-ports": "private-ports",
2500 "private-ssh": "private-ssh", 2500 "private-ssh": "private-ssh",
2501 "private-system": "private-system", 2501 "private-system": "private-system",
2502 "public-copanier": "public-copanier", 2502 "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 @@
27 27
28 private-peertube.url = "path:../../flakes/private/peertube"; 28 private-peertube.url = "path:../../flakes/private/peertube";
29 private-buildbot.url = "path:../../flakes/private/buildbot"; 29 private-buildbot.url = "path:../../flakes/private/buildbot";
30 private-php.url = "path:../../flakes/private/php"; 30 private-ports.url = "path:../../flakes/private/ports";
31 private-environment.url = "path:../../flakes/private/environment"; 31 private-environment.url = "path:../../flakes/private/environment";
32 private-openarc.url = "path:../../flakes/private/openarc"; 32 private-openarc.url = "path:../../flakes/private/openarc";
33 private-openldap.url = "path:../../flakes/private/openldap"; 33 private-openldap.url = "path:../../flakes/private/openldap";
@@ -84,7 +84,7 @@
84 openldap = private-openldap; 84 openldap = private-openldap;
85 monitoring = private-monitoring; 85 monitoring = private-monitoring;
86 peertube = private-peertube.packages.x86_64-linux; 86 peertube = private-peertube.packages.x86_64-linux;
87 php = private-php; 87 ports = private-ports;
88 }; 88 };
89 }; 89 };
90} 90}
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 @@
1{ config, pkgs, lib, nixpkgs, php, secrets, ... }: 1{ config, pkgs, lib, nixpkgs, ports, secrets, ... }:
2{ 2{
3 # ssh-keyscan monitoring-1 | nix-shell -p ssh-to-age --run ssh-to-age 3 # ssh-keyscan monitoring-1 | nix-shell -p ssh-to-age --run ssh-to-age
4 secrets.ageKeys = [ "age1dn4lzhgxusqrpjjnzm7w8ml39ptf326htuzmpqdqs2gg3wq7cqzqxuvx8k" ]; 4 secrets.ageKeys = [ "age1dn4lzhgxusqrpjjnzm7w8ml39ptf326htuzmpqdqs2gg3wq7cqzqxuvx8k" ];
@@ -13,7 +13,7 @@
13 ./status_engine.nix 13 ./status_engine.nix
14 ]; 14 ];
15 15
16 nixpkgs.overlays = builtins.attrValues php.overlays; 16 nixpkgs.overlays = builtins.attrValues ports.overlays;
17 nixpkgs.config.permittedInsecurePackages = [ 17 nixpkgs.config.permittedInsecurePackages = [
18 "python-2.7.18.6" # for nagios-cli 18 "python-2.7.18.6" # for nagios-cli
19 ]; 19 ];
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 @@
628 "type": "github" 628 "type": "github"
629 } 629 }
630 }, 630 },
631 "php": { 631 "ports": {
632 "inputs": { 632 "inputs": {
633 "flake-utils": "flake-utils_2", 633 "flake-utils": "flake-utils_2",
634 "nixpkgs": "nixpkgs_6", 634 "nixpkgs": "nixpkgs_6",
@@ -636,12 +636,12 @@
636 }, 636 },
637 "locked": { 637 "locked": {
638 "lastModified": 1, 638 "lastModified": 1,
639 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 639 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
640 "path": "../../flakes/private/php", 640 "path": "../../flakes/private/ports",
641 "type": "path" 641 "type": "path"
642 }, 642 },
643 "original": { 643 "original": {
644 "path": "../../flakes/private/php", 644 "path": "../../flakes/private/ports",
645 "type": "path" 645 "type": "path"
646 } 646 }
647 }, 647 },
@@ -656,7 +656,7 @@
656 "my-lib": "my-lib", 656 "my-lib": "my-lib",
657 "myuids": "myuids", 657 "myuids": "myuids",
658 "nixpkgs": "nixpkgs_5", 658 "nixpkgs": "nixpkgs_5",
659 "php": "php", 659 "ports": "ports",
660 "secrets": "secrets_3", 660 "secrets": "secrets_3",
661 "system": "system" 661 "system": "system"
662 } 662 }
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 @@
9 chatons.url = "path:../../flakes/private/chatons"; 9 chatons.url = "path:../../flakes/private/chatons";
10 environment.url = "path:../../flakes/private/environment"; 10 environment.url = "path:../../flakes/private/environment";
11 system.url = "path:../../flakes/private/system"; 11 system.url = "path:../../flakes/private/system";
12 php.url = "path:../../flakes/private/php"; 12 ports.url = "path:../../flakes/private/ports";
13 13
14 myuids.url = "path:../../flakes/myuids"; 14 myuids.url = "path:../../flakes/myuids";
15 secrets.url = "path:../../flakes/secrets"; 15 secrets.url = "path:../../flakes/secrets";
@@ -39,7 +39,7 @@
39 moduleArgs = { 39 moduleArgs = {
40 nixpkgs = inputs.nixpkgs; 40 nixpkgs = inputs.nixpkgs;
41 monitoring = inputs.monitoring; 41 monitoring = inputs.monitoring;
42 php = inputs.php; 42 ports = inputs.ports;
43 }; 43 };
44 }; 44 };
45} 45}
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 @@
618 "type": "github" 618 "type": "github"
619 } 619 }
620 }, 620 },
621 "php": { 621 "ports": {
622 "inputs": { 622 "inputs": {
623 "flake-utils": "flake-utils_2", 623 "flake-utils": "flake-utils_2",
624 "nixpkgs": "nixpkgs_6", 624 "nixpkgs": "nixpkgs_6",
@@ -626,12 +626,12 @@
626 }, 626 },
627 "locked": { 627 "locked": {
628 "lastModified": 1, 628 "lastModified": 1,
629 "narHash": "sha256-Qs+O86L4sPArYWm7wMCFNKLCWfUwkz8STePsn5K9Xwk=", 629 "narHash": "sha256-MS3rzLJRZ4jW7ASOUUZY1/4jTFfGVkfpedwgnms9c40=",
630 "path": "../../flakes/private/php", 630 "path": "../../flakes/private/ports",
631 "type": "path" 631 "type": "path"
632 }, 632 },
633 "original": { 633 "original": {
634 "path": "../../flakes/private/php", 634 "path": "../../flakes/private/ports",
635 "type": "path" 635 "type": "path"
636 } 636 }
637 }, 637 },
@@ -645,7 +645,7 @@
645 "my-lib": "my-lib", 645 "my-lib": "my-lib",
646 "myuids": "myuids_2", 646 "myuids": "myuids_2",
647 "nixpkgs": "nixpkgs_5", 647 "nixpkgs": "nixpkgs_5",
648 "php": "php", 648 "ports": "ports",
649 "secrets": "secrets_2", 649 "secrets": "secrets_2",
650 "system": "system" 650 "system": "system"
651 } 651 }
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 @@
6 6
7 monitoring.url = "path:../../flakes/private/monitoring"; 7 monitoring.url = "path:../../flakes/private/monitoring";
8 environment.url = "path:../../flakes/private/environment"; 8 environment.url = "path:../../flakes/private/environment";
9 php.url = "path:../../flakes/private/php"; 9 ports.url = "path:../../flakes/private/ports";
10 system.url = "path:../../flakes/private/system"; 10 system.url = "path:../../flakes/private/system";
11 11
12 myuids.url = "path:../../flakes/myuids"; 12 myuids.url = "path:../../flakes/myuids";
@@ -41,7 +41,7 @@
41 }; 41 };
42 moduleArgs = { 42 moduleArgs = {
43 monitoring = inputs.monitoring; 43 monitoring = inputs.monitoring;
44 php = inputs.php; 44 ports = inputs.ports;
45 landing-page = inputs.landing-page; 45 landing-page = inputs.landing-page;
46 pkgs-no-overlay = inputs.nixpkgs.legacyPackages.x86_64-linux; 46 pkgs-no-overlay = inputs.nixpkgs.legacyPackages.x86_64-linux;
47 }; 47 };