[DDW-356] Bump Daedalus version and cardano-wallet revision (#2155)

* [DDW-356] Bump Daedalus version, cardano-wallet and cardano-node * [DDW-356] Adds CHANGELOG entry * [DDW-356] Revert cardano-node version bump * Bump cardano-launcher * cardano-wallet: drop shelley suffix * fix shellcheck * fix shellcheck Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
input-output-hk · Aug 13, 2020 · 5eccb24 · 5eccb24
1 parent 4ee35a9
commit 5eccb24
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 552 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## vNext
+## 2.2.0
 
 ### Features
 
@@ -21,6 +21,10 @@ Changelog
 - Fixed validation of spending passwords which include spaces ([PR 2147](https://github.com/input-output-hk/daedalus/pull/2147))
 - Disabled ITN rewards redemption in case Daedalus is not fully in sync ([PR 2146](https://github.com/input-output-hk/daedalus/pull/2146))
 
+### Chores
+
+- Updated `cardano-wallet` to revision `a4fd49e3` ([PR 2155](https://github.com/input-output-hk/daedalus/pull/2155))
+
 ## 2.1.0
 
 ### Features

diff --git a/default.nix b/default.nix
@@ -72,9 +72,7 @@ let
     bridgeTable = {
       jormungandr = self.callPackage ./nix/jormungandr-bridge.nix {};
       cardano = self.callPackage ./nix/cardano-bridge.nix {
-        cardano-wallet = if self.launcherConfigs.launcherConfig.nodeConfig.kind == "byron"
-                         then self.cardano-wallet.cardano-wallet-byron
-                         else self.cardano-wallet.cardano-wallet-shelley;
+        cardano-wallet = self.cardano-wallet.cardano-wallet;
         cardanoWalletPkgs = self.cardano-wallet.pkgs;
       };
     };
@@ -99,7 +97,6 @@ let
     cardano-node = if useLocalNode
                    then (import self.sources.cardano-node { inherit system; crossSystem = crossSystem nodePkgs.lib; }).haskellPackages.cardano-node.components.exes.cardano-node
                    else self.cardano-wallet.cardano-node;
-    cardano-sl = import self.sources.cardano-sl { inherit target; gitrev = self.sources.cardano-sl.rev; };
     darwin-launcher = self.callPackage ./nix/darwin-launcher.nix {};
 
     # a cross-compiled fastlist for the ps-list package
@@ -200,7 +197,7 @@ let
     '';
 
     nsisFiles = let
-      nodeImplementation' = if nodeImplementation == "jormungandr" then nodeImplementation else "${nodeImplementation}-${self.launcherConfigs.launcherConfig.nodeConfig.kind}";
+      nodeImplementation' = if nodeImplementation == "jormungandr" then nodeImplementation else "${nodeImplementation}";
     in pkgs.runCommand "nsis-files" {
       buildInputs = [ self.daedalus-installer pkgs.glibcLocales ];
     } ''

diff --git a/installers/Installer.hs b/installers/Installer.hs
@@ -9,10 +9,6 @@ import qualified System.IO as IO
 
 import qualified MacInstaller
 import qualified WindowsInstaller
-import           System.Environment (getEnv)
-import           Data.List.Split (splitOn)
-import           Data.Maybe                          (fromJust)
-import           System.Directory
 import qualified Data.Text.IO as T
 import qualified Data.Text as T
 import           Data.Yaml                 (decodeFileThrow)
@@ -43,38 +39,6 @@ main = do
       installerConfig <- decodeFileThrow "installer-config.json"
       WindowsInstaller.writeInstallerNSIS fullName fullVersion installerConfig options' (oCluster options')
       WindowsInstaller.writeUninstallerNSIS fullVersion installerConfig
-    Appveyor -> do
-        buildNumber <- getEnv "APPVEYOR_BUILD_NUMBER"
-        let
-            opts' = options' {
-                  oBuildJob = Just $ BuildJob $ pack $ buildNumber
-                }
-            go :: String -> IO ()
-            go cluster' = do
-                let
-                    getAppName ITN_Rewards_v1 = "DaedalusRewardsV1"
-                    getAppName Nightly = "DaedalusNightly"
-                    getAppName QA = "DaedalusQA";
-                    getAppName Selfnode = "DaedalusSelfnode"
-                    cluster = fromJust $ diagReadCaseInsensitive cluster'
-                    opts'' = opts' {
-                          oCluster = cluster
-                        , oAppName = getAppName cluster
-                    }
-                    banner :: Text
-                    banner = "##############################################################################\n" <>
-                             "###\n" <>
-                             "### Building for cluster " <> pack cluster' <> "\n" <>
-                             "###\n" <>
-                             "##############################################################################\n"
-                putStr banner
-                genSignedInstaller os opts''
-                copyFile "launcher-config.yaml" ("launcher-config-" <> cluster' <> ".win64.yaml")
-        clusters' <- getEnv "CLUSTERS"
-        let clusters = splitOn " " clusters'
-        print clusters
-        mapM_ go clusters
-
 -- | The contract of `genSignedInstaller` is not to produce unsigned installer binaries.
 genSignedInstaller :: OS -> Options -> IO ()
 genSignedInstaller os options'= do

diff --git a/installers/README.md b/installers/README.md
@@ -2,8 +2,7 @@
 
 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` (OSX/Linux)
-or `..\appveyor.yaml` (Windows).
+Best way to see how to build an installer is to reproduce `../.buildkite/pipeline.yml`
 
 ## Generation of runtime configuration files
 

diff --git a/installers/Spec.hs b/installers/Spec.hs
@@ -21,14 +21,12 @@ import Config
 import Types
 import qualified MacInstaller as Mac
 import Util
-import AppVeyor
 
 main :: IO ()
 main = hspec $ do
   describe "Utility functions" utilSpec
   describe "MacInstaller build" macBuildSpec
   describe "recursive directory deletion" deleteSpec
-  describe "Hydra downloads for AppVeyor" hydraSpec
 
 macBuildSpec :: Spec
 macBuildSpec = do