Unverified Commit 9e220ea0 authored by Ilan Joselevich's avatar Ilan Joselevich Committed by GitHub
Browse files

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

golden-cheetah*: 3.6-RC4 -> 3.6
parents fab8d248 e58c588c

pkgs/applications/misc/golden-cheetah-bin/default.nix

+11 −9
Original line number Diff line number Diff line 
{ appimageTools, lib, fetchurl, stdenv }:

{ appimageTools, lib, fetchurl, nix-update-script, stdenv }:

let



  pname = "golden-cheetah";

  version = "3.6-RC4";

  version = "3.6";



  src = fetchurl {

    url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage";

    hash = "sha256-I5GafK/W1djSx67xrjcMyPqMSqGW9AfrcPYcGcf0Pag=";

    url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v${version}_x64.AppImage";

    hash = "sha256-PMRUDQSQxbECbF9SPOo03t4Xxj1OtYJAPXEMyyy6EVY=";

  };



  appimageContents = appimageTools.extract { inherit pname src version; };
@@ -24,12 +24,14 @@ appimageTools.wrapType2 { 
    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";

    platforms = platforms.linux;

    platforms = lib.platforms.linux;

    broken = !stdenv.isx86_64;

    maintainers = with maintainers; [ gador ];

    license = licenses.gpl2Plus;

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    maintainers = with lib.maintainers; [ gador adamcstephens ];

    license = lib.licenses.gpl2Plus;

    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

  };

}

pkgs/applications/misc/golden-cheetah/default.nix

+9 −7
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, fetchpatch, mkDerivation

{ lib, fetchFromGitHub, nix-update-script, mkDerivation

, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools

, qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas

, bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook
@@ -16,13 +16,13 @@ let 
  };

in mkDerivation rec {

  pname = "golden-cheetah";

  version = "3.6-RC4";

  version = "3.6";



  src = fetchFromGitHub {

    owner = "GoldenCheetah";

    repo = "GoldenCheetah";

    rev = "refs/tags/v${version}";

    hash = "sha256-2cwxsfy4Zc9fF3fe6QcZp3LPd2yWw2rDlYrK/QGiJYw=";

    hash = "sha256-Ntim1/ZPaTPCHQ5p8xF5LWpqq8+OgkPfaQqqysv9j/c=";

  };



  buildInputs = [
@@ -72,10 +72,12 @@ in mkDerivation rec { 
    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";

    platforms = platforms.linux;

    maintainers = with maintainers; [ adamcstephens ];

    license = licenses.gpl2Plus;

    platforms = lib.platforms.linux;

    maintainers = with lib.maintainers; [ adamcstephens ];

    license = lib.licenses.gpl2Plus;

  };

}