[DDW-808] Revert

Author: nikolaglumac

CHANGELOG.md

@@ -20,7 +20,6 @@
 
 - Removed "Alonzo tada" icon and "Alonzo countdown" screen ([PR 2708](https://github.com/input-output-hk/daedalus/pull/2708))
 - Improved the Daedalus startup by avoiding unnecessary Cardano Node restarts ([PR 2716](https://github.com/input-output-hk/daedalus/pull/2716))
-- Updated `cardano-launcher` to version `0.20211105.1` and added Cardano Node RTS flags which improve resource usage ([PR 2734](https://github.com/input-output-hk/daedalus/pull/2734))
 - Updated README with solution steps for the nix SSL issue ([PR 2727](https://github.com/input-output-hk/daedalus/pull/2727))
 - Covered LedgerJS v4.0.0 breaking changes ([PR 2697](https://github.com/input-output-hk/daedalus/pull/2697))
 - Added hardware wallet support for all non-public testnets ([PR 2672](https://github.com/input-output-hk/daedalus/pull/2672))

default.nix

@@ -30,8 +30,7 @@ let
       });
     };
   };
-  pkgs = localLib.iohkNix.pkgsDefault;
-  pkgsNodeJS = import sources.nixpkgs { inherit system config; };
+  pkgs = localLib.iohkNix.getPkgsDefault { inherit system config; };
   pkgsNative = localLib.iohkNix.getPkgsDefault {};
   sources = localLib.sources;
   walletPkgs = import "${sources.cardano-wallet}/nix" {};
@@ -55,8 +54,8 @@ let
     cardanoLib = localLib.iohkNix.cardanoLib;
     daedalus-bridge = self.bridgeTable.${nodeImplementation};
 
-    nodejs = pkgsNodeJS.nodejs-14_x;
-    nodePackages = pkgsNodeJS.nodePackages.override { nodejs = self.nodejs; };
+    nodejs = pkgs.nodejs-14_x;
+    nodePackages = pkgs.nodePackages.override { nodejs = self.nodejs; };
     yarnInfo = {
       version = "1.22.4";
       hash = "1l3sv30g61dcn7ls213prcja2y3dqdi5apq9r7yyick295w25npq";

installers/daedalus-installer.nix

@@ -1,7 +1,7 @@
 { 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, lib
+, optparse-applicative, optparse-generic, split, stdenv
 , system-filepath, temporary, text, turtle, universum, raw-strings-qq
 , unordered-containers, wreq, yaml, zip-archive
 }:
@@ -30,6 +30,5 @@ mkDerivation {
     system-filepath temporary text turtle universum yaml
   ];
   description = "Daedalus Installer Builder";
-
-  license = lib.licenses.asl20;
+  license = stdenv.lib.licenses.asl20;
 }

installers/dhall-haskell.nix

@@ -4,7 +4,7 @@
 , fetchgit, filepath, formatting, haskeline, http-client
 , http-client-tls, insert-ordered-containers, lens-family-core
 , memory, mtl, optparse-generic, parsers, prettyprinter
-, prettyprinter-ansi-terminal, repline, scientific, stdenv, tasty, lib
+, prettyprinter-ansi-terminal, repline, scientific, stdenv, tasty
 , tasty-hunit, text, text-format, transformers, trifecta, unordered-containers
 , vector
 }:
@@ -35,5 +35,5 @@ mkDerivation {
     tasty-hunit text vector text-format
   ];
   description = "A configuration language guaranteed to terminate";
-  license = lib.licenses.bsd3;
+  license = stdenv.lib.licenses.bsd3;
 }

installers/dhall-json.nix

@@ -1,5 +1,5 @@
 { mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-, fetchgit, optparse-generic, stdenv, text, trifecta, lib
+, fetchgit, optparse-generic, stdenv, text, trifecta
 , unordered-containers, yaml
 }:
 mkDerivation {
@@ -19,5 +19,5 @@ mkDerivation {
     aeson aeson-pretty base bytestring dhall optparse-generic text yaml
   ];
   description = "Compile Dhall to JSON or YAML";
-  license = lib.licenses.bsd3;
+  license = stdenv.lib.licenses.bsd3;
 }

installers/nix/electron.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at_spi2_core, libxshmfence,
+{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at_spi2_core, libxshmfence,
   libdrm, libxkbcommon, mesa }:
 
 let
@@ -7,7 +7,7 @@ let
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Cross platform desktop application shell";
     homepage = https://github.com/electron/electron;
     license = licenses.mit;
@@ -48,15 +48,15 @@ let
 
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${atomEnv.libPath}:${lib.makeLibraryPath [ libuuid at-spi2-atk at_spi2_core ]}:$out/lib/electron" \
+        --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at_spi2_core ]}:$out/lib/electron" \
         $out/lib/electron/electron
 
       wrapProgram $out/lib/electron/electron \
-        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
-        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libdrm ]}/libdrm.so.2 \
-        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libxkbcommon ]}/libxkbcommon.so.0 \
-        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ mesa ]}/libgbm.so.1 \
-        --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libxshmfence ]}/libxshmfence.so.1
+        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
+        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libdrm ]}/libdrm.so.2 \
+        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxkbcommon ]}/libxkbcommon.so.0 \
+        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ mesa ]}/libgbm.so.1 \
+        --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxshmfence ]}/libxshmfence.so.1
     '';
   };
 

installers/overlays/dhall-json.nix

@@ -1,7 +1,7 @@
 { 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, lib
+, scientific, stdenv, tasty, tasty-hunit, text
 , unordered-containers, vector, yaml
 }:
 mkDerivation {
@@ -25,5 +25,5 @@ mkDerivation {
     aeson base bytestring dhall tasty tasty-hunit text
   ];
   description = "Convert between Dhall and JSON or YAML";
-  license = lib.licenses.bsd3;
+  license = stdenv.lib.licenses.bsd3;
 }

installers/overlays/dhall.nix

@@ -5,7 +5,7 @@
 , generic-random, haskeline, http-client, http-client-tls
 , http-types, lens-family-core, megaparsec, memory, mockery, mtl
 , network-uri, optparse-applicative, parsers, prettyprinter
-, prettyprinter-ansi-terminal, profunctors, QuickCheck, lib
+, prettyprinter-ansi-terminal, profunctors, QuickCheck
 , quickcheck-instances, repline, scientific, semigroups, serialise
 , spoon, stdenv, tasty, tasty-expected-failure, tasty-hunit
 , tasty-quickcheck, template-haskell, text, th-lift-instances
@@ -40,5 +40,5 @@ mkDerivation {
     base bytestring containers directory gauge serialise text
   ];
   description = "A configuration language guaranteed to terminate";
-  license = lib.licenses.bsd3;
+  license = stdenv.lib.licenses.bsd3;
 }

installers/overlays/nsis.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, base, directory, fetchFromGitHub, process, stdenv, lib
+{ mkDerivation, base, directory, fetchFromGitHub, process, stdenv
 , transformers, uniplate
 }:
 mkDerivation {
@@ -16,5 +16,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/ndmitchell/nsis#readme";
   description = "DSL for producing Windows Installer using NSIS";
-  license = lib.licenses.bsd3;
+  license = stdenv.lib.licenses.bsd3;
 }

installers/overlays/universum.nix

@@ -1,6 +1,6 @@
 { mkDerivation, base, bytestring, containers, deepseq, doctest
 , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
-, microlens-mtl, mtl, safe-exceptions, stdenv, lib, stm, tasty
+, microlens-mtl, mtl, safe-exceptions, stdenv, stm, tasty
 , tasty-hedgehog, text, transformers, unordered-containers
 , utf8-string, vector
 }:
@@ -22,5 +22,5 @@ mkDerivation {
   ];
   homepage = "https://github.com/serokell/universum";
   description = "Custom prelude used in Serokell";
-  license = lib.licenses.mit;
+  license = stdenv.lib.licenses.mit;
 }