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

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2017-04-23 11:26:47 +02:00
parent 004ecac47b f45f2fb67a
commit 4fc9b1852a
150 changed files with 8832 additions and 4012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/audio/mpdris2/default.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "mpDris2";
version = "0.6";
version = "0.7";
src = fetchurl {
url = "https://github.com/eonpatapon/${name}/archive/${version}.tar.gz";
sha256 = "0zdmamj2ldhr6y3s464w8y2x3yizda784jnlrg3j3myfabssisvz";
sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21";
};
preConfigure = ''

35
pkgs/tools/compression/upx/default.nix
View File

@@ -1,33 +1,36 @@
{stdenv, fetchurl, ucl, zlib}:
{stdenv, fetchurl, fetchFromGitHub, ucl, zlib, perl}:
stdenv.mkDerivation {
name = "upx-3.91";
src = fetchurl {
url = mirror://sourceforge/upx/upx-3.91-src.tar.bz2;
sha256 = "0g3aiinlcb37z1xhs202h2qrgbf8dygiyarmflbgahcq89byfz2j";
stdenv.mkDerivation rec {
name = "upx-${version}";
version = "3.93";
src = fetchFromGitHub {
owner = "upx";
repo = "upx";
rev = "v${version}";
sha256 = "03ah23q85hx3liqyyj4vm8vip2d47bijsimagqd39q762a2rin3i";
};
buildInputs = [ ucl zlib ];
buildInputs = [ ucl zlib perl ];
lzmaSrc = fetchurl {
url = mirror://sourceforge/sevenzip/lzma443.tar.bz2;
sha256 = "1ck4z81y6xv1x9ky8abqn3mj9xj2dwg41bmd5j431xgi8crgd1ds";
lzmaSrc = fetchFromGitHub {
owner = "upx";
repo = "upx-lzma-sdk";
rev = "v${version}";
sha256 = "16vj1c5bl04pzma0sr4saqk80y2iklyslzmrb4rm66aifa365zqj";
};
preConfigure = "
export UPX_UCLDIR=${ucl}
mkdir lzma443
pushd lzma443
tar xf $lzmaSrc
popd
export UPX_LZMADIR=`pwd`/lzma443
cp -a $lzmaSrc/* src/lzma-sdk
export UPX_LZMADIR=`pwd`/src/lzma-sdk
cd src
";
buildPhase = "make CHECK_WHITESPACE=true";
installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx";
meta = {
homepage = http://upx.sourceforge.net/;
homepage = https://upx.github.io/;
description = "The Ultimate Packer for eXecutables";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;

8
pkgs/tools/graphics/asymptote/default.nix
View File

@@ -9,11 +9,11 @@ let
s = # Generated upstream information
rec {
baseName="asymptote";
version="2.40";
version="2.41";
name="${baseName}-${version}";
hash="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544";
url="https://netcologne.dl.sourceforge.net/project/asymptote/2.40/asymptote-2.40.src.tgz";
sha256="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544";
hash="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx";
url="https://freefr.dl.sourceforge.net/project/asymptote/2.41/asymptote-2.41.src.tgz";
sha256="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx";
};
buildInputs = [
ghostscriptX imagemagick fftw

9
pkgs/tools/misc/asciinema/default.nix
View File

@@ -4,7 +4,7 @@ let
pythonPackages = python3Packages;
in pythonPackages.buildPythonApplication rec {
name = "asciinema-${version}";
version = "1.3.0";
version = "1.4.0";
buildInputs = with pythonPackages; [ nose ];
propagatedBuildInputs = with pythonPackages; [ requests2 ];
@@ -13,9 +13,14 @@ in pythonPackages.buildPythonApplication rec {
owner = "asciinema";
repo = "asciinema";
rev = "v${version}";
sha256 = "1hx7xipyy9w72iwlawldlif9qk3f7b8jx8c1wcx114pqbjz5d347";
sha256 = "1m2gjqxb5gqyz19lvp7jmwp7cxjc6nb0b2rrlsg3z2bl6vmi1xn2";
};
patchPhase = ''
# disable one test which is failing with -> OSError: out of pty devices
rm tests/pty_recorder_test.py
'';
checkPhase = ''
nosetests
'';

19
pkgs/tools/misc/buildtorrent/default.nix Normal file
View File

@@ -0,0 +1,19 @@
{ stdenv, fetchurl }:
let version = "0.8"; in
stdenv.mkDerivation rec {
name = "buildtorrent";
src = fetchurl {
url = "http://mathr.co.uk/blog/code/${name}-${version}.tar.gz";
sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
};
meta = {
description = "A simple commandline torrent creator";
homepage = http://mathr.co.uk/blog/torrent.html;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
};
}

4
pkgs/tools/misc/units/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "units-${version}";
version = "2.13";
version = "2.14";
src = fetchurl {
url = "mirror://gnu/units/${name}.tar.gz";
sha256 = "1awhjw9zjlfb8s5g3yyx63f7ddfcr1sanlbxpqifmrgq24ql198b";
sha256 = "9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8";
};
buildInputs = [ readline ];

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@@ -14,11 +14,11 @@ with stdenv.lib;
buildPythonApplication rec {
name = "youtube-dl-${version}";
version = "2017.04.02";
version = "2017.04.17";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
sha256 = "131z42aq2qnh394y4ykzm3mvsf62lia86y90as6acyg4v201lgk2";
sha256 = "0bihcjghrpj8skh216wwb7i2r990f6b7x63m8vdamq5bw317wvrj";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/tools/networking/i2pd/default.nix
View File

@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
name = pname + "-" + version;
pname = "i2pd";
version = "2.12.0";
version = "2.13.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
sha256 = "1m97s3c1fvhq6ql3zr2a2ia2n06cl8jgf28gjn4k3xg8m7s984dz";
sha256 = "1gz8jmy2vq520w642jiff1zg4qpgpm2qkad5dgrq9f14ri14lkpp";
};
buildInputs = [ boost zlib openssl ];

10
pkgs/tools/networking/inetutils/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, perl }:
{ stdenv, fetchurl, ncurses, perl, help2man }:
stdenv.mkDerivation rec {
name = "inetutils-1.9.4";
@@ -8,9 +8,12 @@ stdenv.mkDerivation rec {
sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";
};
patches = [ ./whois-Update-Canadian-TLD-server.patch ];
patches = [
./whois-Update-Canadian-TLD-server.patch
./service-name.patch
];
buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ ];
buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ];
configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include";
@@ -18,6 +21,7 @@ stdenv.mkDerivation rec {
# $TMPDIR is too long.
#doCheck = true;
postInstall = ''
# XXX: These programs are normally installed setuid but since it
# fails, they end up being non-executable, hence this hack.

11
pkgs/tools/networking/inetutils/service-name.patch Normal file
View File

@@ -0,0 +1,11 @@
--- inetutils-1.9.4.org/whois/whois.c 2015-03-31 17:40:50.000000000 +0200
+++ inetutils-1.9.4/whois/whois.c 2017-04-20 10:23:38.487358708 +0200
@@ -576,7 +576,7 @@
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
- if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0)
+ if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0)
err_quit ("getaddrinfo: %s", gai_strerror (i));
for (ressave = res; res; res = res->ai_next)

2
pkgs/tools/networking/jwhois/default.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
sed -i -e "s|/usr/bin/lynx|${lynx}/bin/lynx|g" $out/etc/jwhois.conf
'';
patches = [ ./connect.patch ];
patches = [ ./connect.patch ./service-name.patch ];
meta = {
description = "A client for the WHOIS protocol allowing you to query the owner of a domain name";

17
pkgs/tools/networking/jwhois/service-name.patch Normal file
View File

@@ -0,0 +1,17 @@
--- a/src/dns.c 2007-06-25 23:58:38.000000000 -0700
+++ b/src/dns.c 2016-06-04 16:20:19.644865127 -0700
@@ -113,12 +113,13 @@
lookup_host_addrinfo(struct addrinfo **res, const char *host, int port)
{
struct addrinfo hints;
- char ascport[10] = "whois";
+ char ascport[10] = "nicname";
int error;
memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_UNSPEC;
+ hints.ai_flags = AI_ADDRCONFIG;
hints.ai_socktype = SOCK_STREAM;
if (port)
sprintf(ascport, "%9.9d", port);

4
pkgs/tools/networking/stunnel/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "stunnel-${version}";
version = "5.39";
version = "5.41";
src = fetchurl {
url = "http://www.stunnel.org/downloads/${name}.tar.gz";
sha256 = "1vjdn32iw11zqsygwxbjmqgs4644dk3ql1h8ap890ls6a1x0i318";
sha256 = "13qld0b8w2yfs2kfwnqvhcg98warh8hcyk13rjxdwv8zxqhn6p7h";
};
buildInputs = [ openssl ];

2
pkgs/tools/security/ecryptfs/helper.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin $out/libexec
cp $src $out/libexec/ecryptfs-helper.py
makeWrapper "${python2.interpreter} $out/libexec/ecryptfs-helper.py" $out/bin/ecryptfs-helper
makeWrapper "${python2.interpreter}" "$out/bin/ecryptfs-helper" --add-flags "$out/libexec/ecryptfs-helper.py"
'';
meta = with stdenv.lib; {

6
pkgs/tools/system/runit/default.nix
View File

@@ -1,4 +1,6 @@
{ stdenv, fetchurl
# Build runit-init as a static binary
, static ? false
}:
@@ -19,7 +21,9 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optionals static [ stdenv.cc.libc stdenv.cc.libc.static ];
postPatch = stdenv.lib.optionalString (!static) ''
postPatch = ''
sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h
'' + stdenv.lib.optionalString (!static) ''
sed -i 's,-static,,g' src/Makefile
'';

13
pkgs/tools/text/kdiff3/default.nix
View File

@@ -1,5 +1,5 @@
{
kdeDerivation, kdeWrapper, lib, fetchgit,
kdeDerivation, kdeWrapper, lib, fetchgit, fetchpatch,
extra-cmake-modules, kdoctools, kconfig, kinit, kparts
}:
@@ -18,6 +18,15 @@ let
setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
patches = [
(fetchpatch {
name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
sha256 = "0v638rk05wz51qcqnc6blcp2v74f04wn8ifgzw7qi5vr0yfh775r";
})
];
patchFlags = "-p 2";
postPatch = ''
sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
'';
@@ -26,6 +35,8 @@ let
propagatedBuildInputs = [ kconfig kinit kparts ];
enableParallelBuilding = true;
meta = with lib; {
homepage = http://kdiff3.sourceforge.net/;
license = licenses.gpl2Plus;

25
pkgs/tools/text/xsv/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
with rustPlatform;
buildRustPackage rec {
name = "xsv-${version}";
version = "0.11.0";
src = fetchFromGitHub {
owner = "BurntSushi";
repo = "xsv";
rev = "${version}";
sha256 = "169rp4izcjhhlrqrhvlvsbiz7wqfi6g3kjfgrddgvahp0ls29hls";
};
depsSha256 = "006sp66l2gybyk1n7lxp645k6drz5cgxcix376k8qr0v9jwadlqa";
meta = with stdenv.lib; {
description = "A fast CSV toolkit written in Rust";
homepage = https://github.com/BurntSushi/xsv;
license = with licenses; [ unlicense ];
maintainers = [ maintainers.jgertm ];
platforms = platforms.all;
};
}