Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 7.1.0 #3272

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f02475f
Merge branch 'main' into develop
michalrus Dec 12, 2024
039a1c9
fix: `libiconv.dylib` issue on previous macOS
michalrus Jan 8, 2025
0f50f91
[LW-12084] Update cardano-wallet to v2025-01-07
michalrus Jan 9, 2025
60a5b97
[LW-12084] Update cardano-node to 10.1.4
michalrus Jan 9, 2025
2cd00b9
[LW-12084] Update cardano-playground to `d3322dce0ab1c00386adc93899aa…
michalrus Jan 9, 2025
c807f32
[LW-12084] Update `CHANGELOG.md`
michalrus Jan 9, 2025
87c0292
[LW-12084] Update cardano-wallet to v2025-01-09
michalrus Jan 9, 2025
6d1cde5
[LW-12084] Correct the `CHANGELOG.md`
michalrus Jan 9, 2025
ba891cf
fix: Hydra eval (more like a workaround)
michalrus Jan 9, 2025
8ef96c9
[LW-12086] Remove `MacInstaller.hs`
michalrus Jan 10, 2025
1d024da
[LW-12086] Unify runtime Node.js deps across systems
michalrus Jan 10, 2025
51eb36d
[LW-12086] Drop `common.daedalus-installer` from the devshell
michalrus Jan 10, 2025
d364dc6
feat: add support of cip129 for drep ids
szymonmaslowski Jan 10, 2025
dcd1dfb
[LW-12086] Don’t use symlinks
michalrus Jan 10, 2025
234dcc0
[LW-12086] Remove dots from directory names under `Contents/MacOS`…
michalrus Jan 10, 2025
184bc1b
[LW-12086] Restore `.productName` in the final `package.json`
michalrus Jan 10, 2025
57141a8
Merge pull request #3270 from input-output-hk/chore/LW-12084-update-c…
michalrus Jan 10, 2025
286799a
[LW-12088] Update `CHANGELOG.md`
michalrus Jan 10, 2025
d9a45a0
Merge pull request #3271 from input-output-hk/feat/LW-12088-enable-ci…
michalrus Jan 10, 2025
41423f8
Merge pull request #3268 from input-output-hk/fix/previous-macos
michalrus Jan 10, 2025
de501c5
[LW-12086] Update `CHANGELOG.md`
michalrus Jan 10, 2025
dd63902
Release version 7.1.0
michalrus Jan 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[LW-12086] Unify runtime Node.js deps across systems
  • Loading branch information
michalrus committed Jan 10, 2025
commit 1d024da7dbb639ce5638df89fa03e8a9b09592e5
4 changes: 0 additions & 4 deletions nix/internal/any-darwin.nix
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@ in rec {

darwin-launcher = pkgs.callPackage ./darwin-launcher.nix {};

# TODO: don’t use cardano-bridge.nix

# TODO: compare runtime-nodejs-deps.json with Linux and Windows, and re-use it there

nix-bundle-exe-same-dir = pkgs.runCommand "nix-bundle-exe-same-dir" {} ''
cp -R ${inputs.nix-bundle-exe} $out
chmod -R +w $out
Expand Down
1 change: 1 addition & 0 deletions nix/internal/runtime-nodejs-deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"blake-hash",
"blake2b",
"blake2b-wasm",
"blakejs",
"bn.js",
"brorand",
"brotli",
Expand Down
6 changes: 4 additions & 2 deletions nix/internal/x86_64-linux.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ in rec {
name = "daedalus-js";
src = srcWithoutNix;
nativeBuildInputs = [ yarn nodejs ]
++ (with pkgs; [ python3 pkgconfig ]);
++ (with pkgs; [ python3 pkgconfig jq ]);
buildInputs = with pkgs; [ libusb ];
CARDANO_WALLET_VERSION = common.cardanoWalletVersion;
CARDANO_NODE_VERSION = common.cardanoNodeVersion;
Expand Down Expand Up @@ -143,7 +143,9 @@ in rec {
ln -sv $out/share/daedalus/renderer/assets $out/share/fonts/daedalus

mkdir -pv $out/share/daedalus/node_modules
cp -r node_modules/{\@babel,\@noble,\@protobufjs,regenerator-runtime,node-fetch,\@sinclair,\@trezor,\@fivebinaries,\@emurgo,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib,tr46,ts-mixer,usb,whatwg-url} $out/share/daedalus/node_modules/
jq -r '.[]' <${./runtime-nodejs-deps.json} | while IFS= read -r rtdep ; do
cp -r node_modules/"$rtdep" $out/share/daedalus/node_modules/"$rtdep"
done

chmod -R +w $out

Expand Down
6 changes: 4 additions & 2 deletions nix/internal/x86_64-windows.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ in rec {
name = "daedalus-js";
src = srcWithoutNix;
nativeBuildInputs = [ yarn nodejs wine64 ]
++ (with pkgs; [ python3 pkgconfig unzip ]);
++ (with pkgs; [ python3 pkgconfig unzip jq ]);
buildInputs = with pkgs; [ libusb ];
CARDANO_WALLET_VERSION = common.cardanoWalletVersion;
CARDANO_NODE_VERSION = common.cardanoNodeVersion;
Expand Down Expand Up @@ -110,7 +110,9 @@ in rec {
rm -rf $out/resources/app/{installers,launcher-config.yaml,gulpfile.js,home}

mkdir -pv $out/resources/app/node_modules
cp -r node_modules/{\@babel,\@noble,\@protobufjs,regenerator-runtime,node-fetch,\@sinclair,\@trezor,\@fivebinaries,\@emurgo,randombytes,safe-buffer,bip66,pushdata-bitcoin,bitcoin-ops,typeforce,varuint-bitcoin,create-hash,blake2b,blakejs,nanoassert,blake2b-wasm,bs58check,bs58,base-x,create-hmac,wif,ms,semver-compare,long,define-properties,object-keys,has,function-bind,es-abstract,has-symbols,json-stable-stringify,cashaddrjs,big-integer,inherits,bchaddrjs,cross-fetch,js-chain-libs-node,bignumber.js,call-bind,get-intrinsic,base64-js,ieee754,util-deprecate,bech32,blake-hash,tiny-secp256k1,bn.js,elliptic,minimalistic-assert,minimalistic-crypto-utils,brorand,hash.js,hmac-drbg,int64-buffer,object.values,bytebuffer,protobufjs,usb-detection,babel-runtime,bindings,brotli,clone,deep-equal,dfa,eventemitter2,file-uri-to-path,fontkit,functions-have-names,has-property-descriptors,has-tostringtag,is-arguments,is-date-object,is-regex,linebreak,node-hid,object-is,pdfkit,png-js,regexp.prototype.flags,restructure,tiny-inflate,unicode-properties,unicode-trie,socks,socks-proxy-agent,ip,smart-buffer,ripple-lib,lodash,jsonschema,ripple-address-codec,ripple-keypairs,ripple-lib-transactionparser,ripple-binary-codec,buffer,decimal.js,debug,agent-base,tslib,tr46,ts-mixer,usb,whatwg-url} $out/resources/app/node_modules
jq -r '.[]' <${./runtime-nodejs-deps.json} | while IFS= read -r rtdep ; do
cp -r node_modules/"$rtdep" $out/resources/app/node_modules/"$rtdep"
done

chmod -R +w $out

Expand Down
Loading