diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index 11fb0e6cd3a1..af6e1619e7a3 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -14,6 +14,7 @@ libsecret, libxkbcommon, libgbm, + libGL, pango, sqlite, systemd, @@ -23,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "tradingview"; - version = "2.9.6"; - revision = "63"; + version = "2.12.0"; + revision = "66"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap"; - hash = "sha256-WmeGtR/rOzlgTpa1JZKskxre2ONtzppYsA/yhDhv5TI="; + hash = "sha512-ydk0/mJh4M02oIEfU3PKTwEO+nMpeJGuxQAly8WqJLx5GOQAb/J7VRB8IQpHHqWGeRfbwhantdZryQF8ngFJ/g=="; }; nativeBuildInputs = [ @@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { libsecret libxkbcommon libgbm + libGL pango sqlite systemd @@ -71,21 +73,21 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share cp -r squashfs-root $out/share/tradingview rm -rf $out/share/tradingview/meta - - install -Dm444 squashfs-root/meta/gui/tradingview.desktop -t $out/share/applications - substituteInPlace $out/share/applications/tradingview.desktop \ + substituteInPlace squashfs-root/meta/gui/tradingview.desktop \ --replace-fail \$\{SNAP}/meta/gui/icon.png tradingview - - mkdir $out/share/icons - cp squashfs-root/meta/gui/icon.png $out/share/icons/tradingview.png - + install -D --mode 644 squashfs-root/meta/gui/tradingview.desktop -t $out/share/applications + install -D --mode 644 squashfs-root/meta/gui/icon.png $out/share/icons/hicolor/512x512/apps/tradingview.png mkdir $out/bin - makeBinaryWrapper $out/share/tradingview/tradingview $out/bin/tradingview \ + makeWrapper $out/share/tradingview/tradingview $out/bin/tradingview \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} runHook postInstall ''; + preFixup = '' + patchelf --add-needed libGL.so.1 $out/share/tradingview/tradingview + ''; + passthru.updateScript = ./update.sh; meta = { diff --git a/pkgs/by-name/tr/tradingview/update.sh b/pkgs/by-name/tr/tradingview/update.sh index 9fdbd4f7ffe1..f309caa372ba 100755 --- a/pkgs/by-name/tr/tradingview/update.sh +++ b/pkgs/by-name/tr/tradingview/update.sh @@ -1,15 +1,15 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p curl jq git gnused gnugrep +#! nix-shell -i bash -p curl jq gitMinimal gnused gnugrep # # Get latest version of TradingView from Snapcraft. # snap_info=($( - curl -s -H 'X-Ubuntu-Series: 16' \ - 'https://api.snapcraft.io/api/v1/snaps/details/tradingview' \ - | jq --raw-output \ - '.revision,.download_sha512,.version,.last_updated' + curl --silent --header 'X-Ubuntu-Series: 16' \ + 'https://api.snapcraft.io/api/v1/snaps/details/tradingview' | + jq --raw-output \ + '.revision,.download_sha512,.version,.last_updated' )) # "revision" is the actual version identifier; "version" is for human consumption. @@ -27,10 +27,7 @@ echo "Latest release is $upstream_version from $last_updated." nixpkgs="$(git rev-parse --show-toplevel)" tradingview_nix="$nixpkgs/pkgs/by-name/tr/tradingview/package.nix" -current_nix_version=$( - grep 'version\s*=' "$tradingview_nix" \ - | sed -Ene 's/.*"(.*)".*/\1/p' -) +current_nix_version=$(nix eval --raw --file . tradingview.version) echo "Current nix version: $current_nix_version" @@ -50,21 +47,3 @@ sed --regexp-extended \ -e 's#hash\s*=\s*"[^"]*"\s*;#hash = "'"${sri}"'";#' \ -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \ -i "$tradingview_nix" - -# -# Attempt a build. -# - -export NIXPKGS_ALLOW_UNFREE=1 - -if ! nix-build -A tradingview "$nixpkgs"; then - echo "The updated TradingView failed to build." - exit 1 -fi - -# -# Commit changes. -# -git add "$tradingview_nix" -git commit -m "tradingview: ${current_nix_version} -> ${upstream_version}" -