[DDW-745] Clean-up

Author: michalrus

installers/daedalus-installer.nix

@@ -1,9 +1,9 @@
 { mkDerivation, aeson, base, bytestring, containers, directory
 , filepath, foldl, github, Glob, hspec, lens-aeson, managed
 , megaparsec, microlens, network-uri, nsis, optional-args
-, optparse-applicative, optparse-generic, split, stdenv
+, optparse-applicative, optparse-generic, split, lib
 , system-filepath, temporary, text, turtle, universum, raw-strings-qq
-, unordered-containers, wreq, yaml, zip-archive, lib
+, unordered-containers, wreq, yaml, zip-archive
 }:
 mkDerivation {
   pname = "daedalus-installer";

installers/dhall-haskell.nix

@@ -6,7 +6,7 @@
 , memory, mtl, optparse-generic, parsers, prettyprinter
 , prettyprinter-ansi-terminal, repline, scientific, stdenv, tasty, lib
 , tasty-hunit, text, text-format, transformers, trifecta, unordered-containers
-, vector, lib
+, vector
 }:
 mkDerivation {
   pname = "dhall";

installers/dhall-json.nix

@@ -1,6 +1,6 @@
 { mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-, fetchgit, optparse-generic, stdenv, text, trifecta
-, unordered-containers, yaml, lib
+, fetchgit, optparse-generic, stdenv, text, trifecta, lib
+, unordered-containers, yaml
 }:
 mkDerivation {
   pname = "dhall-json";

installers/nix/electron.nix

@@ -12,7 +12,7 @@ let
     homepage = https://github.com/electron/electron;
     license = licenses.mit;
     maintainers = with maintainers; [ travisbhartwell manveru ];
-    platforms = [ "x86_64-darwin" "aarch64-darwin" "x86_64-linux" "i686-linux" ];
+    platforms = [ "x86_64-darwin" "aarch64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ];
   };
 
   linux = {

installers/overlays/dhall-json.nix

@@ -1,8 +1,8 @@
 { mkDerivation, aeson, aeson-pretty, ansi-terminal, base
 , bytestring, containers, dhall, exceptions, filepath, libyaml
 , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
-, scientific, stdenv, tasty, tasty-hunit, text
-, unordered-containers, vector, yaml, lib
+, scientific, stdenv, tasty, tasty-hunit, text, lib
+, unordered-containers, vector, yaml
 }:
 mkDerivation {
   pname = "dhall-json";

installers/overlays/dhall.nix

@@ -10,7 +10,7 @@
 , spoon, stdenv, tasty, tasty-expected-failure, tasty-hunit
 , tasty-quickcheck, template-haskell, text, th-lift-instances
 , transformers, transformers-compat, turtle, unordered-containers
-, uri-encode, vector, lib
+, uri-encode, vector
 }:
 mkDerivation {
   pname = "dhall";

installers/overlays/nsis.nix

@@ -1,4 +1,6 @@
-{ mkDerivation, base, directory, fetchFromGitHub, process, lib, transformers, uniplate }:
+{ mkDerivation, base, directory, fetchFromGitHub, process, stdenv, lib
+, transformers, uniplate
+}:
 mkDerivation {
   pname = "nsis";
   version = "0.3.2";

release.nix

@@ -60,11 +60,17 @@ in {
     inherit (sources) iohk-nix cardano-wallet cardano-shell;
   };
 } // (builtins.listToAttrs (map (x: { name = x; value = makeJobs x; }) clusters))
-// (mapOverArches {
-  daedalus-installer = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
-  yaml2json = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+// (mapOverArches (let
+    allArchesNoWindows = [
+      "x86_64-linux" "x86_64-darwin"
+      # "aarch64-darwin"    # TODO: re-enable when we have `aarch64-darwin` in Hydra
+    ];
+    allArches = allArchesNoWindows ++ [ "x86_64-windows" ];
+  in {
+  daedalus-installer = allArchesNoWindows;
+  yaml2json = allArchesNoWindows;
   bridgeTable = {
-    cardano = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ];
+    cardano = allArches;
   };
-  cardano-node = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ];
-})
+  cardano-node = allArches;
+}))