From 122689763ab33ae2ebeb21f1e25961dd8d639fa4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 29 Oct 2023 02:23:25 +0100 Subject: [PATCH] vgmstream: unstable-2022-02-21 -> 1879 --- pkgs/applications/audio/vgmstream/default.nix | 20 +++-- pkgs/applications/audio/vgmstream/update.sh | 77 ------------------- 2 files changed, 9 insertions(+), 88 deletions(-) delete mode 100755 pkgs/applications/audio/vgmstream/update.sh diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix index f696c5061864..6b5e6460172d 100644 --- a/pkgs/applications/audio/vgmstream/default.nix +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -1,21 +1,23 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config , mpg123, ffmpeg, libvorbis, libao, jansson, speex +, nix-update-script }: -let - vgmstreamVersion = "r1702-5596-00bdb165b"; -in + stdenv.mkDerivation rec { pname = "vgmstream"; - version = "unstable-2022-02-21"; + version = "1879"; src = fetchFromGitHub { owner = "vgmstream"; repo = "vgmstream"; - rev = "00bdb165ba6b55420bbd5b21f54c4f7a825d15a0"; - sha256 = "18g1yqlnf48hi2xn2z2wajnjljpdbfdqmcmi7y8hi1r964ypmfcr"; + rev = "refs/tags/r${version}"; + sha256 = "sha256-m7M9oIEym/jzuw2HAbjdF6fZsfTew1KK0g1D4SePiiE="; }; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + attrPath = "vgmstream"; + extraArgs = [ "--version-regex" "r(.*)" ]; + }; nativeBuildInputs = [ cmake pkg-config ]; @@ -28,10 +30,6 @@ stdenv.mkDerivation rec { "-DUSE_CELT=OFF" ]; - postConfigure = '' - echo "#define VGMSTREAM_VERSION \"${vgmstreamVersion}\"" > ../version.h - ''; - meta = with lib; { description = "A library for playback of various streamed audio formats used in video games"; homepage = "https://vgmstream.org"; diff --git a/pkgs/applications/audio/vgmstream/update.sh b/pkgs/applications/audio/vgmstream/update.sh deleted file mode 100755 index 5353480dd335..000000000000 --- a/pkgs/applications/audio/vgmstream/update.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p gnused jq nix-prefetch-git curl cacert - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -if [[ ! "$(basename $ROOT)" == "vgmstream" || ! -f "$ROOT/default.nix" ]]; then - echo "ERROR: Not in the vgmstream folder" - exit 1 -fi - -if [[ ! -v GITHUB_TOKEN ]]; then - echo "ERROR: \$GITHUB_TOKEN not set" - exit 1 -fi - - -payload=$(jq -cn --rawfile query /dev/stdin '{"query": $query}' <