use riscv-overlay repo

This commit is contained in:
Charlotte 🦝 Delenk 2024-07-05 14:59:06 +02:00
parent 132ef46327
commit ef0fd43557
4 changed files with 28 additions and 61 deletions

View file

@ -4,6 +4,7 @@
pkgs,
nixpkgs,
nixos-hardware,
riscv-overlay,
...
} @ args: {
networking.hostName = "vf2";
@ -20,7 +21,7 @@
nixpkgs.config.allowUnsupportedSystem = true;
nixpkgs.overlays = [
(import ../overlays/riscv.nix args)
riscv-overlay.overlays.default
];
nix.settings.substituters = lib.mkForce [

View file

@ -766,6 +766,26 @@
"type": "github"
}
},
"riscv-overlay": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1720184153,
"narHash": "sha256-bOlvWG82/8xlH+dPH8qZMjMspP6j0TMLSnIAHpsqfnc=",
"owner": "DarkKirb",
"repo": "riscv-overlay",
"rev": "842ef002b8fa44b9cfccea396b631f81a0cd91b1",
"type": "github"
},
"original": {
"owner": "DarkKirb",
"repo": "riscv-overlay",
"type": "github"
}
},
"root": {
"inputs": {
"admin-fe": "admin-fe",
@ -794,6 +814,7 @@
"nixos-hardware": "nixos-hardware",
"nixos-vscode-server": "nixos-vscode-server",
"nixpkgs": "nixpkgs_2",
"riscv-overlay": "riscv-overlay",
"rust-overlay": "rust-overlay",
"sops-nix": "sops-nix",
"systems": "systems_2"

View file

@ -137,6 +137,10 @@ rec {
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = "github:NixOS/nixpkgs";
riscv-overlay = {
url = "github:DarkKirb/riscv-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.flake-utils.follows = "flake-utils";
@ -223,23 +227,7 @@ rec {
emoji-volpeon-vlpn
emoji-volpeon-neofox
emoji-volpeon-neocat
emoji-volpeon-floof
emoji-rosaflags
emoji-raccoon
emoji-caro
lotte-art
alco-sans
constructium
fairfax
fairfax-hd
kreative-square
nasin-nanpa
matrix-media-repo
mautrix-discord
mautrix-whatsapp
mautrix-telegram
python-mautrix
python-tulir-telethon
emoji-volpeon-floofentries
papermc
python-plover-stroke
python-rtf-tokenize

View file

@ -1,43 +0,0 @@
args: self: prev: let
pkgsX86 = import args.nixpkgs {
system = "x86_64-linux";
crossSystem = "riscv64-linux";
overlays = [args.self.overlays.riscv64-linux];
config.allowUnfree = true;
};
/*
lib = pkgsX86.lib;
*/
in {
pandoc = self.writeScriptBin "pandoc" "true";
/*
inherit (pkgsX86) nix;
inherit (args.attic.packages.x86_64-linux) attic-client;
bind = prev.bind.overrideAttrs (_: {
doCheck = false;
doInstallCheck = false;
});
restic = prev.restic.overrideAttrs (_: {
doCheck = false;
doInstallCheck = false;
});
python3 = prev.python3.override {
packageOverrides = final: prev: {
pytest-xdist = prev.pytest-xdist.overrideAttrs (_: {
doCheck = false;
doInstallCheck = false;
});
};
};
python3Packages = self.python3.pkgs;
python310 = prev.python310.override {
packageOverrides = final: prev: {
pytest-xdist = prev.pytest-xdist.overrideAttrs (_: {
doCheck = false;
doInstallCheck = false;
});
};
};
python310Packages = self.python310.pkgs;
*/
}