From 3c3976c8274037e7db14a4fb490c71ef812d1d40 Mon Sep 17 00:00:00 2001 From: hugosenari Date: Sun, 5 Dec 2021 11:41:45 -0300 Subject: [PATCH 1/7] feat(flake): simplify flake template --- flake.nix | 12 +++++++++++- template/flake.nix | 15 +-------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 7c10a6c0..7c91e22c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "devshell"; - outputs = { self }: + outputs = { self, nixpkgs }: let eachSystem = f: let @@ -32,6 +32,15 @@ legacyPackages = devshell; devShell = devshell.fromTOML ./devshell.toml; }; + fromTOML = path: eachSystem (system: + let pkgs = import nixpkgs { + inherit system; + overlays = [ (import ./overlay.nix) ]; + }; + in { + devShell = pkgs.devshell.fromTOML path; + } + ); in { defaultTemplate.path = ./template; @@ -39,6 +48,7 @@ # Import this overlay into your instance of nixpkgs overlay = import ./overlay.nix; lib = { + inherit fromTOML; importTOML = import ./nix/importTOML.nix; }; } diff --git a/template/flake.nix b/template/flake.nix index fb42e8a6..7aa6b32b 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -2,19 +2,6 @@ description = "virtual environments"; inputs.devshell.url = "github:numtide/devshell"; - inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { self, flake-utils, devshell, nixpkgs }: - flake-utils.lib.eachDefaultSystem (system: { - devShell = - let pkgs = import nixpkgs { - inherit system; - - overlays = [ devshell.overlay ]; - }; - in - pkgs.devshell.mkShell { - imports = [ (pkgs.devshell.importTOML ./devshell.toml) ]; - }; - }); + outputs = { devshell, ... }: devshell.lib.fromTOML ./devshell.toml; } From ac375a00b32d4533b9bf92bce4d620f36e1dadb1 Mon Sep 17 00:00:00 2001 From: hugosenari Date: Mon, 6 Dec 2021 20:39:47 -0300 Subject: [PATCH 2/7] feat(flake): simplify flake template --- flake.nix | 4 ++-- template/flake.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 7c91e22c..7a81b4b8 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ legacyPackages = devshell; devShell = devshell.fromTOML ./devshell.toml; }; - fromTOML = path: eachSystem (system: + flakeTOML = inputs: path: eachSystem (system: let pkgs = import nixpkgs { inherit system; overlays = [ (import ./overlay.nix) ]; @@ -48,7 +48,7 @@ # Import this overlay into your instance of nixpkgs overlay = import ./overlay.nix; lib = { - inherit fromTOML; + inherit flakeTOML; importTOML = import ./nix/importTOML.nix; }; } diff --git a/template/flake.nix b/template/flake.nix index 7aa6b32b..31942655 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -3,5 +3,7 @@ inputs.devshell.url = "github:numtide/devshell"; - outputs = { devshell, ... }: devshell.lib.fromTOML ./devshell.toml; + outputs = { devshell, nixpkgs, ... }@inputs: { + devShell = devshell.lib.flakeTOML inputs ./devshell.toml; + }; } From 67afbeddfd720030e10e6fb78f5655afdddea8c1 Mon Sep 17 00:00:00 2001 From: hugosenari Date: Thu, 9 Dec 2021 21:58:03 -0300 Subject: [PATCH 3/7] feat(flake): simplify flake template --- flake.nix | 7 ++----- template/flake.nix | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 7a81b4b8..77a09d14 100644 --- a/flake.nix +++ b/flake.nix @@ -33,11 +33,8 @@ devShell = devshell.fromTOML ./devshell.toml; }; flakeTOML = inputs: path: eachSystem (system: - let pkgs = import nixpkgs { - inherit system; - overlays = [ (import ./overlay.nix) ]; - }; - in { + let pkgs = nixpkgs.legacyPackages.${system}.extend self.overlay; + in { devShell = pkgs.devshell.fromTOML path; } ); diff --git a/template/flake.nix b/template/flake.nix index 31942655..3f53e58d 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -4,6 +4,6 @@ inputs.devshell.url = "github:numtide/devshell"; outputs = { devshell, nixpkgs, ... }@inputs: { - devShell = devshell.lib.flakeTOML inputs ./devshell.toml; + devshell.lib.flakeTOML inputs ./devshell.toml; }; } From 7c876f2863c901683b946ea7a659594d48768197 Mon Sep 17 00:00:00 2001 From: hugosenari Date: Thu, 9 Dec 2021 22:15:05 -0300 Subject: [PATCH 4/7] fix(template): correct template file --- template/flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/template/flake.nix b/template/flake.nix index 3f53e58d..a1b9ac3d 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -3,7 +3,6 @@ inputs.devshell.url = "github:numtide/devshell"; - outputs = { devshell, nixpkgs, ... }@inputs: { + outputs = { devshell, nixpkgs, ... }@inputs: devshell.lib.flakeTOML inputs ./devshell.toml; - }; } From a12b7e7106ae660725cc87252e11da7f4081b1da Mon Sep 17 00:00:00 2001 From: hugosenari Date: Fri, 10 Dec 2021 19:48:23 -0300 Subject: [PATCH 5/7] refactor(flake): simplify flake template --- flake.nix | 13 ++++++++----- template/flake.nix | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 77a09d14..aa8c7fc7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "devshell"; - outputs = { self, nixpkgs }: + outputs = { self }: let eachSystem = f: let @@ -32,10 +32,13 @@ legacyPackages = devshell; devShell = devshell.fromTOML ./devshell.toml; }; - flakeTOML = inputs: path: eachSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}.extend self.overlay; - in { - devShell = pkgs.devshell.fromTOML path; + flakeTOML = nixpkgs: path: eachSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + devshell = import ./. { inherit system pkgs; }; + in + { + devShell = devshell.fromTOML path; } ); in diff --git a/template/flake.nix b/template/flake.nix index a1b9ac3d..3131a751 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -3,6 +3,6 @@ inputs.devshell.url = "github:numtide/devshell"; - outputs = { devshell, nixpkgs, ... }@inputs: - devshell.lib.flakeTOML inputs ./devshell.toml; + outputs = { devshell, nixpkgs }: + devshell.lib.flakeTOML nixpkgs ./devshell.toml; } From f2b4c4118419fd67276b2d24d1227be72b2d32a8 Mon Sep 17 00:00:00 2001 From: hugosenari Date: Fri, 10 Dec 2021 20:02:32 -0300 Subject: [PATCH 6/7] fix(flake): flake template requires self arg --- template/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/flake.nix b/template/flake.nix index 3131a751..2d5143b1 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -3,6 +3,6 @@ inputs.devshell.url = "github:numtide/devshell"; - outputs = { devshell, nixpkgs }: + outputs = { self, devshell, nixpkgs }: devshell.lib.flakeTOML nixpkgs ./devshell.toml; } From e5004d3d8c7834586a24e55d42d34d20d18d04db Mon Sep 17 00:00:00 2001 From: hugosenari Date: Mon, 13 Dec 2021 12:01:49 -0300 Subject: [PATCH 7/7] fix(flake): flake template requies extend overlay --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index aa8c7fc7..32d79ea1 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ }; flakeTOML = nixpkgs: path: eachSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system}.extend self.overlay; devshell = import ./. { inherit system pkgs; }; in {