diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-19 00:03:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-19 00:03:05 +0000 |
commit | 446fc5bdf385135d124b80d5138df8175e727953 (patch) | |
tree | a41302becc2c6ae7cefe30301e6a16cf0bfcdc0d /pkgs/applications/audio | |
parent | 5d55b71ae2ca47b44a2400d8b52aa3b3ad590267 (diff) | |
parent | d60c16acfeed7893f3a6972fdd6b7e7726a8f42d (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/plexamp/default.nix | 17 | ||||
-rwxr-xr-x | pkgs/applications/audio/plexamp/update-plexamp.sh | 5 |
2 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 25d16a658a7d5..ec79cbefabf0f 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,24 +2,25 @@ let pname = "plexamp"; - version = "4.8.3"; + version = "4.10.1"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - name="${pname}-${version}.AppImage"; - hash = "sha512-CrSXmRVatVSkMyB1QaNSL/tK60rQvT9JraRtYYLl0Fau3M1LJXK9yqvt77AjwIwIvi2Dm5SROG+c4rA1XtI4Yg=="; + name = "${pname}-${version}.AppImage"; + hash = "sha512-Y43W6aPnZEMnkBQwSHbT8PWjuhkfNxce79Y9cixEPnq4VybROHGb9s6ghV7kP81TSWkb9QruFhmXfuJRSkXxTw=="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop - install -m 444 -D ${appimageContents}/plexamp.png \ - $out/share/icons/hicolor/512x512/apps/plexamp.png + install -m 444 -D ${appimageContents}/plexamp.svg \ + $out/share/icons/hicolor/scalable/apps/plexamp.svg substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; @@ -29,9 +30,9 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/53"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/73"; license = licenses.unfree; - maintainers = with maintainers; [ killercup synthetica ]; + maintainers = with maintainers; [ killercup redhawk synthetica ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/plexamp/update-plexamp.sh b/pkgs/applications/audio/plexamp/update-plexamp.sh index b6b8def1e310a..44ad9b9250147 100755 --- a/pkgs/applications/audio/plexamp/update-plexamp.sh +++ b/pkgs/applications/audio/plexamp/update-plexamp.sh @@ -5,7 +5,7 @@ set -Eeuxo pipefail cleanup() { - rm -rf "$TMPDIR" + rm -rf "$TMPDIR" } trap cleanup EXIT @@ -42,9 +42,10 @@ if diff "$DEFAULT_NIX" "$WORKING_NIX"; then fi # update sha hash (convenietly provided) -sed -i "s@sha.* = .*;@sha512 = \"$SHA512\";@g" "$WORKING_NIX" +sed -i "s@hash.* = .*;@hash = \"sha512-$SHA512\";@g" "$WORKING_NIX" # update the changelog ("just" increment the number) +# manually check that the changelog corresponds to our Plexamp version CHANGELOG_URL=$(rg --only-matching 'changelog = "(.+)";' --replace '$1' $WORKING_NIX) CHANGELOG_NUMBER=$(rg --only-matching '.*/([0-9]+)' --replace '$1' <<< $CHANGELOG_URL) NEXT_CHANGELOG=$(($CHANGELOG_NUMBER + 1)) |