schrottkatze/katzen-cafe
0
0
Fork 0
mirror of https://forge.katzen.cafe/katzen-cafe/katzen-cafe.git synced 2024-11-22 05:54:41 +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"
} }

106
flake.nix
View file

@ -1,67 +1,81 @@
{ {
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";
mms.url = "github:mkaito/nixos-modded-minecraft-servers"; mms.url = "github:mkaito/nixos-modded-minecraft-servers";
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
conduit = { conduit = {
url = "gitlab:famedly/conduit"; url = "gitlab:famedly/conduit";
}; };
}; };
outputs = { self, nixpkgsOld, nixpkgs, nixpkgsUnstable, ... }@inputs: outputs = {
let self,
hostPkgs = import nixpkgs { system = "x86_64-linux"; }; nixpkgsOld,
in { nixpkgs,
devShell."x86_64-linux" = with hostPkgs; mkShell { nixpkgsUnstable,
buildInputs = [ colmena pass ]; ...
} @ inputs: let
hostPkgs = import nixpkgs {system = "x86_64-linux";};
in {
devShell."x86_64-linux" = with hostPkgs;
mkShell {
buildInputs = [colmena pass];
}; };
colmena = { colmena = {
meta = { meta = {
nixpkgs = import nixpkgs { nixpkgs = import nixpkgs {
system = "aarch64-linux";
overlays = [];
};
specialArgs = {
inherit inputs nixpkgsUnstable;
pkgsUnstable = import nixpkgsUnstable {
system = "aarch64-linux"; system = "aarch64-linux";
overlays = []; overlays = [];
}; };
specialArgs = { pkgsOld = import nixpkgsOld {
inherit inputs; system = "aarch64-linux";
pkgsUnstable = import nixpkgsUnstable { overlays = [];
system = "aarch64-linux";
overlays = [];
};
pkgsOld = import nixpkgsOld {
system = "aarch64-linux";
overlays = [];
};
}; };
}; };
};
katzencafe = { name, nodes, pkgs, pkgsUnstable, inputs, ... }: {
deployment = { katzencafe = {
targetHost = "katzen.cafe"; name,
buildOnTarget = true; nodes,
}; pkgs,
imports = [ pkgsUnstable,
./modules/base-stuff.nix inputs,
./modules/proxy.nix ...
./modules/postgres.nix }: {
./modules/jitsi.nix deployment = {
./modules/containers targetHost = "katzen.cafe";
./modules/conduit.nix buildOnTarget = true;
./modules/keycloak.nix };
./modules/forgejo.nix imports = [
./modules/mumble.nix ./modules/base-stuff.nix
./modules/modded-mc.nix ./modules/proxy.nix
./modules/monitoring.nix ./modules/postgres.nix
./modules/mailserver.nix ./modules/jitsi.nix
./modules/vaultwarden.nix ./modules/containers
./modules/hedgedoc.nix ./modules/conduit.nix
]; ./modules/keycloak.nix
./modules/forgejo.nix
system.stateVersion = "22.11"; ./modules/mumble.nix
}; ./modules/modded-mc.nix
./modules/monitoring.nix
./modules/mailserver.nix
./modules/vaultwarden.nix
./modules/hedgedoc.nix
./modules/invidious.nix
];
system.stateVersion = "22.11";
}; };
}; };
};
} }