From 1fa3ff53f0e132eb958fddd4378607a7058137db Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Mon, 19 Feb 2024 18:00:01 +0100 Subject: [PATCH 01/12] =?UTF-8?q?bolt:=200.9.6=20=E2=86=92=200.9.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/bolt/bolt/-/compare/0.9.6...0.9.7 --- pkgs/os-specific/linux/bolt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index df618cbff5a1..f81173095814 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "bolt"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; rev = version; - sha256 = "sha256-sJBY/pXUX5InLynsvAmapW54UF/WGn9eDlluWXjhubQ="; + sha256 = "sha256-6m4Yrev9W5WV4/pptc8tJ4hc6QSC+eJ7BSt2mx33s9U="; }; patches = [ From 7e9244d0b0559ea6dbebefa2037e90805ef52ba4 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 2 Mar 2024 01:13:02 +0100 Subject: [PATCH 02/12] =?UTF-8?q?=5F1password-gui-beta:=208.10.28-1=20?= =?UTF-8?q?=E2=86=92=208.10.28-11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://releases.1password.com/linux/beta/#1password-for-linux-8.10.28-11 --- pkgs/applications/misc/1password-gui/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 925dfaef5302..2caeb5f44c78 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,7 +9,7 @@ let 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 = { stable = { @@ -33,19 +33,19 @@ let beta = { x86_64-linux = { 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 = { 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 = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-WoitPHQ6yW5jmCGL976am73TTGbcqBfCvYnDKUORAVU="; + hash = "sha256-D3kYUpL69HMQnjJyzQ2/Ahiyt94uwxM86n7U9uQ/mVs="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-YE0TvbA7jXpISywC/AWFBfV09jjgY+DLHhRUYbxpaXE="; + hash = "sha256-FJbFsMS/f7PHTvu9PxDgFQB3v47AsyESdKctr+S1LXk="; }; }; }; From 1b4558c4cf5f465f3752ac81abb70359afc0e2ff Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 2 Mar 2024 14:21:13 +0100 Subject: [PATCH 03/12] yara-python: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/yara-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index cff5b329e6ca..c386e5a56511 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - hash = "sha256-Fl/0ordXDKC1CBBmPx0fEwZZjqSiMxnwNvQqD98MjRo="; + hash = "sha256-RcrzzJQdzn+BXEp5M3ziGL6qSgfUN3wJ3JxwgjzVeuk="; }; # undefined symbol: yr_finalize From 935ee8eae59bc40750c2b708d36e075837cf3120 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 15:19:01 +0000 Subject: [PATCH 04/12] colloid-icon-theme: 2023-07-01 -> 2024-02-28 --- pkgs/data/icons/colloid-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 7806f3e814ad..1e14e7112955 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-07-01"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-2J6LmDV/Y2+x+nK3mO+t4MnmZCbVwDLX0tDG6BmLgqo="; + hash = "sha256-bTN6x3t88yBL4WsPfOJIiNGWTywdIVi7E2VJKgMzEso="; }; nativeBuildInputs = [ From dfef819d515bbdc8444305c5458bbab7fc7b1512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 16:11:39 +0000 Subject: [PATCH 05/12] python312Packages.langsmith: 0.1.10 -> 0.1.13 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index b3f4dc1119d7..98f31581f78c 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.10"; + version = "0.1.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-9My/0DPN6AwAFoAiTdl6jd2GtX4fpFIgpnZe/WzAi9c="; + hash = "sha256-An9E0vT8WJaEcq0QOasnIgHkK1cdV7H5OLqa0EVWd5Q="; }; sourceRoot = "${src.name}/python"; From 5df10e9029b3beae05c046220165502e374bbaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 2 Mar 2024 18:35:16 +0100 Subject: [PATCH 06/12] qt-6: fix meta.position --- pkgs/development/libraries/qt-6/qtModule.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index eb85f9d606cc..addcd53aea81 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -31,12 +31,15 @@ stdenv.mkDerivation (args // { outputs = args.outputs or [ "out" "dev" ]; dontWrapQtApps = args.dontWrapQtApps or true; - - meta = with lib; { +}) // { + meta = with lib; let + pos = builtins.unsafeGetAttrPos "pname" args; + in { homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao ]; platforms = platforms.unix; + position = "${pos.file}:${toString pos.line}"; } // (args.meta or { }); -}) +} From 61791cf4be4912ab38eece0d73c5673a3e642c0b Mon Sep 17 00:00:00 2001 From: sarahec Date: Sun, 18 Feb 2024 00:14:54 -0800 Subject: [PATCH 07/12] python311Packages.spacy: 3.7.3 -> 3.7.4 --- .../python-modules/spacy/default.nix | 47 ++++++++++++------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 406d687bba96..3fb467475fb7 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -6,16 +6,18 @@ , catalogue , cymem , fetchPypi +, hypothesis , jinja2 , jsonschema , langcodes +, mock , murmurhash , numpy , packaging , pathy , preshed , pydantic -, pytest +, pytestCheckHook , python , pythonOlder , pythonRelaxDepsHook @@ -38,14 +40,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.7.3"; + version = "3.7.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mSZQKPvcbhIknFMwXkYfeaEDY3sOaGbCivDkY2X3UeE="; + hash = "sha256-Ul8s7S5AdhViyMrOk+9qHm6MSD8nvVZLwbFfYI776Fs="; }; pythonRelaxDeps = [ @@ -83,35 +85,44 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "thinc>=8.1.8,<8.2.0" "thinc>=8.1.8" - ''; - nativeCheckInputs = [ - pytest + pytestCheckHook + hypothesis + mock ]; - doCheck = false; + doCheck = true; - checkPhase = '' - ${python.interpreter} -m pytest spacy/tests --vectors --models --slow + # Fixes ModuleNotFoundError when running tests on Cythonized code. See #255262 + preCheck = '' + cd $out ''; + pytestFlagsArray = [ + "-m 'slow'" + ]; + + disabledTests = [ + # touches network + "test_download_compatibility" + "test_validate_compatibility_table" + "test_project_assets" + ]; + pythonImportsCheck = [ "spacy" ]; passthru = { updateScript = writeScript "update-spacy" '' - #!${stdenv.shell} - set -eou pipefail - PATH=${lib.makeBinPath [ nix git nix-update ]} + #!${stdenv.shell} + set -eou pipefail + PATH=${lib.makeBinPath [ nix git nix-update ]} - nix-update python3Packages.spacy + nix-update python3Packages.spacy - # update spacy models as well - echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm + # update spacy models as well + echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm ''; tests.annotation = callPackage ./annotation-test { }; }; From 83d145e5596149346fdab90900b335be7e5befd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 23:02:00 +0000 Subject: [PATCH 08/12] yamlscript: 0.1.38 -> 0.1.39 --- pkgs/by-name/ya/yamlscript/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index dd86546d72d4..ab541bb496b3 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.38"; + version = "0.1.39"; src = fetchurl { 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"; From 8323148284e8d51d0f0b1e88357b14b9a4808e32 Mon Sep 17 00:00:00 2001 From: VuiMuich Date: Sat, 2 Mar 2024 10:11:51 +0100 Subject: [PATCH 09/12] prusa-slicer: 2.7.1 -> 2.7.2 --- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 724bfcc4ecce..0b5a5065cf12 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -66,12 +66,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-hSHeh3qJroCFnzeoVz6LKtCK8r0ealWSFz9cW4xvSb8="; + hash = "sha256-IZRw6qEe4hM/Sfhx0je11vaMHeuW/e4ZP5zMTuptb2k="; rev = "version_${finalAttrs.version}"; }; From a0a754e1dfc3e9a063b117c0139e5627bb2aa480 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 2 Mar 2024 18:33:32 +0100 Subject: [PATCH 10/12] ardour: 8.2 -> 8.4 --- pkgs/applications/audio/ardour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index d6267aff3fef..226aa832f80f 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.2"; + version = "8.4"; # 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. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-Ito1gy7k7nzTN7Co/ddXYbAvobiZO0V0J5uymsm756k="; + hash = "sha256-6qx/elkj4Kb4YK1JZG/S036WdUO7wEE6/yf4pZQP8J0="; }; bundledContent = fetchzip { From bd84aa21a08ef3dc2f699de2cbd8b7e64430a79e Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Mon, 26 Feb 2024 21:39:43 +0100 Subject: [PATCH 11/12] undbx: init at 0.21-unstable-2019-02-11 --- pkgs/by-name/un/undbx/package.nix | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/un/undbx/package.nix diff --git a/pkgs/by-name/un/undbx/package.nix b/pkgs/by-name/un/undbx/package.nix new file mode 100644 index 000000000000..69db03479e99 --- /dev/null +++ b/pkgs/by-name/un/undbx/package.nix @@ -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"; + }; +}) From 5f26d9fd93fb3403d1fcc5372403dd2128e35dc0 Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Sat, 17 Feb 2024 14:34:45 +0100 Subject: [PATCH 12/12] magicrescue: init at 1.1.10-unstable-2021-09-12 --- pkgs/by-name/ma/magicrescue/package.nix | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/ma/magicrescue/package.nix diff --git a/pkgs/by-name/ma/magicrescue/package.nix b/pkgs/by-name/ma/magicrescue/package.nix new file mode 100644 index 000000000000..47aee9621ed8 --- /dev/null +++ b/pkgs/by-name/ma/magicrescue/package.nix @@ -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; + }; +}