Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
@@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "8.31";
|
||||
version = "8.32";
|
||||
pname = "checkstyle";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "03dn07lissr2dkhi44wlkrbsby4zfvwai8gykc3xjgs46jy05rf8";
|
||||
sha256 = "18ahdphxfcfi2vghl11kmj089hyh9iawll3cwxrqsdqak0748ijs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
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 = "1vp4f5kwmxc4j59cdzwj0jh0n4c05hkvssvv9ii6w88phzblzpjk";
|
||||
sha256 = "0yaxv89p5pdj1qymc5bnz0mphrypil9dnijvp3ml9hk1vxw6lfvb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "azure-storage-azcopy";
|
||||
version = "10.3.4";
|
||||
version = "10.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-storage-azcopy";
|
||||
rev = version;
|
||||
sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g";
|
||||
sha256 = "0yl7iznjyng1i3d994qrryllni702gga7h45sx8i3sgpy8544yjf";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb";
|
||||
modSha256 = "02c668bp1pfrd994lhg6z3hm1qg3530nk9aw1cahiwj549vxxfhm";
|
||||
|
||||
postInstall = ''
|
||||
ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy"
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "cmake-format";
|
||||
version = "0.6.9";
|
||||
version = "0.6.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "cmake_format";
|
||||
sha256 = "082d7949gsk5v72ap7k4p3vgmc126a0bfm195xpi4lb6khpbzy5j";
|
||||
sha256 = "14ypplkjah4hcb1ad8978xip4vvzxy1nkysvyi1wn9b24cbfzw42";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.18.1";
|
||||
version = "0.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "instrumenta";
|
||||
repo = "conftest";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ial1zs5aqcwza813ny6zqn9ybq6ibrqjmaccwbbam1k9f5rplqv";
|
||||
sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38";
|
||||
};
|
||||
|
||||
modSha256 = "17j5fhgwfpyg9r7a5g9rmvkaz510xx9s4mbl1cmyzysvddc6f5wp";
|
||||
modSha256 = "0nwmxmh1pmism5r9zzghfrzizr1fbyc8d4jljrbzjjq1l449r2ja";
|
||||
|
||||
buildFlagsArray = ''
|
||||
-ldflags=
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dbmate";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amacneil";
|
||||
repo = "dbmate";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jvizj616rsh3aw9z3bijk7ixpbnqmm3xqmdxznjzqd46avr54c3";
|
||||
sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky";
|
||||
};
|
||||
|
||||
modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i";
|
||||
modSha256 = "1ky6cxpmw93nrk26vyrxz8kqa7247axzaxilm6ciypxf30ad0vdq";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Database migration tool";
|
||||
|
||||
@@ -10,11 +10,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liquibase";
|
||||
version = "3.8.8";
|
||||
version = "3.8.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1pl9wgnwykvbnis0ndym0lbsj6a7lvpghrc98cw2hdnp5dglxjjl";
|
||||
sha256 = "13qpva81y98gp84zbcx6b4wsfgpsbv18aj5ihkw6l9ndbxfcrxdl";
|
||||
};
|
||||
|
||||
buildInputs = [ jre makeWrapper ];
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, jre_headless, makeWrapper }:
|
||||
let
|
||||
version = "6.3.2";
|
||||
version = "6.4.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "flyway";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
|
||||
sha256 = "1av1q7znphpsi1iz4dbh0fgh3jsx9prz980b25yk5r89h518s76q";
|
||||
sha256 = "00vm2p4xn8jnldjxcj0djpjjx2hppq0ii8367abhbswq7xfhy2d2";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
dontBuild = true;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-quick-stats";
|
||||
version = "2.0.15";
|
||||
version = "2.0.16";
|
||||
src = fetchFromGitHub {
|
||||
repo = "git-quick-stats";
|
||||
owner = "arzzen";
|
||||
rev = version;
|
||||
sha256 = "1m8b0bskhpwjbs0qjp0rdzrjj613639pn92isv1cg0srj8grjcai";
|
||||
sha256 = "03v06r6gbn8bhya1ig9wdc92hh2ip7072syxkam3sjv150ld80cn";
|
||||
};
|
||||
PREFIX = builtins.placeholder "out";
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gotestsum";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gotestyourself";
|
||||
repo = "gotestsum";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wllcmc2c8ch2ggknhxwgdm6g70ppmxr492kbxvlbwif9p6ms0ci";
|
||||
sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44";
|
||||
};
|
||||
|
||||
modSha256 = "08vil1jb7dpkld59b6qhsfh9cx450vbgfaji7777immzsd1azf4m";
|
||||
modSha256 = "10zkk4zqla5yqs5sq2qc7x1vhadfyd1l7s29xyjmg4grs8iimk2j";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchzip, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.6.4";
|
||||
version = "2.6.5";
|
||||
pname = "jbake";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip";
|
||||
sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw";
|
||||
sha256 = "0ripayv1vf4f4ylxr7h9kad2xhy3y98ca8s4p38z7dn8l47zg0qw";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper jre ];
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ccls";
|
||||
version = "0.20190823.5";
|
||||
version = "0.20190823.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaskRay";
|
||||
repo = "ccls";
|
||||
rev = version;
|
||||
sha256 = "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5";
|
||||
sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.6949";
|
||||
version = "0.1.7179";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0r64m4lcm9w0rzi61rsi3sm719ydwiv5axxnikwhzmvkdz0rd7dq";
|
||||
sha256 = "0md6y2rnzhkpxc2pm3c46jrhwicrswy9qlr6a4mmvpjq1imj1hjq";
|
||||
};
|
||||
|
||||
modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2";
|
||||
modSha256 = "169d0mm52l6w6jln5ak6zkh97q65m9jpg3bm8qll6sfrmrnfncfi";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ];
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clojure-lsp";
|
||||
version = "20200412T033138";
|
||||
version = "20200413T141742";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
|
||||
sha256 = "19i6sikg5x5qzcbakzbiqbcy5q2srqk6ihpmb3l90n1p4jn4605c";
|
||||
sha256 = "0bgyl791l8qaja9p22p77llis39kgdm8x1djz1dm8iy6qn22hm1y";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
|
||||
|
||||
postPatch = "patchShebangs strace-graph";
|
||||
|
||||
configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check";
|
||||
|
||||
# fails 1 out of 523 tests with
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sysbench";
|
||||
version = "1.0.19";
|
||||
version = "1.0.20";
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ libmysqlclient libaio ];
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "akopytov";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1zgqb9cr7ld3vw4a3jhq1mlszhcyjlpr0c8q1jcp1d27l9dcvd1w";
|
||||
sha256 = "1sanvl2a52ff4shj62nw395zzgdgywplqvwip74ky8q7s6qjf5qy";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mod";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marwan-at-work";
|
||||
repo = "mod";
|
||||
rev = "v${version}";
|
||||
sha256 = "1kcsdi9qls9kgklj96ycyrq5fsz5m2qj3ij63d2rwqjggqk0cab6";
|
||||
sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl";
|
||||
};
|
||||
|
||||
modSha256 = "0famjypv5qg9lgzw4pz2kz70l50cn6n6nbjyk7jrzmd6bjzd0ypl";
|
||||
modSha256 = "1nl7d00prw1663xrl1nvj1xbs7wzkbqn75i92al821pz12dybdif";
|
||||
|
||||
subPackages = [ "cmd/mod" ];
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
buildGoPackage rec {
|
||||
pname = "packer";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/packer";
|
||||
|
||||
@@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
owner = "hashicorp";
|
||||
repo = "packer";
|
||||
rev = "v${version}";
|
||||
sha256 = "1l5n6s4fg6rgb7k845hsxgrs44y9bs2hmdxqzfbayiv8nz1qg286";
|
||||
sha256 = "0pwygrh6pjmx8a1jc12929x0slj7w3b8p3pzswnbk7klyhj4jkp8";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-udeps";
|
||||
version = "0.1.10";
|
||||
version = "0.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "est31";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1xmlpn4j5lhbzd9icb3nga5irfknmxfml9sn677d9z6fwfjfpa0l";
|
||||
sha256 = "1drz0slv33p4spm52sb5lnmpb83q8l7k3cvp0zcsinbjv8glvvnv";
|
||||
};
|
||||
|
||||
cargoSha256 = "1si95pdhbi6pa94gh9vip95n37im6kcfsgslpnibck2157pg4la6";
|
||||
cargoSha256 = "13ynab3s563n2xwkls7nmksis0ngx5klw9wc9bpnxgc5na9k84ll";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-xbuild";
|
||||
version = "0.5.28";
|
||||
version = "0.5.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-osdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1rczflf6fllxkag5nah195shwqvqmlna9a1gkcwp9ljlgxlr9zvq";
|
||||
sha256 = "05wg1xx2mcwb9cplmrpg13jimddlzmv7hf5g3vjppjp8kz2gb7zj";
|
||||
};
|
||||
|
||||
cargoSha256 = "0xr8wpcw3x0343hm6clygsbikhrp6gcqb8vh7g7h9nijjrbnzxxb";
|
||||
cargoSha256 = "1s2xsfld29shvjzyp16y263hnbqxrq8i2557y0g09xmfm5x0jhix";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-cbindgen";
|
||||
version = "0.13.2";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eqrion";
|
||||
repo = "cbindgen";
|
||||
rev = "v${version}";
|
||||
sha256 = "100ls8p8w6jwcjh3ligly5alg8fzp21aj7b1qbndn9fm0y1nmjam";
|
||||
sha256 = "15mk7q89rs723c7i9wwq4rrvakwh834wvrsmsnayji5k1kwaj351";
|
||||
};
|
||||
|
||||
cargoSha256 = "0d9sz46yzh01dx973q10xzw4k7r7ylvg82s5pkp3zpwcin8smaiw";
|
||||
cargoSha256 = "03irndd48ck62chm4vmlcnfm98gwd86xm1ssq9glw3b3y0n6x845";
|
||||
|
||||
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
let
|
||||
# NOTE: bumping the version and updating the hash is insufficient;
|
||||
# you must use bundix to generate a new gemset.nix in the Vagrant source.
|
||||
version = "2.2.7";
|
||||
version = "2.2.8";
|
||||
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
|
||||
sha256 = "1z31y1nqiyj6rml9lz8gcbr29myhs5wcap8jsvgm3pb7p9p9y8m9";
|
||||
sha256 = "0nvxda0dyhncgcl9qs34l4rj0jbdbg65a3ii5765p4899z6gzx95";
|
||||
|
||||
deps = bundlerEnv rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@@ -20,25 +20,24 @@
|
||||
version = "3.2.4";
|
||||
};
|
||||
childprocess = {
|
||||
dependencies = ["ffi"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv";
|
||||
sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.3";
|
||||
version = "3.0.0";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
|
||||
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.5";
|
||||
version = "1.1.6";
|
||||
};
|
||||
domain_name = {
|
||||
dependencies = ["unf"];
|
||||
@@ -213,10 +212,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh";
|
||||
sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2019.1009";
|
||||
version = "3.2020.0425";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
@@ -255,10 +254,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n";
|
||||
sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
};
|
||||
netrc = {
|
||||
groups = ["default"];
|
||||
@@ -285,10 +284,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
|
||||
sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
};
|
||||
rb-inotify = {
|
||||
dependencies = ["ffi"];
|
||||
@@ -348,10 +347,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l";
|
||||
sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "2.3.0";
|
||||
};
|
||||
unf = {
|
||||
dependencies = ["unf_ext"];
|
||||
@@ -369,10 +368,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
|
||||
sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.7.6";
|
||||
version = "0.0.7.7";
|
||||
};
|
||||
vagrant_cloud = {
|
||||
dependencies = ["rest-client"];
|
||||
@@ -412,10 +411,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12fzg9liydl244xq6r7x0wy06zn1n4czdbnjavy3150c3qsnv71a";
|
||||
sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
};
|
||||
winrm-fs = {
|
||||
dependencies = ["erubi" "logging" "rubyzip" "winrm"];
|
||||
@@ -423,9 +422,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6";
|
||||
sha256 = "093f698l9b9cx6vcqwjc9hi5hbd86ynp1g5c7g9k18y6h7fxjk43";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
};
|
||||
}
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoPackage {
|
||||
pname = "vgo2nix";
|
||||
version = "unstable-2019-02-06";
|
||||
version = "unstable-2020-05-05";
|
||||
goPackagePath = "github.com/adisbladis/vgo2nix";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adisbladis";
|
||||
owner = "nix-community";
|
||||
repo = "vgo2nix";
|
||||
rev = "f2694cd352830f0561bc00bbcaa08cefb2e36439";
|
||||
sha256 = "10cwi67cyhqjq1pwhry2n1v8z7wybl4cawzmjmfgs5mbsvqp0h78";
|
||||
rev = "71e59bf268d5257a0f89b2f59cd20fd468c8c6ac";
|
||||
sha256 = "1pcdkknq2v7nrs0siqcvvq2x0qqz5snwdz2lpjnad8i33rwhmayh";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
@@ -33,7 +33,7 @@ buildGoPackage {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files";
|
||||
homepage = "https://github.com/adisbladis/vgo2nix";
|
||||
homepage = "https://github.com/nix-community/vgo2nix";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ adisbladis ];
|
||||
};
|
||||
|
||||
71
pkgs/development/tools/vgo2nix/deps.nix
generated
71
pkgs/development/tools/vgo2nix/deps.nix
generated
@@ -126,13 +126,67 @@
|
||||
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/yuin/goldmark";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/yuin/goldmark";
|
||||
rev = "v1.1.27";
|
||||
sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "87dc89f01550";
|
||||
sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/mod";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/mod";
|
||||
rev = "v0.2.0";
|
||||
sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "0de0cce0169b";
|
||||
sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sync";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sync";
|
||||
rev = "cd5d95a43a6e";
|
||||
sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "d99a578cf41b";
|
||||
sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm";
|
||||
rev = "97732733099d";
|
||||
sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "v0.3.0";
|
||||
sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
|
||||
};
|
||||
}
|
||||
{
|
||||
@@ -140,8 +194,17 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/tools";
|
||||
rev = "ded554d0681e";
|
||||
sha256 = "04rlq9hc3ccww9sbsrl48fl6wbjprb136rqxyr7dmgfj444aml56";
|
||||
rev = "0c9eba77bc32";
|
||||
sha256 = "1xz0jyxdmibkams6vd61va5cw963l25jjf3i9r33m0i739qwg4lj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/xerrors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/xerrors";
|
||||
rev = "9bdfabe68543";
|
||||
sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From b0d7b8b348adba8131b12f99be7a9a30a1cca867 Mon Sep 17 00:00:00 2001
|
||||
From a13aff157f899a6388b3c9e621680049f329a028 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Thu, 30 Apr 2020 00:24:57 +0200
|
||||
Date: Fri, 1 May 2020 23:44:08 +0200
|
||||
Subject: [PATCH] Add cargo.lock
|
||||
|
||||
---
|
||||
@@ -10,7 +10,7 @@ Subject: [PATCH] Add cargo.lock
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
new file mode 100644
|
||||
index 00000000..8ae15438
|
||||
index 00000000..4822cea1
|
||||
--- /dev/null
|
||||
+++ b/Cargo.lock
|
||||
@@ -0,0 +1,2527 @@
|
||||
@@ -605,7 +605,7 @@ index 00000000..8ae15438
|
||||
+dependencies = [
|
||||
+ "proc-macro-hack",
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "syn 1.0.18",
|
||||
+]
|
||||
+
|
||||
@@ -782,7 +782,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "js-sys"
|
||||
+version = "0.3.38"
|
||||
+version = "0.3.39"
|
||||
+dependencies = [
|
||||
+ "wasm-bindgen",
|
||||
+ "wasm-bindgen-futures",
|
||||
@@ -1173,7 +1173,7 @@ index 00000000..8ae15438
|
||||
+dependencies = [
|
||||
+ "proc-macro-error-attr",
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "syn 1.0.18",
|
||||
+ "version_check 0.9.1",
|
||||
+]
|
||||
@@ -1185,7 +1185,7 @@ index 00000000..8ae15438
|
||||
+checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53"
|
||||
+dependencies = [
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "syn 1.0.18",
|
||||
+ "syn-mid",
|
||||
+ "version_check 0.9.1",
|
||||
@@ -1238,9 +1238,9 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "quote"
|
||||
+version = "1.0.3"
|
||||
+version = "1.0.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
|
||||
+checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7"
|
||||
+dependencies = [
|
||||
+ "proc-macro2 1.0.10",
|
||||
+]
|
||||
@@ -1642,7 +1642,7 @@ index 00000000..8ae15438
|
||||
+checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
|
||||
+dependencies = [
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "syn 1.0.18",
|
||||
+]
|
||||
+
|
||||
@@ -1731,7 +1731,7 @@ index 00000000..8ae15438
|
||||
+ "heck",
|
||||
+ "proc-macro-error",
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "syn 1.0.18",
|
||||
+]
|
||||
+
|
||||
@@ -1753,7 +1753,7 @@ index 00000000..8ae15438
|
||||
+checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
|
||||
+dependencies = [
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "unicode-xid 0.2.0",
|
||||
+]
|
||||
+
|
||||
@@ -1764,7 +1764,7 @@ index 00000000..8ae15438
|
||||
+checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
|
||||
+dependencies = [
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "syn 1.0.18",
|
||||
+]
|
||||
+
|
||||
@@ -2038,7 +2038,7 @@ index 00000000..8ae15438
|
||||
+dependencies = [
|
||||
+ "heck",
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "syn 1.0.18",
|
||||
+]
|
||||
+
|
||||
@@ -2050,7 +2050,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "js-sys",
|
||||
@@ -2066,7 +2066,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-anyref-xform"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "rayon",
|
||||
@@ -2078,13 +2078,13 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-backend"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "bumpalo",
|
||||
+ "lazy_static",
|
||||
+ "log 0.4.8",
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "syn 1.0.18",
|
||||
+ "wasm-bindgen-shared",
|
||||
+]
|
||||
@@ -2099,7 +2099,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-cli"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "assert_cmd",
|
||||
@@ -2127,7 +2127,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-cli-support"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "base64 0.9.3",
|
||||
@@ -2149,7 +2149,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-futures"
|
||||
+version = "0.4.11"
|
||||
+version = "0.4.12"
|
||||
+dependencies = [
|
||||
+ "cfg-if",
|
||||
+ "futures-channel-preview",
|
||||
@@ -2161,9 +2161,9 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-macro"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "trybuild",
|
||||
+ "wasm-bindgen",
|
||||
+ "wasm-bindgen-futures",
|
||||
@@ -2172,10 +2172,10 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-macro-support"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "syn 1.0.18",
|
||||
+ "wasm-bindgen-backend",
|
||||
+ "wasm-bindgen-shared",
|
||||
@@ -2183,7 +2183,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-multi-value-xform"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "rayon",
|
||||
@@ -2204,11 +2204,11 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-shared"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-test"
|
||||
+version = "0.3.11"
|
||||
+version = "0.3.12"
|
||||
+dependencies = [
|
||||
+ "console_error_panic_hook",
|
||||
+ "js-sys",
|
||||
@@ -2234,15 +2234,15 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-test-macro"
|
||||
+version = "0.3.11"
|
||||
+version = "0.3.12"
|
||||
+dependencies = [
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-threads-xform"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "walrus",
|
||||
@@ -2251,7 +2251,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-wasm-conventions"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "walrus",
|
||||
@@ -2259,7 +2259,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-wasm-interpreter"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "log 0.4.8",
|
||||
@@ -2270,7 +2270,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "wasm-bindgen-webidl"
|
||||
+version = "0.2.61"
|
||||
+version = "0.2.62"
|
||||
+dependencies = [
|
||||
+ "anyhow",
|
||||
+ "env_logger",
|
||||
@@ -2278,7 +2278,7 @@ index 00000000..8ae15438
|
||||
+ "lazy_static",
|
||||
+ "log 0.4.8",
|
||||
+ "proc-macro2 1.0.10",
|
||||
+ "quote 1.0.3",
|
||||
+ "quote 1.0.4",
|
||||
+ "sourcefile",
|
||||
+ "structopt",
|
||||
+ "syn 1.0.18",
|
||||
@@ -2353,7 +2353,7 @@ index 00000000..8ae15438
|
||||
+
|
||||
+[[package]]
|
||||
+name = "web-sys"
|
||||
+version = "0.3.38"
|
||||
+version = "0.3.39"
|
||||
+dependencies = [
|
||||
+ "js-sys",
|
||||
+ "wasm-bindgen",
|
||||
|
||||
@@ -2,19 +2,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-bindgen-cli";
|
||||
version = "0.2.61";
|
||||
version = "0.2.62";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustwasm";
|
||||
repo = "wasm-bindgen";
|
||||
rev = version;
|
||||
sha256 = "1lz4yscs17vix96isqpwwjhjcgj46zh2ljiwvfsk44wky8vwkyb7";
|
||||
sha256 = "0d3ph3g220nvzwxa71rch03j5c0w06v8z4lmlyp5kky6p86r37hz";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
cargoSha256 = "1vblvajhx5gn08rinv6bnw61zah62il015rzm0d4vs2b9p0iaann";
|
||||
cargoSha256 = "13lj2yx2bcwac1b4gpwcgiwqvy178zis6r1pidn4pgwqv7zxa7p2";
|
||||
cargoPatches = [ ./0001-Add-cargo.lock.patch ];
|
||||
cargoBuildFlags = [ "-p" pname ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user