Compare commits

...

6 commits

Author SHA1 Message Date
Max
064f306f10 cluster/services/irc: pkgs.kanidm -> config.services.kanidm.package 2024-08-02 12:51:05 +02:00
Max
5b429dd356 cluster/services/idm: pkgs.kanidm -> config.services.kanidm.package 2024-08-02 12:50:42 +02:00
Max
2b4df99bf8 packages: unshadow kanidm 2024-08-02 12:42:26 +02:00
Max
827ca9bbb8 packages/npins: cargoSha256 -> cargoHash 2024-08-02 12:41:19 +02:00
hercules-ci[bot]
9076ac4fc8
Merge pull request from privatevoid-net/pr-flake-update
`flake.lock`: Update
2024-08-02 02:51:57 +00:00
Hercules CI Effects
9bb1275587 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7' (2024-07-03)
  → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/43c433f2931b803dbe7853e0438ea0744ee48574' (2024-08-01)
  → 'github:NixOS/nixpkgs/f2d6c7123138044e0c68902268bd8f37dd7e2fa7' (2024-08-01)
2024-08-02 02:20:49 +00:00
5 changed files with 12 additions and 16 deletions
cluster/services
flake.lock
packages

View file

@ -27,7 +27,7 @@ in
mode = "0755";
text = ''
#!/bin/sh
exec ${pkgs.kanidm}/bin/kanidm_ssh_authorizedkeys "$@"
exec ${config.services.kanidm.package}/bin/kanidm_ssh_authorizedkeys "$@"
'';
};
@ -57,10 +57,10 @@ in
environment.systemPackages = let
idmAlias = pkgs.runCommand "kanidm-idm-alias" {} ''
mkdir -p $out/bin
ln -s ${pkgs.kanidm}/bin/kanidm $out/bin/idm
ln -s ${config.services.kanidm.package}/bin/kanidm $out/bin/idm
mkdir -p $out/share/bash-completion/completions
cat >$out/share/bash-completion/completions/idm.bash <<EOF
source ${pkgs.kanidm}/share/bash-completion/completions/kanidm.bash
source ${config.services.kanidm.package}/share/bash-completion/completions/kanidm.bash
complete -F _kanidm -o bashdefault -o default idm
EOF
'';

View file

@ -90,7 +90,7 @@ in {
security.pam.services.ngircd = {
text = ''
# verify IRC users via IDM
auth required ${pkgs.kanidm}/lib/pam_kanidm.so
auth required ${config.services.kanidm.package}/lib/pam_kanidm.so
'';
};
systemd.services.ngircd = {

12
flake.lock generated
View file

@ -194,11 +194,11 @@
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
@ -504,11 +504,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1722495206,
"narHash": "sha256-kJ/MgnoLxuVVnGcVrnZuzZ2eUasKhD7SJG/HI8ugWVQ=",
"lastModified": 1722539632,
"narHash": "sha256-g4L+I8rDl7RQy5x8XcEMqNO49LFhrHTzVBqXtG2+FGo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "43c433f2931b803dbe7853e0438ea0744ee48574",
"rev": "f2d6c7123138044e0c68902268bd8f37dd7e2fa7",
"type": "github"
},
"original": {

View file

@ -9,11 +9,7 @@
options.shadows = lib.mkOption {
type = with lib.types; lazyAttrsOf package;
default = {
inherit (self'.packages)
kanidm
;
};
default = { };
};
};
}

View file

@ -21,7 +21,7 @@ in rustPlatform.buildRustPackage rec {
inherit (src) version;
src = passthru.mkSource sources.npins;
cargoSha256 = "0rwnzkmx91cwcz9yw0rbbqv73ba6ggim9f4qgz5pgy6h696ld2k8";
cargoHash = "sha256-aIpGTTLQ+HfLf5i4VON7Rq1xNl4rA+7TZ5yF1Ov8lmc=";
buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]);
nativeBuildInputs = [ makeWrapper ];