Add nixos-23.05 jobs
This commit is contained in:
parent
fcd762f830
commit
f17eee879a
17
flake.lock
17
flake.lock
|
@ -377,6 +377,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-23-05": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1684796928,
|
||||||
|
"narHash": "sha256-GxF+TX2UsuiIj0rdLkovBBWnMdAccWmw/T9p6S00etU=",
|
||||||
|
"owner": "SuperSandro2000",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "7582acc515fa86fb0c5797970ea987f3872a8ad6",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "SuperSandro2000",
|
||||||
|
"ref": "nixos-23.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1684169666,
|
"lastModified": 1684169666,
|
||||||
|
@ -484,6 +500,7 @@
|
||||||
"naersk": "naersk",
|
"naersk": "naersk",
|
||||||
"nix-cache-cut": "nix-cache-cut",
|
"nix-cache-cut": "nix-cache-cut",
|
||||||
"nixos": "nixos",
|
"nixos": "nixos",
|
||||||
|
"nixos-23-05": "nixos-23-05",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixos-modules": "nixos-modules",
|
"nixos-modules": "nixos-modules",
|
||||||
"oparl-scraper": "oparl-scraper",
|
"oparl-scraper": "oparl-scraper",
|
||||||
|
|
37
flake.nix
37
flake.nix
|
@ -9,7 +9,7 @@
|
||||||
inputs = {
|
inputs = {
|
||||||
# use sandro's fork full with cherry-picked fixes
|
# use sandro's fork full with cherry-picked fixes
|
||||||
nixos.url = "github:SuperSandro2000/nixpkgs/nixos-22.11";
|
nixos.url = "github:SuperSandro2000/nixpkgs/nixos-22.11";
|
||||||
# nixos-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon";
|
nixos-23-05.url = "github:SuperSandro2000/nixpkgs/nixos-23.05";
|
||||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||||
|
|
||||||
affection-src = {
|
affection-src = {
|
||||||
|
@ -213,7 +213,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, disko, fenix, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
|
outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, disko, fenix, heliwatch, microvm, naersk, nixos, nixos-23-05, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
|
||||||
let
|
let
|
||||||
inherit (nixos) lib;
|
inherit (nixos) lib;
|
||||||
|
|
||||||
|
@ -231,11 +231,12 @@
|
||||||
|
|
||||||
# Our custom NixOS builder
|
# Our custom NixOS builder
|
||||||
nixosSystem' =
|
nixosSystem' =
|
||||||
{ modules
|
{ nixos ? inputs.nixos
|
||||||
|
, modules
|
||||||
, system ? "x86_64-linux"
|
, system ? "x86_64-linux"
|
||||||
}@args:
|
}@args:
|
||||||
|
|
||||||
{ inherit args; } // lib.nixosSystem {
|
{ inherit args; } // nixos.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
|
@ -831,19 +832,21 @@
|
||||||
in
|
in
|
||||||
lib.mapAttrs getBuildEntryPoint self.nixosConfigurations
|
lib.mapAttrs getBuildEntryPoint self.nixosConfigurations
|
||||||
# NOTE: left here to have the code as reference if we need something like in the future, eg. on a stable update
|
# NOTE: left here to have the code as reference if we need something like in the future, eg. on a stable update
|
||||||
# // lib.mapAttrs' (hostname: nixosSystem: lib.nameValuePair
|
// lib.mapAttrs' (hostname: nixosSystem: let
|
||||||
# # job display name
|
hostname' = hostname + "-23-05";
|
||||||
# (hostname + "-nox")
|
in lib.nameValuePair
|
||||||
# (getBuildEntryPoint null (nixosSystem' (nixosSystem.args // (with nixosSystem.args; {
|
# job display name
|
||||||
# modules = modules ++ [
|
hostname'
|
||||||
# {
|
(getBuildEntryPoint hostname' (nixosSystem' (nixosSystem.args // (with nixosSystem.args; {
|
||||||
# # simd.enable = lib.mkForce true;
|
modules = modules ++ [
|
||||||
# environment.noXlibs = true;
|
# {
|
||||||
# }
|
# # simd.enable = lib.mkForce true;
|
||||||
# ];
|
# environment.noXlibs = true;
|
||||||
# # nixpkgs = nixos-unstable-simd;
|
# }
|
||||||
# }))))
|
];
|
||||||
# ) self.nixosConfigurations
|
nixos = nixos-23-05;
|
||||||
|
}))))
|
||||||
|
) self.nixosConfigurations
|
||||||
// nixos.lib.filterAttrs (name: attr:
|
// nixos.lib.filterAttrs (name: attr:
|
||||||
(builtins.match ".+-tftproot" name != null && lib.isDerivation attr)
|
(builtins.match ".+-tftproot" name != null && lib.isDerivation attr)
|
||||||
) self.packages.aarch64-linux
|
) self.packages.aarch64-linux
|
||||||
|
|
Loading…
Reference in New Issue