eeva/gRPC-haskell
1
0
Fork 0
mirror of https://github.com/unclechu/gRPC-haskell.git synced 2024-09-30 02:07:25 +02:00
Code Issues Projects Releases Wiki Activity

Refactor Nix configuration: Expose overridden Haskell dependencies

Browse source
This commit is contained in:
Viacheslav Lotsmanov 2022-07-29 02:47:27 +03:00
parent fac34c91b1
commit 8895c38ec6
No known key found for this signature in database
GPG key ID: D276FF7467007335
1 changed files with 135 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

161
release.nix
View file

@ -30,7 +30,7 @@
# ... and then add this line below in the Haskell package overrides section: # ... and then add this line below in the Haskell package overrides section:
# #
# ${package-name} = # ${package-name} =
# haskellPackagesNew.callPackage ./nix/${package-name}.nix { }; # hsPkgsSelf.callPackage ./nix/${package-name}.nix { };
# #
# ... replacing `${package-name}` with the name of the package that you would # ... replacing `${package-name}` with the name of the package that you would
# like to upgrade and `${version}` with the version you want to upgrade to. # like to upgrade and `${version}` with the version you want to upgrade to.
@ -41,7 +41,7 @@
# $ cabal2nix <your private git url>/${package-name}.git > ./nix/${package-name}.nix # $ cabal2nix <your private git url>/${package-name}.git > ./nix/${package-name}.nix
# #
# ...but also be sure to supply `fetchgit = pkgs.fetchgitPrivate` in the # ...but also be sure to supply `fetchgit = pkgs.fetchgitPrivate` in the
# `haskellPackagesNew.callPackage` invocation for your private package. # `hsPkgsSelf.callPackage` invocation for your private package.
# #
# Note that `cabal2nix` also takes an optional `--revision` flag if you want to # Note that `cabal2nix` also takes an optional `--revision` flag if you want to
# pick a revision other than the latest to depend on. # pick a revision other than the latest to depend on.
@ -66,60 +66,31 @@
# };); # };);
let let
overlay = pkgsNew: pkgsOld: { overlay = pkgsSelf: pkgsSuper: {
haskellPackages = pkgsOld.haskellPackages.override { haskellPackages = (hsPkgsOverridden pkgsSuper).extend (hsSelf: hsSuper: {
overrides = haskellPackagesNew: haskellPackagesOld: rec {
data-diverse =
pkgsNew.lib.pipe haskellPackagesOld.data-diverse [
# Patch for GHC 9.x support
(haskellAddPatch pkgsNew (pkgsNew.fetchpatch {
url = "https://github.com/louispan/data-diverse/commit/4033c90c44dab5824f76d64b7128bb6dea2b5dc7.patch";
sha256 = "sha256-d6bC1Z7uCLtYF3FXGzo3XNdRPQgeAUjL1RW1Tiv7MnM=";
}))
(haskellMarkUnbroken pkgsNew)
];
proto3-wire =
pkgsNew.lib.pipe haskellPackagesOld.proto3-wire [
(haskellAddPatch pkgsNew ./nix/proto3-wire.patch)
];
proto3-suite =
pkgsNew.lib.pipe haskellPackagesOld.proto3-suite [
(haskellAddPatch pkgsNew ./nix/proto3-suite.patch)
pkgsNew.haskell.lib.dontCheck # 4 out of 74 tests failed
];
grpc-haskell-core = grpc-haskell-core =
pkgsNew.lib.pipe ( pkgsSelf.lib.pipe (
haskellPackagesNew.callCabal2nix "grpc-haskell-core" ./core { hsSelf.callCabal2nix "grpc-haskell-core" ./core {
gpr = pkgsNew.grpc; gpr = pkgsSelf.grpc;
} }
) [ ) [
pkgsNew.usesGRPC pkgsSelf.usesGRPC
pkgsNew.haskell.lib.buildFromSdist pkgsSelf.haskell.lib.buildFromSdist
]; ];
grpc-haskell-no-tests = grpc-haskell-no-tests =
pkgsNew.lib.pipe ( pkgsSelf.lib.pipe (hsSelf.callCabal2nix "grpc-haskell" ./. { }) [
haskellPackagesNew.callCabal2nix "grpc-haskell" ./. { } pkgsSelf.haskell.lib.dontCheck
) [ pkgsSelf.usesGRPC
pkgsNew.haskell.lib.dontCheck pkgsSelf.haskell.lib.buildFromSdist
pkgsNew.usesGRPC
pkgsNew.haskell.lib.buildFromSdist
]; ];
grpc-haskell = grpc-haskell =
pkgsNew.usesGRPC
(pkgsNew.haskell.lib.overrideCabal
(pkgsNew.haskell.lib.buildFromSdist (haskellPackagesNew.callCabal2nix "grpc-haskell" ./. { }))
(oldDerivation:
let let
ghc = ghc =
haskellPackagesNew.ghcWithPackages (pkgs: [ hsSelf.ghcWithPackages (pkgs: [
pkgs.grpc-haskell-no-tests pkgs.grpc-haskell-no-tests
# Include some additional packages in this custom ghc for # Include some additional packages in this custom ghc for
# running tests in the nix-shell environment. # running tests in the nix-shell environment.
@ -127,36 +98,36 @@ let
pkgs.turtle pkgs.turtle
]); ]);
python = pkgsNew.python.withPackages (pkgs: [ python = pkgsSelf.python.withPackages (pkgs: [
pkgs.grpcio-tools pkgs.grpcio-tools
]); ]);
in { override = old: {
configureFlags = (oldDerivation.configureFlags or []) ++ [ configureFlags = (old.configureFlags or []) ++ [
"--flags=with-examples" "--flags=with-examples"
]; ];
buildDepends = (oldDerivation.buildDepends or [ ]) ++ [ buildDepends = (old.buildDepends or [ ]) ++ [
pkgsNew.makeWrapper pkgsSelf.makeWrapper
# Give our nix-shell its own cabal so we don't pick up one # Give our nix-shell its own cabal so we don't pick up one
# from the user's environment by accident. # from the user's environment by accident.
haskellPackagesNew.cabal-install hsSelf.cabal-install
# And likewise for c2hs # And likewise for c2hs
haskellPackagesNew.c2hs hsSelf.c2hs
]; ];
patches = patches =
(oldDerivation.patches or [ ]) ++ [ ./tests/tests.patch ]; (old.patches or [ ]) ++ [ ./tests/tests.patch ];
postPatch = (oldDerivation.postPatch or "") + '' postPatch = (old.postPatch or "") + ''
patchShebangs tests patchShebangs tests
substituteInPlace tests/simple-client.sh \ substituteInPlace tests/simple-client.sh \
--replace @makeWrapper@ ${pkgsNew.makeWrapper} \ --replace @makeWrapper@ ${pkgsSelf.makeWrapper} \
--replace @grpc@ ${pkgsNew.grpc} --replace @grpc@ ${pkgsSelf.grpc}
substituteInPlace tests/simple-server.sh \ substituteInPlace tests/simple-server.sh \
--replace @makeWrapper@ ${pkgsNew.makeWrapper} \ --replace @makeWrapper@ ${pkgsSelf.makeWrapper} \
--replace @grpc@ ${pkgsNew.grpc} --replace @grpc@ ${pkgsSelf.grpc}
wrapProgram tests/protoc.sh \ wrapProgram tests/protoc.sh \
--prefix PATH : ${python}/bin --prefix PATH : ${python}/bin
wrapProgram tests/test-client.sh \ wrapProgram tests/test-client.sh \
@ -169,25 +140,26 @@ let
--prefix PATH : ${ghc}/bin --prefix PATH : ${ghc}/bin
''; '';
shellHook = (oldDerivation.shellHook or "") + '' shellHook = (old.shellHook or "") + ''
# This lets us use our custom ghc and python environments in the shell. # This lets us use our custom ghc and python environments in the shell.
export PATH=${ghc}/bin:${python}/bin''${PATH:+:}$PATH export PATH=${ghc}/bin:${python}/bin''${PATH:+:}$PATH
''; '';
})
);
};
}; };
in
pkgsSelf.lib.pipe (hsSelf.callCabal2nix "grpc-haskell" ./. { }) [
pkgsSelf.haskell.lib.buildFromSdist
(pkgsSelf.lib.flip pkgsSelf.haskell.lib.overrideCabal override)
pkgsSelf.usesGRPC
];
});
test-grpc-haskell = test-grpc-haskell =
pkgsNew.mkShell { pkgsSelf.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
(pkgsNew.haskellPackages.ghcWithPackages (pkgs: [ (pkgsSelf.haskellPackages.ghcWithPackages (pkgs: [
pkgs.grpc-haskell pkgs.grpc-haskell
] ]))
)
)
]; ];
}; };
@ -196,39 +168,65 @@ let
# grpc-haskell{-,core} code into `ghci` from within `nix-shell` # grpc-haskell{-,core} code into `ghci` from within `nix-shell`
# environments. # environments.
# #
# TODO: We might try using pkgsNew.fixDarwinDylibNames (see PR#129) # TODO: We might try using pkgsSelf.fixDarwinDylibNames (see PR#129)
# instead of setting DYLD_LIBRARY_PATH, but we might still need them # instead of setting DYLD_LIBRARY_PATH, but we might still need them
# around for `ghci` as on Linux. # around for `ghci` as on Linux.
pkgsNew.haskell.lib.overrideCabal haskellPackage (oldAttributes: { pkgsSelf.haskell.lib.overrideCabal haskellPackage (oldAttributes: {
preBuild = (oldAttributes.preBuild or "") + preBuild = (oldAttributes.preBuild or "") +
pkgsNew.lib.optionalString pkgsNew.stdenv.isDarwin '' pkgsSelf.lib.optionalString pkgsSelf.stdenv.isDarwin ''
export DYLD_LIBRARY_PATH=${pkgsNew.grpc}/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH=${pkgsSelf.grpc}/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH
''; '';
shellHook = (oldAttributes.shellHook or "") + shellHook = (oldAttributes.shellHook or "") +
pkgsNew.lib.optionalString pkgsNew.stdenv.isDarwin '' pkgsSelf.lib.optionalString pkgsSelf.stdenv.isDarwin ''
export DYLD_LIBRARY_PATH=${pkgsNew.grpc}/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH=${pkgsSelf.grpc}/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH
'' + '' +
pkgsNew.lib.optionalString pkgsNew.stdenv.isLinux '' pkgsSelf.lib.optionalString pkgsSelf.stdenv.isLinux ''
export LD_LIBRARY_PATH=${pkgsNew.grpc}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${pkgsSelf.grpc}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
''; '';
} });
);
# Fix this error when entering a nix-shell: # Fix this error when entering a nix-shell:
# error: mox-0.7.8 not supported for interpreter python2.7 # error: mox-0.7.8 not supported for interpreter python2.7
python = pkgsNew.python3; python = pkgsSelf.python3;
}; };
haskellAddPatch = pkgs: patchFile: hsAddPatch = pkgs: patchFile:
pkgs.lib.flip pkgs.haskell.lib.overrideCabal (old: { pkgs.lib.flip pkgs.haskell.lib.overrideCabal (old: {
patches = (old.patches or [ ]) ++ [ patchFile ]; patches = (old.patches or [ ]) ++ [ patchFile ];
}); });
haskellMarkUnbroken = pkgs: hsMarkUnbroken = pkgs:
pkgs.lib.flip pkgs.haskell.lib.overrideCabal (old: { broken = false; }); pkgs.lib.flip pkgs.haskell.lib.overrideCabal (old: { broken = false; });
# Overrides for Haskell packages this library depends on
hsPkgsOverridden = pkgs:
pkgs.haskellPackages.extend (self: super: {
data-diverse =
pkgs.lib.pipe super.data-diverse [
# Patch for GHC 9.x support
(hsAddPatch pkgs (pkgs.fetchpatch {
url = "https://github.com/louispan/data-diverse/commit/4033c90c44dab5824f76d64b7128bb6dea2b5dc7.patch";
sha256 = "sha256-d6bC1Z7uCLtYF3FXGzo3XNdRPQgeAUjL1RW1Tiv7MnM=";
}))
# The patch above makes it not to be broken anymore
(hsMarkUnbroken pkgs)
];
proto3-wire =
pkgs.lib.pipe super.proto3-wire [
(hsAddPatch pkgs ./nix/proto3-wire.patch)
];
proto3-suite =
pkgs.lib.pipe super.proto3-suite [
(hsAddPatch pkgs ./nix/proto3-suite.patch)
pkgs.haskell.lib.dontCheck # 4 out of 74 tests failed
];
});
overlays = [ overlay ]; overlays = [ overlay ];
config = { }; config = { };
@ -281,4 +279,7 @@ in
inherit pkgs config overlay shell stack-env; inherit pkgs config overlay shell stack-env;
inherit (pkgs) test-grpc-haskell; inherit (pkgs) test-grpc-haskell;
inherit hsPkgsOverridden; # Function :: nixpkgs -> new haskellPackages
inherit (hsPkgsOverridden (nixpkgs {})) data-diverse proto3-wire proto3-suite;
} }