Merge branch 'master' into update/grv-0.2.0
This commit is contained in:
Jörg Thalheim
@@ -19,11 +19,11 @@ let
|
||||
|
||||
in py.pkgs.buildPythonApplication rec {
|
||||
pname = "awscli";
|
||||
version = "1.15.58";
|
||||
version = "1.15.66";
|
||||
|
||||
src = py.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "19wnr498q2mwbp8l978ahy9y7p7icahx53898fki6sbhd9pn2miq";
|
||||
sha256 = "004fbd3bb8932465205675a7de94460b5c2d45ddd6916138a2c867e4d0f2a4c4";
|
||||
};
|
||||
|
||||
# No tests included
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
};
|
||||
|
||||
in pythonPackages.buildPythonApplication rec {
|
||||
name = "beets-${version}";
|
||||
pname = "beets";
|
||||
version = "1.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -114,7 +114,6 @@ in pythonPackages.buildPythonApplication rec {
|
||||
pythonPackages.munkres
|
||||
pythonPackages.musicbrainzngs
|
||||
pythonPackages.mutagen
|
||||
pythonPackages.pathlib
|
||||
pythonPackages.pyyaml
|
||||
pythonPackages.unidecode
|
||||
pythonPackages.gst-python
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://dar.linux.free.fr;
|
||||
description = "Disk ARchiver, allows backing up files into indexed archives";
|
||||
maintainers = with maintainers; [ viric ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ python2Packages.buildPythonApplication rec {
|
||||
description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
|
||||
homepage = http://www.nongnu.org/duplicity;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ viric peti ];
|
||||
maintainers = with maintainers; [ peti ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
27
pkgs/tools/filesystems/android-file-transfer/default.nix
Normal file
27
pkgs/tools/filesystems/android-file-transfer/default.nix
Normal file
@@ -0,0 +1,27 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "android-file-transfer-${version}";
|
||||
version = "3.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "whoozle";
|
||||
repo = "android-file-transfer-linux";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xwl0vk57174gdjhgqkzrirwzd2agdm84q30dq9q376ixgxjrifc";
|
||||
};
|
||||
buildInputs = [ cmake fuse readline pkgconfig qtbase ];
|
||||
buildPhase = ''
|
||||
cmake .
|
||||
make
|
||||
'';
|
||||
installPhase = ''
|
||||
make install
|
||||
'';
|
||||
meta = with stdenv.lib; {
|
||||
description = "Reliable MTP client with minimalistic UI";
|
||||
homepage = http://whoozle.github.io/android-file-transfer-linux/;
|
||||
license = licenses.lgpl21;
|
||||
maintainers = [ maintainers.xaverdh ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://code.google.com/p/cryptsetup/;
|
||||
description = "LUKS for dm-crypt";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric chaoflow ];
|
||||
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.sentex.net/~mwandel/jhead/;
|
||||
description = "Exif Jpeg header manipulation tool";
|
||||
license = licenses.publicDomain;
|
||||
maintainers = with maintainers; [ viric rycee ];
|
||||
maintainers = with maintainers; [ rycee ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -24,5 +24,6 @@ in stdenv.mkDerivation rec {
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ gnidorah ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "2.3.0.3";
|
||||
version = "2.5.0.0";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = "git://git.skarnet.org/execline";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1q0izb8ajzxl36fjpy4rn63sz01055r9s33fga99jprdmkkfzz6x";
|
||||
sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "lib" "dev" "doc" "out" ];
|
||||
|
||||
@@ -2,24 +2,25 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "fortune-mod-1.99.1";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz;
|
||||
sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw";
|
||||
};
|
||||
|
||||
|
||||
buildInputs = [ recode ];
|
||||
|
||||
|
||||
preConfigure = ''
|
||||
sed -i "s|/usr/|$out/|" Makefile
|
||||
sed -i "s|/usr/|$out/|" Makefile
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray=("CC=$CC" "REGEXDEFS=-DHAVE_REGEX_H -DPOSIX_REGEX" "LDFLAGS=")
|
||||
'';
|
||||
|
||||
|
||||
postInstall = ''
|
||||
ln -s $out/games/fortune $out/bin/fortune
|
||||
mv $out/games/fortune $out/bin/fortune
|
||||
rmdir $out/games
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -42,8 +42,8 @@ buildGoPackage rec {
|
||||
cp $src/bin/fzf-tmux $bin/bin
|
||||
mkdir -p $man/share/man
|
||||
cp -r $src/man/man1 $man/share/man
|
||||
mkdir -p $out/share/vim-plugins
|
||||
ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
|
||||
mkdir -p $out/share/vim-plugins/${name}
|
||||
cp -r $src/plugin $out/share/vim-plugins/${name}
|
||||
|
||||
cp -R $src/shell $bin/share/fzf
|
||||
cat <<SCRIPT > $bin/bin/fzf-share
|
||||
|
||||
@@ -1,12 +1,23 @@
|
||||
{ stdenv, fetchurl, elk6Version, makeWrapper, jre }:
|
||||
{ elk6Version
|
||||
, enableUnfree ? true
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, jre
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = elk6Version;
|
||||
name = "logstash-${version}";
|
||||
name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
|
||||
sha256 = "07j3jjg5ik4gjgvcx15qqqas9p1m3815jml82a5r1ip9l6vc4h20";
|
||||
sha256 =
|
||||
if enableUnfree
|
||||
then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr"
|
||||
else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
@@ -35,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
|
||||
homepage = https://www.elastic.co/products/logstash;
|
||||
license = licenses.asl20;
|
||||
license = if enableUnfree then licenses.elastic else licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ wjlroe offline basvandijk ];
|
||||
};
|
||||
|
||||
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://mktorrent.sourceforge.net/;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
description = "Command line utility to create BitTorrent metainfo files";
|
||||
maintainers = with stdenv.lib.maintainers; [viric Profpatsch];
|
||||
maintainers = with stdenv.lib.maintainers; [Profpatsch];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, perl, makeWrapper, procps }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "parallel-20180622";
|
||||
name = "parallel-20180722";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parallel/${name}.tar.bz2";
|
||||
sha256 = "1n91dnnl8d8pman20hr03l9qrpc9wm5hw32ph45xjs0bgp1nmk7j";
|
||||
sha256 = "06635p9w4kl0mvqlbgglsndl1zm06f65ckzrjl9p8n4cswf443fg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper perl ];
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.ivarch.com/programs/pv;
|
||||
description = "Tool for monitoring the progress of data through a pipeline";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
maintainers = with stdenv.lib.maintainers; [ viric jgeerds ];
|
||||
maintainers = with stdenv.lib.maintainers; [ jgeerds ];
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://www.roaringpenguin.com/products/remind;
|
||||
description = "Sophisticated calendar and alarm program for the console";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [viric raskin kovirobi];
|
||||
maintainers = with stdenv.lib.maintainers; [raskin kovirobi];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Wireless encryption cracking tools";
|
||||
homepage = http://www.aircrack-ng.org/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ domenkozar viric garbas chaoflow ];
|
||||
maintainers = with maintainers; [ domenkozar garbas chaoflow ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://troglobit.com/project/inadyn/;
|
||||
description = "Free dynamic DNS client";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Free IMAP and MailDir mailbox synchronizer";
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
maintainers = with maintainers; [ the-kenny viric ];
|
||||
maintainers = with maintainers; [ the-kenny ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = licenses.gpl2;
|
||||
homepage = http://nuttcp.net/;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
|
||||
homepage = http://monkey.org/~marius/nylon;
|
||||
description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ edwtjo viric ];
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "2.2.0.1";
|
||||
version = "2.3.0.0";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = "git://git.skarnet.org/s6-dns";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "10qvkh608nsx8gqs3pj4pb8aivwpshbmjw2766grgmrb35d31brl";
|
||||
sha256 = "1hczdg3dzi9z6f0wicm2qa2239fiax915zp66xspdz6qd23nqrxb";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "lib" "dev" "doc" "out" ];
|
||||
|
||||
@@ -1,10 +1,25 @@
|
||||
{ stdenv, execline, fetchgit, s6, s6-dns, skalibs }:
|
||||
{ stdenv, execline, fetchgit, s6, s6-dns, skalibs
|
||||
|
||||
# Whether to build the TLS/SSL tools and what library to use
|
||||
# acceptable values: "libressl", false
|
||||
# TODO: add bearssl
|
||||
, sslSupport ? "libressl" , libressl
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv) lib;
|
||||
|
||||
version = "2.3.0.2";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
sslSupportEnabled = sslSupport != false;
|
||||
sslLibs = {
|
||||
"libressl" = libressl;
|
||||
};
|
||||
|
||||
in
|
||||
assert sslSupportEnabled -> sslLibs ? ${sslSupport};
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "s6-networking-${version}";
|
||||
|
||||
@@ -41,7 +56,12 @@ in stdenv.mkDerivation rec {
|
||||
"--with-dynlib=${s6.out}/lib"
|
||||
"--with-dynlib=${s6-dns.lib}/lib"
|
||||
]
|
||||
++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}");
|
||||
++ (lib.optionals sslSupportEnabled [
|
||||
"--enable-ssl=${sslSupport}"
|
||||
"--with-include=${lib.getDev sslLibs.${sslSupport}}/include"
|
||||
"--with-lib=${lib.getLib sslLibs.${sslSupport}}/lib"
|
||||
])
|
||||
++ (lib.optional stdenv.isDarwin "--build=${stdenv.system}");
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $doc/share/doc/s6-networking/
|
||||
@@ -51,8 +71,8 @@ in stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://www.skarnet.org/software/s6-networking/;
|
||||
description = "A suite of small networking utilities for Unix systems";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = stdenv.lib.licenses.isc;
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
|
||||
};
|
||||
|
||||
|
||||
@@ -71,7 +71,9 @@ let
|
||||
doInstallCheck = true; # not cross
|
||||
|
||||
# socket path becomes too long otherwise
|
||||
preInstallCheck = lib.optional stdenv.isDarwin "export TMPDIR=/tmp";
|
||||
preInstallCheck = lib.optional stdenv.isDarwin ''
|
||||
export TMPDIR=$NIX_BUILD_TOP
|
||||
'';
|
||||
|
||||
separateDebugInfo = stdenv.isLinux;
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
description = "ccid drivers for pcsclite";
|
||||
homepage = http://pcsclite.alioth.debian.org/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ viric wkennington ];
|
||||
maintainers = with maintainers; [ wkennington ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Set of libraries and utilities to access smart cards";
|
||||
homepage = https://github.com/OpenSC/OpenSC/wiki;
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ viric wkennington ];
|
||||
maintainers = with maintainers; [ wkennington ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Middleware to access a smart card using SCard API (PC/SC)";
|
||||
homepage = https://pcsclite.apdu.fr/;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ viric wkennington ];
|
||||
maintainers = with maintainers; [ wkennington ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Tools used to test a PC/SC driver, card or reader";
|
||||
homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "0.3.0.0";
|
||||
version = "0.4.0.1";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = "git://git.skarnet.org/s6-rc";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "174a3l92nkhxrx8gq36xmb5a7krj40iz1xdiii25nxwjfiw5ynfb";
|
||||
sha256 = "10gkkdbvkb4s2yshx425v9diwm7vvbl320a2bm0c3wz71xr94wsw";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "lib" "dev" "doc" "out" ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
|
||||
version = "2.6.1.1";
|
||||
version = "2.7.1.1";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = "git://git.skarnet.org/s6";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "162hng8xcwjp8pr4d78zq3f82lm9c6ldbcfll0mjsmnxdds5hrsg";
|
||||
sha256 = "0dncw3h9wc4cgc9q8zjwicgbcqcn6722yhk8g9bvrhs7h4fkfqav";
|
||||
};
|
||||
|
||||
# NOTE lib: cannot split lib from bin at the moment,
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://waterlan.home.xs4all.nl/dos2unix.html;
|
||||
description = "Tools to transform text files from dos to unix formats and vicervesa";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [viric ndowens ];
|
||||
maintainers = with maintainers; [ndowens ];
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ mkDerivation rec {
|
||||
homepage = http://kdiff3.sourceforge.net/;
|
||||
license = licenses.gpl2Plus;
|
||||
description = "Compares and merges 2 or 3 files or directories";
|
||||
maintainers = with maintainers; [ viric peterhoeg ];
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Converts HTML files to PostScript and PDF";
|
||||
homepage = https://michaelrsweet.github.io/htmldoc;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ viric shanemikel ];
|
||||
maintainers = with maintainers; [ shanemikel ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
|
||||
longDescription = ''
|
||||
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
||||
description = "Simple tool for doing everyday things with PDF documents";
|
||||
homepage = https://www.pdflabs.com/tools/pdftk-server/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [viric raskin];
|
||||
maintainers = with stdenv.lib.maintainers; [raskin];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = http://rtmpdump.mplayerhq.hu/;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ codyopel viric ];
|
||||
maintainers = with maintainers; [ codyopel ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user