Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix
This commit is contained in:
Tuomas Tynkkynen
@@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nxproxy-${version}";
|
||||
version = "3.5.0.32";
|
||||
version = "3.5.0.33";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
|
||||
sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74";
|
||||
url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ fetchurl, perl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sec-2.7.7";
|
||||
name = "sec-2.7.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz";
|
||||
sha256 = "116nn8fg24nwcimm8gcfp52bsgh1ckrspjr8sk4i0arvpl3d12m9";
|
||||
sha256 = "0f5a2nkd5cmg1rziizz2gmgdwb5dz99x9pbxw30p384rjh79zcaa";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mpdas-${version}";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "mpdas";
|
||||
rev = version;
|
||||
sha256 = "1i6i36jd582y3nm5plcrswqljf528hd23whp8zw06hwqnsgca5b6";
|
||||
sha256 = "0fcqc4w6iwbi1n3cllcgj0k61zffhqkbr8668myxap21m35x8y1r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openobex-1.7.1";
|
||||
name = "openobex-1.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
|
||||
sha256 = "0mza0mrdrbcw4yix6qvl31kqy7bdkgxjycr0yx7yl089v5jlc9iv";
|
||||
sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "securefs-${version}";
|
||||
version = "0.3.2";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1drksvwfgfpgcn2mzb65ljqlg2kgn6nald9fnz60hliw8f1wiqvh";
|
||||
sha256 = "065n3mskv0b2dlk9w4b3pa70h5ymrnanydbanwyx74mf7n8c80r2";
|
||||
rev = version;
|
||||
repo = "securefs";
|
||||
owner = "netheril96";
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zerofree-${version}";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://frippery.org/uml/${name}.tgz";
|
||||
sha256 = "059g29x5r1xj6wcj4xj85l8w6qrxyl86yqbybjqqz6nxz4falxzf";
|
||||
sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm";
|
||||
};
|
||||
|
||||
buildInputs = [ e2fsprogs ];
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "povray-${version}";
|
||||
version = "3.7.0.4";
|
||||
version = "3.7.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "POV-Ray";
|
||||
repo = "povray";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wkwb43w5r9pa79yazy4w4s8n6g280igag97hgl7dyi289q39n0q";
|
||||
sha256 = "0gqbc4ycjfqpnixzzqxlygmargk6sm77b0k3xzff9dxdrak3xng7";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -1,42 +1,27 @@
|
||||
{ stdenv, fetchurl,
|
||||
boost, clasp, cmake, gringo, re2c
|
||||
{ stdenv, fetchzip
|
||||
, boost, clasp, cmake, gringo, re2c
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.9.1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.9.4";
|
||||
name = "aspcud-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz";
|
||||
sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/potassco/aspcud/archive/v${version}.tar.gz";
|
||||
sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw";
|
||||
};
|
||||
|
||||
buildInputs = [ boost clasp cmake gringo re2c ];
|
||||
|
||||
buildPhase = ''
|
||||
cmake -DCMAKE_BUILD_TYPE=Release \
|
||||
-DGRINGO_LOC=${gringo}/bin/gringo \
|
||||
-DCLASP_LOC=${clasp}/bin/clasp \
|
||||
-DENCODING_LOC=$out/share/aspcud/specification.lp \
|
||||
.
|
||||
|
||||
make
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp bin/{aspcud,cudf2lp,lemon} $out/bin
|
||||
|
||||
mkdir -p $out/share/aspcud
|
||||
cp ../share/aspcud/specification.lp $out/share/aspcud
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo"
|
||||
"-DASPCUD_CLASP_PATH=${clasp}/bin/clasp"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Solver for package problems in CUDF format using ASP";
|
||||
homepage = http://potasssco.sourceforge.net/;
|
||||
homepage = "https://potassco.org/aspcud/";
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.hakuch ];
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bdf2psf-${version}";
|
||||
version = "1.175";
|
||||
version = "1.178";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
|
||||
sha256 = "1bbj6wxdpjhy7n2614z0qx2310vhaxlvism6v6lxancb5bwwgdnf";
|
||||
sha256 = "1ngxa7hzfhvfhkvyc2qib3qyql5zz8rjg559wpi2jsi4hibj84vc";
|
||||
};
|
||||
|
||||
buildInputs = [ dpkg ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, python3, texinfo, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ponysay-3.0.2";
|
||||
name = "ponysay-3.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/erkin/ponysay/archive/3.0.2.tar.gz";
|
||||
sha256 = "03avcbl96rv718lgg6yyrq5mvg3xxzccrnnb6brf4g9mcrwqmsb9";
|
||||
url = "https://github.com/erkin/ponysay/archive/3.0.3.tar.gz";
|
||||
sha256 = "12mjabf5cpp5dgg63s19rlyq3dhhpzzy2sa439yncqzsk7rdg0n3";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 texinfo makeWrapper ];
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.03";
|
||||
version = "4.04";
|
||||
name = "quota-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz";
|
||||
sha256 = "0jv7vhxhjp3gc4hwgmrhg448sbzzqib80gdas9nm0c5zwyd4sv4w";
|
||||
sha256 = "1pwfxza923j75z5lx0w89pj09745zi1swy77cm0zalbzgs4f2nvk";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" "man" ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ttylog-${version}";
|
||||
version = "0.29";
|
||||
version = "0.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rocasa";
|
||||
repo = "ttylog";
|
||||
rev = version;
|
||||
sha256 = "035i9slmdgds5azwxqwp6skxykvaq3mq4jckvm49fng8jq09z7zr";
|
||||
sha256 = "0c746bpjpa77vsr88fxk8h1803p5np1di1mpjf4jy5bv5x3zwm07";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
39
pkgs/tools/misc/uutils-coreutils/default.nix
Normal file
39
pkgs/tools/misc/uutils-coreutils/default.nix
Normal file
@@ -0,0 +1,39 @@
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" }:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
name = "uutils-coreutils-2018-02-09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "coreutils";
|
||||
rev = "f333ab26b03294a32a10c1c203a03c6b5cf8a89a";
|
||||
sha256 = "0nkggs5nqvc1mxzzgcsqm1ahchh4ll11xh0xqmcljrr5yg1rhhzf";
|
||||
};
|
||||
|
||||
# too many impure/platform-dependent tests
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "0qv2wz1bxhm5xhzbic7cqmn8jj8fyap0s18ylia4fbwpmv89nkc5";
|
||||
|
||||
makeFlags =
|
||||
[ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
|
||||
++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ cargo sphinx ];
|
||||
|
||||
# empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults
|
||||
buildPhase = "";
|
||||
installPhase = "";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Cross-platform Rust rewrite of the GNU coreutils";
|
||||
longDescription = ''
|
||||
uutils is an attempt at writing universal (as in cross-platform)
|
||||
CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites.
|
||||
'';
|
||||
homepage = https://github.com/uutils/coreutils;
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vmtouch";
|
||||
version = "1.1.0";
|
||||
version = "1.3.0";
|
||||
name = "${pname}-git-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoytech";
|
||||
repo = "vmtouch";
|
||||
rev = "v${version}";
|
||||
sha256 = "1cr8bw3favdvc3kc05n1r7f5fibqqv54bn3z2jwj70br8s5g0qx0";
|
||||
sha256 = "0xpigfpwidk25k605y2m2g1952nzl5fgp0wn65hhn7hbra7srglf";
|
||||
};
|
||||
|
||||
buildInputs = [perl];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xdo-${version}";
|
||||
version = "0.5.6";
|
||||
version = "0.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baskerville";
|
||||
repo = "xdo";
|
||||
rev = version;
|
||||
sha256 = "1i8xlsp36ji7cvyh66ajqsf59hxpwm0xvnn9laq7nbajcx3qqlnh";
|
||||
sha256 = "1h3jrygcjjbavdbkpx2hscsf0yf97gk487lzjdlvymd7dxdv9hy9";
|
||||
};
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xtitle-0.3";
|
||||
name = "xtitle-0.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/baskerville/xtitle/archive/0.3.tar.gz";
|
||||
sha256 = "07r36f4ad1q0dpkx3ykd49xlmi24d8mjqwh40j228k81wsvzayl1";
|
||||
url = "https://github.com/baskerville/xtitle/archive/0.4.3.tar.gz";
|
||||
sha256 = "0bk4mxx0vky37f66b2y34nggi1f7fnrmsprkxyc8mskj6qcrbm5h";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "mptre";
|
||||
repo = "yank";
|
||||
rev = "v${meta.version}";
|
||||
sha256 = "0nf9y3jsvfjxa3mgigywnyirznn1m4zjm1glnwndrjsjrkcpnzb5";
|
||||
sha256 = "0v5aynrilm4fj7gz03q0yz6806ssjxhlv4bsa0213bgkin5iiws7";
|
||||
inherit name;
|
||||
};
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
downloadPage = "https://github.com/mptre/yank/releases";
|
||||
license = licenses.mit;
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
maintainers = [ maintainers.dochang ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@ buildPythonApplication rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d348b89bd4798ef2225f5b357510505a4bc781380479c9f59b69d80ff9a56ab5";
|
||||
sha256 = "1dbalpwhzn39kgswjy84720wfjssa087adavbwig53krsjdvhj6k";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -16,11 +16,11 @@ with stdenv.lib;
|
||||
buildPythonApplication rec {
|
||||
|
||||
name = "youtube-dl-${version}";
|
||||
version = "2018.02.08";
|
||||
version = "2018.02.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
|
||||
sha256 = "0iq5mav782gz0gm00rry3v7gdxkkx4y1k0p20pvz32ga4id5k1mg";
|
||||
sha256 = "112qmwrkd0cpyx2h20k6y07lw7iixvj8yya7r97h3k1y1py9vbz8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yubikey-personalization-gui-3.1.24";
|
||||
name = "yubikey-personalization-gui-3.1.25";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz";
|
||||
sha256 = "0aj8cvajswkwzig0py0mjnfw0m8xsilisdcnixpjx9xxsxz5yacq";
|
||||
sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig qmake4Hook ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, bind, libseccomp, zlib }:
|
||||
{ stdenv, fetchurl, bind, libseccomp, zlib, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dnsperf-${version}";
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "out" "man" "doc" ];
|
||||
|
||||
buildInputs = [ bind libseccomp zlib ];
|
||||
buildInputs = [ bind libseccomp zlib openssl ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/doc/"
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dropbear-2017.75";
|
||||
name = "dropbear-2018.76";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
|
||||
sha256 = "1309cm2aw62n9m3h38prvgsqr8bj85hfasgnvwkd42cp3k5ivg3c";
|
||||
sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj";
|
||||
};
|
||||
|
||||
dontDisableStatic = enableStatic;
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "keepalived-${version}";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acassen";
|
||||
repo = "keepalived";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d3jnfhj9mpnc27wvgsiz2vr4lnvvccw3v128z16jpyibyv20ph0";
|
||||
sha256 = "154yxs6kwpi9yc4pa45ba3z3bfwzgmmmja5nk3d9mxq6w6s1swcy";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "netsniff-ng-${version}";
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
|
||||
# Upstream recommends and supports git
|
||||
src = fetchFromGitHub rec {
|
||||
repo = "netsniff-ng";
|
||||
owner = repo;
|
||||
rev = "v${version}";
|
||||
sha256 = "0g3105c5ha897bpwsnrp72gx4n61gspxmld594i37g8k7vwzny4l";
|
||||
sha256 = "0nip1gmzxq5kak41n0y0qzbhk2876fypk83q14ssy32fk49lxjly";
|
||||
};
|
||||
|
||||
patches = [ ./glibc-2.26.patch ];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, bzip2, yacc, flex }:
|
||||
|
||||
let version = "1.6.15"; in
|
||||
let version = "1.6.16"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nfdump-${version}";
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "phaag";
|
||||
repo = "nfdump";
|
||||
rev = "v${version}";
|
||||
sha256 = "07grsfkfjy05yfqfcmgp5xpavpck9ps6q7x8x8j79fym5d8gwak5";
|
||||
sha256 = "0dgrzf9m4rg5ygibjw21gjdm9am3570wys7wdh5k16nsnyai1gqm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [yacc flex];
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openntpd-${version}";
|
||||
version = "6.2p1";
|
||||
version = "6.2p3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://openbsd/OpenNTPD/${name}.tar.gz";
|
||||
sha256 = "1g6hi03ylhv47sbar3xxgsrar8schqfwn4glckh6m6lni67ndq85";
|
||||
sha256 = "0fn12i4kzsi0zkr4qp3dp9bycmirnfapajqvdfx02zhr4hanj0kv";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
26
pkgs/tools/networking/opensm/default.nix
Normal file
26
pkgs/tools/networking/opensm/default.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{ stdenv, fetchgit, autoconf, automake, libtool, bison, flex, rdma-core }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opensm-${version}";
|
||||
version = "3.3.20";
|
||||
|
||||
src = fetchgit {
|
||||
url = git://git.openfabrics.org/~halr/opensm.git;
|
||||
rev = name;
|
||||
sha256 = "1hlrn5z32yd4w8bj4z6bsfv84pk178s4rnppbabyjqv1rg3c58wl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool bison flex ];
|
||||
|
||||
buildInputs = [ rdma-core ];
|
||||
|
||||
preConfigure = "bash ./autogen.sh";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Infiniband subnet manager";
|
||||
homepage = https://www.openfabrics.org/;
|
||||
license = licenses.gpl2; # dual licensed as 2-clause BSD
|
||||
maintainers = [ maintainers.aij ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pcapfix-1.1.0";
|
||||
name = "pcapfix-1.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://f00l.de/pcapfix/${name}.tar.gz";
|
||||
sha256 = "025jpsqav9wg9lql7jfpd67z1113j8gzmjc5nqf5q07b01nnpfgj";
|
||||
sha256 = "07dfgl99iv88mgpnpfcb9y7h0zjq9fcf4sp5s7d0d3d5a5sshjay";
|
||||
};
|
||||
|
||||
postPatch = ''sed -i "s|/usr|$out|" Makefile'';
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
name = "speedtest-cli-${version}";
|
||||
version = "1.0.6";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sivel";
|
||||
repo = "speedtest-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "008a0wymn06h93gdkxwlgxg8039ybdni96i4blhpayj52jkbflnv";
|
||||
sha256 = "06fini7bqf5paphp8dpck1zpmb33cdxlf4hg6xg2g9k4bdm2k26d";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "srelay-0.4.8b6";
|
||||
name = "srelay-0.4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz";
|
||||
sha256 = "1az9ds10hpmpw6bqk7fcd1w70001kz0mm48v3vgg2z6vrbmgn0qj";
|
||||
url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-0.4.8/srelay-0.4.8.tar.gz";
|
||||
sha256 = "1sn6005aqyfvrlkm5445cyyaj6h6wfyskfncfmds55x34hfyxpvl";
|
||||
};
|
||||
|
||||
patches = [ ./arm.patch ];
|
||||
|
||||
@@ -12,11 +12,11 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "strongswan-${version}";
|
||||
version = "5.6.1";
|
||||
version = "5.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.strongswan.org/${name}.tar.bz2";
|
||||
sha256 = "0lxbyiary8iapx3ysw40czrmxf983fhfzs5mvz2hk1j1mpc85hp0";
|
||||
sha256 = "14ifqay54brw2b2hbmm517bxw8bs9631d7jm4g139igkxcq0m9p0";
|
||||
};
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tcpreplay-${version}";
|
||||
version = "4.2.5";
|
||||
version = "4.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz";
|
||||
sha256 = "1mw9r97blczm70rjf7p83sd1fxpzdzfvsbnjsc0m3nz16jz2c44l";
|
||||
sha256 = "07aklkc1s13hwrd098bqj8izfh8kdgs7wl9swcmkxffs6b2mcdq4";
|
||||
};
|
||||
|
||||
buildInputs = [ libpcap ];
|
||||
|
||||
@@ -16,14 +16,14 @@ let
|
||||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "telepresence";
|
||||
version = "0.65";
|
||||
version = "0.67";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datawire";
|
||||
repo = "telepresence";
|
||||
rev = version;
|
||||
sha256 = "01hwaybhdmfzmyzvwdx19nc5px2grf4k1vbbj9jdmsh5pmzfrby4";
|
||||
sha256 = "1bpyzgvrf43yvhwp5bzkp2qf3z9dhjma165w8ssca9g00v4b5vg9";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, docbook_xsl }:
|
||||
|
||||
let
|
||||
version = "1.0.63";
|
||||
version = "1.0.73";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "tgt-${version}";
|
||||
|
||||
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "fujita";
|
||||
repo = "tgt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x3irnbfikdqhlikhwqazg0g0hc1df5r2bp001f13sr0nvw28y1n";
|
||||
sha256 = "0alrdrklh5wq8x4xbp30zwnxkp0brx1mjkbp70dhaz0zbzvyydr0";
|
||||
};
|
||||
|
||||
buildInputs = [ libxslt systemd libaio docbook_xsl ];
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, ncurses, libnl, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
baseName = "wavemon";
|
||||
name = "${baseName}-${version}";
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "uoaerg";
|
||||
repo = "wavemon";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mx61rzl8a66pmigv2fh75zgdalxx75a5s1b7ydbviz18ihhjyls";
|
||||
sha256 = "0rqpp7rhl9rlwnihsapaiy62v33h45fm3d0ia2nhdjw7fwkwcqvs";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wrk-${version}";
|
||||
version = "4.0.2";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wg";
|
||||
repo = "wrk";
|
||||
rev = version;
|
||||
sha256 = "1qg6w8xz4pr227h1gxrbm6ylhqvspk95hvq2f9iakni7s56pkh1w";
|
||||
sha256 = "0dblb3qdg8mbgb8iiks0g420pza13npbr33b2xkc5dgv7kcwmvqj";
|
||||
};
|
||||
|
||||
buildInputs = [ luajit openssl perl ];
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zap-${version}";
|
||||
version = "2.5.0";
|
||||
version = "2.7.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaproxy";
|
||||
repo = "zaproxy";
|
||||
rev ="${version}";
|
||||
sha256 = "12bd0f2zrs7cvcyy2xj31m3szxrr2ifdjyd24z047qm465z3hj33";
|
||||
sha256 = "1bz4pgq66v6kxmgj99llacm1d85vj8z78jlgc2z9hv0ha5i57y32";
|
||||
};
|
||||
|
||||
buildInputs = [ jdk ant ];
|
||||
|
||||
26
pkgs/tools/package-management/pacman/default.nix
Normal file
26
pkgs/tools/package-management/pacman/default.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, perl, libarchive, openssl,
|
||||
zlib, bzip2, lzma }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pacman-${version}";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.archlinux.org/pacman.git/snapshot/pacman-${version}.tar.gz";
|
||||
sha256 = "1lk54k7d281v55fryqsajl4xav7rhpk8x8pxcms2v6dapp959hgi";
|
||||
};
|
||||
|
||||
# trying to build docs fails with a2x errors, unable to fix through asciidoc
|
||||
configureFlags = [ "--disable-doc" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ perl libarchive openssl zlib bzip2 lzma ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple library-based package manager";
|
||||
homepage = https://www.archlinux.org/pacman/;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mt-caret ];
|
||||
};
|
||||
}
|
||||
@@ -7,28 +7,16 @@ with pythonPackages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "diceware";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0p09q6945qvdmvckjl8rfqx0g8nf6igc3c6rab6v74k9bsmbf15p";
|
||||
sha256 = "0855n4dh16ws1dhw1ixxwk3wx7qr45xff7pn32pjg58p4z4cx168";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
# NOTE: remove once 0.9.4 is released
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "${meta.homepage}/commit/86379bf49ade2b486071d6d330515f01ecb06ab4.patch";
|
||||
sha256 = "0nxvxiqvxfsa9y6zwy9k7shsd0fk92psdzi4klqwd4wy3lbmw8di";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "${meta.homepage}/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733.patch";
|
||||
sha256 = "0ab4fc2pbl2hcxqw5rr6awbhlnmdna6igqjijywwr1byzb7ga4iq";
|
||||
})
|
||||
];
|
||||
checkInputs = [ coverage pytest ];
|
||||
|
||||
# see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733
|
||||
checkPhase = ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }:
|
||||
|
||||
buildGoPackage rec {
|
||||
version = "1.6.7";
|
||||
version = "1.6.11";
|
||||
name = "gopass-${version}";
|
||||
|
||||
goPackagePath = "github.com/justwatchcom/gopass";
|
||||
@@ -12,7 +12,7 @@ buildGoPackage rec {
|
||||
owner = "justwatchcom";
|
||||
repo = "gopass";
|
||||
rev = "v${version}";
|
||||
sha256 = "0al2avdvmnnz7h21hnvlacr20k50my5l67plgf4cphy52p9461vp";
|
||||
sha256 = "12pih414232bsdj1qqc04vck2p9254wjy044n5kbbdqbmfgap7sj";
|
||||
};
|
||||
|
||||
wrapperPath = with stdenv.lib; makeBinPath ([
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "minisign-${version}";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "minisign";
|
||||
owner = "jedisct1";
|
||||
rev = version;
|
||||
sha256 = "15w8fgplkxiw9757qahwmgnl4bwx9mm0rnwp1izs2jcy1wy35vp8";
|
||||
sha256 = "0rgg9jb5108hd5psivlrfd8cxnjylawm0glcry8ba6zlmkv949r8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "munge-0.5.12";
|
||||
name = "munge-0.5.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dun";
|
||||
repo = "munge";
|
||||
rev = "${name}";
|
||||
sha256 = "1wvkc63bqclpm5xmp3rn199x3jqd99255yicyydgz83cixp7wdbh";
|
||||
sha256 = "1c4ff3d8ad3inbliszr4slym3b4cn19bn6mxm13mzy20jyi2rm70";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook gawk gnused ];
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencryptoki-${version}";
|
||||
version = "3.8.1";
|
||||
version = "3.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opencryptoki";
|
||||
repo = "opencryptoki";
|
||||
rev = "v${version}";
|
||||
sha256 = "1m618pjfzw18irmh6i4pfq1gvcxgyfh9ikjn33nrdj55v2l27g31";
|
||||
sha256 = "1rf7cmibmx636vzv7p54g212478a8wim2lfjf2861hfd0m96nv4l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook libtool bison flex ];
|
||||
|
||||
@@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shc-${version}";
|
||||
version = "3.9.3";
|
||||
version = "3.9.6";
|
||||
rev = "${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "neurobin";
|
||||
repo = "shc";
|
||||
sha256 = "00fqzg4a0f4kp4wr8swhi5zqds3gh3gf7cgi1cipn16av0818xsa";
|
||||
sha256 = "07l6m24ivjnvbglxkx9mvarpzc453qrlq5ybkyz7jdilh481aj33";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tpm-quote-tools-${version}";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz";
|
||||
sha256 = "1d6ry2c78sgv0z4phfrwrbvgag83xnnfri2cdzrd86w4yfgnfwdf";
|
||||
sha256 = "1qjs83xb4np4yn1bhbjfhvkiika410v8icwnjix5ad96w2nlxp0h";
|
||||
};
|
||||
|
||||
buildInputs = [ trousers openssl ];
|
||||
|
||||
@@ -9,13 +9,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "vault-${version}";
|
||||
version = "0.9.0";
|
||||
version = "0.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = "vault";
|
||||
rev = "v${version}";
|
||||
sha256 = "1c3jaajf3wpjczbncvdpyy5vaa62gb9287bj2zi2khvqzvii36b0";
|
||||
sha256 = "1a12pfzln6qdff08j9l1807anrsgn3ggnaqda020p6y9zg1p8xzd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go gox removeReferencesTo ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "peco-${version}";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
goPackagePath = "github.com/peco/peco";
|
||||
subPackages = [ "cmd/peco" ];
|
||||
@@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
owner = "peco";
|
||||
repo = "peco";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jnlpr3nxx8xmjb6w4jlwshzz0p9hlww9919qbkm66afv16k0vm8";
|
||||
sha256 = "0cgfwbnz4jp2nvmqf2i03xf69by8g0xgd3k5k9aj46y9hps1ka92";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xidel-${version}";
|
||||
version = "0.8.4";
|
||||
version = "0.9.6";
|
||||
|
||||
## Source archive lacks file (manageUtils.sh), using pre-built package for now.
|
||||
#src = fetchurl {
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/videlibri/Xidel/Xidel%20${version}/xidel_${version}-1_amd64.deb";
|
||||
sha256 = "0gq95ag2661hsw8b7ii6z07ian832cz8g21lvq2cvps4a80ql1gi";
|
||||
sha256 = "0hskc74y7p4j1x33yx0w4fvr610p2yimas8pxhr6bs7mb9b300h7";
|
||||
}
|
||||
else if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
|
||||
@@ -176,6 +176,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
|
||||
# http://tex.stackexchange.com/questions/97999/when-to-use-luajittex-in-favour-of-luatex
|
||||
];
|
||||
|
||||
patches = [ ./luatex-gcc7.patch ];
|
||||
|
||||
configureScript = ":";
|
||||
|
||||
# we use static libtexlua, because it's only used by a single binary
|
||||
|
||||
30
pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch
Normal file
30
pkgs/tools/typesetting/tex/texlive/luatex-gcc7.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
https://www.tug.org/pipermail/tex-live/2017-June/040192.html
|
||||
---
|
||||
texk/web2c/luatexdir/luaffi/ctype.c | 4 ++++
|
||||
texk/web2c/luatexdir/luaffi/ffi.h | 2 +-
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/texk/web2c/luatexdir/luaffi/ctype.c
|
||||
+++ b/texk/web2c/luatexdir/luaffi/ctype.c 2017-05-31 13:08:25.421741873 +0000
|
||||
@@ -245,6 +245,10 @@ void* to_cdata(lua_State* L, int idx, st
|
||||
|
||||
lua_pop(L, 1); /* mt */
|
||||
cd = (struct cdata*) lua_touserdata(L, idx);
|
||||
+ if (!cd) {
|
||||
+ lua_pushnil(L);
|
||||
+ return NULL;
|
||||
+ }
|
||||
*ct = cd->type;
|
||||
lua_getuservalue(L, idx);
|
||||
|
||||
--- a/texk/web2c/luatexdir/luaffi/ffi.h
|
||||
+++ b/texk/web2c/luatexdir/luaffi/ffi.h 2017-06-01 09:12:45.128442092 +0000
|
||||
@@ -370,7 +370,7 @@ __declspec(align(16))
|
||||
#endif
|
||||
struct cdata {
|
||||
const struct ctype type
|
||||
-#ifdef __GNUC__
|
||||
+#if 0 /* def __GNUC__ */
|
||||
__attribute__ ((aligned(16)))
|
||||
#endif
|
||||
;
|
||||
@@ -2,12 +2,10 @@
|
||||
let
|
||||
|
||||
localPython = python.override {
|
||||
packageOverrides = self: super: rec {
|
||||
packageOverrides = self: super: {
|
||||
cement = super.cement.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.8.2";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7";
|
||||
};
|
||||
@@ -15,30 +13,15 @@ let
|
||||
|
||||
colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.3.7";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
|
||||
};
|
||||
});
|
||||
|
||||
docker = super.docker.overridePythonAttrs (oldAttrs: rec {
|
||||
pname = "docker-py";
|
||||
version = "1.7.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm";
|
||||
};
|
||||
});
|
||||
|
||||
requests = super.requests.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.9.1";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5";
|
||||
};
|
||||
@@ -46,18 +29,15 @@ let
|
||||
|
||||
semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.5.0";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname; inherit version;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0p5n3d6blgkncxdz00yxqav0cis87fisdkirjm0ljjh7rdfx7aiv";
|
||||
};
|
||||
});
|
||||
|
||||
tabulate = super.tabulate.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.7.5";
|
||||
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "03l1r7ddd1a0j2snv1yd0hlnghjad3fg1an1jr8936ksv75slwch";
|
||||
};
|
||||
@@ -65,7 +45,6 @@ let
|
||||
};
|
||||
};
|
||||
in with localPython.pkgs; buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "awsebcli";
|
||||
version = "3.12.3";
|
||||
|
||||
@@ -81,7 +60,10 @@ in with localPython.pkgs; buildPythonApplication rec {
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
blessed botocore cement colorama docker dockerpty docopt pathspec pyyaml
|
||||
# FIXME: Add optional docker dependency, which requires requests >= 2.14.2.
|
||||
# Otherwise, awsebcli will try to install it using pip when using some
|
||||
# commands (like "eb local run").
|
||||
blessed botocore cement colorama dockerpty docopt pathspec pyyaml
|
||||
requests semantic-version setuptools tabulate termcolor websocket_client
|
||||
];
|
||||
|
||||
@@ -92,7 +74,7 @@ in with localPython.pkgs; buildPythonApplication rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://aws.amazon.com/elasticbeanstalk/;
|
||||
description = "A command line interface for Elastic Beanstalk.";
|
||||
description = "A command line interface for Elastic Beanstalk";
|
||||
maintainers = with maintainers; [ eqyiel ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user