diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2024-02-11 00:30:04 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2024-02-24 12:24:06 +0100 |
commit | d5ce77bd3af16b6e107a2d59ea42f658df265eb5 (patch) | |
tree | b0c761e336202229aef9e48c56514fd5d9167c87 /flakes | |
parent | d3a40bd942537c35e3eb6cf9282798d704720290 (diff) | |
download | Nix-d5ce77bd3af16b6e107a2d59ea42f658df265eb5.tar.gz Nix-d5ce77bd3af16b6e107a2d59ea42f658df265eb5.tar.zst Nix-d5ce77bd3af16b6e107a2d59ea42f658df265eb5.zip |
Remove manual packages for fluentd / fluentbit
Diffstat (limited to 'flakes')
-rw-r--r-- | flakes/etherpad-lite/flake.lock | 2 | ||||
-rw-r--r-- | flakes/flake.lock | 68 | ||||
-rw-r--r-- | flakes/grocy/flake.lock | 2 | ||||
-rw-r--r-- | flakes/mypackages/pkgs/default.nix | 4 | ||||
-rw-r--r-- | flakes/mypackages/pkgs/fluent-bit/default.nix | 47 | ||||
-rw-r--r-- | flakes/mypackages/pkgs/fluentd/Gemfile | 3 | ||||
-rw-r--r-- | flakes/mypackages/pkgs/fluentd/Gemfile.lock | 38 | ||||
-rw-r--r-- | flakes/mypackages/pkgs/fluentd/default.nix | 20 | ||||
-rw-r--r-- | flakes/mypackages/pkgs/fluentd/gemset.nix | 126 | ||||
-rw-r--r-- | flakes/private/system/flake.lock | 2 | ||||
-rw-r--r-- | flakes/surfer/flake.lock | 2 |
11 files changed, 40 insertions, 274 deletions
diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock index 7859448..9b6e6f4 100644 --- a/flakes/etherpad-lite/flake.lock +++ b/flakes/etherpad-lite/flake.lock | |||
@@ -58,7 +58,7 @@ | |||
58 | }, | 58 | }, |
59 | "locked": { | 59 | "locked": { |
60 | "lastModified": 1, | 60 | "lastModified": 1, |
61 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 61 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
62 | "path": "../mypackages", | 62 | "path": "../mypackages", |
63 | "type": "path" | 63 | "type": "path" |
64 | }, | 64 | }, |
diff --git a/flakes/flake.lock b/flakes/flake.lock index f4e88e4..613f5ff 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock | |||
@@ -3016,7 +3016,7 @@ | |||
3016 | }, | 3016 | }, |
3017 | "locked": { | 3017 | "locked": { |
3018 | "lastModified": 1, | 3018 | "lastModified": 1, |
3019 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3019 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3020 | "path": "../../mypackages", | 3020 | "path": "../../mypackages", |
3021 | "type": "path" | 3021 | "type": "path" |
3022 | }, | 3022 | }, |
@@ -3033,7 +3033,7 @@ | |||
3033 | }, | 3033 | }, |
3034 | "locked": { | 3034 | "locked": { |
3035 | "lastModified": 1, | 3035 | "lastModified": 1, |
3036 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3036 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3037 | "path": "../mypackages", | 3037 | "path": "../mypackages", |
3038 | "type": "path" | 3038 | "type": "path" |
3039 | }, | 3039 | }, |
@@ -3050,7 +3050,7 @@ | |||
3050 | }, | 3050 | }, |
3051 | "locked": { | 3051 | "locked": { |
3052 | "lastModified": 1, | 3052 | "lastModified": 1, |
3053 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3053 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3054 | "path": "../mypackages", | 3054 | "path": "../mypackages", |
3055 | "type": "path" | 3055 | "type": "path" |
3056 | }, | 3056 | }, |
@@ -3067,7 +3067,7 @@ | |||
3067 | }, | 3067 | }, |
3068 | "locked": { | 3068 | "locked": { |
3069 | "lastModified": 1, | 3069 | "lastModified": 1, |
3070 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3070 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3071 | "path": "../../mypackages", | 3071 | "path": "../../mypackages", |
3072 | "type": "path" | 3072 | "type": "path" |
3073 | }, | 3073 | }, |
@@ -3084,7 +3084,7 @@ | |||
3084 | }, | 3084 | }, |
3085 | "locked": { | 3085 | "locked": { |
3086 | "lastModified": 1, | 3086 | "lastModified": 1, |
3087 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3087 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3088 | "path": "../mypackages", | 3088 | "path": "../mypackages", |
3089 | "type": "path" | 3089 | "type": "path" |
3090 | }, | 3090 | }, |
@@ -3101,7 +3101,7 @@ | |||
3101 | }, | 3101 | }, |
3102 | "locked": { | 3102 | "locked": { |
3103 | "lastModified": 1, | 3103 | "lastModified": 1, |
3104 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3104 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3105 | "path": "../../mypackages", | 3105 | "path": "../../mypackages", |
3106 | "type": "path" | 3106 | "type": "path" |
3107 | }, | 3107 | }, |
@@ -3118,7 +3118,7 @@ | |||
3118 | }, | 3118 | }, |
3119 | "locked": { | 3119 | "locked": { |
3120 | "lastModified": 1, | 3120 | "lastModified": 1, |
3121 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3121 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3122 | "path": "../../mypackages", | 3122 | "path": "../../mypackages", |
3123 | "type": "path" | 3123 | "type": "path" |
3124 | }, | 3124 | }, |
@@ -3135,7 +3135,7 @@ | |||
3135 | }, | 3135 | }, |
3136 | "locked": { | 3136 | "locked": { |
3137 | "lastModified": 1, | 3137 | "lastModified": 1, |
3138 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3138 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3139 | "path": "../mypackages", | 3139 | "path": "../mypackages", |
3140 | "type": "path" | 3140 | "type": "path" |
3141 | }, | 3141 | }, |
@@ -3152,7 +3152,7 @@ | |||
3152 | }, | 3152 | }, |
3153 | "locked": { | 3153 | "locked": { |
3154 | "lastModified": 1, | 3154 | "lastModified": 1, |
3155 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3155 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3156 | "path": "../mypackages", | 3156 | "path": "../mypackages", |
3157 | "type": "path" | 3157 | "type": "path" |
3158 | }, | 3158 | }, |
@@ -3169,7 +3169,7 @@ | |||
3169 | }, | 3169 | }, |
3170 | "locked": { | 3170 | "locked": { |
3171 | "lastModified": 1, | 3171 | "lastModified": 1, |
3172 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3172 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3173 | "path": "../mypackages", | 3173 | "path": "../mypackages", |
3174 | "type": "path" | 3174 | "type": "path" |
3175 | }, | 3175 | }, |
@@ -3186,7 +3186,7 @@ | |||
3186 | }, | 3186 | }, |
3187 | "locked": { | 3187 | "locked": { |
3188 | "lastModified": 1, | 3188 | "lastModified": 1, |
3189 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3189 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3190 | "path": "../../mypackages", | 3190 | "path": "../../mypackages", |
3191 | "type": "path" | 3191 | "type": "path" |
3192 | }, | 3192 | }, |
@@ -3203,7 +3203,7 @@ | |||
3203 | }, | 3203 | }, |
3204 | "locked": { | 3204 | "locked": { |
3205 | "lastModified": 1, | 3205 | "lastModified": 1, |
3206 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3206 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3207 | "path": "../../mypackages", | 3207 | "path": "../../mypackages", |
3208 | "type": "path" | 3208 | "type": "path" |
3209 | }, | 3209 | }, |
@@ -3220,7 +3220,7 @@ | |||
3220 | }, | 3220 | }, |
3221 | "locked": { | 3221 | "locked": { |
3222 | "lastModified": 1, | 3222 | "lastModified": 1, |
3223 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 3223 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
3224 | "path": "../../mypackages", | 3224 | "path": "../../mypackages", |
3225 | "type": "path" | 3225 | "type": "path" |
3226 | }, | 3226 | }, |
@@ -3753,7 +3753,7 @@ | |||
3753 | }, | 3753 | }, |
3754 | "locked": { | 3754 | "locked": { |
3755 | "lastModified": 1, | 3755 | "lastModified": 1, |
3756 | "narHash": "sha256-c1cwIQUXLFIFF2kbLKthwYqpxjRtCtMFMGgyJHT6Mx0=", | 3756 | "narHash": "sha256-PDS6Ywli+vK0PoeTi7N2YAEsodfMJegnn2qEe8jfSNg=", |
3757 | "path": "../systems/backup-2", | 3757 | "path": "../systems/backup-2", |
3758 | "type": "path" | 3758 | "type": "path" |
3759 | }, | 3759 | }, |
@@ -3776,7 +3776,7 @@ | |||
3776 | }, | 3776 | }, |
3777 | "locked": { | 3777 | "locked": { |
3778 | "lastModified": 1, | 3778 | "lastModified": 1, |
3779 | "narHash": "sha256-r9r1dLWgbjgm+MvU/c5htD9zlImUE3g8Vb+/9n/HVGk=", | 3779 | "narHash": "sha256-1mF0s6KLRqmHP+OFpLturUbq4pPx6SrSQmSmHq3Qx9Q=", |
3780 | "path": "../systems/dilion", | 3780 | "path": "../systems/dilion", |
3781 | "type": "path" | 3781 | "type": "path" |
3782 | }, | 3782 | }, |
@@ -3824,7 +3824,7 @@ | |||
3824 | }, | 3824 | }, |
3825 | "locked": { | 3825 | "locked": { |
3826 | "lastModified": 1, | 3826 | "lastModified": 1, |
3827 | "narHash": "sha256-2TyPGrTzqaeWyBTV2ASZ7Om9XFgFXfuE0dlYrPA5ozI=", | 3827 | "narHash": "sha256-kSgZHQTcr7TX4T80Ki/2ycsuD7SKCpS/SyahbXhulas=", |
3828 | "path": "../systems/eldiron", | 3828 | "path": "../systems/eldiron", |
3829 | "type": "path" | 3829 | "type": "path" |
3830 | }, | 3830 | }, |
@@ -3850,7 +3850,7 @@ | |||
3850 | }, | 3850 | }, |
3851 | "locked": { | 3851 | "locked": { |
3852 | "lastModified": 1, | 3852 | "lastModified": 1, |
3853 | "narHash": "sha256-xj+YK3GUD0sY+yxs1rPyObCN3yKpvCEMsZbOKIqSoW8=", | 3853 | "narHash": "sha256-+810QcMmYDbvockHWy0clrOGoiw2udV82KybTHtDAOw=", |
3854 | "path": "../systems/monitoring-1", | 3854 | "path": "../systems/monitoring-1", |
3855 | "type": "path" | 3855 | "type": "path" |
3856 | }, | 3856 | }, |
@@ -3875,7 +3875,7 @@ | |||
3875 | }, | 3875 | }, |
3876 | "locked": { | 3876 | "locked": { |
3877 | "lastModified": 1, | 3877 | "lastModified": 1, |
3878 | "narHash": "sha256-So2ZdIfL3LKXRd4sTHBUDfnN16in6xfWS86Lxd6v/xI=", | 3878 | "narHash": "sha256-ZZwKP+iNX9DCOxSXR8MqYqJCMDj4i/1e5T2kavet9sM=", |
3879 | "path": "../systems/quatresaisons", | 3879 | "path": "../systems/quatresaisons", |
3880 | "type": "path" | 3880 | "type": "path" |
3881 | }, | 3881 | }, |
@@ -3895,7 +3895,7 @@ | |||
3895 | }, | 3895 | }, |
3896 | "locked": { | 3896 | "locked": { |
3897 | "lastModified": 1, | 3897 | "lastModified": 1, |
3898 | "narHash": "sha256-26XpjFSVM3B3k2dsnmGGLwUwctJPaGiCr0u2I6MaXFA=", | 3898 | "narHash": "sha256-2fEqKeuLBUWj603S2YwgFvSKCyop2H/KzMiGgDe2wtQ=", |
3899 | "path": "../systems/zoldene", | 3899 | "path": "../systems/zoldene", |
3900 | "type": "path" | 3900 | "type": "path" |
3901 | }, | 3901 | }, |
@@ -7499,7 +7499,7 @@ | |||
7499 | }, | 7499 | }, |
7500 | "locked": { | 7500 | "locked": { |
7501 | "lastModified": 1, | 7501 | "lastModified": 1, |
7502 | "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", | 7502 | "narHash": "sha256-NDD53D9AJZ+7snHv/B5O9cOwtiqW2W9ADFXxafnNsgQ=", |
7503 | "path": "../../flakes/private/system", | 7503 | "path": "../../flakes/private/system", |
7504 | "type": "path" | 7504 | "type": "path" |
7505 | }, | 7505 | }, |
@@ -7518,7 +7518,7 @@ | |||
7518 | }, | 7518 | }, |
7519 | "locked": { | 7519 | "locked": { |
7520 | "lastModified": 1, | 7520 | "lastModified": 1, |
7521 | "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", | 7521 | "narHash": "sha256-NDD53D9AJZ+7snHv/B5O9cOwtiqW2W9ADFXxafnNsgQ=", |
7522 | "path": "../../flakes/private/system", | 7522 | "path": "../../flakes/private/system", |
7523 | "type": "path" | 7523 | "type": "path" |
7524 | }, | 7524 | }, |
@@ -7571,7 +7571,7 @@ | |||
7571 | }, | 7571 | }, |
7572 | "locked": { | 7572 | "locked": { |
7573 | "lastModified": 1, | 7573 | "lastModified": 1, |
7574 | "narHash": "sha256-QnTpL+hdTDC64EIjsidagJfJkmzWH9e9/WMCCRI3Plc=", | 7574 | "narHash": "sha256-cDNCD5xHnCatCxybuBKyGalbPf3YDI+5aCuAW90+884=", |
7575 | "path": "../../flakes/etherpad-lite", | 7575 | "path": "../../flakes/etherpad-lite", |
7576 | "type": "path" | 7576 | "type": "path" |
7577 | }, | 7577 | }, |
@@ -7613,7 +7613,7 @@ | |||
7613 | }, | 7613 | }, |
7614 | "locked": { | 7614 | "locked": { |
7615 | "lastModified": 1, | 7615 | "lastModified": 1, |
7616 | "narHash": "sha256-hkiFggAWHN0O063fBakPNMNKgAPu9Kxtu6tMWakZtt8=", | 7616 | "narHash": "sha256-TwQKrmfqPuMoX4piaB9N3JX5vyQtqAah82OOd4b5JR8=", |
7617 | "path": "../../flakes/grocy", | 7617 | "path": "../../flakes/grocy", |
7618 | "type": "path" | 7618 | "type": "path" |
7619 | }, | 7619 | }, |
@@ -7694,7 +7694,7 @@ | |||
7694 | }, | 7694 | }, |
7695 | "locked": { | 7695 | "locked": { |
7696 | "lastModified": 1, | 7696 | "lastModified": 1, |
7697 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 7697 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
7698 | "path": "../../flakes/mypackages", | 7698 | "path": "../../flakes/mypackages", |
7699 | "type": "path" | 7699 | "type": "path" |
7700 | }, | 7700 | }, |
@@ -7817,7 +7817,7 @@ | |||
7817 | }, | 7817 | }, |
7818 | "locked": { | 7818 | "locked": { |
7819 | "lastModified": 1, | 7819 | "lastModified": 1, |
7820 | "narHash": "sha256-qVrX9q+syZ9CtWoJCiHQTmnt8O00jb7gmPGYwN+6UJg=", | 7820 | "narHash": "sha256-duW8BSOfvL3R5Nf3uxkk2gBhgrk7IZ45usMT9YpwXFA=", |
7821 | "path": "../../flakes/surfer", | 7821 | "path": "../../flakes/surfer", |
7822 | "type": "path" | 7822 | "type": "path" |
7823 | }, | 7823 | }, |
@@ -7962,7 +7962,7 @@ | |||
7962 | }, | 7962 | }, |
7963 | "locked": { | 7963 | "locked": { |
7964 | "lastModified": 1, | 7964 | "lastModified": 1, |
7965 | "narHash": "sha256-QnTpL+hdTDC64EIjsidagJfJkmzWH9e9/WMCCRI3Plc=", | 7965 | "narHash": "sha256-cDNCD5xHnCatCxybuBKyGalbPf3YDI+5aCuAW90+884=", |
7966 | "path": "./etherpad-lite", | 7966 | "path": "./etherpad-lite", |
7967 | "type": "path" | 7967 | "type": "path" |
7968 | }, | 7968 | }, |
@@ -8004,7 +8004,7 @@ | |||
8004 | }, | 8004 | }, |
8005 | "locked": { | 8005 | "locked": { |
8006 | "lastModified": 1, | 8006 | "lastModified": 1, |
8007 | "narHash": "sha256-hkiFggAWHN0O063fBakPNMNKgAPu9Kxtu6tMWakZtt8=", | 8007 | "narHash": "sha256-TwQKrmfqPuMoX4piaB9N3JX5vyQtqAah82OOd4b5JR8=", |
8008 | "path": "./grocy", | 8008 | "path": "./grocy", |
8009 | "type": "path" | 8009 | "type": "path" |
8010 | }, | 8010 | }, |
@@ -8104,7 +8104,7 @@ | |||
8104 | }, | 8104 | }, |
8105 | "locked": { | 8105 | "locked": { |
8106 | "lastModified": 1, | 8106 | "lastModified": 1, |
8107 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 8107 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
8108 | "path": "./mypackages", | 8108 | "path": "./mypackages", |
8109 | "type": "path" | 8109 | "type": "path" |
8110 | }, | 8110 | }, |
@@ -8409,7 +8409,7 @@ | |||
8409 | }, | 8409 | }, |
8410 | "locked": { | 8410 | "locked": { |
8411 | "lastModified": 1, | 8411 | "lastModified": 1, |
8412 | "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", | 8412 | "narHash": "sha256-NDD53D9AJZ+7snHv/B5O9cOwtiqW2W9ADFXxafnNsgQ=", |
8413 | "path": "./private/system", | 8413 | "path": "./private/system", |
8414 | "type": "path" | 8414 | "type": "path" |
8415 | }, | 8415 | }, |
@@ -8451,7 +8451,7 @@ | |||
8451 | }, | 8451 | }, |
8452 | "locked": { | 8452 | "locked": { |
8453 | "lastModified": 1, | 8453 | "lastModified": 1, |
8454 | "narHash": "sha256-qVrX9q+syZ9CtWoJCiHQTmnt8O00jb7gmPGYwN+6UJg=", | 8454 | "narHash": "sha256-duW8BSOfvL3R5Nf3uxkk2gBhgrk7IZ45usMT9YpwXFA=", |
8455 | "path": "./surfer", | 8455 | "path": "./surfer", |
8456 | "type": "path" | 8456 | "type": "path" |
8457 | }, | 8457 | }, |
@@ -9015,7 +9015,7 @@ | |||
9015 | }, | 9015 | }, |
9016 | "locked": { | 9016 | "locked": { |
9017 | "lastModified": 1, | 9017 | "lastModified": 1, |
9018 | "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", | 9018 | "narHash": "sha256-NDD53D9AJZ+7snHv/B5O9cOwtiqW2W9ADFXxafnNsgQ=", |
9019 | "path": "../../flakes/private/system", | 9019 | "path": "../../flakes/private/system", |
9020 | "type": "path" | 9020 | "type": "path" |
9021 | }, | 9021 | }, |
@@ -9034,7 +9034,7 @@ | |||
9034 | }, | 9034 | }, |
9035 | "locked": { | 9035 | "locked": { |
9036 | "lastModified": 1, | 9036 | "lastModified": 1, |
9037 | "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", | 9037 | "narHash": "sha256-NDD53D9AJZ+7snHv/B5O9cOwtiqW2W9ADFXxafnNsgQ=", |
9038 | "path": "../../flakes/private/system", | 9038 | "path": "../../flakes/private/system", |
9039 | "type": "path" | 9039 | "type": "path" |
9040 | }, | 9040 | }, |
@@ -9053,7 +9053,7 @@ | |||
9053 | }, | 9053 | }, |
9054 | "locked": { | 9054 | "locked": { |
9055 | "lastModified": 1, | 9055 | "lastModified": 1, |
9056 | "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", | 9056 | "narHash": "sha256-NDD53D9AJZ+7snHv/B5O9cOwtiqW2W9ADFXxafnNsgQ=", |
9057 | "path": "../../flakes/private/system", | 9057 | "path": "../../flakes/private/system", |
9058 | "type": "path" | 9058 | "type": "path" |
9059 | }, | 9059 | }, |
@@ -9072,7 +9072,7 @@ | |||
9072 | }, | 9072 | }, |
9073 | "locked": { | 9073 | "locked": { |
9074 | "lastModified": 1, | 9074 | "lastModified": 1, |
9075 | "narHash": "sha256-7hwdpri8v4zJXxjyAL3cDLArFw/K9aZr4GrwGHUucu8=", | 9075 | "narHash": "sha256-NDD53D9AJZ+7snHv/B5O9cOwtiqW2W9ADFXxafnNsgQ=", |
9076 | "path": "../../flakes/private/system", | 9076 | "path": "../../flakes/private/system", |
9077 | "type": "path" | 9077 | "type": "path" |
9078 | }, | 9078 | }, |
diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock index 2594651..ed96f8e 100644 --- a/flakes/grocy/flake.lock +++ b/flakes/grocy/flake.lock | |||
@@ -58,7 +58,7 @@ | |||
58 | }, | 58 | }, |
59 | "locked": { | 59 | "locked": { |
60 | "lastModified": 1, | 60 | "lastModified": 1, |
61 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 61 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
62 | "path": "../mypackages", | 62 | "path": "../mypackages", |
63 | "type": "path" | 63 | "type": "path" |
64 | }, | 64 | }, |
diff --git a/flakes/mypackages/pkgs/default.nix b/flakes/mypackages/pkgs/default.nix index cd6b1a1..430a212 100644 --- a/flakes/mypackages/pkgs/default.nix +++ b/flakes/mypackages/pkgs/default.nix | |||
@@ -10,8 +10,8 @@ rec { | |||
10 | cnagios = callPackage ./cnagios {}; | 10 | cnagios = callPackage ./cnagios {}; |
11 | commento = callPackage ./commento {}; | 11 | commento = callPackage ./commento {}; |
12 | flrn = callPackage ./flrn { slang = callPackage ./slang_1 {}; }; | 12 | flrn = callPackage ./flrn { slang = callPackage ./slang_1 {}; }; |
13 | fluentd = callPackage ./fluentd {}; | 13 | #fluentd = callPackage ./fluentd {}; |
14 | fluent-bit = callPackage ./fluent-bit {}; | 14 | #fluent-bit = callPackage ./fluent-bit {}; |
15 | genius = callPackage ./genius {}; | 15 | genius = callPackage ./genius {}; |
16 | ical2html = callPackage ./ical2html {}; | 16 | ical2html = callPackage ./ical2html {}; |
17 | mtop = callPackage ./mtop {}; | 17 | mtop = callPackage ./mtop {}; |
diff --git a/flakes/mypackages/pkgs/fluent-bit/default.nix b/flakes/mypackages/pkgs/fluent-bit/default.nix deleted file mode 100644 index 390223e..0000000 --- a/flakes/mypackages/pkgs/fluent-bit/default.nix +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | { lib, stdenv, fetchFromGitHub, cmake, flex, bison, pkg-config | ||
2 | , systemd, openssl, postgresql }: | ||
3 | |||
4 | stdenv.mkDerivation rec { | ||
5 | pname = "fluent-bit"; | ||
6 | version = "1.8.3"; | ||
7 | |||
8 | src = fetchFromGitHub { | ||
9 | owner = "fluent"; | ||
10 | repo = "fluent-bit"; | ||
11 | rev = "v${version}"; | ||
12 | sha256 = "004x135imja67babmmpkk1jpp5xwhfa8cwg1svaas2asq6cnv77d"; | ||
13 | }; | ||
14 | |||
15 | nativeBuildInputs = [ cmake flex bison pkg-config postgresql ]; | ||
16 | |||
17 | buildInputs = [ openssl ] | ||
18 | ++ lib.optionals stdenv.isLinux [ systemd ]; | ||
19 | |||
20 | cmakeFlags = [ "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" "-DFLB_SQLDB=ON" "-DFLB_OUT_PGSQL=ON" "-DFLB_IN_SYSTEMD=ON" ]; | ||
21 | |||
22 | patches = lib.optionals stdenv.isDarwin [ ./fix-luajit-darwin.patch ]; | ||
23 | |||
24 | NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ | ||
25 | # _FORTIFY_SOURCE requires compiling with optimization (-O) | ||
26 | "-O" | ||
27 | # Needed due to bundled mbedtls | ||
28 | "-Wno-error=format" | ||
29 | "-Wno-error=format-truncation" | ||
30 | ]; | ||
31 | |||
32 | |||
33 | outputs = [ "out" "dev" ]; | ||
34 | |||
35 | postPatch = '' | ||
36 | substituteInPlace src/CMakeLists.txt \ | ||
37 | --replace /lib/systemd $out/lib/systemd | ||
38 | ''; | ||
39 | |||
40 | meta = with lib; { | ||
41 | description = "Log forwarder and processor, part of Fluentd ecosystem"; | ||
42 | homepage = "https://fluentbit.io"; | ||
43 | maintainers = with maintainers; [ samrose fpletz ]; | ||
44 | license = licenses.asl20; | ||
45 | platforms = platforms.unix; | ||
46 | }; | ||
47 | } | ||
diff --git a/flakes/mypackages/pkgs/fluentd/Gemfile b/flakes/mypackages/pkgs/fluentd/Gemfile deleted file mode 100644 index 71486df..0000000 --- a/flakes/mypackages/pkgs/fluentd/Gemfile +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | source "https://rubygems.org" | ||
2 | |||
3 | gem 'fluentd' | ||
diff --git a/flakes/mypackages/pkgs/fluentd/Gemfile.lock b/flakes/mypackages/pkgs/fluentd/Gemfile.lock deleted file mode 100644 index 3f022cf..0000000 --- a/flakes/mypackages/pkgs/fluentd/Gemfile.lock +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | GEM | ||
2 | remote: https://rubygems.org/ | ||
3 | specs: | ||
4 | concurrent-ruby (1.1.9) | ||
5 | cool.io (1.7.1) | ||
6 | fluentd (1.13.3) | ||
7 | bundler | ||
8 | cool.io (>= 1.4.5, < 2.0.0) | ||
9 | http_parser.rb (>= 0.5.1, < 0.8.0) | ||
10 | msgpack (>= 1.3.1, < 2.0.0) | ||
11 | serverengine (>= 2.2.2, < 3.0.0) | ||
12 | sigdump (~> 0.2.2) | ||
13 | strptime (>= 0.2.2, < 1.0.0) | ||
14 | tzinfo (>= 1.0, < 3.0) | ||
15 | tzinfo-data (~> 1.0) | ||
16 | webrick (>= 1.4.2, < 1.8.0) | ||
17 | yajl-ruby (~> 1.0) | ||
18 | http_parser.rb (0.7.0) | ||
19 | msgpack (1.4.2) | ||
20 | serverengine (2.2.4) | ||
21 | sigdump (~> 0.2.2) | ||
22 | sigdump (0.2.4) | ||
23 | strptime (0.2.5) | ||
24 | tzinfo (2.0.4) | ||
25 | concurrent-ruby (~> 1.0) | ||
26 | tzinfo-data (1.2021.1) | ||
27 | tzinfo (>= 1.0.0) | ||
28 | webrick (1.7.0) | ||
29 | yajl-ruby (1.4.1) | ||
30 | |||
31 | PLATFORMS | ||
32 | x86_64-linux | ||
33 | |||
34 | DEPENDENCIES | ||
35 | fluentd | ||
36 | |||
37 | BUNDLED WITH | ||
38 | 2.2.20 | ||
diff --git a/flakes/mypackages/pkgs/fluentd/default.nix b/flakes/mypackages/pkgs/fluentd/default.nix deleted file mode 100644 index f6a22f0..0000000 --- a/flakes/mypackages/pkgs/fluentd/default.nix +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | { ruby, bundlerEnv, bundlerUpdateScript, lib }: | ||
2 | |||
3 | bundlerEnv { | ||
4 | inherit ruby; | ||
5 | |||
6 | pname = "fluentd"; | ||
7 | gemdir = ./.; | ||
8 | |||
9 | passthru.updateScript = bundlerUpdateScript "fluentd"; | ||
10 | |||
11 | copyGemFiles = true; | ||
12 | |||
13 | meta = with lib; { | ||
14 | description = "A data collector"; | ||
15 | homepage = "https://www.fluentd.org/"; | ||
16 | license = licenses.asl20; | ||
17 | maintainers = with maintainers; [ offline nicknovitski ]; | ||
18 | platforms = platforms.unix; | ||
19 | }; | ||
20 | } | ||
diff --git a/flakes/mypackages/pkgs/fluentd/gemset.nix b/flakes/mypackages/pkgs/fluentd/gemset.nix deleted file mode 100644 index 8ee42b6..0000000 --- a/flakes/mypackages/pkgs/fluentd/gemset.nix +++ /dev/null | |||
@@ -1,126 +0,0 @@ | |||
1 | { | ||
2 | concurrent-ruby = { | ||
3 | groups = ["default"]; | ||
4 | platforms = []; | ||
5 | source = { | ||
6 | remotes = ["https://rubygems.org"]; | ||
7 | sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; | ||
8 | type = "gem"; | ||
9 | }; | ||
10 | version = "1.1.9"; | ||
11 | }; | ||
12 | "cool.io" = { | ||
13 | groups = ["default"]; | ||
14 | platforms = []; | ||
15 | source = { | ||
16 | remotes = ["https://rubygems.org"]; | ||
17 | sha256 = "0dfq4h168wzvs9cvn2mm8648ynkl936pgjva2p8ik34p6d620537"; | ||
18 | type = "gem"; | ||
19 | }; | ||
20 | version = "1.7.1"; | ||
21 | }; | ||
22 | fluentd = { | ||
23 | dependencies = ["cool.io" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "webrick" "yajl-ruby"]; | ||
24 | groups = ["default"]; | ||
25 | platforms = []; | ||
26 | source = { | ||
27 | remotes = ["https://rubygems.org"]; | ||
28 | sha256 = "12k9b9903x5fi3lqb41h20qx8s0fwx7chjldbxmyi7j1x6xdm7cv"; | ||
29 | type = "gem"; | ||
30 | }; | ||
31 | version = "1.13.3"; | ||
32 | }; | ||
33 | "http_parser.rb" = { | ||
34 | groups = ["default"]; | ||
35 | platforms = []; | ||
36 | source = { | ||
37 | remotes = ["https://rubygems.org"]; | ||
38 | sha256 = "1xha614fi6l04wryqjj1xmpalzlmhb6lb9qmlh8mmliycdhvcshp"; | ||
39 | type = "gem"; | ||
40 | }; | ||
41 | version = "0.7.0"; | ||
42 | }; | ||
43 | msgpack = { | ||
44 | groups = ["default"]; | ||
45 | platforms = []; | ||
46 | source = { | ||
47 | remotes = ["https://rubygems.org"]; | ||
48 | sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; | ||
49 | type = "gem"; | ||
50 | }; | ||
51 | version = "1.4.2"; | ||
52 | }; | ||
53 | serverengine = { | ||
54 | dependencies = ["sigdump"]; | ||
55 | groups = ["default"]; | ||
56 | platforms = []; | ||
57 | source = { | ||
58 | remotes = ["https://rubygems.org"]; | ||
59 | sha256 = "1gzhggx40a53mnv4f32xag4h6ai0s5m3w06s59b0h6ih7rqvwns9"; | ||
60 | type = "gem"; | ||
61 | }; | ||
62 | version = "2.2.4"; | ||
63 | }; | ||
64 | sigdump = { | ||
65 | groups = ["default"]; | ||
66 | platforms = []; | ||
67 | source = { | ||
68 | remotes = ["https://rubygems.org"]; | ||
69 | sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb"; | ||
70 | type = "gem"; | ||
71 | }; | ||
72 | version = "0.2.4"; | ||
73 | }; | ||
74 | strptime = { | ||
75 | groups = ["default"]; | ||
76 | platforms = []; | ||
77 | source = { | ||
78 | remotes = ["https://rubygems.org"]; | ||
79 | sha256 = "1ycs0xz58kymf7yp4h56f0nid2z7g3s18dj7pa3p790pfzzpgvcq"; | ||
80 | type = "gem"; | ||
81 | }; | ||
82 | version = "0.2.5"; | ||
83 | }; | ||
84 | tzinfo = { | ||
85 | dependencies = ["concurrent-ruby"]; | ||
86 | groups = ["default"]; | ||
87 | platforms = []; | ||
88 | source = { | ||
89 | remotes = ["https://rubygems.org"]; | ||
90 | sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; | ||
91 | type = "gem"; | ||
92 | }; | ||
93 | version = "2.0.4"; | ||
94 | }; | ||
95 | tzinfo-data = { | ||
96 | dependencies = ["tzinfo"]; | ||
97 | groups = ["default"]; | ||
98 | platforms = []; | ||
99 | source = { | ||
100 | remotes = ["https://rubygems.org"]; | ||
101 | sha256 = "0ik16lnsyr2739jzwl4r5sz8q639lqw8f9s68iszwhm2pcq8p4w2"; | ||
102 | type = "gem"; | ||
103 | }; | ||
104 | version = "1.2021.1"; | ||
105 | }; | ||
106 | webrick = { | ||
107 | groups = ["default"]; | ||
108 | platforms = []; | ||
109 | source = { | ||
110 | remotes = ["https://rubygems.org"]; | ||
111 | sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; | ||
112 | type = "gem"; | ||
113 | }; | ||
114 | version = "1.7.0"; | ||
115 | }; | ||
116 | yajl-ruby = { | ||
117 | groups = ["default"]; | ||
118 | platforms = []; | ||
119 | source = { | ||
120 | remotes = ["https://rubygems.org"]; | ||
121 | sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; | ||
122 | type = "gem"; | ||
123 | }; | ||
124 | version = "1.4.1"; | ||
125 | }; | ||
126 | } \ No newline at end of file | ||
diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock index 04ae5fa..6bf1c7f 100644 --- a/flakes/private/system/flake.lock +++ b/flakes/private/system/flake.lock | |||
@@ -69,7 +69,7 @@ | |||
69 | }, | 69 | }, |
70 | "locked": { | 70 | "locked": { |
71 | "lastModified": 1, | 71 | "lastModified": 1, |
72 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 72 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
73 | "path": "../../mypackages", | 73 | "path": "../../mypackages", |
74 | "type": "path" | 74 | "type": "path" |
75 | }, | 75 | }, |
diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock index a1171d9..b5df46c 100644 --- a/flakes/surfer/flake.lock +++ b/flakes/surfer/flake.lock | |||
@@ -41,7 +41,7 @@ | |||
41 | }, | 41 | }, |
42 | "locked": { | 42 | "locked": { |
43 | "lastModified": 1, | 43 | "lastModified": 1, |
44 | "narHash": "sha256-CjP3h4umx1M2svQHDjV9g4R4+Hco50/KTTGDNC/t4ac=", | 44 | "narHash": "sha256-xPdsoBz6YS4L5BgtF+2ZsYq7ELhx/aEOG1nEEqSZetE=", |
45 | "path": "../mypackages", | 45 | "path": "../mypackages", |
46 | "type": "path" | 46 | "type": "path" |
47 | }, | 47 | }, |