nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #324543 from rvl/haskell-updates-unpatch-haskell-gi

Browse Source 
haskellPackages.haskell-gi: Drop obsolete patches
This commit is contained in:
maralorn 2024-07-04 15:49:40 +02:00 committed by GitHub
commit 02d8901937
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2286,22 +2286,6 @@ self: super: {
gi-gtk = self.gi-gtk_4;
};
# Missing dependency on gi-cairo
# https://github.com/haskell-gi/haskell-gi/pull/420
gi-vte =
overrideCabal
(oldAttrs: {
# This is implemented as a sed expression instead of pulling a patch
# from upstream because the gi-vte repo doesn't actually contain a
# gi-vte.cabal file. The gi-vte.cabal file is generated from metadata
# in the repo.
postPatch = (oldAttrs.postPatch or "") + ''
sed -i 's/\(gi-gtk == .*\),/\1, gi-cairo == 1.0.*,/' ./gi-vte.cabal
'';
buildDepends = (oldAttrs.buildDepends or []) ++ [self.gi-cairo];
})
super.gi-vte;
# 2023-04-09: haskell-ci needs Cabal-syntax 3.10
# 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664
# 2024-03-21: pins specific version of ShellCheck