eeva/gRPC-haskell
1
0
Fork 0
mirror of https://github.com/unclechu/gRPC-haskell.git synced 2024-11-26 21:19:43 +01:00
Code Issues Projects Releases Wiki Activity

Refactor use of Haskell Nix lib functions

Browse source
This commit is contained in:
Viacheslav Lotsmanov 2022-07-30 05:33:48 +03:00
parent c0c4b2fc29
commit 5df3fdd213
No known key found for this signature in database
GPG key ID: D276FF7467007335
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
release.nix
View file

@ -178,7 +178,7 @@ let
in in
pkgsSelf.lib.pipe (hsSelf.callCabal2nix "grpc-haskell" ./. { }) [ pkgsSelf.lib.pipe (hsSelf.callCabal2nix "grpc-haskell" ./. { }) [
pkgsSelf.haskell.lib.buildFromSdist pkgsSelf.haskell.lib.buildFromSdist
(pkgsSelf.lib.flip pkgsSelf.haskell.lib.overrideCabal override) (pkgsSelf.haskell.lib.compose.overrideCabal override)
pkgsSelf.usesGRPC pkgsSelf.usesGRPC
]; ];
@ -218,13 +218,8 @@ let
}); });
}; };
hsAddPatch = pkgs: patchFile:
pkgs.lib.flip pkgs.haskell.lib.overrideCabal (old: {
patches = (old.patches or [ ]) ++ [ patchFile ];
});
hsMarkUnbroken = pkgs: hsMarkUnbroken = pkgs:
pkgs.lib.flip pkgs.haskell.lib.overrideCabal (old: { broken = false; }); pkgs.haskell.lib.compose.overrideCabal (old: { broken = false; });
# Overrides for Haskell packages this library depends on # Overrides for Haskell packages this library depends on
hsPkgsOverridden = pkgs: hsPkgsOverridden = pkgs:
@ -232,7 +227,7 @@ let
data-diverse = data-diverse =
pkgs.lib.pipe (self.callPackage nix/data-diverse.nix {}) [ pkgs.lib.pipe (self.callPackage nix/data-diverse.nix {}) [
# Patch for GHC 9.x support # Patch for GHC 9.x support
(hsAddPatch pkgs (pkgs.fetchpatch { (pkgs.haskell.lib.compose.appendPatch (pkgs.fetchpatch {
url = "https://github.com/louispan/data-diverse/commit/4033c90c44dab5824f76d64b7128bb6dea2b5dc7.patch"; url = "https://github.com/louispan/data-diverse/commit/4033c90c44dab5824f76d64b7128bb6dea2b5dc7.patch";
sha256 = "sha256-d6bC1Z7uCLtYF3FXGzo3XNdRPQgeAUjL1RW1Tiv7MnM="; sha256 = "sha256-d6bC1Z7uCLtYF3FXGzo3XNdRPQgeAUjL1RW1Tiv7MnM=";
})) }))
@ -243,12 +238,12 @@ let
proto3-wire = proto3-wire =
pkgs.lib.pipe (self.callPackage nix/proto3-wire.nix {}) [ pkgs.lib.pipe (self.callPackage nix/proto3-wire.nix {}) [
(hsAddPatch pkgs nix/proto3-wire.patch) (pkgs.haskell.lib.compose.appendPatch nix/proto3-wire.patch)
]; ];
proto3-suite = proto3-suite =
pkgs.lib.pipe (self.callPackage nix/proto3-suite.nix {}) [ pkgs.lib.pipe (self.callPackage nix/proto3-suite.nix {}) [
(hsAddPatch pkgs nix/proto3-suite.patch) (pkgs.haskell.lib.compose.appendPatch nix/proto3-suite.patch)
pkgs.haskell.lib.dontCheck # 4 out of 74 tests failed pkgs.haskell.lib.dontCheck # 4 out of 74 tests failed
]; ];
}); });