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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-06-15 16:48:53 +02:00
parent 4ece345970 d3044f0ec2
commit d9e0820393
31 changed files with 143 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/tfsec/default.nix
View File

@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.19.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "liamg";
repo = pname;
rev = "v${version}";
sha256 = "1ddyvkv0949p0b6m1rwai5r87mca5xwyjwsjq7gbyqz9h10bv7nf";
sha256 = "0mmh161zwrkjwpw01zcgh7hsap7lgdxhg191bajzig6vlq287jyh";
};
goPackagePath = "github.com/liamg/tfsec";

4
pkgs/development/tools/delve/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "delve";
version = "1.2.0";
version = "1.4.1";
goPackagePath = "github.com/go-delve/delve";
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "go-delve";
repo = "delve";
rev = "v${version}";
sha256 = "1xz1xm0lb1arwm3w2ydq5y5xglq60fc0q46x9xndr3i9j0rm8bxh";
sha256 = "007bc69r26w0sv6v9mbjdnmnkahpfk5998isx81ma7cinqdhi1cj";
};
meta = with stdenv.lib; {

4
pkgs/development/tools/gauge/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "gauge";
version = "1.0.4";
version = "1.1.1";
goPackagePath = "github.com/getgauge/gauge";
excludedPackages = ''\(build\|man\)'';
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "getgauge";
repo = "gauge";
rev = "v${version}";
sha256 = "1b52kpv5561pyjvqi8xmidarqp6lcyyy4sjsl4qjx4cr7hmk8kc7";
sha256 = "01x4838jljhhhcwfh6zbhy3g7l7nqvypv3g0ch9n2amsf2s16s3l";
};
meta = with stdenv.lib; {

18
pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
View File

@@ -1,18 +0,0 @@
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}:
stdenv.mkDerivation {
pname = "js_of_ocaml";
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
nativeBuildInputs = [ ocaml findlib dune ];
postPatch = "patchShebangs lib/generate_stubs.sh";
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
buildPhase = "dune build -p js_of_ocaml";
}

42
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@@ -1,40 +1,18 @@
{ stdenv, fetchurl, ocaml, findlib, lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild
, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}:
let version = if stdenv.lib.versionAtLeast ocaml.version "4.02"
then "2.8.4" else "2.7";
in
stdenv.mkDerivation {
pname = "js_of_ocaml";
inherit version;
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz";
sha256 = {
"2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
"2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl";
}.${version};
};
pname = "js_of_ocaml";
buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild
cmdliner reactivedata cppo which base64 ]
++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ];
propagatedBuildInputs = [ lwt camlp4 ppx_deriving ]
++ stdenv.lib.optional (version == "2.8.4") uchar;
inherit (js_of_ocaml-compiler) version src installPhase meta;
patches = [ ./Makefile.conf.diff ];
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
nativeBuildInputs = [ ocaml findlib dune ];
createFindlibDestdir = true;
postPatch = "patchShebangs lib/generate_stubs.sh";
meta = with stdenv.lib; {
homepage = "http://ocsigen.org/js_of_ocaml/";
description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser";
license = licenses.lgpl2;
platforms = ocaml.meta.platforms or [];
maintainers = [
maintainers.gal_bolle
];
broken = versionAtLeast ocaml.version "4.05";
};
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
buildPhase = "dune build -p js_of_ocaml";
}

4
pkgs/development/tools/skaffold/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "skaffold";
version = "1.10.1";
version = "1.11.0";
# rev is the ${version} commit, mainly for skaffold version command output
rev = "931a70a6334436735bfc4ff7633232dd5fc73cc1";
@@ -20,7 +20,7 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
sha256 = "1qi4b0304jjpv5npa5yfrrfg7yv5p838qqql3sgx4f47ysyyq0as";
sha256 = "035xp34m8kzb75mivgf3kw026n2h6g2a7j2mi32nxl1a794w36zi";
};
nativeBuildInputs = [ installShellFiles ];