nix: ouroboros-network

* Added explicit cabal.project * Removed `-Werror` flags in nix, they are set in `cabal.project.local` files. * Used `doCheckCross` instead of setting `doCheck` flag per package.
IntersectMBO · Sep 30, 2024 · ca9b54f · ca9b54f
1 parent 9124739
commit ca9b54f
Showing 1 changed file with 9 additions and 19 deletions.
diff --git a/nix/ouroboros-network.nix b/nix/ouroboros-network.nix
@@ -5,7 +5,7 @@ let
   inherit (prev) lib;
   inherit (prev) pkgs;
   inherit (final) haskell-nix;
-  # inherit (final) pkgs;
+  buildSystem = pkgs.buildPlatform.system;
 
   # default compiler used on all systems, also provided within the shell
   defaultCompiler = "ghc982";
@@ -104,34 +104,24 @@ let
     # package customizations as needed. Where cabal.project is not
     # specific enough, or doesn't allow setting these.
     modules = [
-      (forAllProjectPackages ({ ... }: {
-        ghcOptions = [ "-Werror" ];
-      }))
       ({ pkgs, ... }: {
         # We impose limit heap size limit when running some of the tests
         # to discover space leaks Once #4698 and #4699 are done we can
         # further constrain the heap size.
-        preCheck = lib.mkForce ''
-          export GHCRTS=-M250M
-        '';
+        preCheck =
+          lib.mkForce
+            (if buildSystem == "x86_64-linux"
+            then "export GHCRTS=-M200M"
+            else "");
+        doCrossCheck = lib.mkForce false;
 
         # pkgs are instantiated for the host platform
         packages.ouroboros-network-protocols.components.tests.cddl.build-tools = [ pkgs.cddl pkgs.cbor-diag ];
         packages.ouroboros-network-protocols.components.tests.cddl.preCheck = "export HOME=`pwd`";
 
         # don't run checks using Wine when cross compiling
-        packages.quickcheck-monoids.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.ntp-client.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.network-mux.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.network-mux.components.tests.test.preCheck = "export GHCRTS=-M500M";
-        packages.ouroboros-network-api.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.ouroboros-network-protocols.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.ouroboros-network-framework.components.tests.sim-tests.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.ouroboros-network-framework.components.tests.io-tests.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.ouroboros-network-framework.components.tests.bench.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.ouroboros-network.components.tests.sim-tests.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.ouroboros-network.components.tests.io-tests.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
-        packages.cardano-client.components.tests.test.doCheck = !pkgs.stdenv.hostPlatform.isWindows;
+        packages.network-mux.components.tests.test.preCheck =
+          lib.optionalAttrs (buildSystem == "x86_64-linux") "export GHCRTS=-M500M";
       })
     ];
   });