From b7c0b7552b07072618c3c6a8f471068217a7a18c Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 29 Jun 2021 10:47:16 -0500 Subject: [PATCH] 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. --- release.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/release.nix b/release.nix index 76dde9e..bb8f72c 100644 --- a/release.nix +++ b/release.nix @@ -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;