Skip to content

Commit

Permalink
[DDW-483] Bump iohk-nix
Browse files Browse the repository at this point in the history
  • Loading branch information
nikolaglumac committed Nov 19, 2020
1 parent 0802f4b commit 55f5335
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
7 changes: 4 additions & 3 deletions README.md
Expand Up @@ -112,9 +112,10 @@ Daedalus - Cryptocurrency Wallet
`Niv` is used to manage the version of upstream dependencies. The versions of these dependencies can be seen in `nix/sources.json`.

Dependencies are updated with the follow nix commands:
- Update to the latest master: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-wallet"`
- Update to a specific revision: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-wallet -a rev=91db88f9195de49d4fb4299c68fc3f6de09856ab"`
- Update node to a specific tag: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-node -b tags/1.20.0"`
- Update cardano-wallet to the latest master: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-wallet"`
- Update cardano-wallet to a specific revision: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-wallet -a rev=91db88f9195de49d4fb4299c68fc3f6de09856ab"`
- Update cardano-node to a specific tag: `nix-shell -A devops --arg nivOnly true --run "niv update cardano-node -b tags/1.20.0"`
- Update iohk-nix to the latest master: `nix-shell -A devops --arg nivOnly true --run "niv update iohk-nix -b master"`

#### Notes

Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
Expand Up @@ -66,10 +66,10 @@
"homepage": null,
"owner": "input-output-hk",
"repo": "iohk-nix",
"rev": "e3759db64f898ab8b33a4f73d2f864ff76fa6987",
"sha256": "14ah4r49mi8sxw5yc2vqgvqpyy4sp8swyp1xz71da1r8y3j902my",
"rev": "0e5128870dc9de4f603fb35e6c7f659e18c8b6d6",
"sha256": "0pbm85jpmi166wb3hahmg791ycqcy6iryvimk7r8d051sf4rkmvb",
"type": "tarball",
"url": "https://github.com/input-output-hk/iohk-nix/archive/e3759db64f898ab8b33a4f73d2f864ff76fa6987.tar.gz",
"url": "https://github.com/input-output-hk/iohk-nix/archive/0e5128870dc9de4f603fb35e6c7f659e18c8b6d6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"js-chain-libs": {
Expand Down
7 changes: 2 additions & 5 deletions source/main/cardano/CardanoWalletLauncher.js
Expand Up @@ -131,14 +131,11 @@ export async function CardanoWalletLauncher(walletOpts: WalletOpts): Launcher {
logger.info('Launching Wallet with --testnet flag');
}
if (smashUrl) {
// TODO: Update SMASH URLs in iohk-nix: https://jira.iohk.io/browse/DDW-482
const smashUrlApiPath = '/api/v1/metadata';
const smashUrlBase = smashUrl.replace(smashUrlApiPath, '');
logger.info('Launching Wallet with --pool-metadata-fetching flag', {
poolMetadataSource: { smashUrl, smashUrlBase },
poolMetadataSource: { smashUrl },
});
merge(launcherConfig, {
poolMetadataSource: { smashUrl: smashUrlBase },
poolMetadataSource: { smashUrl },
});
}
merge(launcherConfig, { nodeConfig, tlsConfiguration });
Expand Down

0 comments on commit 55f5335

Please sign in to comment.