public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2018-12-16 22:55:06 +01:00
parent 4027966602 eceb2b06a1
commit aead6e12f9
524 changed files with 14889 additions and 12120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/bazel/default.nix
+7 -17
View File
@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
version = "0.18.0";
version = "0.20.0";
meta = with lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "0mbi4n4wp1x73l8qksg4vyh2sba52xh9hfl2m518gv41g0pnvs6h";
sha256 = "1g9hglly5199gcw929fzc5f0d0dwlharkh387h58p1fq9ylayi8r";
};
sourceRoot = ".";
@@ -131,10 +131,10 @@ stdenv.mkDerivation rec {
echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc
echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc
echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc
sed -i -e "378 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
sed -i -e "378 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
sed -i -e "378 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
sed -i -e "378 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
sed -i -e "420 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
sed -i -e "420 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh
sed -i -e "420 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
sed -i -e "420 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh
# --experimental_strict_action_env (which will soon become the
# default, see bazelbuild/bazel#2574) hardcodes the default
@@ -180,16 +180,6 @@ stdenv.mkDerivation rec {
--prepend=scripts/bazel-complete-template.bash
'';
# Build the CPP and Java examples to verify that Bazel works.
doCheck = true;
checkPhase = ''
export TEST_TMPDIR=$(pwd)
./output/bazel test --test_output=errors \
examples/cpp:hello-success_test \
examples/java-native/src/test/java/com/example/myproject:hello
'';
installPhase = ''
mkdir -p $out/bin
@@ -198,7 +188,7 @@ stdenv.mkDerivation rec {
cp scripts/packages/bazel.sh $out/bin/bazel
mv output/bazel $out/bin/bazel-real
wrapProgram "$out/bin/bazel" --set JAVA_HOME "${runJdk}"
wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}"
# shell completion files
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
pkgs/development/tools/build-managers/bloop/default.nix
+5 -3
View File
@@ -2,7 +2,7 @@
let
baseName = "bloop";
version = "1.1.1";
version = "1.1.2";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@@ -16,12 +16,14 @@ let
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "0w2gk9ladkzm3mx3qsmjqjakj94g7s4s3xfzl6yny1h4dg1456n6";
outputHash = "0ki4xh8z31nv42jik998r7gvsxcm0vysx83w0nyvbhi18cah1qh6";
};
in
stdenv.mkDerivation rec {
name = "${baseName}-${version}";
nailgunCommit = "6992a3bf";
# Fetched from https://github.com/scalacenter/bloop/releases/download/v${version}/install.py
nailgunCommit = "dc1dd806";
buildInputs = [ jdk makeWrapper deps ];
pkgs/development/tools/build-managers/gn/default.nix
+3 -3
View File
@@ -2,8 +2,8 @@
, git, ninja, python }:
let
rev = "106b823805adcc043b2bfe5bc21d58f160a28a7b";
sha256 = "1a5s6i07s8l4f1bakh3fyaym00xz7zgd49sp6awm10xb7yjh95ba";
rev = "96ff462cddf35f98e25fd5d098fc27bc81eab94a";
sha256 = "1ny23sprl7ygb2lpdnqxv60m8kaf4h2dmpqjp61l5vc2s7f32g97";
shortRev = builtins.substring 0 7 rev;
lastCommitPosition = writeText "last_commit_position.h" ''
@@ -18,7 +18,7 @@ let
in
stdenv.mkDerivation rec {
name = "gn-${version}";
version = "20180830";
version = "20181031";
src = fetchgit {
url = "https://gn.googlesource.com/gn";
pkgs/development/tools/build-managers/redo/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "redo-1.3";
name = "redo-1.4";
src = fetchurl {
url = "https://jdebp.eu./Repository/freebsd/${name}.tar.gz";
sha256 = "1yx7nd59s01j096hr1zbnbx6mvd6ljzd4vgawh7p2l644jgwj70r";
sha256 = "1c8gr5h77v4fw78zkhbm9z9adqs3kd7xvxwnmci2zvlf4bqqk4jv";
};
nativeBuildInputs = [ perl /* for pod2man */ ];
pkgs/development/tools/build-managers/sbt-extras/default.nix
+3 -3
View File
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk }:
let
rev = "1d8ee2c0a75374afa1cb687f450aeb095180882b";
version = "2018-09-27";
rev = "33b1a535656222810572d36d10afc5711515958e";
version = "2018-12-04";
in
stdenv.mkDerivation {
name = "sbt-extras-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "paulp";
repo = "sbt-extras";
inherit rev;
sha256 = "1a6k1lcpd9sknzyx6niq56z1b90mz7br7y13yk98w06r7fmfchw5";
sha256 = "0195b47a6agzs750il1lirm2rhlz55f59sb8mdi6573fnj6f23d3";
};
dontBuild = true;