Merge remote-tracking branch 'upstream/master' into add-tensorflow-2
This commit is contained in:
John Ericson
@@ -5,7 +5,7 @@ unpackPhase
|
||||
mkdir -p $out/maven
|
||||
cp -r $name/* $out/maven
|
||||
|
||||
makeWrapper $out/maven/bin/mvn $out/bin/mvn --set JAVA_HOME "$jdk"
|
||||
makeWrapper $out/maven/bin/mvn $out/bin/mvn --set-default JAVA_HOME "$jdk"
|
||||
|
||||
# Add the maven-axis and JIRA plugin by default when using maven 1.x
|
||||
if [ -e $out/maven/bin/maven ]
|
||||
|
||||
@@ -25,11 +25,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
sha256 = "1fvc7lakdczim1i99hrwhwx2w75afd3q9fgbhrx7i3pnav3a6kbj";
|
||||
sha256 = "0ijz9lxralyw18r5ra2h79jnafk5521ncr3knaip74cqa28csw9k";
|
||||
};
|
||||
|
||||
# Update with `eval $(nix-build -A bazel.updater)`,
|
||||
@@ -51,9 +51,9 @@ let
|
||||
(if stdenv.hostPlatform.isDarwin
|
||||
then srcs."java_tools_javac11_darwin-v7.0.zip"
|
||||
else srcs."java_tools_javac11_linux-v7.0.zip")
|
||||
srcs."coverage_output_generator-v2.0.zip"
|
||||
srcs."coverage_output_generator-v2.1.zip"
|
||||
srcs.build_bazel_rules_nodejs
|
||||
srcs."android_tools_pkg-0.12.tar.gz"
|
||||
srcs."android_tools_pkg-0.13.tar.gz"
|
||||
srcs."0.28.3.tar.gz"
|
||||
srcs.rules_pkg
|
||||
srcs.rules_cc
|
||||
@@ -106,6 +106,7 @@ let
|
||||
# and libraries path.
|
||||
# We prefetch it, patch it, and override it in a global bazelrc.
|
||||
system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
|
||||
arch = stdenv.hostPlatform.parsed.cpu.name;
|
||||
|
||||
remote_java_tools = stdenv.mkDerivation {
|
||||
name = "remote_java_tools_${system}";
|
||||
@@ -326,6 +327,14 @@ stdenv.mkDerivation rec {
|
||||
postPatch = let
|
||||
|
||||
darwinPatches = ''
|
||||
bazelLinkFlags () {
|
||||
eval set -- "$NIX_LDFLAGS"
|
||||
local flag
|
||||
for flag in "$@"; do
|
||||
printf ' -Wl,%s' "$flag"
|
||||
done
|
||||
}
|
||||
|
||||
# Disable Bazel's Xcode toolchain detection which would configure compilers
|
||||
# and linkers from Xcode instead of from PATH
|
||||
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
|
||||
@@ -335,14 +344,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Framework search paths aren't added by bintools hook
|
||||
# https://github.com/NixOS/nixpkgs/pull/41914
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
|
||||
export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
|
||||
|
||||
# libcxx includes aren't added by libcxx hook
|
||||
# https://github.com/NixOS/nixpkgs/pull/41589
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
|
||||
|
||||
# don't use system installed Xcode to run clang, use Nix clang instead
|
||||
sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
|
||||
sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
|
||||
scripts/bootstrap/compile.sh \
|
||||
src/tools/xcode/realpath/BUILD \
|
||||
src/tools/xcode/stdredirect/BUILD \
|
||||
@@ -485,9 +494,11 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/bin
|
||||
|
||||
# official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
|
||||
# if it can’t find something in tools, it calls $out/bin/bazel-real
|
||||
# if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch}
|
||||
# The binary _must_ exist with this naming if your project contains a .bazelversion
|
||||
# file.
|
||||
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
|
||||
mv ./bazel_src/output/bazel $out/bin/bazel-real
|
||||
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
|
||||
|
||||
# shell completion files
|
||||
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
|
||||
@@ -526,7 +537,7 @@ stdenv.mkDerivation rec {
|
||||
exec "$BAZEL_REAL" "$@"
|
||||
EOF
|
||||
|
||||
# second call succeeds because it defers to $out/bin/bazel-real
|
||||
# second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch}
|
||||
hello_test
|
||||
'';
|
||||
|
||||
|
||||
@@ -55,11 +55,11 @@
|
||||
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
|
||||
]
|
||||
},
|
||||
"android_tools_pkg-0.12.tar.gz": {
|
||||
"name": "android_tools_pkg-0.12.tar.gz",
|
||||
"sha256": "96c4eef4d195dd95e43a4259cf5b82a1e34f67333439e91955bbdc0e1c8e7a31",
|
||||
"android_tools_pkg-0.13.tar.gz": {
|
||||
"name": "android_tools_pkg-0.13.tar.gz",
|
||||
"sha256": "3ca6a5e6576a9cda7c59f5fd33b1fe096725730712057c5893589ac15b019407",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.12.tar.gz"
|
||||
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.13.tar.gz"
|
||||
]
|
||||
},
|
||||
"bazel_j2objc": {
|
||||
@@ -115,11 +115,11 @@
|
||||
"https://github.com/google/googletest/archive/release-1.10.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"coverage_output_generator-v2.0.zip": {
|
||||
"name": "coverage_output_generator-v2.0.zip",
|
||||
"sha256": "3a6951051272d51613ac4c77af6ce238a3db321bf06506fde1b8866eb18a89dd",
|
||||
"coverage_output_generator-v2.1.zip": {
|
||||
"name": "coverage_output_generator-v2.1.zip",
|
||||
"sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.0.zip"
|
||||
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.zip"
|
||||
]
|
||||
},
|
||||
"desugar_jdk_libs": {
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildBazelPackage rec {
|
||||
name = "bazel-remote-${version}";
|
||||
version = "2020-01-29";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buchgr";
|
||||
repo = "bazel-remote";
|
||||
rev = "ae9378321552dd14066332f8fa55076040228cb7";
|
||||
sha256 = "1jbd319n255cmmncnjfdkdcpx0x62asp3dqwgl6vimx4dqqj8v1p";
|
||||
rev = "v${version}";
|
||||
sha256 = "1fpdw139d5q1377qnqbgkahmdr4mdaa17d2m10wkyvyvijwm4r2m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go git ];
|
||||
@@ -64,7 +64,7 @@ buildBazelPackage rec {
|
||||
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
|
||||
'';
|
||||
|
||||
sha256 = "1n66hg1w5jv2rc8q4sjlaf0agvxr713aa40mbkhgjv57x9j7bgn0";
|
||||
sha256 = "141kw2zpr612xdcrg6x9kslg4d5b3fbpzx0vgp3lqwdihfj3sc1l";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
||||
@@ -1,25 +1,29 @@
|
||||
{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "bazel-buildtools";
|
||||
version = "0.29.0";
|
||||
rev = "5bcc31df55ec1de770cb52887f2e989e7068301f";
|
||||
version = "1.0.0";
|
||||
|
||||
goPackagePath = "github.com/bazelbuild/buildtools";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/bazelbuild/buildtools";
|
||||
sha256 = "0p2kgyawh3l46h7dzglqh9c7i16zr5mhmqlhy7qvr4skwif1l089";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "buildtools";
|
||||
rev = version;
|
||||
sha256 = "1rgz1bpg2db6z4q04z061h5b9qjk8padi71xyjcwqfchwqpl7hiv";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
excludedPackages = [ "generatetables" ];
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps.";
|
||||
homepage = https://github.com/bazelbuild/buildtools;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ elasticdog uri-canva ];
|
||||
maintainers = with maintainers; [ elasticdog uri-canva marsam ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/golang/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b";
|
||||
sha256 = "0chbdc4q55z7myiwnbvhryc5ihf6cxh8p4w3c1imy2gyzjn9sf4r";
|
||||
rev = "d23c5127dc24889085f8ccea5c9d560a57a879d8";
|
||||
sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1";
|
||||
};
|
||||
}
|
||||
{
|
||||
@@ -14,8 +13,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/google/starlark-go";
|
||||
rev = "988906f77f657477aa7ebf4d8fb5f12d6c50b767";
|
||||
sha256 = "0ivmbcq3avaxj8ixbc60h706d6wk9wi2mnsid6a483ia4yn7w9k8";
|
||||
rev = "6677ee5c7211380ec7e6a1b50dc45287e40ca9e1";
|
||||
sha256 = "1dl8q1lwvmm38w2lzfwray2djdcq40z89yy6vzy387w0xrax0jj0";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, python }:
|
||||
{ stdenv, fetchFromGitHub, cmake, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bear";
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ python ]; # just for shebang of bin/bear
|
||||
buildInputs = [ python3 ]; # just for shebang of bin/bear
|
||||
|
||||
doCheck = false; # all fail
|
||||
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bmake";
|
||||
version = "20181221";
|
||||
version = "20200212";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
|
||||
sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
|
||||
sha256 = "134ibplk5rj7s3ig2czbhqs89l45jl6vswg3cy6xzm0anz5smhb2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ getopt ];
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
--replace '"-framework CoreServices"' '""'
|
||||
'';
|
||||
|
||||
buildInputs = [ curl expat zlib bzip2 ]
|
||||
buildInputs = [ setupHook curl expat zlib bzip2 ]
|
||||
++ optional useNcurses ncurses
|
||||
++ optional useQt4 qt4;
|
||||
|
||||
@@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
preConfigure = with stdenv; ''
|
||||
source $setupHook
|
||||
fixCmakeFiles .
|
||||
substituteInPlace Modules/Platform/UnixPaths.cmake \
|
||||
--subst-var-by libc_bin ${getBin cc.libc} \
|
||||
@@ -82,7 +81,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://cmake.org;
|
||||
description = "Cross-Platform Makefile Generator";
|
||||
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
maintainers = with stdenv.lib.maintainers; [ xfix ];
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
|
||||
+ lib.optionalString useNcurses "-cursesUI"
|
||||
+ lib.optionalString withQt5 "-qt5UI"
|
||||
+ lib.optionalString useQt4 "-qt4UI";
|
||||
version = "3.16.3";
|
||||
version = "3.16.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
|
||||
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
|
||||
sha256 = "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5";
|
||||
sha256 = "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = false; # fails
|
||||
|
||||
meta = with lib; {
|
||||
homepage = http://www.cmake.org/;
|
||||
homepage = "http://www.cmake.org/";
|
||||
description = "Cross-Platform Makefile Generator";
|
||||
platforms = if useQt4 then qt4.meta.platforms else platforms.all;
|
||||
maintainers = with maintainers; [ ttuegel lnl7 ];
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
{ lib, python3, git, pkgconfig }:
|
||||
|
||||
# Note:
|
||||
# Conan has specific dependency demanands; check
|
||||
# https://github.com/conan-io/conan/blob/master/conans/requirements.txt
|
||||
# https://github.com/conan-io/conan/blob/master/conans/requirements_server.txt
|
||||
# on the release branch/commit we're packaging.
|
||||
#
|
||||
# Two approaches are used here to deal with that:
|
||||
# Pinning the specific versions it wants in `newPython`,
|
||||
# and using `substituteInPlace conans/requirements.txt ...`
|
||||
# in `postPatch` to allow newer versions when we know
|
||||
# (e.g. from changelogs) that they are compatible.
|
||||
|
||||
let newPython = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
distro = super.distro.overridePythonAttrs (oldAttrs: rec {
|
||||
@@ -16,20 +28,6 @@ let newPython = python3.override {
|
||||
sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
|
||||
};
|
||||
});
|
||||
future = super.future.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.16.0";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
|
||||
};
|
||||
});
|
||||
tqdm = super.tqdm.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "4.28.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "1fyybgbmlr8ms32j7h76hz5g9xc6nf0644mwhc40a0s5k14makav";
|
||||
};
|
||||
});
|
||||
pluginbase = super.pluginbase.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.7";
|
||||
src = oldAttrs.src.override {
|
||||
@@ -41,18 +39,34 @@ let newPython = python3.override {
|
||||
};
|
||||
|
||||
in newPython.pkgs.buildPythonApplication rec {
|
||||
version = "1.12.3";
|
||||
version = "1.23.0";
|
||||
pname = "conan";
|
||||
|
||||
src = newPython.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1cnfy9b57apps4bfai6r67g0mrvgnqa154z9idv0kf93k1nvx53g";
|
||||
sha256 = "06jnmgvzdyxjpcmyj1804mlq6b842jvvbsngsamdy976sqws870g";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with newPython.pkgs; [
|
||||
colorama deprecation distro fasteners bottle
|
||||
future node-semver patch pygments pluginbase
|
||||
pyjwt pylint pyyaml requests six tqdm
|
||||
bottle
|
||||
colorama
|
||||
dateutil
|
||||
deprecation
|
||||
distro
|
||||
fasteners
|
||||
future
|
||||
jinja2
|
||||
node-semver
|
||||
patch-ng
|
||||
pluginbase
|
||||
pygments
|
||||
pyjwt
|
||||
pylint # Not in `requirements.txt` but used in hooks, see https://github.com/conan-io/conan/pull/6152
|
||||
pyyaml
|
||||
requests
|
||||
six
|
||||
tqdm
|
||||
urllib3
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
@@ -68,15 +82,13 @@ in newPython.pkgs.buildPythonApplication rec {
|
||||
webtest
|
||||
]);
|
||||
|
||||
checkPhase = ''
|
||||
export HOME=$TMPDIR
|
||||
pytest conans/test/{utils,unittests} \
|
||||
-k 'not SVN and not ToolsNetTest'
|
||||
'';
|
||||
# Conan 1.14.0 has removed all tests from the Pypi source dist:
|
||||
# https://github.com/conan-io/conan/pull/4713
|
||||
# We have recommended they be added back:
|
||||
# https://github.com/conan-io/conan/issues/4563#issuecomment-602225083
|
||||
doCheck = false;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace conans/requirements_server.txt \
|
||||
--replace "pluginbase>=0.5, < 1.0" "pluginbase>=0.5"
|
||||
substituteInPlace conans/requirements.txt \
|
||||
--replace "PyYAML>=3.11, <3.14.0" "PyYAML"
|
||||
'';
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, writeTextDir
|
||||
, substituteAll
|
||||
@@ -20,11 +19,11 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "meson";
|
||||
version = "0.52.1";
|
||||
version = "0.53.2";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan";
|
||||
sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8=";
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
@@ -62,14 +61,6 @@ python3Packages.buildPythonApplication rec {
|
||||
src = ./fix-rpath.patch;
|
||||
inherit (builtins) storeDir;
|
||||
})
|
||||
|
||||
# Fix detecting incorrect compiler in the store path hash.
|
||||
# https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964
|
||||
# https://github.com/mesonbuild/meson/pull/6185
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
|
||||
sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
|
||||
})
|
||||
];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
@@ -107,7 +98,7 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = https://mesonbuild.com;
|
||||
description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mbe rasendubi ];
|
||||
maintainers = with maintainers; [ jtojnar mbe rasendubi ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
|
||||
sha256 = "0pdyv3bk2d50gqqd9h4a2i4yym4k01p7qkwhzz2mxa18f64777s9";
|
||||
sha256 = "1blar5dxhmxlwxhmq8wv0xvhy200qks6xj12n54qx9d5qp300ncw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.lihaoyi.com/mill;
|
||||
homepage = "https://www.lihaoyi.com/mill";
|
||||
license = licenses.mit;
|
||||
description = "A build tool for Scala, Java and more";
|
||||
longDescription = ''
|
||||
|
||||
@@ -4,31 +4,15 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ninja";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ninja-build";
|
||||
repo = "ninja";
|
||||
rev = "v${version}";
|
||||
sha256 = "1q0nld3g0d210zmdjyjzjz2xb2bw1s58gj6zsx7p8q30yh0wg610";
|
||||
sha256 = "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Make builds reproducible by generating the same IDs from the same inputs.
|
||||
(fetchpatch {
|
||||
name = "consistent-doc-ids";
|
||||
url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch";
|
||||
sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9";
|
||||
})
|
||||
# https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs?
|
||||
#
|
||||
(fetchpatch {
|
||||
name = "fix-issue-1510.patch";
|
||||
url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch;
|
||||
sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ];
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
{ pythonPackages, isPy3k, pkgs }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "beautifulsoup-3.2.1";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
|
||||
sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
|
||||
};
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.crummy.com/software/BeautifulSoup/;
|
||||
license = "bsd";
|
||||
description = "Undemanding HTML/XML parser";
|
||||
};
|
||||
}
|
||||
@@ -1,27 +1,16 @@
|
||||
{ stdenv, lib, python27, fetchFromGitHub, mkdocs, which, findutils, coreutils
|
||||
{ stdenv, lib, python3, fetchFromGitHub, mkdocs, which, findutils, coreutils
|
||||
, perl
|
||||
, doCheck ? true
|
||||
}: let
|
||||
|
||||
# copy from
|
||||
# pkgs/applications/networking/pyload/beautifulsoup.nix
|
||||
beautifulsoup = python27.pkgs.callPackage ./beautifulsoup.nix {
|
||||
pythonPackages = python27.pkgs;
|
||||
};
|
||||
|
||||
mkdocs-exclude = python27.pkgs.callPackage ./mkdocs-exclude.nix {
|
||||
pythonPackages = python27.pkgs;
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
}: stdenv.mkDerivation rec {
|
||||
|
||||
pname = "redo-apenwarr";
|
||||
version = "0.42";
|
||||
version = "0.42a";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "apenwarr";
|
||||
repo = "redo";
|
||||
rev = "${repo}-${version}";
|
||||
sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm";
|
||||
sha256 = "172z2idslhcqibd4lw82k6349nl5fdda2vj10dqcjz0lvv6n7php";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -60,10 +49,8 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python27
|
||||
beautifulsoup
|
||||
mkdocs
|
||||
mkdocs-exclude
|
||||
python3
|
||||
(with python3.pkgs; [ beautifulsoup4 markdown ])
|
||||
which
|
||||
findutils
|
||||
];
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
{ pythonPackages, isPy3k, pkgs }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "mkdocs-exclude";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "apenwarr";
|
||||
repo = "mkdocs-exclude";
|
||||
rev = "fdd67d2685ff706de126e99daeaaaf3f6f7cf3ae";
|
||||
sha256 = "1phhl79xf4xq8w2sb2w5zm4bahcr33gsbxkz7dl1dws4qhcbxrfd";
|
||||
};
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
mkdocs
|
||||
];
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "samurai";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelforney";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1jsxfpwa6q893x18qlvpsiym29rrw5cj0k805wgmk2n57j9rw4f2";
|
||||
};
|
||||
|
||||
makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "ninja-compatible build tool written in C";
|
||||
homepage = "https://github.com/michaelforney/samurai";
|
||||
license = with licenses; [ mit asl20 ]; # see LICENSE
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
python waf-light build${wafToolsArg}
|
||||
'';
|
||||
installPhase = ''
|
||||
install waf $out
|
||||
install -D waf $out/bin/waf
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -3,7 +3,7 @@ wafConfigurePhase() {
|
||||
|
||||
if ! [ -f "${wafPath:=./waf}" ]; then
|
||||
echo "copying waf to $wafPath..."
|
||||
cp @waf@ "$wafPath"
|
||||
cp @waf@/bin/waf "$wafPath"
|
||||
fi
|
||||
|
||||
if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then
|
||||
|
||||
Reference in New Issue
Block a user