From b47227447971321cbd3c88b45959413ad2877555 Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 14 May 2024 00:18:19 +0100 Subject: [PATCH] flake: remove upstream dependancy --- flake.lock | 22 +--------------------- flake.nix | 11 +++-------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index d146eee..5999137 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,6 @@ { "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1715447595, - "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } + "root": {} }, "root": "root", "version": 7 diff --git a/flake.nix b/flake.nix index 0f0d49b..30263b8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,18 +1,11 @@ { - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - }; - - outputs = - { self, nixpkgs, ... }: + outputs = { self, ... }: let forAllSystems = self.lib.genAttrs self.lib.systems.flakeExposed; in { lib = import ./lib; - nixPackages = forAllSystems (system: nixpkgs.legacyPackages.${system}); - auxPackages = forAllSystems (system: ( let requiredVersion = import ./lib/minver.nix; in @@ -42,6 +35,8 @@ ) ); + legacyPackages = forAllSystems (system: import ./. { inherit system; }); + # To test, run nix build .#tests.x86_64-linux.release tests = forAllSystems (system: { systems = import ./lib/tests/systems.nix;