diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:14:34 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:14:34 +0200 |
commit | eab41878ac16a80b1189d5e4aeec5e037f6571db (patch) | |
tree | 8bd9dcfadee430fc3f853bfacdd6220bc4e35152 /pkgs/development/tools | |
parent | 11c2b06dd2cf9ea86920ff9bb3939a3f5eb41a27 (diff) | |
parent | afd04a49ed4d03923adf51352ce2bce1fa72455d (diff) | |
download | nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.gz nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.bz2 nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.lz nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.xz nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.tar.zst nixlib-eab41878ac16a80b1189d5e4aeec5e037f6571db.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/cask/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/tools/golangci-lint/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/misc/ctags/wrapped.nix | 14 | ||||
-rw-r--r-- | pkgs/development/tools/misc/elfinfo/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/misc/mkcert/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/skopeo/default.nix | 4 |
6 files changed, 23 insertions, 28 deletions
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 8ec2552aeffb..710503560691 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { pname = "cask"; - version = "0.8.4"; - src = fetchurl { - url = "https://github.com/cask/cask/archive/v${version}.tar.gz"; - sha256 = "02f8bb20b33b23fb11e7d2a1d282519dfdb8b3090b9672448b8c2c2cacd3e478"; - }; + inherit (emacsPackages.melpaStablePackages.cask) src version; doCheck = true; + + nativeBuildInputs = [ emacsPackages.emacs ]; buildInputs = with emacsPackages; [ s f dash ansi ecukes servant ert-runner el-mock noflet ert-async shell-split-string git package-build + ] ++ [ + python ]; + buildPhase = '' emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el ''; @@ -38,11 +39,9 @@ stdenv.mkDerivation rec { Cask can also be used to manage dependencies for your local Emacs configuration. ''; - homepage = https://cask.readthedocs.io/en/latest/index.html; + homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.flexw ]; }; - - nativeBuildInputs = [ emacsPackages.emacs python ]; } diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 7a3d7882715f..b8026a9f8852 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,6 +1,6 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoPackage, fetchFromGitHub, lib }: -buildGoModule rec { +buildGoPackage rec { pname = "golangci-lint"; version = "1.17.1"; goPackagePath = "github.com/golangci/golangci-lint"; @@ -14,8 +14,6 @@ buildGoModule rec { sha256 = "1hs24nimv11c63a90ds8ps1lli16m3apsbrd9vpbq2rmxdbpwqac"; }; - modSha256 = "0k0831rg6ygjffrq5y9488aiacskky7g6bvsfrgfz0g7i0mig1n6"; - meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = https://golangci.com/; diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix index 869e7a61121d..08f8049aa8a1 100644 --- a/pkgs/development/tools/misc/ctags/wrapped.nix +++ b/pkgs/development/tools/misc/ctags/wrapped.nix @@ -27,10 +27,10 @@ with pkgs.stdenv.lib; # don't scan version control directories defaultArgs = [ - "--exclude=\.svn" - "--exclude=\.hg" - "--exclude=\.git" - "--exclude=\_darcs" + "--exclude=.svn" + "--exclude=.hg" + "--exclude=.git" + "--exclude=_darcs" "--sort=yes" ]; @@ -38,8 +38,8 @@ with pkgs.stdenv.lib; asLang = [ "--langdef=ActionScript" "--langmap=ActionScript:.as" - "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/" - "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/" + "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/" + "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/" "--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/" "--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/" "--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/" @@ -67,7 +67,7 @@ with pkgs.stdenv.lib; nixLang = [ "--langdef=NIX" "--langmap=NIX:.nix" - "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/" + "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/" ]; rubyLang = [ diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index cb127906c0bf..b1a51a771448 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "elfinfo"; version = "0.7.6"; @@ -12,8 +12,6 @@ buildGoModule rec { sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9"; }; - modSha256 = "1xr0pylaqcb4f4g862120cgqdxp0bpwsk77zd6g7kk91lqdcvsdf"; - meta = with stdenv.lib; { description = "Small utility for showing information about ELF files"; homepage = https://elfinfo.roboticoverlords.org/; diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 7a3ccaa9fbc4..b9b1f83322d1 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "mkcert"; version = "1.4.0"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xcmvzh5lq8vs3b0f1zw645fxdr8471v7prl1656q02v38f58ly7"; }; - modSha256 = "0an12l15a82mks6gipczdpcf2vklk14wjjnk0ccl3kdjwiw7f4wd"; + goPackagePath = "github.com/FiloSottile/mkcert"; meta = with lib; { homepage = https://github.com/FiloSottile/mkcert; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index e7b21c40f17b..e36f34bb10c4 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let - version = "0.1.37"; + version = "0.1.39"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1ly5yq3aj4ciqn6hbhvxqp1im81pbas9smdhbbks7iwjvh944d62"; + sha256 = "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; |