diff --git a/flake.lock b/flake.lock index e3a2628..be40ade 100644 --- a/flake.lock +++ b/flake.lock @@ -110,6 +110,27 @@ "type": "path" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "openconnect-sso", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703863825, + "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -148,24 +169,66 @@ "openconnect-sso": { "inputs": { "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" - ] + ], + "poetry2nix": "poetry2nix", + "systems": "systems_2", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1692692901, - "narHash": "sha256-JFVvTw11KFnrd/A5z3QCh30ac9MZG+ojDY3udAFpmCE=", - "owner": "vlaci", + "lastModified": 1701455376, + "narHash": "sha256-FMLrMdi6JY7ZfqV5XnNj64jnDcGKznKZLn7O6OMO3u0=", + "owner": "ThinkChaos", "repo": "openconnect-sso", - "rev": "94128073ef49acb3bad84a2ae19fdef926ab7bdf", + "rev": "20c0015c4264c72cc19ac272de0dc534309bd21b", "type": "github" }, "original": { - "owner": "vlaci", + "owner": "ThinkChaos", + "ref": "fix/nix-flake", "repo": "openconnect-sso", "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": [ + "openconnect-sso", + "flake-utils" + ], + "nix-github-actions": [ + "openconnect-sso", + "nix-github-actions" + ], + "nixpkgs": [ + "openconnect-sso", + "nixpkgs" + ], + "systems": [ + "openconnect-sso", + "systems" + ], + "treefmt-nix": [ + "openconnect-sso", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1703546497, + "narHash": "sha256-CN/7HaEmHz+akXKejkRVhsxAm6HPGOmYBWMtgMkuROA=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "528d500ea826383cc126a9be1e633fc92b19ce5d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -190,6 +253,42 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "openconnect-sso", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704233915, + "narHash": "sha256-GYDC4HjyVizxnyKRbkrh1GugGp8PP3+fJuh40RPCN7k=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e434da615ef74187ba003b529cc72f425f5d941e", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 43a8f52..4fa1c86 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; openconnect-sso = { - url = "github:vlaci/openconnect-sso"; + url = "github:ThinkChaos/openconnect-sso/fix/nix-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; cyrus-sasl-xoauth2 = { @@ -41,7 +41,6 @@ inherit system; config.allowUnfree = true; overlays = [ - inputs.openconnect-sso.overlay (final: prev: { emacs-vterm = ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages diff --git a/modules/software.nix b/modules/software.nix index b53bc0f..3237d5e 100644 --- a/modules/software.nix +++ b/modules/software.nix @@ -91,7 +91,7 @@ in { # Overlays cachix # Networking - openconnect-sso + inputs.openconnect-sso.packages.${config.nixpkgs.localSystem.system}.default # Budgeting beancount beancount-language-server