From 2a194d990f76c14e39d32f71a8c54c806e5625b5 Mon Sep 17 00:00:00 2001 From: Roosembert Palacios Date: Tue, 21 Sep 2021 09:51:17 +0200 Subject: [PATCH 1/2] haskellPackages.d-bus: Fix for GHC 8.10.1+ Signed-off-by: Roosembert Palacios --- .../haskell-modules/configuration-common.nix | 19 +++++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8f45269c3008..82f4e6052a4d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -612,6 +612,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 94345e60295d..11fc9e5fbc3f 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 From 5ef7b752874c4d79205c1ba540e4290f105a97cf Mon Sep 17 00:00:00 2001 From: Roosembert Palacios Date: Thu, 23 Sep 2021 15:01:40 +0200 Subject: [PATCH 2/2] Update hackage-packages.nix Signed-off-by: Roosembert Palacios --- pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2125e9341f0a..54ffd8966540 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -68797,8 +68797,6 @@ self: { ]; description = "Permissively licensed D-Bus client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "d10" = callPackage