From 841547a566c13fbe648098736c500853b78abbf2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Apr 2019 10:00:45 +0000 Subject: [PATCH] haskell-network-bsd: fix the build in LTS-13.x --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 46230a532f05..89ac1bbfe533 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1282,4 +1282,7 @@ self: super: { # Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65) yesod-markdown = doJailbreak super.yesod-markdown; + # This package needs network 3.x, which is not in LTS-13.x. + network-bsd = super.network-bsd.override { network = self.network_3_0_1_1; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7e479c0e8d6c..5ac37f1e0b1c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7178,7 +7178,6 @@ broken-packages: - netwire-vinylglfw-examples - network-address - network-anonymous-i2p - - network-bsd - network-builder - network-bytestring - network-connection diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c1fb190364d5..0902c57b83e3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -162199,8 +162199,6 @@ self: { libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database () API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-builder" = callPackage