From 38349e453ede836792da6091f711736554185f61 Mon Sep 17 00:00:00 2001 From: con-f-use Date: Mon, 14 Dec 2020 19:36:24 +0100 Subject: [PATCH 1/3] docopts: init at 0.6.3-rc2 --- .../tools/misc/docopts/default.nix | 30 +++++++++++++++++++ pkgs/development/tools/misc/docopts/deps.nix | 11 +++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/tools/misc/docopts/default.nix create mode 100644 pkgs/development/tools/misc/docopts/deps.nix diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix new file mode 100644 index 00000000000..ed543c42607 --- /dev/null +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "docopts"; + version = "0.6.3-rc2"; + + src = fetchFromGitHub { + owner = "docopt"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PmsTkPT/sf70MKYLhHvjCDb2o3VQ1k7d++RUW7rcoAg="; + }; + + goPackagePath = "github.com/docopt/${pname}"; + + goDeps = ./deps.nix; + + postInstall = '' + install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh + rm $out/bin/json_t + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/docopt/${pname}"; + description = "docopt CLI tool for shell scripting"; + license = licenses.mit; + maintainers = [ maintainers.confus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/docopts/deps.nix b/pkgs/development/tools/misc/docopts/deps.nix new file mode 100644 index 00000000000..8cc1686de7d --- /dev/null +++ b/pkgs/development/tools/misc/docopts/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt.go"; + rev = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1"; # "0.6.2"; + sha256 = "sha256-0mCKIC5x7aauBL8ahXB9ExMfoTJl55HaafWWWPNRmUI="; + }; + } +] From b5d9be6aa2ccda11b4cc2cec052660b1514eba1d Mon Sep 17 00:00:00 2001 From: con-f-use Date: Sun, 20 Dec 2020 15:50:58 +0100 Subject: [PATCH 2/3] docopts: build only necessary binaries --- pkgs/development/tools/misc/docopts/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix index ed543c42607..98a24ca5ebe 100644 --- a/pkgs/development/tools/misc/docopts/default.nix +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -15,9 +15,10 @@ buildGoPackage rec { goDeps = ./deps.nix; + subPackages = [ "./" ]; + postInstall = '' install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh - rm $out/bin/json_t ''; meta = with stdenv.lib; { From b2a1f176ed17e47f134366cba22cfb950629ff2b Mon Sep 17 00:00:00 2001 From: con-f-use Date: Mon, 21 Dec 2020 21:42:48 +0100 Subject: [PATCH 3/3] docopts: add to all-packages --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 902f5eed7ea..81f57d034b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12725,6 +12725,8 @@ in docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; + docopts = callPackage ../development/tools/misc/docopts { }; + dotconf = callPackage ../development/libraries/dotconf { }; draco = callPackage ../development/libraries/draco { };