rarias/nixos-riscv
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove unneeded flake dependencies

Browse Source
This commit is contained in:
Rodrigo Arias 2024-01-24 12:53:10 +01:00
parent 5b8a51fb19
commit 9653377ba5
2 changed files with 2 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
flake.lock
View File

@ -1,40 +1,5 @@
{ {
"nodes": { "nodes": {
"flake-utils": {
"inputs": {
"systems": [
"systems"
]
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1705312285,
"narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1706092046, "lastModified": 1706092046,
@ -53,25 +18,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "nixpkgs": "nixpkgs"
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"systems": "systems"
}
},
"systems": {
"locked": {
"lastModified": 1680978846,
"narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
"owner": "nix-systems",
"repo": "x86_64-linux",
"rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "x86_64-linux",
"type": "github"
} }
} }
}, },

55
flake.nix
View File

@ -1,13 +1,7 @@
{ {
inputs.nixpkgs.url = "github:rodarima/nixpkgs/fix-pkgs-static-gcc-march"; inputs.nixpkgs.url = "github:rodarima/nixpkgs/fix-pkgs-static-gcc-march";
inputs.nixos-hardware.url = "github:nixos/nixos-hardware";
# Some dependencies of this flake are not yet available on non linux systems outputs = { self, nixpkgs, ... }:
inputs.systems.url = "github:nix-systems/x86_64-linux";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.flake-utils.inputs.systems.follows = "systems";
outputs = { self, nixpkgs, nixos-hardware, flake-utils, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
overlay = import ./overlay.nix; overlay = import ./overlay.nix;
@ -43,7 +37,6 @@
nixosconf = self.nixosConfigurations.qemu-nc; nixosconf = self.nixosConfigurations.qemu-nc;
syspkgs = nixosconf.pkgs; syspkgs = nixosconf.pkgs;
toplevel = nixosconf.config.system.build.toplevel; toplevel = nixosconf.config.system.build.toplevel;
#toplevel = "${nixosconf.config.system.build.vm}/system";
in in
pkgs.mkShell { pkgs.mkShell {
pname = "qemu-shell"; pname = "qemu-shell";
@ -51,52 +44,6 @@
# Here we tell the run script where to find the system # Here we tell the run script where to find the system
NIXOS_SYSTEM_TOPLEVEL = toplevel; NIXOS_SYSTEM_TOPLEVEL = toplevel;
OPENSBI = syspkgs.opensbi-uboot; OPENSBI = syspkgs.opensbi-uboot;
#OPENSBI = syspkgs.opensbi;
}; };
}; };
} }
# flake-utils.lib.eachDefaultSystem (system:
# rec {
#
# # .\#nixosConfigurations.visionfive-cross.config.system.build.toplevel
# packages.default = packages.sd-image;
# packages.sd-image = (import "${nixpkgs}/nixos" {
# configuration =
# { config, ... }: {
# imports = [
# "${nixos-hardware}/starfive/visionfive/v2/sd-image-installer.nix"
# ];
#
# # If you want to use ssh set a password
# users.users.nixos.password = "test123";
# # OR add your public ssh key
# # users.users.nixos.openssh.authorizedKeys.keys = [ "ssh-rsa ..." ];
#
# # AND configure networking
# networking.interfaces.end0.useDHCP = true;
# networking.interfaces.end1.useDHCP = true;
#
# # Additional configuration goes here
#
# #hardware.deviceTree.overlays = [{
# # name = "8GB-patch";
# # dtsFile = "${nixos-hardware}/starfive/visionfive/v2/8gb-patch.dts";
# #}];
#
# #sdImage.compressImage = false;
#
# nixpkgs.crossSystem = {
# config = "riscv64-unknown-linux-gnu";
# system = "riscv64-linux";
# };
#
# system.stateVersion = "24.05";
# };
# inherit system;
# }).config.system.build.toplevel;
# });
#}