Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk 2020-05-29 17:06:01 +02:00
commit 36d9eeb9c7
73 changed files with 2595 additions and 1982 deletions

View File

@ -2917,10 +2917,10 @@
name = "Robin Gloster";
};
gnidorah = {
email = "gnidorah@yandex.com";
email = "gnidorah@users.noreply.github.com";
github = "gnidorah";
githubId = 12064730;
name = "Alex Ivanov";
name = "gnidorah";
};
gnxlxnxx = {
email = "gnxlxnxx@web.de";
@ -4735,6 +4735,12 @@
githubId = 3507;
name = "Michael Fellinger";
};
maralorn = {
email = "malte.brandy@maralorn.de";
github = "maralorn";
githubId = 1651325;
name = "Malte Brandy";
};
marcweber = {
email = "marco-oweber@gmx.de";
github = "marcweber";
@ -8171,6 +8177,16 @@
githubId = 6508;
name = "Vincent Demeester";
};
veehaitch = {
name = "Vincent Haupert";
email = "mail@vincent-haupert.de";
github = "veehaitch";
githubId = 15069839;
keys = [{
longkeyid = "rsa4096/0x874BD6F916FAA742";
fingerprint = "4D23 ECDF 880D CADF 5ECA 4458 874B D6F9 16FA A742";
}];
};
velovix = {
email = "xaviosx@gmail.com";
github = "velovix";

View File

@ -341,10 +341,7 @@ in
vault = handleTest ./vault.nix {};
victoriametrics = handleTest ./victoriametrics.nix {};
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
wg-quick = handleTest ./wireguard/wg-quick.nix {};
wireguard = handleTest ./wireguard {};
wireguard-generated = handleTest ./wireguard/generated.nix {};
wireguard-namespaces = handleTest ./wireguard/namespaces.nix {};
wordpress = handleTest ./wordpress.nix {};
xandikos = handleTest ./xandikos.nix {};
xautolock = handleTest ./xautolock.nix {};

View File

@ -0,0 +1,74 @@
{ kernelPackages ? null }:
import ../make-test-python.nix ({ pkgs, lib, ...} :
let
wg-snakeoil-keys = import ./snakeoil-keys.nix;
peer = (import ./make-peer.nix) { inherit lib; };
in
{
name = "wireguard";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ma27 ];
};
nodes = {
peer0 = peer {
ip4 = "192.168.0.1";
ip6 = "fd00::1";
extraConfig = {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.firewall.allowedUDPPorts = [ 23542 ];
networking.wireguard.interfaces.wg0 = {
ips = [ "10.23.42.1/32" "fc00::1/128" ];
listenPort = 23542;
inherit (wg-snakeoil-keys.peer0) privateKey;
peers = lib.singleton {
allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];
inherit (wg-snakeoil-keys.peer1) publicKey;
};
};
};
};
peer1 = peer {
ip4 = "192.168.0.2";
ip6 = "fd00::2";
extraConfig = {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.wireguard.interfaces.wg0 = {
ips = [ "10.23.42.2/32" "fc00::2/128" ];
listenPort = 23542;
allowedIPsAsRoutes = false;
inherit (wg-snakeoil-keys.peer1) privateKey;
peers = lib.singleton {
allowedIPs = [ "0.0.0.0/0" "::/0" ];
endpoint = "192.168.0.1:23542";
persistentKeepalive = 25;
inherit (wg-snakeoil-keys.peer0) publicKey;
};
postSetup = let inherit (pkgs) iproute; in ''
${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0
${iproute}/bin/ip route replace fc00::1/128 dev wg0
'';
};
};
};
};
testScript = ''
start_all()
peer0.wait_for_unit("wireguard-wg0.service")
peer1.wait_for_unit("wireguard-wg0.service")
peer1.succeed("ping -c5 fc00::1")
peer1.succeed("ping -c5 10.23.42.1")
'';
}
)

View File

@ -1,71 +1,27 @@
import ../make-test-python.nix ({ pkgs, lib, ...} :
let
wg-snakeoil-keys = import ./snakeoil-keys.nix;
peer = (import ./make-peer.nix) { inherit lib; };
in
{
name = "wireguard";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ma27 ];
};
{ system ? builtins.currentSystem
, config ? { }
, pkgs ? import ../../.. { inherit system config; }
, kernelVersionsToTest ? [ "5.4" "latest" ]
}:
nodes = {
peer0 = peer {
ip4 = "192.168.0.1";
ip6 = "fd00::1";
extraConfig = {
networking.firewall.allowedUDPPorts = [ 23542 ];
networking.wireguard.interfaces.wg0 = {
ips = [ "10.23.42.1/32" "fc00::1/128" ];
listenPort = 23542;
with pkgs.lib;
inherit (wg-snakeoil-keys.peer0) privateKey;
let
tests = let callTest = p: flip (import p) { inherit system pkgs; }; in {
basic = callTest ./basic.nix;
namespaces = callTest ./namespaces.nix;
wg-quick = callTest ./wg-quick.nix;
generated = callTest ./generated.nix;
};
in
peers = lib.singleton {
allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];
inherit (wg-snakeoil-keys.peer1) publicKey;
};
};
};
};
peer1 = peer {
ip4 = "192.168.0.2";
ip6 = "fd00::2";
extraConfig = {
networking.wireguard.interfaces.wg0 = {
ips = [ "10.23.42.2/32" "fc00::2/128" ];
listenPort = 23542;
allowedIPsAsRoutes = false;
inherit (wg-snakeoil-keys.peer1) privateKey;
peers = lib.singleton {
allowedIPs = [ "0.0.0.0/0" "::/0" ];
endpoint = "192.168.0.1:23542";
persistentKeepalive = 25;
inherit (wg-snakeoil-keys.peer0) publicKey;
};
postSetup = let inherit (pkgs) iproute; in ''
${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0
${iproute}/bin/ip route replace fc00::1/128 dev wg0
'';
};
};
};
};
testScript = ''
start_all()
peer0.wait_for_unit("wireguard-wg0.service")
peer1.wait_for_unit("wireguard-wg0.service")
peer1.succeed("ping -c5 fc00::1")
peer1.succeed("ping -c5 10.23.42.1")
'';
}
listToAttrs (
flip concatMap kernelVersionsToTest (version:
let
v' = replaceStrings [ "." ] [ "_" ] version;
in
flip mapAttrsToList tests (name: test:
nameValuePair "wireguard-${name}-linux-${v'}" (test { kernelPackages = pkgs."linuxPackages_${v'}"; })
)
)
)

View File

@ -1,4 +1,5 @@
import ../make-test-python.nix ({ pkgs, ...} : {
{ kernelPackages ? null }:
import ../make-test-python.nix ({ pkgs, lib, ... } : {
name = "wireguard-generated";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ma27 grahamc ];
@ -6,6 +7,7 @@ import ../make-test-python.nix ({ pkgs, ...} : {
nodes = {
peer1 = {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.firewall.allowedUDPPorts = [ 12345 ];
networking.wireguard.interfaces.wg0 = {
ips = [ "10.10.10.1/24" ];
@ -17,6 +19,7 @@ import ../make-test-python.nix ({ pkgs, ...} : {
};
peer2 = {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.firewall.allowedUDPPorts = [ 12345 ];
networking.wireguard.interfaces.wg0 = {
ips = [ "10.10.10.2/24" ];

View File

@ -1,3 +1,5 @@
{ kernelPackages ? null }:
let
listenPort = 12345;
socketNamespace = "foo";
@ -13,7 +15,7 @@ let
in
import ../make-test-python.nix ({ pkgs, ...} : {
import ../make-test-python.nix ({ pkgs, lib, ... } : {
name = "wireguard-with-namespaces";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ asymmetric ];
@ -23,6 +25,7 @@ import ../make-test-python.nix ({ pkgs, ...} : {
# interface should be created in the socketNamespace
# and not moved from there
peer0 = pkgs.lib.attrsets.recursiveUpdate node {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.wireguard.interfaces.wg0 = {
preSetup = ''
ip netns add ${socketNamespace}
@ -33,6 +36,7 @@ import ../make-test-python.nix ({ pkgs, ...} : {
# interface should be created in the init namespace
# and moved to the interfaceNamespace
peer1 = pkgs.lib.attrsets.recursiveUpdate node {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.wireguard.interfaces.wg0 = {
preSetup = ''
ip netns add ${interfaceNamespace}
@ -43,6 +47,7 @@ import ../make-test-python.nix ({ pkgs, ...} : {
# interface should be created in the socketNamespace
# and moved to the interfaceNamespace
peer2 = pkgs.lib.attrsets.recursiveUpdate node {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.wireguard.interfaces.wg0 = {
preSetup = ''
ip netns add ${socketNamespace}
@ -54,6 +59,7 @@ import ../make-test-python.nix ({ pkgs, ...} : {
# interface should be created in the socketNamespace
# and moved to the init namespace
peer3 = pkgs.lib.attrsets.recursiveUpdate node {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.wireguard.interfaces.wg0 = {
preSetup = ''
ip netns add ${socketNamespace}

View File

@ -1,3 +1,5 @@
{ kernelPackages ? null }:
import ../make-test-python.nix ({ pkgs, lib, ... }:
let
wg-snakeoil-keys = import ./snakeoil-keys.nix;
@ -14,6 +16,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
ip4 = "192.168.0.1";
ip6 = "fd00::1";
extraConfig = {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.firewall.allowedUDPPorts = [ 23542 ];
networking.wg-quick.interfaces.wg0 = {
address = [ "10.23.42.1/32" "fc00::1/128" ];
@ -34,6 +37,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
ip4 = "192.168.0.2";
ip6 = "fd00::2";
extraConfig = {
boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };
networking.wg-quick.interfaces.wg0 = {
address = [ "10.23.42.2/32" "fc00::2/128" ];
inherit (wg-snakeoil-keys.peer1) privateKey;

View File

@ -17,18 +17,15 @@
stdenv.mkDerivation rec {
pname = "musikcube";
version = "0.90.1";
version = "0.92.1";
src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
sha256 = "1ff2cgbllrl2pl5zfbf0cd9qbf6hqpwr395sa1k245ar4f1rfwpg";
sha256 = "0l4ncxqxvp5m014j7vlglhzxhhrxl0c2m71xn0i0a27hn4nc72mr";
};
# https://github.com/clangen/musikcube/issues/339
patches = [ ./dont-strip.patch ];
nativeBuildInputs = [
cmake
pkg-config
@ -46,6 +43,10 @@ stdenv.mkDerivation rec {
taglib
] ++ stdenv.lib.optional systemdSupport systemd;
cmakeFlags = [
"-DDISABLE_STRIP=true"
];
meta = with stdenv.lib; {
description = "A fully functional terminal-based music player, library, and streaming audio server";
homepage = "https://musikcube.com/";

View File

@ -1,14 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3e02666..7c43c7e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -370,9 +370,3 @@ endif()
# they don't yet exist!
add_custom_target(postbuild ALL DEPENDS musikcube musikcubed)
add_custom_command(TARGET postbuild POST_BUILD COMMAND cmake .)
-
-# strip binaries in release mode
-if (CMAKE_BUILD_TYPE MATCHES Release)
- message(STATUS "stripping binaries...")
- add_custom_command(TARGET postbuild POST_BUILD COMMAND "${CMAKE_SOURCE_DIR}/strip-nix.sh")
-endif()

View File

@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let
version = "0.4.12";
version = "0.5.0";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "0q2yf9g6hcwvr2nk3zggkscyf0np6i03q2g7fx10i2kcdr3n9k8c";
sha256 = "0zl3djy9z7cpqk8g8pxrzmmikxsskb0y5qdabg6c683j7x5abjs3";
};
enableParallelBuilding = true;

View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "tiled";
version = "1.3.4";
version = "1.3.5";
src = fetchFromGitHub {
owner = "bjorn";
repo = pname;
rev = "v${version}";
sha256 = "0q3x1v88szxm8177qcnynfiyc7w8sn07ig6c7fjd164q7w30y24m";
sha256 = "0d1bs909vga1k494xnggq1mcjfxjrwa4acc0mj5rv73xqkc9mb2s";
};
nativeBuildInputs = [ pkgconfig qmake ];

View File

@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
version = "7.0.9-0";
sha256 = "1w7ci7v5qlayd7a5z69px94fz3fshvn1diqw7k1ymsyvz5888d39";
version = "7.0.10-14";
sha256 = "1qcsq5884iqis1adpfbx3cwki8v4q9wwh70fpcaqnwwmznmqfq4j";
patches = [];
};
in

View File

@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
version = "6.9.10-71";
sha256 = "0c69xmr8k8c4dplgzxydm30s2dr8biq71x07hc15bw196nsx3srr";
version = "6.9.11-14";
sha256 = "0x51vf48g75cfp0mbwf3ckmlwa6v00592xx3gvrqzjzx7vlayjyg";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pdfcpu";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "pdfcpu";
repo = pname;
rev = "v${version}";
sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4";
sha256 = "09z4z2csp7ld47q36x2id5zadaihisbnk7bkdvci826hwm8km7sl";
};
vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7";

View File

@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
version = "1.0.201";
version = "1.0.216";
desktopItem = makeDesktopItem {
name = "Joplin";
exec = "joplin-desktop";
@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec {
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage";
sha256 = "060dkgamsv59vgslqyjfh1g8wg3nldrvfb9lf0y9sxjlbsv8bc55";
sha256 = "17rb7h98h9i2p5kw5gznx5swpz6yxqdxwc9x5cgbkc31vk10iszn";
};
@ -42,7 +42,7 @@ in appimageTools.wrapType2 rec {
'';
homepage = "https://joplinapp.org";
license = licenses.mit;
maintainers = with maintainers; [ hugoreeves rafaelgg raquelgb ];
maintainers = with maintainers; [ hugoreeves ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -29,6 +29,10 @@ mkDerivation rec {
"${src}/FindQuaZip5.patch"
];
qtWrapperArgs = [
"--suffix PATH : ${lib.makeBinPath [ gdal routino ]}"
];
meta = with lib; {
homepage = "https://github.com/Maproom/qmapshack";
description = "Consumer grade GIS software";

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "qbec";
version = "0.11.0";
version = "0.11.2";
src = fetchFromGitHub {
owner = "splunk";
repo = "qbec";
rev = "v${version}";
sha256 = "0krdfaha19wzi10rh0wfhki5nknbd5mndaxhrq7y9m840xy43d6d";
sha256 = "1lf9srkmi7r6p3him19akzag13hj8arwlkm9mdy8a8fg1ascqbm4";
};
vendorSha256 = "1cyr621fb6hxwswz9lf75brc9qjy1n9rqjkwi6r8s3y6nhw20db6";

View File

@ -0,0 +1,25 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule {
pname = "go-neb";
version = "unstable-2020-04-09";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "go-neb";
rev = "1e297c50ad2938e511a3c86f4b190fd3fc3559d6";
sha256 = "1azwy4s4kmypps1fjbz76flpi1b7sjzjj4qwx94cry0hn3qfnrc6";
};
subPackages = [ "." ];
patches = [ ./go-mod.patch ];
vendorSha256 = "1k3980yf6zl00dkd1djwhm2f9nnffzrsbs3kq3alpw2gm0aln739";
meta = with lib; {
description = "Extensible matrix bot written in Go";
homepage = "https://github.com/matrix-org/go-neb";
license = licenses.asl20;
maintainers = with maintainers; [ hexa maralorn ];
};
}

View File

@ -0,0 +1,50 @@
diff --git a/go.mod b/go.mod
index 8ed4e68..83526e7 100644
--- a/go.mod
+++ b/go.mod
@@ -4,24 +4,15 @@ go 1.14
require (
github.com/PuerkitoBio/goquery v1.5.1 // indirect
- github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
- github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect
github.com/andygrunwald/go-jira v1.11.0
github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/dghubble/oauth1 v0.6.0
github.com/die-net/lrucache v0.0.0-20190707192454-883874fe3947
- github.com/go-kit/kit v0.9.0 // indirect
- github.com/go-logfmt/logfmt v0.4.0 // indirect
- github.com/go-stack/stack v1.8.0 // indirect
- github.com/gogo/protobuf v1.1.1 // indirect
github.com/golang/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.4.0 // indirect
github.com/google/go-github v2.0.1-0.20160719063544-b5e5babef39c+incompatible
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
github.com/jaytaylor/html2text v0.0.0-20200220170450-61d9dc4d7195
- github.com/json-iterator/go v1.1.9 // indirect
- github.com/julienschmidt/httprouter v1.2.0 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/lib/pq v1.3.0
github.com/matrix-org/dugong v0.0.0-20180820122854-51a565b5666b
@@ -32,9 +23,6 @@ require (
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mmcdole/gofeed v1.0.0-beta2
github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
- github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
- github.com/modern-go/reflect2 v1.0.1 // indirect
- github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 // indirect
github.com/olekukonko/tablewriter v0.0.4 // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/prometheus/client_golang v0.8.1-0.20160916180340-5636dc67ae77
@@ -47,10 +35,7 @@ require (
github.com/stretchr/testify v1.4.0 // indirect
golang.org/x/net v0.0.0-20200301022130-244492dfa37a
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
- golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 // indirect
- golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c // indirect
- gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v2 v2.2.8
)

View File

@ -4,11 +4,11 @@
}:
python2.pkgs.buildPythonApplication rec {
pname = "chirp-daily";
version = "20200409";
version = "20200430";
src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
sha256 = "16zhwg2xmp5kpqx5isavwwkfq1212zgfj8gbp453ngjcrvp3m4lq";
sha256 = "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda";
};
propagatedBuildInputs = with python2.pkgs; [

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "dump1090";
version = "3.8.0";
version = "3.8.1";
src = fetchFromGitHub {
owner = "flightaware";
repo = pname;
rev = "v${version}";
sha256 = "0c30x56h79hza9m6b9zp5y28jxx4f4n5xgaaw597l8agcm5iia0p";
sha256 = "0xg8rzrxqklx1m9ncxsd96dlkbjcsxfi2mrb859v50f07xysdyd8";
};
nativeBuildInputs = [ pkgconfig ];

View File

@ -2,12 +2,12 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
stdenv.mkDerivation rec {
version = "4.1.12";
version = "4.1.13";
pname = "fldigi";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1yjjv2ss84xfiaidypp476mhrbpnw4zf7mb5cdqwhdh604x0svr1";
sha256 = "0mlq4z5k3h466plij8hg9xn5xbjxk557g4pw13cplpf32fhng224";
};
buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio

View File

@ -7,7 +7,7 @@ with stdenv; with lib;
mkDerivation rec {
name = "cvs-fast-export-${meta.version}";
meta = {
version = "1.53";
version = "1.55";
description = "Export an RCS or CVS history as a fast-import stream";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dfoxfranke ];
@ -16,8 +16,8 @@ mkDerivation rec {
};
src = fetchurl {
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.53.tar.gz";
sha256 = "01zda8qbi9cm2p23cxw0h5cx55ysr0v7dzzbpx9qa19wpv75kisb";
url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.55.tar.gz";
sha256 = "06y2myhhv2ap08bq7d7shq0b7lq6wgznwrpz6622xq66cxkf2n5g";
};
buildInputs = [

View File

@ -1,6 +1,6 @@
{ buildVersion, sha256, dev ? false }:
{ fetchurl, stdenv, xorg, glib, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
{ fetchurl, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook
, pkexecPath ? "/run/wrappers/bin/pkexec"
, writeScript, common-updater-scripts, curl, gnugrep, coreutils
}:
@ -40,7 +40,7 @@ in let
for binary in ${ builtins.concatStringsSep " " binaries }; do
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
--set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
$binary
done

View File

@ -4,13 +4,13 @@ let
common = opts: callPackage (import ./common.nix opts);
in {
sublime-merge = common {
buildVersion = "1116";
sha256 = "0cwvn47dv0sg8cp8i3njmp4p58c6wjv6g75g09igx25waysn9cx6";
buildVersion = "2020";
sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp";
} {};
sublime-merge-dev = common {
buildVersion = "1115";
sha256 = "0dwgc9libqipwdgdc84maj1i3c8hbadz2318x1pibl6hbqy15bxl";
buildVersion = "2011";
sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp";
dev = true;
} {};
}

View File

@ -76,7 +76,7 @@ in buildBazelPackage rec {
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
'';
sha256 = "0r11kbyp1ambgcj35gvjjmxrsrdg7b9jb9sq3kih4lik7zyljp25";
sha256 = "164r8m95g7njh232xfc7zcn1nssaw9bnin9k7ssj9mk6z7z9zy5v";
};
buildAttrs = {

View File

@ -42,7 +42,7 @@ let
# consecutive calls to buildEnv and overrides to work as
# expected.
mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable (
{ extensions ? ({...}: []), extraConfig ? "", ... }@innerArgs:
{ extensions ? ({ enabled, ... }: enabled), extraConfig ? "", ... }@innerArgs:
let
allArgs = args // prevArgs // innerArgs;
filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ];
@ -55,8 +55,8 @@ let
allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
enabledExtensions =
builtins.foldl'
(state: f:
f { enabled = state; all = php-packages.extensions; })
(enabled: f:
f { inherit enabled; all = php-packages.extensions; })
[]
allExtensionFunctions;

View File

@ -0,0 +1,21 @@
{ stdenv, fetchurl, gnum4 }:
stdenv.mkDerivation rec {
pname = "libfyaml";
version = "0.5.7";
src = fetchurl {
url = "https://github.com/pantoniou/libfyaml/releases/download/v${version}/libfyaml-${version}.tar.gz";
sha256 = "143m30f006jsvhikk9nc050hxzqi8xg0sbd88kjrgfpyncdz689j";
};
nativeBuildInputs = [ gnum4 ];
meta = with stdenv.lib; {
homepage = "https://github.com/pantoniou/libfyaml";
description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
platforms = platforms.all;
};
}

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake }:
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "onig";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1sx683hbb58gbjvla69n5vxdzwqhjqisqbfkf9xi95wr7p9ycjhl";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
homepage = "https://github.com/kkos/oniguruma";

View File

@ -1,30 +0,0 @@
{stdenv, buildOcaml, fetchurl, type_conv,
bin_prot_p4, comparelib, custom_printf, enumerate,
fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit,
pipebang, sexplib_p4, typerep_p4, variantslib_p4}:
buildOcaml rec {
name = "core_kernel";
version = "112.24.00";
minimumSupportedOcamlVersion = "4.02";
src = fetchurl {
url = "https://github.com/janestreet/core_kernel/archive/${version}.tar.gz";
sha256 = "93e1f21e35ade98a2bfbe45ba76eef4a8ad3fed97cdc0769f96e0fcc86d6a761";
};
hasSharedObjects = true;
buildInputs = [ pa_test pa_ounit ];
propagatedBuildInputs = [ type_conv pa_bench bin_prot_p4 comparelib custom_printf
enumerate fieldslib_p4 herelib pipebang sexplib_p4
typerep_p4 variantslib_p4 ];
meta = with stdenv.lib; {
homepage = "https://github.com/janestreet/core_kernel";
description = "Jane Street Capital's standard library overlay (kernel)";
license = licenses.asl20;
maintainers = [ maintainers.ericbmerritt ];
};
}

View File

@ -1,18 +0,0 @@
{stdenv, buildOcamlJane,
bin_prot, fieldslib, sexplib, typerep, variantslib,
ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}:
buildOcamlJane {
name = "core_kernel";
hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6";
propagatedBuildInputs =
[ bin_prot fieldslib sexplib typerep variantslib
ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ];
meta = with stdenv.lib; {
homepage = "https://github.com/janestreet/core_kernel";
description = "Jane Street Capital's standard library overlay (kernel)";
license = licenses.asl20;
maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
};
}

View File

@ -36,7 +36,7 @@ let
bazelTarget = ":install";
fetchAttrs = {
sha256 = "0jlgmwcanfkhkwvh4vxibpi0zyyl6xkjzcz2xqn7raympqscq81a";
sha256 = "1xwrha692if7rwqc0qalgpx9b8indgdan8ppwlcs2v47wjvgg6h3";
};
bazelFlags = [

View File

@ -7,11 +7,11 @@
buildPythonPackage (rec {
pname = "elasticsearch";
version = "7.6.0";
version = "7.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "1j499w9hbpyx0v83xnn1vrm45amx5lbnhlik65v5z1n0gb9v4a6j";
sha256 = "1fm6lalyiy4ayj0mp400dvy629j2av5cqww72w4cg8bqifb83pim";
};
# Check is disabled because running them destroy the content of the local cluster!

View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pyyaml
, jinja2
}:
buildPythonPackage rec {
pname = "HiYaPyCo";
version = "0.4.16";
src = fetchFromGitHub {
owner = "zerwes";
repo = pname;
rev = "release-${version}";
sha256 = "1ams9dp05yhgbg6255wrjgchl2mqg0s34d8b8prvql9lsh59s1fj";
};
propagatedBuildInputs = [ pyyaml jinja2 ];
checkPhase = ''
set -e
find test -name 'test_*.py' -exec python {} \;
'';
meta = with lib; {
description = "A simple python lib allowing hierarchical overlay of config files in YAML syntax, offering different merge methods and variable interpolation based on jinja2.";
homepage = "https://github.com/zerwes/hiyapyco";
license = licenses.gpl3;
maintainers = with maintainers; [ veehaitch ];
};
}

View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "scrypt";
version = "0.8.13";
version = "0.8.15";
src = fetchPypi {
inherit pname version;
sha256 = "1377b1adc98c4152694bf5d7e93b41a9d2e9060af69b747cfad8c93ac426f9ea";
sha256 = "0643fwj8vl96bsl30jx091zicmwyi0gglza66xqhqizqyqjq0ag6";
};
buildInputs = [ openssl ];

View File

@ -0,0 +1,31 @@
{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub
, mock, pytest, pytest-asyncio
}:
buildPythonPackage rec {
pname = "pygls";
version = "0.8.1";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "openlawlibrary";
repo = pname;
rev = "v${version}";
sha256 = "1853rfdks5n8nw6ig96j7his5kqd75hrvzvd0win4niycaqsag6m";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pytest==4.5.0" "pytest"
'';
checkInputs = [ mock pytest pytest-asyncio ];
checkPhase = "pytest";
meta = with stdenv.lib; {
homepage = "https://github.com/openlawlibrary/pygls";
description = "Pythonic generic implementation of the Language Server Protocol";
license = licenses.asl20;
maintainers = with maintainers; [ metadark ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv, buildPythonPackage, fetchFromGitHub
, setuptools_scm, pytest, cmake
}:
buildPythonPackage rec {
pname = "pytest-datadir";
version = "1.3.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "gabrielcnr";
repo = pname;
rev = version;
sha256 = "0kwgp6sqnqnmww5r0dkmyfpi0lmw0iwxz3fnwn2fs8w6bvixzznf";
};
nativeBuildInputs = [ setuptools_scm ];
preBuild = ''
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
'';
checkInputs = [ pytest ];
checkPhase = "pytest";
meta = with stdenv.lib; {
homepage = "https://github.com/gabrielcnr/pytest-datadir";
description = "pytest plugin for manipulating test data directories and files";
license = licenses.mit;
maintainers = with maintainers; [ metadark ];
};
}

View File

@ -36,6 +36,7 @@ buildPythonPackage rec {
'';
postPatch = ''
sed -i '38,45d' setup.py
substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" ""
'';

View File

@ -53,6 +53,10 @@ buildPythonPackage rec {
# ${python.interpreter} -m pytest spacy/tests --vectors --models --slow
# '';
postPatch = ''
substituteInPlace setup.cfg --replace "thinc==7.4.0" "thinc>=7.4.0,<8"
'';
meta = with lib; {
description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython";
homepage = "https://github.com/explosion/spaCy";

View File

@ -61,7 +61,7 @@ let
bazelTarget = ":pip_pkg";
fetchAttrs = {
sha256 = "0nmk7sbgl1ag20333v9r7l5cka6wapbskikfhi3y5a8l9f6hxkl3";
sha256 = "1snj7fxfxzvrqv9cpir1daxcg3fip6cvbk94y3mi2h50k3ni826i";
};
buildAttrs = {

View File

@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "thinc";
version = "7.4.0";
version = "7.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "1f2qpjb8nfdklqp3vf6m36bklydlnr8y8v207p8d2gmapzhrngjj";
sha256 = "17lampllwq50yjl2djs9bs5rp29xw55gqj762npqi3cvvj2glf81";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

View File

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.1.3";
version = "2.1.4";
dontConfigure = true;
dontBuild = true;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "1b0hqc8zs6v47w9sjk40sbj1fw5x5bxg7kw9s84y6s60yr897376";
sha256 = "0jgwvc9flqdm88q9kknzjs125j9d3j5l5adcpngfy17ljgziy4nn";
};
nativeBuildInputs = [

View File

@ -60,7 +60,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
sha256 = "0ili0123xcl0mjcrn4r1r1q9d7a8a3bbh9r3zhlshl39awfm4r2d";
sha256 = "0i77nnbd1sd39qw4vm3n5mwkag3dskqjhzr7qs4w1arbiih45zd4";
};
buildAttrs = {

View File

@ -64,7 +64,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
sha256 = "1hzb84zxav68ysdwkimaaz0b9rq95k3bgifw01m644v7idabrz50";
sha256 = "0rfjyvw370yn4rp1f2772b2h3jbycymdw26zx38krzy5zq0iajyp";
};
buildAttrs = {

View File

@ -1,506 +0,0 @@
{
"0.16.2.zip": {
"name": "0.16.2.zip",
"sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip",
"https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"
]
},
"0.28.3.tar.gz": {
"name": "0.28.3.tar.gz",
"sha256": "d8c2f20deb2f6143bac792d210db1a4872102d81529fe0ea3476c1696addd7ff",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/0.28.3.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"
]
},
"8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip": {
"name": "8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip"
]
},
"8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": {
"name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
"sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
"https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"
]
},
"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"
]
},
"android_tools_pkg-0.13.tar.gz": {
"name": "android_tools_pkg-0.13.tar.gz",
"sha256": "3ca6a5e6576a9cda7c59f5fd33b1fe096725730712057c5893589ac15b019407",
"urls": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.13.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",
"sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52",
"strip_prefix": "bazel-skylib-f83cb8dd6f5658bc574ccd873e25197055265d1c",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"
]
},
"bazel_toolchains": {
"name": "bazel_toolchains",
"sha256": "d8c2f20deb2f6143bac792d210db1a4872102d81529fe0ea3476c1696addd7ff",
"strip_prefix": "bazel-toolchains-0.28.3",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz"
]
},
"build_bazel_rules_nodejs": {
"name": "build_bazel_rules_nodejs",
"sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0",
"strip_prefix": "rules_nodejs-0.16.2",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip",
"https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"
]
},
"c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": {
"name": "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.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"
]
},
"coverage_output_generator-v2.1.zip": {
"name": "coverage_output_generator-v2.1.zip",
"sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e",
"urls": [
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.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"
]
},
"f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": {
"name": "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
"sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"
]
},
"io_bazel_rules_sass": {
"name": "io_bazel_rules_sass",
"sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898",
"strip_prefix": "rules_sass-8ccf4f1c351928b55d5dddf3672e3667f6978d60",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
"https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"
]
},
"io_bazel_skydoc": {
"name": "io_bazel_skydoc",
"sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
"strip_prefix": "skydoc-c7bbde2950769aac9a99364b0926230060a3ce04",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz"
]
},
"java_tools_javac11_darwin-v7.0.zip": {
"name": "java_tools_javac11_darwin-v7.0.zip",
"sha256": "373a4226906ae9ba908550da16e133c4cd1f01b8973af82b9a2eb6903cb4d645",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v7.0/java_tools_javac11_darwin-v7.0.zip"
]
},
"java_tools_javac11_linux-v7.0.zip": {
"name": "java_tools_javac11_linux-v7.0.zip",
"sha256": "3ff465e82954a70f49982610dd63f6f651beaa83c707dd637870b0e41cdcd2f0",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v7.0/java_tools_javac11_linux-v7.0.zip"
]
},
"java_tools_javac11_windows-v7.0.zip": {
"name": "java_tools_javac11_windows-v7.0.zip",
"sha256": "11d90a147919e74d11870cdd58c4ee5de3062c08d11b16aa72d3f3bbfa9497a0",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v7.0/java_tools_javac11_windows-v7.0.zip"
]
},
"java_tools_langtools_javac10": {
"name": "java_tools_langtools_javac10",
"sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.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"
]
},
"java_tools_langtools_javac12": {
"name": "java_tools_langtools_javac12",
"sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip"
]
},
"java_tools_langtools_javac9": {
"name": "java_tools_langtools_javac9",
"sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip"
]
},
"jdk10-server-release-1804.tar.xz": {
"name": "jdk10-server-release-1804.tar.xz",
"sha256": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be",
"urls": [
"https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz"
]
},
"jdk9-server-release-1708.tar.xz": {
"name": "jdk9-server-release-1708.tar.xz",
"sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022",
"urls": [
"https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz"
]
},
"openjdk10_linux_archive": {
"build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])",
"name": "openjdk10_linux_archive",
"sha256": "b3c2d762091a615b0c1424ebbd05d75cc114da3bf4f25a0dec5c51ea7e84146f",
"strip_prefix": "zulu10.2+3-jdk10.0.1-linux_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64.tar.gz"
]
},
"openjdk11_linux_archive": {
"build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])",
"name": "openjdk11_linux_archive",
"sha256": "ddb0fd4526089cf1ce2db36282c282263f587a9e8be373fa02f511a12923cc48",
"strip_prefix": "zulu11.31.11-ca-jdk11.0.3-linux_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.31.11-ca-jdk11.0.3/zulu11.31.11-ca-jdk11.0.3-linux_x64.tar.gz"
]
},
"openjdk12_linux_archive": {
"build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])",
"name": "openjdk12_linux_archive",
"sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13",
"strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz"
]
},
"openjdk9_linux_archive": {
"build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])",
"name": "openjdk9_linux_archive",
"sha256": "45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8",
"strip_prefix": "zulu9.0.7.1-jdk9.0.7-linux_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64.tar.gz"
]
},
"openjdk_linux": {
"downloaded_file_path": "zulu-linux.tar.gz",
"name": "openjdk_linux",
"sha256": "460d8a4f0c0204160b48086e341b22943c9cca471b195340e75b38ae9eb33c1c",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209950.tar.gz"
]
},
"openjdk_linux_aarch64": {
"downloaded_file_path": "zulu-linux-aarch64.tar.gz",
"name": "openjdk_linux_aarch64",
"sha256": "23c37c0c3a8fdcbc68e96e70ff5c5c020c14db76deaae9b547849afda4586e5e",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-allmodules-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz"
]
},
"openjdk_linux_aarch64_minimal": {
"downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz",
"name": "openjdk_linux_aarch64_minimal",
"sha256": "7af2583fe5ef0a781d4a9dca0c0160d42e7db1305ec1b66f98aa44c91cc875df",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-minimal-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz"
]
},
"openjdk_linux_aarch64_vanilla": {
"downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz",
"name": "openjdk_linux_aarch64_vanilla",
"sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz"
]
},
"openjdk_linux_minimal": {
"downloaded_file_path": "zulu-linux-minimal.tar.gz",
"name": "openjdk_linux_minimal",
"sha256": "5123bc8dd21886761d1fd9ca0fb1898b3372d7243064a070ec81ca9c9d1a6791",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556011926.tar.gz"
]
},
"openjdk_linux_vanilla": {
"downloaded_file_path": "zulu-linux-vanilla.tar.gz",
"name": "openjdk_linux_vanilla",
"sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz"
]
},
"openjdk_macos": {
"downloaded_file_path": "zulu-macos.tar.gz",
"name": "openjdk_macos",
"sha256": "8fa61d85ca6f657d646fdb50cfc8634987f8f7d8a3250ed39fb7364647633252",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209951.tar.gz"
]
},
"openjdk_macos_minimal": {
"downloaded_file_path": "zulu-macos-minimal.tar.gz",
"name": "openjdk_macos_minimal",
"sha256": "ac56e44db46fd56ac78b39b6823daed4faa74a2677ac340c7d217f863884ec0f",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003114.tar.gz"
]
},
"openjdk_macos_vanilla": {
"downloaded_file_path": "zulu-macos-vanilla.tar.gz",
"name": "openjdk_macos_vanilla",
"sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip"
]
},
"openjdk_win": {
"downloaded_file_path": "zulu-win.zip",
"name": "openjdk_win",
"sha256": "e6ddb361309f8e84eb5fb5ad8b0f5cc031ba3679910139262c31efd8f7579d05",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip"
]
},
"openjdk_win_minimal": {
"downloaded_file_path": "zulu-win-minimal.zip",
"name": "openjdk_win_minimal",
"sha256": "8e5dada6e9ebcc9ce29b4d051449bb95d3ee1e620e166da862224bbf15211f8b",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003136.zip"
]
},
"openjdk_win_vanilla": {
"downloaded_file_path": "zulu-win-vanilla.zip",
"name": "openjdk_win_vanilla",
"sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-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"
]
},
"rules_cc": {
"name": "rules_cc",
"sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f",
"strip_prefix": "rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip"
]
},
"rules_java": {
"name": "rules_java",
"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_pkg": {
"name": "rules_pkg",
"sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz",
"https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz"
]
},
"rules_pkg-0.2.0.tar.gz": {
"name": "rules_pkg-0.2.0.tar.gz",
"sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz",
"https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz"
]
},
"rules_proto": {
"name": "rules_proto",
"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"
]
},
"zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": {
"name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz",
"sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz"
]
},
"zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": {
"name": "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz",
"sha256": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz"
]
},
"zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": {
"name": "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip",
"sha256": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip"
]
},
"zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": {
"name": "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz",
"sha256": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz"
]
},
"zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": {
"name": "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz",
"sha256": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz"
]
},
"zulu11.2.3-jdk11.0.1-win_x64.zip": {
"name": "zulu11.2.3-jdk11.0.1-win_x64.zip",
"sha256": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip"
]
},
"zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz": {
"name": "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz",
"sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz"
]
},
"zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": {
"name": "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip",
"sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip"
]
},
"zulu11.29.3-ca-jdk11.0.2-win_x64.zip": {
"name": "zulu11.29.3-ca-jdk11.0.2-win_x64.zip",
"sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip"
]
},
"zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": {
"name": "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz",
"sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz"
]
},
"zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": {
"name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz",
"sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz"
]
},
"zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz": {
"name": "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz",
"sha256": "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz"
]
},
"zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip": {
"name": "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip",
"sha256": "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip"
]
}
}

View File

@ -25,11 +25,11 @@
}:
let
version = "2.1.0";
version = "3.2.0";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "0ijz9lxralyw18r5ra2h79jnafk5521ncr3knaip74cqa28csw9k";
sha256 = "1ylbfdcb6rhnc3sr292c6shl754i0h0i050f4gr4bppn6sa15v24";
};
# Update with `eval $(nix-build -A bazel.updater)`,
@ -49,12 +49,12 @@ let
srcs.io_bazel_rules_sass
srcs.platforms
(if stdenv.hostPlatform.isDarwin
then srcs."java_tools_javac11_darwin-v7.0.zip"
else srcs."java_tools_javac11_linux-v7.0.zip")
then srcs."java_tools_javac11_darwin-v8.0.zip"
else srcs."java_tools_javac11_linux-v8.0.zip")
srcs."coverage_output_generator-v2.1.zip"
srcs.build_bazel_rules_nodejs
srcs."android_tools_pkg-0.13.tar.gz"
srcs."0.28.3.tar.gz"
srcs."android_tools_pkg-0.16.0.tar.gz"
srcs."3.1.0.tar.gz"
srcs.rules_pkg
srcs.rules_cc
srcs.rules_java
@ -111,7 +111,7 @@ let
remote_java_tools = stdenv.mkDerivation {
name = "remote_java_tools_${system}";
src = srcDepsSet."java_tools_javac11_${system}-v7.0.zip";
src = srcDepsSet."java_tools_javac11_${system}-v8.0.zip";
nativeBuildInputs = [ autoPatchelfHook unzip ];
buildInputs = [ gcc-unwrapped ];
@ -157,6 +157,8 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
patches = [
./python-shebang.patch
# 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.
@ -383,6 +385,10 @@ stdenv.mkDerivation rec {
sed -i 's|/sbin/md5|md5sum|' \
src/BUILD
# 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!

View File

@ -0,0 +1,20 @@
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-05-25 14:46:01.608403087 +0200
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-05-25 14:50:52.881398320 +0200
@@ -238,14 +238,15 @@
// TODO(#8685): Remove this special-case handling as part of making the proper shebang a
// property of the Python toolchain configuration.
String pythonExecutableName = OS.getCurrent() == OS.OPENBSD ? "python3" : "python";
+ String pythonShebang = "#!/usr/bin/env " + pythonExecutableName;
ruleContext.registerAction(
new SpawnAction.Builder()
.addInput(zipFile)
.addOutput(executable)
.setShellCommand(
shExecutable,
- "echo '#!/usr/bin/env "
- + pythonExecutableName
+ "echo '"
+ + pythonShebang
+ "' | cat - "
+ zipFile.getExecPathString()
+ " > "

View File

@ -0,0 +1,745 @@
{
"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"
]
},
"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"
]
},
"3.1.0.tar.gz": {
"name": "3.1.0.tar.gz",
"sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.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"
]
},
"8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip": {
"name": "8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.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"
]
},
"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": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
"url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz"
},
"android_tools_pkg-0.16.0.tar.gz": {
"name": "android_tools_pkg-0.16.0.tar.gz",
"sha256": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
"urls": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.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/archive/3.1.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.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"
]
},
"c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": {
"name": "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.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.11.3.patch"
],
"sha256": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
"strip_prefix": "protobuf-3.11.3",
"urls": [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz"
]
},
"coverage_output_generator-v2.1.zip": {
"name": "coverage_output_generator-v2.1.zip",
"sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e",
"urls": [
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.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"
]
},
"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": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
"strip_prefix": "skydoc-c7bbde2950769aac9a99364b0926230060a3ce04",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
"https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz"
]
},
"java_tools_javac11_darwin-v8.0.zip": {
"name": "java_tools_javac11_darwin-v8.0.zip",
"sha256": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip"
]
},
"java_tools_javac11_linux-v8.0.zip": {
"name": "java_tools_javac11_linux-v8.0.zip",
"sha256": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip"
]
},
"java_tools_javac11_windows-v8.0.zip": {
"name": "java_tools_javac11_windows-v8.0.zip",
"sha256": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.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"
]
},
"java_tools_langtools_javac12": {
"name": "java_tools_langtools_javac12",
"sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.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"
]
},
"openjdk12_darwin_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
"name": "openjdk12_darwin_archive",
"sha256": "67ca9d285056132ebb19fa237a14affda52132142e1171fe1c20e18974b3b8a5",
"strip_prefix": "zulu12.2.3-ca-jdk12.0.1-macosx_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-macosx_x64.tar.gz"
]
},
"openjdk12_linux_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
"name": "openjdk12_linux_archive",
"sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13",
"strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz"
]
},
"openjdk12_windows_archive": {
"build_file_content": "\njava_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])\nexports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])\n",
"name": "openjdk12_windows_archive",
"sha256": "cf28404c23c3aa1115363ba6e796c30580a768e1d7d6681a7d053e516008e00d",
"strip_prefix": "zulu12.2.3-ca-jdk12.0.1-win_x64",
"urls": [
"https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.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_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": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e",
"urls": [
"https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.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": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.0.zip",
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_darwin-v8.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": "e0291e8956ac295143da4a673ca50727f7376665ee82b649a4ee810b64ff76c1",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_darwin-v8.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": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.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": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip"
]
},
"remote_java_tools_javac12_test_darwin": {
"name": "remote_java_tools_javac12_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": "54df966e7583bafe659e39b4103a4ce934201d969de638d071ada07d8e0c1a3a",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_darwin-v3.0.zip"
]
},
"remote_java_tools_javac12_test_linux": {
"name": "remote_java_tools_javac12_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": "3997ee9a57b095748f1c0d084839fab2fbc72504aeb7b37b1f71c31738d330e3",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_linux-v3.0.zip"
]
},
"remote_java_tools_javac12_test_windows": {
"name": "remote_java_tools_javac12_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": "cfad1718dad1fed12816748eed27ab30b9ea1268c8ce9940acf3b5b7d82d483d",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac12/v3.0/java_tools_javac12_windows-v3.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": "c24aef916cc5a8e9f6d53db1f93c54fe5790a58996a1099592e1dfe992acc81e",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_linux-v8.0.zip",
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_linux-v8.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": "444c391977e50af4e10549a28d021069d2ca7745a0e7b9b968a7b153fe3ea430",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/javac11/v8.0/java_tools_javac11_windows-v8.0.zip",
"https://github.com/bazelbuild/java_tools/releases/download/javac11_v8.0/java_tools_javac11_windows-v8.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_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"
]
},
"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": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f",
"strip_prefix": "rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip",
"https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.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"
]
},
"v3.11.3.tar.gz": {
"name": "v3.11.3.tar.gz",
"sha256": "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
"urls": [
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.11.3.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.11.3.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"
]
}
}

View File

@ -45,6 +45,7 @@ def rules_pkg_dependencies(*args, **kw): pass
def winsdk_configure(*args, **kw): pass
def register_local_rc_exe_toolchains(*args, **kw): pass
def register_toolchains(*args, **kw): pass
def debian_deps(): pass
# execute the WORKSPACE like it was python code in this module,
# using all the function stubs from above.

View File

@ -0,0 +1,31 @@
{ stdenv, buildPythonApplication, fetchFromGitHub
, poetry, pygls, pyparsing
, cmake, pytest, pytest-datadir
}:
buildPythonApplication rec {
pname = "cmake-language-server";
version = "0.1.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "regen100";
repo = pname;
rev = "v${version}";
sha256 = "09rijjksx07inbwxjinrsqihkxb011l2glysasmwpkhy0rmmhbcm";
};
nativeBuildInputs = [ poetry ];
propagatedBuildInputs = [ pygls pyparsing ];
checkInputs = [ cmake pytest pytest-datadir ];
dontUseCmakeConfigure = true;
checkPhase = "pytest";
meta = with stdenv.lib; {
homepage = "https://github.com/regen100/cmake-language-server";
description = "CMake LSP Implementation";
license = licenses.mit;
maintainers = with maintainers; [ metadark ];
};
}

View File

@ -69,28 +69,28 @@ let
baseOverlay = self: super:
let
getDep = depName: self.${depName};
lockPkgs = builtins.listToAttrs
(
builtins.map
(
pkgMeta: rec {
name = moduleName pkgMeta.name;
value = self.mkPoetryDep
(
pkgMeta // {
inherit pwd preferWheels;
source = pkgMeta.source or null;
files = lockFiles.${name};
pythonPackages = self;
sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name};
}
);
}
) compatible
);
lockPkgs = builtins.listToAttrs (
builtins.map
(
pkgMeta: rec {
name = moduleName pkgMeta.name;
value = self.mkPoetryDep (
pkgMeta // {
inherit pwd preferWheels;
source = pkgMeta.source or null;
files = lockFiles.${name};
pythonPackages = self;
sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name} or { };
}
);
}
)
compatible
);
in
lockPkgs;
overlays = builtins.map getFunctorFn
overlays = builtins.map
getFunctorFn
(
[
(
@ -127,6 +127,8 @@ let
};
/* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file.
In editablePackageSources you can pass a mapping from package name to source directory to have
those packages available in the resulting environment, whose source changes are immediately available.
Example:
poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; }
@ -139,18 +141,31 @@ let
, pwd ? projectDir
, python ? pkgs.python3
, preferWheels ? false
# Example: { my-app = ./src; }
, editablePackageSources ? { }
}:
let
py = mkPoetryPackages
(
{
inherit pyproject poetrylock overrides python pwd preferWheels;
}
);
in
py.python.withPackages (_: py.poetryPackages);
py = mkPoetryPackages (
{
inherit pyproject poetrylock overrides python pwd preferWheels;
}
);
/* Creates a Python application from pyproject.toml and poetry.lock */
editablePackage = import ./editable.nix {
inherit pkgs lib poetryLib editablePackageSources;
inherit (py) pyProject python;
};
in
py.python.withPackages (_: py.poetryPackages ++ lib.optional (editablePackageSources != { }) editablePackage);
/* Creates a Python application from pyproject.toml and poetry.lock
The result also contains a .dependencyEnv attribute which is a python
environment of all dependencies and this apps modules. This is useful if
you rely on dependencies to invoke your modules for deployment: e.g. this
allows `gunicorn my-module:app`.
*/
mkPoetryApplication =
{ projectDir ? null
, src ? poetryLib.cleanPythonSources { src = projectDir; }
@ -194,17 +209,17 @@ let
pkg = py.pkgs."${dep}";
constraints = deps.${dep}.python or "";
isCompat = compat constraints;
in if isCompat then pkg else null
) depAttrs;
in
if isCompat then pkg else null
)
depAttrs;
getInputs = attr: attrs.${attr} or [ ];
mkInput = attr: extraInputs: getInputs attr ++ extraInputs;
buildSystemPkgs = poetryLib.getBuildSystemPkgs {
inherit pyProject;
pythonPackages = py.pkgs;
};
in
py.pkgs.buildPythonApplication
(
app = py.pkgs.buildPythonPackage (
passedAttrs // {
pname = moduleName pyProject.tool.poetry.name;
version = pyProject.tool.poetry.version;
@ -212,6 +227,10 @@ let
inherit src;
format = "pyproject";
# Like buildPythonApplication, but without the toPythonModule part
# Meaning this ends up looking like an application but it also
# provides python modules
namePrefix = "";
buildInputs = mkInput "buildInputs" buildSystemPkgs;
propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]);
@ -220,16 +239,30 @@ let
passthru = {
python = py;
dependencyEnv = (
lib.makeOverridable ({ app, ... }@attrs:
let
args = builtins.removeAttrs attrs [ "app" ] // {
extraLibs = [ app ];
};
in
py.buildEnv.override args)
) { inherit app; };
};
meta = meta // {
inherit (pyProject.tool.poetry) description homepage;
meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry) {
inherit (pyProject.tool.poetry) description;
} // lib.optionalAttrs (lib.hasAttr "homepage" pyProject.tool.poetry) {
inherit (pyProject.tool.poetry) homepage;
} // {
inherit (py.meta) platforms;
license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown");
};
} // meta;
}
);
in
app;
/* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */
cli = import ./cli.nix { inherit pkgs lib version; };

View File

@ -0,0 +1,54 @@
{ pkgs
, lib
, poetryLib
, pyProject
, python
, editablePackageSources
}:
let
name = poetryLib.moduleName pyProject.tool.poetry.name;
# Just enough standard PKG-INFO fields for an editable installation
pkgInfoFields = {
Metadata-Version = "2.1";
Name = name;
# While the pyproject.toml could contain arbitrary version strings, for
# simplicity we just use the same one for PKG-INFO, even though that
# should follow follow PEP 440: https://www.python.org/dev/peps/pep-0345/#version
# This is how poetry transforms it: https://github.com/python-poetry/poetry/blob/6cd3645d889f47c10425961661b8193b23f0ed79/poetry/version/version.py
Version = pyProject.tool.poetry.version;
Summary = pyProject.tool.poetry.description;
};
pkgInfoFile = builtins.toFile "${name}-PKG-INFO"
(lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key}: ${value}") pkgInfoFields));
entryPointsFile = builtins.toFile "${name}-entry_points.txt"
(lib.generators.toINI { } pyProject.tool.poetry.plugins);
# A python package that contains simple .egg-info and .pth files for an editable installation
editablePackage = python.pkgs.toPythonModule (pkgs.runCommandNoCC "${name}-editable"
{ } ''
mkdir -p "$out/${python.sitePackages}"
cd "$out/${python.sitePackages}"
# See https://docs.python.org/3.8/library/site.html for info on such .pth files
# These add another site package path for each line
touch poetry2nix-editable.pth
${lib.concatMapStringsSep "\n" (src: ''
echo "${toString src}" >> poetry2nix-editable.pth
'')
(lib.attrValues editablePackageSources)}
# Create a very simple egg so pkg_resources can find this package
# See https://setuptools.readthedocs.io/en/latest/formats.html for more info on the egg format
mkdir "${name}.egg-info"
cd "${name}.egg-info"
ln -s ${pkgInfoFile} PKG-INFO
${lib.optionalString (pyProject.tool.poetry ? plugins) ''
ln -s ${entryPointsFile} entry_points.txt
''}
''
);
in
editablePackage

View File

@ -14,36 +14,39 @@ in
removePathDependenciesHook = callPackage
(
{}:
makeSetupHook {
name = "remove-path-dependencies.sh";
deps = [ ];
substitutions = {
inherit pythonInterpreter;
yj = "${yj}/bin/yj";
pyprojectPatchScript = "${./pyproject-without-path.py}";
};
} ./remove-path-dependencies.sh
makeSetupHook
{
name = "remove-path-dependencies.sh";
deps = [ ];
substitutions = {
inherit pythonInterpreter;
yj = "${yj}/bin/yj";
pyprojectPatchScript = "${./pyproject-without-path.py}";
};
} ./remove-path-dependencies.sh
) { };
pipBuildHook = callPackage
(
{ pip, wheel }:
makeSetupHook {
name = "pip-build-hook.sh";
deps = [ pip wheel ];
substitutions = {
inherit pythonInterpreter pythonSitePackages;
};
} ./pip-build-hook.sh
makeSetupHook
{
name = "pip-build-hook.sh";
deps = [ pip wheel ];
substitutions = {
inherit pythonInterpreter pythonSitePackages;
};
} ./pip-build-hook.sh
) { };
poetry2nixFixupHook = callPackage
(
{}:
makeSetupHook {
name = "fixup-hook.sh";
deps = [ ];
} ./fixup-hook.sh
makeSetupHook
{
name = "fixup-hook.sh";
deps = [ ];
} ./fixup-hook.sh
) { };
}

View File

@ -20,7 +20,7 @@ let
minor = l: lib.elemAt l 1;
joinVersion = v: lib.concatStringsSep "." v;
in
joinVersion ( if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer);
joinVersion (if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer);
# Compare a semver expression with a version
isCompatible = version:
@ -45,28 +45,27 @@ let
state = operators."${operator}" acc.state (satisfiesSemver version v);
};
initial = { operator = "&&"; state = true; };
in if expr == "" then true else (builtins.foldl' combine initial tokens).state;
in
if expr == "" then true else (builtins.foldl' combine initial tokens).state;
fromTOML = builtins.fromTOML or
(
toml: builtins.fromJSON
(
builtins.readFile
(
pkgs.runCommand "from-toml"
{
inherit toml;
allowSubstitutes = false;
preferLocalBuild = true;
}
''
${pkgs.remarshal}/bin/remarshal \
-if toml \
-i <(echo "$toml") \
-of json \
-o $out
''
)
toml: builtins.fromJSON (
builtins.readFile (
pkgs.runCommand "from-toml"
{
inherit toml;
allowSubstitutes = false;
preferLocalBuild = true;
}
''
${pkgs.remarshal}/bin/remarshal \
-if toml \
-i <(echo "$toml") \
-of json \
-o $out
''
)
)
);
readTOML = path: fromTOML (builtins.readFile path);
@ -88,11 +87,10 @@ let
# file: filename including extension
# hash: SRI hash
# kind: Language implementation and version tag
predictURLFromPypi = lib.makeOverridable
(
{ pname, file, hash, kind }:
"https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}"
);
predictURLFromPypi = lib.makeOverridable (
{ pname, file, hash, kind }:
"https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}"
);
# Fetch the wheels from the PyPI index.
@ -102,36 +100,35 @@ let
# file: filename including extension
# hash: SRI hash
# kind: Language implementation and version tag
fetchWheelFromPypi = lib.makeOverridable
(
{ pname, file, hash, kind, curlOpts ? "" }:
let
version = builtins.elemAt (builtins.split "-" file) 2;
in
(pkgs.stdenvNoCC.mkDerivation {
name = file;
nativeBuildInputs = [
pkgs.curl
pkgs.jq
];
isWheel = true;
system = "builtin";
fetchWheelFromPypi = lib.makeOverridable (
{ pname, file, hash, kind, curlOpts ? "" }:
let
version = builtins.elemAt (builtins.split "-" file) 2;
in
(pkgs.stdenvNoCC.mkDerivation {
name = file;
nativeBuildInputs = [
pkgs.curl
pkgs.jq
];
isWheel = true;
system = "builtin";
preferLocalBuild = true;
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
"NIX_CURL_FLAGS"
];
preferLocalBuild = true;
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
"NIX_CURL_FLAGS"
];
predictedURL = predictURLFromPypi { inherit pname file hash kind; };
inherit pname file version curlOpts;
predictedURL = predictURLFromPypi { inherit pname file hash kind; };
inherit pname file version curlOpts;
builder = ./fetch-wheel.sh;
builder = ./fetch-wheel.sh;
outputHashMode = "flat";
outputHashAlgo = "sha256";
outputHash = hash;
})
);
outputHashMode = "flat";
outputHashAlgo = "sha256";
outputHash = hash;
})
);
# Fetch the artifacts from the PyPI index. Since we get all
# info we need from the lock file we don't use nixpkgs' fetchPyPi
@ -143,16 +140,15 @@ let
# file: filename including extension
# hash: SRI hash
# kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention
fetchFromPypi = lib.makeOverridable
(
{ pname, file, hash, kind }:
if lib.strings.hasSuffix "whl" file then fetchWheelFromPypi { inherit pname file hash kind; }
else
pkgs.fetchurl {
url = predictURLFromPypi { inherit pname file hash kind; };
inherit hash;
}
);
fetchFromPypi = lib.makeOverridable (
{ pname, file, hash, kind }:
if lib.strings.hasSuffix "whl" file then fetchWheelFromPypi { inherit pname file hash kind; }
else
pkgs.fetchurl {
url = predictURLFromPypi { inherit pname file hash kind; };
inherit hash;
}
);
getBuildSystemPkgs =
{ pythonPackages
, pyProject

View File

@ -58,7 +58,7 @@ pythonPackages.callPackage
binaryDist = selectWheel fileCandidates;
sourceDist = builtins.filter isSdist fileCandidates;
eggs = builtins.filter isEgg fileCandidates;
entries = ( if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs;
entries = (if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs;
lockFileEntry = builtins.head entries;
_isEgg = isEgg lockFileEntry;
in
@ -111,7 +111,8 @@ pythonPackages.callPackage
propagatedBuildInputs =
let
compat = isCompatible (poetryLib.getPythonVersion python);
deps = lib.filterAttrs (n: v: v)
deps = lib.filterAttrs
(n: v: v)
(
lib.mapAttrs
(
@ -120,7 +121,8 @@ pythonPackages.callPackage
constraints = v.python or "";
in
compat constraints
) dependencies
)
dependencies
);
depAttrs = lib.attrNames deps;
in

File diff suppressed because it is too large Load Diff

View File

@ -37,14 +37,17 @@ let
# Make a tree out of expression groups (parens)
findSubExpressions = expr:
let
acc = builtins.foldl' findSubExpressionsFun {
exprs = [ ];
expr = expr;
pos = 0;
openP = 0;
exprPos = 0;
startPos = 0;
} (lib.stringToCharacters expr);
acc = builtins.foldl'
findSubExpressionsFun
{
exprs = [ ];
expr = expr;
pos = 0;
openP = 0;
exprPos = 0;
startPos = 0;
}
(lib.stringToCharacters expr);
tailExpr = (substr acc.exprPos acc.pos expr);
tailExprs = if tailExpr != "" then [ tailExpr ] else [ ];
in
@ -53,7 +56,7 @@ let
let
splitCond = (
s: builtins.map
(x: stripStr ( if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x))
(x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x))
(builtins.split " (and|or) " (s + " "))
);
mapfn = expr: (
@ -71,8 +74,9 @@ let
in
builtins.foldl'
(
acc: v: acc ++ ( if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ])
) [ ] exprs;
acc: v: acc ++ (if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ])
) [ ]
exprs;
# Transform individual expressions to structured expressions
# This function also performs variable substitution, replacing environment markers with their explicit values
@ -159,10 +163,9 @@ let
let
parts = builtins.splitVersion c;
pruned = lib.take ((builtins.length parts) - 1) parts;
upper = builtins.toString
(
(lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
);
upper = builtins.toString (
(lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
);
upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned);
in
op.">=" v c && op."<" v upperConstraint;
@ -207,10 +210,13 @@ let
) else throw "Unsupported type"
) else if builtins.typeOf v == "list" then (
let
ret = builtins.foldl' reduceExpressionsFun {
value = true;
cond = "and";
} v;
ret = builtins.foldl'
reduceExpressionsFun
{
value = true;
cond = "and";
}
v;
in
acc // {
value = cond."${acc.cond}" acc.value ret.value;
@ -219,10 +225,13 @@ let
);
in
(
builtins.foldl' reduceExpressionsFun {
value = true;
cond = "and";
} exprs
builtins.foldl'
reduceExpressionsFun
{
value = true;
cond = "and";
}
exprs
).value;
in
e: builtins.foldl' (acc: v: v acc) e [

View File

@ -39,10 +39,9 @@ let
# Prune constraint
parts = builtins.splitVersion c;
pruned = lib.take ((builtins.length parts) - 1) parts;
upper = builtins.toString
(
(lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
);
upper = builtins.toString (
(lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
);
upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned);
in
operators.">=" v c && operators."<" v upperConstraint;
@ -69,7 +68,7 @@ let
op = elemAt mPre 0;
v = elemAt mPre 1;
}
# Infix operators are range matches
# Infix operators are range matches
else if mIn != null then {
op = elemAt mIn 1;
v = {
@ -82,6 +81,7 @@ let
satisfiesSemver = version: constraint:
let
inherit (parseConstraint constraint) op v;
in if constraint == "*" then true else operators."${op}" version v;
in
if constraint == "*" then true else operators."${op}" version v;
in
{ inherit satisfiesSemver; }

File diff suppressed because it is too large Load Diff

View File

@ -153,7 +153,6 @@ itchyny/vim-cursorword
itchyny/vim-gitbranch
ivanov/vim-ipython
jacoborus/tender.vim
janko/vim-test
jaredgorski/SpaceCamp
JazzCore/ctrlp-cmatcher
jceb/vim-hier
@ -361,6 +360,7 @@ ntpeters/vim-better-whitespace
numirias/semshi
nvie/vim-flake8
octol/vim-cpp-enhanced-highlight
Olical/conjure
OrangeT/vim-csharp
osyo-manga/shabadou.vim
osyo-manga/vim-anzu
@ -550,6 +550,7 @@ vim-scripts/utl.vim
vim-scripts/wombat256.vim
vim-scripts/YankRing.vim
vim-syntastic/syntastic
vim-test/vim-test
vim-utils/vim-husk
Vimjas/vim-python-pep8-indent
vimlab/split-term.vim

View File

@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
location-aware applications GPS/AIS logs for diagnostic purposes.
'';
homepage = "http://catb.org/gpsd/";
license = "BSD-style";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ bjornfor rasendubi ];
};

View File

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "snmp_exporter";
version = "0.17.0";
version = "0.18.0";
goPackagePath = "github.com/prometheus/snmp_exporter";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "prometheus";
repo = "snmp_exporter";
rev = "v${version}";
sha256 = "0s2vgcpxannyl1zllc3ixww02832s53zijws64lhd8mxrylqvpcp";
sha256 = "1zdkb036zy2sw1drlp2m2z1yb7857d2y3yn2y3l0a1kkd4zcqkk4";
};
buildInputs = [ net-snmp ];
@ -21,7 +21,7 @@ buildGoPackage rec {
description = "SNMP Exporter for Prometheus";
homepage = "https://github.com/prometheus/snmp_exporter";
license = licenses.asl20;
maintainers = with maintainers; [ oida willibutz ];
maintainers = with maintainers; [ oida willibutz Frostman ];
platforms = platforms.unix;
};
}

View File

@ -9,6 +9,8 @@ py = python.override {
inherit version;
sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b";
};
doCheck = false;
postPatch = "";
});
};
};

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "duplicati";
version = "2.0.4.23";
version = "2.0.5.1";
channel = "beta";
build_date = "2019-07-14";
build_date = "2020-01-18";
src = fetchzip {
url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";
sha256 = "1m2448vgl1fc2hkxkyasvdfgl728rqv16b41niznv5rsxv5643w2";
sha256 = "1k3gfwcw7snxkqn4lf9rx1vzradpyq5vc48pwvaa8wwqnlykiimw";
stripRoot = false;
};

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "debianutils";
version = "4.9.1";
version = "4.10";
src = fetchurl {
url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz";
sha256 = "14a0fqdpwdw72790jjm01g5n7lwwaf9d6k78fflbysn5v62nd0mg";
sha256 = "1mj2hrwm8zr3814yig1f78hzflgih93hmy3dsyx6k0fdcfjkjvmx";
};
meta = with stdenv.lib; {

View File

@ -14,9 +14,14 @@ buildGoModule rec {
};
# we have no bash at the moment for windows
makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [
"BASH_PATH=${bash}/bin/bash"
];
BASH_PATH =
stdenv.lib.optionalString (!stdenv.hostPlatform.isWindows)
"${bash}/bin/bash";
# replace the build phase to use the GNUMakefile instead
buildPhase = ''
make BASH_PATH=$BASH_PATH
'';
installPhase = ''
make install DESTDIR=$out

View File

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2020.05.08";
version = "2020.05.29";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6";
sha256 = "111ganbfi76ipfq5gjgamjbqd7m8l4lim9wwmfnc04bzvwqqzfi3";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

View File

@ -7,17 +7,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "wormhole";
version = "0.1.5";
pname = "tunnelto";
version = "0.1.6";
src = fetchFromGitHub {
owner = "agrinman";
repo = pname;
rev = version;
sha256 = "0aq2myzqd9xqz4zdl03jhdd7f22y9k39xdhiark6ymhwcxijsq8y";
sha256 = "0yigjg8kjl8v0636hjr3sg33p4v963vzq7wbfi986ymxfx47jqp7";
};
cargoSha256 = "1gjqiv8sgdab0i461v72zcvh91cpqmmpcc3qyx3svq0391rwzp46";
cargoSha256 = "0603b0hn84shl9wdg7zg7kf9050gh33d8ghscwsby1vqanakms9j";
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = [ ]

View File

@ -49,9 +49,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = ./update.sh;
tests = {
inherit (nixosTests) wireguard wg-quick wireguard-generated wireguard-namespaces;
};
tests = nixosTests.wireguard;
};
meta = {

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "fio";
version = "3.19";
version = "3.20";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
sha256 = "1gr62mzv5rk6mbhll2c0fxgb46anx375cm2ym10mj2rvabcrhnqq";
sha256 = "1ahdcyrj7jgm4qx5s0q7gvbpqr2w57psazsf0wswp1v3mb9w4zg4";
};
buildInputs = [ python zlib ]

View File

@ -1859,6 +1859,8 @@ in
go-dependency-manager = callPackage ../development/tools/gdm { };
go-neb = callPackage ../applications/networking/instant-messengers/go-neb { };
geckodriver = callPackage ../development/tools/geckodriver { };
geekbench = callPackage ../tools/misc/geekbench { };
@ -7200,6 +7202,10 @@ in
tuir = callPackage ../applications/misc/tuir { };
tunnelto = callPackage ../tools/networking/tunnelto {
inherit (darwin.apple_sdk.frameworks) Security;
};
tuptime = callPackage ../tools/system/tuptime { };
turses = callPackage ../applications/networking/instant-messengers/turses { };
@ -7453,10 +7459,6 @@ in
wootility = callPackage ../tools/misc/wootility { };
wormhole = callPackage ../tools/networking/wormhole {
inherit (darwin.apple_sdk.frameworks) Security;
};
wpscan = callPackage ../tools/security/wpscan { };
wsmancli = callPackage ../tools/system/wsmancli {};
@ -10042,7 +10044,7 @@ in
bam = callPackage ../development/tools/build-managers/bam {};
bazel = bazel_2;
bazel = bazel_3;
bazel_0 = bazel_0_26;
@ -10075,14 +10077,14 @@ in
bazel_self = bazel_1;
};
bazel_2 = callPackage ../development/tools/build-managers/bazel/bazel_2 {
bazel_3 = callPackage ../development/tools/build-managers/bazel/bazel_3 {
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk8;
buildJdkName = "jdk8";
runJdk = jdk11_headless;
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
bazel_self = bazel_2;
bazel_self = bazel_3;
};
bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
@ -10248,6 +10250,8 @@ in
cmake-format = python3Packages.callPackage ../development/tools/cmake-format { };
cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { };
# Does not actually depend on Qt 5
inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools;
@ -12996,6 +13000,8 @@ in
libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };
libfyaml = callPackage ../development/libraries/libfyaml { };
libgcrypt = callPackage ../development/libraries/libgcrypt { };
libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { };

View File

@ -589,8 +589,6 @@ let
comparelib = callPackage ../development/ocaml-modules/comparelib { };
core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { };
ocamlbuild =
if lib.versionOlder "4.03" ocaml.version then
callPackage ../development/tools/ocaml/ocamlbuild { }
@ -1160,13 +1158,6 @@ let
then janeStreet.core_bench else
callPackage ../development/ocaml-modules/janestreet/core_bench.nix {};
core_kernel =
if lib.versionOlder "4.03" ocaml.version
then janeStreet.core_kernel
else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}
else core_kernel_p4;
async_rpc_kernel =
if lib.versionOlder "4.03" ocaml.version
then janeStreet.async_rpc_kernel

View File

@ -813,6 +813,8 @@ in {
hdmedians = callPackage ../development/python-modules/hdmedians { };
hiyapyco = callPackage ../development/python-modules/hiyapyco { };
hocr-tools = callPackage ../development/python-modules/hocr-tools { };
holidays = callPackage ../development/python-modules/holidays { };
@ -2482,6 +2484,8 @@ in {
pytest-cram = callPackage ../development/python-modules/pytest-cram { };
pytest-datadir = callPackage ../development/python-modules/pytest-datadir { };
pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { };
pytest-dependency = callPackage ../development/python-modules/pytest-dependency { };
@ -3288,6 +3292,8 @@ in {
pyfxa = callPackage ../development/python-modules/pyfxa { };
pygls = callPackage ../development/python-modules/pygls {};
pyhomematic = callPackage ../development/python-modules/pyhomematic { };
pylama = callPackage ../development/python-modules/pylama { };