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:
Joel Stanley 2021-06-29 10:47:16 -05:00
parent 82070a9b16
commit b7c0b7552b
No known key found for this signature in database
GPG Key ID: F368244CDC80C97F

View File

@ -115,16 +115,9 @@ let
ghc =
haskellPackagesNew.ghcWithPackages (pkgs: [
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 = pkgsNew.python.withPackages (pkgs: [
# pkgs.protobuf3_0
pkgs.grpcio-tools
]);
python =
pkgsNew.python.withPackages (pkgs: [ pkgs.grpcio-tools ]);
in rec {
configureFlags = (oldDerivation.configureFlags or []) ++ [
@ -167,7 +160,8 @@ let
# This lets us use our custom ghc and python environments in the shell.
export PATH=${ghc}/bin:${python}/bin''${PATH:+:}$PATH
'';
})
}
)
);
parameterized = pkgsNew.haskell.lib.appendPatch haskellPackagesOld.parameterized ./nix/parameterized.patch;