diff --git a/pkgs/by-name/ac/acli/sources.json b/pkgs/by-name/ac/acli/sources.json index e35f6351094d..efaedfd1f8f3 100644 --- a/pkgs/by-name/ac/acli/sources.json +++ b/pkgs/by-name/ac/acli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.3.22-stable", + "version": "1.3.23-stable", "sources": { "aarch64-darwin": { - "url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_arm64.tar.gz", - "sha256": "3a9a6ff1bb0bce5902780e26e748b18b9adb4489df67d88ea878f4b7673944ad" + "url": "https://acli.atlassian.com/darwin/1.3.23-stable/acli_1.3.23-stable_darwin_arm64.tar.gz", + "sha256": "af78f7bb06b137ddab785257fb74367ac3304629c7d240af0117a700c7b56b64" }, "aarch64-linux": { - "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_arm64.tar.gz", - "sha256": "1a9e86d0b46a62a8f1992c1ef98b3af7e9a9ee3f76d0efa215fe1f2d1b2fd139" + "url": "https://acli.atlassian.com/linux/1.3.23-stable/acli_1.3.23-stable_linux_arm64.tar.gz", + "sha256": "5d4e8580cf2aae681bc02bb4f61c8a62f3efa8fa2b051b3a5f4f560a90279a60" }, "x86_64-darwin": { "url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_amd64.tar.gz", "sha256": "993fd692700d602fd1e3cff7f1d29f70e44a2ebb8056fbb93bdc8aed1e5cbbd4" }, "x86_64-linux": { - "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_amd64.tar.gz", - "sha256": "de9e0a60a556e4119428b9072f6ca787e75b9f9a538aa71ebcc8084deb8ca1a6" + "url": "https://acli.atlassian.com/linux/1.3.23-stable/acli_1.3.23-stable_linux_amd64.tar.gz", + "sha256": "1678a6d0ac36904b1b7788191b5740962a3dc8694aa6f3eee9ccd8f4774996e5" } } } diff --git a/pkgs/by-name/dr/dracut/package.nix b/pkgs/by-name/dr/dracut/package.nix index 2dcac697dc05..3a05313aa796 100644 --- a/pkgs/by-name/dr/dracut/package.nix +++ b/pkgs/by-name/dr/dracut/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch2, gitUpdater, makeBinaryWrapper, pkg-config, @@ -38,6 +39,32 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-zSyC2SnSQkmS/mDpBXG2DtVVanRRI9COKQJqYZZCPJM="; }; + patches = [ + # dracut-lib.sh moved from 99base to 80base after 059. + # Required by the CVE-2026-15816 fix below; remove when updating to 112 or newer. + (fetchpatch2 { + name = "add-escape-function.patch"; + url = "https://github.com/dracut-ng/dracut/commit/207c339728eff81127469c2f6fe106447c781009.patch?full_index=1"; + relative = "modules.d/80base"; + extraPrefix = "modules.d/99base/"; + hash = "sha256-r8dsJvmb09QH6ZRTceBg3Bo+WbCKA8U7Pj0rAjXDcm4="; + }) + # Remove when updating to the first release after 112 containing this fix. + (fetchpatch2 { + name = "CVE-2026-15816.patch"; + url = "https://github.com/dracut-ng/dracut/commit/c4d555716d569038ca38365741e94ee07908f261.patch?full_index=1"; + relative = "modules.d/80base"; + extraPrefix = "modules.d/99base/"; + hash = "sha256-ja15T++ojzjExRgPjyyuUx/vkLhR9AWBBWgz9hTzHCU="; + }) + ]; + + # Don't create .orig files when the backported patches apply with offsets. + patchFlags = [ + "--no-backup-if-mismatch" + "-p1" + ]; + strictDeps = true; buildInputs = [ diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix index f0fdf3000083..745d06a2cf81 100644 --- a/pkgs/by-name/fu/fulcio/package.nix +++ b/pkgs/by-name/fu/fulcio/package.nix @@ -15,13 +15,13 @@ buildGoModule (finalAttrs: { pname = "fulcio"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "sigstore"; repo = "fulcio"; tag = "v${finalAttrs.version}"; - hash = "sha256-YMM517FpQvx3+8g2EuMmUo7cHTxaXUmCcszqnn3xs+c="; + hash = "sha256-R0fqBbK3dpbjnLlB0IB5IsaJO/+PxjEphqzjXV/nmsA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-FmHT3qLl42LXeU8RA3E8P2QyZyTfxA5b+vHg0EfDHmM="; + vendorHash = "sha256-NLBorBTXNVxvvGKgekTOQuarMcoxZv8sVzKzPStGT74="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index f5f855dcf55b..678516533ec3 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -12,13 +12,13 @@ buildNpmPackage (finalAttrs: { pname = "ghostfolio"; - version = "3.43.0"; + version = "3.50.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = finalAttrs.version; - hash = "sha256-SFu/oBrl1PZomquPjetYHnkdzFoxlhcxWe/eIqc5Q04="; + hash = "sha256-jW/qcLIAVNcLlg9NqPcH2QeTouFZEzUHy4qqOzZ3h/8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: { ''; }; - npmDepsHash = "sha256-kS/KXjMqmuF5cQgFk2pmqzsb4T8QCqK64Y/xPGqDSqQ="; + npmDepsHash = "sha256-wi8NfGBCiCbGUdVGWrX4XMRLUyLoBnur/v8og6RufKU="; postPatch = '' substituteInPlace replace.build.mjs \ diff --git a/pkgs/by-name/go/gokrazy/package.nix b/pkgs/by-name/go/gokrazy/package.nix index 992b59988e56..b1bc9c02e9bb 100644 --- a/pkgs/by-name/go/gokrazy/package.nix +++ b/pkgs/by-name/go/gokrazy/package.nix @@ -4,19 +4,18 @@ fetchFromGitHub, installShellFiles, }: - buildGoModule (finalAttrs: { pname = "gokrazy"; - version = "0-unstable-2026-01-09"; + version = "0-unstable-2026-07-23"; src = fetchFromGitHub { owner = "gokrazy"; repo = "tools"; - rev = "8ed49b4fafc72841e5a087362d719eb8a648db9b"; - hash = "sha256-VxRX94vmzVGt4KwC+0T/I8XCKdmftoDTLeYMISLsHoA="; + rev = "3fe400c13246e09469afca86df37cdc6fe7c3ee9"; + hash = "sha256-+wLO374SJu4Sk7GKwJkg6UOxWmJ1ApIfLt3Hw89/dXU="; }; - vendorHash = "sha256-Khvk7Q0HVyhCg4jMvjVQdSXHRq2uuv2wHszcDTTV3qk="; + vendorHash = "sha256-+9i4dlxcxXw0WpeuHhnxli2qhB6IWOc4babuJXIO4wA="; ldflags = [ "-s" @@ -36,7 +35,7 @@ buildGoModule (finalAttrs: { ''; meta = { - description = "Turn your Go program(s) into an appliance running on the Raspberry Pi 3, Pi 4, Pi Zero 2 W, or amd64 PCs"; + description = "Turn your Go program(s) into an appliance running on the Raspberry Pi 3, Pi 4, Pi 5, Pi Zero 2 W, or amd64 PCs"; homepage = "https://github.com/gokrazy/gokrazy"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ shayne ]; diff --git a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix index dca96ea94fb5..e633da31cc11 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix @@ -38,7 +38,10 @@ rec { rm -rf toolkit/components/ml/vendor/openai cp -r ${source}/themes/browser . - cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json + cp ${source}/assets/search-config-v2.json services/settings/dumps/main/search-config-v2.json + cp ${source}/assets/search-config-icons.json services/settings/dumps/main/search-config-icons.json + cp ${source}/assets/2c4b8834-030c-4097-a887-c7506689095c services/settings/dumps/main/search-config-icons + cp ${source}/assets/2c4b8834-030c-4097-a887-c7506689095c.meta.json services/settings/dumps/main/search-config-icons sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index 025d8ea759f2..07577047724b 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "153.0.3-1", + "packageVersion": "153.0.4-1", "source": { - "rev": "153.0.3-1", - "hash": "sha256-ND8ESSw/7SHUW0h+5LaYVKGHYNWUjBa9PLvRYb13N4Q=" + "rev": "153.0.4-1", + "hash": "sha256-Wa62qksr9/N768dqbTuJ7etZkTbe7QPSXQ4w7YD1xRE=" }, "firefox": { - "version": "153.0.3", - "hash": "sha512-RJ8wxRyU9T3yzrReJ9eickJpySlRkVkUnenI9j95evLByytc0Kaq9nMmzP0MI8Ez/WgxuDKvGiWGMtpahkgkvA==" + "version": "153.0.4", + "hash": "sha512-kIG+7X8IeXwhKAlBac+Vr0o14gj9IrunCb+xoZ4V0VqkhPzK5xFU0q4P+VW/YpzWNMx+1rGANxrqeS2vfGif9w==" } } diff --git a/pkgs/by-name/ma/mailpit/source.nix b/pkgs/by-name/ma/mailpit/source.nix index 574ebd869266..d192e12799f8 100644 --- a/pkgs/by-name/ma/mailpit/source.nix +++ b/pkgs/by-name/ma/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.30.6"; - hash = "sha256-XB88EPRfZAcseYvPWsJSuI5FEtbH9VYTg6TuSh503uQ="; - npmDepsHash = "sha256-BgNbQ+hH04GOQllXm0/K0v7YM2DoKE/KXLR6z9p2Bso="; - vendorHash = "sha256-2HPXdCuFAg5AR0hLPlKdzxlkJL6XOdBjZPU+x66wtDE="; + version = "1.30.7"; + hash = "sha256-d5JNwHLSwY2AbOgTkV+2dSwHAK1JDYG0I7Pet4zzM7Q="; + npmDepsHash = "sha256-Imj09aydZBtOpECIkU6oWoxRjTxDyuY3+jBrhL0VtNM="; + vendorHash = "sha256-xbajtiWFfXDz430SgJ+C9rqMEl+UcHp6TJj7obKDQH0="; } diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 739d00eb41ef..534e18bb6b4b 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -4,6 +4,7 @@ glib, lib, libxcb, + microsoft-edge, nspr, nss, stdenvNoCC, @@ -52,7 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "WebDriver implementation that controls an Edge browser running on the local machine"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ cholli ]; + maintainers = microsoft-edge.meta.maintainers; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 299785cffdf5..d6c170f661c4 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -27,20 +27,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "2.32.6"; + version = "2.33.7"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-wWm6vGyJ2I2SBU38gRGaZG2FR5FBxH6V/sWQwn5B4Ac="; + hash = "sha256-6QysdmXgSxfJpNaL10HogrnNYEyrxZLdkfgBnRiXWX4="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-D8CKJxU2RoMjNrqIgGDE3mFBjc0kqFLQzT/DdUpiNmY="; + hash = "sha256-Ei/8j+KvhZVgqteA+bqNsL11IMGzWn3OHngDpsEH6jk="; }; nativeBuildInputs = [ @@ -104,8 +104,12 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/{bin,lib/n8n} cp -r {packages,node_modules} $out/lib/n8n + # node must be on PATH: in internal runner mode the CLI spawns the + # JS task runner via `spawn('node', ...)`, and since 2.33 a failed + # spawn crashes n8n instead of being silently ignored makeWrapper $out/lib/n8n/packages/cli/bin/n8n $out/bin/n8n \ - --set N8N_RELEASE_TYPE "stable" + --set N8N_RELEASE_TYPE "stable" \ + --prefix PATH : ${lib.makeBinPath [ nodejs ]} # JavaScript runner makeWrapper ${nodejs}/bin/node $out/bin/n8n-task-runner \ diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 41339962c0c2..873b20b90ed6 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "nezha-agent"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-Gpk1KWAumWF31MXMM7UytBaChOiPgsqC6PhdqSocpA4="; + hash = "sha256-cSjioxBFbokyPwFhPhzpMUUIHAOaJtVsbyBrUiAt99Y="; }; - vendorHash = "sha256-RGaU55R8si4N6CBr582ooZcOmVwQX3zneCi/q4GnZiw="; + vendorHash = "sha256-Cwg3xi0kmEwrOOJPbthqwA5yHZKGyEZaNFAlKSwaeAo="; ldflags = [ "-s" diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix index fd5204dd1a09..bf33427635e9 100644 --- a/pkgs/by-name/op/openlist/frontend.nix +++ b/pkgs/by-name/op/openlist/frontend.nix @@ -12,18 +12,18 @@ }: buildNpmPackage (finalAttrs: { pname = "openlist-frontend"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList-Frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xw/nMgNLIuNvfwZ0qJhHcTLfmlk4dQk5HgIGuBYUhtY="; + hash = "sha256-AOy8IZnrf3893d33Gkuu8Ktz1WY/FnvhUzbiHf9PpGk="; }; i18n = fetchzip { url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz"; - hash = "sha256-YXkwy9usUFK9o958AP+eeZuFGEGgpXIRDjnn06VQIJk="; + hash = "sha256-ID8fEVBpq68rrppqx1bx3rwD9hJU/JlEDKuKz5g9DPs="; stripRoot = false; }; @@ -41,7 +41,7 @@ buildNpmPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = openlistPnpm; fetcherVersion = 4; - hash = "sha256-R1abgVxkxCGCtC47Knrnv959JUy0NVadJBxlzg8sDPw="; + hash = "sha256-+QW8ViG8jNUiGPPAUuAY2AhzSUHuFOlLYB2uHA0ILpU="; }; npmConfigHook = pnpmConfigHook; diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix index 610a7460d078..8578e45c6e0d 100644 --- a/pkgs/by-name/op/openlist/package.nix +++ b/pkgs/by-name/op/openlist/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "openlist"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitHub { owner = "OpenListTeam"; repo = "OpenList"; tag = "v${finalAttrs.version}"; - hash = "sha256-dev6hUxJ8y1TjDy9ecCKnUe9d9PLkgVxvoSggahT8I8="; + hash = "sha256-EVKHCyGJMYrD7nrvBGX1xReAPkgTV7ElAG2Uyu3W1cg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { frontend = callPackage ./frontend.nix { }; proxyVendor = true; - vendorHash = "sha256-YRIadkUlp8u36E/g2/+3469BG9pwAWNl8JgF5yQbCEY="; + vendorHash = "sha256-G27D6zDuA4HBEOFUWjwf4+gt8OOHBKsPvuPatBussTM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/python-modules/courlan/default.nix b/pkgs/development/python-modules/courlan/default.nix index c87f84a308c8..d3e63da7213b 100644 --- a/pkgs/development/python-modules/courlan/default.nix +++ b/pkgs/development/python-modules/courlan/default.nix @@ -1,32 +1,49 @@ { lib, - babel, buildPythonPackage, - fetchPypi, - langcodes, - pytestCheckHook, + fetchFromGitHub, + + # build-system, setuptools, + + # dependencies + babel, + langcodes, tld, urllib3, + + # tests + pytest-httpserver, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "courlan"; - version = "1.3.2"; + version = "1.4.0"; pyproject = true; + __structuredAttrs = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-C2b02zqcOabiLdJHxyz6pX1o6mYOlLsshOx9uHEq8ZA="; + src = fetchFromGitHub { + owner = "adbar"; + repo = "courlan"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hDbeAd/gil6S8zggBjmrDmnW3DMMdRvG1vULuhYA1zc="; }; # Tests try to write to /tmp directly. use $TMPDIR instead. - postPatch = '' - substituteInPlace tests/unit_tests.py \ - --replace-fail "\"courlan --help\"" "\"$out/bin/courlan --help\"" \ - --replace-fail "courlan_bin = \"courlan\"" "courlan_bin = \"$out/bin/courlan\"" \ - --replace-fail "/tmp" "$TMPDIR" - ''; + postPatch = + let + courlanBinPath = "${placeholder "out"}/bin/courlan"; + in + '' + substituteInPlace tests/unit_tests.py \ + --replace-fail \ + 'assert os.system("courlan --help") == 0' \ + 'assert os.system("${courlanBinPath} --help") == 0' \ + --replace-fail \ + 'courlan_bin = "courlan"' \ + 'courlan_bin = "${courlanBinPath}"' + ''; build-system = [ setuptools ]; @@ -37,19 +54,24 @@ buildPythonPackage rec { urllib3 ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-httpserver + pytestCheckHook + ]; # disable tests that require an internet connection disabledTests = [ "test_urlcheck" ]; pythonImportsCheck = [ "courlan" ]; + __darwinAllowLocalNetworking = true; + meta = { description = "Clean, filter and sample URLs to optimize data collection"; homepage = "https://github.com/adbar/courlan"; - changelog = "https://github.com/adbar/courlan/blob/v${version}/HISTORY.md"; + changelog = "https://github.com/adbar/courlan/blob/${finalAttrs.src.tag}/HISTORY.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jokatzke ]; mainProgram = "courlan"; }; -} +}) diff --git a/pkgs/development/python-modules/dlinfo/default.nix b/pkgs/development/python-modules/dlinfo/default.nix index 1937f601ff22..86e7951224a8 100644 --- a/pkgs/development/python-modules/dlinfo/default.nix +++ b/pkgs/development/python-modules/dlinfo/default.nix @@ -25,12 +25,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "dlinfo" ]; + # all tests are broken, see: + # https://github.com/fphammerle/python-dlinfo/pull/64 + doCheck = !stdenv.hostPlatform.isDarwin; + meta = { changelog = "https://github.com/fphammerle/python-dlinfo/blob/${src.tag}/CHANGELOG.md"; description = "Python wrapper for libc's dlinfo and dyld_find on Mac"; homepage = "https://github.com/fphammerle/python-dlinfo"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index d730a54ab051..aeeb4332b0fd 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/pkgs/development/python-modules/trafilatura/default.nix @@ -19,27 +19,34 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "trafilatura"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "adbar"; repo = "trafilatura"; - tag = "v${version}"; - hash = "sha256-Cf1W3JEGSMkVmRZVTXYsXzZK/Nt/aDG890Sf0/0OZAA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-hSeJH+8JX8QC3zHMZ3+M2H0C3xI+BCvLnSo/Ih1wUQw="; }; - postPatch = '' + postPatch = # nixify path to the trafilatura binary in the test suite - substituteInPlace tests/cli_tests.py \ - --replace-fail 'trafilatura_bin = "trafilatura"' \ - 'trafilatura_bin = "${placeholder "out"}/bin/trafilatura"' - ''; + '' + substituteInPlace tests/cli_tests.py \ + --replace-fail \ + 'trafilatura_bin = "trafilatura"' \ + 'trafilatura_bin = "${placeholder "out"}/bin/trafilatura"' + ''; build-system = [ setuptools ]; + pythonRelaxDeps = [ + "htmldate" + "lxml" + ]; dependencies = [ certifi charset-normalizer @@ -53,15 +60,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ - # TypeError: argument of type 'NoneType' is not iterable - # https://github.com/adbar/trafilatura/issues/805 - "test_external" - "test_extract" - - # AttributeError: 'NoneType' object has no attribute 'find' - # https://github.com/adbar/trafilatura/issues/805 - "test_table_processing" - # Disable tests that require an internet connection "test_cli_pipeline" "test_crawl_page" @@ -75,10 +73,6 @@ buildPythonPackage rec { "test_queue" "test_redirection" "test_whole" - - # AssertionError: assert ['deflate', 'gzip', 'zstd'] == ['deflate', 'gzip'] - # https://github.com/adbar/trafilatura/issues/823 - "test_config" ]; pythonImportsCheck = [ "trafilatura" ]; @@ -86,10 +80,10 @@ buildPythonPackage rec { meta = { description = "Python package and command-line tool designed to gather text on the Web"; homepage = "https://trafilatura.readthedocs.io"; - changelog = "https://github.com/adbar/trafilatura/blob/v${version}/HISTORY.md"; + changelog = "https://github.com/adbar/trafilatura/blob/${finalAttrs.src.tag}/HISTORY.md"; downloadPage = "https://github.com/adbar/trafilatura"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jokatzke ]; mainProgram = "trafilatura"; }; -} +}) diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 625ae654a3d7..4e080f972acd 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -15,13 +15,13 @@ let }: buildGoModule rec { inherit pname; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - hash = "sha256-ZaeacpzdBG3QBGPQ0rTW8cJyTe5S8ff6OIVv1/VcbL4="; + hash = "sha256-imtdI8nWII2l24FgWXVU0LKg4hYmZHi6DGzenoEfOgA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -34,7 +34,7 @@ let ''; }; - vendorHash = "sha256-xrsiFrC8o4l1nPvxNzsXPY9nshKsy5sVei8yHAee46s="; + vendorHash = "sha256-QxIw3rGTntNpLNhLZq9G6OiuTd+UbjA5B60TYBqFiSY="; nativeBuildInputs = [ installShellFiles ];