Skip to content

Commit f3e5d02

Browse files
committed
wip: add riscv installer base image
1 parent 4f89e60 commit f3e5d02

6 files changed

Lines changed: 61 additions & 7 deletions

File tree

.github/workflows/risky.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ jobs:
2929
rmz_version: "3.1.1" # NEW: Specify rmz version
3030
- uses: "DeterminateSystems/determinate-nix-action@main"
3131
- uses: "DeterminateSystems/magic-nix-cache-action@main"
32-
- name: build + cache
32+
- name: build + cache (jupitertwo)
33+
if: success() || failure()
3334
run: |
34-
nix build .#toplevels.jupitertwo -L --keep-going
35+
nix build -L --keep-going \
36+
.#toplevels.jupitertwo
37+
- name: build + cache (riscv64 iso bits)
38+
if: success() || failure()
39+
run: |
40+
nix build -L --keep-going \
41+
.#extra.riscv64-linux.installer

flake.nix

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@
119119
jupitertwo = {
120120
extraConfig = [ { nixpkgs.buildPlatform.system = "x86_64-linux"; } ];
121121
};
122+
installer-riscv64 = {
123+
path = ./images/installer/configuration-base-riscv64.nix;
124+
extraConfig = [ { nixpkgs.buildPlatform.system = "x86_64-linux"; } ];
125+
};
122126
};
123127
"aarch64-linux" = { };
124128
"aarch64-darwin" = { };
@@ -137,12 +141,17 @@
137141
};
138142
aarch64-linux = {
139143
installer =
140-
(mkSystem "installer-standard-aarch64" {
141-
path = ./images/installer/configuration-standard-aarch64.nix;
144+
(mkSystem "installer-base-aarch64" {
145+
path = ./images/installer/configuration-base-aarch64.nix;
142146
}).config.system.build.toplevel;
143147
};
144148
aarch64-darwin = { };
145-
riscv64-linux = { };
149+
riscv64-linux = {
150+
installer =
151+
(mkSystem "installer-base-aarch64" {
152+
path = ./images/installer/configuration-base-aarch64.nix;
153+
}).config.system.build.toplevel;
154+
};
146155
};
147156

148157
nixosModules = { };
File renamed without changes.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{ pkgs, lib, ... }:
2+
3+
let
4+
hn = "installer-standard";
5+
in
6+
{
7+
imports = [
8+
./configuration-base-installer.nix
9+
];
10+
11+
config = {
12+
networking.hostName = hn;
13+
system.nixos.tags = [
14+
"standard"
15+
"riscv64"
16+
];
17+
18+
# jesus christ, gobject-inspection, gpgme, ruby? fuck no
19+
services.udisks2.enable = lib.mkForce false;
20+
networking.modemmanager.enable = lib.mkForce false;
21+
22+
nixcfg.common.defaultKernel = lib.mkForce false;
23+
nixcfg.common.useZfs = lib.mkForce false;
24+
boot.supportedFilesystems = lib.mkForce [
25+
"btrfs"
26+
"ext4"
27+
"vfat"
28+
"f2fs"
29+
"xfs"
30+
"ntfs"
31+
];
32+
33+
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
34+
35+
nixpkgs.hostPlatform.system = "riscv64-linux";
36+
};
37+
}

images/installer/configuration-base.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
{
99
imports = [
10-
inputs.determinate.nixosModules.default
1110
../../profiles/core.nix
1211
];
1312

images/installer/configuration-standard.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
{ lib, ... }:
1+
{ lib, inputs, ... }:
22

33
let
44
hn = "installer-standard";
55
in
66
{
77
imports = [
8+
inputs.determinate.nixosModules.default
9+
810
./configuration-base-installer.nix
911

1012
../../profiles/interactive.nix

0 commit comments

Comments
 (0)