privatevoid.net/depot
1
1
Fork 0
Code Issues 18 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

Merge pull request #87 from privatevoid-net/pr-flake-update

Browse source 
`flake.lock`: Update
This commit is contained in:
hercules-ci[bot] 2023-10-19 21:48:21 +00:00 committed by GitHub
commit e09cdb52ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
flake.lock
View file

@ -9,11 +9,11 @@
]
},
"locked": {
"lastModified": 1690228878,
"narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
"lastModified": 1696775529,
"narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
"owner": "ryantm",
"repo": "agenix",
"rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
"rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
"type": "github"
},
"original": {
@ -157,11 +157,11 @@
]
},
"locked": {
"lastModified": 1692793255,
"narHash": "sha256-yVyj0AE280JkccDHuG1XO9oGxN6bW8ksr/xttXcXzK0=",
"lastModified": 1695973661,
"narHash": "sha256-BP2H4c42GThPIhERtTpV1yCtwQHYHEKdRu7pjrmQAwo=",
"owner": "numtide",
"repo": "devshell",
"rev": "2aa26972b951bc05c3632d4e5ae683cb6771a7c6",
"rev": "cd4e2fda3150dd2f689caeac07b7f47df5197c31",
"type": "github"
},
"original": {
@ -233,11 +233,11 @@
]
},
"locked": {
"lastModified": 1690933134,
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
"lastModified": 1696343447,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github"
},
"original": {
@ -271,15 +271,16 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1693397971,
"narHash": "sha256-P5PQ8KzK/SXvEsw+AzG7OBUgnGhuUzKETNHhqVokc+0=",
"lastModified": 1697205329,
"narHash": "sha256-WvMtyx5fBgPOlaPN2BnD6MRIHuy1nsoz2uhSstr7xpg=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "344b8b1079731a8c1e144119174f684fb492e03a",
"rev": "3f076fe6678a713fb342f0742717bee6c7fe597d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"ref": "experimental-0.10",
"repo": "hercules-ci-agent",
"type": "github"
}
@ -297,11 +298,11 @@
]
},
"locked": {
"lastModified": 1689397210,
"narHash": "sha256-fVxZnqxMbsDkB4GzGAs/B41K0wt/e+B/fLxmTFF/S20=",
"lastModified": 1697031886,
"narHash": "sha256-oTMPX8dGC7yxSwrbF4NuPNQsUEcHB1dusW2yEbFD5zg=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "0a63bfa3f00a3775ea3a6722b247880f1ffe91ce",
"rev": "178b36dc3a75c96efc25477d45eafc37ba1fafc3",
"type": "github"
},
"original": {
@ -402,11 +403,11 @@
},
"nix-filter": {
"locked": {
"lastModified": 1687178632,
"narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
"lastModified": 1694857738,
"narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
"rev": "41fd48e00c22b4ced525af521ead8792402de0ea",
"type": "github"
},
"original": {
@ -428,11 +429,11 @@
},
"locked": {
"host": "git.privatevoid.net",
"lastModified": 1692913762,
"narHash": "sha256-WIz/rGYBUdRtkZx5BPbE9DXHfUCKlYuKkPzDsP4u77w=",
"lastModified": 1697392285,
"narHash": "sha256-1IBnF9IuStUWoAKJ74HNhV46+9Cbf/yZP6h6hJOJ1Cg=",
"owner": "max",
"repo": "nix-super",
"rev": "0007178284d0247631af40931b7039d42bfc0da5",
"rev": "ba035e1ea339a97e6ba6a1dd79e0c0e334240234",
"type": "gitlab"
},
"original": {
@ -460,11 +461,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1693428224,
"narHash": "sha256-FWUUlhYqkGEySUD0blTADRiDQ7fw+H1ikivfu88uy+w=",
"lastModified": 1697406421,
"narHash": "sha256-Ithak4MM2iF66QCHgoozetW3gnPle3Nny/12bNAFLkQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "841889913dfd06a70ffb39f603e29e46f45f0c1a",
"rev": "6f87c4d764f400d76bafab0f2d940e93aff91a73",
"type": "github"
},
"original": {
@ -481,11 +482,11 @@
]
},
"locked": {
"lastModified": 1692799911,
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -87,7 +87,7 @@
};
hercules-ci-agent = {
url = "github:hercules-ci/hercules-ci-agent";
url = "github:hercules-ci/hercules-ci-agent/experimental-0.10";
inputs = {
flake-parts.follows = "flake-parts";
};

3
packages/checks/ascensions.nix
View file

@ -81,7 +81,7 @@ testers.runNixOSTest {
node2.imports = [ common ];
};
testScript = /*python*/ ''
start_all()
node1.start()
consul.wait_for_unit("consul.service")
consul.wait_until_succeeds("CONSUL_HTTP_ADDR=consul:8500 consul members")
node1.wait_for_unit("multi-user.target")
@ -89,6 +89,7 @@ testers.runNixOSTest {
node1.succeed("tar cvf /tmp/shared/data.tar /data /var/lib/ascensions")
node2.wait_for_unit("multi-user.target")
node2.succeed("rm -rf /data")
node2.succeed("tar xvf /tmp/shared/data.tar -C /")
node2.succeed("systemctl start create-file create-kv")

1
packages/checks/jellyfin-stateless.nix
View file

@ -15,6 +15,7 @@ nixosTest {
machine.wait_for_unit("jellyfin.service")
machine.wait_for_open_port(8096)
machine.wait_until_succeeds("curl --fail http://127.0.0.1:8096")
machine.wait_until_succeeds("test -e /var/lib/jellyfin/config/encoding.xml")
def stop_jf():
machine.succeed("systemctl stop jellyfin.service")

8
packages/patched-derivations.nix
View file

@ -85,7 +85,13 @@ super: rec {
postgresql = super.postgresql_14;
powerdns-admin = patch super.powerdns-admin "patches/base/powerdns-admin";
powerdns-admin = let
package = super.powerdns-admin.override {
python3 = super.python3.override {
packageOverrides = _: _: { python3-saml = null; };
};
};
in patch package "patches/base/powerdns-admin";
prometheus-jitsi-exporter = patch super.prometheus-jitsi-exporter "patches/base/prometheus-jitsi-exporter";