diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-08-21 20:00:04 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-08-21 20:00:04 +0200 |
| commit | 4788fa95f894d1ae112c3a7f38ffb8974d9e1691 (patch) | |
| tree | 0820e2461fab3cffcde0e5163dd251737656d1d9 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | c4bea4230563296643626a20af0c5e34c83c778a (diff) | |
| download | nixpkgs-4788fa95f894d1ae112c3a7f38ffb8974d9e1691.tar nixpkgs-4788fa95f894d1ae112c3a7f38ffb8974d9e1691.tar.gz nixpkgs-4788fa95f894d1ae112c3a7f38ffb8974d9e1691.tar.bz2 nixpkgs-4788fa95f894d1ae112c3a7f38ffb8974d9e1691.tar.lz nixpkgs-4788fa95f894d1ae112c3a7f38ffb8974d9e1691.tar.xz nixpkgs-4788fa95f894d1ae112c3a7f38ffb8974d9e1691.tar.zst nixpkgs-4788fa95f894d1ae112c3a7f38ffb8974d9e1691.zip | |
haskellPackages.spdx: apply patches for GHC >= 9.4
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8632da15036..554fbb5c0f4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -892,6 +892,22 @@ self: super: { # It does not support aeson 2.0 descriptive = super.descriptive.override { aeson = self.aeson_1_5_6_0; }; + # Apply compatibility patches until a new release arrives + # https://github.com/phadej/spdx/issues/33 + spdx = appendPatches [ + (fetchpatch { + name = "spdx-ghc-9.4.patch"; + url = "https://github.com/phadej/spdx/pull/30/commits/545dc69f433225c837375fba4cbbdb7f9cc7b09b.patch"; + sha256 = "0p2h8dxkjy2v0dx7h6v62clmx5n5j3c4zh4myh926fijympi1glz"; + }) + (fetchpatch { + name = "spdx-ghc-9.6.patch"; + url = "https://github.com/phadej/spdx/pull/32/commits/b51f665e9960614274ff6a9ac658802c1a785687.patch"; + sha256 = "01vf1h0djr84yxsjfhym715ncx0w5q4l02k3dkbmg40pnc62ql4h"; + excludes = [ ".github/**" ]; + }) + ] super.spdx; + # 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2 jwt = dontCheck super.jwt; |