Reverts flake.nix changes for dmq-node

Revert "dmq-node: static build"

This reverts commit 0d2ca29.

Revert "dmq-node: disable StandardCrypto tests on Windows"

This reverts commit caed24b.

Revert "nix: build dmq-node with gitrev support"

This reverts commit 2eb112c.

revert crypto overlays for dmq

Author: crocodile-dentist

flake.nix

@@ -45,27 +45,9 @@
           overlays = [
             # haskellNix.overlay can be configured by later overlays, so need to come before them.
             inputs.haskellNix.overlay
-            # dmq-node depends cardano-crypto-class, so we need crypto overlays
-            inputs.iohkNix.overlays.crypto
-            inputs.iohkNix.overlays.haskell-nix-crypto
-            inputs.iohkNix.overlays.haskell-nix-extra
             (import ./nix/tools.nix inputs)
             (import ./nix/ouroboros-network.nix inputs)
             (import ./nix/network-docs.nix inputs)
-            (final: _prev: {
-              static-libsodium-vrf = final.libsodium-vrf.overrideDerivation (old: {
-                configureFlags = old.configureFlags ++ [ "--disable-shared" ];
-              });
-              static-secp256k1 = final.secp256k1.overrideDerivation (old: {
-                configureFlags = old.configureFlags ++ [ "--enable-static" "--disable-shared" ];
-              });
-              static-gmp = (final.gmp.override { withStatic = true; }).overrideDerivation (old: {
-                configureFlags = old.configureFlags ++ [ "--enable-static" "--disable-shared" ];
-              });
-              static-libblst = (final.libblst.override { enableShared = false; }).overrideDerivation (_old: {
-                postFixup = "";
-              });
-            })
           ];
         };
 
@@ -124,16 +106,6 @@
       in
       lib.recursiveUpdate flake rec {
         project = pkgs.ouroboros-network;
-        # `nix build .\#dmq-node` will have the git revision set in the binary,
-        # `nib build .\#hydraJobs.x86_64-linux.packages.dmq-node:exe:dmq-node` won't.
-        packages.dmq-node =
-          pkgs.setGitRev
-            (inputs.self.rev or inputs.self.dirtyShortRev)
-            flake.packages."dmq-node:exe:dmq-node";
-        packages.dmq-node-static =
-          pkgs.setGitRev
-            (inputs.self.rev or inputs.self.dirtyShortRev)
-            flake.packages."x86_64-unknown-linux-musl:dmq-node:exe:dmq-node";
         inherit hydraJobs legacyPackages devShells;
       }
     );

nix/ouroboros-network.nix

@@ -46,7 +46,7 @@ let
     compiler-nix-name = lib.mkDefault defaultCompiler;
     cabalProjectLocal =
       if pkgs.stdenv.hostPlatform.isWindows
-      then lib.readFile ../scripts/ci/cabal.project.local.Nix.Windows
+      then lib.readFile ../scripts/ci/cabal.project.local.Windows
       else lib.readFile ../scripts/ci/cabal.project.local.Linux;
 
     #
@@ -55,7 +55,7 @@ let
 
     # we also want cross compilation to windows on linux (and only with default compiler).
     crossPlatforms =
-      p: lib.optionals (pkgs.stdenv.hostPlatform.isLinux && config.compiler-nix-name == crossGHCVersion) [ p.ucrt64 p.musl64 ];
+      p: lib.optionals (pkgs.stdenv.hostPlatform.isLinux && config.compiler-nix-name == crossGHCVersion) [ p.ucrt64 ];
 
     #
     # VARIANTS
@@ -125,19 +125,6 @@ let
       ({ pkgs, ... }: lib.mkIf pkgs.stdenv.hostPlatform.isWindows {
         packages.basement.configureFlags = [ "--hsc2hs-options=--cflag=-Wno-int-conversion" ];
       })
-      ({ pkgs, ... }: lib.mkIf pkgs.stdenv.hostPlatform.isMusl {
-        # rubby fails to build with musl, hence we disable cddl tests
-        packages.dmq-node.components.tests.dmq-cddl.build-tools = lib.mkForce [ ];
-        packages.dmq-node.components.tests.dmq-cddl.doCheck = lib.mkForce false;
-        packages.cardano-diffusion.components.tests.protocols-cddl.build-tools = lib.mkForce [ ];
-        packages.cardano-diffusion.components.tests.protocols-cddl.doCheck = lib.mkForce false;
-        packages.dmq-node.ghcOptions = with pkgs; [
-          "-L${lib.getLib static-gmp}/lib"
-          "-L${lib.getLib static-libsodium-vrf}/lib"
-          "-L${lib.getLib static-secp256k1}/lib"
-          "-L${lib.getLib static-libblst}/lib"
-        ];
-      })
     ];
   });
 in

scripts/ci/cabal.project.local.Nix.Windows

@@ -1,4 +1,32 @@
-import ./scripts/cabal.project.local.Nix.Windows
+max-backjumps: 5000
+reorder-goals: True
+tests:         True
+benchmarks:    True
+
+-- IPv6 and nothunks tests are DISABLED on Windows
+
+program-options
+  ghc-options: -fno-ignore-asserts -Werror
+
+package strict-checked-vars
+  flags: -checktvarinvariants -checkmvarinvariants
+
+package ntp-client
+  flags: +demo
+
+package network-mux
+  flags: -ipv6
+
+package ouroboros-network
+  flags: +asserts -ipv6
+
+--
+-- cddl is disabled on Windows due to missing build tool support in cross
+-- compilation
+--
 
 package dmq-node
-  flags: -standardcrypto-tests
+  flags: -cddl
+
+package cardano-diffusion
+  flags: +asserts -cddl