Skip to content

Commit 75dc1e5

Browse files
committed
chore: update cardano-shell
Resolves #3292
1 parent f963530 commit 75dc1e5

File tree

5 files changed

+14
-22
lines changed

5 files changed

+14
-22
lines changed

flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
cardano-node-override.flake = false;
1010
cardano-playground.url = "github:input-output-hk/cardano-playground/56ebfef5595c43014029b039ade01b0ef06233e0";
1111
cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
12-
cardano-shell.url = "github:input-output-hk/cardano-shell/0d1d5f036c73d18e641412d2c58d4acda592d493";
12+
cardano-shell.url = "github:input-output-hk/cardano-shell/79f48aa3aa8007a1597cbedc22031eab1f05decd";
1313
cardano-shell.flake = false;
1414
tullia.url = "github:input-output-hk/tullia";
1515
tullia.flake = false; # otherwie, +1k dependencies in flake.lock…

nix/internal/any-darwin.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ in rec {
166166
)
167167
'';
168168

169-
bundle-cardano-launcher = mkBundle "cardano-launcher" (common.cardano-shell.haskellPackages.cardano-launcher.components.exes.cardano-launcher + "/bin/cardano-launcher");
169+
bundle-cardano-launcher = mkBundle "cardano-launcher" (common.cardano-launcher + "/bin/cardano-launcher");
170170
bundle-cardano-node = mkBundle "cardano-node" (lib.getExe common.cardano-node);
171171
bundle-cardano-cli = mkBundle "cardano-cli" (lib.getExe common.cardano-cli);
172172
bundle-cardano-address = mkBundle "cardano-address" (lib.getExe common.cardano-address);

nix/internal/cardano-bridge.nix

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ target, runCommandCC, cardano-wallet, cardano-node, cardano-shell, cardano-cli, cardano-address, lib, local-cluster ? null, mock-token-metadata-server, darwin }:
1+
{ target, runCommandCC, cardano-wallet, cardano-node, cardano-launcher, cardano-cli, cardano-address, lib, local-cluster ? null, mock-token-metadata-server, darwin }:
22

33
runCommandCC "daedalus-cardano-bridge" {
44
passthru = {
@@ -11,7 +11,7 @@ runCommandCC "daedalus-cardano-bridge" {
1111
echo ${cardano-wallet.version} > $out/version
1212
cp ${cardano-wallet}/bin/* .
1313
cp -f ${cardano-address}/bin/cardano-address* .
14-
cp -f ${cardano-shell.haskellPackages.cardano-launcher.components.exes.cardano-launcher}/bin/* .
14+
cp -f ${cardano-launcher}/bin/* .
1515
cp -f ${cardano-node}/bin/* .
1616
cp -f ${cardano-cli}/bin/cardano-cli* .
1717
${lib.optionalString (local-cluster != null) ''
@@ -31,13 +31,6 @@ runCommandCC "daedalus-cardano-bridge" {
3131
cp -f ${mock-token-metadata-server}/bin/* . || true
3232
cp -f ${./../../utils/cardano/selfnode}/token-metadata.json .
3333
''}
34-
${lib.optionalString (target == "x86_64-linux") ''
35-
chmod +w -R .
36-
for x in cardano-launcher; do
37-
$STRIP $x
38-
patchelf --shrink-rpath $x
39-
done
40-
''}
4134
${lib.optionalString (target == "aarch64-darwin") ''
4235
chmod +w -R .
4336
for x in cardano-address cardano-node cardano-launcher cardano-cli cardano-wallet; do

nix/internal/common.nix

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,19 @@ rec {
7272
daedalus-bridge = pkgs.lib.genAttrs sourceLib.installerClusters (cluster: import ./cardano-bridge.nix {
7373
target = targetSystem;
7474
inherit (pkgs) lib runCommandCC darwin;
75-
inherit cardano-wallet cardano-node cardano-shell cardano-cli cardano-address mock-token-metadata-server;
75+
inherit cardano-wallet cardano-node cardano-launcher cardano-cli cardano-address mock-token-metadata-server;
7676
local-cluster = if cluster == "selfnode" then walletPackages.local-cluster else null;
7777
});
7878

7979
inherit (walletPackages) cardano-wallet cardano-address mock-token-metadata-server;
8080

8181
inherit (nodePackages) cardano-node cardano-cli;
8282

83-
cardano-shell = import inputs.cardano-shell {
84-
inherit (pkgs) system;
85-
crossSystem = {
86-
x86_64-windows = pkgs.lib.systems.examples.mingwW64;
87-
}.${targetSystem} or null;
88-
};
83+
cardano-shell = (flake-compat {
84+
src = inputs.cardano-shell;
85+
}).defaultNix;
86+
87+
cardano-launcher = cardano-shell.hydraJobs.cardano-launcher.${targetSystem};
8988

9089
cardanoNodeVersion = cardano-node.identifier.version + "-" + builtins.substring 0 9 nodeFlake.rev;
9190

0 commit comments

Comments
 (0)