Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
61687cbd42
|
|
@ -5,24 +5,27 @@
|
|||
, glib
|
||||
, gobject-introspection
|
||||
, graphene
|
||||
, gst_all_1
|
||||
, gtk4
|
||||
, lib
|
||||
, libadwaita
|
||||
, libcanberra-gtk3
|
||||
, pango
|
||||
, pkg-config
|
||||
, sound-theme-freedesktop
|
||||
, withLibadwaita ? false
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gtkcord4";
|
||||
version = "0.0.6";
|
||||
version = "0.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diamondburned";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uEG1pAHMQT+C/E5rKByflvL0NNkC8SeSPMAXanzvhE4=";
|
||||
hash = "sha256-aJRVk9KFCJbIFInkg5BCJ6ygBlDCFF53WXO9qyACFus=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -38,6 +41,14 @@ buildGoModule rec {
|
|||
graphene
|
||||
gtk4
|
||||
pango
|
||||
# Optional according to upstream but required for sound and video
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gstreamer
|
||||
libcanberra-gtk3
|
||||
sound-theme-freedesktop
|
||||
] ++ lib.optionals withLibadwaita [
|
||||
libadwaita
|
||||
];
|
||||
|
|
@ -45,12 +56,12 @@ buildGoModule rec {
|
|||
tags = lib.optionals withLibadwaita [ "libadwaita" ];
|
||||
|
||||
postInstall = ''
|
||||
install -D -m 444 -t $out/share/applications .nix/com.github.diamondburned.gtkcord4.desktop
|
||||
install -D -m 444 -t $out/share/applications nix/xyz.diamondb.gtkcord4.desktop
|
||||
install -D -m 444 internal/icons/svg/logo.svg $out/share/icons/hicolor/scalable/apps/gtkcord4.svg
|
||||
install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-QZSjSk1xu5ZcrNEra5TxnUVvlQWb5/h31fm5Nc7WMoI=";
|
||||
vendorHash = "sha256-usnlaOqyMd8rdnFpuCqfaCES8bPaB+NbdL4pFybKJbM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "GTK4 Discord client in Go, attempt #4.";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "emptty";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tvrzna";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iT7wdxHC+/3fvBbSrHHuqNYWiqwL48NYzFmtmgVaFik=";
|
||||
hash = "sha256-CbTPJgnKMWMXdG6Hr8xT9ae4Q9MxAfhITn5WSCzCmI4=";
|
||||
};
|
||||
|
||||
buildInputs = [ pam libX11 ];
|
||||
|
|
|
|||
|
|
@ -13149,6 +13149,18 @@ final: prev:
|
|||
meta.homepage = "https://github.com/mg979/vim-visual-multi/";
|
||||
};
|
||||
|
||||
vim-visual-star-search = buildVimPluginFrom2Nix {
|
||||
pname = "vim-visual-star-search";
|
||||
version = "2021-07-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bronson";
|
||||
repo = "vim-visual-star-search";
|
||||
rev = "7c32edb9e3c85d473d9be4dec721a4c9d5d4d69c";
|
||||
sha256 = "1g3n84bwvy2535n8xwh14j3s8n1jwvl577vigg8zsxxvhjzl878b";
|
||||
};
|
||||
meta.homepage = "https://github.com/bronson/vim-visual-star-search/";
|
||||
};
|
||||
|
||||
vim-visualstar = buildVimPluginFrom2Nix {
|
||||
pname = "vim-visualstar";
|
||||
version = "2015-08-27";
|
||||
|
|
|
|||
|
|
@ -1104,6 +1104,7 @@ https://github.com/hashivim/vim-vagrant/,,
|
|||
https://github.com/tpope/vim-vinegar/,,
|
||||
https://github.com/triglav/vim-visual-increment/,,
|
||||
https://github.com/mg979/vim-visual-multi/,,
|
||||
https://github.com/bronson/vim-visual-star-search/,HEAD,
|
||||
https://github.com/thinca/vim-visualstar/,,
|
||||
https://github.com/ngemily/vim-vp4/,HEAD,
|
||||
https://github.com/hrsh7th/vim-vsnip/,,
|
||||
|
|
|
|||
|
|
@ -38,9 +38,13 @@ in pythonPackages.buildPythonApplication rec {
|
|||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coursera-dl/coursera-dl/pull/789.patch";
|
||||
url = "https://github.com/coursera-dl/coursera-dl/commit/c8796e567698be166cb15f54e095140c1a9b567e.patch";
|
||||
sha256 = "sha256:07ca6zdyw3ypv7yzfv2kzmjvv86h0rwzllcg0zky27qppqz917bv";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coursera-dl/coursera-dl/commit/6c221706ba828285ca7a30a08708e63e3891b36f.patch";
|
||||
sha256 = "sha256-/AKFvBPInSq/lsz+G0jVSl/ukVgCnt66oePAb+66AjI=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -7,16 +7,7 @@
|
|||
, zbar
|
||||
, secp256k1
|
||||
, enableQt ? true
|
||||
# for updater.nix
|
||||
, writeScript
|
||||
, common-updater-scripts
|
||||
, bash
|
||||
, coreutils
|
||||
, curl
|
||||
, gnugrep
|
||||
, gnupg
|
||||
, gnused
|
||||
, nix
|
||||
, callPackage
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -125,20 +116,7 @@ python3.pkgs.buildPythonApplication {
|
|||
$out/bin/electrum help >/dev/null
|
||||
'';
|
||||
|
||||
passthru.updateScript = import ./update.nix {
|
||||
inherit lib;
|
||||
inherit
|
||||
writeScript
|
||||
common-updater-scripts
|
||||
bash
|
||||
coreutils
|
||||
curl
|
||||
gnupg
|
||||
gnugrep
|
||||
gnused
|
||||
nix
|
||||
;
|
||||
};
|
||||
passthru.updateScript = callPackage ./update.nix { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight Bitcoin wallet";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "fluidd";
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchurl {
|
||||
name = "fluidd-v${version}.zip";
|
||||
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
|
||||
sha256 = "sha256-SAyR7SeMFh2twLr8QqKzALlMFLv/oAfySN5+cSNALis=";
|
||||
sha256 = "sha256-ewffAfB9Lsac6ivHxI1obAxByk5wNNJjqrYmYL2xCr4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.59";
|
||||
version = "0.8.60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-uvvxlU5c5MNYVqu0btL4xpjyvb/fDbFPGWkIzru84Z8=";
|
||||
sha256 = "sha256-kyWUokQl5n7ko/1pdNs15WxRAAfe8KioYpkTMcLhJjU=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
}:
|
||||
|
||||
let
|
||||
openShiftVersion = "4.11.18";
|
||||
openShiftVersion = "4.12.0";
|
||||
okdVersion = "4.11.0-0.okd-2022-11-05-030711";
|
||||
podmanVersion = "4.2.0";
|
||||
podmanVersion = "4.3.1";
|
||||
writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
|
||||
in
|
||||
buildGoModule rec {
|
||||
version = "2.12.0";
|
||||
version = "2.13.1";
|
||||
pname = "crc";
|
||||
gitCommit = "ea98bb41e24ad81a319d0aa6c6e1286bc1334c1b";
|
||||
gitCommit = "b5b864fdd4ed047027f439db96c2658aa194d2bc";
|
||||
modRoot = "cmd/crc";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
||||
|
||||
let
|
||||
version = "0.38.3";
|
||||
sha256 = "15sx743gbmlmww7jmi56r5nlajg33xmzacyd69hmp46jjxqdckmh";
|
||||
manifestsSha256 = "1dmp7gdnwbg4jjc3dq1wp2jn3z3g6lm296b1nf24ndcfmjja58cz";
|
||||
version = "0.39.0";
|
||||
sha256 = "1mxzafv4p6n2r62nsr4py74z8jw42hm6ypm9kkfw3bfz5db7xhav";
|
||||
manifestsSha256 = "0wri6xzd603ll7ncn4af4xv5px1yg91m133m0dlrrzrb3izgiky0";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
|
|
@ -23,7 +23,7 @@ in buildGoModule rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-IuOivH9K7e5vNpK44NKegzIEVHS+ihkX89++4DJC+8Q=";
|
||||
vendorSha256 = "sha256-IyWXCunOCVDV/OHf3py/g0UbIByYhnIHDlEDxIkBLZI=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
|
|
|||
|
|
@ -1,4 +1,24 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, eigen, opencv, cgal, ceres-solver, boost, vcg, glfw, zstd }:
|
||||
{ lib
|
||||
, boost
|
||||
, breakpad
|
||||
, ceres-solver
|
||||
, cgal
|
||||
, cmake
|
||||
, eigen
|
||||
, fetchFromGitHub
|
||||
, glfw
|
||||
, gmp
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, mpfr
|
||||
, opencv
|
||||
, openmp
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, vcg
|
||||
, zstd
|
||||
}:
|
||||
|
||||
let
|
||||
boostWithZstd = boost.overrideAttrs (old: {
|
||||
|
|
@ -20,10 +40,38 @@ stdenv.mkDerivation rec {
|
|||
# SSE is enabled by default
|
||||
cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF";
|
||||
|
||||
buildInputs = [ eigen opencv cgal ceres-solver vcg glfw boostWithZstd ];
|
||||
buildInputs = [
|
||||
boostWithZstd
|
||||
breakpad
|
||||
ceres-solver
|
||||
cgal
|
||||
eigen
|
||||
glfw
|
||||
gmp
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
mpfr
|
||||
opencv
|
||||
openmp
|
||||
vcg
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/OpenMVS/* $out/bin
|
||||
rmdir $out/bin/OpenMVS
|
||||
rm $out/bin/Tests
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
ctest
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open Multi-View Stereo reconstruction library";
|
||||
homepage = "https://github.com/cdcseacave/openMVS";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "tela-icon-theme";
|
||||
version = "2022-08-28";
|
||||
version = "2023-02-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-SW4MNvtrHpJm6yiS9k11XzzzGSMXdZ71cnvASK1dzno=";
|
||||
sha256 = "sha256-W3gGn4ioTg/iOWTa5hfwx6FWzpFilpG8IXwaO5/YAvk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 jdupes ];
|
||||
|
|
|
|||
|
|
@ -6,19 +6,19 @@
|
|||
, kwin
|
||||
, kdelibs4support
|
||||
, libepoxy
|
||||
, libXdmcp
|
||||
, libxcb
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kde-rounded-corners";
|
||||
version = "unstable-2022-09-17";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matinlotfali";
|
||||
repo = "KDE-Rounded-Corners";
|
||||
rev = "cdf7460d957e82dfd571cf0f2a20fd9553ac4c2e";
|
||||
hash = "sha256-ubocO0Vr3g5kIuGNV6vH+ySP42gFps9gPi5d3EpQVFY=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5b23QCyjPMC6iba84Y2WEar5uXzxg2GonRv3e4mLQlQ=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
|
||||
buildInputs = [ kwin kdelibs4support libepoxy libXdmcp ];
|
||||
buildInputs = [ kwin kdelibs4support libepoxy libxcb ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rounds the corners of your windows";
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "catch2";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catchorg";
|
||||
repo = "Catch2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-f/tM8b2JGZw2OzhlhMvjzLjgvgj5qncEepYsEwSxeAI=";
|
||||
hash = "sha256-JVxBYhKTejc8lfqgxz5Ig5G9H90YuIcGAUopGJG/3Dg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "sope";
|
||||
version = "5.7.0";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inverse-inc";
|
||||
repo = pname;
|
||||
rev = "SOPE-${version}";
|
||||
sha256 = "sha256-mS685NOB6IN3a5tE3yr+VUq55Ouc5af9aJ2wTfGsAlo=";
|
||||
hash = "sha256-sXIpKdJ5930+W+FsxQ8DZOq/49XWMM1zV8dIzbQdcbc=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.199";
|
||||
version = "0.6.202";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6sEgxUDKKAFWxWQqTb8hLt+vqlkD/9f5zdj9rh3sDLM=";
|
||||
sha256 = "sha256-H16CNJ8ztcwGDoH4dZ66/HbpNVEe+pYpKJcFpjW2wCs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hpS8fyyWIw1vkWXyd1OxyorGT5j4bJ5Ey+Hh48QF0p0=";
|
||||
vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
subPackages = [ "." ];
|
||||
|
|
|
|||
|
|
@ -1,28 +1,33 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, colorlog
|
||||
, csvw
|
||||
, python-dateutil
|
||||
, tabulate
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, isPy27
|
||||
, lxml
|
||||
, markdown
|
||||
, markupsafe
|
||||
, mock
|
||||
, postgresql
|
||||
, pytestCheckHook
|
||||
, pylatexenc
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, tabulate
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clldutils";
|
||||
version = "3.9.0";
|
||||
version = "3.19.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clld";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07ljq7v1zvaxyl6xn4a2p4097lgd5j9bz71lf05y5bz8k024mxbr";
|
||||
sha256 = "sha256-dva0lbbTxvETDPkACxpI3PPzWh5gz87Fv6W3lTjNv3Q=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
@ -30,18 +35,23 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
colorlog
|
||||
csvw
|
||||
lxml
|
||||
markdown
|
||||
markupsafe
|
||||
pylatexenc
|
||||
python-dateutil
|
||||
tabulate
|
||||
colorlog
|
||||
attrs
|
||||
csvw
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
postgresql
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
git
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
|
@ -54,6 +64,6 @@ buildPythonPackage rec {
|
|||
description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al";
|
||||
homepage = "https://github.com/clld/clldutils";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ melling ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.5.27";
|
||||
version = "1.5.28";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "fastai";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-LFkjxcotJoHIX0GdKKqUSFF4/HSWc/sLwb34iuBrQIg=";
|
||||
sha256 = "sha256-PSqwpDTzEaBXH77c64yv1s2TvQyIiz6It9cgjnCmrhY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hepunits";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-M7mumot7OvNVFBp0kBy1qlV9zi5MmZKgow7wRDobIgY=";
|
||||
hash = "sha256-sRdLuk1XW5k5wB80HiTZvb4ODNTMTOLn13aS2hkUXPs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,18 +7,19 @@
|
|||
, pytestCheckHook
|
||||
, procps
|
||||
, tmux
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libtmux";
|
||||
version = "0.18.1";
|
||||
version = "0.21.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmux-python";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OhNyJcnxjbyP/Kpt70qLv3ZtZvXXVTWEMcjv/pa50/4=";
|
||||
hash = "sha256-nZPVS3jNz2e2LTlWiSz1fN7MzqJs/CqtAt6UVZaPPTY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -32,14 +33,20 @@ buildPythonPackage rec {
|
|||
nativeCheckInputs = [
|
||||
procps
|
||||
tmux
|
||||
ncurses
|
||||
pytest-rerunfailures
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"tests"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"--ignore=tests/test_test.py"
|
||||
pytestFlagsArray = [ "tests" ];
|
||||
|
||||
disabledTests = [
|
||||
# Fail with: 'no server running on /tmp/tmux-1000/libtmux_test8sorutj1'.
|
||||
"test_new_session_width_height"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.isDarwin [
|
||||
"test_test.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "libtmux" ];
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "particle";
|
||||
version = "0.21.1";
|
||||
version = "0.21.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Mw9IVQoXZU8ByU6OI2Wtmo3PJuVz6KzzH7I+pPYkssQ=";
|
||||
hash = "sha256-BDTTmqtPxyvORSoR+CJzb5WTfF9BFrDoMSVOvO9s/Ns=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i '/pytest-runner/d setup.py
|
||||
sed -i '/pytest-runner/d' setup.py
|
||||
'';
|
||||
|
||||
patches = [
|
||||
|
|
@ -33,7 +33,6 @@ buildPythonPackage rec {
|
|||
libespeak = "${lib.getLib espeak-ng}/lib/libespeak-ng${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
# FIXME package festival
|
||||
})
|
||||
./remove-intertwined-festival-test.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -44,26 +43,9 @@ buildPythonPackage rec {
|
|||
typing-extensions
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# We tried to package festvial, but were unable to get the backend running,
|
||||
# We tried to package festival, but were unable to get the backend running,
|
||||
# so let's disable related tests.
|
||||
disabledTestPaths = [
|
||||
"test/test_festival.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_festival"
|
||||
"test_festival_path"
|
||||
"test_readme_festival_syll"
|
||||
"test_unicode"
|
||||
];
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/bootphon/phonemizer";
|
||||
|
|
|
|||
|
|
@ -1,103 +0,0 @@
|
|||
diff --git a/test/test_main.py b/test/test_main.py
|
||||
index b8c53e9..8f8c6d2 100644
|
||||
--- a/test/test_main.py
|
||||
+++ b/test/test_main.py
|
||||
@@ -68,16 +68,11 @@ def test_readme():
|
||||
_test('hello world', 'həloʊ wɜːld ', '--verbose')
|
||||
_test('hello world', 'həloʊ wɜːld ', '--quiet')
|
||||
_test('hello world', 'hello world | həloʊ wɜːld ', '--prepend-text')
|
||||
- _test('hello world', 'hhaxlow werld', '-b festival --strip')
|
||||
_test('bonjour le monde', 'bɔ̃ʒuʁ lə mɔ̃d ', '-l fr-fr')
|
||||
_test('bonjour le monde', 'b ɔ̃ ʒ u ʁ ;eword l ə ;eword m ɔ̃ d ;eword ',
|
||||
'-l fr-fr -p " " -w ";eword "')
|
||||
|
||||
|
||||
-@pytest.mark.skipif(
|
||||
- '2.1' in backend.FestivalBackend.version(),
|
||||
- reason='festival-2.1 gives different results than further versions '
|
||||
- 'for syllable boundaries')
|
||||
def test_readme_festival_syll():
|
||||
_test('hello world',
|
||||
'hh ax ;esyll l ow ;esyll ;eword w er l d ;esyll ;eword ',
|
||||
diff --git a/test/test_phonemize.py b/test/test_phonemize.py
|
||||
index d156c9e..2bbe371 100644
|
||||
--- a/test/test_phonemize.py
|
||||
+++ b/test/test_phonemize.py
|
||||
@@ -213,18 +213,6 @@ def test_segments(njobs):
|
||||
('segments', True, True, False,
|
||||
['achi acho?', '', 'achi acho'],
|
||||
[u'ʌtʃɪ ʌtʃʊ?', '', u'ʌtʃɪ ʌtʃʊ ']),
|
||||
- ('festival', False, False, False,
|
||||
- ['hello world!', '', 'goodbye'],
|
||||
- ['hhaxlow werld ', 'guhdbay ']),
|
||||
- ('festival', False, True, False,
|
||||
- ['hello world!', '', 'goodbye'],
|
||||
- ['hhaxlow werld!', 'guhdbay ']),
|
||||
- ('festival', True, False, False,
|
||||
- ['hello world!', '', 'goodbye'],
|
||||
- ['hhaxlow werld ', '', 'guhdbay ']),
|
||||
- ('festival', True, True, False,
|
||||
- ['hello world!', '', 'goodbye'],
|
||||
- ['hhaxlow werld!', '', 'guhdbay ']),
|
||||
('espeak', False, False, True,
|
||||
['hello world!', '', 'goodbye'],
|
||||
[('hello world!', 'həloʊ wɜːld '), ('goodbye', 'ɡʊdbaɪ ')]),
|
||||
@@ -248,19 +236,7 @@ def test_segments(njobs):
|
||||
[('achi acho?', u'ʌtʃɪ ʌtʃʊ '), ('', ''), ('achi acho', u'ʌtʃɪ ʌtʃʊ ')]),
|
||||
('segments', True, True, True,
|
||||
['achi acho?', '', 'achi acho'],
|
||||
- [('achi acho?', u'ʌtʃɪ ʌtʃʊ?'), ('', ''), ('achi acho', u'ʌtʃɪ ʌtʃʊ ')]),
|
||||
- ('festival', False, False, True,
|
||||
- ['hello world!', '', 'goodbye'],
|
||||
- [('hello world!', 'hhaxlow werld '), ('goodbye', 'guhdbay ')]),
|
||||
- ('festival', False, True, True,
|
||||
- ['hello world!', '', 'goodbye'],
|
||||
- [('hello world!', 'hhaxlow werld!'), ('goodbye', 'guhdbay ')]),
|
||||
- ('festival', True, False, True,
|
||||
- ['hello world!', '', 'goodbye'],
|
||||
- [('hello world!', 'hhaxlow werld '), ('', ''), ('goodbye', 'guhdbay ')]),
|
||||
- ('festival', True, True, True,
|
||||
- ['hello world!', '', 'goodbye'],
|
||||
- [('hello world!', 'hhaxlow werld!'), ('', ''), ('goodbye', 'guhdbay ')])])
|
||||
+ [('achi acho?', u'ʌtʃɪ ʌtʃʊ?'), ('', ''), ('achi acho', u'ʌtʃɪ ʌtʃʊ ')])])
|
||||
def test_preserve_empty_lines(backend, empty_lines, punctuation, prepend_text, text, expected):
|
||||
language = 'cree' if backend == 'segments' else 'en-us'
|
||||
|
||||
@@ -278,11 +254,7 @@ def test_preserve_empty_lines(backend, empty_lines, punctuation, prepend_text, t
|
||||
('segments', False, False, [''], []),
|
||||
('segments', False, True, [''], []),
|
||||
('segments', True, False, [''], ['']),
|
||||
- ('segments', True, True, [''], ['']),
|
||||
- ('festival', False, False, [''], []),
|
||||
- ('festival', False, True, [''], []),
|
||||
- ('festival', True, False, [''], ['']),
|
||||
- ('festival', True, True, [''], [''])])
|
||||
+ ('segments', True, True, [''], [''])])
|
||||
def test_empty_input(backend, empty_lines, punctuation, text, expected):
|
||||
language = 'cree' if backend == 'segments' else 'en-us'
|
||||
|
||||
diff --git a/test/test_punctuation.py b/test/test_punctuation.py
|
||||
index b2206ac..62e31c1 100644
|
||||
--- a/test/test_punctuation.py
|
||||
+++ b/test/test_punctuation.py
|
||||
@@ -28,9 +28,6 @@ ESPEAK_150 = (EspeakBackend.version() >= (1, 50))
|
||||
# True if we are using espeak>=1.49.3
|
||||
ESPEAK_143 = (EspeakBackend.version() >= (1, 49, 3))
|
||||
|
||||
-# True if we are using festival>=2.5
|
||||
-FESTIVAL_25 = (FestivalBackend.version() >= (2, 5))
|
||||
-
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
'inp, out', [
|
||||
@@ -179,9 +176,7 @@ def test_issue_54(text):
|
||||
('espeak', 'default', ['! ?', 'hey!'], ['! ?', 'heɪ!']),
|
||||
('espeak', '!', ['! ?', 'hey!'], ['! ', 'heɪ!']),
|
||||
('segments', 'default', ['! ?', 'hey!'], ['! ?', 'heːj!']),
|
||||
- ('segments', '!', ['! ?', 'hey!'], ValueError),
|
||||
- ('festival', 'default', ['! ?', 'hey!'], ['! ?', 'hhey!']),
|
||||
- ('festival', '!', ['! ?', 'hey!'], ['! ', 'hhey!'])])
|
||||
+ ('segments', '!', ['! ?', 'hey!'], ValueError)])
|
||||
def test_issue55(backend, marks, text, expected):
|
||||
if marks == 'default':
|
||||
marks = Punctuation.default_marks()
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynamodb";
|
||||
version = "5.3.5";
|
||||
version = "5.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "pynamodb";
|
||||
repo = "PynamoDB";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cxWPnq+xGDaJ1rj/K25ELATFAW+/eteilrnqrCftW0Q=";
|
||||
hash = "sha256-N+WpQil/OJ2p81Dc2b6c5K03NjAUdpbS+gjPzdqLY4w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
|
|
@ -13,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytorch-metric-learning";
|
||||
version = "1.7.2";
|
||||
version = "2.0.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -21,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "KevinMusgrave";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-f+k7WuZRgSDGbWp/TvmDkDzT02WeycwDCd/1WhR3VD8=";
|
||||
sha256 = "sha256-xarZvCRT/PhhB+ySv94XGz7uF/WiKbil6ohg7XbzOUs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -56,6 +57,10 @@ buildPythonPackage rec {
|
|||
"test_pca"
|
||||
# flaky
|
||||
"test_distributed_classifier_loss_and_miner"
|
||||
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
|
||||
# RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly
|
||||
"test_global_embedding_space_tester"
|
||||
"test_with_same_parent_label_tester"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "recurring-ical-events";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "niccokunzmann";
|
||||
repo = "python-recurring-ical-events";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B6oLy4Ai30SGGTgGcO0V+f1mf1P1W8sMpzk7oIUtcJY=";
|
||||
hash = "sha256-1tmUf0HIKufiocAZPxkTLyicMU0o8dhSjCij2Lc/lyk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
|
|
@ -15,7 +16,7 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "rising";
|
||||
version = "0.3.0";
|
||||
disabled = pythonOlder "TODO";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PhoenixDL";
|
||||
|
|
@ -32,6 +33,10 @@ buildPythonPackage rec {
|
|||
lightning-utilities numpy torch threadpoolctl tqdm
|
||||
];
|
||||
nativeCheckInputs = [ dill pytestCheckHook ];
|
||||
disabledTests = lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
|
||||
# RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly:
|
||||
"test_progressive_resize_integration"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"rising"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "somajo";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "tsproisl";
|
||||
repo = "SoMaJo";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-rzh+IASqs+uSgUq3BI9UdC4XRsozIGsaOt/LR+VhBxc=";
|
||||
sha256 = "sha256-EnYw8TSZLXgB4pZaZBgxaO13PpTDx4lGsdGJ+51A6wE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
, isPy3k
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zipfile36";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest test_zipfile.py
|
||||
'';
|
||||
|
||||
# Only works with Python 3.x.
|
||||
# Not supposed to be used with 3.6 and up.
|
||||
disabled = !(isPy3k && (pythonOlder "3.6"));
|
||||
|
||||
meta = {
|
||||
description = "Read and write ZIP files - backport of the zipfile module from Python 3.6";
|
||||
homepage = "https://gitlab.com/takluyver/zipfile36";
|
||||
license = lib.licenses.psfl;
|
||||
maintainers = lib.maintainers.fridh;
|
||||
};
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-me-ws";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "Z-Wave-Me";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-M/+ij6Xjx3irZRAFlHBF+0JHaVpY+kG2i5OISneVjws=";
|
||||
hash = "sha256-DfQh9wuYx/gCyW3ONk8wwDOgbp8Pifx3nwDgS5NZFhI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -46,6 +46,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Library to connect to a ZWave-Me instance";
|
||||
homepage = "https://github.com/Z-Wave-Me/zwave-me-ws";
|
||||
changelog = "https://github.com/Z-Wave-Me/zwave-me-ws/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.6.0";
|
||||
version = "10.7.0";
|
||||
pname = "checkstyle";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "sha256-ghGrRu7a9OUVti6P4QRrGFSmQqX8XCfn7aBHR4Q7RCI=";
|
||||
sha256 = "sha256-JJGAnja/ONuUUTbLlmk/BrGa0NwJH+EfFn1yL5SvrEw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,628 +0,0 @@
|
|||
{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles
|
||||
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
|
||||
# this package (through the fixpoint glass)
|
||||
, bazel_self
|
||||
, lr, xe, zip, unzip, bash, writeCBin, coreutils
|
||||
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
|
||||
# updater
|
||||
, python3, writeScript
|
||||
# Apple dependencies
|
||||
, cctools, libcxx, CoreFoundation, CoreServices, Foundation
|
||||
# Allow to independently override the jdks used to build and run respectively
|
||||
, buildJdk, runJdk
|
||||
, buildJdkName
|
||||
, runtimeShell
|
||||
# Downstream packages for tests
|
||||
, bazel-watcher
|
||||
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
|
||||
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
|
||||
, enableNixHacks ? false
|
||||
, gcc-unwrapped
|
||||
, autoPatchelfHook
|
||||
, file
|
||||
, substituteAll
|
||||
, writeTextFile
|
||||
}:
|
||||
|
||||
let
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
sha256 = "1cfrbs23lg0jnl22ddylx3clcjw7bdpbix7r5lqibab346s5n9fy";
|
||||
};
|
||||
|
||||
# Update with `eval $(nix-build -A bazel.updater)`,
|
||||
# then add new dependencies from the dict in ./src-deps.json as required.
|
||||
srcDeps = lib.attrsets.attrValues srcDepsSet;
|
||||
srcDepsSet =
|
||||
let
|
||||
srcs = lib.importJSON ./src-deps.json;
|
||||
toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
|
||||
urls = d.urls;
|
||||
sha256 = d.sha256;
|
||||
});
|
||||
in builtins.listToAttrs (map toFetchurl [
|
||||
srcs.desugar_jdk_libs
|
||||
srcs.io_bazel_skydoc
|
||||
srcs.bazel_skylib
|
||||
srcs.io_bazel_rules_sass
|
||||
srcs.platforms
|
||||
# `bazel query` wants all of these to be available regardless of platform.
|
||||
srcs."java_tools_javac11_darwin-v10.0.zip"
|
||||
srcs."java_tools_javac11_linux-v10.0.zip"
|
||||
srcs."java_tools_javac11_windows-v10.0.zip"
|
||||
srcs."coverage_output_generator-v2.5.zip"
|
||||
srcs.build_bazel_rules_nodejs
|
||||
srcs."android_tools_pkg-0.19.0rc3.tar.gz"
|
||||
srcs."bazel-toolchains-3.1.0.tar.gz"
|
||||
srcs."com_github_grpc_grpc"
|
||||
srcs.upb
|
||||
srcs.rules_pkg
|
||||
srcs.rules_cc
|
||||
srcs.rules_java
|
||||
srcs.rules_proto
|
||||
srcs.com_google_protobuf
|
||||
]);
|
||||
|
||||
distDir = runCommand "bazel-deps" {} ''
|
||||
mkdir -p $out
|
||||
for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
|
||||
'';
|
||||
|
||||
defaultShellPath = lib.makeBinPath
|
||||
# Keep this list conservative. For more exotic tools, prefer to use
|
||||
# @rules_nixpkgs to pull in tools from the nix repository. Example:
|
||||
#
|
||||
# WORKSPACE:
|
||||
#
|
||||
# nixpkgs_git_repository(
|
||||
# name = "nixpkgs",
|
||||
# revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
|
||||
# )
|
||||
#
|
||||
# # This defines an external Bazel workspace.
|
||||
# nixpkgs_package(
|
||||
# name = "bison",
|
||||
# repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
|
||||
# )
|
||||
#
|
||||
# some/BUILD.bazel:
|
||||
#
|
||||
# genrule(
|
||||
# ...
|
||||
# cmd = "$(location @bison//:bin/bison) -other -args",
|
||||
# tools = [
|
||||
# ...
|
||||
# "@bison//:bin/bison",
|
||||
# ],
|
||||
# )
|
||||
#
|
||||
[ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ];
|
||||
|
||||
# Java toolchain used for the build and tests
|
||||
javaToolchain = "@bazel_tools//tools/jdk:toolchain_${buildJdkName}";
|
||||
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
|
||||
# This repository is fetched by bazel at runtime
|
||||
# however it contains prebuilt java binaries, with wrong interpreter
|
||||
# and libraries path.
|
||||
# We prefetch it, patch it, and override it in a global bazelrc.
|
||||
system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
|
||||
|
||||
# on aarch64 Darwin, `uname -m` returns "arm64"
|
||||
arch = with stdenv.hostPlatform; if isDarwin && isAarch64 then "arm64" else parsed.cpu.name;
|
||||
|
||||
remote_java_tools = stdenv.mkDerivation {
|
||||
name = "remote_java_tools_${system}";
|
||||
|
||||
src = srcDepsSet."java_tools_javac11_${system}-v10.0.zip";
|
||||
|
||||
nativeBuildInputs = [ unzip ]
|
||||
++ lib.optional stdenv.isLinux autoPatchelfHook;
|
||||
buildInputs = [ gcc-unwrapped ];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
buildPhase = ''
|
||||
mkdir $out;
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
cp -Ra * $out/
|
||||
touch $out/WORKSPACE
|
||||
'';
|
||||
};
|
||||
|
||||
bazelRC = writeTextFile {
|
||||
name = "bazel-rc";
|
||||
text = ''
|
||||
startup --server_javabase=${runJdk}
|
||||
|
||||
# Can't use 'common'; https://github.com/bazelbuild/bazel/issues/3054
|
||||
# Most commands inherit from 'build' anyway.
|
||||
build --distdir=${distDir}
|
||||
fetch --distdir=${distDir}
|
||||
query --distdir=${distDir}
|
||||
|
||||
build --override_repository=${remote_java_tools.name}=${remote_java_tools}
|
||||
fetch --override_repository=${remote_java_tools.name}=${remote_java_tools}
|
||||
query --override_repository=${remote_java_tools.name}=${remote_java_tools}
|
||||
|
||||
# Provide a default java toolchain, this will be the same as ${runJdk}
|
||||
build --host_javabase='@local_jdk//:jdk'
|
||||
|
||||
# load default location for the system wide configuration
|
||||
try-import /etc/bazel.bazelrc
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bazel";
|
||||
inherit version;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/bazelbuild/bazel/";
|
||||
description = "Build tool that builds code quickly and reliably";
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
];
|
||||
license = licenses.asl20;
|
||||
maintainers = lib.teams.bazel.members;
|
||||
inherit platforms;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
|
||||
inherit src;
|
||||
sourceRoot = ".";
|
||||
|
||||
patches = [
|
||||
# On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
|
||||
# This is breaking the build of any C target. This patch removes the last
|
||||
# argument if it's found to be an empty string.
|
||||
../trim-last-argument-to-gcc-if-empty.patch
|
||||
|
||||
# On Darwin, using clang 6 to build fails because of a linker error (see #105573),
|
||||
# but using clang 7 fails because libarclite_macosx.a cannot be found when linking
|
||||
# the xcode_locator tool.
|
||||
# This patch removes using the -fobjc-arc compiler option and makes the code
|
||||
# compile without automatic reference counting. Caveat: this leaks memory, but
|
||||
# we accept this fact because xcode_locator is only a short-lived process used during the build.
|
||||
./no-arc.patch
|
||||
|
||||
./gcc11.patch
|
||||
|
||||
# --experimental_strict_action_env (which may one day become the default
|
||||
# see bazelbuild/bazel#2574) hardcodes the default
|
||||
# action environment to a non hermetic value (e.g. "/usr/local/bin").
|
||||
# This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
|
||||
# So we are replacing this bazel paths by defaultShellPath,
|
||||
# improving hermeticity and making it work in nixos.
|
||||
(substituteAll {
|
||||
src = ../strict_action_env.patch;
|
||||
strictActionEnvPatch = defaultShellPath;
|
||||
})
|
||||
|
||||
# bazel reads its system bazelrc in /etc
|
||||
# override this path to a builtin one
|
||||
(substituteAll {
|
||||
src = ../bazel_rc.patch;
|
||||
bazelSystemBazelRCPath = bazelRC;
|
||||
})
|
||||
|
||||
# disable suspend detection during a build inside Nix as this is
|
||||
# not available inside the darwin sandbox
|
||||
../bazel_darwin_sandbox.patch
|
||||
] ++ lib.optional enableNixHacks ../nix-hacks.patch;
|
||||
|
||||
|
||||
# Additional tests that check bazel’s functionality. Execute
|
||||
#
|
||||
# nix-build . -A bazel.tests
|
||||
#
|
||||
# in the nixpkgs checkout root to exercise them locally.
|
||||
passthru.tests =
|
||||
let
|
||||
runLocal = name: attrs: script:
|
||||
let
|
||||
attrs' = removeAttrs attrs [ "buildInputs" ];
|
||||
buildInputs = [ python3 ] ++ (attrs.buildInputs or []);
|
||||
in
|
||||
runCommandCC name ({
|
||||
inherit buildInputs;
|
||||
preferLocalBuild = true;
|
||||
meta.platforms = platforms;
|
||||
} // attrs') script;
|
||||
|
||||
# bazel wants to extract itself into $install_dir/install every time it runs,
|
||||
# so let’s do that only once.
|
||||
extracted = bazelPkg:
|
||||
let install_dir =
|
||||
# `install_base` field printed by `bazel info`, minus the hash.
|
||||
# yes, this path is kinda magic. Sorry.
|
||||
"$HOME/.cache/bazel/_bazel_nixbld";
|
||||
in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
|
||||
export HOME=$(mktemp -d)
|
||||
touch WORKSPACE # yeah, everything sucks
|
||||
install_base="$(${bazelPkg}/bin/bazel info | grep install_base)"
|
||||
# assert it’s actually below install_dir
|
||||
[[ "$install_base" =~ ${install_dir} ]] \
|
||||
|| (echo "oh no! $install_base but we are \
|
||||
trying to copy ${install_dir} to $out instead!"; exit 1)
|
||||
cp -R ${install_dir} $out
|
||||
'';
|
||||
|
||||
bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }:
|
||||
let
|
||||
be = extracted bazelPkg;
|
||||
in runLocal name { inherit buildInputs; } (
|
||||
# skip extraction caching on Darwin, because nobody knows how Darwin works
|
||||
(lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
# set up home with pre-unpacked bazel
|
||||
export HOME=$(mktemp -d)
|
||||
mkdir -p ${be.install_dir}
|
||||
cp -R ${be}/install ${be.install_dir}
|
||||
|
||||
# https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
|
||||
# Bazel checks whether the mtime of the install dir files
|
||||
# is >9 years in the future, otherwise it extracts itself again.
|
||||
# see PosixFileMTime::IsUntampered in src/main/cpp/util
|
||||
# What the hell bazel.
|
||||
${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
|
||||
'')
|
||||
+
|
||||
''
|
||||
# Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
|
||||
# about why to create a subdir for the workspace.
|
||||
cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
|
||||
|
||||
${bazelScript}
|
||||
|
||||
touch $out
|
||||
'');
|
||||
|
||||
bazelWithNixHacks = bazel_self.override { enableNixHacks = true; };
|
||||
|
||||
bazel-examples = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "examples";
|
||||
rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc";
|
||||
sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8";
|
||||
};
|
||||
|
||||
in (if !stdenv.hostPlatform.isDarwin then {
|
||||
# `extracted` doesn’t work on darwin
|
||||
shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; };
|
||||
} else {}) // {
|
||||
bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; };
|
||||
cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
|
||||
java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
|
||||
protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; };
|
||||
pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; };
|
||||
|
||||
bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
|
||||
|
||||
cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
|
||||
javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
|
||||
protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
|
||||
pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
|
||||
|
||||
# downstream packages using buildBazelPackage
|
||||
# fixed-output hashes of the fetch phase need to be spot-checked manually
|
||||
downstream = recurseIntoAttrs ({
|
||||
inherit bazel-watcher;
|
||||
});
|
||||
};
|
||||
|
||||
# update the list of workspace dependencies
|
||||
passthru.updater = writeScript "update-bazel-deps.sh" ''
|
||||
#!${runtimeShell}
|
||||
cat ${runCommand "bazel-deps.json" {} ''
|
||||
${unzip}/bin/unzip ${src} WORKSPACE
|
||||
${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out
|
||||
''} > ${builtins.toString ./src-deps.json}
|
||||
'';
|
||||
|
||||
# Necessary for the tests to pass on Darwin with sandbox enabled.
|
||||
# Bazel starts a local server and needs to bind a local address.
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
# Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
|
||||
customBash = writeCBin "bash" ''
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
extern char **environ;
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
char *path = getenv("PATH");
|
||||
char *pathToAppend = "${defaultShellPath}";
|
||||
char *newPath;
|
||||
if (path != NULL) {
|
||||
int length = strlen(path) + 1 + strlen(pathToAppend) + 1;
|
||||
newPath = malloc(length * sizeof(char));
|
||||
snprintf(newPath, length, "%s:%s", path, pathToAppend);
|
||||
} else {
|
||||
newPath = pathToAppend;
|
||||
}
|
||||
setenv("PATH", newPath, 1);
|
||||
execve("${bash}/bin/bash", argv, environ);
|
||||
return 0;
|
||||
}
|
||||
'';
|
||||
|
||||
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
|
||||
|
||||
# Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
|
||||
export GCOV=${coreutils}/bin/false
|
||||
|
||||
# Framework search paths aren't added by bintools hook
|
||||
# https://github.com/NixOS/nixpkgs/pull/41914
|
||||
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 ${lib.getDev 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 $(bazelLinkFlags) -framework CoreFoundation;g" \
|
||||
scripts/bootstrap/compile.sh \
|
||||
src/tools/xcode/realpath/BUILD \
|
||||
src/tools/xcode/stdredirect/BUILD \
|
||||
tools/osx/BUILD
|
||||
|
||||
substituteInPlace scripts/bootstrap/compile.sh --replace ' -mmacosx-version-min=10.9' ""
|
||||
|
||||
# nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
|
||||
sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
|
||||
|
||||
# clang installed from Xcode has a compatibility wrapper that forwards
|
||||
# invocations of gcc to clang, but vanilla clang doesn't
|
||||
sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
|
||||
|
||||
sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
|
||||
wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
|
||||
for wrapper in "''${wrappers[@]}"; do
|
||||
sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
|
||||
done
|
||||
'';
|
||||
|
||||
genericPatches = ''
|
||||
# Substitute j2objc and objc wrapper's python shebang to plain python path.
|
||||
substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
|
||||
substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
|
||||
substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python3.interpreter}"
|
||||
|
||||
# md5sum is part of coreutils
|
||||
sed -i 's|/sbin/md5|md5sum|g' \
|
||||
src/BUILD third_party/ijar/test/testenv.sh tools/objc/libtool.sh
|
||||
|
||||
# replace initial value of pythonShebang variable in BazelPythonSemantics.java
|
||||
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java \
|
||||
--replace '"#!/usr/bin/env " + pythonExecutableName' "\"#!${python3}/bin/python\""
|
||||
|
||||
# substituteInPlace is rather slow, so prefilter the files with grep
|
||||
grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
|
||||
# If you add more replacements here, you must change the grep above!
|
||||
# Only files containing /bin are taken into account.
|
||||
substituteInPlace "$path" \
|
||||
--replace /bin/bash ${customBash}/bin/bash \
|
||||
--replace "/usr/bin/env bash" ${customBash}/bin/bash \
|
||||
--replace "/usr/bin/env python" ${python3}/bin/python \
|
||||
--replace /usr/bin/env ${coreutils}/bin/env \
|
||||
--replace /bin/true ${coreutils}/bin/true
|
||||
done
|
||||
|
||||
# bazel test runner include references to /bin/bash
|
||||
substituteInPlace tools/build_rules/test_rules.bzl \
|
||||
--replace /bin/bash ${customBash}/bin/bash
|
||||
|
||||
for i in $(find tools/cpp/ -type f)
|
||||
do
|
||||
substituteInPlace $i \
|
||||
--replace /bin/bash ${customBash}/bin/bash
|
||||
done
|
||||
|
||||
# Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
|
||||
substituteInPlace scripts/bootstrap/compile.sh \
|
||||
--replace /bin/bash ${customBash}/bin/bash
|
||||
|
||||
# add nix environment vars to .bazelrc
|
||||
cat >> .bazelrc <<EOF
|
||||
# Limit the resources Bazel is allowed to use during the build to 1/2 the
|
||||
# available RAM and 3/4 the available CPU cores. This should help avoid
|
||||
# overwhelming the build machine.
|
||||
build --local_ram_resources=HOST_RAM*.5
|
||||
build --local_cpu_resources=HOST_CPUS*.75
|
||||
|
||||
build --distdir=${distDir}
|
||||
fetch --distdir=${distDir}
|
||||
build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
|
||||
build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
|
||||
build --linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt="/g')"
|
||||
build --host_linkopt="$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt="/g')"
|
||||
build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
|
||||
build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
|
||||
build --host_javabase='@local_jdk//:jdk'
|
||||
build --host_java_toolchain='${javaToolchain}'
|
||||
EOF
|
||||
|
||||
# add the same environment vars to compile.sh
|
||||
sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
|
||||
-e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
|
||||
-e "/\$command \\\\$/a --linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --linkopt=\"/g')\" \\\\" \
|
||||
-e "/\$command \\\\$/a --host_linkopt=\"$(echo $(< ${stdenv.cc}/nix-support/libcxx-ldflags) | sed -e 's/ /" --host_linkopt=\"/g')\" \\\\" \
|
||||
-e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
|
||||
-e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
|
||||
-e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
|
||||
-e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
|
||||
-i scripts/bootstrap/compile.sh
|
||||
|
||||
# This is necessary to avoid:
|
||||
# "error: no visible @interface for 'NSDictionary' declares the selector
|
||||
# 'initWithContentsOfURL:error:'"
|
||||
# This can be removed when the apple_sdk is upgraded beyond 10.13+
|
||||
sed -i '/initWithContentsOfURL:versionPlistUrl/ {
|
||||
N
|
||||
s/error:nil\];/\];/
|
||||
}' tools/osx/xcode_locator.m
|
||||
|
||||
# append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
|
||||
echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
|
||||
cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
|
||||
mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
|
||||
|
||||
patchShebangs .
|
||||
'';
|
||||
in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
|
||||
+ genericPatches;
|
||||
|
||||
buildInputs = [
|
||||
buildJdk
|
||||
python3
|
||||
];
|
||||
|
||||
# when a command can’t be found in a bazel build, you might also
|
||||
# need to add it to `defaultShellPath`.
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
zip
|
||||
python3
|
||||
unzip
|
||||
makeWrapper
|
||||
which
|
||||
customBash
|
||||
] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
|
||||
|
||||
# Bazel makes extensive use of symlinks in the WORKSPACE.
|
||||
# This causes problems with infinite symlinks if the build output is in the same location as the
|
||||
# Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
|
||||
# subdirectory.
|
||||
# Failing to do this causes "infinite symlink expansion detected"
|
||||
preBuildPhases = ["preBuildPhase"];
|
||||
preBuildPhase = ''
|
||||
mkdir bazel_src
|
||||
shopt -s dotglob extglob
|
||||
mv !(bazel_src) bazel_src
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
# Increasing memory during compilation might be necessary.
|
||||
# export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
|
||||
./bazel_src/compile.sh
|
||||
./bazel_src/scripts/generate_bash_completion.sh \
|
||||
--bazel=./bazel_src/output/bazel \
|
||||
--output=./bazel_src/output/bazel-complete.bash \
|
||||
--prepend=./bazel_src/scripts/bazel-complete-header.bash \
|
||||
--prepend=./bazel_src/scripts/bazel-complete-template.bash
|
||||
|
||||
# need to change directory for bazel to find the workspace
|
||||
cd ./bazel_src
|
||||
# build execlog tooling
|
||||
export HOME=$(mktemp -d)
|
||||
./output/bazel build src/tools/execlog:parser_deploy.jar
|
||||
cd -
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
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-{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
|
||||
|
||||
mkdir $out/share
|
||||
cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
|
||||
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
|
||||
cat <<EOF > $out/bin/bazel-execlog
|
||||
#!${runtimeShell} -e
|
||||
${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
|
||||
EOF
|
||||
chmod +x $out/bin/bazel-execlog
|
||||
|
||||
# shell completion files
|
||||
installShellCompletion --bash \
|
||||
--name bazel.bash \
|
||||
./bazel_src/output/bazel-complete.bash
|
||||
installShellCompletion --zsh \
|
||||
--name _bazel \
|
||||
./bazel_src/scripts/zsh_completion/_bazel
|
||||
installShellCompletion --fish \
|
||||
--name bazel.fish \
|
||||
./bazel_src/scripts/fish/completions/bazel.fish
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
export TEST_TMPDIR=$(pwd)
|
||||
|
||||
hello_test () {
|
||||
$out/bin/bazel test \
|
||||
--test_output=errors \
|
||||
--java_toolchain='${javaToolchain}' \
|
||||
examples/cpp:hello-success_test \
|
||||
examples/java-native/src/test/java/com/example/myproject:hello
|
||||
}
|
||||
|
||||
cd ./bazel_src
|
||||
|
||||
# test whether $WORKSPACE_ROOT/tools/bazel works
|
||||
|
||||
mkdir -p tools
|
||||
cat > tools/bazel <<"EOF"
|
||||
#!${runtimeShell} -e
|
||||
exit 1
|
||||
EOF
|
||||
chmod +x tools/bazel
|
||||
|
||||
# first call should fail if tools/bazel is used
|
||||
! hello_test
|
||||
|
||||
cat > tools/bazel <<"EOF"
|
||||
#!${runtimeShell} -e
|
||||
exec "$BAZEL_REAL" "$@"
|
||||
EOF
|
||||
|
||||
# second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch}
|
||||
hello_test
|
||||
'';
|
||||
|
||||
# Save paths to hardcoded dependencies so Nix can detect them.
|
||||
postFixup = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
|
||||
# The templates get tar’d up into a .jar,
|
||||
# so nix can’t detect python is needed in the runtime closure
|
||||
echo "${python3}" >> $out/nix-support/depends
|
||||
# The string literal specifying the path to the bazel-rc file is sometimes
|
||||
# stored non-contiguously in the binary due to gcc optimisations, which leads
|
||||
# Nix to miss the hash when scanning for dependencies
|
||||
echo "${bazelRC}" >> $out/nix-support/depends
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
echo "${cctools}" >> $out/nix-support/depends
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/third_party/ijar/mapped_file_unix.cc b/third_party/ijar/mapped_file_unix.cc
|
||||
index 6e3a908..030e9ca 100644
|
||||
--- a/third_party/ijar/mapped_file_unix.cc
|
||||
+++ b/third_party/ijar/mapped_file_unix.cc
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include <algorithm>
|
||||
+#include <limits>
|
||||
|
||||
#include "third_party/ijar/mapped_file.h"
|
||||
|
||||
diff --git a/third_party/ijar/zlib_client.h b/third_party/ijar/zlib_client.h
|
||||
index ed66163..c4b051e 100644
|
||||
--- a/third_party/ijar/zlib_client.h
|
||||
+++ b/third_party/ijar/zlib_client.h
|
||||
@@ -16,6 +16,7 @@
|
||||
#define THIRD_PARTY_IJAR_ZLIB_CLIENT_H_
|
||||
|
||||
#include <limits.h>
|
||||
+#include <limits>
|
||||
|
||||
#include "third_party/ijar/common.h"
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
--- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100
|
||||
+++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100
|
||||
@@ -21,10 +21,6 @@
|
||||
// 6,6.4,6.4.1 = 6.4.1
|
||||
// 6.3,6.3.0 = 6.3
|
||||
|
||||
-#if !defined(__has_feature) || !__has_feature(objc_arc)
|
||||
-#error "This file requires ARC support."
|
||||
-#endif
|
||||
-
|
||||
#import <CoreServices/CoreServices.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
--- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100
|
||||
+++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100
|
||||
@@ -123,7 +123,6 @@
|
||||
"macosx",
|
||||
"clang",
|
||||
"-mmacosx-version-min=10.9",
|
||||
- "-fobjc-arc",
|
||||
"-framework",
|
||||
"CoreServices",
|
||||
"-framework",
|
||||
--- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100
|
||||
+++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100
|
||||
@@ -27,7 +27,7 @@
|
||||
])
|
||||
|
||||
DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
|
||||
- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
|
||||
+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \
|
||||
-framework Foundation -o $@ $<
|
||||
"""
|
||||
|
||||
|
|
@ -1,861 +0,0 @@
|
|||
{
|
||||
"1.25.0.zip": {
|
||||
"name": "1.25.0.zip",
|
||||
"sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip",
|
||||
"https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
|
||||
]
|
||||
},
|
||||
"1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": {
|
||||
"name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
|
||||
"sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
|
||||
"https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
|
||||
]
|
||||
},
|
||||
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": {
|
||||
"name": "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
|
||||
"sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
|
||||
"https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz"
|
||||
]
|
||||
},
|
||||
"46993efdd33b73649796c5fc5c9efb193ae19d51.zip": {
|
||||
"name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip",
|
||||
"sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip",
|
||||
"https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip"
|
||||
]
|
||||
},
|
||||
"7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": {
|
||||
"name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
|
||||
"sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
|
||||
"https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
|
||||
]
|
||||
},
|
||||
"97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": {
|
||||
"name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
|
||||
"sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
|
||||
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
|
||||
]
|
||||
},
|
||||
"9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz": {
|
||||
"name": "9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
|
||||
"sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
|
||||
"https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz"
|
||||
]
|
||||
},
|
||||
"android_tools_for_testing": {
|
||||
"name": "android_tools_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
|
||||
"url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz"
|
||||
},
|
||||
"android_tools_pkg-0.19.0rc3.tar.gz": {
|
||||
"name": "android_tools_pkg-0.19.0rc3.tar.gz",
|
||||
"sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz"
|
||||
]
|
||||
},
|
||||
"b1c40e1de81913a3c40e5948f78719c28152486d.zip": {
|
||||
"name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip",
|
||||
"sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
|
||||
"https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
|
||||
]
|
||||
},
|
||||
"bazel-toolchains-3.1.0.tar.gz": {
|
||||
"name": "bazel-toolchains-3.1.0.tar.gz",
|
||||
"sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz",
|
||||
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"bazel_j2objc": {
|
||||
"name": "bazel_j2objc",
|
||||
"sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b",
|
||||
"strip_prefix": "j2objc-2.5",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip",
|
||||
"https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip"
|
||||
]
|
||||
},
|
||||
"bazel_skylib": {
|
||||
"name": "bazel_skylib",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96",
|
||||
"strip_prefix": "bazel-skylib-2d4c9528e0f453b5950eeaeac11d8d09f5a504d4",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
|
||||
"https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz"
|
||||
]
|
||||
},
|
||||
"bazel_toolchains": {
|
||||
"name": "bazel_toolchains",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
|
||||
"strip_prefix": "bazel-toolchains-3.1.0",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz",
|
||||
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"bazel_website": {
|
||||
"build_file_content": "\nexports_files([\"_sass/style.scss\"])\n",
|
||||
"name": "bazel_website",
|
||||
"sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4",
|
||||
"strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42",
|
||||
"urls": [
|
||||
"https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz"
|
||||
]
|
||||
},
|
||||
"build_bazel_rules_nodejs": {
|
||||
"name": "build_bazel_rules_nodejs",
|
||||
"sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz",
|
||||
"https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"com_github_grpc_grpc": {
|
||||
"name": "com_github_grpc_grpc",
|
||||
"patch_args": [
|
||||
"-p1"
|
||||
],
|
||||
"patches": [
|
||||
"//third_party/grpc:grpc_1.26.0.patch"
|
||||
],
|
||||
"sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81",
|
||||
"strip_prefix": "grpc-1.26.0",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz",
|
||||
"https://github.com/grpc/grpc/archive/v1.26.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"com_google_googletest": {
|
||||
"name": "com_google_googletest",
|
||||
"sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
|
||||
"strip_prefix": "googletest-release-1.10.0",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz",
|
||||
"https://github.com/google/googletest/archive/release-1.10.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"com_google_protobuf": {
|
||||
"name": "com_google_protobuf",
|
||||
"patch_args": [
|
||||
"-p1"
|
||||
],
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"patches": [
|
||||
"//third_party/protobuf:3.13.0.patch"
|
||||
],
|
||||
"sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
|
||||
"strip_prefix": "protobuf-3.13.0",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
|
||||
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"coverage_output_generator-v2.5.zip": {
|
||||
"name": "coverage_output_generator-v2.5.zip",
|
||||
"sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
|
||||
]
|
||||
},
|
||||
"desugar_jdk_libs": {
|
||||
"name": "desugar_jdk_libs",
|
||||
"sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
|
||||
"strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
|
||||
"https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip"
|
||||
]
|
||||
},
|
||||
"e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": {
|
||||
"name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
|
||||
"sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
|
||||
"https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip"
|
||||
]
|
||||
},
|
||||
"e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": {
|
||||
"name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
|
||||
"sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
|
||||
"https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz"
|
||||
]
|
||||
},
|
||||
"io_bazel_rules_sass": {
|
||||
"name": "io_bazel_rules_sass",
|
||||
"sha256": "c78be58f5e0a29a04686b628cf54faaee0094322ae0ac99da5a8a8afca59a647",
|
||||
"strip_prefix": "rules_sass-1.25.0",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.25.0.zip",
|
||||
"https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip"
|
||||
]
|
||||
},
|
||||
"io_bazel_skydoc": {
|
||||
"name": "io_bazel_skydoc",
|
||||
"sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1",
|
||||
"strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz",
|
||||
"https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
|
||||
]
|
||||
},
|
||||
"java_tools_javac11_darwin-v10.0.zip": {
|
||||
"name": "java_tools_javac11_darwin-v10.0.zip",
|
||||
"sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip"
|
||||
]
|
||||
},
|
||||
"java_tools_javac11_linux-v10.0.zip": {
|
||||
"name": "java_tools_javac11_linux-v10.0.zip",
|
||||
"sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip"
|
||||
]
|
||||
},
|
||||
"java_tools_javac11_windows-v10.0.zip": {
|
||||
"name": "java_tools_javac11_windows-v10.0.zip",
|
||||
"sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip"
|
||||
]
|
||||
},
|
||||
"java_tools_langtools_javac11": {
|
||||
"name": "java_tools_langtools_javac11",
|
||||
"sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip"
|
||||
]
|
||||
},
|
||||
"openjdk11_darwin_archive": {
|
||||
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
|
||||
"name": "openjdk11_darwin_archive",
|
||||
"sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
|
||||
"strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk11_linux_archive": {
|
||||
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
|
||||
"name": "openjdk11_linux_archive",
|
||||
"sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
|
||||
"strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk11_windows_archive": {
|
||||
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
|
||||
"name": "openjdk11_windows_archive",
|
||||
"sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
|
||||
"strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk14_darwin_archive": {
|
||||
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
|
||||
"name": "openjdk14_darwin_archive",
|
||||
"sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd",
|
||||
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk14_linux_archive": {
|
||||
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
|
||||
"name": "openjdk14_linux_archive",
|
||||
"sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa",
|
||||
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk14_windows_archive": {
|
||||
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
|
||||
"name": "openjdk14_windows_archive",
|
||||
"sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",
|
||||
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk_linux": {
|
||||
"downloaded_file_path": "zulu-linux.tar.gz",
|
||||
"name": "openjdk_linux",
|
||||
"sha256": "65bfe4e0ffa74a680ee4410db46b17e30cd9397b664a92a886599fe1f3530969",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-linux_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689070.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_aarch64": {
|
||||
"downloaded_file_path": "zulu-linux-aarch64.tar.gz",
|
||||
"name": "openjdk_linux_aarch64",
|
||||
"sha256": "6b245793087300db3ee82ab0d165614f193a73a60f2f011e347756c1e6ca5bac",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_aarch64_minimal": {
|
||||
"downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz",
|
||||
"name": "openjdk_linux_aarch64_minimal",
|
||||
"sha256": "06f6520a877704c77614bcfc4f846cc7cbcbf5eaad149bf7f19f4f16e285c9de",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581690750.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_aarch64_vanilla": {
|
||||
"downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz",
|
||||
"name": "openjdk_linux_aarch64_vanilla",
|
||||
"sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_minimal": {
|
||||
"downloaded_file_path": "zulu-linux-minimal.tar.gz",
|
||||
"name": "openjdk_linux_minimal",
|
||||
"sha256": "91f7d52f695c681d4e21499b4319d548aadef249a6b3053e306308992e1e29ae",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_ppc64le_vanilla": {
|
||||
"downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz",
|
||||
"name": "openjdk_linux_ppc64le_vanilla",
|
||||
"sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
|
||||
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_s390x_vanilla": {
|
||||
"downloaded_file_path": "adoptopenjdk-s390x-vanilla.tar.gz",
|
||||
"name": "openjdk_linux_s390x_vanilla",
|
||||
"sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
|
||||
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_linux_vanilla": {
|
||||
"downloaded_file_path": "zulu-linux-vanilla.tar.gz",
|
||||
"name": "openjdk_linux_vanilla",
|
||||
"sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_macos": {
|
||||
"downloaded_file_path": "zulu-macos.tar.gz",
|
||||
"name": "openjdk_macos",
|
||||
"sha256": "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_macos_minimal": {
|
||||
"downloaded_file_path": "zulu-macos-minimal.tar.gz",
|
||||
"name": "openjdk_macos_minimal",
|
||||
"sha256": "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_macos_vanilla": {
|
||||
"downloaded_file_path": "zulu-macos-vanilla.tar.gz",
|
||||
"name": "openjdk_macos_vanilla",
|
||||
"sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk_win": {
|
||||
"downloaded_file_path": "zulu-win.zip",
|
||||
"name": "openjdk_win",
|
||||
"sha256": "8e1604b3a27dcf639bc6d1a73103f1211848139e4cceb081d0a74a99e1e6f995",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"
|
||||
]
|
||||
},
|
||||
"openjdk_win_minimal": {
|
||||
"downloaded_file_path": "zulu-win-minimal.zip",
|
||||
"name": "openjdk_win_minimal",
|
||||
"sha256": "b90a713c9c2d9ea23cad44d2c2dfcc9af22faba9bde55dedc1c3bb9f556ac1ae",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689080.zip"
|
||||
]
|
||||
},
|
||||
"openjdk_win_vanilla": {
|
||||
"downloaded_file_path": "zulu-win-vanilla.zip",
|
||||
"name": "openjdk_win_vanilla",
|
||||
"sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"platforms": {
|
||||
"name": "platforms",
|
||||
"sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88",
|
||||
"strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip",
|
||||
"https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip"
|
||||
]
|
||||
},
|
||||
"remote_coverage_tools_for_testing": {
|
||||
"name": "remote_coverage_tools_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "cd14f1cb4559e4723e63b7e7b06d09fcc3bd7ba58d03f354cdff1439bd936a7d",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.5.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_darwin_for_testing": {
|
||||
"name": "remote_java_tools_darwin_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_darwin-v10.0.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_javac11_test_darwin": {
|
||||
"name": "remote_java_tools_javac11_test_darwin",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "64e5de2175dfccb96831573946b80d106edf3801d9db38b564514bf3581d466b",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_darwin-v10.0.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_javac11_test_linux": {
|
||||
"name": "remote_java_tools_javac11_test_linux",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_javac11_test_windows": {
|
||||
"name": "remote_java_tools_javac11_test_windows",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_linux_for_testing": {
|
||||
"name": "remote_java_tools_linux_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "69e65353c2cd65780abcbcce4daae973599298273b0f8b4d469eed822cb220d1",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_linux-v10.0.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_linux-v10.0.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_windows_for_testing": {
|
||||
"name": "remote_java_tools_windows_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "d2f62af8daa0a3d55789b605f6582e37038329c64843337c71e64515468e55c4",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v10.0/java_tools_javac11_windows-v10.0.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v10.0/java_tools_javac11_windows-v10.0.zip"
|
||||
]
|
||||
},
|
||||
"remotejdk11_linux_aarch64_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk11_linux_aarch64_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
|
||||
"strip_prefix": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk11_linux_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk11_linux_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
|
||||
"strip_prefix": "zulu11.37.17-ca-jdk11.0.6-linux_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk11_linux_ppc64le_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk11_linux_ppc64le_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a",
|
||||
"strip_prefix": "jdk-11.0.7+10",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz",
|
||||
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk11_linux_s390x_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk11_linux_s390x_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "d9b72e87a1d3ebc0c9552f72ae5eb150fffc0298a7cb841f1ce7bfc70dcd1059",
|
||||
"strip_prefix": "jdk-11.0.7+10",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz",
|
||||
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk11_macos_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk11_macos_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
|
||||
"strip_prefix": "zulu11.37.17-ca-jdk11.0.6-macosx_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk11_win_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk11_win_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
|
||||
"strip_prefix": "zulu11.37.17-ca-jdk11.0.6-win_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"remotejdk14_linux_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk14_linux_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa",
|
||||
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-linux_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk14_macos_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk14_macos_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd",
|
||||
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-macosx_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk14_win_for_testing": {
|
||||
"build_file": "@local_jdk//:BUILD.bazel",
|
||||
"name": "remotejdk14_win_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284",
|
||||
"strip_prefix": "zulu14.28.21-ca-jdk14.0.1-win_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"rules_cc": {
|
||||
"name": "rules_cc",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd",
|
||||
"strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip",
|
||||
"https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip"
|
||||
]
|
||||
},
|
||||
"rules_java": {
|
||||
"name": "rules_java",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
|
||||
"strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
|
||||
"https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
|
||||
]
|
||||
},
|
||||
"rules_nodejs-1.3.0.tar.gz": {
|
||||
"name": "rules_nodejs-1.3.0.tar.gz",
|
||||
"sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz",
|
||||
"https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"rules_pkg": {
|
||||
"name": "rules_pkg",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
|
||||
"https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz"
|
||||
]
|
||||
},
|
||||
"rules_pkg-0.2.4.tar.gz": {
|
||||
"name": "rules_pkg-0.2.4.tar.gz",
|
||||
"sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
|
||||
"https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz"
|
||||
]
|
||||
},
|
||||
"rules_proto": {
|
||||
"name": "rules_proto",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD.bazel && chmod u+w BUILD.bazel || true",
|
||||
"echo >> BUILD.bazel",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
|
||||
"strip_prefix": "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
|
||||
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
|
||||
]
|
||||
},
|
||||
"upb": {
|
||||
"name": "upb",
|
||||
"patch_args": [
|
||||
"-p1"
|
||||
],
|
||||
"patches": [
|
||||
"//third_party/grpc:upb_gcc10_fix.patch"
|
||||
],
|
||||
"sha256": "61d0417abd60e65ed589c9deee7c124fe76a4106831f6ad39464e1525cef1454",
|
||||
"strip_prefix": "upb-9effcbcb27f0a665f9f345030188c0b291e32482",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz",
|
||||
"https://github.com/protocolbuffers/upb/archive/9effcbcb27f0a665f9f345030188c0b291e32482.tar.gz"
|
||||
]
|
||||
},
|
||||
"v1.26.0.tar.gz": {
|
||||
"name": "v1.26.0.tar.gz",
|
||||
"sha256": "2fcb7f1ab160d6fd3aaade64520be3e5446fc4c6fa7ba6581afdc4e26094bd81",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.26.0.tar.gz",
|
||||
"https://github.com/grpc/grpc/archive/v1.26.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"v3.13.0.tar.gz": {
|
||||
"name": "v3.13.0.tar.gz",
|
||||
"sha256": "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
|
||||
"https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz": {
|
||||
"name": "zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz",
|
||||
"sha256": "360626cc19063bc411bfed2914301b908a8f77a7919aaea007a977fa8fb3cde1",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": {
|
||||
"name": "zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz",
|
||||
"sha256": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip": {
|
||||
"name": "zulu11.37.17-ca-jdk11.0.6-win_x64.zip",
|
||||
"sha256": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz": {
|
||||
"name": "zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz",
|
||||
"sha256": "a452f1b9682d9f83c1c14e54d1446e1c51b5173a3a05dcb013d380f9508562e4",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/openjdk/azul-zulu11.37.48-ca-jdk11.0.6/zulu11.37.48-ca-jdk11.0.6-linux_aarch64.tar.gz"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -2,8 +2,6 @@
|
|||
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
|
||||
# this package (through the fixpoint glass)
|
||||
, bazel_self
|
||||
# needed only for the updater
|
||||
, bazel_3
|
||||
, lr, xe, zip, unzip, bash, writeCBin, coreutils
|
||||
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
|
||||
# updater
|
||||
|
|
@ -364,7 +362,7 @@ stdenv.mkDerivation rec {
|
|||
#!${runtimeShell}
|
||||
(cd "${src_for_updater}" &&
|
||||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
|
||||
"${bazel_3}"/bin/bazel \
|
||||
"${bazel_self}"/bin/bazel \
|
||||
query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \
|
||||
--loading_phase_threads=1 \
|
||||
--output build) \
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
|
||||
# this package (through the fixpoint glass)
|
||||
, bazel_self
|
||||
# needed only for the updater
|
||||
, bazel_4
|
||||
, lr, xe, zip, unzip, bash, writeCBin, coreutils
|
||||
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
|
||||
# updater
|
||||
|
|
@ -326,7 +324,7 @@ stdenv.mkDerivation rec {
|
|||
#!${runtimeShell}
|
||||
(cd "${src_for_updater}" &&
|
||||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
|
||||
"${bazel_4}"/bin/bazel \
|
||||
"${bazel_self}"/bin/bazel \
|
||||
query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \
|
||||
--loading_phase_threads=1 \
|
||||
--output build) \
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
|
||||
# this package (through the fixpoint glass)
|
||||
, bazel_self
|
||||
# needed only for the updater
|
||||
, bazel_4
|
||||
, lr, xe, zip, unzip, bash, writeCBin, coreutils
|
||||
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
|
||||
# updater
|
||||
|
|
@ -336,7 +334,7 @@ stdenv.mkDerivation rec {
|
|||
#!${runtimeShell}
|
||||
(cd "${src_for_updater}" &&
|
||||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
|
||||
"${bazel_4}"/bin/bazel \
|
||||
"${bazel_self}"/bin/bazel \
|
||||
query 'kind(http_archive, //external:all) + kind(http_file, //external:all) + kind(distdir_tar, //external:all) + kind(git_repository, //external:all)' \
|
||||
--loading_phase_threads=1 \
|
||||
--output build) \
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "bundletool";
|
||||
version = "1.13.2";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
|
||||
sha256 = "sha256-sbX7IYFcU9gwKzHKC8xtmZKVE2XImeNT4RYOx+cSI2Y=";
|
||||
sha256 = "sha256-50Dn04VixejYfMgXVIstuU5CgC6aB3T99nTnWP95aU0=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dbmate";
|
||||
version = "1.16.0";
|
||||
version = "1.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amacneil";
|
||||
repo = "dbmate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6M7ruiBjvXO6LTdZNuGwUIVwa3QzdBQo0Y34UslCGAE=";
|
||||
sha256 = "sha256-5hjAP2+0hbYcA9G7YJyRqqp1ZC8LzFDomjeFjl4z4FY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-DwQUrNBfKZaVIpqI8yI/C9CQF5Ok/sApOrsLeIxt3hM=";
|
||||
vendorHash = "sha256-7fC1jJMY/XK+GX5t2/o/k+EjFxAlRAmiemMcWaZhL9o=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fq";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wader";
|
||||
repo = "fq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OAdKt5RgLVoTmccN50TUwUAU7VLiTU9hEnDAKxKBRzI=";
|
||||
sha256 = "sha256-tMlHhfPocm+n2aHG/XXbhElwPau8IHxEm6IrYaszcNQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Y9wfeAX0jt3KrpRa5kJi8V8WN/hp4jTcPCbvy0RDGRk=";
|
||||
vendorSha256 = "sha256-kfJfEvMHaPyDK9qkZVP07NByALxVwPcAKs9Kab6v4NE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ruff";
|
||||
version = "0.0.239";
|
||||
version = "0.0.240";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charliermarsh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ogAy1HrkoG7PWvDd4HlqTVNjrWpyWw2B+E9DANCoJNo=";
|
||||
sha256 = "sha256-10pGcvMz+5obtk1lo2pg3D/VtBDhsVRsCZ+Tg1lp3qM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-C5ZOV2EUiV4W3J3jXS+aDyL3w+Rjx1YGTaE8ikqB2VQ=";
|
||||
cargoSha256 = "sha256-4u05UeMw0dX0A1SjFsaUvFgPPAFbCS4POrsZuePEafc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -84,8 +84,13 @@ let
|
|||
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreServices CoreGraphics ImageIO;
|
||||
};
|
||||
|
||||
rustPlatform = pkgs.makeRustPlatform {
|
||||
inherit (pkgs.darwin.apple_sdk_11_0) stdenv;
|
||||
inherit (pkgs) rustc cargo;
|
||||
};
|
||||
|
||||
callPackage = newScope (lib.optionalAttrs stdenv.isDarwin rec {
|
||||
inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild;
|
||||
inherit (pkgs.darwin.apple_sdk_11_0) stdenv xcodebuild rustPlatform;
|
||||
darwin = pkgs.darwin.overrideScope (_: prev: {
|
||||
inherit (prev.darwin.apple_sdk_11_0) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security;
|
||||
apple_sdk = prev.darwin.apple_sdk_11_0;
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ let
|
|||
DRM_GMA500 = whenAtLeast "5.12" module;
|
||||
DRM_GMA600 = whenOlder "5.13" yes;
|
||||
DRM_GMA3600 = whenOlder "5.12" yes;
|
||||
DRM_VMWGFX_FBCON = yes;
|
||||
DRM_VMWGFX_FBCON = whenOlder "6.2" yes;
|
||||
# (experimental) amdgpu support for verde and newer chipsets
|
||||
DRM_AMDGPU_SI = yes;
|
||||
# (stable) amdgpu support for bonaire and newer chipsets
|
||||
|
|
@ -431,7 +431,7 @@ let
|
|||
F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes;
|
||||
UDF_FS = module;
|
||||
|
||||
NFSD_V2_ACL = yes;
|
||||
NFSD_V2_ACL = whenOlder "6.2" yes;
|
||||
NFSD_V3 = whenOlder "5.18" yes;
|
||||
NFSD_V3_ACL = yes;
|
||||
NFSD_V4 = yes;
|
||||
|
|
@ -457,7 +457,7 @@ let
|
|||
CEPH_FS_POSIX_ACL = yes;
|
||||
|
||||
SQUASHFS_FILE_DIRECT = yes;
|
||||
SQUASHFS_DECOMP_MULTI_PERCPU = yes;
|
||||
SQUASHFS_DECOMP_MULTI_PERCPU = whenOlder "6.2" yes;
|
||||
SQUASHFS_XATTR = yes;
|
||||
SQUASHFS_ZLIB = yes;
|
||||
SQUASHFS_LZO = yes;
|
||||
|
|
@ -502,8 +502,8 @@ let
|
|||
SECURITY_APPARMOR = yes;
|
||||
DEFAULT_SECURITY_APPARMOR = yes;
|
||||
|
||||
RANDOM_TRUST_CPU = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG
|
||||
RANDOM_TRUST_BOOTLOADER = whenAtLeast "5.4" yes; # allow the bootloader to seed the RNG
|
||||
RANDOM_TRUST_CPU = whenOlder "6.2" (whenAtLeast "4.19" yes); # allow RDRAND to seed the RNG
|
||||
RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG
|
||||
|
||||
MODULE_SIG = no; # r13y, generates a random key during build and bakes it in
|
||||
# Depends on MODULE_SIG and only really helps when you sign your modules
|
||||
|
|
@ -830,7 +830,7 @@ let
|
|||
|
||||
EFI_STUB = yes; # EFI bootloader in the bzImage itself
|
||||
EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER =
|
||||
whenAtLeast "5.8" yes; # initrd kernel parameter for EFI
|
||||
whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI
|
||||
CGROUPS = yes; # used by systemd
|
||||
FHANDLE = yes; # used by systemd
|
||||
SECCOMP = yes; # used by systemd >= 231
|
||||
|
|
|
|||
|
|
@ -3,22 +3,15 @@
|
|||
# rtl8189fs is a branch of the rtl8189es driver
|
||||
rtl8189es.overrideAttrs (drv: rec {
|
||||
name = "rtl8189fs-${kernel.version}-${version}";
|
||||
version = "2022-05-20";
|
||||
version = "2022-10-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwrdegoede";
|
||||
repo = "rtl8189ES_linux";
|
||||
rev = "71500c28164369800041d1716ac513457179ce93";
|
||||
sha256 = "sha256-JTv+ssSv5toNcZ5wR6p0Cywdk87z9Bdq0ftU0ekr/98=";
|
||||
rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172";
|
||||
sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jwrdegoede/rtl8189ES_linux/pull/81.patch";
|
||||
sha256 = "sha256-ovFQBIHLk3wi2uwAyr8VmdbuhPcoHsZ/lpA66obVBK4=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Driver for Realtek rtl8189fs";
|
||||
homepage = "https://github.com/jwrdegoede/rtl8189ES_linux/tree/rtl8189fs";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "rtl8814au";
|
||||
version = "${kernel.version}-unstable-2022-08-18";
|
||||
version = "${kernel.version}-unstable-2022-11-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "morrownr";
|
||||
repo = "8814au";
|
||||
rev = "752d8ea365b2affc5d356e35659600995508849d";
|
||||
hash = "sha256-m79IVoD3xFigmax13qELx5e3v0NfJSwmmC0PatA91HI=";
|
||||
rev = "932df6f7da6c3a384cf91f33eb195097eb0cb6c5";
|
||||
hash = "sha256-nMQiT59IIhzpePWWDiyCQFmYLWM42L/mG0BKsbEwreo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ lib, buildGoModule, fetchFromGitea }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitea }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "eris-go";
|
||||
version = "20230123";
|
||||
version = "20230202";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "eris";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-jdeh5lhbu2hxVNdnU0GiMsdXRi8004Xgu2/tgFhqPao=";
|
||||
hash = "sha256-o9FRlUtMk1h8sR+am2gNEQOMgAceRTdRusI4a6ikHUM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mLyPaX5rDw0rR4PXtzpLMOrsYwTH3Y+COcrvwH7/qdo=";
|
||||
vendorHash = "sha256-ZDJm7ZlDBVWLnuC90pOwa608GnuEgy0N/I96vvesZPY=";
|
||||
|
||||
postInstall = "ln -s $out/bin/eris-get $out/bin/eris-put";
|
||||
# eris-get is a multicall binary
|
||||
|
|
@ -22,5 +22,6 @@ buildGoModule rec {
|
|||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
mainProgram = "eris-get";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "libreddit";
|
||||
version = "0.28.0";
|
||||
version = "0.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libreddit";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kiiZxS5ttUZ1FdF/N9sO6GO13Wmij8DwsNa8p+ZTk0k=";
|
||||
hash = "sha256-gwI2ASJkHc2kOmC4D65Te7iz0Kozm8bpq2MUYZRBdtk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0XBJ1tlVO2+iK9O2CDVZxDwFXW8T23j2lSbqpnW3fis=";
|
||||
cargoSha256 = "sha256-9NkWYurq7S4ysnP7oLoggMNAIFay5qVWcuer4EOrQEA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gobgpd";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osrg";
|
||||
repo = "gobgp";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aVvzbWMh/r1k3AKDHipWkwEevYPj8Xfix8PfIMYXiTM=";
|
||||
hash = "sha256-UGRGJqeVWrt8NVf9d5Mk7k+k2Is/fwHv2X0hmyXvTZs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk=";
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
|
||||
in package.override rec {
|
||||
pname = "bookstack";
|
||||
version = "22.11.1";
|
||||
version = "23.01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bookstackapp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0yofstZiTK/I6c8go5ENivq41nOfL+0mzIHgbQSEUWo=";
|
||||
sha256 = "0d2hqqa4x133ni8j0dijzn9653iq44ax4rly85g9kiwrjd0l17cw";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -15,20 +15,20 @@ let
|
|||
"aws/aws-sdk-php" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "aws-aws-sdk-php-337e447997148b9e5024c2d0ae69618b1cbf80d6";
|
||||
name = "aws-aws-sdk-php-c600a07da531d6c29af791b9d2e8b6df796aa14b";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/337e447997148b9e5024c2d0ae69618b1cbf80d6";
|
||||
sha256 = "1pwghj67zah616cvdrbs2fwgwn99jhxi95mdfq6l2jhpy59gymkc";
|
||||
url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/c600a07da531d6c29af791b9d2e8b6df796aa14b";
|
||||
sha256 = "03iisnif804dkgnynn24y6ji1hnq95ryv8vwgwi6398apcz6vypn";
|
||||
};
|
||||
};
|
||||
};
|
||||
"bacon/bacon-qr-code" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "bacon-bacon-qr-code-d70c840f68657ce49094b8d91f9ee0cc07fbf66c";
|
||||
name = "bacon-bacon-qr-code-8674e51bb65af933a5ffaf1c308a660387c35c22";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c";
|
||||
sha256 = "0k2z8a6qz5xg1p85vwcp58yqbiw8bmnp3hg2pjcaqlimnf65v058";
|
||||
url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22";
|
||||
sha256 = "0hb0w6m5rwzghw2im3yqn6ly2kvb3jgrv8jwra1lwd0ik6ckrngl";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -85,10 +85,10 @@ let
|
|||
"doctrine/dbal" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "doctrine-dbal-f38ee8aaca2d58ee88653cb34a6a3880c23f38a5";
|
||||
name = "doctrine-dbal-88fa7e5189fd5ec6682477044264dc0ed4e3aa1e";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/doctrine/dbal/zipball/f38ee8aaca2d58ee88653cb34a6a3880c23f38a5";
|
||||
sha256 = "09kv9g6693gr3i2wbfc1riyzgfkm5kkamhzfj4skrsw14pvacsgf";
|
||||
url = "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e";
|
||||
sha256 = "1xz7yyq0r8378zb4jrac13z0762pid0dxxnaj0rx82f7vwbxaqas";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -235,10 +235,10 @@ let
|
|||
"laravel/framework" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "laravel-framework-7411d9fa71c1b0fd73a33e225f14512b74e6c81e";
|
||||
name = "laravel-framework-e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/laravel/framework/zipball/7411d9fa71c1b0fd73a33e225f14512b74e6c81e";
|
||||
sha256 = "0pdxr823p52cf284yfqwncii52g4zgk2gw5prn774h26v42dwaqw";
|
||||
url = "https://api.github.com/repos/laravel/framework/zipball/e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49";
|
||||
sha256 = "1k7afj4himxmhv02lmq8dc992m2vdkw8hcjyfcnff99cv555z9ph";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -255,20 +255,20 @@ let
|
|||
"laravel/socialite" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "laravel-socialite-1cd1682b709b8808a5b5dbb68179a58d1342aa7b";
|
||||
name = "laravel-socialite-dae03ca4ecfe3badafcdfb81965d2279080051f4";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/laravel/socialite/zipball/1cd1682b709b8808a5b5dbb68179a58d1342aa7b";
|
||||
sha256 = "0h37rw9ndh56dh71d8jaxidpnyr7xs42nnim88aaxas304j7jdwa";
|
||||
url = "https://api.github.com/repos/laravel/socialite/zipball/dae03ca4ecfe3badafcdfb81965d2279080051f4";
|
||||
sha256 = "1cv67knibrhyfbimgbnig4hrnq2rjyi7kqmsqyqs7il2nizl51vm";
|
||||
};
|
||||
};
|
||||
};
|
||||
"laravel/tinker" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "laravel-tinker-5062061b4924af3392225dd482ca7b4d85d8b8ef";
|
||||
name = "laravel-tinker-74d0b287cc4ae65d15c368dd697aae71d62a73ad";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/laravel/tinker/zipball/5062061b4924af3392225dd482ca7b4d85d8b8ef";
|
||||
sha256 = "0smv55xbj6pk223v3nfd0fi5n4l8v85c4pra98ahq3615xma3k8c";
|
||||
url = "https://api.github.com/repos/laravel/tinker/zipball/74d0b287cc4ae65d15c368dd697aae71d62a73ad";
|
||||
sha256 = "1rhppd4zzz47abjahid8hdhwrzjrnbwkcy0cqqws5dia4x81k7xb";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -375,20 +375,20 @@ let
|
|||
"nesbot/carbon" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "nesbot-carbon-ad35dd71a6a212b98e4b87e97389b6fa85f0e347";
|
||||
name = "nesbot-carbon-09acf64155c16dc6f580f36569ae89344e9734a3";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/ad35dd71a6a212b98e4b87e97389b6fa85f0e347";
|
||||
sha256 = "1a7qlk82jfxnf84v4vwwgs9b325mb07whkc5vxrqjjjp8krncxbi";
|
||||
url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/09acf64155c16dc6f580f36569ae89344e9734a3";
|
||||
sha256 = "1m4sb4vnimg3238g0mivnxgfmf3lwkb3v2njmird20jrh48k4c69";
|
||||
};
|
||||
};
|
||||
};
|
||||
"nikic/php-parser" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "nikic-php-parser-f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc";
|
||||
name = "nikic-php-parser-570e980a201d8ed0236b0a62ddf2c9cbb2034039";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc";
|
||||
sha256 = "0lsw925jy1y1vvsx5da6abn1ky7g6whaxx9g524jgqgbaljrjhxm";
|
||||
url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039";
|
||||
sha256 = "1q3hnpjya4rsxfh72ccs2vj3gz8h0sn12290w8wvkz9pvi0qmmmr";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -465,10 +465,10 @@ let
|
|||
"phpseclib/phpseclib" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "phpseclib-phpseclib-dbc2307d5c69aeb22db136c52e91130d7f2ca761";
|
||||
name = "phpseclib-phpseclib-f28693d38ba21bb0d9f0c411ee5dae2b178201da";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761";
|
||||
sha256 = "1xpb0wi54rg33w7w357l6vh1kg9yh0pwabhmf8r9ih35s05n58a9";
|
||||
url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/f28693d38ba21bb0d9f0c411ee5dae2b178201da";
|
||||
sha256 = "11hvq1mwk2zn1fgrwvifh5z4md178vzka5nfykj8l28vk7r0vb98";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -575,10 +575,10 @@ let
|
|||
"psy/psysh" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "psy-psysh-1acec99d6684a54ff92f8b548a4e41b566963778";
|
||||
name = "psy-psysh-e9eadffbed9c9deb5426fd107faae0452bf20a36";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/bobthecow/psysh/zipball/1acec99d6684a54ff92f8b548a4e41b566963778";
|
||||
sha256 = "169v5160qhq07n3mvhifrgvjqrbm0306nn2ibiqwrcfqyyhq43z0";
|
||||
url = "https://api.github.com/repos/bobthecow/psysh/zipball/e9eadffbed9c9deb5426fd107faae0452bf20a36";
|
||||
sha256 = "0yaj5ixg8zb6hh9swpcc29dcrpffjn4cxp61qz2zqbizvq2d6z0z";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -595,10 +595,10 @@ let
|
|||
"ramsey/collection" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "ramsey-collection-cccc74ee5e328031b15640b51056ee8d3bb66c0a";
|
||||
name = "ramsey-collection-ad7475d1c9e70b190ecffc58f2d989416af339b4";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a";
|
||||
sha256 = "1i2ga25aj80cci3di58qm17l588lzgank8wqhdbq0dcb3cg6cgr6";
|
||||
url = "https://api.github.com/repos/ramsey/collection/zipball/ad7475d1c9e70b190ecffc58f2d989416af339b4";
|
||||
sha256 = "1a1wqdwdrbzkf2hias2kw9crr31265pn027vm69pr7alyq2qrzfw";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -725,20 +725,20 @@ let
|
|||
"symfony/console" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-console-ea59bb0edfaf9f28d18d8791410ee0355f317669";
|
||||
name = "symfony-console-58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/console/zipball/ea59bb0edfaf9f28d18d8791410ee0355f317669";
|
||||
sha256 = "1qvr9av4c9kac5q2lpwiwq269rq5pxdvnvb32asysifw30zd5j3d";
|
||||
url = "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f";
|
||||
sha256 = "1r8a7hra81wfs10m235qhq9xdgini4gx9hf86l1ijbp7k6aszk7b";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/css-selector" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-css-selector-c1681789f059ab756001052164726ae88512ae3d";
|
||||
name = "symfony-css-selector-052ef49b660f9ad2a3adb311c555c9bc11ba61f4";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/css-selector/zipball/c1681789f059ab756001052164726ae88512ae3d";
|
||||
sha256 = "1v1kpfqc4njdpqqa668vkz7mqxsklzbsf62pcgdvkbg724ck4zis";
|
||||
url = "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4";
|
||||
sha256 = "1nracybpl4i2w6vcfhymd0p7bj9cnk5s2frp6dah4anfhmdjk16a";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -755,20 +755,20 @@ let
|
|||
"symfony/error-handler" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-error-handler-539cf1428b8442303c6e876ad7bf5a7babd91091";
|
||||
name = "symfony-error-handler-b900446552833ad2f91ca7dd52aa8ffe78f66cb2";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/error-handler/zipball/539cf1428b8442303c6e876ad7bf5a7babd91091";
|
||||
sha256 = "0x2r3kpip9cmdn5d47isamyas13sl43y50wfk23zwj5vh70qgh5s";
|
||||
url = "https://api.github.com/repos/symfony/error-handler/zipball/b900446552833ad2f91ca7dd52aa8ffe78f66cb2";
|
||||
sha256 = "0rsp4l6azy715r638xbxp8aydksz8v8r2kaz2590bg7c44v52zf0";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/event-dispatcher" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-event-dispatcher-8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc";
|
||||
name = "symfony-event-dispatcher-8e18a9d559eb8ebc2220588f1faa726a2fcd31c9";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc";
|
||||
sha256 = "10vdzpy7gvmy0w4lpr4h4xj2gr224k5llc7f356x1jzbijxg8ckh";
|
||||
url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9";
|
||||
sha256 = "0mp91rpqbjarbh9jzyqa8cv012ilarwa9yx2rhqvms8bhk0aq7qi";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -785,40 +785,40 @@ let
|
|||
"symfony/finder" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-finder-7872a66f57caffa2916a584db1aa7f12adc76f8c";
|
||||
name = "symfony-finder-40c08632019838dfb3350f18cf5563b8080055fc";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c";
|
||||
sha256 = "111qy05azqwj14v0k034lwd970slx081x56pnicyxsbg3yc9wmnp";
|
||||
url = "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc";
|
||||
sha256 = "0gszqsqjgjf05hrycks1sgvizlfx1y6qnwh8cvcih50nmqn2q950";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/http-foundation" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-http-foundation-75bd663ff2db90141bfb733682459d5bbe9e29c3";
|
||||
name = "symfony-http-foundation-b64a0e2df212d5849e4584cabff0cf09c5d6866a";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/http-foundation/zipball/75bd663ff2db90141bfb733682459d5bbe9e29c3";
|
||||
sha256 = "195w56aicv57nmcwsai6jklicb9qqak4imk4xwsgc3i98yw3md2w";
|
||||
url = "https://api.github.com/repos/symfony/http-foundation/zipball/b64a0e2df212d5849e4584cabff0cf09c5d6866a";
|
||||
sha256 = "01l1349d2pab5vsihripq8718988yz1kh67bpp3j1xvgzd09b5a1";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/http-kernel" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-http-kernel-fc63c8c3e1036d424820cc993a4ea163778dc5c7";
|
||||
name = "symfony-http-kernel-5da6f57a13e5d7d77197443cf55697cdf65f1352";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/http-kernel/zipball/fc63c8c3e1036d424820cc993a4ea163778dc5c7";
|
||||
sha256 = "0z1cg1ac1r00c0i5apvk8rrglwswcy6gx9w9v5kmk7ajijnk583m";
|
||||
url = "https://api.github.com/repos/symfony/http-kernel/zipball/5da6f57a13e5d7d77197443cf55697cdf65f1352";
|
||||
sha256 = "1y0mqas5v4rhrmsgizv6pqqhxy49hm6wfs1wahaaxcm3zjip1504";
|
||||
};
|
||||
};
|
||||
};
|
||||
"symfony/mime" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-mime-1c118b253bb3495d81e95a6e3ec6c2766a98a0c4";
|
||||
name = "symfony-mime-2a83d82efc91c3f03a23c8b47a896df168aa5c63";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/mime/zipball/1c118b253bb3495d81e95a6e3ec6c2766a98a0c4";
|
||||
sha256 = "1r06lijy4zbqppyfnvnq2arbjn0dwzb1d14lcy5wsbh3k3bgpsvq";
|
||||
url = "https://api.github.com/repos/symfony/mime/zipball/2a83d82efc91c3f03a23c8b47a896df168aa5c63";
|
||||
sha256 = "1rkg5728y052hq1sag41w46kxnmyfm6jf5bn29canbnx05x32xly";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -935,10 +935,10 @@ let
|
|||
"symfony/routing" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-routing-5c9b129efe9abce9470e384bf65d8a7e262eee69";
|
||||
name = "symfony-routing-4ce2df9a469c19ba45ca6aca04fec1c358a6e791";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/routing/zipball/5c9b129efe9abce9470e384bf65d8a7e262eee69";
|
||||
sha256 = "0pa3zqqsa9jf362zdhg8jhppv1z7nnj6hq65dym473p1c3zwyfxb";
|
||||
url = "https://api.github.com/repos/symfony/routing/zipball/4ce2df9a469c19ba45ca6aca04fec1c358a6e791";
|
||||
sha256 = "1dqnxgkm817msrimhfs9l3d3k4zsjy7zgy2avaq23sm4yvm3nbyw";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -955,10 +955,10 @@ let
|
|||
"symfony/string" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-string-571334ce9f687e3e6af72db4d3b2a9431e4fd9ed";
|
||||
name = "symfony-string-55733a8664b8853b003e70251c58bc8cb2d82a6b";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed";
|
||||
sha256 = "1hwji8pwsfb79sdrigbisxs0cjnhs1qbm6rrflhqyhpviwvbhyqx";
|
||||
url = "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b";
|
||||
sha256 = "0mbagzl3kmrfdkvrb2nddngnzz0cy18r59gipmfsa60n1d7bww4l";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -985,20 +985,20 @@ let
|
|||
"symfony/var-dumper" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "symfony-var-dumper-6894d06145fefebd9a4c7272baa026a1c394a430";
|
||||
name = "symfony-var-dumper-ad74890513d07060255df2575703daf971de92c7";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/symfony/var-dumper/zipball/6894d06145fefebd9a4c7272baa026a1c394a430";
|
||||
sha256 = "055s38szlhpxrhv1kjawsm5rwh6dr7drk9jpyj6a5r0g4jn63m72";
|
||||
url = "https://api.github.com/repos/symfony/var-dumper/zipball/ad74890513d07060255df2575703daf971de92c7";
|
||||
sha256 = "0i1k6x0rfg17fjbcqgppp0vmhp7y597vik7vs6475v20rmvhdncd";
|
||||
};
|
||||
};
|
||||
};
|
||||
"tijsverkoyen/css-to-inline-styles" = {
|
||||
targetDir = "";
|
||||
src = composerEnv.buildZipPackage {
|
||||
name = "tijsverkoyen-css-to-inline-styles-4348a3a06651827a27d989ad1d13efec6bb49b19";
|
||||
name = "tijsverkoyen-css-to-inline-styles-c42125b83a4fa63b187fdf29f9c93cb7733da30c";
|
||||
src = fetchurl {
|
||||
url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/4348a3a06651827a27d989ad1d13efec6bb49b19";
|
||||
sha256 = "0fs2w9hw0drf1hszidrmplrph7ay8m8pv58pqv26v0228m4l6vlm";
|
||||
url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c";
|
||||
sha256 = "0ckk04hwwz0fdkfr20i7xrhdjcnnw1b0liknbb81qyr1y4b7x3dd";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ if ! command -v composer2nix &> /dev/null; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
CURRENT_VERSION=$(nix eval --raw '(with import ../../../.. {}; bookstack.version)')
|
||||
CURRENT_VERSION=$(nix eval -f ../../../.. --raw bookstack.version)
|
||||
TARGET_VERSION_REMOTE=$(curl https://api.github.com/repos/bookstackapp/bookstack/releases/latest | jq -r ".tag_name")
|
||||
TARGET_VERSION=${TARGET_VERSION_REMOTE:1}
|
||||
BOOKSTACK=https://github.com/bookstackapp/bookstack/raw/$TARGET_VERSION_REMOTE
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
, libwbxml }:
|
||||
gnustep.stdenv.mkDerivation rec {
|
||||
pname = "SOGo";
|
||||
version = "5.7.0";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inverse-inc";
|
||||
repo = pname;
|
||||
rev = "SOGo-${version}";
|
||||
hash = "sha256-3Xy0y1sdixy4gXhzhP9mfWeaDmOVJty+X95xCyxayPE=";
|
||||
hash = "sha256-lHUEV5yYLs3oc8Arl3KX8G/OEAoLmS7pRLCGsRAJAr4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ];
|
||||
|
|
|
|||
|
|
@ -32,14 +32,6 @@ stdenv.mkDerivation {
|
|||
|
||||
patches = [
|
||||
./wallabag-data.patch # exposes $WALLABAG_DATA
|
||||
|
||||
# Use sendmail from php.ini instead of FHS path.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/symfony/swiftmailer-bundle/commit/31a4fed8f621f141ba70cb42ffb8f73184995f4c.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "vendor/symfony/swiftmailer-bundle/";
|
||||
sha256 = "rxHiGhKFd/ZWnIfTt6omFLLoNFlyxOYNCHIv/UtxCho=";
|
||||
})
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2023-01-26";
|
||||
version = "2023-02-02";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "e55e3f0f56ab4df21eb33e19569c295e7e5e71a4";
|
||||
rev = "f8bf8f0029a475831ebfba0799975ede20e08742";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "gN5jjhbRxSBJiXs1DsUeMHCCsv9qSOxC4guHmjJdW7U=";
|
||||
sha256 = "5xS5SPNnQTde/2UbOBmjKHiq+nr2Wgj4mt7cNa5m7fs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.48.5";
|
||||
version = "0.48.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-umgOIjOzx8qUCcZfM3nGYeYDmqmA2ayy2lGAS+nSU2s=";
|
||||
hash = "sha256-y6dhp5CUq9fJq7Vjib1g1P0TMCeBIcR32LHqNvMgjZI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo=";
|
||||
vendorHash = "sha256-9BXuxeLL3MwefhtV2SLplAgY/KQI1crWrTNSSC4hUXw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -28,10 +28,6 @@ rustPlatform.buildRustPackage rec {
|
|||
homepage = "https://bupstash.io";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
# = note: Undefined symbols for architecture x86_64:
|
||||
# "_utimensat", referenced from:
|
||||
# https://github.com/NixOS/nixpkgs/issues/101229
|
||||
broken = (stdenv.isDarwin && stdenv.isx86_64);
|
||||
maintainers = with maintainers; [ andrewchambers ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httm";
|
||||
version = "0.20.0";
|
||||
version = "0.20.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimono-koans";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FgVXl986PPaX/6TX7MaXPd+NJ3M94fNGa1hFWUDRP8w=";
|
||||
sha256 = "sha256-8ssYzsjXwYH3xVFxtk8zYcJnrc+wKuoV1js0ONRKBGQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uWKSO2odvBeFUcZPGcsEki0PdNVtbVv5g3Dnkxgw2Io=";
|
||||
cargoHash = "sha256-eg5EXvpwIlza7mXc5MFTpaFLQSR2z/7GSPGyBgzzOj4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "agi";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/google/agi/releases/download/v${version}/agi-${version}-linux.zip";
|
||||
sha256 = "sha256-wguQERJ5Zvcodk7QMtloCwI4qYmatmHCFhgArbS07EA=";
|
||||
sha256 = "sha256-vKq1pe4Z0blSvNgez+/MP2rA0+QfCyr3RsCGX4GMR08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ with rec {
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "astc-encoder";
|
||||
version = "4.3.0";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ARM-software";
|
||||
repo = "astc-encoder";
|
||||
rev = version;
|
||||
sha256 = "sha256-FIskGHamKYYUtYmgwh7dS+bs2UPWIyBiviPkDAbVY+0=";
|
||||
sha256 = "sha256-BtSe14LWb7v+I0V75C1Ej+klZVU22L6FQfNUPp27IQQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
, libtiff
|
||||
, libpng
|
||||
, curl
|
||||
, krita ? null
|
||||
, gimp ? null
|
||||
, gmic
|
||||
, cimg
|
||||
|
|
@ -38,13 +37,6 @@ let
|
|||
description = "GIMP plugin for the G'MIC image processing framework";
|
||||
};
|
||||
|
||||
krita = {
|
||||
extraDeps = [
|
||||
krita
|
||||
];
|
||||
description = "Krita plugin for the G'MIC image processing framework";
|
||||
};
|
||||
|
||||
standalone = {
|
||||
description = "Versatile front-end to the image processing framework G'MIC";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
|
||||
, boost, secp256k1 }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbitcoin";
|
||||
version = "3.6.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
|
|
@ -34,7 +31,6 @@ in stdenv.mkDerivation {
|
|||
homepage = "https://libbitcoin.info/";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ ];
|
||||
|
||||
# AGPL with a lesser clause
|
||||
license = licenses.agpl3;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ let
|
|||
in
|
||||
pypkgs.buildPythonApplication rec {
|
||||
pname = "tmuxp";
|
||||
version = "1.23.0";
|
||||
version = "1.27.0";
|
||||
|
||||
src = pypkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "Ix/43QFOa0kCP5xndszFGk0p12w/t/z+fVcYRIj9y0s=";
|
||||
sha256 = "sha256-QAk+rcNYjhAgkJX2fa0bl3dHrB4yyYQ/oNlUX3IQMR8=";
|
||||
};
|
||||
|
||||
# No tests in archive
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hurl";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Orange-OpenSource";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-CQDyIGUIijNphOVo+aYZ7SqkxE4md9+H3D/g7jdqV+M=";
|
||||
sha256 = "sha256-sY2bSCcC+mMuYqLmh+oH76nqg/ybh/nyz3trNH2xPQM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
|||
# Tests require network access to a test server
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "sha256-wNiEULv+0WlZruxibcKqsw4Ym3retwjoGKXxzACcEeA=";
|
||||
cargoSha256 = "sha256-Zv7TTQw4UcuQBhEdjD5nwcE1LonUHLUFf9BVhRWWuDo=";
|
||||
|
||||
postInstall = ''
|
||||
installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1
|
||||
|
|
|
|||
|
|
@ -1,27 +1,34 @@
|
|||
{ fetchFromGitHub, lib, pkg-config, rustPlatform, stdenv, openssl, Security }:
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, openssl
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oha";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hatoo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-NSre4OHzREVM8y9njMkS/whQ0+Ed+R+cLYfRWKmhA98=";
|
||||
sha256 = "sha256-0Z8+dpZs0KMknyuw4Brkr8UosTDk75Kvy6zA/d91xgE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-GPP2eespnxDQoKZkqoPXEthRKk84szFl0LNTeqJQLNs=";
|
||||
cargoSha256 = "sha256-isrfxnZbkIqQJ+jipYXvl1QgQ6hwRMdGA1kKFM1saDQ=";
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.isLinux openssl
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
# remove cargo config so it can find the linker
|
||||
postPatch = ''
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
# tests don't work inside the sandbox
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,15 @@
|
|||
{ lib, stdenv, fetchurl, openssl, nixosTests }:
|
||||
{ lib, stdenv, fetchurl, openssl
|
||||
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stunnel";
|
||||
version = "5.67";
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz";
|
||||
sha256 = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456";
|
||||
|
|
@ -11,11 +17,19 @@ stdenv.mkDerivation rec {
|
|||
# not the output of `nix-prefetch-url`
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals systemdSupport [
|
||||
systemd
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-ssl=${openssl.dev}"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
(lib.enableFeature systemdSupport "systemd")
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "bin" "out" "dev" "man" ];
|
||||
|
||||
passthru.tests = lib.optionalAttrs enableTests {
|
||||
test-xrdcp = callPackage ./test-xrdcp.nix {
|
||||
url = "root://eospublic.cern.ch//eos/opendata/alice/2010/LHC10h/000138275/ESD/0000/AliESDs.root";
|
||||
hash = "sha256-tIcs2oi+8u/Qr+P7AAaPTbQT+DEt26gEdc4VNerlEHY=";
|
||||
};
|
||||
} // lib.optionalAttrs stdenv.isLinux {
|
||||
test-runner = callPackage ./test-runner.nix { };
|
||||
};
|
||||
|
||||
|
|
@ -47,6 +52,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
curl
|
||||
fuse
|
||||
libkrb5
|
||||
libuuid
|
||||
libxcrypt
|
||||
|
|
@ -56,7 +62,6 @@ stdenv.mkDerivation rec {
|
|||
zlib
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
fuse
|
||||
systemd
|
||||
voms
|
||||
]
|
||||
|
|
|
|||
19
pkgs/tools/networking/xrootd/test-xrdcp.nix
Normal file
19
pkgs/tools/networking/xrootd/test-xrdcp.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ lib
|
||||
, runCommandLocal
|
||||
, buildPlatform
|
||||
, xrootd
|
||||
, url
|
||||
, hash
|
||||
}: runCommandLocal (baseNameOf url)
|
||||
{
|
||||
nativeBuildInputs = [ xrootd ];
|
||||
outputHashAlgo = null;
|
||||
outputHashMode = "flat";
|
||||
outputHash = hash;
|
||||
inherit url;
|
||||
}
|
||||
# Set [DY]LD_LIBRARY_PATH to workaround #169677
|
||||
# TODO: Remove the library path after #200830 get merged
|
||||
''
|
||||
${lib.optionalString buildPlatform.isDarwin "DY"}LD_LIBRARY_PATH=${lib.makeLibraryPath [ xrootd ]} xrdcp --force "$url" "$out"
|
||||
''
|
||||
|
|
@ -1,12 +1,38 @@
|
|||
import argparse
|
||||
import os
|
||||
import sys
|
||||
import textwrap
|
||||
import traceback
|
||||
from io import StringIO
|
||||
from pprint import pprint
|
||||
from typing import Any, Dict
|
||||
|
||||
from .md import Converter
|
||||
from . import manual
|
||||
from . import options
|
||||
|
||||
def pretty_print_exc(e: BaseException, *, _desc_text: str = "error") -> None:
|
||||
print(f"\x1b[1;31m{_desc_text}:\x1b[0m", file=sys.stderr)
|
||||
# destructure Exception and RuntimeError specifically so we can show nice
|
||||
# messages for errors that weren't given their own exception type with
|
||||
# a good pretty-printer.
|
||||
if type(e) is Exception or type(e) is RuntimeError:
|
||||
args = e.args
|
||||
if len(args) and isinstance(args[0], str):
|
||||
print("\t", args[0], file=sys.stderr, sep="")
|
||||
args = args[1:]
|
||||
buf = StringIO()
|
||||
for arg in args:
|
||||
pprint(arg, stream=buf)
|
||||
if extra_info := buf.getvalue():
|
||||
print(f"\x1b[1;34mextra info:\x1b[0m", file=sys.stderr)
|
||||
print(textwrap.indent(extra_info, "\t"), file=sys.stderr, end="")
|
||||
else:
|
||||
print(e)
|
||||
if e.__context__ is not None:
|
||||
print("", file=sys.stderr)
|
||||
pretty_print_exc(e.__context__, _desc_text="caused by")
|
||||
|
||||
def main() -> None:
|
||||
parser = argparse.ArgumentParser(description='render nixos manual bits')
|
||||
|
||||
|
|
@ -16,9 +42,14 @@ def main() -> None:
|
|||
manual.build_cli(commands.add_parser('manual'))
|
||||
|
||||
args = parser.parse_args()
|
||||
if args.command == 'options':
|
||||
options.run_cli(args)
|
||||
elif args.command == 'manual':
|
||||
manual.run_cli(args)
|
||||
else:
|
||||
raise RuntimeError('command not hooked up', args)
|
||||
try:
|
||||
if args.command == 'options':
|
||||
options.run_cli(args)
|
||||
elif args.command == 'manual':
|
||||
manual.run_cli(args)
|
||||
else:
|
||||
raise RuntimeError('command not hooked up', args)
|
||||
except Exception as e:
|
||||
traceback.print_exc()
|
||||
pretty_print_exc(e)
|
||||
sys.exit(1)
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ import json
|
|||
|
||||
from abc import abstractmethod
|
||||
from collections.abc import MutableMapping, Sequence
|
||||
from pathlib import Path
|
||||
from typing import Any, cast, NamedTuple, Optional, Union
|
||||
from xml.sax.saxutils import escape, quoteattr
|
||||
from markdown_it.token import Token
|
||||
|
|
@ -26,11 +27,15 @@ class BaseConverter(Converter):
|
|||
super().__init__(manpage_urls)
|
||||
self._sections = []
|
||||
|
||||
def add_section(self, id: Optional[str], chapters: list[str]) -> None:
|
||||
def add_section(self, id: Optional[str], chapters: list[Path]) -> None:
|
||||
self._sections.append(RenderedSection(id))
|
||||
for content in chapters:
|
||||
self._md.renderer._title_seen = False # type: ignore[attr-defined]
|
||||
self._sections[-1].chapters.append(self._render(content))
|
||||
for chpath in chapters:
|
||||
try:
|
||||
with open(chpath, 'r') as f:
|
||||
self._md.renderer._title_seen = False # type: ignore[attr-defined]
|
||||
self._sections[-1].chapters.append(self._render(f.read()))
|
||||
except Exception as e:
|
||||
raise RuntimeError(f"failed to render manual chapter {chpath}") from e
|
||||
|
||||
@abstractmethod
|
||||
def finalize(self) -> str: raise NotImplementedError()
|
||||
|
|
@ -45,7 +50,13 @@ class ManualDocBookRenderer(DocBookRenderer):
|
|||
(tag, attrs) = super()._heading_tag(token, tokens, i, options, env)
|
||||
if self._title_seen:
|
||||
if token.tag == 'h1':
|
||||
raise RuntimeError("only one title heading allowed", token)
|
||||
assert token.map is not None
|
||||
raise RuntimeError(
|
||||
"only one title heading (# [text...]) allowed per manual chapter "
|
||||
f"but found a second in lines [{token.map[0]}..{token.map[1]}]. "
|
||||
"please remove all such headings except the first, split your "
|
||||
"chapters, or demote the subsequent headings to (##) or lower.",
|
||||
token)
|
||||
return (tag, attrs)
|
||||
self._title_seen = True
|
||||
return ("chapter", attrs | {
|
||||
|
|
@ -111,7 +122,7 @@ class ChaptersAction(argparse.Action):
|
|||
values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None:
|
||||
sections = getattr(ns, self.dest)
|
||||
if sections is None: raise argparse.ArgumentError(self, "no active section")
|
||||
sections[-1].chapters.extend(cast(Sequence[str], values))
|
||||
sections[-1].chapters.extend(map(Path, cast(Sequence[str], values)))
|
||||
|
||||
def _build_cli_db(p: argparse.ArgumentParser) -> None:
|
||||
p.add_argument('--manpage-urls', required=True)
|
||||
|
|
@ -124,11 +135,7 @@ def _run_cli_db(args: argparse.Namespace) -> None:
|
|||
with open(args.manpage_urls, 'r') as manpage_urls:
|
||||
md = DocBookConverter(json.load(manpage_urls))
|
||||
for section in args.contents:
|
||||
chapters = []
|
||||
for p in section.chapters:
|
||||
with open(p, 'r') as f:
|
||||
chapters.append(f.read())
|
||||
md.add_section(section.id, chapters)
|
||||
md.add_section(section.id, section.chapters)
|
||||
with open(args.outfile, 'w') as f:
|
||||
f.write(md.finalize())
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gotrue";
|
||||
version = "2.42.0";
|
||||
version = "2.42.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZLonPW7lXaBE039R21DWjRBa7xxRnH9rTNu4PDNOWoY=";
|
||||
hash = "sha256-nMSvc90oZsAbDGktvSBMWZNEAGzz/INLK5K6hawteew=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU=";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bfs";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "bfs";
|
||||
owner = "tavianator";
|
||||
rev = version;
|
||||
sha256 = "sha256-m8Ga0aG+TjWFRo2O2f+NVvdDLGExsPuBGQx6r6mBMXk=";
|
||||
sha256 = "sha256-XsbD5WYa05tldwBylr6CLwARo61/g4IN686pkCpGGM4=";
|
||||
};
|
||||
|
||||
buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl ];
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "nvitop";
|
||||
version = "0.10.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XuehaiPan";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nGdEMLxpw2Ts0dypkoZg3r2NF4IeT1ykbRmrmf9qxrA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-GcwPFPE9opGMvdeIUg0Pj6qkk0qPU8MNnFTq9qIxFFs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -124,6 +124,7 @@ mapAliases ({
|
|||
bazel_0_27 = throw "bazel 0.27 is past end of life as it is not an lts version"; # Added 2022-05-09
|
||||
bazel_0_29 = throw "bazel 0.29 is past end of life as it is not an lts version"; # Added 2022-05-09
|
||||
bazel_1 = throw "bazel 1 is past end of life as it is not an lts version"; # Added 2022-05-09
|
||||
bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02
|
||||
bcat = throw "bcat has been removed because upstream is dead"; # Added 2021-08-22
|
||||
beetsExternalPlugins = throw "beetsExternalPlugins has been deprecated, use beetsPackages.$pluginname"; # Added 2022-05-07
|
||||
beret = throw "beret has been removed"; # Added 2021-11-16
|
||||
|
|
@ -528,7 +529,7 @@ mapAliases ({
|
|||
glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22
|
||||
glimpse = throw "glimpse was removed, as the project was discontinued. You can use gimp instead."; # Added 2022-07-11
|
||||
gmailieer = lieer; # Added 2020-04-19
|
||||
gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07
|
||||
gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02
|
||||
gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08
|
||||
gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06
|
||||
gnome-breeze = throw "gnome-breeze has been removed, use libsForQt5.breeze-gtk instead"; # Added 2022-04-22
|
||||
|
|
|
|||
|
|
@ -1471,7 +1471,7 @@ with pkgs;
|
|||
|
||||
headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { };
|
||||
|
||||
httm = callPackage ../tools/filesystems/httm { };
|
||||
httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
|
||||
|
||||
inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;
|
||||
|
||||
|
|
@ -1601,7 +1601,12 @@ with pkgs;
|
|||
|
||||
xpaste = callPackage ../tools/text/xpaste { };
|
||||
|
||||
xrootd = callPackage ../tools/networking/xrootd { };
|
||||
xrootd = callPackage ../tools/networking/xrootd {
|
||||
fuse =
|
||||
if hostPlatform.isDarwin then osxfuse
|
||||
else if hostPlatform.isLinux then fuse
|
||||
else null;
|
||||
};
|
||||
|
||||
xtrt = callPackage ../tools/archivers/xtrt { };
|
||||
|
||||
|
|
@ -4794,12 +4799,6 @@ with pkgs;
|
|||
|
||||
gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { };
|
||||
|
||||
# NOTE: If overriding qt version, krita needs to use the same qt version as
|
||||
# well.
|
||||
gmic-qt-krita = gmic-qt.override {
|
||||
variant = "krita";
|
||||
};
|
||||
|
||||
gpg-tui = callPackage ../tools/security/gpg-tui {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
|
||||
inherit (darwin) libobjc libresolv;
|
||||
|
|
@ -5786,7 +5785,7 @@ with pkgs;
|
|||
|
||||
bup = callPackage ../tools/backup/bup { };
|
||||
|
||||
bupstash = callPackage ../tools/backup/bupstash { };
|
||||
bupstash = darwin.apple_sdk_11_0.callPackage ../tools/backup/bupstash { };
|
||||
|
||||
burp = callPackage ../tools/backup/burp { };
|
||||
|
||||
|
|
@ -10294,9 +10293,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
oha = callPackage ../tools/networking/oha {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
oha = callPackage ../tools/networking/oha { };
|
||||
|
||||
onetun = callPackage ../tools/networking/onetun {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
|
@ -10406,7 +10403,9 @@ with pkgs;
|
|||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
|
||||
openmvs = callPackage ../applications/science/misc/openmvs { };
|
||||
openmvs = callPackage ../applications/science/misc/openmvs {
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
|
||||
openntpd = callPackage ../tools/networking/openntpd { };
|
||||
|
||||
|
|
@ -15831,8 +15830,8 @@ with pkgs;
|
|||
cargo-wasi = callPackage ../development/tools/rust/cargo-wasi {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-watch = callPackage ../development/tools/rust/cargo-watch {
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices Foundation;
|
||||
cargo-watch = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-watch {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreServices Foundation;
|
||||
};
|
||||
cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { };
|
||||
cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces {
|
||||
|
|
@ -17099,17 +17098,7 @@ with pkgs;
|
|||
|
||||
bam = callPackage ../development/tools/build-managers/bam {};
|
||||
|
||||
bazel = bazel_3;
|
||||
|
||||
bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 {
|
||||
inherit (darwin) cctools;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
|
||||
buildJdk = jdk11_headless;
|
||||
buildJdkName = "java11";
|
||||
runJdk = jdk11_headless;
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
|
||||
bazel_self = bazel_3;
|
||||
};
|
||||
bazel = bazel_6;
|
||||
|
||||
bazel_4 = callPackage ../development/tools/build-managers/bazel/bazel_4 {
|
||||
inherit (darwin) cctools;
|
||||
|
|
|
|||
|
|
@ -12614,8 +12614,6 @@ self: super: with self; {
|
|||
|
||||
zimports = callPackage ../development/python-modules/zimports { };
|
||||
|
||||
zipfile36 = callPackage ../development/python-modules/zipfile36 { };
|
||||
|
||||
zipp = callPackage ../development/python-modules/zipp { };
|
||||
|
||||
zipstream = callPackage ../development/python-modules/zipstream { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue