From be797d6f58393f32f24d108b6cbaf78d8d34b926 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sun, 31 Dec 2023 11:48:13 +0100 Subject: [PATCH 1/2] fac: 2.0.0 -> unstable-2023-12-29 --- pkgs/development/tools/fac/default.nix | 31 ++++++------ pkgs/development/tools/fac/deps.nix | 66 -------------------------- 2 files changed, 17 insertions(+), 80 deletions(-) delete mode 100644 pkgs/development/tools/fac/deps.nix diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index c50fd834e031..36dce35b995f 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -1,19 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, git }: +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, git +}: -buildGoPackage rec { +buildGoModule rec { pname = "fac"; - version = "2.0.0"; - - goPackagePath = "github.com/mkchoi212/fac"; + version = "unstable-2023-12-29"; src = fetchFromGitHub { owner = "mkchoi212"; repo = "fac"; - rev = "v${version}"; - sha256 = "054bbiw0slz9szy3ap2sh5dy97w3g7ms27rd3ww3i1zdhvnggwpc"; + rev = "d232b05149564701ca3a21cd1a07be2540266cb2"; + hash = "sha256-puSHbrzxTUebK1qRdWh71jY/f7TKgONS45T7PcZcy00="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-bmGRVTjleAFS5GGf2i/zN8k3SBtaEc3RbKSVZyF6eN4="; nativeBuildInputs = [ makeWrapper ]; @@ -22,14 +25,14 @@ buildGoPackage rec { --prefix PATH : ${git}/bin # Install man page, not installed by default - install -D go/src/${goPackagePath}/assets/doc/fac.1 $out/share/man/man1/fac.1 + install -D assets/doc/fac.1 $out/share/man/man1/fac.1 ''; - meta = with lib; { + meta = { description = "CUI for fixing git conflicts"; - inherit (src.meta) homepage; - license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + homepage = "https://github.com/mkchoi212/fac"; + changelog = "https://github.com/mkchoi212/fac/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dtzWill ]; }; } - diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix deleted file mode 100644 index 8545bae7e22d..000000000000 --- a/pkgs/development/tools/fac/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/alecthomas/chroma"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/chroma"; - rev = "0c0b382eca61a71c1eb4cb4dea2bc78aa4939d96"; - sha256 = "0chpzs542s366vv01bfhrajdrbhmrvc3gi8jhpw3xgz6wfkivcp4"; - }; - } - { - goPackagePath = "github.com/danwakefield/fnmatch"; - fetch = { - type = "git"; - url = "https://github.com/danwakefield/fnmatch"; - rev = "cbb64ac3d964b81592e64f957ad53df015803288"; - sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; - }; - } - { - goPackagePath = "github.com/dlclark/regexp2"; - fetch = { - type = "git"; - url = "https://github.com/dlclark/regexp2"; - rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1"; - sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2"; - }; - } - { - goPackagePath = "github.com/jroimartin/gocui"; - fetch = { - type = "git"; - url = "https://github.com/jroimartin/gocui"; - rev = "c055c87ae801372cd74a0839b972db4f7697ae5f"; - sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; - sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] From b47e7bf35c9d363687a7830777bee9261793b434 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sun, 31 Dec 2023 11:50:00 +0100 Subject: [PATCH 2/2] fac: move to by-name --- .../default.nix => by-name/fa/fac/package.nix} | 17 +++++++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 11 insertions(+), 8 deletions(-) rename pkgs/{development/tools/fac/default.nix => by-name/fa/fac/package.nix} (73%) diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/by-name/fa/fac/package.nix similarity index 73% rename from pkgs/development/tools/fac/default.nix rename to pkgs/by-name/fa/fac/package.nix index 36dce35b995f..e7b09e73b355 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/by-name/fa/fac/package.nix @@ -1,13 +1,14 @@ { lib , buildGoModule , fetchFromGitHub -, makeWrapper +, makeBinaryWrapper +, installShellFiles , git }: buildGoModule rec { pname = "fac"; - version = "unstable-2023-12-29"; + version = "2.0.0-unstable-2023-12-29"; src = fetchFromGitHub { owner = "mkchoi212"; @@ -18,21 +19,25 @@ buildGoModule rec { vendorHash = "sha256-bmGRVTjleAFS5GGf2i/zN8k3SBtaEc3RbKSVZyF6eN4="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + installShellFiles + ]; postInstall = '' wrapProgram $out/bin/fac \ - --prefix PATH : ${git}/bin + --prefix PATH : ${lib.makeBinPath [ git ]} # Install man page, not installed by default - install -D assets/doc/fac.1 $out/share/man/man1/fac.1 + installManPage assets/doc/fac.1 ''; meta = { + changelog = "https://github.com/mkchoi212/fac/releases/tag/v${version}"; description = "CUI for fixing git conflicts"; homepage = "https://github.com/mkchoi212/fac"; - changelog = "https://github.com/mkchoi212/fac/releases/tag/v${version}"; license = lib.licenses.mit; + mainProgram = "fac"; maintainers = with lib.maintainers; [ dtzWill ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 056bada2b343..f0bf65dbfb16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5349,8 +5349,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; - fac = callPackage ../development/tools/fac { }; - facedetect = callPackage ../tools/graphics/facedetect { }; facter = callPackage ../tools/system/facter { };