From a023d391a08f8c8b1b7c26fcbb8d06edd5ceb203 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sun, 6 Nov 2022 00:30:18 -0500 Subject: feat: reuse the pre-installed channel --- flake.lock | 27 --------------------------- flake.nix | 5 +++-- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 flake.lock diff --git a/flake.lock b/flake.lock deleted file mode 100644 index d99ebe5..0000000 --- a/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1660646295, - "narHash": "sha256-V4G+egGRc3elXPTr7QLJ7r7yrYed0areIKDiIAlMLC8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "762b003329510ea855b4097a37511eb19c7077f0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix index cd955a2..dd065cf 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,8 @@ { description = "Description for the project"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # don't lock to give precedence to a USB live-installer's registry + inputs.nixpkgs.url = "nixpkgs"; outputs = { self, nixpkgs, ... }: { nixosModules.disko = import ./module.nix; @@ -9,8 +10,8 @@ inherit (nixpkgs) lib; }; packages.x86_64-linux.disko = let - inherit (nixpkgs) lib; pkgs = nixpkgs.legacyPackages.x86_64-linux; + inherit (pkgs) lib; inclFiles = {src, name}: files: lib.cleanSourceWith { inherit src name; filter = _path: _type: _type == "regular" -- cgit v1.2.3