Merge pull request #138937 from roosemberth/hs-fix-d-bus

haskellPackages.d-bus: Fix for GHC 8.10.1+

maralorn 291c4680 1c28c30c

Changed files
+19 -3
pkgs
development
haskell-modules
+19
pkgs/development/haskell-modules/configuration-common.nix
···
'';
});
+
d-bus = let
+
# The latest release on hackage is missing necessary patches for recent compilers
+
# https://github.com/Philonous/d-bus/issues/24
+
newer = overrideSrc super.d-bus {
+
version = "unstable-2021-01-08";
+
src = pkgs.fetchFromGitHub {
+
owner = "Philonous";
+
repo = "d-bus";
+
rev = "fb8a948a3b9d51db618454328dbe18fb1f313c70";
+
hash = "sha256-R7/+okb6t9DAkPVUV70QdYJW8vRcvBdz4zKJT13jb3A=";
+
};
+
};
+
# Add now required extension on recent compilers.
+
# https://github.com/Philonous/d-bus/pull/23
+
in appendPatch newer (pkgs.fetchpatch {
+
url = "https://github.com/Philonous/d-bus/commit/e5f37900a3a301c41d98bdaa134754894c705681.patch";
+
sha256 = "6rQ7H9t483sJe1x95yLPAZ0BKTaRjgqQvvrQv7HkJRE=";
+
});
+
# * The standard libraries are compiled separately.
# * We need multiple patches from master to fix compilation with
# updated dependencies (haskeline and megaparsec) which can be
-1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
···
- dbmigrations-mysql
- dbmigrations-postgresql
- dbmigrations-sqlite
-
- d-bus
- DBus
- dbus-core
- dbus-qq
-2
pkgs/development/haskell-modules/hackage-packages.nix
···
description = "Permissively licensed D-Bus client library";
license = lib.licenses.bsd3;
-
hydraPlatforms = lib.platforms.none;
-
broken = true;
}) {};
"d10" = callPackage