depotwide: fix stuff
This commit is contained in:
parent
65d5cf0f92
commit
e25a1ba6c4
11 changed files with 2185 additions and 2370 deletions
File diff suppressed because it is too large
Load diff
|
@ -4,6 +4,6 @@ pkgs.buildGoModule {
|
||||||
pname = "authentik-server";
|
pname = "authentik-server";
|
||||||
inherit src version;
|
inherit src version;
|
||||||
|
|
||||||
vendorSha256 = "072vjqcv3ihjwj45aaf94a2wiy5vg1kxncyzhwixpfiyn617wac8";
|
vendorSha256 = "0djv6xmh3719dpzl21jhz3jraq9wl2adv6bs22hgs31jzkinx2g3";
|
||||||
subPackages = "cmd/server";
|
subPackages = "cmd/server";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,22 @@
|
||||||
{ pkgs, src, ... }:
|
{ pkgs, src, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
app = pkgs.poetry2nix.mkPoetryApplication {
|
pyproject = pkgs.runCommand "authentik-pyproject" { src = "${src}/pyproject.toml"; } ''
|
||||||
projectDir = src;
|
sed 's/extras = \["standard"\],//' $src > $out
|
||||||
|
'';
|
||||||
|
poetrylock = pkgs.runCommand "authentik-poetrylock" { src = "${src}/poetry.lock"; } ''
|
||||||
|
sed -e 's/, markers = "extra == \\\"standard\\\""//' \
|
||||||
|
-e 's/and extra == \\\"standard\\\"//' \
|
||||||
|
$src > $out
|
||||||
|
'';
|
||||||
|
fixedSrc = pkgs.runCommand "authentik-src" { inherit src; } ''
|
||||||
|
cp -R $src $out
|
||||||
|
chmod -R u+w $out
|
||||||
|
cp ${pyproject} $out/pyproject.toml
|
||||||
|
cp ${poetrylock} $out/poetry.lock
|
||||||
|
'';
|
||||||
|
app = pkgs.poetry2nix.mkPoetryApplication rec {
|
||||||
|
projectDir = fixedSrc;
|
||||||
python = pkgs.python310;
|
python = pkgs.python310;
|
||||||
overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: {
|
overrides = pkgs.poetry2nix.overrides.withDefaults (self: super: {
|
||||||
click-didyoumean = super.click-didyoumean.overridePythonAttrs (old: {
|
click-didyoumean = super.click-didyoumean.overridePythonAttrs (old: {
|
||||||
|
@ -27,6 +41,11 @@ let
|
||||||
sha256 = "1zxb12lrrl1n7ijcxl8mvv94lnhn6b52c1jx6jq9pv2fncrxf4wr";
|
sha256 = "1zxb12lrrl1n7ijcxl8mvv94lnhn6b52c1jx6jq9pv2fncrxf4wr";
|
||||||
};
|
};
|
||||||
}));
|
}));
|
||||||
|
watchfiles = self.callPackage "${pkgs.path}/pkgs/development/python-modules/watchfiles/default.nix" {};
|
||||||
|
uvicorn = (self.callPackage "${pkgs.path}/pkgs/development/python-modules/uvicorn/default.nix" {}).overridePythonAttrs (old: {
|
||||||
|
propagatedBuildInputs = old.propagatedBuildInputs ++ old.passthru.optional-dependencies.standard;
|
||||||
|
});
|
||||||
|
inherit (pkgs.python310.pkgs) ua-parser;
|
||||||
});
|
});
|
||||||
|
|
||||||
buildInputs = [ pkgs.bash ];
|
buildInputs = [ pkgs.bash ];
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -147,7 +147,7 @@ in {
|
||||||
systemd.services.nix-daemon.serviceConfig.EnvironmentFile = "/var/lib/secrets/nix-daemon/secret";
|
systemd.services.nix-daemon.serviceConfig.EnvironmentFile = "/var/lib/secrets/nix-daemon/secret";
|
||||||
services.gitlab-runner = {
|
services.gitlab-runner = {
|
||||||
enable = true;
|
enable = true;
|
||||||
concurrent = 16;
|
settings.concurrent = 16;
|
||||||
services = {
|
services = {
|
||||||
deployer = {
|
deployer = {
|
||||||
registrationConfigFile = "/var/lib/secrets/gitlab-runner-environment/secret";
|
registrationConfigFile = "/var/lib/secrets/gitlab-runner-environment/secret";
|
||||||
|
|
|
@ -246,7 +246,7 @@
|
||||||
};
|
};
|
||||||
services.gitlab-runner = {
|
services.gitlab-runner = {
|
||||||
enable = true;
|
enable = true;
|
||||||
concurrent = 1;
|
settings.concurrent = 1;
|
||||||
services = {
|
services = {
|
||||||
deployer = {
|
deployer = {
|
||||||
registrationConfigFile = config.my.vault.secrets.gitlab-runner-environment.path;
|
registrationConfigFile = config.my.vault.secrets.gitlab-runner-environment.path;
|
||||||
|
|
|
@ -67,9 +67,8 @@ in {
|
||||||
services.zfs.rollbackOnBoot.enable = true;
|
services.zfs.rollbackOnBoot.enable = true;
|
||||||
|
|
||||||
# Enable libvirtd.
|
# Enable libvirtd.
|
||||||
virtualisation.libvirtd = {
|
virtualisation.libvirtd.enable = true;
|
||||||
enable = true;
|
security.polkit.enable = true;
|
||||||
};
|
|
||||||
|
|
||||||
networking.hostName = "howl";
|
networking.hostName = "howl";
|
||||||
networking.hostId = "cdd51451";
|
networking.hostId = "cdd51451";
|
||||||
|
|
|
@ -16,7 +16,6 @@ in
|
||||||
|
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
gtkUsePortal = true;
|
|
||||||
extraPortals = with depot.pkgs; [ xdg-desktop-portal-wlr ];
|
extraPortals = with depot.pkgs; [ xdg-desktop-portal-wlr ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -114,6 +114,7 @@ in {
|
||||||
virtualisation.libvirtd = {
|
virtualisation.libvirtd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
security.polkit.enable = true;
|
||||||
|
|
||||||
networking.hostName = "porcorosso";
|
networking.hostName = "porcorosso";
|
||||||
networking.hostId = "1ee729a4";
|
networking.hostId = "1ee729a4";
|
||||||
|
|
|
@ -151,6 +151,7 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
allowedBridges = [ "virbr0" "br-ext" ];
|
allowedBridges = [ "virbr0" "br-ext" ];
|
||||||
};
|
};
|
||||||
|
security.polkit.enable = true;
|
||||||
users.users.lukegb = {
|
users.users.lukegb = {
|
||||||
packages = with depot.pkgs; [ irssi ];
|
packages = with depot.pkgs; [ irssi ];
|
||||||
extraGroups = lib.mkAfter [ "libvirtd" "acme" "podman" ];
|
extraGroups = lib.mkAfter [ "libvirtd" "acme" "podman" ];
|
||||||
|
|
1
third_party/default.nix
vendored
1
third_party/default.nix
vendored
|
@ -7,6 +7,7 @@ let
|
||||||
nixpkgsConfig = {
|
nixpkgsConfig = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
|
"python3.10-mistune-0.8.4"
|
||||||
"p7zip-16.02"
|
"p7zip-16.02"
|
||||||
];
|
];
|
||||||
packageOverrides = pkgs: {
|
packageOverrides = pkgs: {
|
||||||
|
|
Loading…
Reference in a new issue