diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 0773fc0472aa..0b920c7a6d5f 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -15,6 +15,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : services.xserver.enable = true; services.xserver.desktopManager.pantheon.enable = true; + environment.systemPackages = [ pkgs.xdotool ]; }; enableOCR = true; @@ -29,6 +30,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.wait_for_text("${user.description}") # OCR was struggling with this one. # machine.wait_for_text("${bob.description}") + # Ensure the password box is focused by clicking it. + # Workaround for https://github.com/NixOS/nixpkgs/issues/211366. + machine.succeed("XAUTHORITY=/var/lib/lightdm/.Xauthority DISPLAY=:0 xdotool mousemove 512 505 click 1") + machine.sleep(2) machine.screenshot("elementary_greeter_lightdm") with subtest("Login with elementary-greeter"): diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch deleted file mode 100644 index 95238cf88524..000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe7abe08..acdbe0d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,7 +13,6 @@ find_program(CARGO cargo) - - add_custom_command( - OUTPUT -- "target/release/libdeltachat.a" - "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - COMMAND -@@ -38,13 +37,11 @@ add_custom_target( - lib_deltachat - ALL - DEPENDS -- "target/release/libdeltachat.a" - "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - ) - - include(GNUInstallDirs) - install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) --install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml -index a34a27ba..cf354abb 100644 ---- a/deltachat-ffi/Cargo.toml -+++ b/deltachat-ffi/Cargo.toml -@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] - - [lib] - name = "deltachat" --crate-type = ["cdylib", "staticlib"] -+crate-type = ["cdylib"] - - [dependencies] - deltachat = { path = "../", default-features = false } diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index e3e3106b8302..8e799917304e 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/pkgs/applications/office/kbibtex/default.nix @@ -5,7 +5,6 @@ , extra-cmake-modules , shared-mime-info # Qt -, qtnetworkauth , qtxmlpatterns , qtwebengine , qca-qt5 @@ -29,13 +28,13 @@ mkDerivation rec { pname = "kbibtex"; - version = "0.9.3.1"; + version = "0.9.3.2"; src = let majorMinorPatch = lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version)); in fetchurl { url = "mirror://kde/stable/KBibTeX/${majorMinorPatch}/kbibtex-${version}.tar.xz"; - hash = "sha256-kH/E5xv9dmzM7WrIMlGCo4y0Xv/7XHowELJP3OJz8kQ="; + hash = "sha256-BzPCTKMiMnzz2S+jbk4ZbEudyJX5EaTDVY59te/AxFc="; }; nativeBuildInputs = [ @@ -44,7 +43,6 @@ mkDerivation rec { ]; buildInputs = [ - qtnetworkauth qtxmlpatterns qtwebengine qca-qt5 diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index b26e8ae7225f..5f130c26658b 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "csdr"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "jketterl"; repo = pname; rev = version; - sha256 = "sha256-4XO3QYF0yaMNFjBHulrlZvO0/A1fFscD98QxnC6Itmk="; + sha256 = "sha256-Cmms+kQzTP+CMDRXCbtWuizosFe9FywLobjBOUA79O0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index d2ec15c09c6c..df4690d05b25 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.2.2"; + version = "6.3.0"; outputs = [ "out" "dev" ]; @@ -36,9 +37,18 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-YV7fcRaLaDwa0m6zbdhayCAqeON5nqEdQ1IUtDKu5AY="; + sha256 = "sha256-DS39jCeN+FFiEqJqxa5F2XRKF7SJsm2qi5KKb79guKo="; }; + patches = [ + # Avoid crash due to ref counting issues in Directory cache + # https://github.com/elementary/files/pull/2149 + (fetchpatch { + url = "https://github.com/elementary/files/commit/6a0d16e819dea2d0cd2d622414257da9433afe2f.patch"; + sha256 = "sha256-ijuSMZzVbSwWMWsK24A/24NfxjxgK/BU2qZlq6xLBEU="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils meson diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index e1f4ff6373d6..4da6dfe6abee 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.110.0"; + version = "1.111.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-SPBuStrBp9fnrLfFT2ec9yYItZsvQF9BHdJxi+plbgw="; + hash = "sha256-Fj5qrvlhty03+rxFqajdNoKFI+7qEHmKBXOLy3EonJ8="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Y4+CkaV9njHqmmiZnDtfZ5OwMVk583FtncxOgAqACkA="; + hash = "sha256-5s4onnL5aX4jFxEZWDU9xK6wSdTg7ZJZirxKTiImy38="; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/deltachat/deltachat-core-rust/"; changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda srapenne ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix new file mode 100644 index 000000000000..6c5146313881 --- /dev/null +++ b/pkgs/development/python-modules/deid/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, matplotlib +, pydicom +, python-dateutil +, setuptools +}: + +let + deid-data = buildPythonPackage rec { + pname = "deid-data"; + version = "unstable-2022-12-06"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ pydicom ]; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "deid-data"; + rev = "5750d25a5048fba429b857c16bf48b0139759644"; + hash = "sha256-c8NBAN53NyF9dPB7txqYtM0ac0Y+Ch06fMA1LrIUkbc="; + }; + + meta = { + description = "Supplementary data for deid package"; + homepage = "https://github.com/pydicom/deid-data"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.bcdarwin ]; + }; + }; +in +buildPythonPackage rec { + pname = "deid"; + version = "0.3.21"; + + format = "pyproject"; + disabled = pythonOlder "3.7"; + + # Pypi version has no tests + src = fetchFromGitHub { + owner = "pydicom"; + repo = pname; + # the github repo does not contain Pypi version tags: + rev = "38717b8cbfd69566ba489dd0c9858bb93101e26d"; + hash = "sha256-QqofxNjshbNfu8vZ37rB6pxj5R8q0wlUhJRhrpkKySk="; + }; + + propagatedBuildInputs = [ + matplotlib + pydicom + python-dateutil + ]; + + nativeCheckInputs = [ + deid-data + pytestCheckHook + ]; + + pythonImportsCheck = [ + "deid" + ]; + + meta = with lib; { + description = "Best-effort anonymization for medical images"; + homepage = "https://pydicom.github.io/deid"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 92777f73e7ad..034be82d7e39 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -56,11 +56,8 @@ buildPythonPackage rec { "deltachat.message" ]; - meta = with lib; { + meta = libdeltachat.meta // { description = "Python bindings for the Delta Chat Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/tree/master/python"; - changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/python/CHANGELOG"; - license = licenses.mpl20; - maintainers = with maintainers; [ dotlambda srapenne ]; }; } diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index 54750b63a933..c06ab09a4d6f 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -1,29 +1,31 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitLab , requests -, pythonOlder +, pytestCheckHook +, requests-mock }: buildPythonPackage rec { pname = "doorbirdpy"; - version = "2.2.1"; + version = "2.2.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "DoorBirdPy"; - inherit version; - hash = "sha256-o6d8xXF5OuiF0B/wwYhDAZr05D84MuxHBY96G2XHILU="; + src = fetchFromGitLab { + owner = "klikini"; + repo = "doorbirdpy"; + rev = version; + hash = "sha256-pgL4JegD1gANefp7jLYb74N9wgpkDgQc/Fe+NyLBrkA="; }; propagatedBuildInputs = [ requests ]; - # no tests on PyPI, no tags on GitLab - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; pythonImportsCheck = [ "doorbirdpy" diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index f17bc7923f8b..1055bada787e 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , six , hypothesis , mock @@ -24,6 +25,15 @@ buildPythonPackage rec { hash = "sha256-cwY1RRNtpAn6LnBASQLTNf4XXSPnfhOa1WgglGEM2/s="; }; + patches = [ + # https://github.com/google/python-fire/pull/440 + (fetchpatch { + name = "remove-asyncio-coroutine.patch"; + url = "https://github.com/google/python-fire/pull/440/commits/30b775a7b36ce7fbc04656c7eec4809f99d3e178.patch"; + hash = "sha256-GDAAlvZKbJl3OhajsEO0SZvWIXcPDi3eNKKVgbwSNKk="; + }) + ]; + propagatedBuildInputs = [ six termcolor diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index c0c5fb0742f1..379790d4b79b 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.5.8"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "abdullahselek"; repo = "HerePy"; rev = "refs/tags/${version}"; - hash = "sha256-BwuH3GxEXiIFFM0na8Jhgp7J5TPW41/u89LWf+EprG4="; + hash = "sha256-wz6agxPKQvWobRIiYKYU2og33tzswd0qG1hawPCh1qI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 588a5ee7083d..a9da2ef29ca3 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -4,15 +4,19 @@ , pyhcl , requests , six +, pythonOlder }: buildPythonPackage rec { pname = "hvac"; - version = "1.0.2"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-5AKMXA7Me3/PalTSkPmSQOWrzbn/5ELRwU8GExDUxhw="; + hash = "sha256-B53KWIVt7mZG7VovIoOAnBbS3u3eHp6WFbKRAySkuWk="; }; propagatedBuildInputs = [ @@ -29,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "HashiCorp Vault API client"; homepage = "https://github.com/ianunruh/hvac"; + changelog = "https://github.com/hvac/hvac/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index be36f758f941..03591377a07e 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "12.2.6"; + version = "12.2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IAqXp/d0f1khhNpkp4uQmxqJ4Xh8Nl87i+iMa3U9EDM="; + hash = "sha256-CtOicqS4PBDcsLrIyu3vek5Gi73vfE2vZfIo83mJgS4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyobihai/default.nix b/pkgs/development/python-modules/pyobihai/default.nix index 0cc62311f329..45f12b49b96f 100644 --- a/pkgs/development/python-modules/pyobihai/default.nix +++ b/pkgs/development/python-modules/pyobihai/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, defusedxml , fetchPypi , pythonOlder , requests @@ -7,7 +8,7 @@ buildPythonPackage rec { pname = "pyobihai"; - version = "1.3.2"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,10 +16,11 @@ buildPythonPackage rec { # GitHub release, https://github.com/dshokouhi/pyobihai/issues/10 src = fetchPypi { inherit pname version; - hash = "sha256-zhsnJyhXlugK0nJ7FJZZcrq2VDQt1a9uCgsJAIABZ28="; + hash = "sha256-P6tKpssey59SdjS/QWpuv1UUagjR7RVAl6rse/O79mg="; }; propagatedBuildInputs = [ + defusedxml requests ]; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 2588c5724996..0ffcbdb135c9 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "happyleavesaoc"; repo = "python-snapcast"; rev = "refs/tags/${version}"; - hash = "sha256-5SnjAkIrsgyEQ9nrBfe1jL+y4cxFzRVao2PM3VPIz8c="; + hash = "sha256-kUUKDcHnWA+saqQM7aCfW9NmhG6DYsB21tlEQ3cYNs4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index a8fd24ebd6a3..da9a7f4db6da 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.42"; + version = "0.2.43"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+1ciEHBMl78aFDu/NzIAdsGtAZJOfHZRDDZCR1+YuEM="; + hash = "sha256-Le5jw1ezGNx4lurHucbJ+q9arXldnHjDlAO61w4p61U="; }; - vendorHash = "sha256-qXjDeR0VZyyhASpt6zv6OyltEZDoguILhhD1ejpd0F4="; + vendorHash = "sha256-yQA84lBe85/NyG6GUa9gueLKw7Ei+3Hc3U9PmqGG8YA="; doCheck = false; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 33ad5756ee18..6a79e1ab879f 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.23667"; + version = "0.1.23816"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VrRdcp03B/Q3tUD/WKKKr7svNiOXFMM2s6EuIda6z6g="; + sha256 = "sha256-Ab22+fEHQry8dRIElFydxQXVWOXLo4Ch8Q26F8qPUDw="; }; - vendorHash = "sha256-6l2cblbpIORSqhu2rjzmDl/7y/Vki7fX/b5002jDKd0="; + vendorHash = "sha256-8HAiZ0zEJ+nnCsSUrNv0qQlvROCyNXO49fLWnKi6anE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index cdb5e7bbd8ad..c6a5f9aafe84 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.31.0"; + version = "2.31.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-yozW+Yb8uHOA5NfAQ+QWVylgJUM8b8DTKPUHxCNi9SU="; + hash = "sha256-zSr4lvrrGM+BgPWtq/J7vnB1lWHI8PmqP/N5csFL9kU="; }; - vendorHash = "sha256-8kG3GTb3dpLNeFppuLwvB+cjM0K1mp3QJgXTDieLgW8="; + vendorHash = "sha256-/CGdz6wIpEZrhZe6IYa43Z3bpN1byeSi9h4dTxCMxog="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1b2af5cfa35..9e6ef1c76c81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37255,7 +37255,7 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { - inherit (ocaml-ng.ocamlPackages_4_05) ocaml; + inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml; }; tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eaacd7b786e1..56cb8c3dea76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2378,6 +2378,8 @@ self: super: with self; { defusedxml = callPackage ../development/python-modules/defusedxml { }; + deid = callPackage ../development/python-modules/deid { }; + delegator-py = callPackage ../development/python-modules/delegator-py { }; delorean = callPackage ../development/python-modules/delorean { };