mirror of
https://github.com/urbit/shrub.git
synced 2024-11-28 05:22:27 +03:00
Merge pull request #5256 from urbit/ea/fix-dist-urbit-tests
nix: fix broken symlinks in arvo and ropsten-patched arvo
This commit is contained in:
commit
5181cc40c1
@ -114,6 +114,8 @@ let
|
||||
|
||||
solid = callPackage ./nix/pkgs/pill/solid.nix { };
|
||||
|
||||
marsSources = callPackage ./nix/pkgs/marsSources { };
|
||||
|
||||
urbit = callPackage ./nix/pkgs/urbit { inherit enableStatic; };
|
||||
|
||||
docker-image = callPackage ./nix/pkgs/docker-image { };
|
||||
|
@ -1,46 +1,21 @@
|
||||
{ lib, stdenvNoCC, bc }:
|
||||
{ lib, stdenvNoCC, marsSources }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "arvo";
|
||||
src = lib.cleanSource ../../../pkg/arvo;
|
||||
|
||||
buildInputs = [ bc ];
|
||||
src = marsSources;
|
||||
|
||||
outputs = [ "out" "ropsten" ];
|
||||
|
||||
phases = [ "mainnetPhase" "ropstenPhase" ];
|
||||
|
||||
mainnetPhase = ''
|
||||
cp -r $src/ $out
|
||||
chmod -R u+w $out
|
||||
'';
|
||||
ln -s ${marsSources.out}/arvo $out
|
||||
'';
|
||||
|
||||
ropstenPhase = ''
|
||||
cp -r $src tmp
|
||||
chmod -R u+w tmp
|
||||
|
||||
ZUSE=tmp/sys/zuse.hoon
|
||||
AMES=tmp/sys/vane/ames.hoon
|
||||
ACME=tmp/app/acme.hoon
|
||||
|
||||
# Replace the mainnet azimuth contract with the ropsten contract
|
||||
sed --in-place \
|
||||
's/\(\+\+ contracts \)mainnet\-contracts/\1ropsten-contracts/' \
|
||||
$ZUSE
|
||||
|
||||
# Increment the %ames protocol version
|
||||
sed -r --in-place \
|
||||
's_^(=/ protocol\-version=\?\(.*\) %)([0-7])_echo "\1$(echo "(\2+1) % 8" | bc)"_e' \
|
||||
$AMES
|
||||
|
||||
# Use the staging API in :acme
|
||||
sed --in-place \
|
||||
's_https://acme-v02.api.letsencrypt.org/directory_https://acme-staging-v02.api.letsencrypt.org/directory_' \
|
||||
$ACME
|
||||
|
||||
cp -r tmp $ropsten
|
||||
chmod -R u+w $ropsten
|
||||
'';
|
||||
ln -s ${marsSources.ropsten}/arvo $ropsten
|
||||
'';
|
||||
|
||||
preferLocalBuild = true;
|
||||
}
|
||||
|
46
nix/pkgs/marsSources/default.nix
Normal file
46
nix/pkgs/marsSources/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ lib, stdenvNoCC, bc }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "sources";
|
||||
src = lib.cleanSource ../../../pkg;
|
||||
|
||||
buildInputs = [ bc ];
|
||||
|
||||
outputs = [ "out" "ropsten" ];
|
||||
|
||||
phases = [ "mainnetPhase" "ropstenPhase" ];
|
||||
|
||||
mainnetPhase = ''
|
||||
cp -r $src $out
|
||||
chmod -R u+w $out
|
||||
'';
|
||||
|
||||
ropstenPhase = ''
|
||||
cp -r $src tmp
|
||||
chmod -R u+w tmp
|
||||
|
||||
ZUSE=tmp/arvo/sys/zuse.hoon
|
||||
AMES=tmp/arvo/sys/vane/ames.hoon
|
||||
ACME=tmp/arvo/app/acme.hoon
|
||||
|
||||
# Replace the mainnet azimuth contract with the ropsten contract
|
||||
sed --in-place \
|
||||
's/\(\+\+ contracts \)mainnet\-contracts/\1ropsten-contracts/' \
|
||||
$ZUSE
|
||||
|
||||
# Increment the %ames protocol version
|
||||
sed -r --in-place \
|
||||
's_^(=/ protocol\-version=\?\(.*\) %)([0-7])_echo "\1$(echo "(\2+1) % 8" | bc)"_e' \
|
||||
$AMES
|
||||
|
||||
# Use the staging API in :acme
|
||||
sed --in-place \
|
||||
's_https://acme-v02.api.letsencrypt.org/directory_https://acme-staging-v02.api.letsencrypt.org/directory_' \
|
||||
$ACME
|
||||
|
||||
cp -r tmp $ropsten
|
||||
chmod -R u+w $ropsten
|
||||
'';
|
||||
|
||||
preferLocalBuild = true;
|
||||
}
|
Loading…
Reference in New Issue
Block a user