Unverified Commit a53940c6 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

justbuild: 1.5.3 -> 1.6.1 (#425771)

parents 4f3a8e69 9596db00

pkgs/by-name/ju/justbuild/package.nix

+10 −10
Original line number Diff line number Diff line
@@ -33,18 +33,18 @@ let 
in

stdenv.mkDerivation rec {

  pname = "justbuild";

  version = "1.5.3";

  version = "1.6.1";



  src = fetchFromGitHub {

    owner = "just-buildsystem";

    repo = "justbuild";

    rev = "refs/tags/v${version}";

    hash = "sha256-1qVe2s3MCmFm4hAwFwGn1jj6eVcBnvhvuK3OnNEuxQM=";

    hash = "sha256-WtdzrtTqeDN0N50KLry95ijYfCP8xIY+ZSRtVbWLw/g=";

  };



  bazelapi = fetchurl {

    url = "https://github.com/bazelbuild/remote-apis/archive/e1fe21be4c9ae76269a5a63215bb3c72ed9ab3f0.tar.gz";

    hash = "sha256:1zh5i2dx7qkg5dqfihqf2z3v3xx1px6kliah41y95krc6pasn8bl";

    url = "https://github.com/bazelbuild/remote-apis/archive/9ef19c6b5fbf77d6dd9d84d75fbb5a20a6b62ef1.tar.gz";

    hash = "sha256-zPV1ObY0fOsKp+k+5Duf/xrrSW02zAl9qRjEo172WDk=";

  };



  googleapi = fetchurl {
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec { 
    # Using fmt 10 because this is the same version upstream currently

    # uses for bundled builds

    # For future updates: The currently used version can be found in the file

    # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json

    # etc/repos.in.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.in.json

    # under the key .repositories.fmt

    fmt_10

    microsoft-gsl
@@ -89,10 +89,10 @@ stdenv.mkDerivation rec { 
    ''

      sed -i -e 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py

      sed -i -e 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py

      jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf}"' etc/repos.json > etc/repos.json.patched

      mv etc/repos.json.patched etc/repos.json

      jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched

      mv etc/repos.json.patched etc/repos.json

      jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf}"' etc/repos.in.json > etc/repos.in.json.patched

      mv etc/repos.in.json.patched etc/repos.in.json

      jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.in.json > etc/repos.in.json.patched

      mv etc/repos.in.json.patched etc/repos.in.json

      jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched

      mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS

    ''
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec { 
    runHook preBuild



    mkdir .distfiles

    ln -s ${bazelapi} .distfiles/e1fe21be4c9ae76269a5a63215bb3c72ed9ab3f0.tar.gz

    ln -s ${bazelapi} .distfiles/9ef19c6b5fbf77d6dd9d84d75fbb5a20a6b62ef1.tar.gz

    ln -s ${googleapi} .distfiles/fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0.tar.gz



    mkdir .pkgconfig