diff options
| author | quentin@aristote.fr <quentin@aristote.fr> | 2023-08-28 12:09:46 +0200 |
|---|---|---|
| committer | quentin@aristote.fr <quentin@aristote.fr> | 2023-08-28 12:45:00 +0200 |
| commit | 390bbde8924e47e278b75ef412477f71781518cf (patch) | |
| tree | c8b8720ed05c77a1ddbdaf5ae5f98e3119c467d4 | |
| parent | 2aa5cffaf3b1461df12500f112ba1484ee4e8a2f (diff) | |
lib: mkDevenv: fix args
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | lib/default.nix | 10 | ||||
| -rw-r--r-- | templates/devenv/flake-parts/flake.nix | 1 | ||||
| -rw-r--r-- | templates/devenv/simple/flake.nix | 6 |
4 files changed, 12 insertions, 11 deletions
@@ -136,11 +136,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693060755, - "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", + "lastModified": 1693145325, + "narHash": "sha256-Gat9xskErH1zOcLjYMhSDBo0JTBZKfGS0xJlIRnj6Rc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc", + "rev": "cddebdb60de376c1bdb7a4e6ee3d98355453fe56", "type": "github" }, "original": { diff --git a/lib/default.nix b/lib/default.nix index 40758eb..d65830b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -8,12 +8,10 @@ flake-parts.lib.mkFlake {inherit inputs;} { imports = [devenv.flakeModule]; systems = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; - perSystem = {...} @ perSystemInputs: { - devenv.shells.default = - { - imports = [my-nixpkgs.devenvModules.personal]; - } - // config perSystemInputs; + perSystem = _: { + devenv.shells.default = { + imports = [my-nixpkgs.devenvModules.personal config]; + }; }; }; } diff --git a/templates/devenv/flake-parts/flake.nix b/templates/devenv/flake-parts/flake.nix index 5c32548..8708556 100644 --- a/templates/devenv/flake-parts/flake.nix +++ b/templates/devenv/flake-parts/flake.nix @@ -2,6 +2,7 @@ inputs = { devenv.url = "github:cachix/devenv"; my-nixpkgs.url = "github:qaristote/my-nixpkgs"; + nixpkgs = {}; }; nixConfig = { diff --git a/templates/devenv/simple/flake.nix b/templates/devenv/simple/flake.nix index 6466cfa..078b577 100644 --- a/templates/devenv/simple/flake.nix +++ b/templates/devenv/simple/flake.nix @@ -2,6 +2,8 @@ inputs = { devenv.url = "github:cachix/devenv"; my-nixpkgs.url = "github:qaristote/my-nixpkgs"; + nixpkgs = {}; + flake-parts = {}; }; nixConfig = { @@ -9,8 +11,8 @@ extra-trusted-substituters = "https://devenv.cachix.org"; }; - outputs = {my-nixpkgs, ...} @ inputs: - my-nixpkgs.lib.mkDevenv inputs + outputs = inputs: + inputs.my-nixpkgs.lib.mkDevenv inputs # this function has the same arguments flake-parts' perSystem does: # config, lib, pkgs, system, etc. ({...}: { |