From 9653377ba5d99af3446186156448be05a68e5d29 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Wed, 24 Jan 2024 12:53:10 +0100 Subject: [PATCH] Remove unneeded flake dependencies --- flake.lock | 55 +----------------------------------------------------- flake.nix | 55 +----------------------------------------------------- 2 files changed, 2 insertions(+), 108 deletions(-) diff --git a/flake.lock b/flake.lock index 9dbb15a..1a56d89 100644 --- a/flake.lock +++ b/flake.lock @@ -1,40 +1,5 @@ { "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": { "locked": { "lastModified": 1706092046, @@ -53,25 +18,7 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", - "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" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 855d8ec..cbb45db 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,7 @@ { 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 - 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, ... }: + outputs = { self, nixpkgs, ... }: let system = "x86_64-linux"; overlay = import ./overlay.nix; @@ -43,7 +37,6 @@ nixosconf = self.nixosConfigurations.qemu-nc; syspkgs = nixosconf.pkgs; toplevel = nixosconf.config.system.build.toplevel; - #toplevel = "${nixosconf.config.system.build.vm}/system"; in pkgs.mkShell { pname = "qemu-shell"; @@ -51,52 +44,6 @@ # Here we tell the run script where to find the system NIXOS_SYSTEM_TOPLEVEL = toplevel; 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; -# }); -#}