From db84219ded13e3b5276c6a0a2b02b9c7be697fe0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 18 Jul 2021 12:05:34 +0200 Subject: haskellPackages.{rel8,tmp-postgres}: unbreak 1.1.0.0 brings us compatibility with opaleye >= 7.3.0.0, so we can get rid of the old version as well. tmp-postgres was incorrectly marked as broken (maybe due to a flaky failure) and can be unmarked. --- .../haskell-modules/configuration-common.nix | 6 ----- .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/main.yaml | 1 - .../haskell-modules/hackage-packages.nix | 31 ---------------------- 4 files changed, 39 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 09943b46e46..0ca7c092112 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1944,12 +1944,6 @@ EOT # Fixed on upstream: https://github.com/softwarefactory-project/matrix-client-haskell/commit/4ca4963cfd06379d9bdce49742af854aed6a0d37 matrix-client = dontCheck super.matrix-client; - # Flakey tests - # upstream https://github.com/circuithub/rel8/issues/86 - rel8 = dontCheck (super.rel8.override { - opaleye = dontCheck super.opaleye_0_7_2_0; - }); - # Release 1.0.0.0 added version bounds (was unrestricted before), # but with too strict lower bounds for our lts-18. graphql = assert pkgs.lib.versionOlder self.parser-combinators.version "1.3.0"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 302c2722ee0..c02f6b4dc18 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4805,7 +4805,6 @@ broken-packages: - Titim - tkhs - tkyprof - - tmp-postgres - todo - tofromxml - to-haskell diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index c63942afe1a..45d0bdcd0cb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -115,7 +115,6 @@ extra-packages: - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501 - - opaleye < 0.7.3.0 # 2021-07-11: for rel8 <= 1.0.0.1, see https://github.com/circuithub/rel8/issues/95#issuecomment-877616118 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 38aa561bead..68c7a075a83 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -191329,35 +191329,6 @@ self: { broken = true; }) {}; - "opaleye_0_7_2_0" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, dotenv, hspec - , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-locale-compat, transformers, uuid - , void - }: - mkDerivation { - pname = "opaleye"; - version = "0.7.2.0"; - sha256 = "1qz34isgb5hl2ab5vij3zw1h3xwvl3a0d1k02n156xszibnkcgf1"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors scientific semigroups text time time-locale-compat - transformers uuid void - ]; - testHaskellDepends = [ - aeson base bytestring containers contravariant dotenv hspec - hspec-discover multiset postgresql-simple product-profunctors - profunctors QuickCheck semigroups text time transformers uuid - ]; - testToolDepends = [ hspec-discover ]; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "opaleye" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec @@ -264395,8 +264366,6 @@ self: { ]; description = "Start and stop a temporary postgres"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tmpl" = callPackage -- cgit 1.4.1