diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/by-name/ge/gex/package.nix similarity index 64% rename from pkgs/applications/version-management/gex/default.nix rename to pkgs/by-name/ge/gex/package.nix index 51a8839261af..50336ec56021 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/by-name/ge/gex/package.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, Security +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + darwin, }: rustPlatform.buildRustPackage rec { @@ -13,18 +14,20 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Piturnah"; - repo = pname; + repo = "gex"; rev = "v${version}"; hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libgit2 - ] ++ lib.optionals stdenv.isDarwin [ - Security - ]; + buildInputs = + [ + libgit2 + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # force the libgit2-sys crate to use the system libgit2 library LIBGIT2_NO_VENDOR = 1; @@ -35,8 +38,15 @@ rustPlatform.buildRustPackage rec { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; homepage = "https://github.com/Piturnah/gex"; changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ azd325 evanrichter piturnah ]; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ + azd325 + evanrichter + piturnah + ]; mainProgram = "gex"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2cab3581603..8eb55c3fc4d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2161,10 +2161,6 @@ with pkgs; forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; - gex = callPackage ../applications/version-management/gex { - inherit (darwin.apple_sdk.frameworks) Security; - }; - gfold = callPackage ../applications/version-management/gfold { inherit (darwin.apple_sdk.frameworks) Security; };