b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #247837 from adamcstephens/golden-cheetah/3.6

Browse source 
golden-cheetah*: 3.6-RC4 -> 3.6
This commit is contained in:
Ilan Joselevich 2023-08-26 01:05:50 +03:00 committed by GitHub
parent fab8d2488b e58c588c2d
commit 9e220ea00c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/misc/golden-cheetah-bin/default.nix
View file

@ -1,12 +1,12 @@
{ appimageTools, lib, fetchurl, stdenv }: { appimageTools, lib, fetchurl, nix-update-script, stdenv }:
let let
pname = "golden-cheetah"; pname = "golden-cheetah";
version = "3.6-RC4"; version = "3.6";
src = fetchurl { src = fetchurl {
url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage"; url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v${version}_x64.AppImage";
hash = "sha256-I5GafK/W1djSx67xrjcMyPqMSqGW9AfrcPYcGcf0Pag="; hash = "sha256-PMRUDQSQxbECbF9SPOo03t4Xxj1OtYJAPXEMyyy6EVY=";
}; };
appimageContents = appimageTools.extract { inherit pname src version; }; appimageContents = appimageTools.extract { inherit pname src version; };
@ -24,12 +24,14 @@ appimageTools.wrapType2 {
cp ${appimageContents}/gc.png $out/share/pixmaps/ cp ${appimageContents}/gc.png $out/share/pixmaps/
''; '';
meta = with lib; { passthru.updateScript = nix-update-script { };
meta = {
description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava";
platforms = platforms.linux; platforms = lib.platforms.linux;
broken = !stdenv.isx86_64; broken = !stdenv.isx86_64;
maintainers = with maintainers; [ gador ]; maintainers = with lib.maintainers; [ gador adamcstephens ];
license = licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
}; };
} }

16
pkgs/applications/misc/golden-cheetah/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchpatch, mkDerivation { lib, fetchFromGitHub, nix-update-script, mkDerivation
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
, qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas
, bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook , bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook
@ -16,13 +16,13 @@ let
}; };
in mkDerivation rec { in mkDerivation rec {
pname = "golden-cheetah"; pname = "golden-cheetah";
version = "3.6-RC4"; version = "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoldenCheetah"; owner = "GoldenCheetah";
repo = "GoldenCheetah"; repo = "GoldenCheetah";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-2cwxsfy4Zc9fF3fe6QcZp3LPd2yWw2rDlYrK/QGiJYw="; hash = "sha256-Ntim1/ZPaTPCHQ5p8xF5LWpqq8+OgkPfaQqqysv9j/c=";
}; };
buildInputs = [ buildInputs = [
@ -72,10 +72,12 @@ in mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
meta = with lib; { passthru.updateScript = nix-update-script { };
meta = {
description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens"; description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens";
platforms = platforms.linux; platforms = lib.platforms.linux;
maintainers = with maintainers; [ adamcstephens ]; maintainers = with lib.maintainers; [ adamcstephens ];
license = licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
}; };
} }