From 0a310fc3c4b4a35f3e3941f6b35aefe0db2a244b Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Fri, 22 Mar 2024 16:43:45 +0100 Subject: [PATCH 1/7] github-desktop 3.3.6 -> 3.3.10 --- .../version-management/github-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index b16befcd080d..d5c46cf29e48 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "github-desktop"; - version = "3.3.6"; - rcversion = "3"; + version = "3.3.10"; + rcversion = "1"; arch = "amd64"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux${finalAttrs.rcversion}/GitHubDesktop-linux-${finalAttrs.arch}-${finalAttrs.version}-linux${finalAttrs.rcversion}.deb"; - hash = "sha256-900JhfHN78CuAXptPX2ToTvT9E+g+xRXqmlm34J9l6k="; + hash = "sha256-zzq6p/DAQmgSw4KAUYqtrQKkIPksLzkUQjGzwO26WgQ="; }; nativeBuildInputs = [ From 6163c182cfe1baf3c223ea4f29db8df116796aae Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 1 Apr 2024 12:21:33 +0200 Subject: [PATCH 2/7] github-desktop: add missing phase hooks --- .../version-management/github-desktop/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index d5c46cf29e48..3df312d5a94f 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -52,16 +52,20 @@ stdenv.mkDerivation (finalAttrs: { ]; unpackPhase = '' + runHook preUnpack mkdir -p $TMP/${finalAttrs.pname} $out/{opt,bin} cp $src $TMP/${finalAttrs.pname}.deb ar vx ${finalAttrs.pname}.deb tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${finalAttrs.pname}/ + runHook postUnpack ''; installPhase = '' + runHook preInstall cp -R $TMP/${finalAttrs.pname}/usr/share $out/ cp -R $TMP/${finalAttrs.pname}/usr/lib/${finalAttrs.pname}/* $out/opt/ ln -sf $out/opt/${finalAttrs.pname} $out/bin/${finalAttrs.pname} + runHook postInstall ''; preFixup = '' From 9320e86e1a81ac48953d4c63b03c50ab6ebba9d1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 1 Apr 2024 13:03:40 +0200 Subject: [PATCH 3/7] github-desktop: use `stdenvNoCC` --- .../version-management/github-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 3df312d5a94f..854c56f8a2d7 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenvNoCC , lib , fetchurl , autoPatchelfHook @@ -19,7 +19,7 @@ , openssl }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "github-desktop"; version = "3.3.10"; rcversion = "1"; From f438a28dc598db30aa8853e541efb6bc296abfbd Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 1 Apr 2024 13:04:32 +0200 Subject: [PATCH 4/7] github-desktop: sort `meta` attributes --- .../version-management/github-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 854c56f8a2d7..e6d7abf3a58b 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -81,10 +81,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "GUI for managing Git and GitHub."; homepage = "https://desktop.github.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mit; + mainProgram = "github-desktop"; maintainers = with lib.maintainers; [ dan4ik605743 ]; platforms = lib.platforms.linux; - mainProgram = "github-desktop"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) From 5e504176f3f7c5bf5a07bfcd2eb3785677f59874 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 1 Apr 2024 13:05:03 +0200 Subject: [PATCH 5/7] github-desktop: avoid reusing `pname` everywhere --- .../github-desktop/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index e6d7abf3a58b..b5799ae66607 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -19,14 +19,16 @@ , openssl }: +let + rcversion = "1"; + arch = "amd64"; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "github-desktop"; version = "3.3.10"; - rcversion = "1"; - arch = "amd64"; src = fetchurl { - url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux${finalAttrs.rcversion}/GitHubDesktop-linux-${finalAttrs.arch}-${finalAttrs.version}-linux${finalAttrs.rcversion}.deb"; + url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux${rcversion}/GitHubDesktop-linux-${arch}-${finalAttrs.version}-linux${rcversion}.deb"; hash = "sha256-zzq6p/DAQmgSw4KAUYqtrQKkIPksLzkUQjGzwO26WgQ="; }; @@ -53,18 +55,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { unpackPhase = '' runHook preUnpack - mkdir -p $TMP/${finalAttrs.pname} $out/{opt,bin} - cp $src $TMP/${finalAttrs.pname}.deb - ar vx ${finalAttrs.pname}.deb - tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${finalAttrs.pname}/ + mkdir -p $TMP/github-desktop $out/{opt,bin} + cp $src $TMP/github-desktop.deb + ar vx github-desktop.deb + tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/github-desktop/ runHook postUnpack ''; installPhase = '' runHook preInstall - cp -R $TMP/${finalAttrs.pname}/usr/share $out/ - cp -R $TMP/${finalAttrs.pname}/usr/lib/${finalAttrs.pname}/* $out/opt/ - ln -sf $out/opt/${finalAttrs.pname} $out/bin/${finalAttrs.pname} + cp -R $TMP/github-desktop/usr/share $out/ + cp -R $TMP/github-desktop/usr/lib/github-desktop/* $out/opt/ + ln -sf $out/opt/github-desktop $out/bin/github-desktop runHook postInstall ''; From 9b12db21dcbce131d181e70605f8a827278103a1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 1 Apr 2024 13:05:48 +0200 Subject: [PATCH 6/7] github-desktop: move to `pkgs/by-name` --- .../default.nix => by-name/gi/github-desktop/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/github-desktop/default.nix => by-name/gi/github-desktop/package.nix} (100%) diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/by-name/gi/github-desktop/package.nix similarity index 100% rename from pkgs/applications/version-management/github-desktop/default.nix rename to pkgs/by-name/gi/github-desktop/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20a9726b6882..462402c82426 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3874,8 +3874,6 @@ with pkgs; github-copilot-intellij-agent = callPackage ../development/tools/github-copilot-intellij-agent { }; - github-desktop = callPackage ../applications/version-management/github-desktop { }; - github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite; gistyc = with python3Packages; toPythonApplication gistyc; From 731678dab4f29d87bb7b1d8f8ca5cb0422759fae Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 1 Apr 2024 13:32:34 +0200 Subject: [PATCH 7/7] github-desktop: 3.3.10 -> 3.3.12 Now support `aarch64` and `x86_64` archs --- pkgs/by-name/gi/github-desktop/package.nix | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index b5799ae66607..7ada2ddb663b 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -20,17 +20,26 @@ }: let - rcversion = "1"; - arch = "amd64"; + rcversion = "2"; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "github-desktop"; - version = "3.3.10"; + version = "3.3.12"; - src = fetchurl { - url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux${rcversion}/GitHubDesktop-linux-${arch}-${finalAttrs.version}-linux${rcversion}.deb"; - hash = "sha256-zzq6p/DAQmgSw4KAUYqtrQKkIPksLzkUQjGzwO26WgQ="; - }; + src = + let + urls = { + "x86_64-linux" = { + url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux${rcversion}/GitHubDesktop-linux-amd64-${finalAttrs.version}-linux${rcversion}.deb"; + hash = "sha256-iflKD7NPuZvhxviNW8xmtCOYgdRz1rXiG42ycWCjXiY="; + }; + "aarch64-linux" = { + url = "https://github.com/shiftkey/desktop/releases/download/release-${finalAttrs.version}-linux${rcversion}/GitHubDesktop-linux-arm64-${finalAttrs.version}-linux${rcversion}.deb"; + hash = "sha256-C9eCvuf/TwXQiYjZ88xSiyaqi8+cppmrLiSYTyQCkmg="; + }; + }; + in + fetchurl urls."${stdenvNoCC.hostPlatform.system}" or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); nativeBuildInputs = [ autoPatchelfHook