From a93d66c9d50b33959fac7e37b030f283efb32681 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 29 Sep 2024 17:00:10 +0800 Subject: [PATCH] garble: move to by-name; nixfmt --- .../default.nix => by-name/ga/garble/package.nix} | 13 +++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 8 deletions(-) rename pkgs/{development/tools/garble/default.nix => by-name/ga/garble/package.nix} (90%) diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/by-name/ga/garble/package.nix similarity index 90% rename from pkgs/development/tools/garble/default.nix rename to pkgs/by-name/ga/garble/package.nix index 0735e283d6db..c469c0e01caf 100644 --- a/pkgs/development/tools/garble/default.nix +++ b/pkgs/by-name/ga/garble/package.nix @@ -1,8 +1,9 @@ -{ stdenv -, buildGoModule -, fetchFromGitHub -, lib -, git +{ + stdenv, + buildGoModule, + fetchFromGitHub, + lib, + git, }: buildGoModule rec { pname = "garble"; @@ -18,7 +19,7 @@ buildGoModule rec { vendorHash = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4="; # Used for some of the tests. - nativeCheckInputs = [git]; + nativeCheckInputs = [ git ]; preBuild = lib.optionalString (!stdenv.hostPlatform.isx86_64) '' # The test assumex amd64 assembly diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f17b22d3023..fcc1a43d9076 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19450,8 +19450,6 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../development/tools/garble { }; - gcab = callPackage ../development/libraries/gcab { }; gcovr = with python3Packages; toPythonApplication gcovr;