From f9a08ca02596d9f23a741593a832b79791f24033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 21 Dec 2023 09:22:40 +0100 Subject: [PATCH 1/2] nix-direnv: also bump version in default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index b26ff24..2888356 100644 --- a/default.nix +++ b/default.nix @@ -4,7 +4,7 @@ # https://github.com/abathur/resholve/issues/107 resholve.mkDerivation rec { pname = "nix-direnv"; - version = "3.0.1"; + version = "3.0.2"; src = builtins.path { path = ./.; From 913735d6b8d26cb53eed5baf72cc0f1ef4e2ac98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 21 Dec 2023 09:31:05 +0100 Subject: [PATCH 2/2] fix devShell In https://github.com/nix-community/nix-direnv/pull/450 I broke the default shell by accident --- flake.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 867c6fa..0f5175c 100644 --- a/flake.nix +++ b/flake.nix @@ -52,17 +52,18 @@ nixVersion = "stable"; direnv = config.packages.direnv-bash4; }; - devShells.default = pkgs.callPackage ./shell.nix { - packages = [ config.treefmt.build.wrapper ]; - }; - - checks = - let - packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages; - devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells; - in - packages // devShells; }; + + devShells.default = pkgs.callPackage ./shell.nix { + packages = [ config.treefmt.build.wrapper ]; + }; + + checks = + let + packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages; + devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells; + in + packages // devShells; }; flake = { overlays.default = final: _prev: {