pub-solar/infra
6
1
Fork 3
Code Issues 25 Pull requests 11 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'chore: update flake inputs home-manager, nixpkgs, remove temporary input release-2311' (#84) from chore/bump-flake-inputs into main

Browse source 
Reviewed-on: #84
This commit is contained in:
teutat3s 2023-12-20 11:00:30 +00:00
parent 2e2ca2fc82 7cc3a261ed
commit e1cab88e3d
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
4 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
flake.lock
View file

@ -161,11 +161,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702195709, "lastModified": 1702814678,
"narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=", "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6761b8188b860f374b457eddfdb05c82eef9752f", "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -236,11 +236,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1702346276, "lastModified": 1702780907,
"narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -284,22 +284,6 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -312,7 +296,6 @@
"nixos-flake": "nixos-flake", "nixos-flake": "nixos-flake",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-2205": "nixpkgs-2205", "nixpkgs-2205": "nixpkgs-2205",
"release-2311": "release-2311",
"triton-vmtools": "triton-vmtools", "triton-vmtools": "triton-vmtools",
"unstable": "unstable" "unstable": "unstable"
} }

1
flake.nix
View file

@ -4,7 +4,6 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; 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"; nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05";
nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.url = "github:lnl7/nix-darwin/master";

4
overlays/default.nix
View file

@ -9,15 +9,13 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: (final: prev:
let let
release-2311 = import inputs.release-2311 { unstable = import inputs.unstable {
system = prev.system; system = prev.system;
}; };
in in
{ {
element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; }; element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; };
forgejo = release-2311.forgejo;
}) })
(import ./keycloak.nix)
]; ];
}); });
}; };

9
overlays/keycloak.nix
View file

@ -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=";
};
});
}