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

Merge pull request #154 from nix-community/upgrade-aarch64

Browse source 
upgrade zfs on aarch64
This commit is contained in:
Jörg Thalheim 2023-12-23 09:19:36 +01:00 committed by GitHub
commit 1d92ed3028
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 50 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/update-flake-lock.yml vendored
View file

@ -1,8 +1,8 @@
name: update-flake-lock name: update-flake-lock
on: on:
workflow_dispatch: # allows manual triggering workflow_dispatch: # allows manual triggering
schedule: # schedule:
- cron: '0 0 * * 1,4' # Run twice a week # - cron: '0 0 * * 1,4' # Run twice a week
jobs: jobs:
lockfile: lockfile:

25
.mergify.yml
View file

@ -1,30 +1,7 @@
queue_rules: queue_rules:
- name: default - name: default
merge_conditions: merge_conditions:
- check-success=Evaluate flake.nix - check-success=buildbot/nix-eval
- check-success=check kexec-installer-2311 [x86_64-linux]
- check-success=check kexec-installer-unstable [x86_64-linux]
- check-success=check shellcheck [x86_64-linux]
- check-success=images (nixos-23.11, nscloud-ubuntu-22.04-arm64-4x16)
- check-success=images (nixos-23.11, ubuntu-latest)
- check-success=images (nixos-unstable, nscloud-ubuntu-22.04-arm64-4x16)
- check-success=images (nixos-unstable, ubuntu-latest)
- check-success=package kexec-installer-nixos-2311 [aarch64-linux]
- check-success=package kexec-installer-nixos-2311 [x86_64-linux]
- check-success=package kexec-installer-nixos-2311-noninteractive [aarch64-linux]
- check-success=package kexec-installer-nixos-2311-noninteractive [x86_64-linux]
- check-success=package kexec-installer-nixos-unstable [aarch64-linux]
- check-success=package kexec-installer-nixos-unstable [x86_64-linux]
- check-success=package kexec-installer-nixos-unstable-noninteractive [aarch64-linux]
- check-success=package kexec-installer-nixos-unstable-noninteractive [x86_64-linux]
- check-success=package netboot-installer-nixos-2311 [aarch64-linux]
- check-success=package netboot-installer-nixos-2311 [x86_64-linux]
- check-success=package netboot-installer-nixos-unstable [aarch64-linux]
- check-success=package netboot-installer-nixos-unstable [x86_64-linux]
- check-success=package netboot-nixos-2311 [aarch64-linux]
- check-success=package netboot-nixos-2311 [x86_64-linux]
- check-success=package netboot-nixos-unstable [aarch64-linux]
- check-success=package netboot-nixos-unstable [x86_64-linux]
defaults: defaults:
actions: actions:
queue: queue:

12
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixos-2311": { "nixos-2311": {
"locked": { "locked": {
"lastModified": 1702128801, "lastModified": 1703242439,
"narHash": "sha256-nU69ZNl1pCXEtNdyHT1/nA4NnXWsWUMpEg937BNecbo=", "narHash": "sha256-cPYxhiZkgoZIsKo8l0zaE6PCy7Fv4ekL7YAlaH3J7Ls=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8ae56eaea9054590c57f9509341601f05cbb92d7", "rev": "df3e6d6131d5f5df9b9524c7f4c39bfce7add927",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,11 +18,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1701893209, "lastModified": 1703166787,
"narHash": "sha256-050hRfYUCfS1Kh72RpuG9fgEtwu6cuHHF3P8iC0BKgY=", "narHash": "sha256-OnhZqQdVvhBytYthnjsnQtH/zRn6wR8P4U478lGpktw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e4e2af6d113155799eb9be93e3d8dd32d7300e06", "rev": "d644f3882d553e717e225e69ec8254d6736b8cba",
"type": "github" "type": "github"
}, },
"original": { "original": {

48
flake.nix
View file

@ -4,12 +4,8 @@
inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
inputs.nixos-2311.url = "github:NixOS/nixpkgs/release-23.11"; inputs.nixos-2311.url = "github:NixOS/nixpkgs/release-23.11";
nixConfig.extra-substituters = [ nixConfig.extra-substituters = [ "https://nix-community.cachix.org" ];
"https://cache.garnix.io" nixConfig.extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
];
nixConfig.extra-trusted-public-keys = [
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
];
outputs = { self, nixos-unstable, nixos-2311 }: outputs = { self, nixos-unstable, nixos-2311 }:
let let
@ -51,24 +47,30 @@
# TODO: also add a test here once we have https://github.com/NixOS/nixpkgs/pull/228346 merged # TODO: also add a test here once we have https://github.com/NixOS/nixpkgs/pull/228346 merged
netboot-installer = ./nix/netboot-installer/module.nix; netboot-installer = ./nix/netboot-installer/module.nix;
}; };
checks.x86_64-linux = checks =
let let
pkgs = nixos-unstable.legacyPackages.x86_64-linux; # re-export the packages as checks
in packages = forAllSystems (system: nixos-unstable.lib.mapAttrs' (n: nixos-unstable.lib.nameValuePair "package-${n}") self.packages.${system});
{ checks =
kexec-installer-unstable = pkgs.callPackage ./nix/kexec-installer/test.nix { let
kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-unstable-noninteractive; pkgs = nixos-unstable.legacyPackages.x86_64-linux;
}; in
shellcheck = pkgs.runCommand "shellcheck"
{ {
nativeBuildInputs = [ pkgs.shellcheck ]; kexec-installer-unstable = pkgs.callPackage ./nix/kexec-installer/test.nix {
} '' kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-unstable-noninteractive;
shellcheck ${(pkgs.nixos [self.nixosModules.kexec-installer]).config.system.build.kexecRun} };
touch $out shellcheck = pkgs.runCommand "shellcheck"
''; {
kexec-installer-2311 = nixos-2311.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix { nativeBuildInputs = [ pkgs.shellcheck ];
kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-2311-noninteractive; } ''
}; shellcheck ${(pkgs.nixos [self.nixosModules.kexec-installer]).config.system.build.kexecRun}
}; touch $out
'';
kexec-installer-2311 = nixos-2311.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix {
kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-2311-noninteractive;
};
};
in
nixos-unstable.lib.recursiveUpdate packages { x86_64-linux = checks; };
}; };
} }

5
nix/installer.nix
View file

@ -3,7 +3,10 @@
system.stateVersion = config.system.nixos.version; system.stateVersion = config.system.nixos.version;
# use latest kernel we can support to get more hardware support # use latest kernel we can support to get more hardware support
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelPackages = lib.mkDefault (pkgs.zfs.override {
removeLinuxDRM = pkgs.hostPlatform.isAarch64;
}).latestCompatibleLinuxPackages;
boot.zfs.removeLinuxDRM = lib.mkDefault pkgs.hostPlatform.isAarch64;
# IPMI SOL console redirection stuff # IPMI SOL console redirection stuff
boot.kernelParams = boot.kernelParams =

13
nix/noninteractive.nix
View file

@ -50,9 +50,20 @@
"dm-raid" "dm-raid"
]; ];
extraModulePackages = [ extraModulePackages = [
config.boot.kernelPackages.zfs (config.boot.kernelPackages.zfs.override {
inherit (config.boot.zfs) removeLinuxDRM;
})
]; ];
}; };
boot.kernelPatches = lib.optional (config.boot.zfs.removeLinuxDRM && pkgs.stdenv.hostPlatform.system == "aarch64-linux") {
name = "export-neon-symbols-as-gpl";
patch = pkgs.fetchpatch {
url = "https://github.com/torvalds/linux/commit/aaeca98456431a8d9382ecf48ac4843e252c07b3.patch";
hash = "sha256-L2g4G1tlWPIi/QRckMuHDcdWBcKpObSWSRTvbHRIwIk=";
revert = true;
};
};
networking.hostId = lib.mkDefault "8425e349"; networking.hostId = lib.mkDefault "8425e349";
} }