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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-07-16 07:43:37 +02:00
parent 0f01215203 fd2448b2e6
commit 3c09808160
150 changed files with 1972 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/tools/analysis/radare2-cutter/default.nix
View File

@@ -7,16 +7,26 @@
, radare2
, python3 }:
let
r2 = radare2.overrideDerivation (o: {
name = "radare2-for-cutter-${version}";
src = fetchFromGitHub {
owner = "radare";
repo = "radare2";
rev = "a98557bfbfa96e9f677a8c779ee78085ee5a23bb";
sha256 = "04jl1lq3dqljb6vagzlym4wc867ayhx1v52f75rkfz0iybsh249r";
};
});
version = "1.6";
in
stdenv.mkDerivation rec {
name = "radare2-cutter-${version}";
version = "1.5";
src = fetchFromGitHub {
owner = "radareorg";
repo = "cutter";
rev = "v${version}";
sha256 = "0xwls8jhhigdkwyq3nf9xwcz4inm5smwinkyliwmfzvfflbbci5c";
sha256 = "1ps52yf94yfnws3nn1iiwch2jy33dyvi7j47xkmh0m5fpdqi5xk7";
};
postUnpack = "export sourceRoot=$sourceRoot/src";
@@ -31,7 +41,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ];
buildInputs = [ qtbase qtsvg qtwebengine r2 python3 ];
qmakeFlags = [
"CONFIG+=link_pkgconfig"

8
pkgs/development/tools/bloaty/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, binutils, cmake, zlib, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "2018-05-22";
version = "2018-06-15";
name = "bloaty-${version}";
src = fetchFromGitHub {
owner = "google";
repo = "bloaty";
rev = "054788b091ccfd43b05b9817062139145096d440";
sha256 = "0pmv66137ipzsjjdz004n61pz3aipjhh3b0w0y1406clqpwkvpjm";
rev = "bdbb3ce196c86d2154f5fba99b5ff73ca43446a9";
sha256 = "1r7di2p8bi12jpgl6cm4ygi1s0chv767mdcavc7pb45874vl02fx";
fetchSubmodules = true;
};
@@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkPhase = "ctest";
installPhase = ''
install -Dm755 {.,$out/bin}/bloaty
'';

3
pkgs/development/tools/build-managers/bazel/0.4.nix
View File

@@ -65,8 +65,9 @@ stdenv.mkDerivation rec {
];
buildPhase = ''
export TMPDIR=/tmp/.bazel-$UID
./compile.sh
./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \
./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \
--spawn_strategy=standalone \
--genrule_strategy=standalone
cp bazel-bin/scripts/bazel-complete.bash output/

4
pkgs/development/tools/build-managers/bazel/default.nix
View File

@@ -96,9 +96,9 @@ stdenv.mkDerivation rec {
# Change this to $(mktemp -d) as soon as we figure out why.
buildPhase = ''
export TMPDIR=/tmp
export TMPDIR=/tmp/.bazel-$UID
./compile.sh
./output/bazel --output_user_root=/tmp/.bazel build //scripts:bash_completion \
./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \
--spawn_strategy=standalone \
--genrule_strategy=standalone
cp bazel-bin/scripts/bazel-complete.bash output/

38
pkgs/development/tools/build-managers/rebar3/default.nix
View File

@@ -3,19 +3,19 @@
tree, fetchFromGitHub, hexRegistrySnapshot }:
let
version = "3.4.3";
version = "3.6.1";
bootstrapper = ./rebar3-nix-bootstrap;
erlware_commons = fetchHex {
pkg = "erlware_commons";
version = "1.0.0";
sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7";
version = "1.2.0";
sha256 = "149kkn9gc9cjgvlmakygq475r63q2rry31s29ax0s425dh37sfl7";
};
ssl_verify_fun = fetchHex {
pkg = "ssl_verify_fun";
version = "1.1.2";
sha256 = "0qdyx70v09fydv4wzz1djnkixqj62ny40yjjhv2q6mh47lns2arj";
version = "1.1.3";
sha256 = "1zljxashfhqmiscmf298vhr880ppwbgi2rl3nbnyvsfn0mjhw4if";
};
certifi = fetchHex {
pkg = "certifi";
@@ -24,23 +24,23 @@ let
};
providers = fetchHex {
pkg = "providers";
version = "1.6.0";
sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g";
version = "1.7.0";
sha256 = "19p4rbsdx9lm2ihgvlhxyld1q76kxpd7qwyqxxsgmhl5r8ln3rlb";
};
getopt = fetchHex {
pkg = "getopt";
version = "0.8.2";
sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk";
version = "1.0.1";
sha256 = "174mb46c2qd1f4a7507fng4vvscjh1ds7rykfab5rdnfp61spqak";
};
bbmustache = fetchHex {
pkg = "bbmustache";
version = "1.3.0";
sha256 = "042pfgss8kscq6ssg8gix8ccmdsrx0anjczsbrn2a6c36ljrx2p6";
version = "1.5.0";
sha256 = "0xg3r4lxhqifrv32nm55b4zmkflacc1s964g15p6y6jfx6v4y1zd";
};
relx = fetchHex {
pkg = "relx";
version = "3.23.1";
sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d";
version = "3.26.0";
sha256 = "1f810rb01kdidpa985s321ycg3y4hvqpzbk263n6i1bfnqykkvv9";
};
cf = fetchHex {
pkg = "cf";
@@ -49,13 +49,13 @@ let
};
cth_readable = fetchHex {
pkg = "cth_readable";
version = "1.3.0";
sha256 = "1s7bqj6f2zpbyjmbfq2mm6vcz1jrxjr2nd0531wshsx6fnshqhvs";
version = "1.4.2";
sha256 = "1pjid4f60pp81ds01rqa6ybksrnzqriw3aibilld1asn9iabxkav";
};
eunit_formatters = fetchHex {
pkg = "eunit_formatters";
version = "0.3.1";
sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934";
version = "0.5.0";
sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n";
};
rebar3_hex = fetchHex {
pkg = "rebar3_hex";
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz";
sha256 = "1a05gpxxc3mx5v33kzpb5xnq5vglmjl0q8hrcvpinjlazcwbg531";
sha256 = "0cqhqymzh10pfyxqiy4hcg3d2myz3chx0y4m2ixmq8zk81acics0";
};
inherit bootstrapper;
@@ -121,6 +121,6 @@ stdenv.mkDerivation {
'';
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.gleber ];
maintainers = with stdenv.lib.maintainers; [ gleber tazjin ];
};
}

37
pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
View File

@@ -1,5 +1,5 @@
diff --git a/bootstrap b/bootstrap
index 7c56bab..16c1be5 100755
index 5dedd713..864056c4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -101,7 +101,7 @@ extract(Binary) ->
@@ -12,9 +12,8 @@ index 7c56bab..16c1be5 100755
[{body_format, binary}],
rebar) of
diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl
new file mode 100644
index 0000000..8f6cc7d
--- /dev/null
index e69de29b..8f6cc7d0 100644
--- a/src/rebar_hermeticity.erl
+++ b/src/rebar_hermeticity.erl
@@ -0,0 +1,42 @@
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
@@ -60,20 +59,20 @@ index 0000000..8f6cc7d
+ ?ERROR("Request: ~p ~s", [Method, Url]),
+ erlang:halt(1).
diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
index d588f24..9ac8ad4 100644
index 2cf167ee..6080aaca 100644
--- a/src/rebar_pkg_resource.erl
+++ b/src/rebar_pkg_resource.erl
@@ -109,7 +109,7 @@ make_vsn(_) ->
@@ -127,7 +127,7 @@ make_vsn(_) ->
request(Url, ETag) ->
HttpOptions = [{ssl, ssl_opts(Url)}, {relaxed, true} | rebar_utils:get_proxy_auth()],
- case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
+ case rebar_hermeticity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
HttpOptions,
[{body_format, binary}],
rebar) of
HttpOptions = [{ssl, ssl_opts(Url)},
{relaxed, true} | rebar_utils:get_proxy_auth()],
- case httpc:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""}
+ case rebar_hermeticity:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""}
|| ETag =/= false] ++
[{"User-Agent", rebar_utils:user_agent()}]},
HttpOptions, [{body_format, binary}], rebar) of
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index a019c5a..697cbab 100644
index 17446311..4d44d794 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -38,6 +38,8 @@ init(State) ->
@@ -85,17 +84,17 @@ index a019c5a..697cbab 100644
do(State) ->
try
case rebar_packages:registry_dir(State) of
@@ -52,7 +54,7 @@ do(State) ->
case rebar_utils:url_append_path(CDN, ?REMOTE_REGISTRY_FILE) of
@@ -53,7 +55,7 @@ do(State) ->
{ok, Url} ->
HttpOptions = [{relaxed, true} | rebar_utils:get_proxy_auth()],
?DEBUG("Fetching registry from ~p", [Url]),
- case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
+ case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
[], [{stream, TmpFile}, {sync, true}],
HttpOptions, [{stream, TmpFile}, {sync, true}],
rebar) of
{ok, saved_to_file} ->
@@ -76,6 +78,7 @@ do(State) ->
?DEBUG("Error creating package index: ~p ~p", [C, erlang:get_stacktrace()]),
@@ -77,6 +79,7 @@ do(State) ->
?DEBUG("Error creating package index: ~p ~p", [C, S]),
throw(?PRV_ERROR(package_index_write))
end.
+-endif.

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

@@ -1,4 +1,4 @@
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }:
let
version = "1.8.2";
@@ -47,7 +47,7 @@ let
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${atomEnv.libPath}:$out/lib/electron" \
--set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/electron" \
$out/lib/electron/electron
wrapProgram $out/lib/electron/electron \

33
pkgs/development/tools/erlang/hex2nix/default.nix
View File

@@ -1,32 +1,23 @@
{ stdenv, fetchFromGitHub, buildRebar3, buildHex
{ stdenv, fetchFromGitHub, buildRebar3, buildHex,
, getopt_0_8_2, erlware_commons_1_0_0 }:
# Erlang dependencies:
ibrowse_4_2_2,
getopt_0_8_2,
erlware_commons_1_0_0,
jsx_2_8_0 }:
let
ibrowse_4_4_0 = buildHex {
name = "ibrowse";
version = "4.4.0";
sha256 = "1hpic1xgksfm00mbl1kwmszca6jmjca32s7gdd8g11i0hy45k3ka";
};
jsx_2_8_2 = buildHex {
name = "jsx";
version = "2.8.2";
sha256 = "0k7lnmwqbgpmh90wy30kc0qlddkbh9r3sjlyayaqsz1r1cix7idl";
};
in
buildRebar3 rec {
name = "hex2nix";
version = "0.0.6";
version = "0.0.6-a31eadd7";
src = fetchFromGitHub {
owner = "erlang-nix";
repo = "hex2nix";
rev = "${version}";
sha256 = "17rkzg836v7z2xf0i5m8zqfvr23dbmw1bi3c83km92f9glwa1dbf";
owner = "erlang-nix";
repo = "hex2nix";
rev = "a31eadd7af2cbdac1b87991b378e98ea4fb40ae0";
sha256 = "1hnkrksyrbpq2gq25rfsrnm86n0g3biab88gswm3zj88ddrz6dyk";
};
beamDeps = [ ibrowse_4_4_0 jsx_2_8_2 erlware_commons_1_0_0 getopt_0_8_2 ];
beamDeps = [ ibrowse_4_2_2 jsx_2_8_0 erlware_commons_1_0_0 getopt_0_8_2 ];
enableDebugInfo = true;

4
pkgs/development/tools/flatpak-builder/default.nix
View File

@@ -36,7 +36,7 @@
}:
let
version = "0.99.1";
version = "0.99.3";
in stdenv.mkDerivation rec {
name = "flatpak-builder-${version}";
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5";
sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk";
};
nativeBuildInputs = [

30
pkgs/development/tools/flatpak-builder/fix-paths.patch
View File

@@ -1,6 +1,6 @@
--- a/src/builder-context.c
+++ b/src/builder-context.c
@@ -711,7 +711,7 @@
@@ -763,7 +763,7 @@
g_autoptr(GFile) rofiles_base = NULL;
g_autoptr(GFile) rofiles_dir = NULL;
g_autofree char *tmpdir_name = NULL;
@@ -31,7 +31,7 @@
return res;
--- a/src/builder-source-archive.c
+++ b/src/builder-source-archive.c
@@ -401,7 +401,7 @@
@@ -430,7 +430,7 @@
va_list ap;
va_start (ap, error);
@@ -40,7 +40,7 @@
va_end (ap);
return res;
@@ -416,7 +416,7 @@
@@ -445,7 +445,7 @@
va_list ap;
va_start (ap, error);
@@ -49,7 +49,7 @@
va_end (ap);
return res;
@@ -428,7 +428,7 @@
@@ -457,7 +457,7 @@
GError **error)
{
gboolean res;
@@ -58,6 +58,15 @@
"sh", /* shell's $0 */
rpm_path, /* shell's $1 */
NULL };
@@ -604,7 +604,7 @@
va_list ap;
va_start (ap, error);
- res = flatpak_spawn (dir, NULL, 0, error, "git", ap);
+ res = flatpak_spawn (dir, NULL, 0, error, "@git@", ap);
va_end (ap);
return res;
--- a/src/builder-source-bzr.c
+++ b/src/builder-source-bzr.c
@@ -124,7 +124,7 @@
@@ -71,7 +80,7 @@
return res;
--- a/src/builder-source-patch.c
+++ b/src/builder-source-patch.c
@@ -204,11 +204,11 @@
@@ -215,15 +215,15 @@
args = g_ptr_array_new ();
if (use_git) {
@@ -79,6 +88,11 @@
+ g_ptr_array_add (args, "@git@");
g_ptr_array_add (args, "apply");
g_ptr_array_add (args, "-v");
} else if (use_git_am) {
- g_ptr_array_add (args, "git");
+ g_ptr_array_add (args, "@git@");
g_ptr_array_add (args, "am");
g_ptr_array_add (args, "--keep-cr");
} else {
- g_ptr_array_add (args, "patch");
+ g_ptr_array_add (args, "@patch@");
@@ -87,7 +101,7 @@
g_ptr_array_add (args, (gchar *) extra_options[i]);
--- a/src/builder-utils.c
+++ b/src/builder-utils.c
@@ -139,7 +139,7 @@
@@ -149,7 +149,7 @@
va_list ap;
va_start (ap, error);
@@ -96,7 +110,7 @@
va_end (ap);
return res;
@@ -153,7 +153,7 @@
@@ -163,7 +163,7 @@
va_list ap;
va_start (ap, error);
@@ -105,7 +119,7 @@
va_end (ap);
return res;
@@ -167,7 +167,7 @@
@@ -177,7 +177,7 @@
va_list ap;
va_start (ap, error);

6
pkgs/development/tools/misc/creduce/default.nix
View File

@@ -8,18 +8,18 @@
stdenv.mkDerivation rec {
name = "creduce-${version}";
version = "2.7.0";
version = "2.8.0";
src = fetchurl {
url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz";
sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n";
sha256 = "1vqx73ymfscvlyig03972a5m7ar3gx2yv6m8c6h2mibz792j5xkp";
};
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [
# Ensure stdenv's CC is on PATH before clang-unwrapped
stdenv.cc
# Actual deps:
cmake makeWrapper
llvm clang-unwrapped
flex zlib
perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey

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

@@ -3,11 +3,11 @@
# TODO: Look at the hardcoded paths to kernel, modules etc.
stdenv.mkDerivation rec {
name = "elfutils-${version}";
version = "0.172";
version = "0.173";
src = fetchurl {
url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
sha256 = "090fmbnvd9jblkwhb2bm3hanim63rrvd5f30mfxq4jac6kk9k73p";
sha256 = "1zq0l12k64hrbjmdjc4llrad96c25i427hpma1id9nk87w9qqvdp";
};
patches = ./debug-info-from-env.patch;