Unverified Commit 1792395c authored by nicoo's avatar nicoo Committed by GitHub
Browse files

Merge #376190: move git-workspace to pkgs/by-name & nixfmt

parents 64497b02 82bc5bbd

pkgs/applications/version-management/git-workspace/default.nix→pkgs/by-name/gi/git-workspace/package.nix

+8 −13
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, rustPlatform

, libiconv

, Security

, pkg-config

, openssl

, nix-update-script

, testers

, git-workspace

{

  lib,

  fetchFromGitHub,

  rustPlatform,

  pkg-config,

  openssl,

  nix-update-script,

}:



rustPlatform.buildRustPackage rec {
@@ -26,8 +22,7 @@ rustPlatform.buildRustPackage rec { 


  nativeBuildInputs = [ pkg-config ];



  buildInputs = [ openssl ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ];

  buildInputs = [ openssl ];



  passthru.updateScript = nix-update-script { };

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -1256,10 +1256,6 @@ with pkgs; 
    pythonPackages = python3Packages;

  };













  git-workspace = callPackage ../applications/version-management/git-workspace {













    inherit (darwin.apple_sdk.frameworks) Security;













  };



























  gitlint = python3Packages.callPackage ../applications/version-management/gitlint { };





























  gitmux = callPackage ../applications/version-management/gitmux { buildGoModule = buildGo122Module; };