kanidm-provision: 1.1.2 -> 1.2.0, modernize (#397130)

authored by Adam C. Stephens and committed by GitHub 1331f7a9 288383d2

+41 -9
+10
nixos/modules/services/security/kanidm.nix
··· 563 563 default = null; 564 564 }; 565 565 566 + imageFile = mkOption { 567 + description = '' 568 + Application image to display in the WebUI. 569 + Kanidm supports "image/jpeg", "image/png", "image/gif", "image/svg+xml", and "image/webp". 570 + The image will be uploaded each time kanidm-provision is run. 571 + ''; 572 + type = types.nullOr types.path; 573 + default = null; 574 + }; 575 + 566 576 enableLocalhostRedirects = mkOption { 567 577 description = "Allow localhost redirects. Only for public clients."; 568 578 type = types.bool;
+31 -9
pkgs/by-name/ka/kanidm-provision/package.nix
··· 2 2 lib, 3 3 rustPlatform, 4 4 fetchFromGitHub, 5 + yq, 6 + versionCheckHook, 7 + nix-update-script, 8 + nixosTests, 5 9 }: 6 - rustPlatform.buildRustPackage rec { 10 + 11 + rustPlatform.buildRustPackage (finalAttrs: { 7 12 pname = "kanidm-provision"; 8 - version = "1.1.2"; 13 + version = "1.2.0"; 9 14 10 15 src = fetchFromGitHub { 11 16 owner = "oddlama"; 12 17 repo = "kanidm-provision"; 13 - rev = "v${version}"; 14 - hash = "sha256-pgPjkj0nMb5j3EvyJTTDpfmh0WigAcMzoleF5EOqBAM="; 18 + tag = "v${finalAttrs.version}"; 19 + hash = "sha256-+NQJEAJ0DqKEV1cYZN7CLzGoBJNUL3SQAMmxRQG5DMI="; 15 20 }; 16 21 22 + postPatch = '' 23 + tomlq -ti '.package.version = "${finalAttrs.version}"' Cargo.toml 24 + ''; 25 + 17 26 useFetchCargoVendor = true; 18 - cargoHash = "sha256-kbctfPhEF1PdVLjE62GyLDzjOnZxH/kOWUS4x2vd/+8="; 27 + cargoHash = "sha256-uo/TGyfNChq/t6Dah0HhXhAwktyQk0V/wewezZuftNk="; 19 28 20 - meta = with lib; { 29 + nativeBuildInputs = [ 30 + yq # for `tomlq` 31 + ]; 32 + 33 + nativeInstallCheckInputs = [ versionCheckHook ]; 34 + versionCheckProgramArg = "--version"; 35 + doInstallCheck = true; 36 + 37 + passthru = { 38 + tests = { inherit (nixosTests) kanidm-provisioning; }; 39 + updateScript = nix-update-script { }; 40 + }; 41 + 42 + meta = { 21 43 description = "A small utility to help with kanidm provisioning"; 22 44 homepage = "https://github.com/oddlama/kanidm-provision"; 23 - license = with licenses; [ 45 + license = with lib.licenses; [ 24 46 asl20 25 47 mit 26 48 ]; 27 - maintainers = with maintainers; [ oddlama ]; 49 + maintainers = with lib.maintainers; [ oddlama ]; 28 50 mainProgram = "kanidm-provision"; 29 51 }; 30 - } 52 + })