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

Merge remote-tracking branch 'central/master' into viric_clean

Browse Source
This commit is contained in:
Lluís Batlle i Rossell
2018-07-28 19:25:14 +02:00
parent 66d7126255 0fa2cbf59f
commit f54b387b63
292 changed files with 11331 additions and 3672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/analysis/flow/default.nix
View File

@@ -3,14 +3,14 @@
with lib;
stdenv.mkDerivation rec {
version = "0.76.0";
version = "0.77.0";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "0r3yl4m7dhm1h4c431zp8hd2gg6k1d9bwd2371xav5q7hviwmjl6";
sha256 = "1wcbqw5vwb3wsz9dkhi2k159ms98kn1nw3g9lc2j9w1m8ki41lql";
};
installPhase = ''
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libelf
] ++ (with ocamlPackages; [
ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx lwt_log wtf8 dtoa
ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx ppx_deriving ppx_gen_rec lwt_log wtf8 dtoa
]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
meta = with stdenv.lib; {

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

@@ -26,7 +26,7 @@ let
in
stdenv.mkDerivation rec {
version = "0.15.1";
version = "0.15.2";
meta = with stdenv.lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "0v7wdwbxy4bcx488lm1glf4iv3wfdwbkg8fh6kmmmfn1lhgkaay6";
sha256 = "1w83zi6d9npi1jmiy022v92xp1cwdvn2qqgghlnl2v9sprryqlxz";
};
sourceRoot = ".";
@@ -128,10 +128,10 @@ stdenv.mkDerivation rec {
buildPhase = ''
export TMPDIR=/tmp/.bazel-$UID
./compile.sh
./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/
scripts/generate_bash_completion.sh \
--bazel=./output/bazel \
--output=output/bazel-complete.bash \
--prepend=scripts/bazel-complete-template.bash
'';
# Build the CPP and Java examples to verify that Bazel works.
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
mv output/bazel $out/bin
wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}"
mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
mv output/bazel-complete.bash $out/share/bash-completion/completions/
mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel
cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
'';

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

@@ -2,12 +2,12 @@
targetPrefix = lib.optionalString stdenv.isCross
(targetPlatform.config + "-");
in python3Packages.buildPythonApplication rec {
version = "0.47.0";
version = "0.46.1";
pname = "meson";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "1mxsvsw7mg3q4yj8qrkrwv79qwws14qnbihryn2i7504b3r204h6";
sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
};
postFixup = ''

11
pkgs/development/tools/cloudfoundry-cli/default.nix
View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "cloudfoundry-cli-${version}";
version = "6.36.1";
version = "6.37.0";
goPackagePath = "code.cloudfoundry.org/cli";
@@ -12,17 +12,18 @@ buildGoPackage rec {
owner = "cloudfoundry";
repo = "cli";
rev = "v${version}";
sha256 = "19inl7qs2acs59p3gnl5zdsxym0wp2rn05q0zfg7rwf5sjh68amp";
sha256 = "1v4f1fyydpzkfir46g4ppbf3zmk3ym6kxswpkdjls8h3dbb2fbnv";
};
outputs = [ "out" ];
buildFlagsArray = ''
-ldflags= -X ${goPackagePath}/version.binaryVersion=${version}
buildPhase = ''
cd go/src/${goPackagePath}
CF_BUILD_DATE="1970-01-01" make build
'';
installPhase = ''
install -Dm555 go/bin/cli "$out/bin/cf"
install -Dm555 out/cf "$out/bin/cf"
remove-references-to -t ${go} "$out/bin/cf"
install -Dm444 -t "$out/share/bash-completion/completions/" "$src/ci/installers/completion/cf"
'';

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

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "dep-${version}";
version = "0.4.1";
version = "0.5.0";
rev = "v${version}";
goPackagePath = "github.com/golang/dep";
@@ -12,7 +12,7 @@ buildGoPackage rec {
inherit rev;
owner = "golang";
repo = "dep";
sha256 = "0183xq5l4sinnclynv6xi85vmk69mqpy5wjfsgh8bxwziq3vkd7y";
sha256 = "1p35995w2f8rp4cxhcwnhdv26ajx6gxx9pm2ijb5sjy2pwhw5c6j";
};
buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}");
@@ -22,6 +22,6 @@ buildGoPackage rec {
description = "Go dependency management tool";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = [ maintainers.carlsverre ];
maintainers = with maintainers; [ carlsverre rvolosatovs ];
};
}

28
pkgs/development/tools/kustomize/default.nix Normal file
View File

@@ -0,0 +1,28 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "kustomize-${version}";
version = "1.0.4";
goPackagePath = "github.com/kubernetes-sigs/kustomize";
src = fetchFromGitHub {
sha256 = "0lbf94wz34axaf8ps7h79qbj4dpihrpvnqa12zrawcmmgqallwhm";
rev = "v${version}";
repo = "kustomize";
owner = "kubernetes-sigs";
};
meta = with lib; {
description = "Customization of kubernetes YAML configurations";
longDescription = ''
kustomize lets you customize raw, template-free YAML files for
multiple purposes, leaving the original YAML untouched and usable
as is.
'';
homepage = https://github.com/kubernetes-sigs/kustomize;
license = licenses.asl20;
maintainers = [ maintainers.carlosdagos ];
};
}

6
pkgs/development/tools/misc/circleci-cli/default.nix
View File

@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "circleci-cli";
version = "2018-05-12";
version = "0.1.0";
src = fetchFromGitHub {
owner = "circleci";
repo = "local-cli";
rev = "2c7c1a74e3c3ffb8eebc03fccd782b1bfe9e940a";
sha256 = "0fp0fz0xr7ynp32lqcmaigl9p45wk1hd2gv9i5q5bj9syj3g7qzm";
rev = "v${version}";
sha256 = "1bv1ck5zvyl6pyvbfglizg8ybna4yg2nz441kiv5rmp4g27n6db2";
};
nativeBuildInputs = [ makeWrapper ];

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

@@ -28,46 +28,40 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
crossAttrs = {
# This program does not cross-build fine. So I only cross-build some parts
# I need for the linux perf tool.
# On the awful cross-building:
# http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005
#
# I wrote this testing for the nanonote.
/* Having bzip2 will harm, because anything using elfutils
as buildInput cross-building, will not be able to run 'bzip2' */
propagatedBuildInputs = [ zlib.crossDrv ];
buildPhase = if stdenv.hostPlatform == stdenv.buildPlatform then null else ''
pushd libebl
make
popd
pushd libelf
make
popd
pushd libdwfl
make
popd
pushd libdw
make
popd
'';
# This program does not cross-build fine. So I only cross-build some parts
# I need for the linux perf tool.
# On the awful cross-building:
# http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005
#
# I wrote this testing for the nanonote.
buildPhase = ''
pushd libebl
make
popd
pushd libelf
make
popd
pushd libdwfl
make
popd
pushd libdw
make
popd
'';
installPhase = ''
pushd libelf
make install
popd
pushd libdwfl
make install
popd
pushd libdw
make install
popd
cp version.h $out/include
'';
};
installPhase = if stdenv.hostPlatform == stdenv.buildPlatform then null else ''
pushd libelf
make install
popd
pushd libdwfl
make install
popd
pushd libdw
make install
popd
cp version.h $out/include
'';
meta = {
homepage = https://sourceware.org/elfutils/;

47
pkgs/development/tools/misc/kibana/6.x.nix
View File

@@ -1,4 +1,13 @@
{ stdenv, makeWrapper, fetchurl, elk6Version, nodejs, coreutils, which }:
{ elk6Version
, enableUnfree ? true
, stdenv
, makeWrapper
, fetchzip
, fetchurl
, nodejs
, coreutils
, which
}:
with stdenv.lib;
let
@@ -6,12 +15,31 @@ let
info = splitString "-" stdenv.system;
arch = elemAt info 0;
plat = elemAt info 1;
shas = {
"x86_64-linux" = "1br9nvwa3i5sfcbnrxp2x3dxxnsbs9iavz6zwgw0jlh5ngf5vysk";
"x86_64-darwin" = "1w4dck02i0rrl8m18kvy2zz02cb7bb9a2pdhkd1jfy1qz4ssnhii";
shas =
if enableUnfree
then {
"x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0";
"x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3";
}
else {
"x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly";
"x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b";
};
# For the correct phantomjs version see:
# https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js
phantomjs = rec {
name = "phantomjs-${version}-linux-x86_64";
version = "2.1.1";
src = fetchzip {
inherit name;
url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2";
sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv";
};
};
in stdenv.mkDerivation rec {
name = "kibana-${version}";
name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}";
version = elk6Version;
src = fetchurl {
@@ -28,12 +56,19 @@ in stdenv.mkDerivation rec {
makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
--prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
'' +
# phantomjs is needed in the unfree version. When phantomjs doesn't exist in
# $out/libexec/kibana/data kibana will try to download and unpack it during
# runtime which will fail because the nix store is read-only. So we make sure
# it already exist in the nix store.
optionalString enableUnfree ''
ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name}
'';
meta = {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = licenses.asl20;
license = if enableUnfree then licenses.elastic else licenses.asl20;
maintainers = with maintainers; [ offline rickynils basvandijk ];
platforms = with platforms; unix;
};

8
pkgs/development/tools/misc/ycmd/default.nix
View File

@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "ycmd-${version}";
version = "2018-06-14";
version = "2018-07-24";
src = fetchgit {
url = "https://github.com/Valloric/ycmd.git";
rev = "29e36f74f749d10b8d6ce285c1453fac26f15a41";
sha256 = "0s62nf18jmgjihyba7lk7si8xrxsg60whdr430nlb5gjikag8zr5";
rev = "f8a8b04892b925efeee24298a957cc6d6a69ad06";
sha256 = "1br2sh6bs0fg1axq2hq9f48fz8klkzydi1mf0j0jdsh3zjzkmxbn";
};
nativeBuildInputs = [ cmake ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release}
for p in jedi waitress frozendict bottle python-future requests; do
for p in jedi waitress frozendict bottle parso python-future requests; do
cp -r third_party/$p $out/lib/ycmd/third_party
done

10
pkgs/development/tools/parsing/flex/2.5.35.nix
View File

@@ -12,12 +12,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ m4 ];
crossAttrs = {
preConfigure = ''
export ac_cv_func_malloc_0_nonnull=yes
export ac_cv_func_realloc_0_nonnull=yes
'';
};
preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
];
meta = {
branch = "2.5.35";

21
pkgs/development/tools/parsing/flex/2.6.1.nix
View File

@@ -12,22 +12,19 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ m4 ];
preConfigure = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
];
postConfigure = stdenv.lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
sed -i Makefile -e 's/-no-undefined//;'
'';
crossAttrs = {
# disable tests which can't run on build machine
postPatch = ''
substituteInPlace Makefile.in --replace "tests" " ";
'';
preConfigure = ''
export ac_cv_func_malloc_0_nonnull=yes
export ac_cv_func_realloc_0_nonnull=yes
'';
};
# disable tests which can't run on build machine
postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace Makefile.in --replace "tests" " ";
'';
meta = {
homepage = https://github.com/westes/flex;

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

@@ -0,0 +1,25 @@
{ buildGoPackage, fetchFromGitHub, lib }:
buildGoPackage rec {
name = "pet-${version}";
version = "0.3.2";
goPackagePath = "github.com/knqyf263/pet";
src = fetchFromGitHub {
owner = "knqyf263";
repo = "pet";
rev = "v${version}";
sha256 = "1zv2jfgh5nqd4cwr1ljm5p4rqam7hq3a6asfmhr3lcnp7sz9b8fr";
};
goDeps = ./deps.nix;
meta = with lib; {
description = "Simple command-line snippet manager, written in Go";
homepage = https://github.com/knqyf263/pet;
license = licenses.mit;
maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin;
};
}

155
pkgs/development/tools/pet/deps.nix generated Normal file
View File

@@ -0,0 +1,155 @@
[
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
};
}
{
goPackagePath = "github.com/briandowns/spinner";
fetch = {
type = "git";
url = "https://github.com/briandowns/spinner";
rev = "5b875a9171af19dbde37e70a8fcbe2ebd7285e05";
sha256 = "0vq78qmg07dm9vnjqz17ca9qml8np7f9vj9igsira7a39xg09ivg";
};
}
{
goPackagePath = "github.com/chzyer/readline";
fetch = {
type = "git";
url = "https://github.com/chzyer/readline";
rev = "2972be24d48e78746da79ba8e24e8b488c9880de";
sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
};
}
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "2d684516a8861da43017284349b7e303e809ac21";
sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs";
};
}
{
goPackagePath = "github.com/google/go-github";
fetch = {
type = "git";
url = "https://github.com/google/go-github";
rev = "c0b63e2f9bb198baf328c8abf1ddcbe05ff9427e";
sha256 = "1a4skdbzxnyj3irqrmhhj4c9cimga0k5sd0vykjfqj7c8c5bwbd5";
};
}
{
goPackagePath = "github.com/google/go-querystring";
fetch = {
type = "git";
url = "https://github.com/google/go-querystring";
rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a";
sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f";
};
}
{
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 = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
};
}
{
goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "a114f312e075f65bf30d6d9a1430113f857e543b";
sha256 = "10lmi5ni06yijxg02fcic5b7ycjkia12yma4a4lz8a56j30wykx1";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
};
}
{
goPackagePath = "github.com/xanzy/go-gitlab";
fetch = {
type = "git";
url = "https://github.com/xanzy/go-gitlab";
rev = "696e3cf592c0f71a0fce1934ad500376abe2e12d";
sha256 = "1wjn991i161z4xqply3lxvvjgnisdrbkiadr0h0n01k40hymdx6h";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9";
sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
};
}
{
goPackagePath = "golang.org/x/oauth2";
fetch = {
type = "git";
url = "https://go.googlesource.com/oauth2";
rev = "ef147856a6ddbb60760db74283d2424e98c87bff";
sha256 = "1q1vm1z40fx1grlrm7az4rln6v5pj9xi5n1cjqg5xgq4dsk9132y";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4";
sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm";
};
}
]

20
pkgs/development/tools/rshell/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ lib, buildPythonApplication, fetchPypi, pyserial, pyudev }:
buildPythonApplication rec {
pname = "rshell";
version = "0.0.14";
src = fetchPypi {
inherit pname version;
sha256 = "12gh9l13lwnlp330jl3afy3wgfkpjvdxr43flrg9k9kyyhbr191g";
};
propagatedBuildInputs = [ pyserial pyudev ];
meta = with lib; {
homepage = https://github.com/dhylands/rshell;
description = "Remote Shell for MicroPython";
license = licenses.mit;
maintainers = with maintainers; [ c0deaddict ];
};
}

14
pkgs/development/tools/rubocop/Gemfile.lock
View File

@@ -2,21 +2,23 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.0)
jaro_winkler (1.5.1)
parallel (1.12.1)
parser (2.5.1.0)
parser (2.5.1.2)
ast (~> 2.4.0)
powerpack (0.1.1)
powerpack (0.1.2)
rainbow (3.0.0)
rake (12.3.1)
rubocop (0.55.0)
rubocop (0.58.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)
unicode-display_width (1.3.2)
unicode-display_width (1.4.0)
PLATFORMS
ruby
@@ -26,4 +28,4 @@ DEPENDENCIES
rubocop
BUNDLED WITH
1.14.6
1.16.1

26
pkgs/development/tools/rubocop/gemset.nix
View File

@@ -7,6 +7,14 @@
};
version = "2.4.0";
};
jaro_winkler = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rr797nqz081bfk30m2apj5h24bg5d1jr1c8p3xwx4hbwsrbclah";
type = "gem";
};
version = "1.5.1";
};
parallel = {
source = {
remotes = ["https://rubygems.org"];
@@ -19,18 +27,18 @@
dependencies = ["ast"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k";
type = "gem";
};
version = "2.5.1.0";
version = "2.5.1.2";
};
powerpack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv";
type = "gem";
};
version = "0.1.1";
version = "0.1.2";
};
rainbow = {
source = {
@@ -49,13 +57,13 @@
version = "12.3.1";
};
rubocop = {
dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17qnk66q4diny1bvzbwsl1d5a26nj0mjzc2425h6nyp3xqjipz11";
sha256 = "0s2qlrdx2f7653kmzwm58c8izyvgyjrzjrz76l2b005f2816kji6";
type = "gem";
};
version = "0.55.0";
version = "0.58.1";
};
ruby-progressbar = {
source = {
@@ -68,9 +76,9 @@
unicode-display_width = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
type = "gem";
};
version = "1.3.2";
version = "1.4.0";
};
}

23
pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
View File

@@ -4,29 +4,26 @@ Date: Sat, 28 Oct 2017 17:58:17 +0200
Subject: [PATCH] nix customization: patchelf installed binaries
---
src/rustup-dist/src/component/package.rs | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
src/rustup-dist/src/component/package.rs | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs
index 8aa63db9..4d219826 100644
index 70c54dcd..f0318986 100644
--- a/src/rustup-dist/src/component/package.rs
+++ b/src/rustup-dist/src/component/package.rs
@@ -99,7 +99,13 @@ impl Package for DirectoryPackage {
@@ -100,7 +100,10 @@ impl Package for DirectoryPackage {
let src_path = root.join(&path);
match &*part.0 {
- "file" => try!(builder.copy_file(path.clone(), &src_path)),
- "file" => builder.copy_file(path.clone(), &src_path)?,
+ "file" => {
+ try!(builder.copy_file(path.clone(), &src_path));
+ nix_patchelf_if_needed(
+ &target.prefix().path().join(path.clone()),
+ &src_path,
+ )
+ builder.copy_file(path.clone(), &src_path)?;
+ nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path)
+ }
"dir" => try!(builder.copy_dir(path.clone(), &src_path)),
"dir" => builder.copy_dir(path.clone(), &src_path)?,
_ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()),
}
@@ -117,6 +123,22 @@ impl Package for DirectoryPackage {
@@ -118,6 +121,22 @@ impl Package for DirectoryPackage {
}
}
@@ -50,5 +47,5 @@ index 8aa63db9..4d219826 100644
// binaries are executable and directories readable. This shouldn't be
// necessary: the source files *should* have the right permissions,
--
2.14.1
2.17.1

12
pkgs/development/tools/rust/rustup/default.nix
View File

@@ -4,17 +4,17 @@
rustPlatform.buildRustPackage rec {
name = "rustup-${version}";
version = "1.11.0";
cargoSha256 = "1r9mnj3x9sn16hi1r09gl5q0cnsa2g6kbjw2g115858i2a9k6hkr";
version = "1.13.0";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "rustup.rs";
rev = version;
sha256 = "05rbgkz4fk6c1x6bpmpx108bg2qcrf6vv3yfz378s7bmr3l319iz";
sha256 = "1h0786jx64nc9q8x6fv7a5sf1xijxhn02m2pq5v2grl9ks0vxidn";
};
cargoSha256 = "09lbm2k189sri3vwcwzv7j07ah39c8ajbpkg0kzvjsjwr7ypli8a";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
@@ -32,10 +32,12 @@ rustPlatform.buildRustPackage rec {
'')
];
doCheck = !stdenv.isAarch64;
postInstall = ''
pushd $out/bin
mv rustup-init rustup
for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt; do
for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt cargo-clippy; do
ln -s rustup $link
done
popd

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

@@ -28,7 +28,7 @@ buildGoPackage rec {
excludedPackages = "integration";
nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux ];
buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs ostree libselinux ];
buildFlagsArray = ''
-ldflags=
@@ -37,8 +37,8 @@ buildGoPackage rec {
'';
preBuild = ''
export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev lvm2}/include -I${getDev btrfs-progs}/include"
export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib lvm2}/lib"
export CGO_CFLAGS="$CFLAGS"
export CGO_LDFLAGS="$LDFLAGS"
'';
postBuild = ''