diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 053752edd6fa..88dbf081c6ce 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -605,6 +605,25 @@ self: super: { ''; }); + 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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 641dd36dc29d..eaba58319fe4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -968,7 +968,6 @@ broken-packages: - dbmigrations-mysql - dbmigrations-postgresql - dbmigrations-sqlite - - d-bus - DBus - dbus-core - dbus-qq diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8f2d67d7866c..745e0a8c7162 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -68830,8 +68830,6 @@ self: { ]; description = "Permissively licensed D-Bus client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "d10" = callPackage