From 834eb1729b396fefa2af3d08406c82e2fc72ec6f Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 6 May 2020 01:08:27 -0300 Subject: [PATCH 1/2] haskellPackages.network_2_6_3_1: enable dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4cf9770c7a2..f9cdab48b32 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -333,6 +333,7 @@ self: super: { nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; network = dontCheck super.network; + network_2_6_3_1 = dontCheck super.network_2_6_3_1; network-dbus = dontCheck super.network-dbus; notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; From ae77b8f42db25c783dc0434f20f8455e67cfcbc2 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 6 May 2020 01:09:54 -0300 Subject: [PATCH 2/2] hedgewars: use haskellPackages.network_2_6_3_1 gameServer/hedgewars-server.cabal indicates network version needs to be < 3.0. --- pkgs/games/hedgewars/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index dffeb2ac556..771554192d8 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -6,8 +6,9 @@ }: let + # gameServer/hedgewars-server.cabal depends on network < 3 ghc = ghcWithPackages (pkgs: with pkgs; [ - SHA bytestring entropy hslogger network pkgs.zlib random + SHA bytestring entropy hslogger network_2_6_3_1 pkgs.zlib random regex-tdfa sandi utf8-string vector ]); @@ -40,6 +41,15 @@ mkDerivation rec { "-DNOSERVER=${if withServer then "OFF" else "ON"}" ]; + + # hslogger brings network-3 and network-bsd which conflict with + # network-2.6.3.1 + preConfigure = '' + substituteInPlace gameServer/CMakeLists.txt \ + --replace "haskell_flags}" \ + "haskell_flags} -package network-2.6.3.1 -hide-package network-bsd" + ''; + NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ SDL2.out SDL2_image