From 5f50642031505ce5cf1b59c95fa5b997e5198dcc Mon Sep 17 00:00:00 2001 From: dish Date: Thu, 29 May 2025 16:11:34 -0400 Subject: [PATCH] [flake] remove authentik-nix and upgrade flake --- flake.lock | 315 +++++++++++++++++------------------------------------ flake.nix | 9 -- 2 files changed, 98 insertions(+), 226 deletions(-) diff --git a/flake.lock b/flake.lock index 2de63cb6..b96a768f 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -27,58 +27,6 @@ "type": "github" } }, - "authentik": { - "inputs": { - "authentik-src": "authentik-src", - "flake-compat": [ - "flake-compat" - ], - "flake-parts": [ - "flake-parts" - ], - "flake-utils": [ - "flake-utils" - ], - "napalm": "napalm", - "nixpkgs": [ - "nixpkgs" - ], - "pyproject-build-systems": "pyproject-build-systems", - "pyproject-nix": "pyproject-nix", - "systems": "systems", - "uv2nix": "uv2nix" - }, - "locked": { - "lastModified": 1746874492, - "narHash": "sha256-Gm2Eb5KBxAL6y9WJj7phRMXNAZzVkKlm9Dky9WDZHtQ=", - "owner": "nix-community", - "repo": "authentik-nix", - "rev": "2ef24fac993808a1a57f367ef58ac0f5254c3489", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "authentik-nix", - "type": "github" - } - }, - "authentik-src": { - "flake": false, - "locked": { - "lastModified": 1745954192, - "narHash": "sha256-QuIgeu3CN6S44/zSiaj+iIkDz2494mb1MWvD3eYYkVE=", - "owner": "goauthentik", - "repo": "authentik", - "rev": "22412729e2379d645da2ac0c0270a0ac6147945e", - "type": "github" - }, - "original": { - "owner": "goauthentik", - "ref": "version/2025.4.0", - "repo": "authentik", - "type": "github" - } - }, "blobs": { "flake": false, "locked": { @@ -107,11 +55,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746626503, - "narHash": "sha256-mRnIdJLP+0NSim9ao30ue0Z3ttSuxzXwQG7UN1KuKfU=", + "lastModified": 1748243781, + "narHash": "sha256-U8KlBdkPOeT4YN+MjfJbciUKlncKjuRGTsiateciKrM=", "owner": "Mic92", "repo": "buildbot-nix", - "rev": "7ad9b4886eccb5eecc0686a16266ddabf6cbefe9", + "rev": "eb6a8b45cb4123a05c67b45cd3fac4f0275a1930", "type": "github" }, "original": { @@ -125,11 +73,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747268376, - "narHash": "sha256-JDcdINnB1bfbUAy1eEgwIXLrfZeuntxuxTu7UWcQrQY=", + "lastModified": 1748080874, + "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", "owner": "catppuccin", "repo": "nix", - "rev": "7a6ccdeba6e761bec9601e2192983e6b9dff630c", + "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", "type": "github" }, "original": { @@ -322,7 +270,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1694529238, @@ -338,7 +286,55 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "mailserver", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "mailserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { + "inputs": { + "nixpkgs": [ + "mailserver", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "topology", @@ -370,11 +366,11 @@ ] }, "locked": { - "lastModified": 1746124171, - "narHash": "sha256-+rin6Z3gsw5FNrC17K4Wn6BDcbpbVi2a+Vzw3J6Azp0=", + "lastModified": 1748546644, + "narHash": "sha256-HMoXUvYz+p3vTK0hp445Vc7Od9F6oHV0FrRBPx1b2Fs=", "owner": "tailscale", "repo": "golink", - "rev": "3e2c22db8b1b6260108f3260c26d9ef770e38d50", + "rev": "a98f4c4dffd89d9e2052904ac5abfa5b11016382", "type": "github" }, "original": { @@ -385,11 +381,11 @@ }, "hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -410,11 +406,11 @@ ] }, "locked": { - "lastModified": 1744693102, - "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=", + "lastModified": 1748000383, + "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e", + "rev": "231726642197817d20310b9d39dd4afb9e899489", "type": "github" }, "original": { @@ -430,11 +426,11 @@ ] }, "locked": { - "lastModified": 1747279714, - "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=", + "lastModified": 1748529677, + "narHash": "sha256-MJEX3Skt5EAIs/aGHD8/aXXZPcceMMHheyIGSjvxZN0=", "owner": "nix-community", "repo": "home-manager", - "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2", + "rev": "da282034f4d30e787b8a10722431e8b650a907ef", "type": "github" }, "original": { @@ -469,17 +465,18 @@ "flake-compat": [ "flake-compat" ], + "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1746937334, - "narHash": "sha256-7g2GSePdYbpD1v5BxEVSCJ2Ogf4K5rc9sBB81FervUY=", + "lastModified": 1748540497, + "narHash": "sha256-QtXdmcjodPP0QWxpxGlg3IwGBm7iWu0MMN17X9Qf/0Q=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "da66510f688b7eac54e3cac7c75be4b8dd78ce8b", + "rev": "a1e927665660762b92fdaa9b9168322057c9ae0d", "type": "gitlab" }, "original": { @@ -509,32 +506,6 @@ "url": "https://git.pyrox.dev/pyrox/pkgs" } }, - "napalm": { - "inputs": { - "flake-utils": [ - "authentik", - "flake-utils" - ], - "nixpkgs": [ - "authentik", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1725806412, - "narHash": "sha256-lGZjkjds0p924QEhm/r0BhAxbHBJE1xMOldB/HmQH04=", - "owner": "willibutz", - "repo": "napalm", - "rev": "b492440d9e64ae20736d3bec5c7715ffcbde83f5", - "type": "github" - }, - "original": { - "owner": "willibutz", - "ref": "avoid-foldl-stack-overflow", - "repo": "napalm", - "type": "github" - } - }, "nix-index": { "inputs": { "flake-compat": [ @@ -565,11 +536,11 @@ ] }, "locked": { - "lastModified": 1746934494, - "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", + "lastModified": 1748145500, + "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", + "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", "type": "github" }, "original": { @@ -620,28 +591,29 @@ "type": "github" } }, - "nixpkgs-24_11": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1746925973, - "narHash": "sha256-03BE0+8MEQ5hSU5+8OI24X7Rhn5GruYZr18KWAZ5Rzk=", + "lastModified": 1748135671, + "narHash": "sha256-PIkcBpddXRAGWstWV7zTwRZ9EAPqgzFNssux17p1NTg=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f9077b977f4c06f04afdfcac722fa942dd25818c", + "rev": "6194ba204e5b188965da97ebb16e05191e560427", "type": "github" }, "original": { @@ -652,11 +624,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747060738, - "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", + "lastModified": 1748475218, + "narHash": "sha256-zDYqMBDbQR4SU9vHFrvHRbI0qxv0RGAoog5idGLiOWQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "rev": "e80506de785dc48dcfbb636c443c5e2b0b5b2d7d", "type": "github" }, "original": { @@ -669,7 +641,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "topology", "nixpkgs" @@ -693,60 +665,9 @@ "type": "github" } }, - "pyproject-build-systems": { - "inputs": { - "nixpkgs": [ - "authentik", - "nixpkgs" - ], - "pyproject-nix": [ - "authentik", - "pyproject-nix" - ], - "uv2nix": [ - "authentik", - "uv2nix" - ] - }, - "locked": { - "lastModified": 1744599653, - "narHash": "sha256-nysSwVVjG4hKoOjhjvE6U5lIKA8sEr1d1QzEfZsannU=", - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "rev": "7dba6dbc73120e15b558754c26024f6c93015dd7", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "build-system-pkgs", - "type": "github" - } - }, - "pyproject-nix": { - "inputs": { - "nixpkgs": [ - "authentik", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746146146, - "narHash": "sha256-60+mzI2lbgn+G8F5mz+cmkDvHFn4s5oqcOna1SzYy74=", - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "rev": "3e9623bdd86a3c545e82b7f97cfdba5f07232d9a", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", - "authentik": "authentik", "buildbot-nix": "buildbot-nix", "ctp": "ctp", "deploy-rs": "deploy-rs", @@ -767,7 +688,7 @@ "nixpkgs-lib": "nixpkgs-lib", "snowfall-lib": "snowfall-lib", "stable": "stable", - "systems": "systems_3", + "systems": "systems_2", "topology": "topology" } }, @@ -812,21 +733,6 @@ } }, "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -841,7 +747,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -889,11 +795,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { @@ -901,31 +807,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "uv2nix": { - "inputs": { - "nixpkgs": [ - "authentik", - "nixpkgs" - ], - "pyproject-nix": [ - "authentik", - "pyproject-nix" - ] - }, - "locked": { - "lastModified": 1746048139, - "narHash": "sha256-LdCLyiihLg6P2/mjzP0+W7RtraDSIaJJPTy6SCtW5Ag=", - "owner": "pyproject-nix", - "repo": "uv2nix", - "rev": "680e2f8e637bc79b84268949d2f2b2f5e5f1d81c", - "type": "github" - }, - "original": { - "owner": "pyproject-nix", - "repo": "uv2nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 04cfb7f6..d782ef3b 100644 --- a/flake.nix +++ b/flake.nix @@ -54,15 +54,6 @@ home-manager.follows = "home-manager"; }; }; - authentik = { - url = "github:nix-community/authentik-nix"; - inputs = { - flake-utils.follows = "flake-utils"; - flake-parts.follows = "flake-parts"; - flake-compat.follows = "flake-compat"; - nixpkgs.follows = "nixpkgs"; - }; - }; buildbot-nix = { url = "github:Mic92/buildbot-nix"; inputs.nixpkgs.follows = "nixpkgs"; -- 2.54.0