From 7e22a3daab4766800f2973a195f7fb7c810aaef7 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Mon, 27 May 2024 12:54:51 -0600 Subject: [PATCH] Fixup readme and version to say what this is --- .nix-version | 1 - README.md | 14 +++++++++----- default.nix | 2 +- flake.nix | 1 - 4 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 .nix-version diff --git a/.nix-version b/.nix-version deleted file mode 100644 index 6842dbd..0000000 --- a/.nix-version +++ /dev/null @@ -1 +0,0 @@ -unstable diff --git a/README.md b/README.md index 72df091..e2c8bcc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # nix-eval-jobs +> [!NOTE] +> This is a fork of nix-eval-jobs that works with Lix. + This project evaluates nix attribute sets in parallel with streamable json output. This is useful for time and memory intensive evaluations such as NixOS machines, i.e. in a CI context. The evaluation is done with a controllable @@ -89,11 +92,12 @@ we collect example ci configuration for various CIs. ## Organisation of this repository -On the `main` branch we target nixUnstable. When a release of nix happens, we -fork for a release branch i.e. `release-2.8` and change the nix version in -`.nix-version`. Changes and improvements made in `main` also may be backported -to these release branches. At the time of writing we only intent to support the -latest release branch. +`main` follows Lix HEAD, and is updated alongside the Lix NixOS module. When we +release we will make a `release-2.90` etc branch, which receives backports. + +The version of nix-eval-jobs follows the major version of Lix and minor +versions of nix-eval-jobs are released as necessary when changes are made in +n-e-j itself. ## Projects using nix-eval-jobs diff --git a/default.nix b/default.nix index bb2ddf3..9ef66af 100644 --- a/default.nix +++ b/default.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation { pname = "nix-eval-jobs"; - version = "2.19.0"; + version = "2.90.0-unstable"; src = if srcDir == null then filterMesonBuild ./. else srcDir; buildInputs = with pkgs; [ nlohmann_json diff --git a/flake.nix b/flake.nix index f764e66..1219d5c 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,6 @@ let inherit (inputs.nixpkgs) lib; inherit (inputs) self; - nixVersion = lib.fileContents ./.nix-version; in flake-parts.lib.mkFlake { inherit inputs; } {