emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: add riscv64-linux image
Some checks failed
Build / images (nscloud-ubuntu-22.04-arm64-4x16, nixos-24.05) (push) Has been cancelled
Details
Build / images (nscloud-ubuntu-22.04-arm64-4x16, nixos-unstable) (push) Has been cancelled
Details
Build / images (ubuntu-latest, nixos-24.05) (push) Has been cancelled
Details
Build / images (ubuntu-latest, nixos-unstable) (push) Has been cancelled
Details

Browse source
This commit is contained in:
emily 2024-10-23 20:49:48 +02:00
parent a5fbf34b25
commit 1d4c4b7f6f
Signed by: emily
GPG key ID: F6F4C66207FCF995
3 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
flake.nix
View file

@ -9,10 +9,11 @@
outputs = { self, nixos-unstable, nixos-stable }: outputs = { self, nixos-unstable, nixos-stable }:
let let
supportedSystems = [ "aarch64-linux" "x86_64-linux" ]; supportedSystems = [ "riscv64-linux" ];
forAllSystems = nixos-unstable.lib.genAttrs supportedSystems; forAllSystems = nixos-unstable.lib.genAttrs supportedSystems;
in in
{ {
hydraJobs = { inherit (self) checks; };
packages = forAllSystems (system: packages = forAllSystems (system:
let let
netboot = nixpkgs: (import (nixpkgs + "/nixos/release.nix") { }).netboot.${system}; netboot = nixpkgs: (import (nixpkgs + "/nixos/release.nix") { }).netboot.${system};
@ -60,8 +61,8 @@
packages = forAllSystems (system: nixos-unstable.lib.mapAttrs' (n: nixos-unstable.lib.nameValuePair "package-${n}") self.packages.${system}); packages = forAllSystems (system: nixos-unstable.lib.mapAttrs' (n: nixos-unstable.lib.nameValuePair "package-${n}") self.packages.${system});
checks = checks =
let let
pkgsUnstable = nixos-unstable.legacyPackages.x86_64-linux; pkgsUnstable = nixos-unstable.legacyPackages.riscv64-linux;
pkgsStable = nixos-stable.legacyPackages.x86_64-linux; pkgsStable = nixos-stable.legacyPackages.riscv64-linux;
bootTests = pkgs: channel: suffix: pkgs.lib.mapAttrs' (name: pkgs.lib.nameValuePair "${name}${suffix}") (pkgs.callPackages ./nix/image-installer/tests.nix { bootTests = pkgs: channel: suffix: pkgs.lib.mapAttrs' (name: pkgs.lib.nameValuePair "${name}${suffix}") (pkgs.callPackages ./nix/image-installer/tests.nix {
nixpkgs = channel; nixpkgs = channel;
@ -70,22 +71,15 @@
in in
{ {
kexec-installer-unstable = pkgsUnstable.callPackage ./nix/kexec-installer/test.nix { kexec-installer-unstable = pkgsUnstable.callPackage ./nix/kexec-installer/test.nix {
kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-unstable-noninteractive; kexecTarball = self.packages.riscv64-linux.kexec-installer-nixos-unstable-noninteractive;
}; };
kexec-installer-stable = nixos-stable.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix { kexec-installer-stable = nixos-stable.legacyPackages.riscv64-linux.callPackage ./nix/kexec-installer/test.nix {
kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-stable-noninteractive; kexecTarball = self.packages.riscv64-linux.kexec-installer-nixos-stable-noninteractive;
}; };
shellcheck = pkgsUnstable.runCommand "shellcheck"
{
nativeBuildInputs = [ pkgsUnstable.shellcheck ];
} ''
shellcheck ${(pkgsUnstable.nixos [self.nixosModules.kexec-installer]).config.system.build.kexecRun}
touch $out
'';
} // (bootTests pkgsUnstable nixos-unstable "-nixos-unstable") } // (bootTests pkgsUnstable nixos-unstable "-nixos-unstable")
// (bootTests pkgsStable nixos-stable "-nixos-stable"); // (bootTests pkgsStable nixos-stable "-nixos-stable");
in in
nixos-unstable.lib.recursiveUpdate packages { x86_64-linux = checks; }; nixos-unstable.lib.recursiveUpdate packages { riscv64-linux = checks; };
}; };
} }

4
nix/installer.nix
View file

@ -6,7 +6,7 @@
}: }:
{ {
imports = [ imports = [
./latest-zfs-kernel.nix # ./latest-zfs-kernel.nix
./nix-settings.nix ./nix-settings.nix
]; ];
# more descriptive hostname than just "nixos" # more descriptive hostname than just "nixos"
@ -19,7 +19,7 @@
boot.supportedFilesystems.bcachefs = lib.mkDefault true; boot.supportedFilesystems.bcachefs = lib.mkDefault true;
# use latest kernel we can support to get more hardware support # use latest kernel we can support to get more hardware support
boot.zfs.package = pkgs.zfsUnstable; # boot.zfs.package = pkgs.zfsUnstable;
documentation.enable = false; documentation.enable = false;
documentation.man.man-db.enable = false; documentation.man.man-db.enable = false;

2
nix/noninteractive.nix
View file

@ -10,7 +10,7 @@
]; ];
imports = [ imports = [
./zfs-minimal.nix # ./zfs-minimal.nix
./no-bootloaders.nix ./no-bootloaders.nix
./python-minimal.nix ./python-minimal.nix
./noveau-workaround.nix ./noveau-workaround.nix