public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
Hydra nixpkgs: ?compare=1279790
This commit is contained in:
Vladimír Čunát
2016-06-19 12:33:04 +02:00
parent a02e5ad926 410aad942f
commit e757404555
614 changed files with 55697 additions and 27124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/development/tools/build-managers/cargo/common.nix
View File

@@ -1,38 +0,0 @@
{stdenv, version, rustc}:
{
inherit version;
name = "cargo-${version}";
postInstall = ''
rm "$out/lib/rustlib/components" \
"$out/lib/rustlib/install.log" \
"$out/lib/rustlib/rust-installer-version" \
"$out/lib/rustlib/uninstall.sh" \
"$out/lib/rustlib/manifest-cargo"
wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin" \
${stdenv.lib.optionalString stdenv.isDarwin ''--suffix DYLD_LIBRARY_PATH : "${rustc}/lib"''}
'';
platform = if stdenv.system == "i686-linux"
then "i686-unknown-linux-gnu"
else if stdenv.system == "x86_64-linux"
then "x86_64-unknown-linux-gnu"
else if stdenv.system == "i686-darwin"
then "i686-apple-darwin"
else if stdenv.system == "x86_64-darwin"
then "x86_64-apple-darwin"
else throw "no snapshot to bootstrap for this platform (missing platform url suffix)";
passthru.rustc = rustc;
meta = with stdenv.lib; {
homepage = http://crates.io;
description = "Downloads your Rust project's dependencies and builds your project";
maintainers = with maintainers; [ wizeman retrry ];
license = [ licenses.mit licenses.asl20 ];
platforms = platforms.linux ++ platforms.darwin;
};
}

49
pkgs/development/tools/build-managers/cargo/default.nix
View File

@@ -1,49 +0,0 @@
{ stdenv, lib, cacert, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
, cmake, zlib, makeWrapper
# Darwin dependencies
, libiconv }:
with rustPlatform;
with ((import ./common.nix) {
inherit stdenv rustc;
version = "0.10.0";
});
buildRustPackage rec {
inherit name version meta passthru;
# Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
src = fetchgit {
url = "git://github.com/rust-lang/cargo";
rev = "refs/tags/${version}";
sha256 = "06scvx5qh60mgvlpvri9ig4np2fsnicsfd452fi9w983dkxnz4l2";
};
depsSha256 = "0js4697n7v93wnqnpvamhp446w58llj66za5hkd6wannmc0gsy3b";
buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ]
++ lib.optional stdenv.isDarwin libiconv;
configurePhase = ''
./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo
'';
buildPhase = "make";
checkPhase = ''
# Export SSL_CERT_FILE as without it one test fails with SSL verification error
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
# Disable cross compilation tests
export CFG_DISABLE_CROSS_TESTS=1
cargo test
'';
# Disable check phase as there are failures (author_prefers_cargo test fails)
doCheck = false;
installPhase = ''
make install
${postInstall}
'';
}

39
pkgs/development/tools/build-managers/cargo/head.nix
View File

@@ -1,39 +0,0 @@
{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
, cmake, zlib, makeWrapper }:
with rustPlatform;
with ((import ./common.nix) {
inherit stdenv rustc;
version = "2016-03-20";
});
buildRustPackage rec {
inherit name version meta passthru;
# Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
src = fetchgit {
url = "git://github.com/rust-lang/cargo";
rev = "7d79da08238e3d47e0bc4406155bdcc45ccb8c82";
sha256 = "190qdii53s4vk940yzs2iizhfs22y2v8bzw051bl6bk9bs3y4fdd";
};
depsSha256 = "1xbb33aqnf5yyws6gjys9w8kznbh9rh6hw8mpg1hhq1ahipc2j1f";
buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
configurePhase = ''
./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo
'';
buildPhase = "make";
# Disable check phase as there are lots of failures (some probably due to
# trying to access the network).
doCheck = false;
installPhase = ''
make install
${postInstall}
'';
}

55
pkgs/development/tools/build-managers/cargo/snapshot.nix
View File

@@ -1,55 +0,0 @@
{ stdenv, fetchurl, zlib, makeWrapper, rustc }:
/* Cargo binary snapshot */
let snapshotDate = "2016-01-31";
in
with ((import ./common.nix) {
inherit stdenv rustc;
version = "snapshot-${snapshotDate}";
});
let snapshotHash = if stdenv.system == "i686-linux"
then "7e2f9c82e1af5aa43ef3ee2692b985a5f2398f0a"
else if stdenv.system == "x86_64-linux"
then "4c03a3fd2474133c7ad6d8bb5f6af9915ca5292a"
else if stdenv.system == "i686-darwin"
then "4d84d31449a5926f9e7ceb344540d6e5ea530b88"
else if stdenv.system == "x86_64-darwin"
then "f8baef5b0b3e6f9825be1f1709594695ac0f0abc"
else throw "no snapshot for platform ${stdenv.system}";
snapshotName = "cargo-nightly-${platform}.tar.gz";
in
stdenv.mkDerivation {
inherit name version meta passthru;
src = fetchurl {
url = "https://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${snapshotDate}/${snapshotName}";
sha1 = snapshotHash;
};
buildInputs = [ makeWrapper ];
dontStrip = true;
__propagatedImpureHostDeps = [
"/usr/lib/libiconv.2.dylib"
"/usr/lib/libssl.0.9.8.dylib"
"/usr/lib/libcurl.4.dylib"
"/System/Library/Frameworks/GSS.framework/GSS"
"/System/Library/Frameworks/GSS.framework/Versions/Current"
"/System/Library/PrivateFrameworks/Heimdal.framework/Heimdal"
"/System/Library/PrivateFrameworks/Heimdal.framework/Versions/Current"
];
installPhase = ''
mkdir -p "$out"
./install.sh "--prefix=$out"
'' + (if stdenv.isLinux then ''
patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
--set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/:${zlib.out}/lib" \
"$out/bin/cargo"
'' else "") + postInstall;
}

56
pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
View File

@@ -26,6 +26,7 @@
-record(data, {version
, registry_only = false
, debug_info = false
, compile_ports
, erl_libs
, plugins
@@ -54,21 +55,29 @@ do_the_bootstrap(RequiredData) ->
%% @doc
%% Argument parsing is super simple only because we want to keep the
%% dependencies minimal. For now there can be two entries on the
%% command line, "registery-only"
%% command line, "registery-only" and "debug-info"
-spec parse_args([string()]) -> #data{}.
parse_args(["registry-only"]) ->
{ok, #data{registry_only = true}};
parse_args([]) ->
{ok, #data{registry_only = false}};
parse_args(Args) ->
io:format("Unexpected command line arguments passed in: ~p~n", [Args]),
erlang:halt(120).
parse_args(Args0) ->
PossibleArgs = sets:from_list(["registry-only", "debug-info"]),
Args1 = sets:from_list(Args0),
Result = sets:subtract(Args1, PossibleArgs),
case sets:to_list(Result) of
[] ->
{ok, #data{registry_only = sets:is_element("registry-only", Args1),
debug_info = sets:is_element("debug-info", Args1)}};
UnknownArgs ->
io:format("Unexpected command line arguments passed in: ~p~n",
[UnknownArgs]),
erlang:halt(120)
end.
-spec bootstrap_configs(#data{}) -> ok.
bootstrap_configs(RequiredData)->
io:format("Boostrapping app and rebar configurations~n"),
ok = if_single_app_project_update_app_src_version(RequiredData),
ok = if_compile_ports_add_pc_plugin(RequiredData).
ok = if_compile_ports_add_pc_plugin(RequiredData),
ok = if_debug_info_add(RequiredData).
-spec bootstrap_plugins(#data{}) -> ok.
bootstrap_plugins(#data{plugins = Plugins}) ->
@@ -198,6 +207,33 @@ guard_env(Name) ->
Variable
end.
%% @doc
%% If debug info is set we need to add debug info to the list of compile options
%%
-spec if_debug_info_add(#data{}) -> ok.
if_debug_info_add(#data{debug_info = true}) ->
ConfigTerms = add_debug_info(read_rebar_config()),
Text = lists:map(fun(Term) -> io_lib:format("~tp.~n", [Term]) end,
ConfigTerms),
file:write_file("rebar.config", Text);
if_debug_info_add(_) ->
ok.
-spec add_debug_info([term()]) -> [term()].
add_debug_info(Config) ->
ExistingOpts = case lists:keysearch(erl_opts, 1, Config) of
{value, {erl_opts, ExistingOptsList}} -> ExistingOptsList;
_ -> []
end,
case lists:member(debug_info, ExistingOpts) of
true ->
Config;
false ->
lists:keystore(erl_opts, 1, Config,
{erl_opts, [debug_info | ExistingOpts]})
end.
%% @doc
%% If the compile ports flag is set, rewrite the rebar config to
%% include the 'pc' plugin.
@@ -213,7 +249,7 @@ if_compile_ports_add_pc_plugin(_) ->
-spec add_pc_to_plugins([term()]) -> [term()].
add_pc_to_plugins(Config) ->
PluginList = case lists:keysearch(plugins, 1, Config) of
{ok, {plugins, ExistingPluginList}} -> ExistingPluginList;
{value, {plugins, ExistingPluginList}} -> ExistingPluginList;
_ -> []
end,
lists:keystore(plugins, 1, Config, {plugins, [pc | PluginList]}).

23
pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
View File

@@ -1,23 +0,0 @@
{stdenv, writeText, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "hex-registry";
rev = "329ae2b";
version = "0.0.0+build.${rev}";
src = fetchFromGitHub {
owner = "erlang-nix";
repo = "hex-pm-registry-snapshots";
inherit rev;
sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh";
};
installPhase = ''
mkdir -p "$out/var/hex"
zcat "registry.ets.gz" > "$out/var/hex/registry.ets"
'';
setupHook = writeText "setupHook.sh" ''
export HEX_REGISTRY_SNAPSHOT="$1/var/hex/registry.ets"
'';
}

43
pkgs/development/tools/continuous-integration/buildkite-agent/default.nix Normal file
View File

@@ -0,0 +1,43 @@
{ stdenv, fetchurl, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
stdenv.mkDerivation rec {
version = "2.1.13";
name = "buildkite-agent-${version}";
dontBuild = true;
src = fetchurl {
url = "https://github.com/buildkite/agent/releases/download/v${version}/buildkite-agent-linux-386-${version}.tar.gz";
sha256 = "bd40c2ba37b3b54b875241a32b62190a4cf4c15e2513c573f1626a3ca35c8657";
};
nativeBuildInputs = [ makeWrapper ];
sourceRoot = ".";
installPhase = ''
install -Dt "$out/bin/" buildkite-agent
mkdir -p $out/share
mv hooks bootstrap.sh $out/share/
'';
postFixup = ''
substituteInPlace $out/share/bootstrap.sh \
--replace "#!/bin/bash" "#!$(type -P bash)"
wrapProgram $out/bin/buildkite-agent \
--set PATH '"${openssh}/bin/:${git}/bin:${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:$PATH"'
'';
meta = {
description = "Build runner for buildkite.com";
longDescription = ''
The buildkite-agent is a small, reliable, and cross-platform build runner
that makes it easy to run automated builds on your own infrastructure.
It’s main responsibilities are polling buildkite.com for work, running
build jobs, reporting back the status code and output log of the job,
and uploading the job's artifacts.
'';
homepage = https://buildkite.com/docs/agent;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.pawelpacana ];
platforms = stdenv.lib.platforms.linux;
};
}

25
pkgs/development/tools/deis/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "deis-${version}";
version = "1.13.0";
rev = "v${version}";
goPackagePath = "github.com/deis/deis";
subPackages = [ "client" ];
postInstall = ''
if [ -f "$bin/bin/client" ]; then
mv "$bin/bin/client" "$bin/bin/deis"
fi
'';
src = fetchFromGitHub {
inherit rev;
owner = "deis";
repo = "deis";
sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw";
};
goDeps = ./deps.json;
}

10
pkgs/development/tools/deis/deps.json Normal file
View File

@@ -0,0 +1,10 @@
[
{
"include": "../../../go-modules/libs.json",
"packages": [
"github.com/docopt/docopt-go",
"golang.org/x/crypto",
"gopkg.in/yaml.v2"
]
}
]

15
pkgs/development/tools/electron/default.nix
View File

@@ -1,16 +1,16 @@
{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv }:
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
stdenv.mkDerivation rec {
name = "electron-${version}";
version = "0.36.2";
version = "1.2.2";
src = fetchurl {
url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
sha256 = "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d";
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
name = "${name}.zip";
};
buildInputs = [ unzip ];
buildInputs = [ unzip makeWrapper ];
buildCommand = ''
mkdir -p $out/lib/electron $out/bin
@@ -23,11 +23,14 @@ stdenv.mkDerivation rec {
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:$out/lib/electron" \
$out/lib/electron/electron
wrapProgram $out/lib/electron/electron \
--prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
'';
meta = with stdenv.lib; {
description = "Cross platform desktop application shell";
homepage = https://github.com/atom/electron;
homepage = https://github.com/electron/electron;
license = licenses.mit;
maintainers = [ maintainers.travisbhartwell ];
platforms = [ "x86_64-linux" ];

16
pkgs/development/tools/glide/default.nix Normal file
View File

@@ -0,0 +1,16 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "glide-${version}";
version = "0.10.2";
rev = "${version}";
goPackagePath = "github.com/Masterminds/glide";
src = fetchFromGitHub {
inherit rev;
owner = "Masterminds";
repo = "glide";
sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl";
};
}

25
pkgs/development/tools/go-bindata/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "go-bindata-${version}";
version = "20151023-${stdenv.lib.strings.substring 0 7 rev}";
rev = "a0ff2567cfb70903282db057e799fd826784d41d";
goPackagePath = "github.com/jteeuwen/go-bindata";
src = fetchgit {
inherit rev;
url = "https://github.com/jteeuwen/go-bindata";
sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v";
};
excludedPackages = "testdata";
meta = with stdenv.lib; {
homepage = "https://github.com/jteeuwen/go-bindata";
description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program";
maintainers = with maintainers; [ cstrahan ];
license = licenses.cc0 ;
platforms = platforms.all;
};
}

17
pkgs/development/tools/go-repo-root/default.nix Normal file
View File

@@ -0,0 +1,17 @@
{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "go-repo-root-${version}";
version = "20140911-${stdenv.lib.strings.substring 0 7 rev}";
rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
goPackagePath = "github.com/cstrahan/go-repo-root";
src = fetchgit {
inherit rev;
url = "https://github.com/cstrahan/go-repo-root";
sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
};
buildInputs = [ gotools ];
}

30
pkgs/development/tools/go2nix/default.nix Normal file
View File

@@ -0,0 +1,30 @@
{ stdenv, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper,
fetchFromGitHub }:
buildGoPackage rec {
name = "go2nix-${version}";
version = "0.1.0";
rev = "v${version}";
goPackagePath = "github.com/kamilchm/go2nix";
src = fetchFromGitHub {
inherit rev;
owner = "kamilchm";
repo = "go2nix";
sha256 = "10nz7gva3n6wk01wphrjjb31sy33kf9ji03zr849x21a669fnmjf";
};
goDeps = ./deps.json;
buildInputs = [ go-bindata goimports makeWrapper ];
preBuild = ''go generate ./...'';
postInstall = ''
wrapProgram $bin/bin/go2nix \
--prefix PATH : ${nix-prefetch-git}/bin \
--prefix PATH : ${git}/bin
'';
allowGoReference = true;
}

9
pkgs/development/tools/go2nix/deps.json Normal file
View File

@@ -0,0 +1,9 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/Masterminds/vcs",
"github.com/jawher/mow.cli"
]
}
]

15
pkgs/development/tools/gocode/default.nix Normal file
View File

@@ -0,0 +1,15 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "gocode-${version}";
version = "20150904-${stdenv.lib.strings.substring 0 7 rev}";
rev = "680a0fbae5119fb0dbea5dca1d89e02747a80de0";
goPackagePath = "github.com/nsf/gocode";
src = fetchgit {
inherit rev;
url = "https://github.com/nsf/gocode";
sha256 = "1ay2xakz4bcn8r3ylicbj753gjljvv4cj9l4wfly55cj1vjybjpv";
};
}

6
pkgs/development/tools/godep/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "ddd7fbf";
version = "73";
name = "godep-${version}";
src = import ./deps.nix {
inherit stdenv lib fetchgit fetchFromGitHub;
inherit stdenv lib fetchgit;
};
buildInputs = [ go ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "Ddependency tool for go";
description = "Dependency tool for go";
homepage = https://github.com/tools/godep;
license = licenses.bsd3;
maintainers = with maintainers; [ offline ];

34
pkgs/development/tools/godep/deps.nix
View File

@@ -1,5 +1,5 @@
# This file was generated by go2nix.
{ stdenv, lib, fetchFromGitHub, fetchgit }:
{ stdenv, lib, fetchgit }:
let
goDeps = [
@@ -15,32 +15,40 @@ let
root = "github.com/tools/godep";
src = fetchgit {
url = "https://github.com/tools/godep.git";
rev = "0baa7ea464025b2cb8e84b13c5ac4da99237a1bf";
sha256 = "10hr10fj6ymmfzwjg5drf7j0f4mrpb4p97a01rqp7xvfv5j0zisj";
rev = "f4edf338389e6e2bde0e8307886718133dc0613e";
sha256 = "1jdza8kwnzdsh3layqjzy9dnr92xdg3kfhnzvqkq3p50vsdims9w";
};
}
{
root = "golang.org/x/net";
root = "github.com/kr/pretty";
src = fetchgit {
url = "https://go.googlesource.com/net";
rev = "8b2d0ae1f4c3b83c10ff17e89a89ff04cc0903c3";
sha256 = "0nxawxhq7yysbrrd88hkqzfr5hvsqpd452yzi53cp1afzma3zjay";
url = "https://github.com/kr/pretty";
rev = "f31442d60e51465c69811e2107ae978868dbea5c";
sha256 = "12nczwymikxmivb10q5ml5yxrwpz9s8p6k4vqig9g9707yhpxrkh";
};
}
{
root = "golang.org/x/text";
root = "github.com/kr/text";
src = fetchgit {
url = "https://go.googlesource.com/text";
rev = "bfad311ce93436dc888b40d76c78f99dc3104473";
sha256 = "1mbhp5q24drz2l2x6ib3180i42f9015ry80bn7jhr7rwizvyp6lh";
url = "https://github.com/kr/text";
rev = "6807e777504f54ad073ecef66747de158294b639";
sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698";
};
}
{
root = "github.com/pmezard/go-difflib";
src = fetchgit {
url = "https://github.com/pmezard/go-difflib";
rev = "f78a839676152fd9f4863704f5d516195c18fc14";
sha256 = "1bws3qyy572b62i3wkwfr1aw1g2nwcim2sy42jqsvh9pajjsf1vz";
};
}
{
root = "golang.org/x/tools";
src = fetchgit {
url = "https://go.googlesource.com/tools";
rev = "3ecc311976cc3f7c7b7a50314929bdc1b07c4c9d";
sha256 = "0ic3lrg6ykxrlnzcway4ka280n052qysjawf4lvj8gl3r1vlmwfg";
rev = "1f1b3322f67af76803c942fd237291538ec68262";
sha256 = "0h2yarcvcgg1px20r8n58psra1czv0sgly5gins2q3wp25iql6gj";
};
}
];

16
pkgs/development/tools/goimports/default.nix Normal file
View File

@@ -0,0 +1,16 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "goimports-${version}";
version = "20160519-${stdenv.lib.strings.substring 0 7 rev}";
rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
goPackagePath = "golang.org/x/tools";
subPackages = [ "cmd/goimports" ];
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/tools";
sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
};
}

18
pkgs/development/tools/golint/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "lint-${version}";
version = "20160428-${stdenv.lib.strings.substring 0 7 rev}";
rev = "c7bacac2b21ca01afa1dee0acf64df3ce047c28f";
goPackagePath = "github.com/golang/lint";
excludedPackages = "testdata";
src = fetchgit {
inherit rev;
url = "https://github.com/golang/lint";
sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg";
};
goDeps = ./deps.json;
}

8
pkgs/development/tools/golint/deps.json Normal file
View File

@@ -0,0 +1,8 @@
[
{
"include": "../../libs.json",
"packages": [
"golang.org/x/tools"
]
}
]

15
pkgs/development/tools/gotags/default.nix Normal file
View File

@@ -0,0 +1,15 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "gotags-${version}";
version = "20150803-${stdenv.lib.strings.substring 0 7 rev}";
rev = "be986a34e20634775ac73e11a5b55916085c48e7";
goPackagePath = "github.com/jstemmer/gotags";
src = fetchgit {
inherit rev;
url = "https://github.com/jstemmer/gotags";
sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja";
};
}

44
pkgs/development/tools/gotools/default.nix Normal file
View File

@@ -0,0 +1,44 @@
{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "gotools-${version}";
version = "20160519-${stdenv.lib.strings.substring 0 7 rev}";
rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc";
goPackagePath = "golang.org/x/tools";
goPackageAliases = [ "code.google.com/p/go.tools" ];
src = fetchgit {
inherit rev;
url = "https://go.googlesource.com/tools";
sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
};
goDeps = ./deps.json;
preConfigure = ''
# Make the builtin tools available here
mkdir -p $bin/bin
eval $(go env | grep GOTOOLDIR)
find $GOTOOLDIR -type f | while read x; do
ln -sv "$x" "$bin/bin"
done
export GOTOOLDIR=$bin/bin
'';
excludedPackages = "\\("
+ stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
+ "\\)";
# Do not copy this without a good reason for enabling
# In this case tools is heavily coupled with go itself and embeds paths.
allowGoReference = true;
# Set GOTOOLDIR for derivations adding this to buildInputs
postInstall = ''
mkdir -p $bin/nix-support
substituteAll ${../../go-modules/tools/setup-hook.sh} $bin/nix-support/setup-hook.tmp
cat $bin/nix-support/setup-hook.tmp >> $bin/nix-support/setup-hook
rm $bin/nix-support/setup-hook.tmp
'';
}

8
pkgs/development/tools/gotools/deps.json Normal file
View File

@@ -0,0 +1,8 @@
[
{
"include": "../../libs.json",
"packages": [
"golang.org/x/net"
]
}
]

17
pkgs/development/tools/govers/default.nix Normal file
View File

@@ -0,0 +1,17 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "govers-${version}";
version = "20150109-${stdenv.lib.strings.substring 0 7 rev}";
rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
goPackagePath = "github.com/rogpeppe/govers";
src = fetchgit {
inherit rev;
url = "https://github.com/rogpeppe/govers";
sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc";
};
dontRenameImports = true;
}

18
pkgs/development/tools/gox/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "gox-${version}";
version = "20140904-${stdenv.lib.strings.substring 0 7 rev}";
rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549";
goPackagePath = "github.com/mitchellh/gox";
src = fetchgit {
inherit rev;
url = "https://github.com/mitchellh/gox";
sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1";
};
goDeps = ./deps.json;
}

8
pkgs/development/tools/gox/deps.json Normal file
View File

@@ -0,0 +1,8 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/mitchellh/iochan"
]
}
]

4
pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
View File

@@ -6,12 +6,12 @@
mkDerivation rec {
pname = "cabal2nix";
version = "20160406";
version = "20160613";
src = fetchFromGitHub {
owner = "nixos";
repo = "cabal2nix";
rev = "v${version}";
sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6";
sha256 = "0cnc037qsmwwddws138z7w1aww0l9z5bg89dgh4vfxck29z84is9";
};
postUnpack = "sourceRoot+=/${pname}";
isLibrary = false;

4
pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
View File

@@ -11,8 +11,8 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "nixos";
repo = "cabal2nix";
rev = "v20160406";
sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6";
rev = "v20160613";
sha256 = "0cnc037qsmwwddws138z7w1aww0l9z5bg89dgh4vfxck29z84is9";
};
postUnpack = "sourceRoot+=/${pname}";
libraryHaskellDepends = [

4
pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
View File

@@ -7,12 +7,12 @@
mkDerivation rec {
pname = "hackage2nix";
version = "20160406";
version = "20160613";
src = fetchFromGitHub {
owner = "nixos";
repo = "cabal2nix";
rev = "v${version}";
sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6";
sha256 = "0cnc037qsmwwddws138z7w1aww0l9z5bg89dgh4vfxck29z84is9";
};
postUnpack = "sourceRoot+=/${pname}";
isLibrary = false;

4
pkgs/development/tools/misc/gdb/default.nix
View File

@@ -12,7 +12,7 @@
let
basename = "gdb-7.11";
basename = "gdb-7.11.1";
# Whether (cross-)building for GNU/Hurd. This is an approximation since
# having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnu/gdb/${basename}.tar.xz";
sha256 = "1hg5kwwdvi9b9nxzxfjnx8fx3gip75fqyvkp82xpf3b3rcb42hvs";
sha256 = "0w7wi1llznlqdqk2lmzygz2xylb2c9mh580s9i0rypkmwfj6s8g9";
};
nativeBuildInputs = [ pkgconfig texinfo perl ]

4
pkgs/development/tools/misc/kibana/default.nix
View File

@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "kibana-${version}";
version = "4.4.1";
version = "4.5.1";
src = fetchurl {
url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz";
sha256 = "0kxvrhrkcvx7pcn7myvabhcm4nj8gi86ij4a1xi392lfds2v350z";
sha256 = "0k9pmzx2sa3026yw29f2h2lddxdkhyn3jvdf3si8scz70ncwylj9";
};
buildInputs = [ makeWrapper ];

47
pkgs/development/tools/nimble/default.nix
View File

@@ -1,37 +1,36 @@
{ stdenv, fetchFromGitHub, nim }:
{ stdenv, fetchFromGitHub, nim, openssl }:
let
srcs = {
nimble = fetchFromGitHub {
owner = "nim-lang";
repo = "nimble";
rev = "v0.7.2";
sha256 = "0j9b519cv91xwn6k0alynakh7grbq4m6yy5bdwdrqmc7lag35r0i";
};
nim = fetchFromGitHub {
owner = "nim-lang";
repo = "nim";
rev = "v0.13.0";
sha256 = "14grhkwdva4wmvihm1413ly86sf0qk96bd473pvsbgkp46cg8rii";
};
};
in
stdenv.mkDerivation rec {
name = "nimble-${version}";
version = "0.7.2";
src = srcs.nimble;
version = "0.7.4";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nimble";
rev = "v${version}";
sha256 = "1l477f1zlqpc738jg47pz599cwjasgy9jqdsplj3ywd12xfqpc96";
};
buildInputs = [ nim ];
postUnpack = ''
mkdir -p $sourceRoot/vendor
ln -s ${srcs.nim} $sourceRoot/vendor/nim
patchPhase = ''
substituteInPlace src/nimble.nim.cfg --replace "./vendor/nim" "${nim}/share"
'';
buildPhase = ''
buildPhase = ''
nim c src/nimble
'';
installPhase = "installBin src/nimble";
installPhase = ''
mkdir -p $out/bin
cp src/nimble $out/bin
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.cc.libc openssl]}" \
--add-needed libcrypto.so \
"$out/bin/nimble"
'';
dontStrip = true;
meta = with stdenv.lib; {
description = "Package manager for the Nim programming language";

6
pkgs/development/tools/packer/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, go, gox, goPackages, fetchFromGitHub
{ stdenv, lib, gox, gotools, buildGoPackage, fetchFromGitHub
, fetchgit, fetchhg, fetchbzr, fetchsvn }:
stdenv.mkDerivation rec {
@@ -6,10 +6,10 @@ stdenv.mkDerivation rec {
version = "0.10.1";
src = import ./deps.nix {
inherit stdenv lib go gox goPackages fetchgit fetchhg fetchbzr fetchsvn;
inherit stdenv lib gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn;
};
buildInputs = [ go gox goPackages.tools ];
buildInputs = [ src.go gox gotools ];
configurePhase = ''
export GOPATH=$PWD/share/go

16
pkgs/development/tools/packer/deps.nix
View File

@@ -1,14 +1,11 @@
# This file was generated by go2nix.
{ stdenv, lib, go, gox, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
with goPackages;
{ stdenv, lib, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "packer-${version}";
version = "20160507-${stdenv.lib.strings.substring 0 7 rev}";
rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
buildInputs = [ go gox goPackages.tools ];
buildInputs = [ gox gotools ];
goPackagePath = "github.com/mitchellh/packer";
@@ -379,15 +376,6 @@ buildGoPackage rec {
sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
};
}
{
goPackagePath = "github.com/mitchellh/packer";
src = fetchgit {
url = "https://github.com/mitchellh/packer";
rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10";
};
}
{
goPackagePath = "github.com/mitchellh/panicwrap";

15
pkgs/development/tools/pup/default.nix Normal file
View File

@@ -0,0 +1,15 @@
{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "pup-${version}";
version = "20160425-${stdenv.lib.strings.substring 0 7 rev}";
rev = "e76307d03d4d2e0f01fb7ab51dee09f2671c3db6";
goPackagePath = "github.com/ericchiang/pup";
src = fetchgit {
inherit rev;
url = "https://github.com/ericchiang/pup";
sha256 = "15lwas4cjchlwhrwnd5l4gxcwqdfgazdyh466hava5qzxacqxrm5";
};
}

6
pkgs/development/tools/remarshal/default.nix
View File

@@ -1,6 +1,6 @@
{ lib, goPackages, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
goPackages.buildGoPackage rec {
buildGoPackage rec {
name = "remarshal-${rev}";
rev = "0.3.0";
goPackagePath = "github.com/dbohdan/remarshal";
@@ -12,7 +12,7 @@ goPackages.buildGoPackage rec {
sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496";
};
buildInputs = with goPackages; [ toml yaml-v2 ];
goDeps = ./deps.json;
meta = with lib; {
description = "Convert between TOML, YAML and JSON";

9
pkgs/development/tools/remarshal/deps.json Normal file
View File

@@ -0,0 +1,9 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/BurntSushi/toml",
"gopkg.in/yaml.v2"
]
}
]

4
pkgs/development/tools/rust/racer/default.nix
View File

@@ -17,13 +17,13 @@ buildRustPackage rec {
buildInputs = [ makeWrapper ];
preCheck = ''
export RUST_SRC;_PATH="${rustc.src}/src"
export RUST_SRC;_PATH="${rustPlatform.rust.rustc.src}/src"
'';
installPhase = ''
mkdir -p $out/bin
cp -p target/release/racer $out/bin/
wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src"
wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rust.rustc.src}/src"
'';
meta = with stdenv.lib; {

2
pkgs/development/tools/rust/racerd/default.nix
View File

@@ -17,7 +17,7 @@ buildRustPackage rec {
buildInputs = [ makeWrapper ];
RUST_SRC_PATH = ''${rustc.src}/src'';
RUST_SRC_PATH = ''${rustPlatform.rust.rustc.src}/src'';
installPhase = ''
mkdir -p $out/bin

25
pkgs/development/tools/textql/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "textql-${version}";
version = "2.0.3";
rev = "${version}";
goPackagePath = "github.com/dinedal/textql";
src = fetchFromGitHub {
inherit rev;
owner = "dinedal";
repo = "textql";
sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3";
};
goDeps = ./deps.json;
meta = with stdenv.lib; {
description = "Execute SQL against structured text like CSV or TSV";
homepage = https://github.com/dinedal/textql;
license = licenses.mit;
maintainers = with maintainers; [ vrthra ];
};
}

8
pkgs/development/tools/textql/deps.json Normal file
View File

@@ -0,0 +1,8 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/mattn/go-sqlite3"
]
}
]