diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index 36bd13433386..d13bbd13c922 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -9,6 +9,7 @@ # For the update script , coreutils +, curl , nix-prefetch-git , jq , nodePackages @@ -41,7 +42,7 @@ let in stdenv.mkDerivation rec { pname = "botamusique"; - version = "unstable-${lib.substring 0 10 srcJson.date}"; + version = srcJson.version; inherit src; @@ -67,21 +68,21 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - python3Packages.wrapPython - nodejs makeWrapper + nodejs + python3Packages.wrapPython ]; pythonPath = with python3Packages; [ - pymumble - packaging - magic - requests - youtube-dl flask + magic mutagen + packaging pillow + pymumble pyradios + requests + yt-dlp ]; buildPhase = '' @@ -118,9 +119,17 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = pkgs.writeShellScript "botamusique-updater" '' - export PATH=${lib.makeBinPath [ coreutils nix-prefetch-git jq nodePackages.node2nix ]} + export PATH=${lib.makeBinPath [ coreutils curl nix-prefetch-git jq nodePackages.node2nix ]} + set -ex - nix-prefetch-git https://github.com/azlux/botamusique > ${toString ./src.json} + OWNER=azlux + REPO=botamusique + VERSION=$(curl https://api.github.com/repos/$OWNER/$REPO/releases/latest | jq -r '.tag_name') + + nix-prefetch-git --rev "$VERSION" --url https://github.com/$OWNER/$REPO | \ + jq > ${toString ./src.json } \ + --arg version "$VERSION" \ + '.version |= $version' path=$(jq '.path' -r < ${toString ./src.json}) tmp=$(mktemp -d) @@ -129,7 +138,7 @@ stdenv.mkDerivation rec { # botamusique doesn't have a version in its package.json # But that's needed for node2nix jq < "$path"/web/package.json > "$tmp/package.json" \ - --arg version "0.0.0" \ + --arg version "$VERSION" \ '.version |= $version' node2nix \ diff --git a/pkgs/tools/audio/botamusique/node-packages.nix b/pkgs/tools/audio/botamusique/node-packages.nix index 89c7d8d98036..afff50cb922b 100644 --- a/pkgs/tools/audio/botamusique/node-packages.nix +++ b/pkgs/tools/audio/botamusique/node-packages.nix @@ -4526,8 +4526,8 @@ let args = { name = "botamusique"; packageName = "botamusique"; - version = "0.0.0"; - src = ../../../../../../../../../tmp/tmp.IOzfGq3zuo; + version = "7.2.2"; + src = ../../../../../../../../../tmp/tmp.axdirie3HR; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.7" diff --git a/pkgs/tools/audio/botamusique/src.json b/pkgs/tools/audio/botamusique/src.json index ab5c4819ecbe..22a9c01bce73 100644 --- a/pkgs/tools/audio/botamusique/src.json +++ b/pkgs/tools/audio/botamusique/src.json @@ -1,11 +1,12 @@ { "url": "https://github.com/azlux/botamusique", - "rev": "3733353170e1d24b5f3ce2a21643c27ca2a39835", - "date": "2021-09-01T12:19:37+02:00", - "path": "/nix/store/07vl4lhi6dshh4n7pcyrxvy9m028rrbr-botamusique", - "sha256": "0cggan70zymbh9iwggq9a04zkky86k9cncprxb9nnr35gp4l4992", + "rev": "9b9b4e40ce7b077ebfa3b9be08d32025d1e43bc3", + "date": "2021-10-27T02:29:59+02:00", + "path": "/nix/store/9gxn2bw0757yrmx0xhhwq642lixyy88x-botamusique", + "sha256": "07n6nyi84ddqp2x8xrds7q83yfqapl5qhkcprzjsmvxhv4a3ar8q", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, - "leaveDotGit": false + "leaveDotGit": false, + "version": "7.2.2" }