Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-08-21 18:01:29 +00:00 committed by GitHub
commit fd9f6da81c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
58 changed files with 329 additions and 177 deletions

View File

@ -6355,6 +6355,16 @@
}];
name = "Ioannis Koutras";
};
jonaenz = {
name = "Jona Enzinger";
email = "5xt3zyy5l@mozmail.com";
matrix = "@jona:matrix.jonaenz.de";
github = "jonaenz";
githubId = 57130301;
keys = [{
fingerprint = "1CC5 B67C EB9A 13A5 EDF6 F10E 0B4A 3662 FC58 9202";
}];
};
jonafato = {
email = "jon@jonafato.com";
github = "jonafato";

View File

@ -180,8 +180,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.kanata;
defaultText = lib.literalExpression "pkgs.kanata";
example = lib.literalExpression "pkgs.kanata-with-cmd";
defaultText = literalExpression "pkgs.kanata";
example = literalExpression "pkgs.kanata-with-cmd";
description = mdDoc ''
The kanata package to use.
@ -198,7 +198,7 @@ in
};
};
config = lib.mkIf cfg.enable {
config = mkIf cfg.enable {
hardware.uinput.enable = true;
systemd = {
@ -211,5 +211,5 @@ in
};
};
meta.maintainers = with lib.maintainers; [ linj ];
meta.maintainers = with maintainers; [ linj ];
}

View File

@ -254,6 +254,14 @@ in {
'';
};
fastcgiTimeout = mkOption {
type = types.int;
default = 120;
description = lib.mdDoc ''
FastCGI timeout for database connection in seconds.
'';
};
database = {
createLocally = mkOption {
@ -1032,7 +1040,7 @@ in {
fastcgi_pass unix:${fpm.socket};
fastcgi_intercept_errors on;
fastcgi_request_buffering off;
fastcgi_read_timeout 120s;
fastcgi_read_timeout ${builtins.toString cfg.fastcgiTimeout}s;
'';
};
"~ \\.(?:css|js|woff2?|svg|gif|map)$".extraConfig = ''

View File

@ -167,7 +167,7 @@ sub get_active_units {
# Takes the name of the unit as an argument and returns a bool whether the unit is active or not.
sub unit_is_active {
my ($unit_name) = @_;
my $units = busctl_call_systemd1_mgr("ListUnitsByNames", "as", 1, $unit_name)->{data}->[0];
my $units = busctl_call_systemd1_mgr("ListUnitsByNames", "as", 1, , "--", $unit_name)->{data}->[0];
if (scalar(@{$units}) == 0) {
return 0;
}

View File

@ -214,6 +214,25 @@ in {
systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test";
};
unitStartingWithDash.configuration = {
systemd.services."-" = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
ExecStart = "${pkgs.coreutils}/bin/true";
};
};
};
unitStartingWithDashModified.configuration = {
imports = [ unitStartingWithDash.configuration ];
systemd.services."-" = {
reloadIfChanged = true;
serviceConfig.ExecReload = "${pkgs.coreutils}/bin/true";
};
};
unitWithRequirement.configuration = {
systemd.services.required-service = {
wantedBy = [ "multi-user.target" ];
@ -637,9 +656,27 @@ in {
assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n")
assert_lacks(out, "the following new units were started:")
# Ensure units can start with a dash
out = switch_to_specialisation("${machine}", "unitStartingWithDash")
assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n")
assert_lacks(out, "NOT restarting the following changed units:")
assert_lacks(out, "reloading the following units:")
assert_lacks(out, "\nrestarting the following units:")
assert_lacks(out, "\nstarting the following units:")
assert_contains(out, "the following new units were started: -.service\n")
# The regression only occurs when reloading units
out = switch_to_specialisation("${machine}", "unitStartingWithDashModified")
assert_lacks(out, "stopping the following units:")
assert_lacks(out, "NOT restarting the following changed units:")
assert_contains(out, "reloading the following units: -.service")
assert_lacks(out, "\nrestarting the following units:")
assert_lacks(out, "\nstarting the following units:")
assert_lacks(out, "the following new units were started:")
# Ensure units that require changed units are properly reloaded
out = switch_to_specialisation("${machine}", "unitWithRequirement")
assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n")
assert_contains(out, "stopping the following units: -.service\n")
assert_lacks(out, "NOT restarting the following changed units:")
assert_lacks(out, "reloading the following units:")
assert_lacks(out, "\nrestarting the following units:")

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "wvkbd";
version = "0.7";
version = "0.9";
src = fetchFromGitHub {
owner = "jjsullivan5196";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5UV2PMrLXtF3AxjfPxxwFRkgVef+Ap8nG1v795o0bWE=";
sha256 = "sha256-Dcb1mnqvf2MvwljWuqMV/8AyF/aGMcDiz4cRQ9NAFtM=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -0,0 +1,107 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, libX11
, libXrandr
, libXinerama
, libXext
, libXcursor
, freetype
, alsa-lib
, libjack2
, Cocoa
, WebKit
, MetalKit
, simd
, DiscRecording
, CoreAudioKit
}:
stdenv.mkDerivation rec {
pname = "dexed";
version = "unstable-2022-07-09";
src = fetchFromGitHub {
owner = "asb2m10";
repo = "dexed";
rev = "2c036316bcd512818aa9cc8129767ad9e0ec7132";
fetchSubmodules = true;
sha256 = "sha256-6buvA72YRlGjHWLPEZMr45lYYG6ZY+IWmylcHruX27g=";
};
postPatch = ''
# needs special setup on Linux, dunno if it can work on Darwin
# https://github.com/NixOS/nixpkgs/issues/19098
sed -i -e '/juce::juce_recommended_lto_flags/d' Source/CMakeLists.txt
'';
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
libX11
libXext
libXcursor
libXinerama
libXrandr
freetype
alsa-lib
libjack2
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
WebKit
MetalKit
simd
DiscRecording
CoreAudioKit
];
# JUCE insists on only dlopen'ing these
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [
"-lX11"
"-lXext"
"-lXcursor"
"-lXinerama"
"-lXrandr"
"-ljack"
]);
installPhase = let
vst3Dir = if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/VST3" else "$out/lib/vst3";
# this one's a guess, don't know where ppl have agreed to put them yet
clapDir = if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/CLAP" else "$out/lib/clap";
auDir = "$out/Library/Audio/Plug-Ins/Components";
in ''
runHook preInstall
'' + (if stdenv.hostPlatform.isDarwin then ''
mkdir -p $out/{Applications,bin}
mv Source/Dexed_artefacts/Release/Standalone/Dexed.app $out/Applications/
ln -s $out/{Applications/Dexed.app/Contents/MacOS,bin}/Dexed
'' else ''
install -Dm755 {Source/Dexed_artefacts/Release/Standalone,$out/bin}/Dexed
'') + ''
mkdir -p ${vst3Dir} ${clapDir}
mv Source/Dexed_artefacts/Release/VST3/* ${vst3Dir}
mv Source/Dexed_artefacts/Release/CLAP/* ${clapDir}
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p ${auDir}
mv Source/Dexed_artefacts/Release/AU/* ${auDir}
'' + ''
runHook postInstall
'';
meta = with lib; {
description = "DX7 FM multi platform/multi format plugin";
mainProgram = "Dexed";
homepage = "https://asb2m10.github.io/dexed";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ OPNA2608 ];
};
}

View File

@ -9,13 +9,13 @@
mkDerivation rec {
pname = "spotify-qt";
version = "3.8";
version = "3.9";
src = fetchFromGitHub {
owner = "kraxarn";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Rgtw+nrM8YUBHPIIe9zVhLij/ep07piPf/2MSmTVQKk=";
sha256 = "sha256-8rLpasgXiaL2KpGnYMQdNN2ayjcSkmz5hDkNBnKNWHk=";
};
buildInputs = [ libxcb qtbase qtsvg ];

View File

@ -46,9 +46,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "7.13";
version = "7.15";
url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz";
sha256 = "sha256-a/6+kz2qUJVprnmwv2ofG08H4b+K/Balm+4TdIuSymQ=";
sha256 = "sha256-0auKGarm/mwIM8PYgqMkSKv6SihZDxRulUUOufWPuRw=";
inherit (stable) gecko32 gecko64 patches;
mono = fetchurl rec {
@ -61,7 +61,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "sha256-U1awbhJRT3aAJstyEjv2Dp20FqyQ4ntnFFRYJb12C/U=";
sha256 = "sha256-JMig0EUgxdRwpeaxZcNQi+6xWHUg43bXB7jkm5skKC8=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

View File

@ -17,13 +17,13 @@
mkDerivation rec {
pname = "CopyQ";
version = "6.1.0";
version = "6.2.0";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
sha256 = "sha256-2BWyLVxH50G+S/Hp8E5hWG64DcIamtZPGm0nSMwEhY4=";
hash = "sha256-0XCqSF1oc2B3FD5OmOxqgt9sqCIrzK0KjkntVFXlRWI=";
};
nativeBuildInputs = [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "surface-control";
version = "0.4.1-2";
version = "0.4.2-1";
src = fetchFromGitHub {
owner = "linux-surface";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZgtEmjk1HwoKkyuOiMWalK5RPb3ML8HM/wwz8OM9HoI=";
sha256 = "sha256-tFGYIIlcJ4qF1t4Ej6WanjHtm8dSWtH38856uSTc7rU=";
};
cargoSha256 = "sha256-CsPyY/NA2+Lecemuor2nHd6yzf2PvMK7NZyvY3vewpI=";
cargoSha256 = "sha256-WwTM1DMTi5DKnkMERkW8H8T2OXlg+Tk6BupmwnOAK5I=";
nativeBuildInputs = [ pkg-config installShellFiles ];
buildInputs = [ udev ];

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tdrop";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "noctuid";
repo = "tdrop";
rev = version;
sha256 = "sha256-1umHwzpv4J8rZ0c0q+2dPsEk4vhFB4UerwI8ctIJUZg=";
sha256 = "sha256-fHvGXaZL7MMvTnkap341B79PDDo2lOVPPcOH4AX/zXo=";
};
dontBuild = true;

View File

@ -34,11 +34,11 @@
in
stdenv.mkDerivation rec {
pname = "suricata";
version = "6.0.4";
version = "6.0.6";
src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
sha256 = "sha256-qPGX4z0WeGieu/e8Gr6Ek0xGXSLFBMR8LH6bdKoELQ0=";
sha256 = "sha256-ABc2NPp2ruY244qQscAmFskD5CFzEH1HtBFJYLX76Dk=";
};
nativeBuildInputs = [

View File

@ -7,11 +7,11 @@
mkDerivation rec {
pname = "skrooge";
version = "2.27.0";
version = "2.28.0";
src = fetchurl {
url = "https://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
sha256 = "sha256-xkl0UyJEDOeYOqqXf3woCDMb8ZyC2c5ChQdDFFERZxE=";
sha256 = "sha256-s2SkGMBx7HVpr1NBUJpqji3PTPnw4RqnkakdQVC5ric=";
};
nativeBuildInputs = [

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "siril";
version = "1.0.0";
version = "1.0.3";
src = fetchFromGitLab {
owner = "free-astro";
repo = pname;
rev = version;
sha256 = "sha256-yqWFEa1fnSwl0ecN9hMI13QCfj0f69CFqTJlEAhTpJI=";
sha256 = "sha256-Y5ED2LuNapaq+FkKg3m8t4sgoh2TGXO1VX0p5gwlJjQ=";
};
nativeBuildInputs = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fricas";
version = "1.3.7";
version = "1.3.8";
src = fetchurl {
url = "mirror://sourceforge/fricas/fricas/${version}/fricas-${version}-full.tar.bz2";
sha256 = "sha256-cOqMvSe3ef/ZeVy5cj/VU/aTRtxgfxZfRbE4lWE5TU4=";
sha256 = "sha256-amAGPLQo70nKATyZM7h3yX5mMUxCwOFwb/fTIWB5hUQ=";
};
buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "media-downloader";
version = "2.4.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = pname;
rev = "${version}";
sha256 = "sha256-EyfhomwBtdAt6HGRwnpiijm2D1LfaCAoG5qk3orDG98=";
sha256 = "sha256-xoRbNbzFa1CEB4x9JLkVMrkEqaCgweFzvI0Qr9Fl4zs=";
};
nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ];

View File

@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
freetype
];
postPatch = ''
sed -i --regexp-extended 's/(pkg_verstr=").*(")/\1${version}\2/' configure
'';
preConfigure = ''
patchShebangs configure
'';

View File

@ -6,16 +6,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
version = "0.2.11";
version = "0.3.0";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "sha256-GLHmX628UUdIM+xYJhPtqFg4whQqaF8hFxg0Z5grPac=";
sha256 = "sha256-AfE36u5xSfivkg+hmJ6ASh6zXmTnLOv5RFigkGzySng=";
};
cargoSha256 = "sha256-4Pu3TDLmi0c2nyUj1lTRincgRqL40A/g0PkyJOen0is=";
cargoSha256 = "sha256-MmxF1jt5VUZGbkEe858HBjAuHhgDY23MJJxpYQ4ckhs=";
buildInputs = rpathLibs;

View File

@ -2,12 +2,12 @@
rebar3Relx rec {
pname = "erlfmt";
version = "1.0.0";
version = "1.1.0";
releaseType = "escript";
src = fetchFromGitHub {
owner = "WhatsApp";
repo = "erlfmt";
sha256 = "19apbs9xr4j8qjb3sv9ilknqjw4a7bvp8jvwrjiwvwnxzzm2kjm6";
sha256 = "sha256-diZCyw4eR+h/Pc73HDfnFaXnNXwqu3XabTbeiWVPNPI=";
rev = "v${version}";
};
meta = with lib; {

View File

@ -1,5 +1,5 @@
{ lib, stdenv, llvm_meta, cmake, python3
, monorepoSrc, runCommand
, monorepoSrc, runCommand, fetchpatch
, cxx-headers, libunwind, version
, enableShared ? !stdenv.hostPlatform.isStatic
}:
@ -39,7 +39,13 @@ stdenv.mkDerivation rec {
patches = [
./gnu-install-dirs.patch
./skip-other-project-tests.patch
# https://reviews.llvm.org/D132298, Allow building libcxxabi alone
(fetchpatch {
url = "https://github.com/llvm/llvm-project/commit/e6a0800532bb409f6d1c62f3698bdd6994a877dc.patch";
sha256 = "1xyjd56m4pfwq8p3xh6i8lhkk9kq15jaml7qbhxdf87z4jjkk63a";
stripLen = 1;
})
];
postPatch = ''

View File

@ -1,45 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,10 +131,21 @@ if (NOT LIBCXXABI_ENABLE_SHARED AND NOT LIBCXXABI_ENABLE_STATIC)
message(FATAL_ERROR "libc++abi must be built as either a shared or static library.")
endif()
-# TODO: Remove this, which shouldn't be necessary since we know we're being built
-# side-by-side with libc++.
set(LIBCXXABI_LIBCXX_INCLUDES "" CACHE PATH
"Specify path to libc++ includes.")
+if (NOT libcxx IN_LIST LLVM_ENABLE_RUNTIMES)
+ if (NOT IS_DIRECTORY ${LIBCXXABI_LIBCXX_INCLUDES})
+ message(FATAL_ERROR
+ "LIBCXXABI_LIBCXX_INCLUDES=${LIBCXXABI_LIBCXX_INCLUDES} is not a valid directory. "
+ "Please provide the path to where the libc++ headers have been installed.")
+ endif()
+ add_library(cxx-headers INTERFACE)
+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
+ target_compile_options(cxx-headers INTERFACE /I "${LIBCXXABI_LIBCXX_INCLUDES}")
+ else()
+ target_compile_options(cxx-headers INTERFACE -I "${LIBCXXABI_LIBCXX_INCLUDES}")
+ endif()
+endif()
set(LIBCXXABI_HERMETIC_STATIC_LIBRARY_DEFAULT OFF)
if (WIN32)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -61,9 +61,13 @@ if (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY)
list(APPEND LIBCXXABI_TEST_DEPS cxx_external_threads)
endif()
-list(APPEND LIBCXXABI_TEST_DEPS cxx)
-if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind)
- list(APPEND LIBCXXABI_TEST_DEPS unwind)
+if(libcxx IN_LIST LLVM_ENABLE_RUNTIMES)
+ list(APPEND LIBCXXABI_TEST_DEPS cxx)
+endif()
+if(libunwind IN_LIST LLVM_ENABLE_RUNTIMES)
+ if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind)
+ list(APPEND LIBCXXABI_TEST_DEPS unwind)
+ endif()
endif()
set(AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n# Do not edit!")

View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "tvm";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "apache";
repo = "incubator-tvm";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-fv2hhPGbr/AbwuN8rAF9PI/QTTqxNgwjYl9arg5GjKY=";
sha256 = "sha256-lzLrd4vNK1c7BwWS0H5x1uDdZ3moUl+zWHb8G6gs8hw=";
};
nativeBuildInputs = [ cmake ];

View File

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "svdtools";
version = "0.2.5";
version = "0.2.6";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-tN1GC4tQXyaA8bgq7wB/NZEdO14p/0f8BXtgTk6aOzg=";
sha256 = "sha256-y0RCUSk7YEE5bF/dVEuH/sTtHcVIT4+P0DVkPiNf54I=";
};
cargoSha256 = "sha256-puaveP9a11rlGgsguCfueYXfYSd7Xew8ZRGeDP8WrSI=";
cargoSha256 = "sha256-PPoHTh8cjQMkD69BYk/HW/PwDV5j/OrHHpjFZdBqZxM=";
meta = with lib; {
description = "Tools to handle vendor-supplied, often buggy SVD files";

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rakudo";
version = "2022.03";
version = "2022.07";
src = fetchurl {
url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
sha256 = "sha256-A+IVsAGoeXR2GNb8GOt/icC4EvXlQ6Q+1mwTQ56ooic=";
hash = "sha256-ejvJ1lTh0nkqBVtPrxFu820UH2tq3eeqcDF3BfJgkK0=";
};
nativeBuildInputs = [ removeReferencesTo ];

View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "moarvm";
version = "2022.03";
version = "2022.07";
src = fetchurl {
url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz";
sha256 = "sha256-+3HNE5EkZEgrmbM/DAbp/XxRoVHG5jKpIgz5PFhV/a8=";
hash = "sha256-M37wTRb4JvmUZcZTuSAGAo/iIL5o09z9BylhL09rW0Y=";
};
patches = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nqp";
version = "2022.03";
version = "2022.07";
src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
sha256 = "sha256-qV53iXDE0JwJHSqimcBQNiCM5LSw06evNzGYwSJYswY=";
hash = "sha256-WAgcEG1nKlQGAY/WmRLI1IX9Er8iWVEyXFDJKagjImg=";
};
buildInputs = [ perl ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zef";
version = "0.13.7";
version = "0.13.8";
src = fetchFromGitHub {
owner = "ugexe";
repo = "zef";
rev = "v${version}";
sha256 = "sha256-FEQwe9MkP+tFZgXiR3hrNS+Jyavj85oYql3uOLP3nwc=";
sha256 = "sha256-lWlom1LZuYzsV6BzOl232usvJJFlTz1DQOWkuNUTvX4=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gmm";
version = "5.4";
version = "5.4.2";
src = fetchurl {
url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz";
sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi";
sha256 = "sha256-UgbnMmQ/aTQQkCiy8XNmDywu3LDuJpIo1pSsym4iyIo=";
};
meta = with lib; {

View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "libbde";
version = "20210605";
version = "20220121";
src = fetchurl {
url = "https://github.com/libyal/libbde/releases/download/${version}/${pname}-alpha-${version}.tar.gz";
sha256 = "0dk5h7gvp2fgg21n7k600mnayg4g4pc0lm7317k43j1q0p4hkfng";
sha256 = "sha256-dnSMuTm/nMiZ6t2rbhDqGpp/e9xt5Msz2In8eiuTjC8=";
};
buildInputs = [ fuse ncurses python3 ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libinklevel";
version = "0.9.3";
version = "0.9.4";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1zwkicjznkzw81ax745inv4n29y20vq82w8249vizaal76739n19";
sha256 = "sha256-J0cEaC5v4naO4GGUzdfV55kB7KzA+q+v64i5y5Xbp9Q=";
};
buildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mxml";
version = "3.3";
version = "3.3.1";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = "mxml";
rev = "v${version}";
sha256 = "sha256-YN8g8KDk7xnDVK1io0zSLO7erxEp4VQ9heA7Lu/cUUg=";
sha256 = "sha256-l7GUA+vlSECi/72eU3Y9COpGtLTRh3vYcHUi+uRkCn8=";
};
enableParallelBuilding = true;

View File

@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation rec {
pname = "ipopt";
version = "3.14.5";
version = "3.14.9";
src = fetchFromGitHub {
owner = "coin-or";
repo = "Ipopt";
rev = "releases/${version}";
sha256 = "sha256-eqOacZGuuGAjWMs2H6RntQ+WJmGTi+EqydHUQXEpY54=";
sha256 = "sha256-mlRr1BjkWiJZSgpxQIc0k1tXGewJkHwxf6xe0edUHaY=";
};
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sofia-sip";
version = "1.13.7";
version = "1.13.8";
src = fetchFromGitHub {
owner = "freeswitch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gBejwt5YAkCKQh0vzN00J4y1ifcdc4TglA+SqEevaGQ=";
sha256 = "sha256-RtYeZFQu0YvD709KNmwPPlOLMl01Ox58cpNYygvDn78=";
};
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "awesomeversion";
version = "22.6.0";
version = "22.8.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-osAJzJr9PtGH8wcHam1BolIBTD8QDBWg3mI/z4JW0JE=";
sha256 = "sha256-peSGe9ycxVD2ve8tFpmznQZr3Hrc1KimeVlThmd0NFo=";
};
nativeBuildInputs = [

View File

@ -1,20 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, flit-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pep440";
version = "0.1.0";
format = "setuptools";
version = "0.1.1";
format = "flit";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "m1H/yqqDiFrj6tmD9jo8nDakCBZxkBPq/HtSOXMH4ZQ=";
hash = "sha256-E9F4mHaavQKK8PYnRcnOdfW7mXcBKn1dTInCknLeNO4=";
};
nativeBuildInputs = [
flit-core
];
checkInputs = [
pytestCheckHook
];

View File

@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "pyunifiprotect";
version = "4.1.2";
version = "4.1.3";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "briis";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-KGPPnyjFbKmNdFosn+4WvQH1rxDsiOEH9qmb3Zq8Xb8=";
hash = "sha256-tZo8+McpnJ1gekghtgH6m5w7nmVWB8CTxz5RGHv3xtE=";
};
propagatedBuildInputs = [

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "scheme-bytestructures";
version = "1.0.10";
version = "2.0.1";
src = fetchFromGitHub {
owner = "TaylanUB";
repo = pname;
rev = "v${version}";
sha256 = "04oDvwvzTRzAVyywbcCm3Ug3p3xNbxjI7nOKYakEZZI=";
sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4=";
};
postConfigure = ''

View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }:
stdenv.mkDerivation rec{
pname = "flyway";
version = "9.1.4";
version = "9.1.6";
src = fetchurl {
url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
sha256 = "sha256-Hs9DZmgkaX00cI7YXTfgdvC0x3st8UfU0pQ7BDGHpDY=";
sha256 = "sha256-ZqvphqQsuLbc23TaMEIZvoghdZ2hA3GkJu40G6ykJXQ=";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gosec";
version = "2.13.0";
version = "2.13.1";
src = fetchFromGitHub {
owner = "securego";
repo = pname;
rev = "v${version}";
sha256 = "sha256-U4nP812du71wcU/OPSDpZePHO9/vSdTL5s58VdA4UvY=";
sha256 = "sha256-a7SZe6n3MQIjkOtFPavFYmBadHwsShjWdzMzOGZIb9s=";
};
vendorSha256 = "sha256-D4wWofYz63c0yXIg4xnolXzWudG17dRqdjUHYhMrtt4=";

View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "gf";
version = "unstable-2022-06-22";
version = "unstable-2022-08-01";
src = fetchFromGitHub {
repo = "gf";
owner = "nakst";
rev = "e0d6d2f59344f853a4a204d5313db6b6a5e5de7d";
sha256 = "01fln4wnn1caqr4wa1nhcp0rqdx5m5nqyn2amvclp5hhi3h3qaiq";
rev = "c0a018a9b965eb97551ee87d5236a9f57011cea2";
hash = "sha256-i0aLSy+4/fbYZpUKExFDUZ/2nXJmEhRsAX0JQZ8EhNk=";
};
nativeBuildInputs = [ makeWrapper pkg-config ];

View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "pkgconf";
version = "1.9.2";
version = "1.9.3";
src = fetchurl {
url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-22v1Qm4On8EHBCzIX8YrHzkfHXr0bEo8Obf1tSMd+gk=";
hash = "sha256-X7NVtIfVT7bTQeTxjU4vfoE6ZiLPA6noev+mpAVlaZ0=";
};
outputs = [ "out" "lib" "dev" "man" "doc" ];

View File

@ -6,13 +6,13 @@
mkDerivation rec {
pname = "heaptrack";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "KDE";
repo = "heaptrack";
rev = "v${version}";
sha256 = "sha256-GXwlauLspbY+h/Y75zlHPoP27pr3xVl05LuDW+WVYxU=";
sha256 = "sha256-AzHQnPYhmCHGco7JoKal57PC6NKUoMTeflHtFsBxQpA=";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];

View File

@ -2,15 +2,15 @@
rustPlatform.buildRustPackage rec {
pname = "snazy";
version = "0.10.0";
version = "0.10.1";
src = fetchFromGitHub {
owner = "chmouel";
repo = pname;
rev = version;
sha256 = "sha256-0LxpwvQxHxNQ09kCsM8fJfcOxPMKqzQlW1Kl2y0I3Zg=";
sha256 = "sha256-kUoML6UUgZLOBCbakj1CJeRSt268rv2ymAdvPkcn8R4=";
};
cargoSha256 = "sha256-onYVVBB91Zn+WcELpBhybT3hV1gZMXHXbmScA6a1mys=";
cargoSha256 = "sha256-MPfzC5iEE8GficLUaGaBy5usZzYoreYsdadoiiRoVQI=";
doInstallCheck = true;
installCheckPhase = ''

View File

@ -2,20 +2,20 @@
rustPlatform.buildRustPackage rec {
pname = "the-way";
version = "0.13.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "out-of-cheese-error";
repo = pname;
rev = "v${version}";
sha256 = "sha256-OqJceRO1RFOLgNi3SbTKLw62tSfJSO7T2/u0RTX89AM=";
sha256 = "sha256-Imo1CUk2H4/K9w/FnIBEkKFXd7OIAuApejcNY+rs7JU=";
};
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ];
cargoSha256 = "sha256-sULjd+weixTQYFIQlluPwY4MFlZ1+vMMoMn4GP79oQs=";
cargoSha256 = "sha256-3ZiNRXrb3gpXXOxztf0eimJE16PpQTD/OWFmeTDIr2w=";
checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ];
dontUseCargoParallelTests = true;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.374";
version = "0.0.377";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-rudTGh4l0wroag0yp2YU8h5NTq+noC3bjbisyP47ktI=";
sha256 = "sha256-L8wOhs7jL+nby2NTPQGweGTKBYnXFKnfi7boFBOeSTs=";
};
vendorSha256 = "sha256-E6QeWu88MXMMfZAM7vMIGXpJQuduX6GTj3tXvlE9hFo=";

View File

@ -0,0 +1,25 @@
{ lib, buildGoModule, fetchFromGitHub }:
let
pname = "speedtest_exporter";
version = "0.3.2";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "speedtest_exporter";
rev = "7364db62b98ab2736405c7cde960698ab5b688bf";
sha256 = "WIMDv63sHyZVw3Ct5LFXCIufj7sU2H81n+hT/NiPMeQ=";
};
in buildGoModule rec {
inherit pname version src;
vendorSha256 = "Lm73pZzdNZv7J+vKrtQXxm4HiAuB9lugKT/oanmD0HM=";
meta = with lib; {
license = licenses.asl20;
homepage = "https://github.com/nlamirault/speedtest_exporter";
description = "Prometheus exporter for Speedtest metrics";
maintainers = with maintainers; [ jonaenz ];
platforms = platforms.unix;
};
}

View File

@ -5,13 +5,13 @@
}:
let
version = "2.2.1";
version = "2.3.0";
src = fetchFromGitHub {
owner = "influxdata";
repo = "influx-cli";
rev = "v${version}";
sha256 = "sha256-9FUchI93xLpQwtpbr5S3GfVrApHaemwbnRPIfAWmG6Y=";
sha256 = "sha256-i3PN0mvSzPX/hu6fF2oizfioHZ2qU2V+mRwuxT1AYWo=";
};
in buildGoModule {

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "pgpool-II";
version = "4.3.2";
version = "4.3.3";
src = fetchurl {
name = "${pname}-${version}.tar.gz";
url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz";
sha256 = "02jg0c6k259i0r927dng9h0y58q965swshg2c9mzqhazcdiga5ap";
sha256 = "sha256-bHNDS67lgThqlVX+WWKL9GeCD31b2+M0F2g5mgOCyXk=";
};
buildInputs = [ postgresql openssl pam libmemcached ];
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "http://pgpool.net/mediawiki/index.php";
description = "A middleware that works between postgresql servers and postgresql clients";
license = licenses.free;
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View File

@ -2,9 +2,9 @@
buildGoModule rec {
pname = "shiori";
version = "1.5.2";
version = "1.5.3";
vendorSha256 = "sha256-6XF4wBwoRnINAskhGHTw4eAJ9zAaoZcEYo9/xZk4ems=";
vendorSha256 = "sha256-vyBb8jNpXgpiktbn2lphL2wAeKmvjJLxV8ZrHoUSNYY=";
doCheck = false;
@ -12,7 +12,7 @@ buildGoModule rec {
owner = "go-shiori";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Py6Lq29F7RkvSui+Z2VyogU9+azHQ2KEvEq924pQmQo=";
sha256 = "sha256-razBb/flqwyFG4SPWhSapDO1sB5DYzyjYGx8ABFg/I8=";
};
passthru.tests = {

View File

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "termshark";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "gcla";
repo = "termshark";
rev = "v${version}";
sha256 = "sha256-ekIxKBnqGTIXncvSTItBL43WN5mdX5dxROWHXUtH3o8=";
sha256 = "sha256-qq7BDGprRkWKRMJiVnqPeTwtHd3tea9dPE8RIPL2YVI=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ wireshark-cli ];
vendorSha256 = "sha256-16JPVgo3heJMjOHNOP13kyhRveQjF9h9kRznhSZM+ik=";
vendorSha256 = "sha256-C9XOiNjo+TZ+erdnypRhhfpbuBhB3yEqNpbtwjEv14g=";
doCheck = false;

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "tinyproxy";
version = "1.11.0";
version = "1.11.1";
src = fetchFromGitHub {
sha256 = "13fhkmmrwzl657dq04x2wagkpjwdrzhkl141qvzr7y7sli8j0w1n";
sha256 = "sha256-tipFXh9VG5auWTI2/IC5rwMQFls7aZr6dkzhYTZZkXM=";
rev = version;
repo = "tinyproxy";
owner = "tinyproxy";

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "mitmproxy2swagger";
version = "0.6.1";
version = "0.7.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "alufers";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-7c+SIU5re1GaqKmzjY+wBXwm8CoQ4uaNLNHzUfG0GDA=";
hash = "sha256-tLLz3nGIzsE6bkHbMC+Cfevv7E/NNHxtYqCUwo/5yF4=";
};
nativeBuildInputs = with python3.pkgs; [

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "saml2aws";
version = "2.34.0";
version = "2.36.0";
src = fetchFromGitHub {
owner = "Versent";
repo = "saml2aws";
rev = "v${version}";
sha256 = "sha256-JRJjuVF0MkV7KVmbAZhiWPWVwDORByCsZqPwdTuVRoA=";
sha256 = "sha256-Mux0n8uBnh9R+llA/XAVsfcDWIDxoaQkkSuhoSpIhl4=";
};
vendorSha256 = "sha256-/N/RYqt+lhhECK+uq99vkm3Mg7PWpdE0GYLXkIYthNw=";
vendorSha256 = "sha256-cxfanKv25U8U6FQ1YfOXghAR8GYQB9PN0TkfLzG4UbI=";
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];

View File

@ -1,41 +1,26 @@
{ fetchFromGitHub
, fetchpatch
, lib
, libevdev
, pkg-config
, rustPlatform
, withCmd ? false
}:
rustPlatform.buildRustPackage rec {
pname = "kanata";
version = "1.0.6";
version = "1.0.7";
src = fetchFromGitHub {
owner = "jtroo";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0S27dOwtHxQi5ERno040RWZNo5+ao0ULFwHKJz27wWw=";
sha256 = "sha256-2gGFAz0zXea+27T4ayDj6KdoI0ThwXV7U0CspHduTiQ=";
};
cargoHash = "sha256-Ge9CiYIl6R8cjfUAY4B9ggjNZv5vpjmQKMPv93wGJwc=";
cargoPatches = [
(fetchpatch {
name = "update-cargo.lock-for-1.0.6.patch";
url = "https://github.com/jtroo/kanata/commit/29a7669ac230571c30c9113e5c82e8440c8b89af.patch";
sha256 = "sha256-s4R7vUFlrL1XTNpgXRyIpIq4rDuM5A85ECzbMUX4MAw=";
})
];
cargoHash = "sha256-0NvZATdPABIboL5xvmBmDbqPPWvO4mM6wVB3FrOVHIQ=";
buildFeatures = lib.optional withCmd "cmd";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libevdev ];
meta = with lib; {
description = "A cross-platform advanced keyboard customization tool";
description = "A tool to improve keyboard comfort and usability with advanced customization";
homepage = "https://github.com/jtroo/kanata";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ linj ];

View File

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "thermald";
version = "2.4.9";
version = "2.5";
outputs = [ "out" "devdoc" ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "thermal_daemon";
rev = "v${version}";
sha256 = "sha256-82O4vrUo3lMNzGOI5WyV1eponF0za0WM6mtd54xqUh8=";
sha256 = "sha256-j66uBbTZhHFXhDSDI0IseoyF/rCEl/B87YjorfZIHX8=";
};
nativeBuildInputs = [

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "sov";
version = "0.71";
version = "0.72";
src = fetchFromGitHub {
owner = "milgra";
repo = pname;
rev = version;
sha256 = "sha256-6FdZ3UToeIAARxrOqSWBX+ALrlr4s2J0bj9c3l9ZTyQ=";
sha256 = "sha256-av+st0tux+ho8bfJwx6Nk1pma1Pjvv/dpW5BWnUDNvQ=";
};
postPatch = ''

View File

@ -15169,6 +15169,8 @@ with pkgs;
inherit (darwin) libobjc;
};
defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
# recent v8 doesn't build on nixpkgs Darwin yet. https://github.com/NixOS/nixpkgs/issues/158076
v8 = if stdenv.isDarwin then v8_8_x else v8;
inherit (darwin) DarwinTools cctools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@ -23244,6 +23246,7 @@ with pkgs;
prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { };
prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { };
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
prometheus-speedtest-exporter = callPackage ../servers/monitoring/prometheus/speedtest-exporter.nix { };
prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { };
@ -26833,6 +26836,11 @@ with pkgs;
denemo = callPackage ../applications/audio/denemo { };
dexed = darwin.apple_sdk_11_0.callPackage ../applications/audio/dexed {
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa WebKit MetalKit DiscRecording CoreAudioKit;
inherit (darwin.apple_sdk_11_0.libs) simd;
};
dvdauthor = callPackage ../applications/video/dvdauthor { };
dvdbackup = callPackage ../applications/video/dvdbackup { };