mirror of
https://github.com/unclechu/gRPC-haskell.git
synced 2025-01-12 20:19:47 +01:00
Remove dead code
We no longer need the additional test packages for the grpc-haskell derivation since we now use test-grpc-haskell to obtain the nix-shell environment.
This commit is contained in:
parent
82070a9b16
commit
b7c0b7552b
1 changed files with 4 additions and 10 deletions
14
release.nix
14
release.nix
|
@ -115,16 +115,9 @@ let
|
||||||
ghc =
|
ghc =
|
||||||
haskellPackagesNew.ghcWithPackages (pkgs: [
|
haskellPackagesNew.ghcWithPackages (pkgs: [
|
||||||
pkgs.grpc-haskell-no-tests
|
pkgs.grpc-haskell-no-tests
|
||||||
# Include some additional packages in this custom ghc for
|
|
||||||
# running tests in the nix-shell environment.
|
|
||||||
pkgs.tasty-quickcheck
|
|
||||||
pkgs.turtle
|
|
||||||
]);
|
]);
|
||||||
|
python =
|
||||||
python = pkgsNew.python.withPackages (pkgs: [
|
pkgsNew.python.withPackages (pkgs: [ pkgs.grpcio-tools ]);
|
||||||
# pkgs.protobuf3_0
|
|
||||||
pkgs.grpcio-tools
|
|
||||||
]);
|
|
||||||
|
|
||||||
in rec {
|
in rec {
|
||||||
configureFlags = (oldDerivation.configureFlags or []) ++ [
|
configureFlags = (oldDerivation.configureFlags or []) ++ [
|
||||||
|
@ -167,7 +160,8 @@ let
|
||||||
# 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
|
||||||
'';
|
'';
|
||||||
})
|
}
|
||||||
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
parameterized = pkgsNew.haskell.lib.appendPatch haskellPackagesOld.parameterized ./nix/parameterized.patch;
|
parameterized = pkgsNew.haskell.lib.appendPatch haskellPackagesOld.parameterized ./nix/parameterized.patch;
|
||||||
|
|
Loading…
Reference in a new issue