From c9b09f6a2dfa91de26af799b13a069f53b0e3b7b Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 28 Apr 2025 15:24:42 +0200 Subject: [PATCH] use upstream nixpkgs for authentik --- flake.lock | 38 ++++++++++++++++++++++++++------------ flake.nix | 1 - 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 34f1f3a..5da240b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,9 +7,7 @@ "flake-parts": "flake-parts", "flake-utils": "flake-utils", "napalm": "napalm", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "poetry2nix": "poetry2nix", "systems": "systems" }, @@ -47,7 +45,7 @@ "course-management": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "poetry2nix": "poetry2nix_2" }, "locked": { @@ -305,15 +303,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", - "owner": "nixos", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -335,6 +333,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1745742390, "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", @@ -350,7 +364,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -468,7 +482,7 @@ "ese-manual": "ese-manual", "kpp": "kpp", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "notenrechner": "notenrechner", "print-interface": "print-interface", "sops-nix": "sops-nix", @@ -649,7 +663,7 @@ "vscode-server": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1729422940, diff --git a/flake.nix b/flake.nix index 0e4f805..923b081 100755 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,6 @@ notenrechner.inputs.nixpkgs.follows = "nixpkgs"; authentik = { url = "github:nix-community/authentik-nix"; - inputs.nixpkgs.follows = "nixpkgs"; };