Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 40c6ede01b5e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0aa4a4535819
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2018

  1. bazel-deps: 2018-08-16 -> 2018-11-01

    @uri-canva
    uri-canva committed Nov 4, 2018
    Copy the full SHA
    71449e7 View commit details

  2. Merge pull request #49738 from uri-canva/fix-bazel-deps 

    bazel-deps: 2018-08-16 -> 2018-11-01
    @Mic92
    Mic92 authored Nov 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0aa4a45 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
9 changes: 5 additions & 4 deletions pkgs/development/tools/build-managers/bazel/bazel-deps/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildBazelPackage rec {
name = "bazel-deps-${version}";
version = "2018-08-16";
version = "2018-11-01";

meta = with stdenv.lib; {
homepage = "https://github.com/johnynek/bazel-deps";
@@ -15,8 +15,8 @@ buildBazelPackage rec {
src = fetchFromGitHub {
owner = "johnynek";
repo = "bazel-deps";
rev = "942a0b03cbf159dd6e0f0f40787d6d8e4e832d81";
sha256 = "0ls2jvz9cxa169a8pbbykv2d4dik4ipf7dj1lkqx5g0ss7lgs6q5";
rev = "1af8921d52f053fad575f26762533a3823b4a847";
sha256 = "0srz0sbz4bq9n7cp4g1n3kd3j6rcjqfi25sq8aa64l27yqzbk53x";
};

bazelTarget = "//src/scala/com/github/johnynek/bazel_deps:parseproject_deploy.jar";
@@ -66,12 +66,13 @@ buildBazelPackage rec {
find . -type d -empty -delete
'';

sha256 = "0jkzf1hay0h8ksk9lhfvdliac6c5d7nih934i1xjbrn6zqlivy19";
sha256 = "1gvl4a9z8p4ch2gmcj3lpp0imrkrvy8wng949p3wlkibi14hc6ww";
};

buildAttrs = {
installPhase = ''
mkdir -p $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps
cp gen_maven_deps.sh $out/bin
wrapProgram "$out/bin/gen_maven_deps.sh" --set JAVA_HOME "${jre}" --prefix PATH : ${lib.makeBinPath [ jre ]}
cp bazel-bin/src/scala/com/github/johnynek/bazel_deps/parseproject_deploy.jar $out/bin/bazel-bin/src/scala/com/github/johnynek/bazel_deps