tlaternet/tlaternet-server
1
0
Fork 0
Code Issues11 Pull requests Releases Activity

bump: Update inputs

Browse source
This commit is contained in:
Tristan Daniël Maat 2025-02-16 18:35:16 +08:00
parent b93ea1aaca
commit 3c7b6a7163
Signed by: tlater
GPG key ID: 49670FD774E43268
5 changed files with 23 additions and 46 deletions
flake.lockflake.nix
modules/crowdsec
default.nix
pkgs/crowdsec/_sources
generated.jsongenerated.nix

41
flake.lock
View file

@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737038063, "lastModified": 1739634831,
"narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", "narHash": "sha256-xFnU+uUl48Icas2wPQ+ZzlL2O3n8f6J2LrzNK9f2nng=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", "rev": "fa5746ecea1772cf59b3f34c5816ab3531478142",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -190,29 +190,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-crowdsec": {
"locked": {
"lastModified": 1738085579,
"narHash": "sha256-7mLjMrOiiIi0vI7BJwbEipYQzwA7JF/NWHP+LM4q5S8=",
"owner": "tlater",
"repo": "nixpkgs",
"rev": "426a7afc9a6ecfdac544bda4022acef31e36df34",
"type": "github"
},
"original": {
"owner": "tlater",
"ref": "tlater/fix-crowdsec",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1737192615, "lastModified": 1739611738,
"narHash": "sha256-jtucJjcdryEZQw1g0RThPSPxCdWNHF42sLp8pmMMGDs=", "narHash": "sha256-3bnOIZz8KXtzcaXGuH9Eriv0HiQyr1EIfcye+VHLQZE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "09c71b16e6efc9e90edae7eb8b63348702ff9a85", "rev": "31ff66eb77d02e9ac34b7256a02edb1c43fb9998",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,11 +208,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1737171713, "lastModified": 1739578539,
"narHash": "sha256-9mWmMXCto7e8U9hM8ZFozElv4dgOMTe308SSc7rEEFs=", "narHash": "sha256-jGiez5BtGGJUB/LXzRa+4AQurMO9acc1B69kBfgQhJc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8773174492fc61571b578f34a59953baba46471a", "rev": "30d4471a8a2a13b716530d3aad60b9846ea5ff83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,7 +310,6 @@
"disko": "disko", "disko": "disko",
"foundryvtt": "foundryvtt", "foundryvtt": "foundryvtt",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-crowdsec": "nixpkgs-crowdsec",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sonnenshift": "sonnenshift", "sonnenshift": "sonnenshift",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@ -401,11 +384,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737107480, "lastModified": 1739262228,
"narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -26,8 +26,6 @@
url = "git+ssh://git@github.com/sonnenshift/battery-manager"; url = "git+ssh://git@github.com/sonnenshift/battery-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs-crowdsec.url = "github:tlater/nixpkgs/tlater/fix-crowdsec";
}; };
outputs = outputs =
@ -106,7 +104,6 @@
in in
{ {
default = vm.config.system.build.vm; default = vm.config.system.build.vm;
crowdsec = pkgs.callPackage "${inputs.nixpkgs-crowdsec}/pkgs/by-name/cr/crowdsec/package.nix" { };
crowdsec-hub = localPkgs.crowdsec.hub; crowdsec-hub = localPkgs.crowdsec.hub;
crowdsec-firewall-bouncer = localPkgs.crowdsec.firewall-bouncer; crowdsec-firewall-bouncer = localPkgs.crowdsec.firewall-bouncer;
}; };

9
modules/crowdsec/default.nix
View file

@ -1,5 +1,4 @@
{ {
flake-inputs,
pkgs, pkgs,
lib, lib,
config, config,
@ -9,8 +8,6 @@ let
cfg = config.security.crowdsec; cfg = config.security.crowdsec;
settingsFormat = pkgs.formats.yaml { }; settingsFormat = pkgs.formats.yaml { };
crowdsec = flake-inputs.self.packages.${pkgs.system}.crowdsec;
hub = pkgs.fetchFromGitHub { hub = pkgs.fetchFromGitHub {
owner = "crowdsecurity"; owner = "crowdsecurity";
repo = "hub"; repo = "hub";
@ -19,14 +16,14 @@ let
}; };
cscli = pkgs.writeShellScriptBin "cscli" '' cscli = pkgs.writeShellScriptBin "cscli" ''
export PATH="$PATH:${crowdsec}/bin/" export PATH="$PATH:${cfg.package}/bin/"
sudo=exec sudo=exec
if [ "$USER" != "crowdsec" ]; then if [ "$USER" != "crowdsec" ]; then
sudo='exec /run/wrappers/bin/sudo -u crowdsec' sudo='exec /run/wrappers/bin/sudo -u crowdsec'
fi fi
$sudo ${crowdsec}/bin/cscli "$@" $sudo ${cfg.package}/bin/cscli "$@"
''; '';
acquisitions = '' acquisitions = ''
@ -53,7 +50,7 @@ in
package = lib.mkOption { package = lib.mkOption {
type = package; type = package;
default = crowdsec; default = pkgs.crowdsec;
}; };
stateDirectory = lib.mkOption { stateDirectory = lib.mkOption {

8
pkgs/crowdsec/_sources/generated.json
View file

@ -21,7 +21,7 @@
}, },
"crowdsec-hub": { "crowdsec-hub": {
"cargoLocks": null, "cargoLocks": null,
"date": "2025-01-30", "date": "2025-02-16",
"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": "8f102f5ac79af59d3024ca2771b65ec87411ac02", "rev": "f7d7f476f88a4af05e1cfb3994536990adecfb57",
"sha256": "sha256-8K1HkBg0++Au1dr2KMrl9b2ruqXdo+vqWngOCwL11Mo=", "sha256": "sha256-m78uipryHDKixJzrF4K59ioAJ3WJN1JlXEC0DNVMCJ8=",
"type": "github" "type": "github"
}, },
"version": "8f102f5ac79af59d3024ca2771b65ec87411ac02" "version": "f7d7f476f88a4af05e1cfb3994536990adecfb57"
} }
} }

8
pkgs/crowdsec/_sources/generated.nix
View file

@ -14,14 +14,14 @@
}; };
crowdsec-hub = { crowdsec-hub = {
pname = "crowdsec-hub"; pname = "crowdsec-hub";
version = "8f102f5ac79af59d3024ca2771b65ec87411ac02"; version = "f7d7f476f88a4af05e1cfb3994536990adecfb57";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crowdsecurity"; owner = "crowdsecurity";
repo = "hub"; repo = "hub";
rev = "8f102f5ac79af59d3024ca2771b65ec87411ac02"; rev = "f7d7f476f88a4af05e1cfb3994536990adecfb57";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-8K1HkBg0++Au1dr2KMrl9b2ruqXdo+vqWngOCwL11Mo="; sha256 = "sha256-m78uipryHDKixJzrF4K59ioAJ3WJN1JlXEC0DNVMCJ8=";
}; };
date = "2025-01-30"; date = "2025-02-16";
}; };
} }