diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix index 909c2815d168..e418e59da2c2 100644 --- a/nixos/modules/services/monitoring/scrutiny.nix +++ b/nixos/modules/services/monitoring/scrutiny.nix @@ -147,7 +147,7 @@ in schedule = mkOption { type = str; - default = "*:0/15"; + default = "daily"; description = '' How often to run the collector in systemd calendar format. ''; diff --git a/nixos/tests/lomiri-mediaplayer-app.nix b/nixos/tests/lomiri-mediaplayer-app.nix index e1f20a4cc203..0a6cbac41a11 100644 --- a/nixos/tests/lomiri-mediaplayer-app.nix +++ b/nixos/tests/lomiri-mediaplayer-app.nix @@ -54,30 +54,39 @@ in with subtest("lomiri mediaplayer launches"): machine.succeed("lomiri-mediaplayer-app >&2 &") + machine.wait_for_console_text("The name com.lomiri.content.dbus.Service was not provided") + machine.wait_for_console_text("The name com.lomiri.content.dbus.Service was not provided") # Emitted twice machine.sleep(10) machine.send_key("alt-f10") - machine.wait_for_text("Choose from") + machine.sleep(5) + machine.wait_for_text(r"(Choose|Sorry|provide|content)") machine.screenshot("lomiri-mediaplayer_open") machine.succeed("pkill -f lomiri-mediaplayer-app") with subtest("lomiri mediaplayer plays video"): machine.succeed("lomiri-mediaplayer-app /etc/${videoFile} >&2 &") + machine.wait_for_console_text("The name com.lomiri.content.dbus.Service was not provided") # Only once here + machine.wait_for_console_text("qml: onPositionChanged") machine.sleep(10) machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text("${ocrContent}") machine.screenshot("lomiri-mediaplayer_playback") machine.succeed("pkill -f lomiri-mediaplayer-app") with subtest("lomiri mediaplayer localisation works"): - # OCR struggles with finding identifying the translated window title, and lomiri-content-hub QML isn't translated + # OCR struggles with finding the translated window title, and lomiri-content-hub QML isn't translated # Cause an error, and look for the error popup machine.succeed("touch invalid.mp4") machine.succeed("env LANG=de_DE.UTF-8 lomiri-mediaplayer-app invalid.mp4 >&2 &") + machine.wait_for_console_text("The name com.lomiri.content.dbus.Service was not provided") + machine.wait_for_console_text("Der Datenstrom enthält keine Daten") machine.sleep(10) machine.send_key("alt-f10") - machine.wait_for_text("Fehler") + machine.sleep(5) + machine.wait_for_text(r"(Fehler|Abspielen|fehlgeschlagen)") machine.screenshot("lomiri-mediaplayer_localised") ''; } diff --git a/pkgs/applications/emulators/libretro/cores/mgba.nix b/pkgs/applications/emulators/libretro/cores/mgba.nix index 0073417c651c..8cf1ea735ac6 100644 --- a/pkgs/applications/emulators/libretro/cores/mgba.nix +++ b/pkgs/applications/emulators/libretro/cores/mgba.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mgba"; - version = "0-unstable-2025-02-17"; + version = "0-unstable-2025-05-18"; src = fetchFromGitHub { owner = "libretro"; repo = "mgba"; - rev = "88b22735dbdbc4d6236ed872ef21ea1b4d2fc492"; - hash = "sha256-ouwtL8vfc1LFMjfIZQ4F/ZOBW4y3VU9zovkXug0fgZY="; + rev = "c9bbf28b091c4c104485092279c7a6b114b2e8ff"; + hash = "sha256-yCRM2qkacGbFVr6x0ZHBCZ8xAMruFENBdcnNKzK0sY4="; }; meta = { diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index eb2f5b5a9673..4b8b1c0b746e 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -15,12 +15,12 @@ }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "2.0.5"; + version = "2.0.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-jpaTLbDmwcL8ihu8XTD2LsSfmneBpOGSVaRcJyeSSo4="; + hash = "sha256-yxAtD7sKOo0voE8BvfL0HGsnP0L2sc1f0UgXBNt/aQU="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index 442a83cf3e26..8fd36de84f8a 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "45.0"; + version = "46.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = "cloud-hypervisor"; rev = "v${version}"; - hash = "sha256-PmgHO3gRE/LfLiRC+sAQXKUeclweVUNJV2ihpkvx0Wg="; + hash = "sha256-3jFZgcTyjbAB4Ka8ZHeqorlVTkAvXJ2No32038xK0Pc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-h9ydLEp7GpW5jMkt5jObR09lPWGs+rmvdoEZntIZwxY="; + cargoHash = "sha256-Zllj6HGRgI1tT8EODGOpSgmw3F89ie9Y1hChTrvwskg="; separateDebugInfo = true; diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix index ad25a106c215..3d2016a256cd 100644 --- a/pkgs/by-name/co/containerd/package.nix +++ b/pkgs/by-name/co/containerd/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { pname = "containerd"; - version = "2.0.5"; + version = "2.1.0"; outputs = [ "out" @@ -27,7 +27,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; tag = "v${version}"; - hash = "sha256-BY6lIzTlJbBbeIxCtSd7NcYVEWta3VNMmHmH97ksGsE="; + hash = "sha256-5Fd9LrpJUf5MEtfQaRM6zo5C8RUsOasR2NHCDj8vMBk="; }; postPatch = "patchShebangs ."; diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index 965d3dc66c34..94debf50ed1f 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.22"; + version = "1.1.24"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-+YFQU7qCj2hpRuBpUn0hn5GNq+T0DHQFZwEoLu1FY4c="; + hash = "sha256-dTJ2YMNZwpZj3ZDWegjFr9aiaUtTpN8gY1wq5SAoVvs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index 97499533e82a..9a284e9e6881 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "jenkins"; - version = "2.492.3"; + version = "2.504.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war"; - hash = "sha256-kMz1VhM8Nv33ZTrXEPANJIvyiV+fvCbM7g4tO6aBsB8="; + hash = "sha256-gQJtsYsMSq1rYs9AjkxC5Xl2YbQcUXs332BiOOibnfE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix index 7937320acfda..b6fbbc4001cc 100644 --- a/pkgs/by-name/li/libspnav/package.nix +++ b/pkgs/by-name/li/libspnav/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libspnav"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "FreeSpacenav"; repo = "libspnav"; tag = "v${version}"; - hash = "sha256-qBewSOiwf5iaGKLGRWOQUoHkUADuH8Q1mJCLiWCXmuQ="; + hash = "sha256-4ESzH2pMTGoDI/AAX8Iz/MVhxQD8q5cg9I91ryUi5Ys="; }; buildInputs = [ libX11 ]; diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index ef997de10d60..92dff5e16573 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-YnNqFuRRaRnVqNlD1VaWbx1TaTpD851altu9YamXX0q2ZohtGzB7lzE2xhllbS61E71jSUDasLUlbyyVqGTrJw=="; + hash = "sha512-H4v2fpOvjU8Cxxf0kxHf2CB/NwjarMp8EjjfGb2IbrVM0aXQQyvW+cHRwfsLnkyOxNYLWNC50Px0Ur/0rpj4bg=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mi/mint-themes/package.nix b/pkgs/by-name/mi/mint-themes/package.nix index 29d3e4ba3948..e9f7044f0f26 100644 --- a/pkgs/by-name/mi/mint-themes/package.nix +++ b/pkgs/by-name/mi/mint-themes/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.2.3"; + version = "2.2.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "mint-themes"; rev = version; - hash = "sha256-QCf0hF1qtTiYo9F/M3UiCrGj6EPSrrSWZaLXqH0UNWs="; + hash = "sha256-O1ky967RWrd5L2RGl7SC2ZsvaM8FMmSmroJKcItD+ck="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix index 9997857befc4..052bed2b64e2 100644 --- a/pkgs/by-name/ml/mlt/package.nix +++ b/pkgs/by-name/ml/mlt/package.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "7.30.0"; + version = "7.32.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - hash = "sha256-z1bW+hcVeMeibC1PUS5XNpbkNB+75YLoOWZC2zuDol4="; + hash = "sha256-8T5FXXGs7SxL6nD+R1Q/0Forsdp5Xux4S3VLvgqXzw8="; # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix index fff6c79404f1..19753dd8bf84 100644 --- a/pkgs/by-name/mo/morgen/package.nix +++ b/pkgs/by-name/mo/morgen/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.6.13"; + version = "3.6.14"; src = fetchurl { name = "morgen-${version}.deb"; url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-a7IkEHRAwa7SnsPcK6psho6E+o1aOlQPPFHaDPrrXxw="; + hash = "sha256-ouSXOOTf+7FxSj8iyYyGN2WnsZ5EtvbW/XECfBA4UVc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix index 394f8d73afab..0392ef6e3145 100644 --- a/pkgs/by-name/ne/netavark/package.nix +++ b/pkgs/by-name/ne/netavark/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "containers"; repo = "netavark"; rev = "v${version}"; - hash = "sha256-kAJOfZ4Q1EQ+JV1izXoLe/Z/qgxbzz3WbczM4fVhxfU="; + hash = "sha256-V+JwfKWo8gqVq/lF0MMt8sovPRyb3saBxsUhdMo4C5g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-MdKTGLNf+7SzdkQNLOWgfmSE9TNLYzPFU0oXh6MnW5w="; + cargoHash = "sha256-C2+N3jPdqh/cmJ2efrUnScXo1rFBEec6w4r8M6OfcPo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index f866e1fa2af6..338564c76338 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "niri"; - version = "25.05"; + version = "25.05.1"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; tag = "v${finalAttrs.version}"; - hash = "sha256-ngQ+iTHmBJkEbsjYfCWTJdV8gHhOCTkV8K0at6Y+YHI="; + hash = "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs="; }; postPatch = '' @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-tZp7AhhddEhKWzEUTgosxXMEzALbv6FxqnJEb9MBhzc="; + cargoHash = "sha256-8ltuI94yIhff7JxIfe1mog4bDJ/7VFgLooMWOnSTREs="; strictDeps = true; diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 70ae5a6af2ba..9aae938e011a 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-05-14"; + version = "0-unstable-2025-05-20"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "877452519d3138bd4a98dc7ef3cd3dec78a5b9dc"; - hash = "sha256-uqtCB636qAe6c/dokLsbbTGw3oeo+93YhnGfPUwg7WI="; + rev = "707a5e8beec085376c6bc772352289ace86633d9"; + hash = "sha256-tSn+Yymhx8rxbr81aVgoU83FESCfK4Sq01KfO88kzJQ="; }; dontConfigure = true; diff --git a/pkgs/by-name/sl/sleek/package.nix b/pkgs/by-name/sl/sleek/package.nix index 3a1fbfda5a4b..b5424eb16d67 100644 --- a/pkgs/by-name/sl/sleek/package.nix +++ b/pkgs/by-name/sl/sleek/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "sleek"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "nrempel"; repo = "sleek"; rev = "v${version}"; - hash = "sha256-VQ0LmKhFsC12qoXCFHxtV5E+J7eRvZMVH0j+5r8pDk8="; + hash = "sha256-U1ujR+6wW3SKUnjqs/+DrEhu0XRBB8hxGC2pxe3LVbw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vq4e/2+YfMw2n8ZMYPa/3HtNk9pCtXWN/u1MzhBkZJQ="; + cargoHash = "sha256-2P47kVNQPksKyWPtk1XEpVEjFfz7cEvWX0VvlT3nKOc="; meta = with lib; { description = "CLI tool for formatting SQL"; diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix index 98cb45d6dbe9..bbb9050e6bec 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, cmake, @@ -23,50 +22,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-mediaplayer-app"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-mediaplayer-app"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-Pq1TA7eoHDRRzr6zT2cmIye91uz/0YsmQ8Qp79244wg="; + tag = "${finalAttrs.version}"; + hash = "sha256-A1tAXQXDwVZ3ILFcJKCtbOm1iNxPFOXQIS6p7fPbqwM="; }; - patches = [ - # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/35 merged & in release - (fetchpatch { - name = "0001-lomiri-mediaplayer-app-Fix-GNUInstallDirs-usage.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/baaa0ea7cba2a9f8bc7f223246857eba1cd5d8e4.patch"; - hash = "sha256-RChPRi4zrAWJEl4Urznh5FRYuTnxCFzG+gZurrF7Ym0="; - }) - - # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/36 merged & in release - (fetchpatch { - name = "0002-lomiri-mediaplayer-app-Drop-NO_DEFAULT_PATH-for-qmltestrunner.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/3bf4ebae7eb59176af984d07ad72b67ee0bd1b8f.patch"; - hash = "sha256-dJCW0dKe7Tq1Mg9CSdVQHamObVrPS7COXsdv41SWnHg="; - }) - - # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/37 merged & in release - (fetchpatch { - name = "0003-lomiri-mediaplayer-app-BUILD_TESTING.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/df1aadb82d73177133bc096307ec1ef1e2b0c2ed.patch"; - hash = "sha256-dvkGjG0ptCmLDIAWzDjOzu+Q/5bgVdb/+RmE6v8fV0Q="; - }) - - # Remove when https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/merge_requests/38 merged & in release - (fetchpatch { - name = "0004-lomiri-mediaplayer-app-bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/bd927e823205214f9ea01dfb1f93171a8952ecf9.patch"; - hash = "sha256-/lg0elv9weNnRGq1oD94/sE511EZ0TmXZsURcauQobI="; - }) - (fetchpatch { - name = "0005-lomiri-mediaplayer-app-Fix-title-localisation.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-mediaplayer-app/-/commit/c4cba819dd55e7e85c4ea496626bed9aa78470a5.patch"; - hash = "sha256-EiUxaCa5ANnRSciB8IodQOGnmG4rE/g/M+K4XcyqTI8="; - }) - ]; - postPatch = '' # We don't want absolute paths in desktop files substituteInPlace data/lomiri-mediaplayer-app.desktop.in.in \ @@ -154,7 +118,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Media Player application for Ubuntu Touch devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app"; - changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${finalAttrs.version}/ChangeLog"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-mediaplayer-app/-/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = with lib.licenses; [ gpl3Only cc-by-sa-30 diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index e34ba7924d85..29786e6ef51d 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "elementary-notifications"; - version = "8.0.0"; + version = "8.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "notifications"; rev = version; - sha256 = "sha256-40STrDpMx1WFaTriJNrvkkbzAM0DeBaPdc8o8URItQI="; + sha256 = "sha256-2+LV3O2V42gI+ysVoeO9KpLqmAj/Zk5F8LzO2RNZ1ZY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 16f0af732552..0796522a5660 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { tutorial. ''; - homepage = "https://gtkmm.org/"; + homepage = "https://gtkmm.gnome.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/python-modules/condense-json/default.nix b/pkgs/development/python-modules/condense-json/default.nix index 422aa5dacf2d..3c81a79b3cf5 100644 --- a/pkgs/development/python-modules/condense-json/default.nix +++ b/pkgs/development/python-modules/condense-json/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "condense-json"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "condense-json"; tag = version; - hash = "sha256-eZ8d8N7k8VL7dFkORHmp7JmHM1/11Km8BCriWw/LiwE="; + hash = "sha256-vMh6GLWqae0Ave3FmrGQuVCgFzYMGCIe76mGNDMrBdU="; }; build-system = [ diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index f11178381f4b..36ef3c86a329 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "flufl-lock"; - version = "8.1.0"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "flufl_lock"; inherit version; - hash = "sha256-2IMCAFaSpj2YtgCAFY+vCJvl7K5pafcGQJ2oJ2/c58s="; + hash = "sha256-FbMzw1+rGjayI4QAVyWK60zXnw+6+CwUTyPN9s8U1eM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 43925f8ee7ab..3ff806860f45 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -17,7 +17,6 @@ # optional-dependencies diffusers, - evaluate, h5py, onnx, onnxruntime, @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.24.0"; + version = "1.25.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -38,7 +37,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; tag = "v${version}"; - hash = "sha256-0D/kHPUI+gM7IblA4ULs0JuGTNQVezIYg0SPD3ESukw="; + hash = "sha256-SVyGtWFI5GjfxbaVKICf+QSSMYI62dDVMzphu8TngvY="; }; build-system = [ setuptools ]; @@ -56,24 +55,25 @@ buildPythonPackage rec { optional-dependencies = { onnxruntime = [ onnx - onnxruntime datasets - evaluate protobuf + onnxruntime ]; exporters = [ onnx - onnxruntime timm + onnxruntime + protobuf ]; exporters-tf = [ - tensorflow - tf2onnx onnx - onnxruntime timm h5py + tf2onnx + onnxruntime numpy + datasets + tensorflow ]; diffusers = [ diffusers ]; intel = [ diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 04e641b11cc5..50cf47eee03c 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.17.0"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-+ivAULLC0+c7VNbVQceSF4Vho0TwfkCfUy1buXrHuJQ="; + hash = "sha256-+9AdBKTSziiaqgLPhYBDZ5vw3R+YVca4jtlTgsH1ARo="; }; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index d3174581741c..01b697d154be 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -5,7 +5,6 @@ aioquic, beautifulsoup4, buildPythonPackage, - cacert, fetchFromGitHub, gunicorn, html5tagger, @@ -27,7 +26,7 @@ buildPythonPackage rec { pname = "sanic"; - version = "24.12.0"; + version = "25.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -36,12 +35,9 @@ buildPythonPackage rec { owner = "sanic-org"; repo = "sanic"; tag = "v${version}"; - hash = "sha256-17Nr0iNeZC1sHm0JETIufdMVqrhORts1WxCh8cukCKg="; + hash = "sha256-tucLXWYPpALQrPYf+aiovKHYf2iouu6jezvNdukEu9w="; }; - # https://github.com/sanic-org/sanic/issues/3031 - patches = [ ./websockets-14.2-compat.patch ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch b/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch deleted file mode 100644 index 9acf47757335..000000000000 --- a/pkgs/development/python-modules/sanic/websockets-14.2-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sanic/server/protocols/websocket_protocol.py b/sanic/server/protocols/websocket_protocol.py -index beee1d26..5a3e70f2 100644 ---- a/sanic/server/protocols/websocket_protocol.py -+++ b/sanic/server/protocols/websocket_protocol.py -@@ -147,7 +147,7 @@ class WebSocketProtocol(HttpProtocol): - "".join([f"{k}: {v}\r\n" for k, v in resp.headers.items()]) - ).encode() - rbody += b"\r\n" -- if resp.body is not None: -+ if resp.body: - rbody += resp.body - rbody += b"\r\n\r\n" - await super().send(rbody) diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix index 7d4710c74388..cb8d8458141c 100644 --- a/pkgs/development/python-modules/testresources/default.nix +++ b/pkgs/development/python-modules/testresources/default.nix @@ -1,42 +1,50 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, pbr, fixtures, testtools, - unittestCheckHook, + pytestCheckHook, }: buildPythonPackage rec { pname = "testresources"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417"; + src = fetchFromGitHub { + owner = "testing-cabal"; + repo = "testresources"; + tag = version; + hash = "sha256-cdZObOgBOUxYg4IGUUMb6arlpb6NTU7w+EW700LKH4Y="; }; - postPatch = '' - substituteInPlace testresources/tests/test_resourced_test_case.py \ - --replace "failIf" "assertFalse" - ''; + build-system = [ + setuptools + pbr + ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ pbr ]; + dependencies = [ + pbr + ]; nativeCheckInputs = [ fixtures testtools - unittestCheckHook + pytestCheckHook ]; - meta = with lib; { + env.PBR_VERSION = version; + + meta = { description = "Pyunit extension for managing expensive test resources"; homepage = "https://launchpad.net/testresources"; - license = licenses.bsd2; + license = with lib.licenses; [ + asl20 # or + bsd3 + ]; + maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index e6771acefb51..35d6c4e1d2f5 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2025.2.0.20250326"; + version = "2025.2.0.20250516"; pyproject = true; src = fetchPypi { pname = "types_pytz"; inherit version; - hash = "sha256-3toC3iT1JwZvyNahnihKs/OucWpCtK22tA515AjAjTY="; + hash = "sha256-4SFjBvjA1dptr9ZJLnLrCAyaFmFx+oDdehmQ/Yvnp7M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index f83ce85defb4..093118aa92fb 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "xcffib"; - version = "1.7.1"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M3dcHQRh8ZJV/FTiLOkU4QoT+2W8e7oOq6/ufwh4z9s="; + hash = "sha256-K6xgY2lnVOiHHC9AcwR7Uz792Cx33fhnYgEWcJfMUlM="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 7e2c0bd43cde..fa48f16d9972 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -225,8 +225,8 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.14"; - hash = "sha256-Ya0xDTx9Pl2hMbdrvyK1pMB4bp2JLa6MFljUtITePKo="; + version = "8.14.1"; + hash = "sha256-hFlSqdavp4PbcLs7Dv+q5FrlVCyiu3kpYZ6K9Jy2NM8="; defaultJava = jdk21; };