Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-10-02 06:06:29 +00:00 committed by GitHub
commit 2cdbb0a834
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 59 additions and 55 deletions

View File

@ -26,13 +26,13 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "neovim-unwrapped"; pname = "neovim-unwrapped";
version = "0.7.2"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "neovim"; repo = "neovim";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-eKKQNM02Vhy+3yL2QV+0FSEpcniEa5Aq6hkAUIgLo1k="; sha256 = "sha256-mVeVjkP8JpTi2aW59ZuzQPi5YvEySVAtxko7xxAx/es=";
}; };
patches = [ patches = [
@ -104,9 +104,6 @@ in
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
; ;
# triggers on buffer overflow bug while running tests
hardeningDisable = [ "fortify" ];
preConfigure = lib.optionalString stdenv.isDarwin '' preConfigure = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
''; '';

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "worker"; pname = "worker";
version = "4.10.1"; version = "4.11.0";
src = fetchurl { src = fetchurl {
url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-8dJjh+h8lsdydSqLJ72sfi2IFJ4X8dfRot5/aAEQ5Vk="; sha256 = "sha256-lpR9eHiKOkQ6/rHTJLFUDrMHdSx4rZgppc36CyZlSXg=";
}; };
buildInputs = [ libX11 ]; buildInputs = [ libX11 ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "batsignal"; pname = "batsignal";
version = "1.6.0"; version = "1.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "electrickite"; owner = "electrickite";
repo = "batsignal"; repo = "batsignal";
rev = version; rev = version;
sha256 = "sha256-uDfC/PqT1Bb8np0l2DDIZUoNP9QpjxZH5v1hK2k1Miw="; sha256 = "sha256-3T0vpyAw21u2+csqaz3Yf10G8IQRDyjReedIo+I4fvw=";
}; };
buildInputs = [ libnotify glib ]; buildInputs = [ libnotify glib ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmaxminddb"; pname = "libmaxminddb";
version = "1.7.0"; version = "1.7.1";
src = fetchurl { src = fetchurl {
url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-StbPiRlXU183tua2Fi4SIEV5xdPksZExHQvWFj23FYw="; sha256 = "sha256-6EFPDe3Oy8H2wxy2XNgWUJUqsGd6TYxJyrYDs7j7CD4=";
}; };
meta = with lib; { meta = with lib; {

View File

@ -1,20 +1,18 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchurl
, perl , perl
, libtool , libtool
}: }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "libvterm-neovim"; pname = "libvterm-neovim";
# Releases are not tagged, look at commit history to find latest release # Releases are not tagged, look at commit history to find latest release
version = "0.1.3"; version = "0.3";
src = fetchFromGitHub { src = fetchurl {
owner = "neovim"; url = "https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz";
repo = "libvterm"; sha256 = "sha256-YesNZijFK98CkA39RGiqhqGnElIourimcyiYGIdIM1g=";
rev = "65dbda3ed214f036ee799d18b2e693a833a0e591";
sha256 = "0r6yimzbkgrsi9aaxwvxahai2lzgjd1ysblr6m6by5w459853q3n";
}; };
nativeBuildInputs = [ perl libtool ]; nativeBuildInputs = [ perl libtool ];

View File

@ -5,13 +5,13 @@
buildGoModule rec { buildGoModule rec {
pname = "brev-cli"; pname = "brev-cli";
version = "0.6.114"; version = "0.6.116";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "brevdev"; owner = "brevdev";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-4qDRQQp3UWejehr2FgTOQKeZhKmBffrkADpUJj2hP4w="; sha256 = "sha256-4W6Ew80HN436mEG+gjEj8cuVY3iCQBpqNO1voAMDX1o=";
}; };
vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw="; vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw=";

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "flyctl"; pname = "flyctl";
version = "0.0.383"; version = "0.0.402";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "superfly"; owner = "superfly";
repo = "flyctl"; repo = "flyctl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SI+Xm4TUn4HmfbTG0YQuwQhCSVcean8PsOx5SowI/eU="; sha256 = "sha256-SKnSVa+ZARlCA6lrpDZpn5vkJmdvEp3aMwGtpT31jrc=";
}; };
vendorSha256 = "sha256-swbQOLW3NMVDbD1hJh7iFKAFWlQhWSY2KHQGj5NSdqw="; vendorSha256 = "sha256-gmqCqZ0w7UQDxovxUFm3uweTh/gCAhcqCk/9zt54ndI=";
subPackages = [ "." ]; subPackages = [ "." ];

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "terraria-server"; pname = "terraria-server";
version = "1.4.3.6"; version = "1.4.4.2";
urlVersion = lib.replaceChars [ "." ] [ "" ] version; urlVersion = lib.replaceChars [ "." ] [ "" ] version;
src = fetchurl { src = fetchurl {
url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip";
sha256 = "sha256-OFI7U6Mqu09pIbgJQs0O+GS8jf1uVuhAVEJhYNYXrBE="; sha256 = "sha256-kRqLnrLuv9hgaGcOaTQmS7auozZcEZmXmE/qcD+wRWA=";
}; };
buildInputs = [ file ]; buildInputs = [ file ];

View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Proxy for sending IIO sensor data to D-Bus"; description = "Proxy for sending IIO sensor data to D-Bus";
homepage = "https://github.com/hadess/iio-sensor-proxy"; homepage = "https://gitlab.freedesktop.org/hadess/iio-sensor-proxy";
license = licenses.gpl3 ; license = licenses.gpl3 ;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux; platforms = platforms.linux;

View File

@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
install -D pgroonga.so -t $out/lib/ install -D pgroonga.so -t $out/lib/
install -D pgroonga.control -t $out/share/postgresql/extension install -D pgroonga.control -t $out/share/postgresql/extension
install -D data/pgroonga-*.sql -t $out/share/postgresql/extension install -D data/pgroonga-*.sql -t $out/share/postgresql/extension
install -D pgroonga_database.so -t $out/lib/
install -D pgroonga_database.control -t $out/share/postgresql/extension
install -D data/pgroonga_database-*.sql -t $out/share/postgresql/extension
''; '';
meta = with lib; { meta = with lib; {
@ -31,6 +35,6 @@ stdenv.mkDerivation rec {
homepage = "https://pgroonga.github.io/"; homepage = "https://pgroonga.github.io/";
license = licenses.postgresql; license = licenses.postgresql;
platforms = postgresql.meta.platforms; platforms = postgresql.meta.platforms;
maintainers = with maintainers; [ DerTim1 ]; maintainers = with maintainers; [ DerTim1 ivan ];
}; };
} }

View File

@ -8,7 +8,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.13.5"; version = "1.13.6";
pname = "wimlib"; pname = "wimlib";
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-MvzJ6bFEt8sdtMhuEEyngoPNwiXhP+grJzZgWGrv4yM="; sha256 = "sha256-Cg+cHA06KnZkVTWusPYuA/xVkUymXzpNVZm7iwJg29k=";
}; };
preBuild = lib.optionalString (!stdenv.isDarwin) '' preBuild = lib.optionalString (!stdenv.isDarwin) ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mtools"; pname = "mtools";
version = "4.0.40"; version = "4.0.41";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2";
sha256 = "sha256-oi/KQjVAEd0ik6f1HyKLRuu9gC53QLCXWRKv7LedXfQ="; sha256 = "sha256-JUIVImT7Pv9+1wZiq/T07vgTO8N9C3pobCQN8rX4ChM=";
}; };
patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

View File

@ -2,40 +2,45 @@
, stdenv , stdenv
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, pkg-config
, installShellFiles , installShellFiles
, openssl
, Security , Security
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "tealdeer"; pname = "tealdeer";
version = "1.5.0"; version = "1.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dbrgn"; owner = "dbrgn";
repo = "tealdeer"; repo = "tealdeer";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yF46jCdC4UDswKa/83ZrM9VkZXQqzua2/S7y2bqYa+c="; sha256 = "sha256-c7HYQtNT3e/GRyhS6sVGBw91cIusWmOqQ3i+Gglc/Ks=";
}; };
cargoSha256 = "sha256-BIMaVeNSdKl2A9613S+wgmb6YmiF5YJU8pTMVQfjDwI="; cargoSha256 = "sha256-CLCY4rKdYX3QZvk18Ty9B3kcC6hXsDTpAFG0S5xusEQ=";
buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; buildInputs = lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ installShellFiles pkg-config ]; nativeBuildInputs = [ installShellFiles ];
postInstall = '' postInstall = ''
installShellCompletion --cmd tldr \ installShellCompletion --cmd tldr \
--bash bash_tealdeer \ --bash completion/bash_tealdeer \
--fish fish_tealdeer \ --fish completion/fish_tealdeer \
--zsh zsh_tealdeer --zsh completion/zsh_tealdeer
''; '';
# disable tests for now since one needs network # Disable tests that require Internet access:
# what is unavailable in sandbox build checkFlags = [
# and i can't disable just this one "--skip test_autoupdate_cache"
doCheck = false; "--skip test_create_cache_directory_path"
"--skip test_pager_flag_enable"
"--skip test_quiet_cache"
"--skip test_quiet_failures"
"--skip test_quiet_old_cache"
"--skip test_spaces_find_command"
"--skip test_update_cache"
];
meta = with lib; { meta = with lib; {
description = "A very fast implementation of tldr in Rust"; description = "A very fast implementation of tldr in Rust";

View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vttest"; pname = "vttest";
version = "20220215"; version = "20220827";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz"
"ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz"
]; ];
sha256 = "sha256-SmWZjF4SzwjO0s/OEZrbRPqEKsFJXQ8VDyHIpnhZFaE="; sha256 = "sha256-Vyaq5YE3dzzmzgH+aob8D4PEd2PjBIi/81ubxPyUbOI=";
}; };
meta = with lib; { meta = with lib; {

View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "godns"; pname = "godns";
version = "2.8.9"; version = "2.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TimothyYe"; owner = "TimothyYe";
repo = "godns"; repo = "godns";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Mqfbug+v47RdFEN13hTFxu/JYINz5fFE2QKzZs3FoJU="; sha256 = "sha256-FxVvqZMB9UGryNEbBFaxpK+VgrMH73x0fseU0dgCH0o=";
}; };
vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE="; vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE=";

View File

@ -2,20 +2,20 @@
let let
pname = "ookla-speedtest"; pname = "ookla-speedtest";
version = "1.1.1"; version = "1.2.0";
srcs = rec { srcs = rec {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz"; url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-x86_64.tgz";
sha256 = "sha256-lwR3/f7k10HnXwiPr2SPm1HHvgQxP7iP+13gfrGjBAw="; sha256 = "sha256-VpBZbFT/m+1j+jcy+BigXbwtsZrTbtaPIcpfZNXP7rc=";
}; };
aarch64-linux = fetchurl { aarch64-linux = fetchurl {
url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-aarch64.tgz"; url = "https://install.speedtest.net/app/cli/${pname}-${version}-linux-aarch64.tgz";
sha256 = "sha256-J2pAhz/hw8okohWAwvxkqpLtNY/8bbYHGhPQOo1DH9k="; sha256 = "sha256-OVPSMdo3g+K/iQS23XJ2fFxuUz4WPTdC/QQ3r/pDG9M=";
}; };
x86_64-darwin = fetchurl { x86_64-darwin = fetchurl {
url = "https://install.speedtest.net/app/cli/${pname}-${version}.84-macosx-x86_64.tgz"; url = "https://install.speedtest.net/app/cli/${pname}-${version}-macosx-universal.tgz";
sha256 = "sha256-FT925OUCortHDH98O0uK+qUOuYuxHoYhb8sai5JnbpQ="; sha256 = "sha256-yfgZIUnryI+GmZmM7Ksc4UQUQEWQfs5vU89Qh39N5m8=";
}; };
aarch64-darwin = x86_64-darwin; aarch64-darwin = x86_64-darwin;
}; };