Merge branch 'develop' into chore/ddw-1151-cicero-instead-of-hydra

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

@@ -4,6 +4,7 @@
 
 ### Chores
 
+- 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

default.nix

@@ -58,7 +58,6 @@ let
   nodePkgs = import "${sources.cardano-node}/nix" {};
   shellPkgs = (import "${sources.cardano-shell}/nix") { inherit system; };
   inherit (pkgs.lib) optionalString optional concatStringsSep;
-  inherit (pkgs) writeTextFile;
   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 {};
@@ -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 {} ''

installers/README.md

@@ -4,41 +4,6 @@ This folder provides a way to create Daedalus installers for OSX/Linux/Windows.
 
 Best way to see how to build an installer is to reproduce `../.buildkite/pipeline.yml`
 
-## Generation of runtime configuration files
-
-The run-time configuration files of the Daedalus wallet are generated during the
-installer build, and are governed by configuration files written in the Dhall
-configuration language, which are factored per OS and target cluster:
-
-  - https://github.com/input-output-hk/daedalus/tree/develop/installers/dhall
-
-The Dhall expressions that comprise the runtime configuration are thus composed from:
-  - `launcher.dhall` -- top level expression defining the launcher configuration YAML file
-  - `topology.dhall` -- top level expression defining the wallet topology YAML file
-  - `{linux64,macos64,win64}.dhall`
-  - `{mainnet,staging,testnet}.dhall`
-
-The set of clusters (currently `mainnet` and `staging`) that the build scripts
-(`scripts/build-installer-*`) will build installers for is enumerated in
-https://github.com/input-output-hk/daedalus/blob/develop/installer-clusters.cfg
-
-### Validating the Dhall configuration files
-
-The entire set of configuration files can be validated by typechecking all
-possible combinations:
-
-    $ cd installers
-    $ ghci Config.hs
-    GHCi, version 8.0.2: http://www.haskell.org/ghc/  :? for help
-    Loaded GHCi configuration from /home/deepfire/.ghci
-    [1 of 2] Compiling Types            ( Types.hs, interpreted )
-    [2 of 2] Compiling Config           ( Config.hs, interpreted )
-    Ok, modules loaded: Config, Types.
-    *Config> generateAllConfigs "./dhall"
-
-..which will be silent if everything is well, and will otherwise provide
-a detailed explanation of what is wrong, and where.
-
 ## Certificate import on MacOS X
 
 Before signing the Mac installer, the keychain needs to be set up. Do this by running:

installers/Spec.hs

@@ -77,7 +77,6 @@ makeTestInstallersDir = do
   liftIO $ writeTextFile (src </> "package.json") "{ \"version\": \"0.4.2\" }"
   let installersDir = src </> "installers"
   mkdir installersDir
-  cptree "dhall" (installersDir </> "dhall")
   mktree (installersDir </> "data/scripts")
   liftIO $ writeTextFile (installersDir </> "data/scripts/dockutil") "fake dock util"
   pure installersDir

installers/common/Config.hs

@@ -99,6 +99,5 @@ backendOptionParser = cardano
     cardano = Cardano <$> optPath "cardano" 'S' "Use Cardano backend with given Daedalus bridge path"
 
 -- | Render a FilePath with POSIX-style forward slashes, which is the
--- Dhall syntax.
 dfp :: Format r (FilePath -> r)
 dfp = makeFormat (\fpath -> either id id (FP.toText FP.posix fpath))