Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-03-28 06:05:34 +00:00 committed by GitHub
commit ea21c98571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 99 additions and 60 deletions

View File

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
CXXFLAGS = "-std=c++11";
configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0";
postPatch = ''

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
version = "0.9.21";
version = "0.9.22";
nativeBuildInputs = [
p7zip
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
sha256 = "sha256-Tnv+vfKOdDWIU36T9ZqwdTwuMd2AOGyKBY0IkPfrZlc=";
sha256 = "sha256-DOiO36suytukkviqYyLL47DFVzsJt2ZfSnnni95CLaA=";
};
buildInputs = [

View File

@ -3,13 +3,13 @@
mkDerivation rec {
pname = "photoflare";
version = "1.6.7";
version = "1.6.7.1";
src = fetchFromGitHub {
owner = "PhotoFlare";
repo = "photoflare";
rev = "v${version}";
sha256 = "sha256-Gx3YP29NrNHp0p05a1O4Xb9kqkA6pQLTJZ3/wOx+BWY=";
sha256 = "sha256-7b7ICcHuMjOMtyQDkokoHeZrF4G+bOzgRJP4mkns+Zc=";
};
nativeBuildInputs = [ qmake qttools ];

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
ffmpeg_3, kio, taglib
ffmpeg_4, kio, taglib
}:
mkDerivation {
@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ffmpeg_3 kio taglib ];
buildInputs = [ ffmpeg_4 kio taglib ];
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.24.3";
version = "0.24.5";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-xxWbojMY0je1mkp2TMuIhIsimVKdHvbkTMozlU9RbTQ=";
sha256 = "sha256-CAKvu6/U/2krJzY9VnK9wUHSNCpM6rjRzgXAWhC65uw=";
};
buildFlagsArray = ''
@ -18,7 +18,7 @@ buildGoModule rec {
-X github.com/derailed/k9s/cmd.commit=${src.rev}
'';
vendorSha256 = "sha256-Q/l/GH6NSZdMMwTJ5spVEGZclnzcWpUW+zOwRXYQjxc=";
vendorSha256 = "sha256-WcGIw53QPOVPeRXKMr1rH1R+PZRWf9/asyPyoutD8x4=";
doCheck = false;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "2.34";
version = "2.35";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
sha256 = "sha256-YQL9xx4dpT1psZqLiF5ojQcEY2EI0szWTS4oOPbG7Co=";
sha256 = "sha256-J0vwc/sabc6T8+eh94luQdnVltmThapYwLCdyGjCnSc=";
};
vendorSha256 = "sha256-8o/Y5SXMgDrid1a5KTQieiVrWce0wcgrhPbSsbravEI=";
vendorSha256 = "sha256-u1Aqcm6oJ1y2dVP9BJXV7/1nhNxEOtgZQppoA+cXbD0=";
subPackages = [ "weed" ];

View File

@ -4,12 +4,12 @@ with lib;
stdenv.mkDerivation rec {
pname = "marvin";
version = "21.2.0";
version = "21.3.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
sha256 = "sha256-CLvMspk7HqrtNM5TD45mZIz6vsS32eUuxFDJiBDs9VY=";
sha256 = "sha256-PM4Exi4YD6WibxqtewLzE4dDRgSVHiTT36p68uoQP4g=";
};
nativeBuildInputs = [ dpkg makeWrapper ];

View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "git-lfs";
version = "2.13.2";
version = "2.13.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "git-lfs";
repo = "git-lfs";
sha256 = "0gfpzdya48phwln61746ii78sq55mhzj938lz8x062xkkcsdvbf4";
sha256 = "sha256-T4s/xnu5nL6dkEIo7xGywaE+EPH2OnzsaCF9OCGu7WQ=";
};
goPackagePath = "github.com/git-lfs/git-lfs";

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
version = "1.10.2.774";
version = "1.10.3.814";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "0z3j8m9k7prmx6n3kpyhj04pjdg7y0plyxv4kp7789shanr6y4qp";
sha256 = "sha256-+jpnhuKPvxKJA8xDo9GiRKpFJdPYRJTssmZtafadEn4=";
};
nativeBuildInputs = [

View File

@ -40,7 +40,7 @@ let
in stdenv.mkDerivation rec {
pname = "egl-wayland";
version = "1.1.4";
version = "1.1.6";
outputs = [ "out" "dev" ];
@ -48,13 +48,9 @@ in stdenv.mkDerivation rec {
owner = "Nvidia";
repo = pname;
rev = version;
sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d";
sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk";
};
# Add missing include
# https://github.com/NVIDIA/egl-wayland/pull/24
patches = [ ./eglmesaext.patch ];
nativeBuildInputs = [
meson
ninja
@ -69,6 +65,13 @@ in stdenv.mkDerivation rec {
wayland
];
postFixup = ''
# Doubled prefix in pc file after postbuild hook replaces includedir prefix variable with dev output path
substituteInPlace $dev/lib/pkgconfig/wayland-eglstream.pc \
--replace "=$dev/$dev" "=$dev" \
--replace "Requires:" "Requires.private:"
'';
meta = with lib; {
description = "The EGLStream-based Wayland external platform";
homepage = "https://github.com/NVIDIA/egl-wayland/";

View File

@ -1,12 +0,0 @@
diff --git a/src/wayland-eglsurface.c b/src/wayland-eglsurface.c
index 01c9cb3..45736b0 100644
--- a/src/wayland-eglsurface.c
+++ b/src/wayland-eglsurface.c
@@ -37,6 +37,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <fcntl.h>
+#include <EGL/eglmesaext.h>
#define WL_EGL_WINDOW_DESTROY_CALLBACK_SINCE 3

View File

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "tfsec";
version = "0.39.10";
version = "0.39.14";
src = fetchFromGitHub {
owner = "tfsec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-T2soogk5KcNSeluNyJ4b2GjLkvauvvznaLSMQVgVZgI=";
sha256 = "sha256-Peq51XN8EEvHWdSL3ngBx74t7V4RUrZa4RpGnvZ0Ml8=";
};
goPackagePath = "github.com/tfsec/tfsec";

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pkgconf";
version = "1.7.3";
version = "1.7.4";
nativeBuildInputs = [ removeReferencesTo ];
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
sha256 = "1h7rf5cch0cbxp8nmjkkf272zrz2jgpqpr8a58ww75pn3jjswimq";
sha256 = "sha256-1z8ywkikWRE5prF3d8gNTeq2tBTsKz0h0KJL40jEdqs=";
};
# Debian has outputs like these too:

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "sd-local";
version = "1.0.26";
version = "1.0.27";
src = fetchFromGitHub {
owner = "screwdriver-cd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JQeqCvnGWE0VesLQ6HbH7gikwAP3im19nBnwr1ruQqk=";
sha256 = "sha256-aJxSLOUmTuPzBJCnXv2d09Kdh/jPPBUmFnuq8629PWY=";
};
vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20=";

View File

@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
version = "3.13.10";
version = "3.13.11";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
sha256 = "sha256-5UT/STcU+/17wjc/guOXgkD6UCtn97EQkVRgnTliFjg=";
sha256 = "sha256-U0kTkdcEC1cu+UFmQmgadNn1bIZ5Rq4+bBqjFU3c4+M=";
};
dontUnpack = true;

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "swego";
version = "0.93";
version = "0.94";
src = fetchFromGitHub {
owner = "nodauf";
repo = "Swego";
rev = "v${version}";
sha256 = "sha256-oTeSh7OzjzbgKbSQSNhnCUZw5FdUkN+Y9LkIbWFhn5c=";
sha256 = "sha256-PquedlfBzNSXa3l6IIHlf6Xb4M4uEb1XCKRfN229IEA=";
};
vendorSha256 = "sha256-TK1LN9EmVH95jPO6K7gtCwdnW4WOKH3K7Q0FhgNMVUQ=";

View File

@ -1,22 +1,22 @@
{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
rustPlatform.buildRustPackage rec {
pname = "bupstash";
version = "0.7.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "andrewchambers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-4+Ra7rNvIL4SpdCkRbPBNrZeTb1dMbuwZx+D++1qsGs=";
sha256 = "sha256-zZHJlC0OICIc3G825t7GrZwdmkaaLQKzX2IwkKigkV4=";
};
cargoSha256 = "sha256-cZSscmH3XPfH141hZhew79/UZHsqDZRN3EoNnYkW0wA=";
cargoSha256 = "sha256-KVeIF6x+gpb8vkqCtZptF5EX9G1Zv6q8L6tskN6HziM=";
nativeBuildInputs = [ ronn pkg-config installShellFiles ];
buildInputs = [ libsodium ];
postBuild = ''
RUBYOPT="-KU -E utf-8:utf-8" ronn doc/man/*.md
RUBYOPT="-KU -E utf-8:utf-8" ronn -r doc/man/*.md
'';
postInstall = ''

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gobgp";
version = "2.23.0";
version = "2.24.0";
src = fetchFromGitHub {
owner = "osrg";
repo = "gobgp";
rev = "v${version}";
sha256 = "0r7w1c3rh0wnsrhdpzr2fp1aqdqafrb42f2hra6xwwspr092ixq0";
sha256 = "sha256-1IG1AKMz6WzDDbdZnSaAS4HHlPApCG1qND7xJcQ97Hk=";
};
vendorSha256 = "0dmd4r6x76jn8pyvp47x4llzc2wij5m9lchgyaagcb5sfdgbns9x";
vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY=";
postConfigure = ''
export CGO_ENABLED=0

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ibm-sw-tpm2";
version = "1637";
version = "1661";
src = fetchurl {
url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz";
sha256 = "09z3wbv38dc8wnw1q961s6bcd0kvz2xkjp6dxg4kn914fwzlqfnx";
sha256 = "sha256-VRRZKK0rJPNL5qDqz5+0kuEODqkZuEKMch+pcOhdYUc=";
};
buildInputs = [ openssl ];

View File

@ -5,13 +5,13 @@
buildPythonApplication rec {
pname = "sipvicious";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "EnableSecurity";
repo = pname;
rev = "v${version}";
sha256 = "0hna4xyjhdwi6z2aqqp25ydkb1qznlil95w2iqrr576wcrciznd5";
sha256 = "17f6w7qh33zvlhqwf22y9y7skha0xjs46yk66q8xm4brsv4lfxxa";
};
# Project has no tests

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "teler";
version = "1.1.1";
version = "1.2.1";
src = fetchFromGitHub {
owner = "kitabisa";
repo = "teler";
rev = "v${version}";
sha256 = "sha256-FZG23j7LUwfJ0dSbU4xW0YyCKJxOjVf1uqkuGlrwnqs=";
sha256 = "sha256-lExZWFj0PQFUBJgfhahF8PfYaOndRxKyVHoMlubmEpc=";
};
vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys=";
vendorSha256 = "sha256-TQjwPem+RMuoF5T02CL/CTvBS6W7Q786gTvYUFIvxjE=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X ktbs.dev/teler/common.Version=${version}")

View File

@ -0,0 +1,45 @@
{ lib, nim, stdenv, fetchFromGitLab
, enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ]
}:
stdenv.mkDerivation {
name = "swaycwd";
version = "0.0.1";
src = fetchFromGitLab {
owner = "cab404";
repo = "swaycwd";
rev = "aca81695ec2102b9bca6f5bae364f69a8b9d399f";
hash = "sha256-MkyY3wWByQo0l0J28xKDfGtxfazVPRyZHCObl9Fszh4=";
};
configurePhase = ''
runHook preConfigure
{
echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}'
echo 'export enabledShells'
} > shells.nim
runHook postConfigure
'';
nativeBuildInputs = [ nim ];
buildPhase = ''
export HOME=$TMPDIR
nim c --opt:speed -d:release swaycwd.nim
'';
installPhase = ''
runHook preInstall
install -D -m555 -t $out/bin swaycwd
runHook postInstall
'';
meta = with lib; {
homepage = "https://gitlab.com/cab404/swaycwd";
description = "Returns cwd for shell in currently focused sway window, or home directory if cannot find shell";
maintainers = with maintainers; [ cab404 ];
platforms = platforms.linux;
license = licenses.gpl3Only;
};
}

View File

@ -2050,6 +2050,8 @@ in
swaykbdd = callPackage ../tools/wayland/swaykbdd { };
swaycwd = callPackage ../tools/wayland/swaycwd { };
wayland-utils = callPackage ../tools/wayland/wayland-utils { };
wev = callPackage ../tools/wayland/wev { };