diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index a798f05c7ef4..c37211ee91a0 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -1,30 +1,35 @@ -{ lib -, stdenv -, fetchurl -, appimageTools -, undmg +{ + lib, + stdenv, + fetchurl, + appimageTools, + undmg, + copyDesktopItems, }: let pname = "hoppscotch"; - version = "24.3.3-1"; + version = "24.8.1-0"; - src = fetchurl { - aarch64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-litOYRsUOx6VpkA1LPx7aGGagqIVL9fgNsYoP5n/2mo="; - }; - x86_64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-UG89Fv9J8SnzPVoIO16LOprxPmZuu/zyox1b+jn+eNw="; - }; - x86_64-linux = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-110l1DTyvH2M0ex1r35Q+55NiJ8nYum1KdWQXDvAdxo="; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = + fetchurl + { + aarch64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; + hash = "sha256-Tc6lQbMZHX4Wl0R3fGClRr27fFTrYTxMtAkSPCw8mrw="; + }; + x86_64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; + hash = "sha256-c3UHntrLRoXfmz8LL3Xu8mjBtyf952/tYMFqbTyECR0="; + }; + x86_64-linux = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; + hash = "sha256-Aegc4kiLPtY+hlQtfYR3uztqs8Gj9fbUcAZ1XB8i1Pw="; + }; + } + .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - meta = with lib; { + meta = { description = "Open source API development ecosystem"; longDescription = '' Hoppscotch is a lightweight, web-based API development suite. It was built @@ -34,41 +39,56 @@ let ''; homepage = "https://hoppscotch.com"; downloadPage = "https://hoppscotch.com/downloads"; - changelog = "https://hoppscotch.com/changelog"; - license = licenses.mit; - maintainers = with maintainers; [ DataHearth ]; + changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/2024.8.1"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DataHearth ]; mainProgram = "hoppscotch"; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation -{ - inherit pname version src meta; +if stdenv.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - sourceRoot = "."; + sourceRoot = "."; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ undmg ]; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p "$out/Applications" - mv Hoppscotch.app $out/Applications/ + mkdir -p "$out/Applications" + mv Hoppscotch.app $out/Applications/ - runHook postInstall - ''; -} -else appimageTools.wrapType2 { - inherit pname version src meta; - - extraInstallCommands = - let - appimageContents = appimageTools.extractType2 { inherit pname version src; }; - in - '' - # Install .desktop files - install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + runHook postInstall ''; -} + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; + + extraInstallCommands = + let + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + # Install .desktop files + install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + ''; + }