From 1d4c4b7f6fd850f34e14ccf35453af21266f1f8d Mon Sep 17 00:00:00 2001 From: emily Date: Wed, 23 Oct 2024 20:49:48 +0200 Subject: [PATCH] feat: add riscv64-linux image --- flake.nix | 22 ++++++++-------------- nix/installer.nix | 4 ++-- nix/noninteractive.nix | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 8392544..eeed279 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,11 @@ outputs = { self, nixos-unstable, nixos-stable }: let - supportedSystems = [ "aarch64-linux" "x86_64-linux" ]; + supportedSystems = [ "riscv64-linux" ]; forAllSystems = nixos-unstable.lib.genAttrs supportedSystems; in { + hydraJobs = { inherit (self) checks; }; packages = forAllSystems (system: let 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}); checks = let - pkgsUnstable = nixos-unstable.legacyPackages.x86_64-linux; - pkgsStable = nixos-stable.legacyPackages.x86_64-linux; + pkgsUnstable = nixos-unstable.legacyPackages.riscv64-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 { nixpkgs = channel; @@ -70,22 +71,15 @@ in { 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 { - kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-stable-noninteractive; + kexec-installer-stable = nixos-stable.legacyPackages.riscv64-linux.callPackage ./nix/kexec-installer/test.nix { + 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 pkgsStable nixos-stable "-nixos-stable"); in - nixos-unstable.lib.recursiveUpdate packages { x86_64-linux = checks; }; + nixos-unstable.lib.recursiveUpdate packages { riscv64-linux = checks; }; }; } diff --git a/nix/installer.nix b/nix/installer.nix index 45908c0..c850f9d 100644 --- a/nix/installer.nix +++ b/nix/installer.nix @@ -6,7 +6,7 @@ }: { imports = [ - ./latest-zfs-kernel.nix +# ./latest-zfs-kernel.nix ./nix-settings.nix ]; # more descriptive hostname than just "nixos" @@ -19,7 +19,7 @@ boot.supportedFilesystems.bcachefs = lib.mkDefault true; # 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.man.man-db.enable = false; diff --git a/nix/noninteractive.nix b/nix/noninteractive.nix index 41ae548..2cc44af 100644 --- a/nix/noninteractive.nix +++ b/nix/noninteractive.nix @@ -10,7 +10,7 @@ ]; imports = [ - ./zfs-minimal.nix +# ./zfs-minimal.nix ./no-bootloaders.nix ./python-minimal.nix ./noveau-workaround.nix