Merge pull request #3076 from input-output-hk/merge-5.1.1-into-main

Author: danielmain

.github/dependabot.yml

@@ -0,0 +1,22 @@
+# Basic set up for three package managers
+
+version: 2
+updates:
+
+  # Maintain dependencies for npm
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "friday"
+      time: "06:00"
+    commit-message:
+      # Prefix all commit messages with "npm"
+      prefix: "npm"
+    labels:
+      - "npm"
+      - "dependencies"
+    assignees:
+      - "danielmain"
+    target-branch: "dependabot"
+    versioning-strategy: increase-if-necessary

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 5.1.1
+
+### Chores
+
+- Increase minimum free space required from 2gb to 4gb ([PR 3071](https://github.com/input-output-hk/daedalus/pull/3071))
+- Fixed Language components in Storybook to have it's own mocked store ([PR 3063](https://github.com/input-output-hk/daedalus/pull/3063))
+- Updated `cardano-node` configs for Preprod respin ([PR 3070](https://github.com/input-output-hk/daedalus/pull/3070))
+- Fixed the properties and providers for the Send stories ([PR 3047](https://github.com/input-output-hk/daedalus/pull/3047))
+- Fixed locale in Storybook ([PR 3062](https://github.com/input-output-hk/daedalus/pull/3062))
+- Switched from Hydra’s `release.nix` to Cicero’s `flake.nix` ([PR 3060](https://github.com/input-output-hk/daedalus/pull/3060))
+
 ## 5.1.0
 
 ### Chores

README.md

@@ -38,7 +38,7 @@ Daedalus - Cryptocurrency Wallet
    trusted-users = root
    allowed-users = *
 
-   substituters = https://hydra.iohk.io https://cache.nixos.org/
+   substituters = https://cache.iog.io https://cache.nixos.org/
    trusted-substituters =
    trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
    extra-sandbox-paths = /System/Library/Frameworks /System/Library/PrivateFrameworks /usr/lib
@@ -159,15 +159,14 @@ Most of the commands need `nix` and will run only on Linux or macOS.
 - `yarn install`
 - `yarn dev:windows`
 
-#### Updating upstream dependencies (cardano-wallet, cardano-node, and iohk-nix)
+#### Updating upstream dependencies (cardano-wallet, cardano-node)
 
 `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 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
 

default.nix

@@ -1,6 +1,7 @@
 { target ? builtins.currentSystem
+, localLibSystem ? builtins.currentSystem
 , nodeImplementation ? "cardano"
-, localLib ? import ./lib.nix { inherit nodeImplementation; }
+, localLib ? import ./lib.nix { inherit nodeImplementation; system = localLibSystem; }
 , cluster ? "mainnet"
 , version ? "versionNotSet"
 , buildNum ? null
@@ -17,7 +18,7 @@
 
 let
   systemTable = {
-    x86_64-windows = builtins.currentSystem;
+    x86_64-windows = "x86_64-linux"; # Windows can only be cross-built from Linux now
   };
   crossSystemTable = lib: {
     x86_64-windows = lib.systems.examples.mingwW64;
@@ -42,23 +43,21 @@ let
         patch -p1 -i ${./nix/cardano-wallet--enable-aarch64-darwin.patch}
       '';
   };
-  haskellNix = import sources."haskell.nix" {};
-  inherit (import haskellNix.sources.nixpkgs-unstable haskellNix.nixpkgsArgs) haskell-nix;
+  haskell-nix = walletFlake.inputs.haskellNix.legacyPackages.${system}.haskell-nix;
   flake-compat = import sources.flake-compat;
-  walletFlake = flake-compat  { src = sources.cardano-wallet; };
-  walletPackages = with walletFlake.defaultNix.hydraJobs; {
+  walletFlake = (flake-compat  { src = sources.cardano-wallet; }).defaultNix;
+  walletPackages = with walletFlake.hydraJobs; {
     x86_64-windows = linux.windows;
     x86_64-linux = linux.native;
     x86_64-darwin = macos.intel;
     aarch64-darwin = macos.silicon;
   }.${target};
-  walletPkgs = import "${sources.cardano-wallet}/nix" {};
+  walletPkgs = walletFlake.legacyPackages.${system}.pkgs;
   cardanoWorldFlake = (flake-compat { src = sources.cardano-world; }).defaultNix.outputs;
   # only used for CLI, to be removed when upgraded to next node version
   nodePkgs = import "${sources.cardano-node}/nix" {};
-  shellPkgs = (import "${sources.cardano-shell}/nix") {};
-  inherit (pkgs.lib) optionalString optional concatStringsSep;
-  inherit (pkgs) writeTextFile;
+  shellPkgs = (import "${sources.cardano-shell}/nix") { inherit system; };
+  inherit (pkgs.lib) optionalString;
   crossSystem = lib: (crossSystemTable lib).${target} or null;
   # TODO, nsis can't cross-compile with the nixpkgs daedalus currently uses
   nsisNixPkgs = import localLib.sources.nixpkgs-nsis {};
@@ -73,7 +72,7 @@ let
 
   packages = self: {
     inherit walletFlake cardanoWorldFlake cluster pkgs version target nodeImplementation;
-    cardanoLib = localLib.iohkNix.cardanoLib;
+    cardanoLib = walletPkgs.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
     nodejs = let
@@ -296,7 +295,6 @@ let
 
       mkdir -p $out/{nix-support,cfg-files}
       mkdir installers
-      cp -vir ${./installers/dhall} installers/dhall
       cp -vir ${self.windowsIcons} installers/icons
       cp -vir ${./package.json} package.json
       chmod -R +w installers
@@ -452,7 +450,6 @@ let
     }).installerBundle;
     wrappedBundle = let
       version = (builtins.fromJSON (builtins.readFile ./package.json)).version;
-      backend = "cardano-wallet-${nodeImplementation}";
       suffix = if buildNum == null then "" else "-${toString buildNum}";
       fn = "daedalus-${version}-${self.linuxClusterBinName}${suffix}-x86_64-linux.bin";
     in pkgs.runCommand fn {} ''