schrottkatze/katzen-cafe
1
0
Fork 0
mirror of https://forge.katzen.cafe/katzen-cafe/katzen-cafe.git synced 2024-11-05 15:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

update nixpkgs to 23.11

Browse source
This commit is contained in:
Schrottkatze 2024-01-25 10:05:22 +01:00
parent e92fdba6be
commit d556d11260
Signed by: schrottkatze
GPG key ID: DFD0FD205943C14A
2 changed files with 64 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -389,16 +389,16 @@
}, },
"nixpkgsOld": { "nixpkgsOld": {
"locked": { "locked": {
"lastModified": 1685573264, "lastModified": 1688392541,
"narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "380be19fbd2d9079f677978361792cb25e8a3635", "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.05", "ref": "nixos-22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

30
flake.nix
View file

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
nixpkgsOld.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgsOld.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
arion.url = "github:hercules-ci/arion"; arion.url = "github:hercules-ci/arion";
@ -12,12 +12,18 @@
}; };
}; };
outputs = { self, nixpkgsOld, nixpkgs, nixpkgsUnstable, ... }@inputs: outputs = {
let self,
hostPkgs = import nixpkgs { system = "x86_64-linux"; }; nixpkgsOld,
nixpkgs,
nixpkgsUnstable,
...
} @ inputs: let
hostPkgs = import nixpkgs {system = "x86_64-linux";};
in { in {
devShell."x86_64-linux" = with hostPkgs; mkShell { devShell."x86_64-linux" = with hostPkgs;
buildInputs = [ colmena pass ]; mkShell {
buildInputs = [colmena pass];
}; };
colmena = { colmena = {
meta = { meta = {
@ -26,7 +32,7 @@
overlays = []; overlays = [];
}; };
specialArgs = { specialArgs = {
inherit inputs; inherit inputs nixpkgsUnstable;
pkgsUnstable = import nixpkgsUnstable { pkgsUnstable = import nixpkgsUnstable {
system = "aarch64-linux"; system = "aarch64-linux";
overlays = []; overlays = [];
@ -38,7 +44,14 @@
}; };
}; };
katzencafe = { name, nodes, pkgs, pkgsUnstable, inputs, ... }: { katzencafe = {
name,
nodes,
pkgs,
pkgsUnstable,
inputs,
...
}: {
deployment = { deployment = {
targetHost = "katzen.cafe"; targetHost = "katzen.cafe";
buildOnTarget = true; buildOnTarget = true;
@ -58,6 +71,7 @@
./modules/mailserver.nix ./modules/mailserver.nix
./modules/vaultwarden.nix ./modules/vaultwarden.nix
./modules/hedgedoc.nix ./modules/hedgedoc.nix
./modules/invidious.nix
]; ];
system.stateVersion = "22.11"; system.stateVersion = "22.11";