diff options
| -rw-r--r-- | .envrc-nix | 20 | ||||
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | org/config_env.org | 30 |
3 files changed, 54 insertions, 26 deletions
@@ -1,17 +1,25 @@ NIX_ENFORCE_PURITY=1 -NixDirEnvVersion="2.3.0" -NixDirEnvSHA="sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8=" +# - https://github.com/nix-community/nix-direnv +NixDirEnvVersion="2.4.0" +NixDirEnvSHA="sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=" if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}" fi watch_file flake.lock watch_file flake.nix +watch_file shell.nix watch_file makefile +watch_file .envrc watch_file .envrc-local watch_file .envrc-nix +nix_direnv_watch_file flake.nix +nix_direnv_watch_file shell.nix +nix_direnv_watch_file .envrc +nix_direnv_watch_file .envrc-local +nix_direnv_watch_file .envrc-nix +#nix flake update +#nix flake check +echo "" PATH_add result/bin -nix flake update -nix flake check nix flake show -use flake . -#use flake .#default +#use flake . @@ -8,10 +8,11 @@ ] }, "locked": { - "dirtyRev": "e0a47b6196c8e5808617cf3e4faebc5a511ea65c-dirty", - "dirtyShortRev": "e0a47b6-dirty", - "lastModified": 1690898297, - "narHash": "sha256-sGe8PqE1E4+tu+2rckJ/e32/agmUMKDf6Wb6jBcHH70=", + "lastModified": 1697649634, + "narHash": "sha256-y7V50JZuqyk7XX6yBJzvROaSTPkD1Tmo2foFOOxdDe4=", + "ref": "refs/heads/main", + "rev": "fd1a5c1ec645f39e6600d87c1830f851beb682b1", + "revCount": 5, "type": "git", "url": "file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/packages/nix-flakes/dlang/dlang-nix-flakes" }, @@ -25,11 +26,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -76,11 +77,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696757521, - "narHash": "sha256-cfgtLNCBLFx2qOzRLI6DHfqTdfWI+UbvsKYa3b3fvaA=", + "lastModified": 1697379843, + "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2646b294a146df2781b1ca49092450e8a32814e1", + "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d", "type": "github" }, "original": { @@ -106,10 +107,11 @@ ] }, "locked": { - "dirtyRev": "2aaf8a8bf9dc22ec3d4d70f91d32ca4cd5e90324-dirty", - "dirtyShortRev": "2aaf8a8-dirty", - "lastModified": 1696699635, - "narHash": "sha256-WLhYyDoAnYLK71RxP1WytM2HiqtksuyMTGOPi197buw=", + "lastModified": 1697647426, + "narHash": "sha256-1aGKqDOBurHKZNiBLBSJiZPlYf9MD53hO/WtI7/DSDQ=", + "ref": "refs/heads/beta-builds", + "rev": "d46ca676345160831a4bae8ad42f3e2245ff4bd1", + "revCount": 601, "type": "git", "url": "file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/spine" }, diff --git a/org/config_env.org b/org/config_env.org index 9ded9ef..145160f 100644 --- a/org/config_env.org +++ b/org/config_env.org @@ -35,11 +35,14 @@ fi ** .envrc-nix - https://github.com/nix-community/nix-direnv - - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-0000000000000000000000000000000000000000000=" + - source_url + - direnv fetchurl "https://raw.githubusercontent.com/nix-community/nix-direnv/<<direnv-version>>/direnvrc" "<<direnv-sha>>" + - ${NixDirEnvVersion} #+HEADER: :tangle ../.envrc-nix #+BEGIN_SRC sh NIX_ENFORCE_PURITY=1 +# - https://github.com/nix-community/nix-direnv NixDirEnvVersion="<<direnv-version>>" NixDirEnvSHA="<<direnv-sha>>" if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then @@ -47,24 +50,39 @@ if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then fi watch_file flake.lock watch_file flake.nix +watch_file shell.nix watch_file makefile +watch_file .envrc watch_file .envrc-local watch_file .envrc-nix +nix_direnv_watch_file flake.nix +nix_direnv_watch_file shell.nix +nix_direnv_watch_file .envrc +nix_direnv_watch_file .envrc-local +nix_direnv_watch_file .envrc-nix +#nix flake update +#nix flake check +echo "" PATH_add result/bin -nix flake update -nix flake check nix flake show -use flake . -#use flake .#default +#use flake . #+END_SRC #+NAME: direnv-version #+BEGIN_SRC sh -2.3.0 +2.4.0 #+END_SRC #+NAME: direnv-sha #+BEGIN_SRC sh +sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U= +#+END_SRC + +#+BEGIN_SRC sh +2.3.0 +#+END_SRC + +#+BEGIN_SRC sh sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8= #+END_SRC |