diff --git a/auth/auth.nix b/auth/auth.nix index 6e72b48..296d81a 100644 --- a/auth/auth.nix +++ b/auth/auth.nix @@ -1,4 +1,4 @@ -nixpkgs-2411: { config, lib, pkgs, ... }: +nixos-unstable: { config, lib, pkgs, ... }: let domain = config.selfprivacy.domain; subdomain = "auth"; @@ -85,11 +85,10 @@ lib.mkIf config.selfprivacy.sso.enable { nixpkgs.overlays = [ ( _final: prev: { - inherit (nixpkgs-2411.legacyPackages.${prev.system}) kanidm; - kanidm-provision = - (nixpkgs-2411.legacyPackages.${prev.system}).callPackage - ./kanidm-provision.nix - { }; + inherit (nixos-unstable.legacyPackages.${prev.system}) + kanidm + kanidm-provision + ; } ) ]; diff --git a/auth/kanidm-provision.nix b/auth/kanidm-provision.nix deleted file mode 100644 index fe09d0e..0000000 --- a/auth/kanidm-provision.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - yq, - versionCheckHook, - nix-update-script, - nixosTests, -}: - -rustPlatform.buildRustPackage rec { - pname = "kanidm-provision"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "oddlama"; - repo = "kanidm-provision"; - tag = "v${version}"; - hash = "sha256-+NQJEAJ0DqKEV1cYZN7CLzGoBJNUL3SQAMmxRQG5DMI="; - }; - - postPatch = '' - tomlq -ti '.package.version = "${version}"' Cargo.toml - ''; - - useFetchCargoVendor = true; - cargoHash = "sha256-uo/TGyfNChq/t6Dah0HhXhAwktyQk0V/wewezZuftNk="; - - nativeBuildInputs = [ - yq # for `tomlq` - ]; - - nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgramArg = "--version"; - doInstallCheck = true; - - passthru = { - tests = { inherit (nixosTests) kanidm-provisioning; }; - updateScript = nix-update-script { }; - }; - - meta = { - description = "A small utility to help with kanidm provisioning"; - homepage = "https://github.com/oddlama/kanidm-provision"; - license = with lib.licenses; [ - asl20 - mit - ]; - maintainers = with lib.maintainers; [ oddlama ]; - mainProgram = "kanidm-provision"; - }; -} diff --git a/flake.lock b/flake.lock index 43f5b56..8650115 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "nixos-unstable": { + "locked": { + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1734835170, @@ -15,26 +31,10 @@ "type": "github" } }, - "nixpkgs-2411": { - "locked": { - "lastModified": 1738435198, - "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { + "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs", - "nixpkgs-2411": "nixpkgs-2411", "selfprivacy-api": "selfprivacy-api" } }, diff --git a/flake.nix b/flake.nix index 5a526a6..238d422 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = github:nixos/nixpkgs; - nixpkgs-2411.url = github:nixos/nixpkgs/nixos-24.11; + nixos-unstable.url = github:nixos/nixpkgs/nixos-unstable; selfprivacy-api.url = git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git; @@ -11,7 +11,7 @@ selfprivacy-api.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, nixpkgs-2411, selfprivacy-api }: { + outputs = { self, nixpkgs, nixos-unstable, selfprivacy-api }: { nixosConfigurations-fun = { hardware-configuration , deployment @@ -25,7 +25,7 @@ hardware-configuration deployment ./configuration.nix - (import ./auth/auth.nix nixpkgs-2411) + (import ./auth/auth.nix nixos-unstable) { disabledModules = [ "services/security/kanidm.nix" ]; imports = [ ./auth/kanidm.nix ];