Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Chores

- Update `cardano-node` to 10.2.1 and `cardano-wallet` to v2025-03-31 ([PR 3288](https://github.com/input-output-hk/daedalus/pull/3288))

- Added the links to app.projectcatalyst.io ([PR 3286](https://github.com/input-output-hk/daedalus/pull/3286))

## 7.1.0
Expand Down
16 changes: 8 additions & 8 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-22.11-darwin";
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2025-01-09";
cardano-wallet-unpatched.url = "github:cardano-foundation/cardano-wallet/v2025-03-31";
cardano-wallet-unpatched.flake = false; # otherwise, +10k quadratic dependencies in flake.lock…
cardano-node-override.url = "github:IntersectMBO/cardano-node/10.1.4";
cardano-node-override.url = "github:IntersectMBO/cardano-node/10.2.1";
cardano-node-override.flake = false;
cardano-playground.url = "github:input-output-hk/cardano-playground/d3322dce0ab1c00386adc93899aabe9252342b54";
cardano-playground.flake = false; # otherwise, +9k dependencies in flake.lock…
Expand Down
12 changes: 0 additions & 12 deletions nix/internal/cardano-wallet--expose-musl64Packages.patch

This file was deleted.

20 changes: 20 additions & 0 deletions nix/internal/cardano-wallet--expose-packages.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/flake.nix b/flake.nix
index 76b05e4d73..03fd75e9e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -370,6 +370,7 @@
tests = lib.collect lib.isDerivation windowsPackages.tests;
benchmarks = lib.collect lib.isDerivation windowsPackages.benchmarks;
};
+ inherit windowsPackages;
};
}
# macos is never cross-compiled
@@ -434,6 +435,7 @@
inherit pkgs;
project = walletProject;
};
+ musl64Packages = mkPackages walletProject.projectCross.musl64;
}) // {
# Continuous integration builds
ci.tests.all = pkgs.releaseTools.aggregate {
12 changes: 0 additions & 12 deletions nix/internal/cardano-wallet--expose-windowsPackages.patch

This file was deleted.

5 changes: 2 additions & 3 deletions nix/internal/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ rec {
cp -r ${unpatched} $out
chmod -R +w $out
cd $out
patch -p1 -i ${./cardano-wallet--expose-windowsPackages.patch}
patch -p1 -i ${./cardano-wallet--expose-musl64Packages.patch}
patch -p1 -i ${./cardano-wallet--expose-packages.patch}
'');
inherit (unpatched) rev shortRev lastModified lastModifiedDate;
};
Expand All @@ -55,7 +54,7 @@ rec {
}).defaultNix;

walletPackages = {
x86_64-windows = walletFlake.packages.x86_64-linux.windowsPackages;
x86_64-windows = walletFlake.packages.x86_64-linux.ci.artifacts.win64.windowsPackages;
x86_64-linux = walletFlake.packages.x86_64-linux.musl64Packages;
x86_64-darwin = walletFlake.packages.x86_64-darwin;
aarch64-darwin = walletFlake.packages.aarch64-darwin;
Expand Down