diff options
Diffstat (limited to 'pkgs')
24 files changed, 126 insertions, 193 deletions
diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index d1a3cc988a50e..493079a25bba6 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -10,8 +10,6 @@ looking-glass-obs = callPackage ./looking-glass-obs.nix { }; - obs-backgroundremoval = callPackage ./obs-backgroundremoval { }; - obs-gstreamer = callPackage ./obs-gstreamer.nix { }; obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; @@ -34,5 +32,7 @@ obs-websocket = throw "obs-websocket has been removed: Functionality has been integrated into obs-studio itself."; + obs-backgroundremoval = throw "obs-backgroundremoval has been removed: It does not work anymore and is unmaintained."; + wlrobs = callPackage ./wlrobs.nix { }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix deleted file mode 100644 index 79a3f82fec87d..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, obs-studio -, onnxruntime -, opencv -}: - -stdenv.mkDerivation rec { - pname = "obs-backgroundremoval"; - version = "unstable-2022-05-02"; - - src = fetchFromGitHub { - owner = "royshil"; - repo = "obs-backgroundremoval"; - rev = "cc9d4a5711f9388ed110230f9f793bb071577a23"; - hash = "sha256-xkVZ4cB642p4DvZAPwI2EVhkfVl5lJhgOQobjNMqpec="; - }; - - patches = [ - # Fix c++ include directives - ./includes.patch - - # Use CPU backend instead of CUDA/DirectML - ./use-cpu-backend.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio onnxruntime opencv ]; - - dontWrapQtApps = true; - - cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" - "-DOnnxruntime_INCLUDE_DIRS=${onnxruntime.dev}/include/onnxruntime/core/session" - ]; - - - prePatch = '' - sed -i 's/version_from_git()/set(VERSION "0.4.0")/' CMakeLists.txt - ''; - - meta = with lib; { - description = "OBS plugin to replace the background in portrait images and video"; - homepage = "https://github.com/royshil/obs-backgroundremoval"; - maintainers = with maintainers; [ puffnfresh ]; - license = licenses.mit; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch deleted file mode 100644 index b99fc11818811..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/includes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/Model.h b/src/Model.h -index 6a73745..6bb8a7d 100644 ---- a/src/Model.h -+++ b/src/Model.h -@@ -1,13 +1,8 @@ - #ifndef MODEL_H - #define MODEL_H - --#if defined(__APPLE__) - #include <onnxruntime/core/session/onnxruntime_cxx_api.h> - #include <onnxruntime/core/providers/cpu/cpu_provider_factory.h> --#else --#include <onnxruntime_cxx_api.h> --#include <cpu_provider_factory.h> --#endif - - #ifdef WITH_CUDA - #include <cuda_provider_factory.h> -diff --git a/src/background-filter.cpp b/src/background-filter.cpp -index 0853818..32c6483 100644 ---- a/src/background-filter.cpp -+++ b/src/background-filter.cpp -@@ -1,13 +1,8 @@ - #include <obs-module.h> - #include <media-io/video-scaler.h> - --#if defined(__APPLE__) - #include <onnxruntime/core/session/onnxruntime_cxx_api.h> - #include <onnxruntime/core/providers/cpu/cpu_provider_factory.h> --#else --#include <onnxruntime_cxx_api.h> --#include <cpu_provider_factory.h> --#endif - #ifdef WITH_CUDA - #include <cuda_provider_factory.h> - #endif diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch deleted file mode 100644 index 0db5592e5cdb7..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/use-cpu-backend.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d04e167f9081a3ec8c49f0967b5b0cec79e40e4d Mon Sep 17 00:00:00 2001 -From: Raphael Robatsch <raphael-git@tapesoftware.net> -Date: Fri, 14 Oct 2022 16:55:36 +0200 -Subject: [PATCH] unix: use CPU backend instead of DirectML - ---- - src/background-filter.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/background-filter.cpp b/src/background-filter.cpp -index 32c6483..55e838f 100644 ---- a/src/background-filter.cpp -+++ b/src/background-filter.cpp -@@ -205,10 +205,14 @@ static void createOrtSession(struct background_removal_filter *tf) { - if (tf->useGPU == USEGPU_CUDA) { - Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CUDA(sessionOptions, 0)); - } --#else -+#elseif _WIN32 - if (tf->useGPU == USEGPU_DML) { - Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_DML(sessionOptions, 0)); - } -+#else -+ if (tf->useGPU == USEGPU_CPU) { -+ Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CPU(sessionOptions, 0)); -+ } - #endif - tf->session.reset(new Ort::Session(*tf->env, tf->modelFilepath, sessionOptions)); - } catch (const std::exception& e) { --- -2.37.3 - diff --git a/pkgs/development/libraries/jabcode/default.nix b/pkgs/development/libraries/jabcode/default.nix index bc4df3f99ba5d..dba1fba20df60 100644 --- a/pkgs/development/libraries/jabcode/default.nix +++ b/pkgs/development/libraries/jabcode/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "jabcode-${subproject}"; - version = "unstable-2021-02-16"; + version = "unstable-2022-06-17"; src = fetchFromGitHub { repo = "jabcode"; owner = "jabcode"; - rev = "e342b647525fa294127930d836b54a6b21957cdc"; - sha256 = "04ngw5aa43q7kxfn1v8drmir2i2qakvq0ni0lgf0zw8150mww52x"; + rev = "ee0e4c88b9f3c1da46d6f679ee8b69c547907c20"; + hash = "sha256-GjRkDWefQFdT4i9hRcQhYsY4beMUIXxy38I5lsQytyA="; }; nativeBuildInputs = diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 48da747c30203..f018992900357 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -14,6 +14,7 @@ , nlohmann_json , boost , oneDNN +, abseil-cpp_202111 , gtest , pythonSupport ? false , nsync @@ -27,23 +28,15 @@ assert pythonSupport -> lib.versionOlder protobuf.version "3.20"; -let - # prefetch abseil - # Note: keep URL in sync with `cmake/external/abseil-cpp.cmake` - abseil = fetchurl { - url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip"; - sha256 = "sha256-pFZ/8C+spnG5XjHTFbqxi0K2xvGmDpHG6oTlohQhEsI="; - }; -in stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "sha256-wwllEemiHTp9aJcCd1gsTS4WUVMp5wW+4i/+6DzmAeM="; + sha256 = "sha256-paaeq6QeiOzwiibbz0GkYZxEI/V80lvYNYTm6AuyAXQ="; fetchSubmodules = true; }; @@ -51,8 +44,8 @@ stdenv.mkDerivation rec { # Use dnnl from nixpkgs instead of submodules (fetchpatch { name = "system-dnnl.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad"; - sha256 = "sha256-58RBrQnAWNtc/1pmFs+PkZ6qCsL1LfMY3P0exMKzotA="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=9c392fb542979981fe0026e0fe3cc361a5f00a36"; + sha256 = "sha256-+kedzJHLFU1vMbKO9cn8fr+9A5+IxIuiqzOfR2AfJ0k="; }) ]; @@ -80,6 +73,7 @@ stdenv.mkDerivation rec { nsync python3Packages.numpy python3Packages.pybind11 + python3Packages.packaging ]; # TODO: build server, and move .so's to lib output @@ -98,6 +92,7 @@ stdenv.mkDerivation rec { "-Donnxruntime_USE_PREINSTALLED_EIGEN=ON" "-Donnxruntime_USE_MPI=ON" "-Deigen_SOURCE_PATH=${eigen.src}" + "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp_202111.src}" "-Donnxruntime_USE_DNNL=YES" ] ++ lib.optionals pythonSupport [ "-Donnxruntime_ENABLE_PYTHON=ON" @@ -106,15 +101,12 @@ stdenv.mkDerivation rec { doCheck = true; postPatch = '' - substituteInPlace cmake/external/abseil-cpp.cmake \ - --replace "${abseil.url}" "${abseil}" - substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ ''; postBuild = lib.optionalString pythonSupport '' - ${python3Packages.python.interpreter} ../setup.py bdist_wheel + python ../setup.py bdist_wheel ''; postInstall = '' diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index fbbfd17ddb369..f1c4cccb51ade 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -8,13 +8,13 @@ buildDunePackage rec { pname = "git"; - version = "3.10.0"; + version = "3.10.1"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "sha256-slUzAT4qwPzUNzHMbib/ArxaGzcMFl8tg0ynq1y5U1M="; + sha256 = "sha256-plu69FIpyJcuZ8nJ3QnufLnDEjtcsoAd8czKHfzTkd8="; }; # remove changelog for the carton package diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix index 9aef505a06117..25169c7c4913d 100644 --- a/pkgs/development/ocaml-modules/mimic/default.nix +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "mimic"; - version = "0.0.5"; + version = "0.0.6"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz"; - sha256 = "sha256-3qFjttVLgXKHOsr71550z7aVBcHPYzwdFeMpwHgWPa0="; + sha256 = "sha256-gVvBj4NqqKR2mn944g9F0bFZ8Me+WC87skti0dBW3Cg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index cc525d1d1e95b..d3af0ea154ea8 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -34,6 +34,7 @@ let param = "4.12" = v6_6; "4.13" = v6_6; "4.14" = v6_6; + "5.0" = v6_6; }.${ocaml.meta.branch}; in @@ -56,6 +57,7 @@ then buildDunePackage { inherit pname src meta; inherit (param) version buildInputs nativeBuildInputs; + duneVersion = "3"; strictDeps = true; } diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix index eed651ee3ada1..c96c722cc3868 100644 --- a/pkgs/development/python-modules/chess/default.nix +++ b/pkgs/development/python-modules/chess/default.nix @@ -7,7 +7,8 @@ buildPythonPackage rec { pname = "chess"; - version = "1.9.3"; + version = "1.9.4"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,19 +16,22 @@ buildPythonPackage rec { owner = "niklasf"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Qm6CNtie+oqZRCAs8qp8ythfs+OQvLZFK9YVLOuf918="; + hash = "sha256-YBABB//53gwJIwrmKJh8W+05hTBhl+49vCYv9//4E+0="; }; - pythonImportsCheck = [ "chess" ]; + pythonImportsCheck = [ + "chess" + ]; checkPhase = '' ${python.interpreter} ./test.py -v ''; meta = with lib; { - description = "A chess library for Python, with move generation, move validation, and support for common formats"; + description = "A chess library with move generation, move validation, and support for common formats"; homepage = "https://github.com/niklasf/python-chess"; - maintainers = with maintainers; [ smancill ]; + changelog = "https://github.com/niklasf/python-chess/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ smancill ]; }; } diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 013df4dc0faef..ece85f9a45b88 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -9,30 +9,43 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.2.5"; + version = "3.2.6"; # the wheel comes with pre-built assets, allowing us to avoid fighting # with npm/webpack/gettext to build them ourselves. format = "wheel"; + src = fetchPypi { inherit version format; pname = "django_hijack"; dist = "py3"; python = "py3"; - sha256 = "sha256-8BHnC3uK6zmSWKfvtDJuTjAKwQlL75G/QwRPgtNJYkE="; + hash = "sha256-xFPZ03II1814+bZ5gx7GD/AxYMiLuH6awfSeXEraOHQ="; }; - propagatedBuildInputs = [ django django_compat ]; + propagatedBuildInputs = [ + django + django_compat + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; - checkInputs = [ pytestCheckHook pytest-django ]; preCheck = '' export DJANGO_SETTINGS_MODULE='hijack.tests.test_app.settings' ''; - pytestFlagsArray = [ "--pyargs" "hijack" ]; + + pytestFlagsArray = [ + "--pyargs" + "hijack" + ]; meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; homepage = "https://github.com/arteria/django-hijack"; + changelog = "https://github.com/django-hijack/django-hijack/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index f87984dc022f1..42803c89461cb 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.22.3"; + version = "1.22.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-JOhsV4NyY5OW4smDEup1i9MTSQzK4Ldut/VybPB9ulc="; + sha256 = "sha256-8uL+n9eQmGVtQmwYqUr/368IqQ1RLJGBLMlY9eAqUa4="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 9bcbf7c5c56f5..d32379584b8ca 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.24.0"; + version = "5.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-u7tBP9ZETcDsPx562ZMr9I23iGoHsSlhUu382KU1lcE="; + hash = "sha256-siIi3RWiQUddiuA4ce3D6Js9n7X294oD6zwSMsIH0OI="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index bdd907176f99f..fc5b479df24c2 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -100,6 +100,8 @@ buildPythonPackage rec { # Flaky test "--deselect=pyarrow/tests/test_flight.py::test_roundtrip_errors" "--deselect=pyarrow/tests/test_pandas.py::test_threaded_pandas_import" + # Flaky test, works locally but not on Hydra + "--deselect=pyarrow/tests/test_csv.py::TestThreadedCSVTableRead::test_cancellation" ] ++ lib.optionals stdenv.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" diff --git a/pkgs/development/python-modules/pycarwings2/default.nix b/pkgs/development/python-modules/pycarwings2/default.nix index e404475e93ba1..bb4c794bc8926 100644 --- a/pkgs/development/python-modules/pycarwings2/default.nix +++ b/pkgs/development/python-modules/pycarwings2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pycarwings2"; - version = "2.13"; + version = "2.14"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "filcole"; repo = pname; rev = "v${version}"; - sha256 = "04k1la7wix6sp668nqpwdhd3057b2bzcz7h2b9a57cxlifl8pjxf"; + sha256 = "sha256-kqj/NZXqgPUsOnnzMPmIlICHek7RBxksmL3reNBK+bo="; }; propagatedBuildInputs = [ @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with the NissanConnect EV"; homepage = "https://github.com/filcole/pycarwings2"; + changelog = "https://github.com/filcole/pycarwings2/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index 84909ca056599..282e5b684f65f 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pavoni"; repo = "pyroon"; rev = version; - sha256 = "sha256-GEgm250uALTXIEMBWmluqGw/dw2TfGmUIcItfzonGkU="; + hash = "sha256-HcHs9UhRbSKTxW5qEvmMrQ+kWIBAqVpyldapx635uNM="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interface with the Roon API"; homepage = "https://github.com/pavoni/pyroon"; + changelog = "https://github.com/pavoni/pyroon/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix index 21f0ec0d08c8f..18fe23e1ea179 100644 --- a/pkgs/development/python-modules/wn/default.nix +++ b/pkgs/development/python-modules/wn/default.nix @@ -9,32 +9,39 @@ buildPythonPackage rec { pname = "wn"; - version = "0.9.2"; + version = "0.9.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-TghCKPKLxRTpvojmZi8tPGmU/D2W+weZl64PArAwDCE="; + hash = "sha256-rqrzGUiF1XQZzE6xicwJ7CJsI7SvWlFT4nDCrhtQUWg="; }; - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ requests tomli ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; preCheck = '' export HOME=$(mktemp -d) ''; - pythonImportsCheck = [ "wn" ]; + pythonImportsCheck = [ + "wn" + ]; meta = with lib; { description = "A modern, interlingual wordnet interface for Python"; homepage = "https://github.com/goodmami/wn"; + changelog = "https://github.com/goodmami/wn/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ zendo ]; }; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index ae9e15ecb80d4..be3265b04722c 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -1,22 +1,33 @@ -{ buildPythonPackage -, isPyPy +{ lib +, buildPythonPackage +, pythonOlder , fetchPypi }: buildPythonPackage rec { pname = "zodbpickle"; - version = "2.4"; - disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 + version = "2.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vWzJIPKDO6bTWzvxwyaekhDr/AHs1/F2jCL2OqoHU60="; + hash = "sha256-BZePwk/5PzSQRa6hH6OtHvqA6rGcq2JR6sdBfGMRodI="; }; # fails.. doCheck = false; - meta = { - homepage = "https://pypi.python.org/pypi/zodbpickle"; + pythonImportsCheck = [ + "zodbpickle" + ]; + + meta = with lib; { + description = "Fork of Python's pickle module to work with ZODB"; + homepage = "https://github.com/zopefoundation/zodbpickle"; + changelog = "https://github.com/zopefoundation/zodbpickle/blob/${version}/CHANGES.rst"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/geospatial/tile38/default.nix b/pkgs/servers/geospatial/tile38/default.nix index 341cd65afa591..8087d767b6611 100644 --- a/pkgs/servers/geospatial/tile38/default.nix +++ b/pkgs/servers/geospatial/tile38/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tile38"; - version = "1.30.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - sha256 = "sha256-/jFIj35PazQ11PcnYfuJXXSjPpKtNDshzQXnXkSCI8c="; + sha256 = "sha256-M/qH/EVe1T16XyRiUy8sfXvgxmZE+pK3zFTagFoOLN4="; }; vendorSha256 = "sha256-KOoSIVCbWlLenFP4SFBXPbZW9KUSL9KTcLXED72tABo="; diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index 76cd06d46c61d..b10ce6a38ceca 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.6"; + version = "1.0.7"; src = fetchCrate { inherit pname version; - sha256 = "sha256-NPlfgnLji261w/QedCkZ+IgfJMiG2aGjVfqJYpBPm6I="; + sha256 = "sha256-Cn05HX4GbHTwMwWxP3x0EtDEFqmn93eA+g4AXFFNNgE="; }; - cargoSha256 = "sha256-NBegNCNjhI0XuvxeqiI1RD7nIM9MabhXxZBnSEZrsD4="; + cargoSha256 = "sha256-UnlTpuYoyvu3MK87zogwzmKhGJwIENws1Ak4VYnfTBI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix index e126cfc7a778f..ffe60f6aa0fe7 100644 --- a/pkgs/tools/networking/xdp-tools/default.nix +++ b/pkgs/tools/networking/xdp-tools/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "xdp-tools"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { owner = "xdp-project"; repo = "xdp-tools"; rev = "v${version}"; - sha256 = "7QYlC0YBQsXH2VxjgBbmTgEvp83lXloTLCHY2fTrZuQ="; + sha256 = "Q1vaogcAeNjLIPaB0ovOo96hzRv69tMO5xwHh5W4Ws0="; }; outputs = [ "out" "lib" ]; diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index 24e8470182bf7..7611680c64af2 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, fetchurl, jdk, jre, swt, makeWrapper, xorg, dpkg }: +{ lib +, stdenv +, fetchurl +, jdk +, jre +, swt +, makeWrapper +, xorg +, dpkg +}: stdenv.mkDerivation rec { pname = "ipscan"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb"; - sha256 = "sha256-064V1KnMXBnjgM6mBrwkezdl+Tko3Xri0D4fCk9iPbk="; + sha256 = "sha256-HpsEp5XSz118cbV2wT81hzQT4cgDEBnpUbpl45ZVvlg="; }; sourceRoot = "."; unpackCmd = "${dpkg}/bin/dpkg-deb -x $src ."; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk ]; installPhase = '' @@ -34,8 +44,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and friendly network scanner"; homepage = "https://angryip.org"; + changelog = "https://github.com/angryip/ipscan/blob/${version}/CHANGELOG"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kylesferrazza ]; }; diff --git a/pkgs/tools/text/txr/default.nix b/pkgs/tools/text/txr/default.nix index d36d1bef03698..fd375d6b44d0b 100644 --- a/pkgs/tools/text/txr/default.nix +++ b/pkgs/tools/text/txr/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "txr"; - version = "283"; + version = "284"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2"; - hash = "sha256-2TnwxHAiiWEytHpKXrEwQ+ajq19f0lv7ss842kkPs4Y="; + hash = "sha256-dlAOThO2sJspkSYmR927iu13y3XRSllIGVh7ufu8ROU="; }; buildInputs = [ libffi ]; @@ -28,9 +28,15 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace tests/018/process.tl --replace /usr/bin/env ${lib.getBin coreutils}/bin/env ''; - # Remove failing tests -- 018/chmod tries setting sticky bit - preCheck = '' - rm -rf tests/018/chmod* + preCheck = let + disabledTests = lib.concatStringsSep " " [ + # - tries to set sticky bits + "tests/018/chmod.tl" + # - warning: unbound function crypt + "tests/018/crypt.tl" + ]; + in '' + rm ${disabledTests} ''; # TODO: ship vim plugin separately? @@ -46,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - homepage = "http://nongnu.org/txr"; + homepage = "https://nongnu.org/txr"; description = "An Original, New Programming Language for Convenient Data Munging"; longDescription = '' TXR is a general-purpose, multi-paradigm programming language. It @@ -58,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { at the command line, to data scanning and extracting scripts, to full application development in a wide range of areas. ''; + changelog = "https://www.kylheku.com/cgit/txr/tree/RELNOTES?h=txr-${finalAttrs.version}"; license = licenses.bsd2; maintainers = with lib.maintainers; [ AndersonTorres dtzWill ]; platforms = platforms.all; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 0cf5c77544b71..8ba2d116f538a 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9c4PoDJLfUH6ySNIxJDg5m2M2WFxNtuqCVKF6FvOHzY="; + hash = "sha256-mELI0mAkIERq8lfO5CdZcVgrsR5sybMEjKXJVPeg+dg="; }; buildInputs = [ @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ultra fast grep with interactive query UI"; homepage = "https://github.com/Genivia/ugrep"; + changelog = "https://github.com/Genivia/ugrep/releases/tag/v${version}"; maintainers = with maintainers; [ numkem ]; license = licenses.bsd3; platforms = platforms.all; |