From 3fa168d2a6218435df49383489b6a2020372fa18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jan=20Niemier?= Date: Wed, 23 Aug 2023 21:56:16 +0200 Subject: [PATCH] fix: update Nix derivation to use new build (#344) * fix: update Nix derivation to use new build --------- Co-authored-by: Steve Cohen --- flake.lock | 31 +++++++++++++++++++++++++------ nix/lexical.nix | 4 ++-- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index f4e0f1191..949bc9dde 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -17,9 +20,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 0, - "narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=", - "path": "/nix/store/v4alr5pcln6h03406f3s9hd89jkfl13y-source", + "lastModified": 1692557222, + "narHash": "sha256-TCOtZaioLf/jTEgfa+nyg0Nwq5Uc610Z+OFV75yUgGw=", + "path": "/nix/store/7x0565m245dv1ny5j1v04a7azl2kll3a-source", + "rev": "0b07d4957ee1bd7fd3bdfd12db5f361bd70175a6", "type": "path" }, "original": { @@ -32,6 +36,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/nix/lexical.nix b/nix/lexical.nix index a17f516d1..f721594aa 100644 --- a/nix/lexical.nix +++ b/nix/lexical.nix @@ -19,7 +19,7 @@ installPhase = '' runHook preInstall - mix release lexical --no-deps-check --path "$out" + mix do compile --no-deps-check, package --path "$out" runHook postInstall ''; @@ -29,6 +29,6 @@ substituteInPlace "$script" --replace 'ERL_EXEC="erl"' 'ERL_EXEC="${erlang}/bin/erl"' done - wrapProgram $out/bin/lexical --set RELEASE_COOKIE lexical + makeWrapper $out/bin/start_lexical.sh $out/bin/lexical --set RELEASE_COOKIE lexical ''; }