diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index 5e0d5804dbf2..28c2e9e83788 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -4,8 +4,8 @@ fetchurl, makeWrapper, makeDesktopItem, - genericUpdater, writeShellScript, + jq, atk, cairo, gdk-pixbuf, @@ -164,24 +164,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = genericUpdater { - versionLister = - let - arch = - if system == "x86_64-linux" then - "amd64" - else if system == "aarch64-linux" then - "arm64" - else - throw "cannot update AnyDesk on ${system}"; - in - writeShellScript "anydesk-versionLister" '' - curl -s https://anydesk.com/en/downloads/linux \ - | grep "https://[a-z0-9._/-]*-${arch}.tar.gz" -o \ - | uniq \ - | sed 's,.*/anydesk-\(.*\)-${arch}.tar.gz,\1,g' - ''; - }; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/an/anydesk/pin.json b/pkgs/by-name/an/anydesk/pin.json index be59d275a145..5c5c41eb883e 100644 --- a/pkgs/by-name/an/anydesk/pin.json +++ b/pkgs/by-name/an/anydesk/pin.json @@ -1,5 +1,5 @@ { - "version": "8.0.2", - "x86_64-linux": "sha256-6noMPfe0x6kx/whyd66qcmk7WhEivx3xK5q58Se9Ij0=", - "aarch64-linux": "sha256-wfY+OCx9OyLCmiA29RjnYzcg/pApMIXWT5UrcdcyRYM=" + "version": "8.0.3", + "x86_64-linux": "sha256-Mjl17hh5A/pwRAi7giL1SJYlQ61O0SXX+KeH8STZ4bs=", + "aarch64-linux": "sha256-MhAj5cy81uBMoNeFPvOyhBOlJzBgNRHXyCXrpdvF8nE=" } diff --git a/pkgs/by-name/an/anydesk/update.sh b/pkgs/by-name/an/anydesk/update.sh new file mode 100755 index 000000000000..166540cf7b8b --- /dev/null +++ b/pkgs/by-name/an/anydesk/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env -S nix shell nixpkgs#curl nixpkgs#jq nixpkgs#nix --command bash + +set -euo pipefail + +directory="$(dirname $0 | xargs realpath)" + +new_version=$( + curl -s https://rpm.anydesk.com/rhel/x86_64/Packages/ \ + | grep -oP 'anydesk_\K[0-9]+\.[0-9]+\.[0-9]+(?=-[0-9]+_x86_64\.rpm)' \ + | sort -V \ + | tail -1 +) + +old_version=$(jq -r '.version' "$directory/pin.json") + +if [[ "$new_version" == "$old_version" ]]; then + echo "anydesk is already up to date ($old_version)" + exit 0 +fi + +echo "Updating anydesk: $old_version -> $new_version" + +hash_amd64=$(nix hash to-sri --type sha256 \ + "$(nix-prefetch-url --type sha256 \ + "https://download.anydesk.com/linux/anydesk-${new_version}-amd64.tar.gz")") + +hash_arm64=$(nix hash to-sri --type sha256 \ + "$(nix-prefetch-url --type sha256 \ + "https://download.anydesk.com/rpi/anydesk-${new_version}-arm64.tar.gz")") + +cat > "$directory/pin.json" << EOF +{ + "version": "$new_version", + "x86_64-linux": "$hash_amd64", + "aarch64-linux": "$hash_arm64" +} +EOF + +cat "$directory/pin.json" diff --git a/pkgs/by-name/au/authelia/web.nix b/pkgs/by-name/au/authelia/web.nix index ca8a276e5e31..9aa80ab2b8da 100644 --- a/pkgs/by-name/au/authelia/web.nix +++ b/pkgs/by-name/au/authelia/web.nix @@ -62,4 +62,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + + # (node:24500) Warning: File descriptor 19 closed but not opened in unmanaged mode + # (node:24500) Warning: File descriptor 19 opened in unmanaged mode twice + meta.broken = stdenv.hostPlatform.isDarwin; }) diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index 1a53c5bbd7fa..6284a4ca3c5b 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -100,7 +100,7 @@ maven.buildMavenPackage { homepage = "https://github.com/Athou/commafeed"; license = lib.licenses.asl20; mainProgram = "commafeed"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ svrana ]; broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/ra/rasdaemon/package.nix b/pkgs/by-name/ra/rasdaemon/package.nix index c8756368c802..c5e50ed8f49c 100644 --- a/pkgs/by-name/ra/rasdaemon/package.nix +++ b/pkgs/by-name/ra/rasdaemon/package.nix @@ -17,20 +17,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "rasdaemon"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "mchehab"; repo = "rasdaemon"; tag = "v${finalAttrs.version}"; - hash = "sha256-rk4CZrWQRe2wsx8/eXP0BIeaU/Gxmcb+Kry5F8t4YKQ="; + hash = "sha256-CN9fSo7CQFkbpxPRwFSNJovTJBAjqEhqQzwHfYirGmo="; }; - patches = [ - # https://github.com/mchehab/rasdaemon/pull/246 - ./ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch - ]; - strictDeps = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch b/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch deleted file mode 100644 index 88facf5c6001..000000000000 --- a/pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in -index b00c9c1..e56402b 100755 ---- a/util/ras-mc-ctl.in -+++ b/util/ras-mc-ctl.in -@@ -2497,7 +2497,7 @@ sub errors - - # SIGNAL event - if ($has_signal == 1) { -- $query = "select id, timestamp, signal, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id"; -+ $query = "select id, timestamp, sig, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id"; - $query_handle = $dbh->prepare($query); - $query_handle->execute(); - $query_handle->bind_columns(\($id, $timestamp, $signal, $errorno, $code, $comm, $pid, $grp, $res)); diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix index fa5cfa4639dc..85f211dce2f2 100644 --- a/pkgs/development/python-modules/anova-wifi/default.nix +++ b/pkgs/development/python-modules/anova-wifi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "anova-wifi"; - version = "0.17.1"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Lash-L"; repo = "anova_wifi"; tag = "v${version}"; - hash = "sha256-TRiv5ljdVqc4qeX+fSH+aTDf5UyNII8/twlNx3KC6oI="; + hash = "sha256-/9R/41gClcLuJoaJ+CokX9sh4mQryDUsleO+NylU1AE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 2972cd56b18d..c398e1a19057 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "homematicip"; - version = "2.13.0"; + version = "2.13.2"; pyproject = true; src = fetchFromGitHub { owner = "hahn-th"; repo = "homematicip-rest-api"; tag = finalAttrs.version; - hash = "sha256-gy9s2w8zbNqED6MXzoMLEERGk3E9Zz/gWC7NzhPRiPw="; + hash = "sha256-gOpdmsLsF73m1da027hfU6IK8DfV67p0JXI/inIsvd4="; }; build-system = [ diff --git a/pkgs/development/python-modules/indevolt-api/default.nix b/pkgs/development/python-modules/indevolt-api/default.nix index baa67cd9b52b..e9d082760366 100644 --- a/pkgs/development/python-modules/indevolt-api/default.nix +++ b/pkgs/development/python-modules/indevolt-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "indevolt-api"; - version = "1.8.5"; + version = "1.8.6"; pyproject = true; src = fetchFromGitHub { owner = "Xirt"; repo = "indevolt-api"; tag = "v${finalAttrs.version}"; - hash = "sha256-FLbZIz2gnmjflDFr/8ExUYE9cgz+LCFtp/C9eqWihZ8="; + hash = "sha256-KFYavUYlFNaHj3QqJsHqhn7s1KzYAPjJrR6h7lw+ttU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/redisvl/default.nix b/pkgs/development/python-modules/redisvl/default.nix index 05897866f9bf..82e63148e861 100644 --- a/pkgs/development/python-modules/redisvl/default.nix +++ b/pkgs/development/python-modules/redisvl/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "redisvl"; - version = "0.21.0"; + version = "0.22.0"; pyproject = true; src = fetchFromGitHub { owner = "redis"; repo = "redis-vl-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sk1XNFTxk3bOTqiqhpZBaYgrZSxSoJUc9XoJmNo0EZY="; + hash = "sha256-0RgGNG6u6ZNraCd7YV10tajDYPHBIi7TbOYsbTR0tk8="; }; build-system = [ hatchling ];