diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2023-02-13 16:20:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-13 16:20:52 +0100 |
| commit | 14cb2130bb78b96853e576d21ea823b1b19f39de (patch) | |
| tree | af9b4d1d34a9c2442d1f7192b0d5fabcd9147206 | |
| parent | 8e63fa3f0a3618eec8d5152ecd0786bd3be380d8 (diff) | |
| parent | bb62992d4e3a50d590c27c8bbdc480b63b35f20a (diff) | |
| download | nixlib-14cb2130bb78b96853e576d21ea823b1b19f39de.tar nixlib-14cb2130bb78b96853e576d21ea823b1b19f39de.tar.gz nixlib-14cb2130bb78b96853e576d21ea823b1b19f39de.tar.bz2 nixlib-14cb2130bb78b96853e576d21ea823b1b19f39de.tar.lz nixlib-14cb2130bb78b96853e576d21ea823b1b19f39de.tar.xz nixlib-14cb2130bb78b96853e576d21ea823b1b19f39de.tar.zst nixlib-14cb2130bb78b96853e576d21ea823b1b19f39de.zip | |
Merge pull request #216166 from mmilata/torq-01817
torq: 0.17.3 -> 0.18.17, fix frontend build
| -rw-r--r-- | pkgs/applications/blockchains/torq/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/blockchains/torq/default.nix b/pkgs/applications/blockchains/torq/default.nix index 4b786168bce3..657e5b0e3ffa 100644 --- a/pkgs/applications/blockchains/torq/default.nix +++ b/pkgs/applications/blockchains/torq/default.nix @@ -6,20 +6,20 @@ let pname = "torq"; - version = "0.17.3"; + version = "0.18.17"; src = fetchFromGitHub { owner = "lncapital"; repo = pname; rev = "v${version}"; - hash = "sha256-fqHJZi1NQCrZqsa+N+FVYZ8s9o0D555Sqn5qNlJ1MmI="; + hash = "sha256-xiA66yGo8b1+zZ7jQ7SFOtNPmqbdna7fUCT21uibrIM="; }; web = buildNpmPackage { pname = "${pname}-frontend"; inherit version; src = "${src}/web"; - npmDepsHash = "sha256-8mUfTFzPjQlQvhC3zZf+WruDBkYnmGt3yckNi0CPWs0="; + npmDepsHash = "sha256-/7x5RWYIB5BChYMnMuFVVaZd0pVkew4i4QrF7hSFnCM="; # copied from upstream Dockerfile npmInstallFlags = [ "--legacy-peer-deps" ]; @@ -29,14 +29,14 @@ let # override npmInstallHook, we only care about the build/ directory installPhase = '' mkdir $out - cp -r build $out/ + cp -r build/* $out/ ''; }; in buildGoModule rec { inherit pname version src; - vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs="; + vendorHash = "sha256-bvisI589Gq9IdyJEqI+uzs3iDPOTUkq95P3n/KoFhF0="; subPackages = [ "cmd/torq" ]; @@ -47,7 +47,8 @@ buildGoModule rec { ]; postInstall = '' - ln -s ${web} $out/web + mkdir -p $out/web/build + cp -r ${web}/* $out/web/build/ ''; meta = with lib; { |