public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages: Move some overrides and update affected derivations

Browse Source 
This is a follow-up to
https://github.com/NixOS/nixpkgs/pull/105140
This commit is contained in:
Malte Brandy 2020-11-27 17:32:13 +01:00 committed by Peter Simons
parent f1f8539583
commit 505d721c3c
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1519,4 +1519,12 @@ self: super: {
# 2020-11-23: https://github.com/cdornan/fmt/issues/30 # 2020-11-23: https://github.com/cdornan/fmt/issues/30
fmt = dontCheck super.fmt; fmt = dontCheck super.fmt;
# 2020-11-27: Tests broken
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
servant-swagger = dontCheck super.servant-swagger;
# 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

7
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View File

@ -73,9 +73,6 @@ self: super: {
shellmet = doJailbreak super.shellmet; shellmet = doJailbreak super.shellmet;
shower = doJailbreak super.shower; shower = doJailbreak super.shower;
# Broken test compile
servant-swagger = dontCheck super.servant-swagger;
# The shipped Setup.hs file is broken. # The shipped Setup.hs file is broken.
csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; });
@ -95,8 +92,4 @@ self: super: {
# Break out of "Cabal < 3.2" constraint. # Break out of "Cabal < 3.2" constraint.
stylish-haskell = doJailbreak super.stylish-haskell; stylish-haskell = doJailbreak super.stylish-haskell;
# cxx-options is broken in Cabal 3.2.0.0
hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
} }

13
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -123186,8 +123186,8 @@ self: {
}: }:
mkDerivation { mkDerivation {
pname = "hercules-ci-agent"; pname = "hercules-ci-agent";
version = "0.7.4"; version = "0.7.5";
sha256 = "0yj9njd168xpj4har99mbb9rr5dqsbnzqs1061s3czrzlp229z3l"; sha256 = "0v3wyz8fm3n6rwanjgfxws6f18kp3qmgwx5g4f0xy00mxjzswjrq";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
libraryHaskellDepends = [ libraryHaskellDepends = [
@ -123225,8 +123225,7 @@ self: {
doHaddock = false; doHaddock = false;
description = "Runs Continuous Integration tasks on your machines"; description = "Runs Continuous Integration tasks on your machines";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ roberth ];
broken = true;
}) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;};
"hercules-ci-api-agent" = callPackage "hercules-ci-api-agent" = callPackage
@ -123257,8 +123256,7 @@ self: {
]; ];
description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ roberth ];
broken = true;
}) {}; }) {};
"hercules-ci-api-core" = callPackage "hercules-ci-api-core" = callPackage
@ -123281,8 +123279,7 @@ self: {
]; ];
description = "Types and convenience modules use across Hercules CI API packages"; description = "Types and convenience modules use across Hercules CI API packages";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ roberth ];
broken = true;
}) {}; }) {};
"here" = callPackage "here" = callPackage