Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-05-24 18:01:48 +00:00 committed by GitHub
commit a05fa7cdd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 370 additions and 162 deletions

View File

@ -636,6 +636,7 @@ in {
trusted_key_servers = mkOption {
type = types.listOf (types.submodule {
freeformType = format.type;
options = {
server_name = mkOption {
type = types.str;
@ -644,22 +645,6 @@ in {
Hostname of the trusted server.
'';
};
verify_keys = mkOption {
type = types.nullOr (types.attrsOf types.str);
default = null;
example = literalExpression ''
{
"ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw";
}
'';
description = lib.mdDoc ''
Attribute set from key id to base64 encoded public key.
If specified synapse will check that the response is signed
by at least one of the given keys.
'';
};
};
});
default = [ {

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "lsp-plugins";
version = "1.2.6";
version = "1.2.7";
src = fetchurl {
url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz";
sha256 = "sha256-lNrIsXW3ZNKMFwsl5qowWqK/ZaCaQUAlrSscnsOxvVg=";
sha256 = "sha256-UCyPOGfa8tVTZzE5ynv/Ov0L+Q6SjAAIwb3jX8X/x0M=";
};
outputs = [ "out" "dev" "doc" ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "sptlrx";
version = "1.0.0";
version = "1.1.0";
src = fetchFromGitHub {
owner = "raitonoberu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-UDxmUc902A6+DC254wyvjSzNs95K7QIuDW+24o8VCCc=";
hash = "sha256-6GbefTWrhH6RdASmSrugd4xESkwqFVF5qwFmf0JUDTY=";
};
vendorSha256 = "sha256-t9Mkszzuw7YtBnADsZDjwN2AA6MuQH4+zzDiHe302A4=";
vendorHash = "sha256-Ll5jUjpx4165BAE86/z95i4xa8fdKlfxqrUc/gDLqJ0=";
ldflags = [ "-s" "-w" ];

View File

@ -642,6 +642,10 @@ self: super: {
dependencies = with self; [ nvim-lspconfig ];
});
lazy-nvim = super.lazy-nvim.overrideAttrs (old: {
patches = [ ./patches/lazy-nvim/no-helptags.patch ];
});
lean-nvim = super.lean-nvim.overrideAttrs (old: {
dependencies = with self; [ nvim-lspconfig plenary-nvim ];
});

View File

@ -0,0 +1,14 @@
diff --git a/lua/lazy/help.lua b/lua/lazy/help.lua
index 4a289eb..5ddc168 100644
--- a/lua/lazy/help.lua
+++ b/lua/lazy/help.lua
@@ -38,9 +38,6 @@ function M.index(plugin)
end
function M.update()
- if Config.plugins["lazy.nvim"] then
- vim.cmd.helptags(Config.plugins["lazy.nvim"].dir .. "/doc")
- end
if Config.options.readme.enabled == false then
return
end

View File

@ -1,15 +1,15 @@
{
stable = import ./browser.nix {
channel = "stable";
version = "113.0.1774.42";
version = "113.0.1774.50";
revision = "1";
sha256 = "sha256-gd9ub3WppnYuK7Ul57r66+ioYHCopz8MoDdxqWb3Ukg=";
sha256 = "sha256-5QKIVh/y3CBPlWUbrudvC2NHfJGB5nGsu/4tUfCOCYM=";
};
beta = import ./browser.nix {
channel = "beta";
version = "114.0.1823.18";
version = "114.0.1823.24";
revision = "1";
sha256 = "sha256-58oe/82jad0v+cqR1l5NZjdAI0EJDyICMR1l6z2DLsE=";
sha256 = "sha256-AT3jkuNXcVoKx98BJtONm06oO/kUyV0E7DVvkzPOfGE=";
};
dev = import ./browser.nix {
channel = "dev";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circumflex";
version = "2.8.2";
version = "2.9.1";
src = fetchFromGitHub {
owner = "bensadeh";
repo = "circumflex";
rev = version;
hash = "sha256-6g1x19FLC7IdShlcCNlKMuPQX1sBU5+eFr0CzTSu4nE=";
hash = "sha256-FgmtRARNyvO+Ivhwr2S12GLX+vlTFnsClXv1Y7sTCmU=";
};
vendorHash = "sha256-rztg2mIuyoqpI9SKQsp0ASMT4HO4h0/bxLX7+xtfLzo=";
vendorHash = "sha256-p4lIIu3rkzb1EfJ4GJeXPgQlxGN1dqyTlIC9BOE1o/Y=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -1,4 +1,7 @@
{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, branch, withOpenASAR ? false }:
{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper
, branch
, withOpenASAR ? false, openasar
, withVencord ? false, vencord }:
stdenv.mkDerivation {
inherit pname version src meta;
@ -22,5 +25,10 @@ stdenv.mkDerivation {
postInstall = lib.strings.optionalString withOpenASAR ''
cp -f ${openasar} $out/Applications/${desktopName}.app/Contents/Resources/app.asar
'' + lib.strings.optionalString withVencord ''
mv $out/Applications/${desktopName}.app/Contents/Resources/app.asar $out/Applications/${desktopName}.app/Contents/Resources/_app.asar
mkdir $out/Applications/${desktopName}.app/Contents/Resources/app.asar
echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json
echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js
'';
}

View File

@ -59,7 +59,7 @@ let
downloadPage = "https://discordapp.com/download";
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ MP2E artturin infinidoge jopejoe1 ];
maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
};
package =

View File

@ -1,4 +1,4 @@
{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook
{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook
, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk
, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf
, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11
@ -9,7 +9,9 @@
, speechd
, wayland
, branch
, common-updater-scripts, withOpenASAR ? false, withTTS ? false }:
, withOpenASAR ? false, openasar
, withVencord ? false, vencord
, withTTS ? false }:
let
disableBreakingUpdates = runCommand "disable-breaking-updates.py"
@ -124,6 +126,11 @@ stdenv.mkDerivation rec {
postInstall = lib.strings.optionalString withOpenASAR ''
cp -f ${openasar} $out/opt/${binaryName}/resources/app.asar
'' + lib.strings.optionalString withVencord ''
mv $out/opt/${binaryName}/resources/app.asar $out/opt/${binaryName}/resources/_app.asar
mkdir $out/opt/${binaryName}/resources/app.asar
echo '{"name":"discord","main":"index.js"}' > $out/opt/${binaryName}/resources/app.asar/package.json
echo 'require("${vencord}/patcher.js")' > $out/opt/${binaryName}/resources/app.asar/index.js
'';
desktopItem = makeDesktopItem {

View File

@ -1,13 +1,13 @@
{ webcord
, substituteAll
, callPackage
, lib
, vencord-web-extension
}:
webcord.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [
(substituteAll {
src = ./add-extension.patch;
vencord = callPackage ./vencord-web-extension { };
vencord = vencord-web-extension;
})
];

View File

@ -1,7 +1,7 @@
{ lib
, writeShellScript
, buildFHSEnv
, stdenv
, stdenvNoCC
, fetchurl
, autoPatchelfHook
, dpkg
@ -15,7 +15,7 @@
let
pname = "insync";
version = "3.8.5.50499";
version = "3.8.6.50504";
meta = with lib; {
platforms = ["x86_64-linux"];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
@ -37,13 +37,14 @@ let
2) libqtvirtualkeyboardplugin does not have necessary Qt library shipped from vendor.
'';
};
insync-pkg = stdenv.mkDerivation {
inherit pname version;
insync-pkg = stdenvNoCC.mkDerivation {
inherit pname version meta;
src = fetchurl {
# Find a binary from https://www.insynchq.com/downloads/linux#ubuntu.
url = "https://cdn.insynchq.com/builds/linux/${pname}_${version}-lunar_amd64.deb";
sha256 = "sha256-mpMJe8LAmO9OrqRIEWuxfVNeh5ANvjZIEHFz8cXYObY=";
sha256 = "sha256-BxTFtQ1rAsOuhKnH5vsl3zkM7WOd+vjA4LKZGxl4jk0=";
};
buildInputs = [
@ -68,7 +69,7 @@ let
cp -R usr/* $out/
# use system glibc
rm -f $out/lib/insync/{libgcc_s.so.1,libstdc++.so.6}
rm $out/lib/insync/{libgcc_s.so.1,libstdc++.so.6}
# remove badly packaged plugins
rm $out/lib/insync/PySide2/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so
@ -76,35 +77,43 @@ let
runHook postInstall
'';
dontConfigure = true;
dontBuild = true;
# NB! This did the trick, otherwise it segfaults! However I don't understand why!
dontStrip = true;
inherit meta;
};
in buildFHSEnv { # ref: pkgs/build-support/build-fhsenv-bubblewrap/default.nix
name = "${pname}-${version}";
inherit meta;
# for including insync's xdg data dirs
extraOutputsToInstall = [ "share" ];
insync-fhsenv = buildFHSEnv {
name = "${pname}-${version}";
inherit meta;
targetPkgs = pkgs: [
insync-pkg
];
# for including insync's xdg data dirs
extraOutputsToInstall = [ "share" ];
multiPkgs = pkgs: with pkgs; [
# apparently only package needed for the FHS :)
libudev0-shim
];
targetPkgs = pkgs: [
insync-pkg
];
runScript = writeShellScript "insync-wrapper.sh" ''
multiPkgs = pkgs: with pkgs; [
# apparently only package needed for the FHS :)
libudev0-shim
];
runScript = writeShellScript "insync-wrapper.sh" ''
# QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary.
export QT_STYLE_OVERRIDE=Fusion
exec "${insync-pkg.outPath}/lib/insync/insync" "$@"
'';
# "insync start" command starts a daemon.
dieWithParent = false;
};
in stdenvNoCC.mkDerivation {
inherit pname version meta;
dontUnpack = true;
installPhase = ''
mkdir -p $out/bin
ln -s ${insync-fhsenv}/bin/${insync-fhsenv.name} $out/bin/insync
ln -s ${insync-pkg}/share $out/share
'';
# "insync start" command starts a daemon.
dieWithParent = false;
}

View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "srsran";
version = "22.10";
version = "23.04";
src = fetchFromGitHub {
owner = "srsran";
repo = "srsran";
rev = "release_${builtins.replaceStrings ["."] ["_"] version}";
sha256 = "sha256-O43MXJ6EyKXg7hA1WjW8TqLmAWC+h5RLBGzBO6f/0zo=";
sha256 = "sha256-k2KUejn2eBFGknVQCHeYuZd4UUC2Jv0WEI9le9fYoFE=";
};
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -10,14 +10,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "dvc";
version = "2.57.3";
version = "2.58.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-W9AgYTvTjmFBAlKIme+7GaGY1lCyYbmYJdUC1s+3Vc8=";
hash = "sha256-n6tX7sHzyeIWnpFM08QosQ7y27SB9OKMuQeSB25lJRU=";
};
pythonRelaxDeps = [

View File

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec {
pname = "pijul";
version = "1.0.0-beta.4";
version = "1.0.0-beta.5";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-Sx+ZbT1EONWiQmC/5f4thfE9mmTulhTmUWeqPkQgJh8=";
hash = "sha256-hFNNi5xzH1wQnmy4XkXg07ZbZMlyWR4/GLe/PyJpb20=";
};
cargoSha256 = "sha256-vc7rkLCy489W7MjJYiN8vg4DNS65/ZSIEAcw0vaQJtU=";
cargoHash = "sha256-gOREd5Z1j+UUJ2NNryoDDsFtP6XYlWQlR/llgqKgy+g=";
doCheck = false;
nativeBuildInputs = [ pkg-config ];

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "clash-geoip";
version = "20230312";
version = "20230512";
src = fetchurl {
url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
sha256 = "sha256-Y/glz6HUfjox9Mn+gPzA8+tUHqV/KkIInUn4SyajUiE=";
sha256 = "sha256-/QIii+f7pOzXXlhDQV6XGHpyjAlCS/OONalbPSnmArE=";
};
dontUnpack = true;
@ -27,5 +27,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/Dreamacro/maxmind-geoip";
license = licenses.unfree;
maintainers = [];
platforms = platforms.all;
};
}

View File

@ -187,7 +187,8 @@ in {
servant-swagger = doJailbreak super.servant-swagger;
servant-client-core = doJailbreak super.servant-client-core;
servant-client = doJailbreak super.servant-client;
relude = doJailbreak super.relude;
# https://github.com/kowainik/relude/issues/436
relude = dontCheck (doJailbreak super.relude);
# Fixes compilation failure with GHC >= 9.4 on aarch64-* due to an API change
cborg = appendPatch (pkgs.fetchpatch {

View File

@ -1,8 +1,8 @@
{ mkDerivation }:
mkDerivation {
version = "1.14.4";
sha256 = "sha256-mV40pSpLrYKT43b8KXiQsaIB+ap+B4cS2QUxUoylm7c=";
# https://hexdocs.pm/elixir/1.14.4/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
version = "1.14.5";
sha256 = "sha256-bCCTjFT+FG1hz+0H6k/izbCmi0JgO3Kkqc3LWWCs5Po=";
# https://hexdocs.pm/elixir/1.14.5/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
minimumOTPVersion = "23";
}

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "libyang";
version = "2.1.55";
version = "2.1.80";
src = fetchFromGitHub {
owner = "CESNET";
repo = "libyang";
rev = "v${version}";
sha256 = "sha256-fNVhsZPjqdMOmESy/MinjdaNE5jWMWSeVidAs9JGV38=";
sha256 = "sha256-3Lf8JUnzD20Xq6UswCbcWpgEBs0z4OEo7CGt0vWiPhI=";
};
nativeBuildInputs = [

View File

@ -18,6 +18,15 @@ stdenv.mkDerivation rec {
hash = "sha256-e8MGJGirulCv8+y4sizmdxlgNgCYkGiO9FM6qn+S5uQ=";
};
patches = [
# A bugfix https://gitlab.com/hepcedar/yoda/-/merge_requests/116
(fetchpatch {
url = "https://gitlab.com/hepcedar/yoda/-/commit/ba1275033522c66bc473dfeffae1a7971e985611.diff";
hash = "sha256-/8UJuypiQzywarE+o3BEMtqM+f+YzkHylugi+xTJf+w=";
excludes = [ "ChangeLog" ];
})
];
nativeBuildInputs = with python.pkgs; [
cython
makeWrapper

View File

@ -0,0 +1,60 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, ragel
, util-linux
, python3
, boost
, enableShared ? !stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {
pname = "vectorscan";
version = "5.4.9";
src = fetchFromGitHub {
owner = "VectorCamp";
repo = "vectorscan";
rev = "vectorscan/${version}";
hash = "sha256-V5Qgr8aH1H+ZoJ0IZ52HIDRZq+yIwHjLf3gU/ZhjjlY=";
};
nativeBuildInputs = [
cmake
ragel
util-linux
python3
];
buildInputs = [
boost
];
cmakeFlags = lib.optional enableShared "-DBUILD_STATIC_AND_SHARED=ON"
++ [ "-DFAT_RUNTIME=${if stdenv.hostPlatform.isLinux then "ON" else "OFF"}" ]
++ lib.optional stdenv.hostPlatform.avx2Support "-DBUILD_AVX2=ON"
++ lib.optional stdenv.hostPlatform.avx512Support "-DBUILD_AVX512=ON"
;
meta = with lib; {
description = "A portable fork of the high-performance regular expression matching library";
longDescription = ''
A fork of Intel's Hyperscan, modified to run on more platforms. Currently
ARM NEON/ASIMD is 100% functional, and Power VSX are in development.
ARM SVE2 will be implemented when hardware becomes accessible to the
developers. More platforms will follow in the future, on demand/request.
Vectorscan will follow Intel's API and internal algorithms where possible,
but will not hesitate to make code changes where it is thought of giving
better performance or better portability. In addition, the code will be
gradually simplified and made more uniform and all architecture specific
code will be abstracted away.
'';
homepage = "https://www.vectorcamp.gr/vectorscan/";
changelog = "https://github.com/VectorCamp/vectorscan/blob/${src.rev}/CHANGELOG.md";
platforms = platforms.unix;
license = with licenses; [ bsd3 /* and */ bsd2 /* and */ licenses.boost ];
maintainers = with maintainers; [ tnias vlaci ];
};
}

View File

@ -1,24 +1,24 @@
{ lib, fetchurl, buildDunePackage, result }:
{ lib, fetchurl, buildDunePackage, liquidsoap }:
buildDunePackage rec {
pname = "csexp";
version = "1.5.1";
version = "1.5.2";
src = fetchurl {
url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz";
sha256 = "sha256-1gXkBl+pCliABEDvLzOi2TE5i/LCIGGorLffhFwKrAI=";
hash = "sha256-GhTdBLtDeaQZkCSFUGKMd5E6nAfzw1wTcLaWDml3h/8=";
};
minimumOCamlVersion = "4.03";
useDune2 = true;
minimalOCamlVersion = "4.03";
propagatedBuildInputs = [
result
];
passthru.tests = {
inherit liquidsoap;
};
meta = with lib; {
homepage = "https://github.com/ocaml-dune/csexp/";
description = "Minimal support for Canonical S-expressions";
homepage = "https://github.com/ocaml-dune/csexp";
changelog = "https://github.com/ocaml-dune/csexp/raw/${version}/CHANGES.md";
license = licenses.mit;
maintainers = with maintainers; [ marsam ];
};

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.2.51";
version = "9.2.52";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-X7dwwuEy5IVNmkNY82QUBEZMY8yPK2h4ov1pWQn3Rn0=";
hash = "sha256-F5KEoxvGkop2mcAYHYt1flWKrtJ7oPLaRhhGGaXCTAc=";
};
nativeBuildInputs = [

View File

@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "aiomisc";
version = "17.2.2";
version = "17.3.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-e8E2FOsHvTzjnUnF6jNX0skl7szRuC3ByMPfsqtcVno=";
hash = "sha256-HX3IfTQ/zgNnYRN1qnd3vVWvm84g2pjSOBjhzrZHEUI=";
};
nativeBuildInputs = [

View File

@ -32,7 +32,7 @@
buildPythonPackage rec {
pname = "angr";
version = "9.2.51";
version = "9.2.52";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -41,7 +41,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-sZRK6V9eq7tIUDLJ8r/zKu+9TwGaRr0zHGnVbrNdv1g=";
hash = "sha256-EjCy8p4rqhoZx2W+8VutZj9o1WsMuH7ftfuKr1pw6YM=";
};
propagatedBuildInputs = [

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.2.51";
version = "9.2.52";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-sx+/2pFBwCTOjUO2fx9Me9UvJSEDk/wLoqCdmbY0TQ8=";
hash = "sha256-cPlRbtesG7QWxoeBm8bPXkN5yZGwiSreM3zayLWerfE=";
};
nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "1.18.2";
version = "1.19.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "refs/tags/v${version}";
hash = "sha256-oI+w9EoNgKnR+7pgvwTmsRpOQI0TxzCx8TjfSEmO7mc=";
hash = "sha256-lIVZhWtGWJutmHgReT4k4G5hJZuD52AaJhwmwTmqHIY=";
};
propagatedBuildInputs = [

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.2.51";
version = "9.2.52";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-QitBUufRt7AIeX19fvjXEhMtE90Cw2fL7EPj1OSjBug=";
hash = "sha256-tAEYoYj7fcXQw6MN8q5vA0eGXop83dGDiPuoADwpteU=";
};
nativeBuildInputs = [

View File

@ -16,7 +16,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.2.51";
version = "9.2.52";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-sk5TiDtfltiQLinXj2psLOY2wrNYXU9Ab+kDa/8C0VU=";
hash = "sha256-01NFCADCGo/frM2EKlkq4wpJ4lJeNoFoP1my+2PK73g=";
};
nativeBuildInputs = [

View File

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "dvc-gs";
version = "2.22.0";
version = "2.22.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-UzYW2iU/GvLJd4q6ErcLQRoAehyFF3PrMTjb8PEtmNE=";
hash = "sha256-IKDwdSfolZwv8TvHHicVV42PYeULhskv8csbkiJzLbk=";
};
# Prevent circular dependency

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dvc-studio-client";
version = "0.9.2";
version = "0.10.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-ko69Zhs3B7zEq+CFky0Ff4Vf4MJbCLEp+q79s+5MtJM=";
hash = "sha256-RhIHjTaNokuWlafG+UjzOmD7ByL3+CaRZTM96wbkxqY=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, buildPythonPackage
, rustPlatform
, pytestCheckHook
, libiconv
, vectorscan
}:
buildPythonPackage rec {
pname = "pyperscan";
version = "0.2.2";
format = "pyproject";
src = fetchFromGitHub {
owner = "vlaci";
repo = "pyperscan";
rev = "v${version}";
hash = "sha256-ioNGEmWy+lEzazF1RzMFS06jYLNYll3QSlWAF0AoU7Y=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-2zppyxJ+XaI/JCkp7s27/jgtSbwxnI4Yil5KT8WgrVI=";
};
nativeBuildInputs = with rustPlatform; [
bindgenHook
cargoSetupHook
maturinBuildHook
];
checkInputs = [ pytestCheckHook ];
buildInputs = [ vectorscan ] ++ lib.optional stdenv.isDarwin libiconv;
# Disable default features to use the system vectorscan library instead of a vendored one.
maturinBuildFlags = [ "--no-default-features" ];
pythonImportsCheck = [ "pyperscan" ];
meta = with lib; {
description = "a hyperscan binding for Python, which supports vectorscan";
homepage = "https://github.com/vlaci/pyperscan";
platforms = platforms.unix;
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ tnias vlaci ];
};
}

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.2.51";
version = "9.2.52";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-/4AmEmbG1XWRPIVGcqcxhHrJmbq7RXcUuDFYZGhuUY4=";
hash = "sha256-6cC+dr0ViHOSwgf9ubpTNIJbGFIYxWmxkPXFAKvQh0I=";
};
nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "twitchapi";
version = "3.10.0";
version = "3.11.0";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "twitchAPI";
inherit version;
hash = "sha256-zYcAuPVbPAqGpLwRfHozM6RTpH9CkIyjlKi9Jtqp9ug=";
hash = "sha256-TkQzF32nt89uBvC6aj/b5f2DQkOVDz7UyeUXRyVYumM=";
};
propagatedBuildInputs = [

View File

@ -22,14 +22,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.3.251";
version = "2.3.257";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-qbnGibGpAH5Lg2VuJBLx+Jdh6/IYkk54SA8Gr8UtnYg=";
hash = "sha256-Ve/g7hhm1ae8aQY/2XDle4/W22FsXxipaR3hZ9fs7IA=";
};
patches = [

View File

@ -0,0 +1,29 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "go-mod-graph-chart";
version = "0.5.3";
src = fetchFromGitHub {
owner = "PaulXu-cn";
repo = pname;
rev = "v${version}";
hash = "sha256-vitUZXQyAj72ed9Gukr/sAT/iWWMhwsxjZhf2a9CM7I=";
};
vendorHash = null;
# check requires opening webpage
doCheck = false;
meta = with lib; {
description = "A tool build chart by go mod graph output with zero dependencies";
homepage = "https://github.com/PaulXu-cn/go-mod-graph-chart";
mainProgram = "gmchart";
license = licenses.mit;
maintainers = with maintainers; [ aleksana ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kube-linter";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "stackrox";
repo = pname;
rev = "v${version}";
sha256 = "sha256-REUjvIiHASiFQyzU/4n9wPkvaVGmaU/2MBqIBjtWhdY=";
sha256 = "sha256-L0JjbjV5KwI4qas8iLp5OLkleQlD29jsYLpe3ER1l2Y=";
};
vendorHash = "sha256-ATGSIwjmqRuqn+6VTBvjdfXbcABEdaf5HEsaS2o2V3o=";
vendorHash = "sha256-1erG3TFv3DR6SLDIrmRefAPjXhgXEVYFiAsUPiI7kX4=";
ldflags = [
"-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}"

View File

@ -37,7 +37,7 @@
let
pname = "mindustry";
version = "143.1";
version = "144.3";
buildVersion = makeBuildVersion version;
selectedGlew = if enableWayland then glew-egl else glew;
@ -46,13 +46,13 @@ let
owner = "Anuken";
repo = "Mindustry";
rev = "v${version}";
hash = "sha256-p6HxccLg+sjFW+ZGGTfo5ZvOIs6lKjub88kX/iaBres=";
hash = "sha256-IXwrBaj0gweaaHefO/LyqEW4a3fBLfySSYPHBhRMVo8=";
};
Arc = fetchFromGitHub {
owner = "Anuken";
repo = "Arc";
rev = "v${version}";
hash = "sha256-fbFjelwqBRadcUmbW3/oDnhmNAjTj660qB5WwXugIIU=";
hash = "sha256-nH/sHRWMdX6ieh2EWfD0wAn87E2ZkqZX+9zt2vKYPcE=";
};
soloud = fetchFromGitHub {
owner = "Anuken";
@ -131,7 +131,7 @@ let
| sh
'';
outputHashMode = "recursive";
outputHash = "sha256-uxnW5AqX6PazqHJYLuF/By5qpev8Se+992jCyacogSY=";
outputHash = "sha256-vZc8T7Hk1DLHYgqj8zxKUP2NPXumRxuheMk21Sh2TZY=";
};
in

View File

@ -4,9 +4,10 @@
, substituteAll
, esbuild
, buildGoModule
, buildWebExtension ? false
}:
buildNpmPackage rec {
pname = "vencord-web-extension";
pname = "vencord";
version = "1.1.6";
src = fetchFromGitHub {
@ -34,7 +35,7 @@ buildNpmPackage rec {
npmDepsHash = "sha256-jKSdeyQ8oHw7ZGby0XzDg4O8mtH276ykVuBcw7dU/Ls=";
npmFlags = [ "--legacy-peer-deps" ];
npmBuildScript = "buildWeb";
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
prePatch = ''
cp ${./package-lock.json} ./package-lock.json
@ -47,14 +48,16 @@ buildNpmPackage rec {
})
];
installPhase = ''
cp -r dist/extension-unpacked $out
installPhase = if buildWebExtension then ''
cp -r dist/extension-unpacked/ $out
'' else ''
cp -r dist/ $out
'';
meta = with lib; {
description = "Vencord web extension";
homepage = "https://github.com/Vendicated/Vencord";
license = licenses.gpl3Only;
maintainers = with maintainers; [ FlafyDev NotAShelf ];
maintainers = with maintainers; [ FlafyDev NotAShelf Scrumplex ];
};
}

View File

@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "wiki-tui";
version = "0.6.4";
version = "0.7.0";
src = fetchFromGitHub {
owner = "Builditluc";
repo = pname;
rev = "v${version}";
hash = "sha256-pjNXDU1YgzaH4vtdQnnfRCSmbhIgeAiOP/uyhBNG/7s=";
hash = "sha256-vrWjX8WB9niZnBDIlMSj/NUuJxCkP4QoOLp+xTnvSjs=";
};
nativeBuildInputs = [
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
Security
];
cargoHash = "sha256-RWj1QCHYEtw+QzdX+YlFiMqMhvCfxYzj6SUzfhqrcM8=";
cargoHash = "sha256-m3gxmoZVEVzqach7Oep943B4DhOUzrTB+Z6J/TvdCQ8=";
meta = with lib; {
description = "A simple and easy to use Wikipedia Text User Interface";

View File

@ -7,18 +7,18 @@
buildGoModule rec {
pname = "mattermost";
version = "7.8.4";
version = "7.8.5";
src = fetchFromGitHub {
owner = "mattermost";
repo = "mattermost-server";
rev = "v${version}";
hash = "sha256-fSFfOWC0wCWIVmsmn1e3lUKxDfeQWK9AL3iEyFMDFds=";
hash = "sha256-qC6tJcWruiTbWXKuACuhl0kwbRdPVXfUlaFJx4DiQgE=";
};
webapp = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
hash = "sha256-Dc3uQEh7JKaBjz3myzZaOEqC5FAgdOs+NRbRR7OW0os=";
hash = "sha256-ojAGa4tZ5aZp+4XSW6ycDvJ295zH8GaYsA9w6z8n2WM=";
};
vendorHash = "sha256-VvGLYOESyoBpFmIibHWxazliHcscMxf3KcQ46NQ4syk=";

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "sftpgo";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "drakkan";
repo = "sftpgo";
rev = "refs/tags/v${version}";
hash = "sha256-UL/CSNRvT9e+WAmE7nwd/EU7YOJ1mwMSnOIrd0dQJrk=";
hash = "sha256-wFJ1PKGzEvB0fIqGbqoI4qmA485YJtD6Y4VVyKHSUoM=";
};
vendorHash = "sha256-q6GgaMlmBPjovCpLku9/ENlEc0lF8gck1fM+fpptti4=";
vendorHash = "sha256-0GfJw/RPfPGf0yds3QUpi3GLrDE3IXexBatReqU10Pg=";
ldflags = [
"-s"

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "netplan";
version = "0.105";
version = "0.106";
src = fetchFromGitHub {
owner = "canonical";
repo = "netplan";
rev = version;
hash = "sha256-77vUZU9JG9Dz/5n4DpcAUS77UqfIILXhZHgBogIb400=";
hash = "sha256-oKHnhUEYdWutkkL8hbSX43+6qzlts1vqxrr/L42VztY=";
};
nativeBuildInputs = [
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
systemd
glib
libyaml
(python3.withPackages (p: with p; [ pyyaml netifaces ]))
(python3.withPackages (p: with p; [ pyyaml netifaces dbus-python rich ]))
libuuid
bash-completion
];

View File

@ -29,11 +29,9 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
postFixup = ''
wrapQtApp $out/bin/patray
wrapQtApp $out/bin/patray --prefix QT_PLUGIN_PATH : ${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}
'';
meta = with lib; {
description = "Yet another tray pulseaudio frontend";
homepage = "https://github.com/pohmelie/patray";

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gcsfuse";
version = "0.42.4";
version = "0.42.5";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
hash = "sha256-Yv2IY+ZSyZDcgEpMGYZxqxKc6twmMh/18HlTKdyUGbk=";
hash = "sha256-ME0xoi1KEzw99GmKQeeNHVjIH3UlBnP6/b50xJcPA/I=";
};
vendorHash = null;
vendorHash = "sha256-oTELdPPkKBQFBIRhjns6t3wj84RQhDVOi95seNyeeR0=";
subPackages = [ "." "tools/mount_gcsfuse" ];

View File

@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
version = "1.12.4";
version = "1.12.5";
pname = "chafa";
src = fetchFromGitHub {
owner = "hpjansson";
repo = "chafa";
rev = version;
sha256 = "sha256-rW3QHf7T3mXWxTCcUPriu+iZohbwGNxWRmquXdSMPQk=";
sha256 = "sha256-2li2Vp+W4Q2/8WY8FJ519BuVR9KzddIJ1j/GY/hLMZo=";
};
nativeBuildInputs = [ autoconf

View File

@ -2,16 +2,18 @@
stdenv.mkDerivation rec {
pname = "hdfview";
version = "3.2.0";
version = "3.3.0";
src = fetchurl {
url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz";
sha256 = "sha256-08De/yy9lZUIxNqccS2nL7IE/2gYo0NPAKcHH46M8rg=";
sha256 = "sha256-CRYWGGHCH6jdNUtEW0jv9aU9gKXAs4PnnrZLexCOJDA=";
};
patches = [
# Hardcode isUbuntu=false to avoid calling hostname to detect os
./0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch
# Disable signing on macOS
./disable-mac-signing.patch
];
nativeBuildInputs = [

View File

@ -0,0 +1,26 @@
diff --git a/build.xml b/build.xml
index 70ab3e2..9460321 100644
--- a/build.xml
+++ b/build.xml
@@ -1802,13 +1802,6 @@
description="Create the final package for distribution" />
<target name="createJPackageMac" depends="createJPackageBase" if="${isAppMac}">
- <!-- unlock keychain -->
- <exec executable="security" dir="${dist.dir}" failonerror="true">
- <arg value="unlock-keychain" />
- <arg value="-p" />
- <arg value="${login.keychain_key}" />
- <arg value="login.keychain" />
- </exec>
<echo> Create the mac jpackage</echo>
<exec executable="${java.home}/bin/jpackage">
@@ -1864,7 +1857,6 @@
<arg value="app-image" />
<arg value="--icon" />
<arg value="${basedir}/package_files/macosx/HDFView.icns" />
- <arg value="--mac-sign" />
<arg value="--mac-package-identifier" />
<arg value="HDFView.hdfgroup.org" />
<arg value="--mac-package-name" />

View File

@ -1,31 +1,21 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, ncurses
, pcre2
}:
stdenv.mkDerivation rec {
pname = "less";
version = "608";
version = "633";
# Only tarballs on the website are valid releases,
# other versions, e.g. git tags are considered snapshots.
src = fetchurl {
url = "https://www.greenwoodsoftware.com/less/less-${version}.tar.gz";
hash = "sha256-ppq+LgoSZ3fgIdO3OqMiLhsmHxDmRiTUHsB5aFpqwgk=";
hash = "sha256-LyAdZLgouIrzbf5s/bo+CBns4uRG6+YiSBMgmq7+0E8=";
};
patches = [
(fetchpatch {
# https://github.com/advisories/GHSA-5xw7-xf7p-gm82
name = "CVE-2022-46663.patch";
url = "https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c.patch";
hash = "sha256-gWgCzoMt1WyVJVKYzkMq8HfaTlU1XUtC8fvNFUQT0sI=";
})
];
configureFlags = [
# Look for sysless in /etc.
"--sysconfdir=/etc"

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "mapcidr";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-HmX4C1DXPS/14TGxKFnw/sxxp2suU6c4GC5W7ZtzjZ8=";
hash = "sha256-LnEoe9H3KbR2DfHKjDnhzBB8NCoU2wG9+7n7qBktYls=";
};
vendorHash = "sha256-7cB+fDYWy1Qe3apEPaUMA2+6KmMpC7ANjEgIde00Pas=";
vendorHash = "sha256-hbV93MhlXhF4j5MS5agNrG8JcdoHMBKIVn9aUusvBpo=";
modRoot = ".";
subPackages = [

View File

@ -7,21 +7,21 @@
buildGoModule rec {
pname = "gotrue";
version = "2.47.1";
version = "2.67.1";
src = fetchFromGitHub {
owner = "supabase";
repo = pname;
rev = "v${version}";
hash = "sha256-GBrdYlWvtlz/A/5Tn58EPYBL3X73D44GzbN1OrzwU8U=";
hash = "sha256-aJQCd4azeEvZiC1MUEPz1siy7ljSqvSYbEvQQHY14KM=";
};
vendorHash = "sha256-FIl30sKmdcXayK8KWGFl+N+lYExl4ibKZ2tcvelw8zo=";
vendorHash = "sha256-67IGkVQja1tBNBBV9KCSrQqkF6glvS0GAGZPINiTZu8=";
ldflags = [
"-s"
"-w"
"-X=github.com/netlify/gotrue/internal/utilities.Version=${version}"
"-X github.com/supabase/gotrue/internal/utilities.Version=${version}"
];
# integration tests require network to connect to postgres database

View File

@ -13475,6 +13475,8 @@ with pkgs;
vcstool = callPackage ../development/tools/vcstool { };
vectorscan = callPackage ../development/libraries/vectorscan { };
verco = callPackage ../applications/version-management/verco { };
verilator = callPackage ../applications/science/electronics/verilator { };
@ -19836,7 +19838,8 @@ with pkgs;
c-blosc = callPackage ../development/libraries/c-blosc { };
# justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990
cachix = haskell.lib.justStaticExecutables haskellPackages.cachix;
# ghc94: https://discourse.haskell.org/t/facing-mmap-4096-bytes-at-nil-cannot-allocate-memory-youre-not-alone/6259
cachix = haskell.lib.justStaticExecutables haskell.packages.ghc94.cachix;
calcium = callPackage ../development/libraries/calcium { };
@ -24407,6 +24410,10 @@ with pkgs;
vcg = callPackage ../development/libraries/vcg { };
vencord = callPackage ../misc/vencord { };
vencord-web-extension = callPackage ../misc/vencord { buildWebExtension = true; };
vid-stab = callPackage ../development/libraries/vid-stab {
inherit (llvmPackages) openmp;
};
@ -27350,6 +27357,8 @@ with pkgs;
go-mockery = callPackage ../development/tools/go-mockery { };
go-mod-graph-chart = callPackage ../development/tools/go-mod-graph-chart { };
gomacro = callPackage ../development/tools/gomacro { };
gomodifytags = callPackage ../development/tools/gomodifytags { };

View File

@ -9018,6 +9018,8 @@ self: super: with self; {
pyperclip = callPackage ../development/python-modules/pyperclip { };
pyperscan = callPackage ../development/python-modules/pyperscan { };
pyperf = callPackage ../development/python-modules/pyperf { };
pyphen = callPackage ../development/python-modules/pyphen { };