From 7cc3a261edb728d05b2c0890514793c5d3b1ed5f Mon Sep 17 00:00:00 2001 From: teutat3s Date: Mon, 18 Dec 2023 12:39:04 +0100 Subject: [PATCH] chore: update flake inputs home-manager, nixpkgs, MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit remove temporary input release-2311 • Updated input 'home-manager': 'github:nix-community/home-manager/6761b8188b860f374b457eddfdb05c82eef9752f' (2023-12-10) → 'github:nix-community/home-manager/1488651d02c1a7a15e284210f0d380a62d8d8cef' (2023-12-17) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7' (2023-12-12) → 'github:nixos/nixpkgs/1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f' (2023-12-17) • Removed input 'release-2311' --- flake.lock | 29 ++++++----------------------- flake.nix | 1 - overlays/default.nix | 4 +--- overlays/keycloak.nix | 9 --------- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 overlays/keycloak.nix diff --git a/flake.lock b/flake.lock index 452a6638..bf3732ca 100644 --- a/flake.lock +++ b/flake.lock @@ -161,11 +161,11 @@ ] }, "locked": { - "lastModified": 1702195709, - "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=", + "lastModified": 1702814678, + "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=", "owner": "nix-community", "repo": "home-manager", - "rev": "6761b8188b860f374b457eddfdb05c82eef9752f", + "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef", "type": "github" }, "original": { @@ -236,11 +236,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702346276, - "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", + "lastModified": 1702780907, + "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", + "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", "type": "github" }, "original": { @@ -284,22 +284,6 @@ "type": "github" } }, - "release-2311": { - "locked": { - "lastModified": 1702509556, - "narHash": "sha256-trm+c/erCSRe+Mi2fAaI975+jrU8uhmUznx8py6N9po=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c15f414581b4eb4113eed52ed303a1e62771fb6f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -312,7 +296,6 @@ "nixos-flake": "nixos-flake", "nixpkgs": "nixpkgs", "nixpkgs-2205": "nixpkgs-2205", - "release-2311": "release-2311", "triton-vmtools": "triton-vmtools", "unstable": "unstable" } diff --git a/flake.nix b/flake.nix index 13cb0716..7cb4db75 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - release-2311.url = "github:nixos/nixpkgs/release-23.11"; nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05"; nix-darwin.url = "github:lnl7/nix-darwin/master"; diff --git a/overlays/default.nix b/overlays/default.nix index d285cb11..9bbb22d0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -9,15 +9,13 @@ nixpkgs.overlays = [ (final: prev: let - release-2311 = import inputs.release-2311 { + unstable = import inputs.unstable { system = prev.system; }; in { element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; }; - forgejo = release-2311.forgejo; }) - (import ./keycloak.nix) ]; }); }; diff --git a/overlays/keycloak.nix b/overlays/keycloak.nix deleted file mode 100644 index f45772ef..00000000 --- a/overlays/keycloak.nix +++ /dev/null @@ -1,9 +0,0 @@ -final: prev: { - keycloak = prev.keycloak.overrideAttrs (oldAttrs: rec { - version = "999.0.0-SNAPSHOT"; - src = prev.fetchzip { - url = "https://github.com/keycloak/keycloak/releases/download/nightly/keycloak-${version}.zip"; - hash = "sha256-2rOhBmPXQy6HK3CtG/7E2EUK5zEWrJtSgBg6AMw2q3E="; - }; - }); -}