diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3bcf22eb0a1c..bf82513ba005 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15040,10 +15040,10 @@ }; onemoresuza = { name = "Coutinho de Souza"; - email = "dev@onemoresuza.mailer.me"; + email = "dev@onemoresuza.com"; github = "onemoresuza"; githubId = 106456302; - keys = [ { fingerprint = "484F D3B8 BAD7 BF5D 8B68 2AEA A2ED 1159 935E 4D7E"; } ]; + keys = [ { fingerprint = "6FD3 7E64 11C5 C659 2F34 EDBC 4352 D15F B177 F2A8"; } ]; }; onixie = { email = "onixie@gmail.com"; diff --git a/nixos/modules/services/misc/etebase-server.nix b/nixos/modules/services/misc/etebase-server.nix index 7b6b5249f230..9b2ba34cc30b 100644 --- a/nixos/modules/services/misc/etebase-server.nix +++ b/nixos/modules/services/misc/etebase-server.nix @@ -45,7 +45,7 @@ in package = mkOption { type = types.package; - default = pkgs.python3.pkgs.etebase-server; + default = pkgs.etebase-server; defaultText = literalExpression "pkgs.python3.pkgs.etebase-server"; description = "etebase-server package to use."; }; diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index af45e965b7ec..662d7a49a8a2 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-caki8WVnu8ELE2mXwRvT9TTTXCtMZEa0E3KVpHl05jg="; + hash = "sha256-FX0wb6GVTB/Y0m6qmoMbaeXPf8bA3+JqbGE8PPS6vAA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 0486e7e424cc..6f2eeecfc461 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,11 +30,9 @@ , ApplicationServices , Foundation , testers -, imagemagick , nixos-icons , perlPackages , python3 -, fetchpatch }: assert libXtSupport -> libX11Support; diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index f0869bca596d..09b81ac37cb7 100644 --- a/pkgs/applications/graphics/gscreenshot/default.nix +++ b/pkgs/applications/graphics/gscreenshot/default.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "gscreenshot"; - version = "3.5.1"; + version = "3.6.1"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-3CvPJLenEVpTLNZUj+TG1cEfyWGmtaPZH/FD/AgK1io="; + sha256 = "sha256-JQnXjKl+BBSblHT0qQgz8iie33wnwfPSkFnZM5xNE7k="; }; # needed for wrapGAppsHook3 to function diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 29758aed79b5..c83eb4dca798 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240708"; + version = "20240715-2"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-UwUygYbmwDdv37mo8rEsHx4mMGdXVfAcscrnn1g0wio="; + hash = "sha256-QyukKuRoF6TWFa73EaOO429u9AF+1NCKsLjwQT/fD6U="; }; postPatch = '' diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/applications/science/math/numworks-epsilon/default.nix index 98d5d0d4560a..af896309750e 100644 --- a/pkgs/applications/science/math/numworks-epsilon/default.nix +++ b/pkgs/applications/science/math/numworks-epsilon/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "numworks-epsilon"; - version = "22.2.0"; + version = "23.2.2"; src = fetchFromGitHub { owner = "numworks"; repo = "epsilon"; rev = version; - hash = "sha256-E2WaXTn8+Ky9kdZxvQmEt63Ggo6Ns0fZ0Za+rQGIMSg="; + hash = "sha256-XyKi0IMvXDOYgF7e8nU14sE5YuJPTTfkZnoWZOoJdC0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 5d3fa37fbebb..2db54695b3b8 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-ykPYxRgzKZrA0KwS1FoxZOkSL+7TbLgy0yLfs7Iqpf4="; + hash = "sha256-qSZb83gB9Kw6goY7RkWRWXpzHTF27EV5T59RitjSuc4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openvswitch/generic.nix b/pkgs/by-name/op/openvswitch/generic.nix index 74b0725855ce..95fea77f8d1e 100644 --- a/pkgs/by-name/op/openvswitch/generic.nix +++ b/pkgs/by-name/op/openvswitch/generic.nix @@ -26,19 +26,23 @@ which, writeScript, makeWrapper, + withDPDK ? false, + dpdk, + numactl, + libpcap, }: let _kernel = kernel; in stdenv.mkDerivation rec { - pname = "openvswitch"; + pname = if withDPDK then "openvswitch-dpdk" else "openvswitch"; inherit version; kernel = lib.optional (_kernel != null) _kernel.dev; src = fetchurl { - url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; + url = "https://www.openvswitch.org/releases/openvswitch-${version}.tar.gz"; inherit hash; }; @@ -69,23 +73,32 @@ stdenv.mkDerivation rec { sphinxRoot = "./Documentation"; - buildInputs = [ - libcap_ng - openssl - perl - procps - python3 - util-linux - which - ]; + buildInputs = + [ + libcap_ng + openssl + perl + procps + python3 + util-linux + which + ] + ++ (lib.optionals withDPDK [ + dpdk + numactl + libpcap + ]); preConfigure = "./boot.sh"; - configureFlags = [ - "--localstatedir=/var" - "--sharedstatedir=/var" - "--sbindir=$(out)/bin" - ] ++ (lib.optionals (_kernel != null) [ "--with-linux" ]); + configureFlags = + [ + "--localstatedir=/var" + "--sharedstatedir=/var" + "--sbindir=$(out)/bin" + ] + ++ (lib.optionals (_kernel != null) [ "--with-linux" ]) + ++ (lib.optionals withDPDK [ "--with-dpdk=shared" ]); # Leave /var out of this! installFlags = [ @@ -104,7 +117,7 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : $out/share/openvswitch/python wrapProgram $out/bin/ovs-tcpdump \ - --prefix PATH : ${lib.makeBinPath [tcpdump]} \ + --prefix PATH : ${lib.makeBinPath [ tcpdump ]} \ --prefix PYTHONPATH : $out/share/openvswitch/python ''; @@ -148,6 +161,7 @@ stdenv.mkDerivation rec { adamcstephens kmcopper netixx + xddxdd ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index d101e2a960c6..4ad3ba33cb5c 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { cairo libjpeg libXft python3 ]; + # NOTE: ntk provides its own waf script that is incompatible with new + # python versions. If the script is not present, wafHook will install + # a compatible version from nixpkgs. + prePatch = '' + rm waf + ''; + meta = { description = "Fork of FLTK 1.3.0 with additional functionality"; version = version; diff --git a/pkgs/development/libraries/clipper2/default.nix b/pkgs/development/libraries/clipper2/default.nix index 4f4dee29ec98..ea3383871433 100644 --- a/pkgs/development/libraries/clipper2/default.nix +++ b/pkgs/development/libraries/clipper2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clipper2"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "AngusJohnson"; repo = "Clipper2"; rev = "Clipper2_${version}"; - sha256 = "sha256-3TKhb48cABl0QcbeG12xlA1taQ/8/RdUUHSp0Qh85eE="; + sha256 = "sha256-ASL9uKkXsWyIbD1qaKEL7gf/JuCqzZQZSKHwLT5dKJU="; }; sourceRoot = "${src.name}/CPP"; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 9c96f6ebe08c..6297488d491a 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -159,6 +159,7 @@ effectiveStdenv.mkDerivation rec { libcufft # cufft.h cudnn # cudnn.h cuda_cudart + nccl ]); nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index b0e9c97c5d1a..ebe39136080e 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "2.3.6"; format = "setuptools"; pname = "beancount"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-z2aGhpx+o+78CU7hPthmv196K7DGHk1PXfPjX4Rs/98="; + hash = "sha256-gB+Tvta1fS4iQ2aIxInVob8fduIQ887RhoB1fmDTR1o="; }; # Tests require files not included in the PyPI archive. diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index f0de12dcc8b3..cb31be20a170 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, substituteAll, cmdstan, setuptools, @@ -32,11 +31,6 @@ buildPythonPackage rec { src = ./use-nix-cmdstan-path.patch; cmdstan = "${cmdstan}/opt/cmdstan"; }) - # Fix seed-dependent tests - (fetchpatch { - url = "https://github.com/stan-dev/cmdstanpy/commit/c72acd0b8123c02b47d5d583bdd7d8408b04562c.patch"; - hash = "sha256-cliyDDko4spYa62DMwWBavy5pePkofJo4Kf8I0RzueM="; - }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 46aed51be299..3a94a3e70cb3 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -1,12 +1,18 @@ { lib, buildPythonPackage, - fetchPypi, - poetry-core, pythonOlder, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + boto3, fastavro, httpx, httpx-sse, + parameterized, pydantic, requests, tokenizers, @@ -16,22 +22,26 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.5.8"; + version = "5.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-hM52Zv+PvfT0H7X2ykUqsmOaUUvIiWeihUqbG4INbqA="; + src = fetchFromGitHub { + owner = "cohere-ai"; + repo = "cohere-python"; + rev = "refs/tags/${version}"; + hash = "sha256-zv4zSUQzt2jjuKumaV5vI3GbhZWKEjALohfuxQp6i7Q="; }; build-system = [ poetry-core ]; dependencies = [ + boto3 fastavro httpx httpx-sse + parameterized pydantic requests tokenizers @@ -44,11 +54,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "cohere" ]; - meta = with lib; { + meta = { description = "Simplify interfacing with the Cohere API"; homepage = "https://docs.cohere.com/docs"; changelog = "https://github.com/cohere-ai/cohere-python/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; }; } diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index ace8f66e14ea..139e103d40a1 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.10"; + version = "0.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-GHvLE6xTY37MCDlGOmvyqi42ORRk1W8UcQXqH3Ty/c4="; + hash = "sha256-ZNVBP/c1Q7635PbySk5Yxz7riYNLnBnJLG6AMxy/ZeA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix index aba72cf59ab9..7e54d04ff3a2 100644 --- a/pkgs/development/python-modules/optree/default.nix +++ b/pkgs/development/python-modules/optree/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "optree"; - version = "0.11.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "metaopt"; repo = pname; - rev = "v${version}"; - hash = "sha256-VnnnEoXkYJO+S7baH+JZvsW18Tk3TiY9+Cd230OlZWo="; + rev = "refs/tags/v${version}"; + hash = "sha256-4GvB9Z7qnEjsUSl+x5wd8czV80F50MwJdlNdylUU0zY="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix index 4af23c95cc61..b4626a8d02db 100644 --- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix +++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-homeassistant-analytics"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-homeassistant-analytics"; rev = "refs/tags/v${version}"; - hash = "sha256-uGi72UCIIvb5XZl7RkiAiR/TS+5VCpyvZfBsmlPzQEs="; + hash = "sha256-HPimk401tRBwszWvkyUEAcuLeYeEu0JUld16PESXkbo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 28da64efdc1d..6a55316e99c0 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-ywqZggn1k7zezk5CS1y6EWZfLoIWMHmGO8mvqxBaB9g="; + hash = "sha256-2HpiUnFfGP3XNe6vFQyXMUxwqdXxFulm919t3o8a/ys="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index e65aad91904a..72b6629a752d 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "qtile"; - version = "0.26.0"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "refs/tags/v${version}"; - hash = "sha256-htgrfGBGRlJSm88mmwW92ikXR/M1lr0OTom16TIvdpo="; + hash = "sha256-FO83i6nnMGY4eGsPYFfLuQPbN9ngUWXQMguBYqGrehg="; }; patches = [ diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index 493f142724e3..c16bc8c76640 100644 --- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "snakemake-interface-storage-plugins"; - version = "3.2.2"; + version = "3.2.3"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-syUjK32RPV9FMV7RSpXy+PJ2AVigGH+ywm6iTjUAuec="; + hash = "sha256-xfqxUla3qFnGZSFpWVCmtSJLqCK6XJF1OtDF1EDXbZU="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/stanio/default.nix b/pkgs/development/python-modules/stanio/default.nix index 27d754a7d894..a87e753c1886 100644 --- a/pkgs/development/python-modules/stanio/default.nix +++ b/pkgs/development/python-modules/stanio/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stanio"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3uQpMU2WXzkBga+o/3/4FERG7rWMwlR8zBCLpz5nROI="; + hash = "sha256-NI1S+UfexDHhGPS2AcTFKWkpuGQB1NTdWqk3Ow1K5Kw="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch b/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch deleted file mode 100644 index 3b602421d100..000000000000 --- a/pkgs/development/tools/analysis/cpplint/0001-Remove-pytest-runner-version-pin.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.py b/setup.py -index aef5c4e..030ea14 100755 ---- a/setup.py -+++ b/setup.py -@@ -73,7 +73,7 @@ setup(name='cpplint', - long_description=open('README.rst').read(), - license='BSD-3-Clause', - setup_requires=[ -- "pytest-runner==5.2" -+ "pytest-runner" - ], - tests_require=test_required, - # extras_require allow pip install .[dev] --- -2.31.1 - diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index f380f7086e82..f4dcd71f0b3c 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -1,49 +1,46 @@ -{ lib, python3Packages, fetchFromGitHub, fetchpatch }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "cpplint"; - version = "1.5.5"; - format = "setuptools"; + version = "1.6.1"; + pyproject = true; # Fetch from github instead of pypi, since the test cases are not in the pypi archive src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - hash = "sha256-JXz2Ufo7JSceZVqYwCRkuAsOR08znZlIUk8GCLAyiI4="; + owner = "cpplint"; + repo = "cpplint"; + rev = "refs/tags/${version}"; + hash = "sha256-N5YrlhEXQGYxhsJ4M5dGYZUzA81GKRSI83goaqbtCkI="; }; - patches = [ - ./0001-Remove-pytest-runner-version-pin.patch - - # The patch below stops using the sre_compile module, which was deprecated - # in Python 3.11 and replaces it with re.compile. Upstream is unsure if it - # should use re.compile or re._compiler.compile, so we should monitor the - # thread for updates. - # - # https://github.com/cpplint/cpplint/pull/214 - # - (fetchpatch { - name = "python-3.11-compatibility.patch"; - url = "https://github.com/cpplint/cpplint/commit/e84e84f53915ae2a9214e756cf89c573a73bbcd3.patch"; - hash = "sha256-u57AFWaVmGFSsvSGq1x9gZmTsuZPqXvTC7mTfyb2164="; - }) - ]; - postPatch = '' + substituteInPlace setup.py \ + --replace-fail '"pytest-runner==5.2"' "" + patchShebangs cpplint_unittest.py + + substituteInPlace cpplint_unittest.py \ + --replace-fail "assertEquals" "assertEqual" ''; - nativeCheckInputs = with python3Packages; [ pytest pytest-runner ]; + build-system = with python3Packages; [ + setuptools + ]; + + nativeCheckInputs = with python3Packages; [ + pytest + pytest-runner + ]; + checkPhase = '' ./cpplint_unittest.py ''; - meta = with lib; { + meta = { homepage = "https://github.com/cpplint/cpplint"; description = "Static code checker for C++"; mainProgram = "cpplint"; - maintainers = [ maintainers.bhipple ]; - license = [ licenses.bsd3 ]; + maintainers = [ lib.maintainers.bhipple ]; + license = [ lib.licenses.bsd3 ]; }; } diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 6e69aca6dd25..ab146df71acf 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rover"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c1Tnb9ACyV6RZmYnLL+KnybGgy8kwGi0JyWYcoH1J6M="; + sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y="; }; - cargoSha256 = "sha256-wTvQ4QBysppMgwv9pjQckVjMoBzLiDReOt6sJImqKFY="; + cargoSha256 = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index f3ee68352ee0..6076bb161fa3 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub -, withLdap ? true , python3 +, withLdap ? false , withPostgres ? true , nix-update-script , nixosTests @@ -14,7 +14,7 @@ let }; }; in -python.pkgs.buildPythonPackage rec { +python.pkgs.buildPythonApplication rec { pname = "etebase-server"; version = "0.13.1"; diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix index 0744d76a32d1..e19e1b4dc130 100644 --- a/pkgs/servers/http/jetty/11.x.nix +++ b/pkgs/servers/http/jetty/11.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "11.0.20"; - hash = "sha256-qOpIWht7Q8zjNRiHvpN5SBy+hOhddhgor5S55gWxHlQ="; + version = "11.0.22"; + hash = "sha256-afFuUZ1csDuE60m+WKMriU/wObBZleTORLOCFU8qcJk="; } diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix index e35533d547a9..0bbcb76e03a3 100644 --- a/pkgs/servers/http/jetty/12.x.nix +++ b/pkgs/servers/http/jetty/12.x.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "12.0.9"; - hash = "sha256-+/pn6Q24QDTaK+Slr+B17fshEXXh6sO1DWRuFGfi2h0="; + version = "12.0.11"; + hash = "sha256-5fZMHb2ZpkoAFY/v124F+99Kq9vZypSYrG8QmQ/RK6k="; } diff --git a/pkgs/servers/http/jetty/common.nix b/pkgs/servers/http/jetty/common.nix index 71f0dee03013..9b9e064e993f 100644 --- a/pkgs/servers/http/jetty/common.nix +++ b/pkgs/servers/http/jetty/common.nix @@ -1,6 +1,6 @@ { version, hash }: -{ lib, stdenvNoCC, fetchurl }: +{ lib, stdenvNoCC, fetchurl, gitUpdater }: stdenvNoCC.mkDerivation rec { pname = "jetty"; @@ -19,9 +19,17 @@ stdenvNoCC.mkDerivation rec { mv etc lib modules start.jar $out ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/jetty/jetty.project.git"; + allowedVersions = "^${lib.versions.major version}\\."; + ignoredVersions = "(alpha|beta).*"; + rev-prefix = "jetty-"; + }; + meta = with lib; { + changelog = "https://github.com/jetty/jetty.project/releases/tag/jetty-${version}"; description = "Web server and javax.servlet container"; - homepage = "https://eclipse.dev/jetty/"; + homepage = "https://jetty.org/"; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = with licenses; [ asl20 epl10 ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index ec8cefeab7a8..75d6449858a6 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -51,9 +51,13 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$PYTHONPATH" ''; - doCheck = true; + doCheck = python3Packages.pythonOlder "3.12"; checkPhase = '' + runHook preCheck + sh scripts/run-tests.sh -2 + + runHook postCheck ''; doInstallCheck = true; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 3f436d650a3f..a9e973f8d00d 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -37,13 +37,13 @@ let libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "4.20c"; + version = "4.21c"; src = fetchFromGitHub { owner = "AFLplusplus"; repo = "AFLplusplus"; rev = "refs/tags/v${version}"; - hash = "sha256-bS4Zxd2CX8m6zxO/izJi7Cj34260mOaU6GWjEj+xEU8="; + hash = "sha256-DKwPRxSO+JEJYWLldnfrAYqzwqukNzrbo4R5FzJqzzg="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 81fed0ad0046..950e4eb85cba 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "AFLplusplus"; repo = "qemuafl"; - # rev origin: https://github.com/AFLplusplus/AFLplusplus/commits/stable/qemu_mode/QEMUAFL_VERSION - rev = "40033af00c4c5de172ed4fe60c21b9edbd2c189d"; - sha256 = "sha256-oK0DLJjXDiQuRlbaNOurvw5vlr9HEeOobNywiFTq7xg="; + # rev origin: https://github.com/AFLplusplus/AFLplusplus/blob/v4.21c/qemu_mode/QEMUAFL_VERSION + rev = "a6f0632a65e101e680dd72643a6128dd180dff72"; + sha256 = "sha256-4kaQA5KDUqkK+fbjHg47lxZHRN8JrfSC2zdjrbMbDPo="; fetchSubmodules = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afdbcbf9cc11..cfe1b3d7c7e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11285,6 +11285,7 @@ with pkgs; opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; openvswitch-lts = callPackage ../by-name/op/openvswitch/lts.nix { }; + openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; }; ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { }; @@ -30189,7 +30190,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; - etebase-server = with python3Packages; toPythonApplication etebase-server; + etebase-server = callPackage ../servers/etebase {}; etesync-dav = callPackage ../applications/misc/etesync-dav { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b81579771555..dc4d8092cf32 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -158,6 +158,7 @@ mapAliases ({ email_validator = email-validator; # added 2022-06-22 enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27 et_xmlfile = et-xmlfile; # added 2023-10-16 + etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16 ev3dev2 = python-ev3dev2; # added 2023-06-19 eyeD3 = eyed3; # added 2024-01-03 Fabric = fabric; # addedd 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eab52aa3d6b1..d876ee2929e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3978,8 +3978,6 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; - etebase-server = callPackage ../servers/etebase { }; - eternalegypt = callPackage ../development/python-modules/eternalegypt { }; etesync = callPackage ../development/python-modules/etesync { };