Update #144

Manually merged
tlater merged 4 commits from tlater/update into master 2025-05-19 18:30:15 +01:00
6 changed files with 58 additions and 55 deletions
configuration/services
flake.lockflake.nix
pkgs/crowdsec/_sources

View file

@ -20,7 +20,7 @@ in
services.matrix-conduit = { services.matrix-conduit = {
enable = true; enable = true;
package = flake-inputs.conduwuit.packages.${pkgs.system}.default; package = flake-inputs.continuwuity.packages.${pkgs.system}.default;
settings.global = { settings.global = {
address = "127.0.0.1"; address = "127.0.0.1";
server_name = domain; server_name = domain;

View file

@ -97,4 +97,6 @@ in
# - postgres (?) # - postgres (?)
# - ssl_exporter (?) # - ssl_exporter (?)
}; };
services.dbus.implementation = "broker";
} }

89
flake.lock generated
View file

@ -49,17 +49,17 @@
"cachix_2": { "cachix_2": {
"inputs": { "inputs": {
"devenv": [ "devenv": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"devenv" "devenv"
], ],
"flake-compat": [ "flake-compat": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"devenv" "devenv"
], ],
"git-hooks": [ "git-hooks": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"devenv" "devenv"
], ],
@ -199,7 +199,7 @@
"type": "github" "type": "github"
} }
}, },
"conduwuit": { "continuwuity": {
"inputs": { "inputs": {
"attic": "attic", "attic": "attic",
"cachix": "cachix", "cachix": "cachix",
@ -216,23 +216,24 @@
"rocksdb": "rocksdb" "rocksdb": "rocksdb"
}, },
"locked": { "locked": {
"lastModified": 1743735594, "lastModified": 1745186840,
"narHash": "sha256-aaP8OjY4fkpxk2JdSggx9S3Rk+P+VhuivT6aRpLxoj0=", "narHash": "sha256-Oq2scBu3Ewao828BT1QGffqIqF5WoH9HMXEXKg1YU0o=",
"owner": "girlbossceo", "ref": "refs/tags/v0.5.0-rc.5",
"repo": "conduwuit", "rev": "0a0f327ae034f5c44b12a3154cc1143aff10291c",
"rev": "00f7745ec4ebcea5f892376c5de5db1299f71696", "revCount": 5147,
"type": "github" "type": "git",
"url": "https://forgejo.ellis.link/continuwuation/continuwuity.git"
}, },
"original": { "original": {
"owner": "girlbossceo", "ref": "refs/tags/v0.5.0-rc.5",
"repo": "conduwuit", "type": "git",
"type": "github" "url": "https://forgejo.ellis.link/continuwuation/continuwuity.git"
} }
}, },
"crane": { "crane": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"conduwuit", "continuwuity",
"attic", "attic",
"nixpkgs" "nixpkgs"
] ]
@ -390,18 +391,18 @@
"inputs": { "inputs": {
"cachix": "cachix_2", "cachix": "cachix_2",
"flake-compat": [ "flake-compat": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"flake-compat" "flake-compat"
], ],
"git-hooks": [ "git-hooks": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"git-hooks" "git-hooks"
], ],
"nix": "nix", "nix": "nix",
"nixpkgs": [ "nixpkgs": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"nixpkgs" "nixpkgs"
] ]
@ -499,11 +500,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743598667, "lastModified": 1747274630,
"narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "narHash": "sha256-87RJwXbfOHyzTB9LYagAQ6vOZhszCvd8Gvudu+gf3qo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "rev": "ec7c109a4f794fce09aad87239eab7f66540b888",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -535,7 +536,7 @@
"fenix": { "fenix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"conduwuit", "continuwuity",
"nixpkgs" "nixpkgs"
], ],
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
@ -703,7 +704,7 @@
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"conduwuit", "continuwuity",
"attic", "attic",
"nixpkgs" "nixpkgs"
] ]
@ -725,7 +726,7 @@
"flake-parts_2": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"devenv", "devenv",
"nix", "nix",
@ -931,11 +932,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739712626, "lastModified": 1746877938,
"narHash": "sha256-u3m+awbdL+0BKk8IWidsWMr+R0ian3GZMUlH7623kd8=", "narHash": "sha256-N9J96pSPg4vbozV+ZZ++dwLnMIf2Le6ONNMO0kZCj1M=",
"owner": "reckenrode", "owner": "reckenrode",
"repo": "nix-foundryvtt", "repo": "nix-foundryvtt",
"rev": "a7fa493ba2c623cf90e83756b62285b3b58f18d2", "rev": "f1b401831d796dd94cf5a11b65fd169a199d4ff0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -947,13 +948,13 @@
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"flake-compat" "flake-compat"
], ],
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"nixpkgs" "nixpkgs"
], ],
@ -976,7 +977,7 @@
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"git-hooks", "git-hooks",
"nixpkgs" "nixpkgs"
@ -1104,7 +1105,7 @@
"nix": { "nix": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"devenv" "devenv"
], ],
@ -1112,17 +1113,17 @@
"libgit2": "libgit2", "libgit2": "libgit2",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-23-11": [ "nixpkgs-23-11": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"devenv" "devenv"
], ],
"nixpkgs-regression": [ "nixpkgs-regression": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"devenv" "devenv"
], ],
"pre-commit-hooks": [ "pre-commit-hooks": [
"conduwuit", "continuwuity",
"cachix", "cachix",
"devenv" "devenv"
] ]
@ -1161,7 +1162,7 @@
"nix-github-actions": { "nix-github-actions": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"conduwuit", "continuwuity",
"attic", "attic",
"nixpkgs" "nixpkgs"
] ]
@ -1278,11 +1279,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1743732435, "lastModified": 1747413287,
"narHash": "sha256-RrWgOj3F1N6kDG0xatvZzP0p1Zq00yhcTMlaj4bWi5E=", "narHash": "sha256-hOnqJr0tZBERWa29JWf9B3/8qr82mlt/UlKPvS7iYzA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a462b946265ed006720d02153882780b12a8376d", "rev": "b965e4c283060415956ccd39eee4ca34a6a56cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1400,11 +1401,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1743703532, "lastModified": 1747418223,
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "narHash": "sha256-DkCYFm09AR2+FPKcT7lD8iIMNXqTdesVvwKpCnqKiYg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bdb91860de2f719b57eef819b5617762f7120c70", "rev": "d6c9326e40bb557ebb8c040b4375590bc06413f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1631,7 +1632,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"conduwuit": "conduwuit", "continuwuity": "continuwuity",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"foundryvtt": "foundryvtt", "foundryvtt": "foundryvtt",
@ -1727,11 +1728,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743756170, "lastModified": 1746485181,
"narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=", "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d", "rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -4,8 +4,8 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11-small"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11-small";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
conduwuit = { continuwuity = {
url = "github:girlbossceo/conduwuit"; url = "git+https://forgejo.ellis.link/continuwuation/continuwuity.git?ref=refs/tags/v0.5.0-rc.5";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
disko = { disko = {

View file

@ -21,7 +21,7 @@
}, },
"crowdsec-hub": { "crowdsec-hub": {
"cargoLocks": null, "cargoLocks": null,
"date": "2025-04-04", "date": "2025-05-17",
"extract": null, "extract": null,
"name": "crowdsec-hub", "name": "crowdsec-hub",
"passthru": null, "passthru": null,
@ -33,10 +33,10 @@
"name": null, "name": null,
"owner": "crowdsecurity", "owner": "crowdsecurity",
"repo": "hub", "repo": "hub",
"rev": "eebc5f71379ea8f4de4a26f6695e0340444c719c", "rev": "850614b9fcd4298f559b422c5ac685a69aa2e5ff",
"sha256": "sha256-/jhsqumekdOHDbHjBP8KvAICsSNhCg5ejMT3jSRiROo=", "sha256": "sha256-96MMwFN5KongQA3YJVSuk7Kanbr1gR94CCyiflmez2k=",
"type": "github" "type": "github"
}, },
"version": "eebc5f71379ea8f4de4a26f6695e0340444c719c" "version": "850614b9fcd4298f559b422c5ac685a69aa2e5ff"
} }
} }

View file

@ -14,14 +14,14 @@
}; };
crowdsec-hub = { crowdsec-hub = {
pname = "crowdsec-hub"; pname = "crowdsec-hub";
version = "eebc5f71379ea8f4de4a26f6695e0340444c719c"; version = "850614b9fcd4298f559b422c5ac685a69aa2e5ff";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crowdsecurity"; owner = "crowdsecurity";
repo = "hub"; repo = "hub";
rev = "eebc5f71379ea8f4de4a26f6695e0340444c719c"; rev = "850614b9fcd4298f559b422c5ac685a69aa2e5ff";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-/jhsqumekdOHDbHjBP8KvAICsSNhCg5ejMT3jSRiROo="; sha256 = "sha256-96MMwFN5KongQA3YJVSuk7Kanbr1gR94CCyiflmez2k=";
}; };
date = "2025-04-04"; date = "2025-05-17";
}; };
} }