Merge pull request #534 from DarkKirb/fix-riscv

use nixVersions.latest for nixos-option
This commit is contained in:
Charlotte 🦝 Delenk 2024-09-28 23:07:56 +02:00 committed by GitHub
commit 81532b150c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 5 deletions

View file

@ -5,8 +5,15 @@
nixpkgs,
nixos-hardware,
riscv-overlay,
lix,
...
} @ args: {
} @ args: let
pkgs_x86_64 = import nixpkgs {
system = "x86_64-linux";
crossSystem.system = "riscv64-linux";
overlays = [lix.overlays.default];
};
in {
networking.hostName = "vf2";
networking.hostId = "ad325df9";
imports = [
@ -22,8 +29,12 @@
nixpkgs.overlays = [
riscv-overlay.overlays.default
(self: super: {
inherit (pkgs_x86_64) lix;
nixos-option = super.nixos-option.override {
nix = self.nix;
nix = self.nixVersions.stable_upstream.overrideAttrs {
doCheck = false;
doInstallCheck = false;
};
};
})
];

View file

@ -894,11 +894,11 @@
]
},
"locked": {
"lastModified": 1727270329,
"narHash": "sha256-9AkbFImNM+GFeWS0Uz6bxtGAOZEGUudcpjbUsBdMF6Q=",
"lastModified": 1727422502,
"narHash": "sha256-TYcXc+VN0VHDU4b/6DDOcKQ/laKwODK5aFSwvIWWutg=",
"owner": "DarkKirb",
"repo": "riscv-overlay",
"rev": "75f0fa9565554835e126e495bf53dae37ad03e8e",
"rev": "a2866322389d5d927c1a1a298c474b2d7b9e37e4",
"type": "github"
},
"original": {