Skip to content

Commit

Permalink
Revert "dev-env: remove gradle (#2738)"
Browse files Browse the repository at this point in the history
This reverts commit daf15e6.
  • Loading branch information
leo-da authored Sep 4, 2019
1 parent daf15e6 commit a572143
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ghc-bindist
ensime.sbt
pipelinePerformance.xml
**/database_test.manifest
.gradle/
.ghci
.ghcid
*.log
Expand Down Expand Up @@ -88,4 +89,4 @@ daml-lf/project
daml-lf/gen
daml-lf/build.sbt
.markdown-preview.html
compiler/damlc/output
compiler/damlc/output
1 change: 1 addition & 0 deletions dev-env/bin/gradle
2 changes: 2 additions & 0 deletions nix/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ in rec {
scalafmt = pkgs.callPackage ./overrides/scalafmt.nix { jre = jdk; };
dependency-check = (pkgs.callPackage ./tools/dependency-check { });

gradle = pkgs.gradle;

# Nix development
cabal2nix = pkgs.cabal2nix;

Expand Down

0 comments on commit a572143

Please sign in to comment.