Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-03-26 12:06:44 +00:00
committed by GitHub
64 changed files with 806 additions and 387 deletions

View File

@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "buildah";
version = "1.19.8";
version = "1.20.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "sha256-xhnhc4vhKw5T93076vS+pszIOpj22KzaPyzCvuHMaPE=";
sha256 = "12gmn61mfrr58071x3cdsksad6swn1b23ghih128hjdpdzk1zxs3";
};
outputs = [ "out" "man" ];

View File

@@ -18,11 +18,11 @@ let
}.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
in stdenv.mkDerivation rec {
pname = "php-blackfire";
version = "1.49.1";
version = "1.53.0";
src = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
sha256 = "5Z6CUj/HfSj+pC9iDEmU/OKCYePSAazU9q9M3glnOZU=";
sha256 = "ApKj5gulTCzWh7oSAM+JWQnWviHCnHV3OJHegpXJL54=";
};
nativeBuildInputs = [

View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
export HOME=$TMPDIR
nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \
c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \
-d:debugLogging -d:explicitSourcePath=${srcOnly nim.unwrapped} -d:tempDir=/tmp src/nimlsp
-d:debugLogging -d:explicitSourcePath=${srcOnly nim.passthru.nim} -d:tempDir=/tmp src/nimlsp
'';
installPhase = ''

View File

@@ -1,16 +1,16 @@
{ lib, fetchurl, buildDunePackage
, cmdliner, cppo, yojson, ppxlib
, ocaml, cmdliner, cppo, yojson, ppxlib
, menhir
}:
buildDunePackage rec {
pname = "js_of_ocaml-compiler";
version = "3.8.0";
version = "3.9.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy";
sha256 = "0ib551kfsjlp9vr3fk36hrbq7xxyl8bj6vcn3ccr0s370bsmgpm6";
};
nativeBuildInputs = [ cppo menhir ];