From de1528a0a3e527791e4afb746fe50b4cfaebbc97 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Wed, 3 Aug 2022 08:35:52 +0200 Subject: [PATCH] Update versions in README --- README.md | 12 +++++++----- flake.nix | 22 +++++----------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index b35ad9d..db36811 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ The sections below list what each template includes. In all cases, you're free t ### [`nickel`](./nickel/) -- [Nickel] 0.1.0 +- [Nickel] 0.2.0 ### [`nim`](./nim) @@ -151,6 +151,7 @@ The sections below list what each template includes. In all cases, you're free t ### [`node`](./node/) - [Node.js][node] 18.7.0 +- [npm] 8.15.0 - [pnpm] 7.3.0 - [Yarn] 1.22.19 - [node2nix] 1.11.1 @@ -158,7 +159,7 @@ The sections below list what each template includes. In all cases, you're free t ### [`opa`](./opa/) - [Open Policy Agent][opa] 0.43.0 -- [Conftest] 0.33.2 +- [Conftest] 0.34.0 ### [`protobuf`](./protobuf/) @@ -168,8 +169,8 @@ The sections below list what each template includes. In all cases, you're free t ### [`python`](./python/) - [Python] 3.11.0b4 -- [pip] -- [Virtualenv] +- [pip] 22.1.2 +- [Virtualenv] 20.15.1 - [mach-nix] ### [`ruby`](./ruby/) @@ -184,7 +185,7 @@ The sections below list what each template includes. In all cases, you're free t - From the `rust-toolchain` file if present - Version 1.6.2 if neither is present -- [rust-analyzer] 2022-07-11 +- [rust-analyzer] 2022-08-01 - [cargo-audit] 0.17.0 - [cargo-deny] 0.12.1 - [cross] 0.2.4 @@ -251,6 +252,7 @@ All of the templates have only the root [flake](./flake.nix) as a flake input. T [nomad]: https://nomadproject.io [nomad-autoscaler]: TOhttps://github.com/hashicorp/nomad-autoscaler [nomad-pack]: https://github.com/hashicorp/nomad-pack +[npm]: https://npmjs.org [opa]: https://openpolicyagent.org [packer]: https://packer.io [pip]: https://pypi.org/project/pip diff --git a/flake.nix b/flake.nix index 0c16872..faa8f28 100644 --- a/flake.nix +++ b/flake.nix @@ -132,37 +132,25 @@ let pkgs = import nixpkgs { inherit system; }; inherit (pkgs) mkShell writeScriptBin; - run = pkg: "${pkgs.${pkg}}/bin/${pkg}"; + exec = pkg: "${pkgs.${pkg}}/bin/${pkg}"; format = writeScriptBin "format" '' - ${run "nixfmt"} **/*.nix + ${exec "nixfmt"} **/*.nix ''; update = writeScriptBin "update" '' - # Update root - ${run "nix"} flake update - for dir in `ls -d */`; do # Iterate through all the templates ( cd $dir - ${run "nix"} flake update # Update flake.lock - ${run "direnv"} reload # Make sure things work after the update - ) - done - ''; - - visit = writeScriptBin "visit" '' - for dir in `ls -d */`; do - ( - cd $dir - ${run "direnv"} reload + ${exec "nix"} flake update # Update flake.lock + ${exec "direnv"} reload # Make sure things work after the update ) done ''; in { devShells = { default = mkShell { - buildInputs = [ format update visit ]; + buildInputs = [ format update ]; }; }; }