Merge pull request #195 from nix-community/docs

Template refactoring + fix version

README.md

@@ -88,8 +88,8 @@ keep-outputs = true
 Put the following lines in your `.envrc`:
 
 ```bash
-if ! has nix_direnv_version || ! nix_direnv_version 2.1.0; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.1.0/direnvrc" "sha256-FAT2R9yYvVg516v3LiogjIc8YfsbWbMM/itqWsm5xTA="
+if ! has nix_direnv_version || ! nix_direnv_version 2.1.1; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.1.1/direnvrc" "sha256-b6qJ4r34rbE23yWjMqbmu3ia2z4b2wIlZUksBke/ol0="
 fi
 ```
 

flake.nix

@@ -12,7 +12,9 @@
         test-runner = pkgs.callPackage ./run-tests.nix {};
       };
       defaultPackage = self.packages.${system}.default;
-      devShell = pkgs.callPackage ./shell.nix { };
+      devShells.default = pkgs.callPackage ./shell.nix { };
+      # FIXME backward compat, drop soon
+      devShell = self.devShells.default;
       apps.test-runner = {
         type = "app";
         program = "${self.packages.${system}.test-runner}";
@@ -21,9 +23,11 @@
       overlay = final: prev: {
         nix-direnv = final.callPackage ./default.nix { };
       };
-      defaultTemplate = {
-        path = ./template;
+      templates.default = {
+        path = ./templates/flake;
         description = "nix flake new -t github:Mic92/nix-direnv .";
       };
+      # FIXME backward compat, drop soon
+      defaultTemplate = self.templates.default;
     };
 }

scripts/create-release.sh

@@ -21,7 +21,7 @@ fi
 sed -i direnvrc \
     -e 's!\(declare major=\).*\( # UPDATE(nix-direnv version)\)!\1'"${ver[0]@Q} minor=${ver[1]@Q} patch=${ver[2]@Q}"'\2!'
 
-sed -i README.md template/.envrc \
+sed -i README.md templates/flake/.envrc \
     -e 's!\(nix-direnv/\).*\(/direnvrc\)!\1'"${version}"'\2!' \
     -e 's?\( ! nix_direnv_version \)[0-9.]\+\(; \)?\1'"${version}"'\2?'
 git add README.md direnvrc

scripts/update-checksum.sh

@@ -7,7 +7,7 @@ cd "$SCRIPT_DIR/.."
 tag=$(curl --silent "https://api.github.com/repos/nix-community/nix-direnv/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
 sha256=$(direnv fetchurl "https://raw.githubusercontent.com/nix-community/nix-direnv/${tag}/direnvrc" | grep -m1 -o 'sha256-.*')
 
-sed -i README.md template/.envrc -e "s!sha256-.*!${sha256}\"!"
-git add README.md template/.envrc
+sed -i README.md templates/flake/.envrc -e "s!sha256-.*!${sha256}\"!"
+git add README.md templates/flake/.envrc
 git commit -m "update fetchurl checksum"
 #git push

template/.envrc

@@ -1,4 +0,0 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.1.0; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.1.0/direnvrc" "sha256-FAT2R9yYvVg516v3LiogjIc8YfsbWbMM/itqWsm5xTA="
-fi
-use flake

templates/flake/.envrc

@@ -0,0 +1,4 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.1.1; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.1.1/direnvrc" "sha256-b6qJ4r34rbE23yWjMqbmu3ia2z4b2wIlZUksBke/ol0="
+fi
+use flake