From 3b1a6b95d482d6380cb5cd7ebe250dc5170294b3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 12 Aug 2021 14:17:36 +0200 Subject: [PATCH] haskellPackages.odbc: add freetds, unbreak --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 11a78272fa4b..213edaa9f4fa 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3322,7 +3322,6 @@ broken-packages: - oblivious-transfer - ocaml-export - Octree - - odbc - OddWord - oden-go-packages - oeis2 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1c96024fc0d6..7a820af6b574 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -224,6 +224,9 @@ self: super: builtins.intersectAttrs super { # Test suite wants to connect to $DISPLAY. hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]); + # Wants to check against a real DB, Needs freetds + odbc = dontCheck (addExtraLibraries super.odbc [ pkgs.freetds ]); + # Tests attempt to use NPM to install from the network into # /homeless-shelter. Disabled. purescript = dontCheck super.purescript; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 72b6f88a9fb8..b1e63e5940d8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -191956,8 +191956,6 @@ self: { benchmarkHaskellDepends = [ async base text weigh ]; description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) unixODBC;}; "odd-jobs" = callPackage