Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-03-03 06:00:58 +00:00 committed by GitHub
commit 6a2985393f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 129 additions and 40 deletions

View file

@ -64,14 +64,14 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ardour"; pname = "ardour";
version = "8.2"; version = "8.4";
# We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org
# result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.
src = fetchgit { src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git"; url = "git://git.ardour.org/ardour/ardour.git";
rev = version; rev = version;
hash = "sha256-Ito1gy7k7nzTN7Co/ddXYbAvobiZO0V0J5uymsm756k="; hash = "sha256-6qx/elkj4Kb4YK1JZG/S036WdUO7wEE6/yf4pZQP8J0=";
}; };
bundledContent = fetchzip { bundledContent = fetchzip {

View file

@ -9,7 +9,7 @@
let let
pname = "1password"; pname = "1password";
version = if channel == "stable" then "8.10.26" else "8.10.28-1.BETA"; version = if channel == "stable" then "8.10.26" else "8.10.28-11.BETA";
sources = { sources = {
stable = { stable = {
@ -33,19 +33,19 @@ let
beta = { beta = {
x86_64-linux = { x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-2XwSBJHvv0YYMQUHw2baiMJm5FizmxbaKoQaCIRc5UY="; hash = "sha256-pchfBeZcXoyfSHutQqgAWkf6uzTEIQ/AbKDOC2N+BN8=";
}; };
aarch64-linux = { aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-pxEGRpzMaxxJ+W2lSDZ7jNKHLQ22pgOKqD/Bt6ot2lk="; hash = "sha256-rcjoyuEL8p4nCvjboPF0BV1lV5/+zo/rP9AP0ORB0N0=";
}; };
x86_64-darwin = { x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-WoitPHQ6yW5jmCGL976am73TTGbcqBfCvYnDKUORAVU="; hash = "sha256-D3kYUpL69HMQnjJyzQ2/Ahiyt94uwxM86n7U9uQ/mVs=";
}; };
aarch64-darwin = { aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-YE0TvbA7jXpISywC/AWFBfV09jjgY+DLHhRUYbxpaXE="; hash = "sha256-FJbFsMS/f7PHTvu9PxDgFQB3v47AsyESdKctr+S1LXk=";
}; };
}; };
}; };

View file

@ -66,12 +66,12 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "prusa-slicer"; pname = "prusa-slicer";
version = "2.7.1"; version = "2.7.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prusa3d"; owner = "prusa3d";
repo = "PrusaSlicer"; repo = "PrusaSlicer";
hash = "sha256-hSHeh3qJroCFnzeoVz6LKtCK8r0ealWSFz9cW4xvSb8="; hash = "sha256-IZRw6qEe4hM/Sfhx0je11vaMHeuW/e4ZP5zMTuptb2k=";
rev = "version_${finalAttrs.version}"; rev = "version_${finalAttrs.version}";
}; };

View file

@ -0,0 +1,41 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, gdbm # ndbm.h for dupemap binary
, perl
}:
stdenv.mkDerivation {
pname = "magicrescue";
version = "1.1.10-unstable-2021-09-12";
src = fetchFromGitHub {
owner = "jbj";
repo = "magicrescue";
rev = "d9a57931d437674009bfd2f98451b3d71058eade";
hash = "sha256-jVBzsa39TQjeDZ4zuXn3UA+4WectjNRwPNb1AkLuIbg=";
};
patches = [
# Add PERL as processor for file.
(fetchpatch {
url = "https://salsa.debian.org/pkg-security-team/magicrescue/-/raw/6331d088a159ae21ad4ab5f18b9bf892ebe18ce3/debian/patches/020_add-Perl-preprocessor.patch";
hash = "sha256-XX3Rlv/qKB2y/csuaPiliv4cu9KKHNpG/E88VSVP0sg=";
})
];
buildInputs = [
gdbm
perl
];
meta = with lib; {
description = "Find and recover deleted files on block devices";
mainProgram = "magicrescue";
homepage = "https://github.com/jbj/magicrescue";
maintainers = with maintainers; [ d3vil0p3r ];
platforms = platforms.unix;
license = licenses.gpl2Plus;
};
}

View file

@ -0,0 +1,34 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, autoreconfHook
}:
stdenv.mkDerivation (finalAttrs: {
pname = "undbx";
version = "0.22-unstable-2019-02-11";
src = fetchFromGitHub {
owner = "ZungBang";
repo = "undbx";
rev = "5e31c757e137a6409115cac0623d61d384019b7a";
hash = "sha256-leregcv3dv/D3WvFkYyjQePdKi4BgE0aj5PY6JiSKl8=";
};
nativeBuildInputs = [ autoreconfHook ];
postPatch = ''
substituteInPlace Makefile.am \
--replace-fail "-Werror" "" \
--replace-fail "bin_SCRIPTS" "#bin_SCRIPTS"
'';
meta = with lib; {
description = "Extract e-mail messages from Outlook Express DBX files";
homepage = "https://github.com/ZungBang/undbx";
maintainers = with maintainers; [ d3vil0p3r ];
platforms = platforms.unix;
license = licenses.gpl3Plus;
mainProgram = "undbx";
};
})

View file

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec { buildGraalvmNativeImage rec {
pname = "yamlscript"; pname = "yamlscript";
version = "0.1.38"; version = "0.1.39";
src = fetchurl { src = fetchurl {
url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
hash = "sha256-cdRMmeJTlkEmF4jbElrXgobSU+VIvh/k9Lr9WkOSTl8="; hash = "sha256-P64Ekkn8yIuct+dl4dVYDRhMmKFieIa75r0rJbTvfhg=";
}; };
executable = "ys"; executable = "ys";

View file

@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red"
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
inherit pname; inherit pname;
version = "2023-07-01"; version = "2024-02-28";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-2J6LmDV/Y2+x+nK3mO+t4MnmZCbVwDLX0tDG6BmLgqo="; hash = "sha256-bTN6x3t88yBL4WsPfOJIiNGWTywdIVi7E2VJKgMzEso=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -31,12 +31,15 @@ stdenv.mkDerivation (args // {
outputs = args.outputs or [ "out" "dev" ]; outputs = args.outputs or [ "out" "dev" ];
dontWrapQtApps = args.dontWrapQtApps or true; dontWrapQtApps = args.dontWrapQtApps or true;
}) // {
meta = with lib; { meta = with lib; let
pos = builtins.unsafeGetAttrPos "pname" args;
in {
homepage = "https://www.qt.io/"; homepage = "https://www.qt.io/";
description = "A cross-platform application framework for C++"; description = "A cross-platform application framework for C++";
license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ];
maintainers = with maintainers; [ milahu nickcao ]; maintainers = with maintainers; [ milahu nickcao ];
platforms = platforms.unix; platforms = platforms.unix;
position = "${pos.file}:${toString pos.line}";
} // (args.meta or { }); } // (args.meta or { });
}) }

View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "langsmith"; pname = "langsmith";
version = "0.1.10"; version = "0.1.13";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "langchain-ai"; owner = "langchain-ai";
repo = "langsmith-sdk"; repo = "langsmith-sdk";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-9My/0DPN6AwAFoAiTdl6jd2GtX4fpFIgpnZe/WzAi9c="; hash = "sha256-An9E0vT8WJaEcq0QOasnIgHkK1cdV7H5OLqa0EVWd5Q=";
}; };
sourceRoot = "${src.name}/python"; sourceRoot = "${src.name}/python";

View file

@ -6,16 +6,18 @@
, catalogue , catalogue
, cymem , cymem
, fetchPypi , fetchPypi
, hypothesis
, jinja2 , jinja2
, jsonschema , jsonschema
, langcodes , langcodes
, mock
, murmurhash , murmurhash
, numpy , numpy
, packaging , packaging
, pathy , pathy
, preshed , preshed
, pydantic , pydantic
, pytest , pytestCheckHook
, python , python
, pythonOlder , pythonOlder
, pythonRelaxDepsHook , pythonRelaxDepsHook
@ -38,14 +40,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "spacy"; pname = "spacy";
version = "3.7.3"; version = "3.7.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-mSZQKPvcbhIknFMwXkYfeaEDY3sOaGbCivDkY2X3UeE="; hash = "sha256-Ul8s7S5AdhViyMrOk+9qHm6MSD8nvVZLwbFfYI776Fs=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [
@ -83,35 +85,44 @@ buildPythonPackage rec {
typing-extensions typing-extensions
]; ];
postPatch = ''
substituteInPlace setup.cfg \
--replace "thinc>=8.1.8,<8.2.0" "thinc>=8.1.8"
'';
nativeCheckInputs = [ nativeCheckInputs = [
pytest pytestCheckHook
hypothesis
mock
]; ];
doCheck = false; doCheck = true;
checkPhase = '' # Fixes ModuleNotFoundError when running tests on Cythonized code. See #255262
${python.interpreter} -m pytest spacy/tests --vectors --models --slow preCheck = ''
cd $out
''; '';
pytestFlagsArray = [
"-m 'slow'"
];
disabledTests = [
# touches network
"test_download_compatibility"
"test_validate_compatibility_table"
"test_project_assets"
];
pythonImportsCheck = [ pythonImportsCheck = [
"spacy" "spacy"
]; ];
passthru = { passthru = {
updateScript = writeScript "update-spacy" '' updateScript = writeScript "update-spacy" ''
#!${stdenv.shell} #!${stdenv.shell}
set -eou pipefail set -eou pipefail
PATH=${lib.makeBinPath [ nix git nix-update ]} PATH=${lib.makeBinPath [ nix git nix-update ]}
nix-update python3Packages.spacy nix-update python3Packages.spacy
# update spacy models as well # update spacy models as well
echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm
''; '';
tests.annotation = callPackage ./annotation-test { }; tests.annotation = callPackage ./annotation-test { };
}; };

View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "yara-python"; pname = "yara-python";
version = "4.4.0"; version = "4.5.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "VirusTotal"; owner = "VirusTotal";
repo = "yara-python"; repo = "yara-python";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Fl/0ordXDKC1CBBmPx0fEwZZjqSiMxnwNvQqD98MjRo="; hash = "sha256-RcrzzJQdzn+BXEp5M3ziGL6qSgfUN3wJ3JxwgjzVeuk=";
}; };
# undefined symbol: yr_finalize # undefined symbol: yr_finalize

View file

@ -21,14 +21,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bolt"; pname = "bolt";
version = "0.9.6"; version = "0.9.7";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";
owner = "bolt"; owner = "bolt";
repo = "bolt"; repo = "bolt";
rev = version; rev = version;
sha256 = "sha256-sJBY/pXUX5InLynsvAmapW54UF/WGn9eDlluWXjhubQ="; sha256 = "sha256-6m4Yrev9W5WV4/pptc8tJ4hc6QSC+eJ7BSt2mx33s9U=";
}; };
patches = [ patches = [