forked from mirrors/nixpkgs
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
465d584100
|
|
@ -28,10 +28,16 @@ let
|
|||
testScript = ''
|
||||
start_all()
|
||||
${backend}.wait_for_unit("${backend}-nginx.service")
|
||||
result = ${backend}.wait_until_succeeds(
|
||||
"cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello'"
|
||||
${backend}.wait_for_open_port(8181)
|
||||
# For some reason, the cntr command hangs when run without the &.
|
||||
# As such, we have to do some messy things to ensure we check the exitcode and output in a race-condition-safe manner
|
||||
${backend}.execute(
|
||||
"(cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello' > /tmp/result; echo $? > /tmp/exitcode; touch /tmp/done) &"
|
||||
)
|
||||
assert "Hello" in result
|
||||
|
||||
${backend}.wait_for_file("/tmp/done")
|
||||
assert "0" == ${backend}.succeed("cat /tmp/exitcode").strip(), "non-zero exit code"
|
||||
assert "Hello" in ${backend}.succeed("cat /tmp/result"), "no greeting in output"
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -54,7 +60,13 @@ let
|
|||
testScript = ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("container@test.service")
|
||||
machine.succeed("cntr attach test sh -- -c 'ping -c5 172.16.0.1'")
|
||||
# I haven't observed the same hanging behaviour in this version as in the OCI version which necessetates this messy invocation, but it's probably better to be safe than sorry and use it here as well
|
||||
machine.execute(
|
||||
"(cntr attach test sh -- -c 'ping -c5 172.16.0.1'; echo $? > /tmp/exitcode; touch /tmp/done) &"
|
||||
)
|
||||
|
||||
machine.wait_for_file("/tmp/done")
|
||||
assert "0" == machine.succeed("cat /tmp/exitcode").strip(), "non-zero exit code"
|
||||
'';
|
||||
};
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pt2-clone";
|
||||
version = "1.40";
|
||||
version = "1.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "pt2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0qEhhkprIpseCEFStgJ0035TX0e9s271BK/1hVkn/JU=";
|
||||
sha256 = "sha256-FnGtUoA6ol4lqp5HXjoJ3CHjdRs8eML0WI917ruid84=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,33 +1,64 @@
|
|||
{ lib, stdenv, fetchFromGitHub , alsa-lib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
|
||||
, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, alsa-lib
|
||||
, boost
|
||||
, cairo
|
||||
, cmake
|
||||
, fftwSinglePrec
|
||||
, fltk
|
||||
, libGLU
|
||||
, libjack2
|
||||
, libsndfile
|
||||
, libXdmcp
|
||||
, lv2
|
||||
, minixml
|
||||
, pcre
|
||||
, pkg-config
|
||||
, readline
|
||||
, xorg
|
||||
, zlib
|
||||
}:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoshimi";
|
||||
# Fix build with lv2 1.18: https://github.com/Yoshimi/yoshimi/pull/102/commits/86996cbb235f0fe138ae814a6758c2c8ba1c2a38
|
||||
version = "unstable-2020-05-10";
|
||||
version = "2.1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yoshimi";
|
||||
repo = pname;
|
||||
rev = "86996cbb235f0fe138ae814a6758c2c8ba1c2a38";
|
||||
sha256 = "0bgcc5fbgwpdjircq00wlii30pakf45yzligpbnf02a554hh4j01";
|
||||
rev = version;
|
||||
hash = "sha256-6YsA6tC94yJuuWp5rXXqHzqRy28tvmJzjOR92YwQYO0=";
|
||||
};
|
||||
buildInputs = [
|
||||
alsa-lib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL
|
||||
minixml zlib xorg.libpthreadstubs pcre
|
||||
];
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Misc/Config.cpp --replace /usr $out
|
||||
substituteInPlace Misc/Bank.cpp --replace /usr $out
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace src/Misc/Config.cpp --replace /usr $out
|
||||
substituteInPlace src/Misc/Bank.cpp --replace /usr $out
|
||||
'';
|
||||
|
||||
preConfigure = "cd src";
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
boost
|
||||
cairo
|
||||
fftwSinglePrec
|
||||
fltk
|
||||
libGLU
|
||||
libjack2
|
||||
libsndfile
|
||||
libXdmcp
|
||||
lv2
|
||||
minixml
|
||||
pcre
|
||||
readline
|
||||
xorg.libpthreadstubs
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ];
|
||||
|
||||
|
|
@ -38,8 +69,8 @@ stdenv.mkDerivation rec {
|
|||
ZynAddSubFX along with very good Jack and Alsa midi/audio
|
||||
functionality on Linux
|
||||
'';
|
||||
homepage = "http://yoshimi.sourceforge.net";
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://yoshimi.github.io/";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "charm";
|
||||
version = "0.9.2";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "charm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5WNkD+YfmQHGAWWfD9/ZEHnHPT0Ejm9Nz+/mn8xvU4U=";
|
||||
sha256 = "sha256-kyfyRq/5QWMoiMooEpLv7UkehGxFlrfGEq9jA3OHiIs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-r0mYrtWllKOvKQJmW0ie4l+1nsCwU8O+CV6ESXNoETk=";
|
||||
vendorSha256 = "sha256-LB5fwySDOH+kOYYdGdtLAvETmI6fFP2QT6l2eAS3Ijg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
# Upstream has a `./vendor` directory with all deps which we rely upon.
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "tty-share";
|
||||
version = "2.2.1";
|
||||
|
||||
|
|
@ -12,7 +11,10 @@ buildGoPackage rec {
|
|||
sha256 = "sha256-aAqKfi0ZX0UB07yGY6x0HcMspvq4rcJXKHSONxAwMlc=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/elisescu/tty-share";
|
||||
# Upstream has a `./vendor` directory with all deps which we rely upon.
|
||||
vendorSha256 = null;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://tty-share.com";
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xplr";
|
||||
version = "0.17.2";
|
||||
version = "0.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sayanarijit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iy03ucPFbFL/rRILt9P+NtfdGoIpjutbUDrykpZkAtk=";
|
||||
sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
cargoSha256 = "sha256-VeV/vsM2XCg9h8KoYmniCmo/MJHjwcfn/tUCoZ1rKzM=";
|
||||
cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A hackable, minimal, fast TUI file explorer";
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "flexget";
|
||||
version = "3.2.18";
|
||||
version = "3.3.2";
|
||||
|
||||
# Fetch from GitHub in order to use `requirements.in`
|
||||
src = fetchFromGitHub {
|
||||
owner = "flexget";
|
||||
repo = "flexget";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg=";
|
||||
hash = "sha256-Z2JYFnE9g2bWaR+Ghxg3zJUD0Ja8/od52jkOVWEqeVE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ let
|
|||
disabledTests = [
|
||||
"test_capabilities.py"
|
||||
"test_cwd.py"
|
||||
"test_delete.py"
|
||||
"test_detach.py"
|
||||
"test_exec.py"
|
||||
"test_hooks.py"
|
||||
|
|
@ -37,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-zGtHO8CgpbXTh8nZ6WA0ocakzLjL/PW2IULI5QSEPVI=";
|
||||
sha256 = "sha256-5q8HirGOPsbaJ7JoLa4DRYkZX3kucWOZ633nzx4zVhg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DpSDMjUFA8coRInJO1jhMALOYG444WRFw1w7vJKc7cw=";
|
||||
sha256 = "sha256-uLpvTnn2EWEI8+5gC3ofMjsZ9O7nLOaaUGGuvSE1gdE=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mxml";
|
||||
version = "3.2";
|
||||
version = "3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "michaelrsweet";
|
||||
repo = "mxml";
|
||||
rev = "v${version}";
|
||||
sha256 = "0zvib87rgsib0w9xp6bks5slq5ma1qbgyyyvr23cv7zkbgw3xgil";
|
||||
sha256 = "sha256-YN8g8KDk7xnDVK1io0zSLO7erxEp4VQ9heA7Lu/cUUg=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -314,6 +314,13 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
parcel = super.parcel.override {
|
||||
buildInputs = [ self.node-gyp-build ];
|
||||
preRebuild = ''
|
||||
sed -i -e "s|#!/usr/bin/env node|#! ${pkgs.nodejs}/bin/node|" node_modules/node-gyp-build/bin.js
|
||||
'';
|
||||
};
|
||||
|
||||
postcss-cli = super.postcss-cli.override {
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -224,6 +224,7 @@
|
|||
, "nrm"
|
||||
, "ocaml-language-server"
|
||||
, "parcel-bundler"
|
||||
, "parcel"
|
||||
, "parsoid"
|
||||
, "patch-package"
|
||||
, "peerflix"
|
||||
|
|
|
|||
5416
pkgs/development/node-packages/node-packages.nix
generated
5416
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlmap";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-X8FpGnrF0aHuf3yIzRrxoNAu77UASTL36CQpcuxESV8=";
|
||||
sha256 = "sha256-W/UdJPLcFOEHHz7VYeQ3CcXysNju5DuxqvYA+xMkb20=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "6.02";
|
||||
version = "6.03";
|
||||
pname = "xscreensaver";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-Xm1ssJAzrVYs/m1Gv5MS5EUfeUa+2KRnGqk0TfkZMYQ=";
|
||||
sha256 = "sha256-Mo1ReXNSrPWMpbq0nnb78mA058rXhfZR6hHOe0P7olo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
"x86_64-darwin" = fetchzip {
|
||||
sha256 = "sha256-hB3TL1FocAtLpBe+Rv2Pyon4f1ld+Fqapz6TUQ0O1jU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-mKCqFMkTei7n/eI9s3aiAKc4jdnRA121TOizRHON1ic==";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
sha256 = "sha256-ZPHmFxKLJ1oxT18P6FDv74/leCzlESTrhNYuC8T6u+I=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-N+S2BWUskEHt5YjpncmiurdgQ6TN35TWN8Zv7bM3a5k=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
sha256 = "sha256-yOvkEimDp646BCCFV2fnmVGe6R8geFlxtWLfPMVQ9Uk=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-p665fB2lVSLpWIYlTNW+ZGOohpobdvOs0AIQ1l9BlmE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
sha256 = "sha256-ayNv2O0Ge3dT6YAN4SW/gsyoErCB3BJYsx/daMbGHjs=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-oomkIHeQDTNDp6A6CcMv2s89PkuKpGVV4iLCxcj0Xsc=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.4/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.3";
|
||||
version = "0.107.4";
|
||||
|
||||
src = (import ./bins.nix { inherit fetchurl fetchzip; }).${stdenv.hostPlatform.system};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dismap";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhzyker";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0d5r6n92ndlr48f4z6lxwrx7bdh5mmibdjcyab4j2h49lf37c1qd";
|
||||
sha256 = "sha256-WaQdDcBvv4mHdPFAB+spC64YeT3jlfyMYNsTjBILjwA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "00hwhc86rj806arvqfhfarmxs1drcdp91xkr12whqhsi9ddc254d";
|
||||
vendorSha256 = "sha256-GnchyE2TswvjYlehhMYesZruTTwyTorfR+17K0RXXFY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Asset discovery and identification tools";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gau";
|
||||
version = "2.0.8";
|
||||
version = "2.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GkPAv6JrgzlblSw4oIvPvNSboOmvZCMKyFwAMD3W0fQ=";
|
||||
sha256 = "sha256-8op515+0wDxxU1e08gJ6lg/8NhQScFb4b3mCzBV/VNw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ=";
|
||||
|
|
|
|||
Loading…
Reference in a new issue