logos-storage/logos-storage-nim
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-nim.git synced 2026-06-13 05:59:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update nimbus build system (#1433)

Browse Source
This commit is contained in:
Arnaud 2026-06-03 12:27:04 +04:00 committed by GitHub
parent abce4f68c5
commit 0ad13ca897
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nix/checksums.nix
View File

@ -8,5 +8,5 @@ in pkgs.fetchFromGitHub {
repo = "checksums";
rev = tools.findKeyValue "^ +ChecksumsStableCommit = \"([a-f0-9]+)\".*$" sourceFile;
# WARNING: Requires manual updates when Nim compiler version changes.
hash = "sha256-JZhWqn4SrAgNw/HLzBK0rrj3WzvJ3Tv1nuDMn83KoYY=";
hash = "sha256-xC11sD13OTMMUY4F5CrF1XxKSigLtIPt2XQCcQOFNdM=";
}

4
nix/csources.nix
View File

@ -5,8 +5,8 @@ let
sourceFile = ../vendor/nimbus-build-system/vendor/Nim/config/build_config.txt;
in pkgs.fetchFromGitHub {
owner = "nim-lang";
repo = "csources_v2";
repo = "csources_v3";
rev = tools.findKeyValue "^nim_csourcesHash=([a-f0-9]+)$" sourceFile;
# WARNING: Requires manual updates when Nim compiler version changes.
hash = "sha256-UCLtoxOcGYjBdvHx7A47x6FjLMi6VZqpSs65MN7fpBs=";
hash = "sha256-pTcm2y+HDOuTol8DyoJMOMHsUA6QrgwGdfcOu1NX4PU=";
}

12
nix/default.nix
View File

@ -63,15 +63,11 @@ in stdenv.mkDerivation rec {
"QUICK_AND_DIRTY_NIMBLE=${if quickAndDirty then "1" else "0"}"
];
# FIXME: Remove once permanent fix is applied to NBS:
patchPhase = ''
substituteInPlace vendor/nimbus-build-system/scripts/build_nim.sh \
--replace-fail '"''${NIX_BUILD_TOP}" != "/build"' '-z $${NIX_BUILD_TOP}'
'';
configurePhase = ''
# Avoid Nim cache permission errors.
export XDG_CACHE_HOME=$TMPDIR
# Force build of Nimble from dist/nimble source.
export NIMBLE_COMMIT=""
patchShebangs . vendor/nimbus-build-system > /dev/null
make nimbus-build-system-paths
'';
@ -81,8 +77,8 @@ in stdenv.mkDerivation rec {
mkdir dist
cp -r ${callPackage ./nimble.nix {}} dist/nimble
cp -r ${callPackage ./checksums.nix {}} dist/checksums
cp -r ${callPackage ./csources.nix {}} csources_v2
chmod 777 -R dist/nimble csources_v2
cp -r ${callPackage ./csources.nix {}} csources_v3
chmod 777 -R dist/nimble csources_v3
popd
'';

6
nix/nimble.nix
View File

@ -2,12 +2,14 @@
let
tools = pkgs.callPackage ./tools.nix {};
nbsVersion = tools.findKeyValue "^[[:space:]]+NIMBLE_COMMIT='([a-f0-9]+)'.*$" ../vendor/nimbus-build-system/scripts/build_nim.sh;
nimVersion = tools.findKeyValue "^ +NimbleStableCommit = \"([a-f0-9]+)\".+" ../vendor/nimbus-build-system/vendor/Nim/koch.nim;
sourceFile = ../vendor/nimbus-build-system/vendor/Nim/koch.nim;
in pkgs.fetchFromGitHub {
owner = "nim-lang";
repo = "nimble";
fetchSubmodules = true;
rev = tools.findKeyValue "^ +NimbleStableCommit = \"([a-f0-9]+)\".+" sourceFile;
rev = if nbsVersion != null then nbsVersion else nimVersion;
# WARNING: Requires manual updates when Nim compiler version changes.
hash = "sha256-wgzFhModFkwB8st8F5vSkua7dITGGC2cjoDvgkRVZMs=";
hash = "sha256-v0RhIx6ithFJqH6ThKpyvC0JB3CBCevahhCossC+deA=";
}

2
vendor/nimbus-build-system vendored

@ -1 +1 @@
Subproject commit 0be0663e1af76e869837226a4ef3e586fcc737d3
Subproject commit f34e2130c14e527e62fc1118de2fc2d7d6fdcb4a