greg/vms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qol-improvements' into 'main'

Browse Source 
Fix Rawhide builds

Closes #28, #29, #24, #26, and #19

See merge request greg/vms!14
This commit is contained in:
Greg Hellings
2024-11-19 06:39:27 +00:00
parent 37f8e7c063 a3eae3daf5
commit ce0c459baf
90 changed files with 970 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -1,3 +1,4 @@
.pre-commit-config.yaml
output_* output_*
output/* output/*
*.box *.box
.gitlab-ci-build.yml.in
-1
View File
@@ -94,4 +94,3 @@ hyperv-iso.amd64:
description: >- description: >-
Release $CI_COMMIT_TAG, found on [Vagrant Cloud](https://app.vagrantup.com/boxen/) Release $CI_COMMIT_TAG, found on [Vagrant Cloud](https://app.vagrantup.com/boxen/)
as version v${BUILD} as version v${BUILD}
.gitlab-ci.yml
+4
View File
@@ -35,6 +35,10 @@ shellcheck:
stage: generate stage: generate
script: nix run ".#shellcheck" script: nix run ".#shellcheck"
flake-check:
stage: generate
script: nix flake check
validate: validate:
stage: check stage: check
needs: needs:
distros/almalinux/default.nix
+6 -3
View File
@@ -1,9 +1,12 @@
[ { [
{
version = "8"; version = "8";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "9"; version = "9";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} ] }
]
distros/alpine/default.nix
+6 -3
View File
@@ -1,9 +1,12 @@
[ { [
{
version = "3.19.0"; version = "3.19.0";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "3.20"; version = "3.20";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} ] }
]
distros/archlinux/default.nix
+4 -2
View File
@@ -1,5 +1,7 @@
[ { [
{
version = "rolling"; version = "rolling";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} ] }
]
distros/centos-stream/default.nix
+6 -3
View File
@@ -1,9 +1,12 @@
[ { [
{
version = "8"; version = "8";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "9"; version = "9";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} ] }
]
distros/centos/7/disc/ks.cfg
-1
View File
@@ -75,4 +75,3 @@ if [ "${virt}" == "microsoft" ]; then
systemctl enable hypervvssd systemctl enable hypervvssd
fi fi
%end %end
distros/centos/default.nix
+4 -2
View File
@@ -1,5 +1,7 @@
[ { [
{
version = "7"; version = "7";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} ] }
]
distros/debian/default.nix
+10 -5
View File
@@ -1,20 +1,25 @@
[ { [
{
version = "9"; version = "9";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "10"; version = "10";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "11"; version = "11";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "12"; version = "12";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
exclude = [ exclude = [
"virtualbox-iso" "virtualbox-iso"
]; ];
} ] }
]
distros/fedora/38/amd64-ks.cfg
-1
View File
@@ -168,4 +168,3 @@ ssh-keygen -A
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/fedora/39/amd64-ks.cfg
-1
View File
@@ -180,4 +180,3 @@ chcon -R unconfined_u:object_r:user_home_t:s0 /home/vagrant/.ssh
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/fedora/40/amd64-ks.cfg
-1
View File
@@ -179,4 +179,3 @@ chcon -R unconfined_u:object_r:user_home_t:s0 /home/vagrant/.ssh
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/fedora/41/amd64-ks.cfg
-1
View File
@@ -179,4 +179,3 @@ chcon -R unconfined_u:object_r:user_home_t:s0 /home/vagrant/.ssh
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/fedora/default.nix
+14 -7
View File
@@ -1,25 +1,32 @@
[ { [
{
version = "37"; version = "37";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "38"; version = "38";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "39"; version = "39";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "40"; version = "40";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "41"; version = "41";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "rawhide"; version = "rawhide";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} ] }
]
distros/fedora/rawhide/amd64-ks.cfg
-1
View File
@@ -181,4 +181,3 @@ chcon -R unconfined_u:object_r:user_home_t:s0 /home/vagrant/.ssh
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/nixos/23.05/http/configuration.nix
+9 -2
View File
@@ -1,4 +1,8 @@
{config, pkgs, lib, ...}: {
pkgs,
lib,
...
}:
{ {
imports = [ imports = [
@@ -32,7 +36,10 @@
users = [ "vagrant" ]; users = [ "vagrant" ];
groups = [ "vagrant" ]; groups = [ "vagrant" ];
commands = [ commands = [
{ command = "ALL"; options = [ "NOPASSWD" ]; } {
command = "ALL";
options = [ "NOPASSWD" ];
}
]; ];
} }
]; ];
distros/nixos/23.05/http/flake.nix
+2 -1
View File
@@ -5,7 +5,8 @@
nixstable.url = "github:nixos/nixpkgs/nixos-23.05"; nixstable.url = "github:nixos/nixpkgs/nixos-23.05";
}; };
outputs = { nixstable, self, ... }@inputs: outputs =
{ nixstable, ... }:
{ {
nixosConfigurations.vagrant = nixstable.lib.nixosSystem { nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
distros/nixos/23.05/http/ga-kvm.nix
-1
View File
@@ -1 +0,0 @@
ga-qemu.nix
distros/nixos/23.05/http/ga-kvm.nix
+4
View File
@@ -0,0 +1,4 @@
{ ... }:
{
services.qemuGuest.enable = true;
}
distros/nixos/23.05/http/ga-vmware.nix
+1 -1
View File
@@ -3,5 +3,5 @@
virtualisation.vmware.guest = { virtualisation.vmware.guest = {
enable = true; enable = true;
headless = false; headless = false;
} };
} }
distros/nixos/23.11/http/configuration.nix
+9 -2
View File
@@ -1,4 +1,8 @@
{config, pkgs, lib, ...}: {
pkgs,
lib,
...
}:
{ {
imports = [ imports = [
@@ -32,7 +36,10 @@
users = [ "vagrant" ]; users = [ "vagrant" ];
groups = [ "vagrant" ]; groups = [ "vagrant" ];
commands = [ commands = [
{ command = "ALL"; options = [ "NOPASSWD" ]; } {
command = "ALL";
options = [ "NOPASSWD" ];
}
]; ];
} }
]; ];
distros/nixos/23.11/http/flake.nix
+2 -1
View File
@@ -5,7 +5,8 @@
nixstable.url = "github:nixos/nixpkgs/nixos-23.11"; nixstable.url = "github:nixos/nixpkgs/nixos-23.11";
}; };
outputs = { nixstable, self, ... }@inputs: outputs =
{ nixstable, ... }:
{ {
nixosConfigurations.vagrant = nixstable.lib.nixosSystem { nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
distros/nixos/23.11/http/ga-kvm.nix
-1
View File
@@ -1 +0,0 @@
ga-qemu.nix
distros/nixos/23.11/http/ga-kvm.nix
+4
View File
@@ -0,0 +1,4 @@
{ ... }:
{
services.qemuGuest.enable = true;
}
distros/nixos/23.11/http/ga-vmware.nix
+1 -1
View File
@@ -3,5 +3,5 @@
virtualisation.vmware.guest = { virtualisation.vmware.guest = {
enable = true; enable = true;
headless = false; headless = false;
} };
} }
distros/nixos/24.05/http/configuration.nix
+9 -2
View File
@@ -1,4 +1,8 @@
{config, pkgs, lib, ...}: {
pkgs,
lib,
...
}:
{ {
imports = [ imports = [
@@ -32,7 +36,10 @@
users = [ "vagrant" ]; users = [ "vagrant" ];
groups = [ "vagrant" ]; groups = [ "vagrant" ];
commands = [ commands = [
{ command = "ALL"; options = [ "NOPASSWD" ]; } {
command = "ALL";
options = [ "NOPASSWD" ];
}
]; ];
} }
]; ];
distros/nixos/24.05/http/flake.nix
+2 -1
View File
@@ -5,7 +5,8 @@
nixstable.url = "github:nixos/nixpkgs/nixos-24.05"; nixstable.url = "github:nixos/nixpkgs/nixos-24.05";
}; };
outputs = { nixstable, self, ... }@inputs: outputs =
{ nixstable, ... }:
{ {
nixosConfigurations.vagrant = nixstable.lib.nixosSystem { nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
distros/nixos/24.05/http/ga-kvm.nix
-1
View File
@@ -1 +0,0 @@
ga-qemu.nix
distros/nixos/24.05/http/ga-kvm.nix
+4
View File
@@ -0,0 +1,4 @@
{ ... }:
{
services.qemuGuest.enable = true;
}
distros/nixos/24.05/http/ga-vmware.nix
+1 -1
View File
@@ -3,5 +3,5 @@
virtualisation.vmware.guest = { virtualisation.vmware.guest = {
enable = true; enable = true;
headless = false; headless = false;
} };
} }
distros/nixos/default.nix
+8 -4
View File
@@ -1,13 +1,17 @@
[ { [
{
version = "23.05"; version = "23.05";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "23.11"; version = "23.11";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "24.05"; version = "24.05";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} ] }
]
distros/opensuse/default.nix
+10 -5
View File
@@ -1,17 +1,22 @@
[ { [
{
version = "15.5"; version = "15.5";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "15.6"; version = "15.6";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "16.0"; version = "16.0";
arch = "amd64"; arch = "amd64";
eol = true; # Not yet released, and bugged at the moment eol = true; # Not yet released, and bugged at the moment
} { }
{
version = "tumbleweed"; version = "tumbleweed";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} ] }
]
distros/rockylinux/default.nix
+6 -3
View File
@@ -1,9 +1,12 @@
[ { [
{
version = "8"; version = "8";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "9"; version = "9";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} ] }
]
distros/ubuntu/24.04/amd64.pkrvars.hcl
+1 -1
View File
@@ -1,7 +1,7 @@
distro = "ubuntu" distro = "ubuntu"
version = "24.04" version = "24.04"
iso = { iso = {
url = "http://releases.ubuntu.com/24.04/ubuntu-24.04.01-live-server-amd64.iso" url = "http://releases.ubuntu.com/24.04/ubuntu-24.04.1-live-server-amd64.iso"
checksum = "e240e4b801f7bb68c20d1356b60968ad0c33a41d00d828e74ceb3364a0317be9" checksum = "e240e4b801f7bb68c20d1356b60968ad0c33a41d00d828e74ceb3364a0317be9"
} }
boot_command = [ boot_command = [
distros/ubuntu/default.nix
+14 -7
View File
@@ -1,25 +1,32 @@
[ { [
{
version = "18.04"; version = "18.04";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "20.04"; version = "20.04";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "22.04"; version = "22.04";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "23.10"; version = "23.10";
arch = "amd64"; arch = "amd64";
eol = true; eol = true;
} { }
{
version = "24.04"; version = "24.04";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} { }
{
version = "24.10"; version = "24.10";
arch = "amd64"; arch = "amd64";
eol = false; eol = false;
} ] }
]
flake.lock
Generated
+56 -85
View File
@@ -1,21 +1,18 @@
{ {
"nodes": { "nodes": {
"devshell": { "flake-compat": {
"inputs": { "flake": false,
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": { "locked": {
"lastModified": 1717408969, "lastModified": 1696426674,
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "numtide", "owner": "edolstra",
"repo": "devshell", "repo": "flake-compat",
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "edolstra",
"repo": "devshell", "repo": "flake-compat",
"type": "github" "type": "github"
} }
}, },
@@ -37,46 +34,55 @@
"type": "github" "type": "github"
} }
}, },
"flake-root": { "gitignore": {
"inputs": {
"nixpkgs": [
"hooks",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1713493429, "lastModified": 1709087332,
"narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "srid", "owner": "hercules-ci",
"repo": "flake-root", "repo": "gitignore.nix",
"rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "srid", "owner": "hercules-ci",
"repo": "flake-root", "repo": "gitignore.nix",
"type": "github" "type": "github"
} }
}, },
"flake-utils": { "hooks": {
"inputs": { "inputs": {
"systems": "systems" "flake-compat": "flake-compat",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1731363552,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "numtide", "owner": "cachix",
"repo": "flake-utils", "repo": "git-hooks.nix",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "cachix",
"repo": "flake-utils", "repo": "git-hooks.nix",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1704161960, "lastModified": 1730768919,
"narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "63143ac2c9186be6d9da6035fa22620018c85932", "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -98,6 +104,22 @@
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1720750130, "lastModified": 1720750130,
@@ -114,22 +136,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1708475490,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"process-compose": { "process-compose": {
"locked": { "locked": {
"lastModified": 1718031437, "lastModified": 1718031437,
@@ -147,45 +153,10 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"devshell": "devshell",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-root": "flake-root", "hooks": "hooks",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"process-compose": "process-compose", "process-compose": "process-compose"
"treefmt-nix": "treefmt-nix"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1718522839,
"narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
} }
} }
}, },
flake.nix
+106 -136
View File
@@ -3,14 +3,14 @@
description = "Greg's homepage"; description = "Greg's homepage";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
devshell.url = "github:numtide/devshell";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-root.url = "github:srid/flake-root";
process-compose.url = "github:Platonic-Systems/process-compose-flake"; process-compose.url = "github:Platonic-Systems/process-compose-flake";
treefmt-nix.url = "github:numtide/treefmt-nix"; hooks.url = "github:cachix/git-hooks.nix";
}; };
outputs = { devshell, flake-parts, flake-root, process-compose, treefmt-nix, nixpkgs, ... }@inputs: let outputs =
{ flake-parts, nixpkgs, ... }@inputs:
let
lib = nixpkgs.lib; lib = nixpkgs.lib;
providers = [ providers = [
"qemu" "qemu"
@@ -19,30 +19,24 @@
]; ];
distros = import ./distros; distros = import ./distros;
# Inserts the distro name into each element in the list # Inserts the distro name into each element in the list
insertNames = lib.attrsets.mapAttrsToList (distro: val: (builtins.map (x: x // { inherit distro; }) val)) distros; insertNames = lib.attrsets.mapAttrsToList (
distro: val: (builtins.map (x: x // { inherit distro; }) val)
) distros;
# Flattens all the distros into a single list # Flattens all the distros into a single list
flat = lib.lists.flatten insertNames; flat = lib.lists.flatten insertNames;
# Combines providers list with flattened list # Combines providers list with flattened list
withProviders = lib.attrsets.mapCartesianProduct withProviders = lib.attrsets.mapCartesianProduct ({ d, provider }: d // { inherit provider; }) {
({d, provider}: d // { inherit provider; }) d = flat;
{ d = flat; provider = providers; }; provider = providers;
active = builtins.filter (x: (x?eol) && (!x.eol)) withProviders; };
active = builtins.filter (
x:
!(x.eol or false) && ((lib.lists.findFirstIndex (y: y == x.provider) (-1) (x.exclude or [ ])) == -1)
) withProviders;
name = d: "-${d.distro}-${d.arch}-${d.provider}-${d.version}"; name = d: "-${d.distro}-${d.arch}-${d.provider}-${d.version}";
distroFile = d: "distros/${d.distro}/${d.version}/${d.arch}.pkrvars.hcl"; distroFile = d: "distros/${d.distro}/${d.version}/${d.arch}.pkrvars.hcl";
cmd = d: '' in
# This is a workaround for a goofy behavior in CI flake-parts.lib.mkFlake { inherit inputs; } {
if [ -e "''${PACKER_CONFIG_DIR}" ]; then
find "''${PACKER_CONFIG_DIR}" -name '*_linux_amd64' -exec chmod +x '{}' ";"
fi
packer init sources
packer build -only=${d.provider}.${d.arch} -var-file=${distroFile d}'';
in flake-parts.lib.mkFlake { inherit inputs; }
{
imports = [
inputs.devshell.flakeModule
inputs.flake-root.flakeModule
inputs.treefmt-nix.flakeModule
];
flake = { flake = {
# Universal things # Universal things
}; };
@@ -50,52 +44,50 @@
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
]; ];
perSystem = { config, pkgs, self', system, ... }: perSystem =
{
pkgs,
self',
system,
...
}@inputs':
{ {
_module.args.pkgs = import inputs.nixpkgs { _module.args.pkgs = import inputs.nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
# https://numtide.github.io/devshell/intro.html
devshells.default = { devShells.default = pkgs.mkShell {
buildInputs = self'.checks.pre-commit.enabledPackages;
shellHook = self'.checks.pre-commit.shellHook;
packages =
(with pkgs; [
vagrant
])
++ (with self'.packages; [
cache
generate
shellcheck
validate
])
++ (builtins.map (d: self'.packages."build${name d}") withProviders);
# These commands will be shown in the motd that users read # These commands will be shown in the motd that users read
# upon entering the shell # upon entering the shell
commands = [ { env = {
package = self'.packages.cache; EFI_DIR = "${pkgs.OVMF.fd}/FV/";
category = "utils"; PACKER_CONFIG_DIR = "./packer_config";
help = "Downloads ISO files and adds them to the S3 bucket"; STORAGE_URL = "http://s3.thehellings.lan:9000";
} { };
package = self'.packages.generate;
category = "utils";
help = "Generate dynamic HCL files";
} {
package = self'.packages.shellcheck;
category = "utils";
help = "Run shellchecks";
} {
package = self'.packages.validate;
category = "utils";
help = "Validate all the files";
} {
package = pkgs.vagrant;
category = "utils";
help = "Vagrant to help with testing";
} ] ++ (builtins.map (d: { package = self'.packages."build${name d}"; category = "builds"; }) withProviders);
env = [{
name = "EFI_DIR";
value = "${pkgs.OVMF.fd}/FV/";
} {
name = "PACKER_CONFIG_DIR";
value = "./packer_config";
} {
name = "STORAGE_URL";
value = "http://s3.thehellings.lan:9000";
} ];
}; };
# This is not special, this is just flakes # This is not special, this is just flakes
packages = let packages =
base = { let
base =
prefix: d: args:
pkgs.writeShellApplication {
name = "${prefix}${name d}";
runtimeInputs = with pkgs; [ runtimeInputs = with pkgs; [
cdrtools cdrtools
findutils findutils
@@ -104,44 +96,47 @@
vagrant vagrant
xorriso xorriso
]; ];
text = ''
# This is a workaround for a goofy behavior in CI
if [ -e "''${PACKER_CONFIG_DIR}" ]; then
find "''${PACKER_CONFIG_DIR}" -name '*_linux_amd64' -exec chmod +x '{}' ";"
fi
packer init sources
packer build -only=${d.provider}.${d.arch} -var-file=${distroFile d} ${args} sources/
'';
}; };
build = d: let builds = lib.lists.foldr (
vp = x: if x.provider == "qemu" then "libvirt" d: acc: acc // { "build${name d}" = (base "build" d "-except=upload -var headless=false"); }
else if x.provider == "virtualbox-iso" then "virtualbox" ) { } withProviders;
else if x.provider == "hyperv-iso" then "hyperv" cibuilds = lib.lists.foldr (
else "unknown"; d: acc: acc // { "ci${name d}" = (base "ci" d "-except=upload"); }
in pkgs.writeShellApplication (base // { ) { } withProviders;
name = "build${name d}"; uploads = lib.lists.foldr (
text = '' d: acc: acc // { "upload${name d}" = (base "upload" d ""); }
set -x ) { } withProviders;
${cmd d} -except=upload -var headless=false sources/ qemu_list = builtins.map (d: { buildcmd = (name d); }) (
vagrant box add --provider ${vp d} ./output/${vp d}/${d.distro}-${d.version}.box --name test_box --force builtins.filter (x: x.provider == "qemu") active
''; );
}); vbox_list = builtins.map (d: { buildcmd = (name d); }) (
cibuild = d: pkgs.writeShellApplication (base // { builtins.filter (x: x.provider == "virtualbox-iso") active
name = "ci${name d}"; );
text = '' hyperv_list = builtins.map (d: { distro = distroFile d; }) (
set -x builtins.filter (x: x.provider == "hyperv-iso") active
${cmd d} -except=upload sources/ );
''; in
}); builds
upload = d: pkgs.writeShellApplication (base // { // uploads
name = "upload${name d}"; // cibuilds
text = '' // {
set -x continue = (
${cmd d} sources/ import ./nix/continue.nix {
''; inherit
}); pkgs
builds = lib.lists.foldr (d: acc: acc // { "build${name d}" = (build d); }) {} withProviders; qemu_list
uploads = lib.lists.foldr (d: acc: acc // { "upload${name d}" = (upload d); }) {} withProviders; vbox_list
cibuilds = lib.lists.foldr (d: acc: acc // { "ci${name d}" = (cibuild d); }) {} withProviders; hyperv_list
qemu_list = builtins.toJSON (builtins.map (d: { buildcmd = (name d); }) (builtins.filter (x: x.provider == "qemu") active)); ;
vbox_list = builtins.toJSON (builtins.map (d: { buildcmd = (name d); }) (builtins.filter (x: x.provider == "virtualbox-iso") active)); }
hyperv_list = builtins.toJSON (builtins.map (d: { distro = distroFile d; }) (builtins.filter (x: x.provider == "hyperv-iso") active));
in builds // uploads // cibuilds // {
continue = pkgs.writeText "continue.yml"
(builtins.replaceStrings ["QEMU_MATRIX" "VBOX_MATRIX" "HYPERV_MATRIX"] [qemu_list vbox_list hyperv_list]
(builtins.readFile ./.gitlab-ci-build.yml.in)
); );
cache = pkgs.callPackage (import ./nix/cache.nix) { inherit active distroFile; }; cache = pkgs.callPackage (import ./nix/cache.nix) { inherit active distroFile; };
validate = pkgs.callPackage (import ./nix/validate.nix) { }; validate = pkgs.callPackage (import ./nix/validate.nix) { };
@@ -154,50 +149,25 @@
]; ];
text = builtins.readFile ./cache-restore.sh; text = builtins.readFile ./cache-restore.sh;
}; };
generate = pkgs.writeShellApplication { generate = pkgs.callPackage (import ./nix/generate.nix) { };
name = "generate"; shellcheck = pkgs.callPackage (import ./nix/shellcheck.nix) { };
runtimeInputs = with pkgs; [
bash
coreutils
curl
jq
pup
];
text = ''
shopt -s globstar
for vars in distros/**/*.pkrvars.hcl.sh; do
bash "./''${vars}"
done
set -x
echo "BUILD=$(date "+%Y.%m.%d.%H")" >> build.env
'';
};
shellcheck = pkgs.writeShellApplication {
name = "shellcheck";
runtimeInputs = with pkgs; [
shellcheck
];
text = ''
scripts=()
shopt -s globstar
for f in **/*.sh; do
scripts+=("$f")
done
shellcheck -e SC2239 "''${scripts[@]}"
'';
};
}; };
# https://numtide.github.io/treefmt/ checks = {
treefmt.config = { pre-commit = inputs.hooks.lib.${inputs'.system}.run {
inherit (config.flake-root) projectRootFile; src = ./.;
package = pkgs.treefmt; hooks = {
check-added-large-files.enable = true;
programs = { check-case-conflicts.enable = true;
check-merge-conflicts.enable = true;
check-symlinks.enable = true;
deadnix.enable = true; deadnix.enable = true;
end-of-file-fixer.enable = true;
fix-byte-order-marker.enable = true;
mixed-line-endings.enable = true;
nixfmt-rfc-style.enable = true;
trim-trailing-whitespace.enable = true;
}; };
settings.formatter = {
}; };
}; };
}; };
nix/cache.nix
+6 -3
View File
@@ -12,20 +12,23 @@
let let
inherit (builtins) concatStringsSep map; inherit (builtins) concatStringsSep map;
in writeShellApplication { in
writeShellApplication {
name = "cache-isos"; name = "cache-isos";
runtimeInputs = [ runtimeInputs = [
curl curl
minio-client minio-client
packer packer
]; ];
text = '' text =
''
push="''${1:-yes}" push="''${1:-yes}"
if [ "$push" == "yes" ]; then if [ "$push" == "yes" ]; then
mc alias set storage "$STORAGE_URL" root "$MINIO_SECRET" mc alias set storage "$STORAGE_URL" root "$MINIO_SECRET"
fi fi
mkdir -p cache mkdir -p cache
'' + (concatStringsSep "\n" ( ''
+ (concatStringsSep "\n" (
map (d: '' map (d: ''
url=$(echo var.iso.url | packer console -var-file="${distroFile d}" -config-type=hcl2 sources/) url=$(echo var.iso.url | packer console -var-file="${distroFile d}" -config-type=hcl2 sources/)
sha=$(echo var.iso.checksum | packer console -var-file="${distroFile d}" -config-type=hcl2 sources/) sha=$(echo var.iso.checksum | packer console -var-file="${distroFile d}" -config-type=hcl2 sources/)
nix/continue.nix
+98
View File
@@ -0,0 +1,98 @@
{
pkgs,
qemu_list,
vbox_list,
hyperv_list,
...
}:
let
general = {
stage = "build";
cache = [
{
key = {
files = [ "sources/build.pkr.hcl" ];
};
paths = [ "./packer_config/" ];
}
];
rules = [
{
"if" = "$CI_COMMIT_TAG";
variables = {
EXCEPT = "";
JOB_PREFIX = "upload";
};
}
{
"if" = "$CI_COMMIT_TAG =~ \"/^$/\"";
variables = {
EXCEPT = "-except=upload";
JOB_PREIX = "ci";
};
}
];
needs = [
{
pipeline = "$PARENT_PIPELINE_ID";
job = "generate";
artifacts = true;
}
];
script = [
"nix run \".#\\\"\${JOB_PREIX}\${buildcmd}\\\"\" || exit 1"
];
};
variables = {
PACKER_CONFIG_DIR = "./packer_config/";
PACKER_CACHE_DIR = "./cache/";
PACKER_LOG = "1";
};
continue = {
stages = [
"build"
"release"
];
"qemu.amd64" = general // {
variables = variables // {
only = "-only=qemu.amd64";
};
tags = [ "qemu" ];
parallel = {
matrix = qemu_list;
};
before_script = [
"echo $BUILD"
"env"
];
};
"virtualbox-iso.amd64" = general // {
variables = variables // {
only = "-only=\"virtualbox-iso.amd64\"";
};
tags = [ "vbox" ];
parallel = {
matrix = vbox_list;
};
};
"hyperv-iso.amd64" = general // {
variables = variables // {
only = "-only=\"hyperv-iso.amd64\"";
};
tags = [ "hyperv" ];
parallel = {
matrix = hyperv_list;
};
script = [
"packer init sources"
"packer build -only=\"hyperv-iso.amd64\" -var-file=\"\${distro}\" -var build=\${BUILD} -var cpus=2 -var memory=4096 \${EXCEPT} sources"
"if (-not $?) { throw \"Error in build\" }"
];
};
};
in
pkgs.writeText "continue.yml" (builtins.toJSON continue)
nix/generate.nix
+27
View File
@@ -0,0 +1,27 @@
{
writeShellApplication,
bash,
coreutils,
curl,
jq,
pup,
}:
writeShellApplication {
name = "generate";
runtimeInputs = [
bash
coreutils
curl
jq
pup
];
text = ''
shopt -s globstar
for vars in distros/**/*.pkrvars.hcl.sh; do
bash "./''${vars}"
done
set -x
echo "BUILD=$(date "+%Y.%m.%d.%H")" >> build.env
'';
}
nix/shellcheck.nix
+15
View File
@@ -0,0 +1,15 @@
{ writeShellApplication, shellcheck }:
writeShellApplication {
name = "shellcheck";
runtimeInputs = [
shellcheck
];
text = ''
scripts=()
shopt -s globstar
for f in **/*.sh; do
scripts+=("$f")
done
shellcheck -e SC2239 "''${scripts[@]}"
'';
}
scripts/minimize.sh
+5
View File
@@ -22,9 +22,14 @@ elif [ -n "$swap_device_label" ]; then
fi fi
if [ -n "${swap_device}" ] && [ -e "${swap_device}" ]; then if [ -n "${swap_device}" ] && [ -e "${swap_device}" ]; then
case ${swap_device} in
"/dev/zram"*) ;;
*)
sudo /sbin/swapoff "$swap_device" sudo /sbin/swapoff "$swap_device"
sudo dd if=/dev/zero of="$swap_device" bs=1M || : sudo dd if=/dev/zero of="$swap_device" bs=1M || :
sudo /sbin/mkswap ${swap_device_label:+-L "$swap_device_label"} ${swap_device_uuid:+-U "$swap_device_uuid"} "$swap_device" sudo /sbin/mkswap ${swap_device_label:+-L "$swap_device_label"} ${swap_device_uuid:+-U "$swap_device_uuid"} "$swap_device"
;;
esac
fi fi
sleep 15 # Hyper-v seems to be super fast during boot sleep 15 # Hyper-v seems to be super fast during boot