Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III 2015-07-19 15:20:04 -07:00
commit 05c0fc15c0
23 changed files with 249 additions and 34 deletions

View file

@ -189,6 +189,7 @@
./services/misc/cpuminer-cryptonight.nix
./services/misc/cgminer.nix
./services/misc/confd.nix
./services/misc/devmon.nix
./services/misc/dictd.nix
./services/misc/disnix.nix
./services/misc/docker-registry.nix

View file

@ -0,0 +1,28 @@
{ pkgs, config, lib, ... }:
with lib;
let
cfg = config.services.devmon;
in {
options = {
services.devmon = {
enable = mkOption {
default = false;
description = ''
Whether to enable devmon, an automatic device mounting daemon.
'';
};
};
};
config = mkIf cfg.enable {
systemd.services.devmon = {
description = "devmon automatic device mounting daemon";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.udevil ];
serviceConfig.ExecStart = "${pkgs.udevil}/bin/devmon";
};
};
}

View file

@ -63,12 +63,30 @@ in {
twoFingerScroll = mkOption {
type = types.bool;
default = false;
description = "Whether to enable two-finger drag-scrolling.";
description = "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll.";
};
horizTwoFingerScroll = mkOption {
type = types.bool;
default = cfg.twoFingerScroll;
description = "Whether to enable horizontal two-finger drag-scrolling.";
};
vertTwoFingerScroll = mkOption {
type = types.bool;
default = cfg.twoFingerScroll;
description = "Whether to enable vertical two-finger drag-scrolling.";
};
horizEdgeScroll = mkOption {
type = types.bool;
default = ! cfg.horizTwoFingerScroll;
description = "Whether to enable horizontal edge drag-scrolling.";
};
vertEdgeScroll = mkOption {
type = types.bool;
default = ! cfg.twoFingerScroll;
default = ! cfg.vertTwoFingerScroll;
description = "Whether to enable vertical edge drag-scrolling.";
};
@ -147,9 +165,10 @@ in {
Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
Option "VertTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
Option "HorizTwoFingerScroll" "${if cfg.twoFingerScroll then "1" else "0"}"
Option "VertTwoFingerScroll" "${if cfg.vertTwoFingerScroll then "1" else "0"}"
Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}"
Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}"
${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""}
${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''}
${cfg.additionalOptions}

View file

@ -11,10 +11,10 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "nano-${version}";
version = "2.4.1";
version = "2.4.2";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.gz";
sha256 = "1li99ycnva40hiavm9lf34gjny74mj469x6ismrfm6wv3dgfn33a";
sha256 = "1fb5gzdm3jdx1f2vyanjvdmppaz082lf4kinyffnssgmzhc7zkf8";
};
buildInputs = [ ncurses ] ++ optional enableNls gettext;
configureFlags = ''

View file

@ -0,0 +1,27 @@
{stdenv, fetchurl, ncurses, gettext}:
stdenv.mkDerivation {
name = "calcurse-4.0.0";
src = fetchurl {
url = http://calcurse.org/files/calcurse-4.0.0.tar.gz;
sha256 = "0d33cpkbhyidvm3xx6iw9ljqdvl6477c2kcwix3bs63nj0ch06v2";
};
buildInputs = [ncurses gettext];
meta = {
description = "A calendar and scheduling application for the command line";
version = "4.0.0";
longDescription = ''
calcurse is a calendar and scheduling application for the command line. It helps
keep track of events, appointments and everyday tasks. A configurable notification
system reminds users of upcoming deadlines, the curses based interface can be
customized to suit user needs and a very powerful set of command line options can
be used to filter and format appointments, making it suitable for use in scripts.
'';
homepage = http://calcurse.org/;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgs, pythonPackages }:
pythonPackages.buildPythonPackage rec {
version = "0.4.0";
version = "0.4.1";
name = "khard-${version}";
namePrefix = "";
src = fetchurl {
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
sha256 = "0xvg8725297faw5mk7ka4xjc968vq3ix7izd4vmsaqysl43gnh21";
sha256 = "09yibjzly711hwpg345n653rz47llvrj4shnlcxd8snzvg8m5gri";
};
propagatedBuildInputs = with pythonPackages; [

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
version = "1.0.0";
version = "1.0.1";
name = "mdp-${version}";
src = fetchurl {
url = "https://github.com/visit1985/mdp/archive/${version}.tar.gz";
sha256 = "1xkmzcwa5ml1xfv92brwirnm00a44jkj7wpfimxbny98zgmad8vn";
sha256 = "0vmr0ymq06r50yags9nv6fk4f890b82a7bvxg697vrgs04i2x4dy";
};
makeFlags = "PREFIX=$(out)";

View file

@ -0,0 +1,30 @@
{ stdenv, fetchurl, intltool, glib, pkgconfig, udev, utillinux, acl }:
stdenv.mkDerivation {
name = "udevil-0.4.4";
src = fetchurl {
url = https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz;
sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd";
};
buildInputs = [ intltool glib pkgconfig udev ];
configurePhase = ''
substituteInPlace src/Makefile.am --replace "-o root -g root" ""
substituteInPlace src/Makefile.in --replace "-o root -g root" ""
./configure \
--prefix=$out \
--with-mount-prog=${utillinux}/bin/mount \
--with-umount-prog=${utillinux}/bin/umount \
--with-losetup-prog=${utillinux}/bin/losetup \
--with-setfacl-prog=${acl}/bin/setfacl \
--sysconfdir=$prefix/etc
'';
preConfigure = ''
cat src/Makefile.am
exit 2
'';
meta = {
description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes";
homepage = https://ignorantguru.github.io/udevil/;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3;
};
}

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
python34Packages.buildPythonPackage rec {
version = "0.9.3";
version = "0.9.4";
name = "canto-curses-${version}";
src = fetchFromGitHub {
owner = "themoken";
repo = "canto-curses";
rev = "v${version}";
sha256 = "1k3rbniyfdbqhbkclgrrvfjgvfl5if4c2rbgpcb6l2l5v6i1y742";
sha256 = "0g1ckcb9xcfb0af17zssiqcrfry87agx578vd40nb6gbw90ql4fn";
};
buildInputs = [ readline ncurses canto-daemon ];

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, python34Packages, }:
python34Packages.buildPythonPackage rec {
version = "0.9.1";
version = "0.9.3";
name = "canto-daemon-${version}";
namePrefix = "";
@ -9,7 +9,7 @@ python34Packages.buildPythonPackage rec {
owner = "themoken";
repo = "canto-next";
rev = "v${version}";
sha256 = "14lh6x0yz2asspwdi1ims01589r79q0dv77vq61gfjk5wiwfbdwa";
sha256 = "1x875qdyhab89nwwa2bzbfvcrkx34zwyy8dlbxm8wg3vz9b78l61";
};
propagatedBuildInputs = with python34Packages; [ feedparser ];

View file

@ -4,12 +4,12 @@ with goPackages;
buildGoPackage rec {
name = "syncthing-${version}";
version = "0.11.15";
version = "0.11.16";
goPackagePath = "github.com/syncthing/syncthing";
src = fetchgit {
url = "git://github.com/syncthing/syncthing.git";
rev = "refs/tags/v${version}";
sha256 = "8afd0a0999c7d7d285f361589330421c00012da86ce91623c5ad6b96d8fb9695";
sha256 = "f9b5c2de7e2b6592cccb0222c48b9baa2497dce519824a75923d40cc722ab937";
};
subPackages = [ "cmd/syncthing" ];

View file

@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
postUnpack = ''
mkdir -v $sourceRoot/src
'' + (stdenv.lib.concatMapStrings (f: "ln -sv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
'' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
+ ''
ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name}
ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name}

View file

@ -7,6 +7,7 @@
, qt5
, libv4l
, x264
, curl
, pulseaudioSupport ? false
, libpulseaudio
@ -16,14 +17,15 @@ let
optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "obs-studio-${version}";
version = "0.10.0";
version = "0.11.1";
src = fetchurl {
url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz";
sha256 = "1xms48gl20pr9g8bv8ygykh6m99c3wjphsavr4hb1d5263r9f4in";
sha256 = "12g1y6y8ixvgvwk75x7qgq0j06d5khd0w3if6kahswlc58q65fm8";
};
buildInputs = [ cmake
curl
ffmpeg
jansson
libv4l

View file

@ -0,0 +1,8 @@
{ callPackage, apacheHttpd }:
callPackage ./generic.nix {
phpVersion = "7.0.0beta1";
url = "https://downloads.php.net/~ab/php-7.0.0beta1.tar.bz2";
sha = "1pj3ysfhswg2r370ivp33fv9zbcl3yvhmxgnc731k08hv6hmd984";
apacheHttpd = apacheHttpd;
php7 = true;
}

View file

@ -0,0 +1,23 @@
--- php-7.0.0beta1/configure 2015-07-10 12:11:41.810045613 +0000
+++ php-7.0.0beta1-new/configure 2015-07-17 16:10:21.775528267 +0000
@@ -6172,7 +6172,7 @@
as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
fi
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+ APXS_LIBEXECDIR="$prefix/modules"
if test -z `$APXS -q SYSCONFDIR`; then
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
@@ -37303,9 +37303,7 @@
if test "$PHP_GETTEXT" != "no"; then
- for i in $PHP_GETTEXT /usr/local /usr; do
- test -r $i/include/libintl.h && GETTEXT_DIR=$i && break
- done
+ GETTEXT_DIR=$PHP_GETTEXT
if test -z "$GETTEXT_DIR"; then
as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5

View file

@ -4,7 +4,8 @@
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
, uwimap, pam, gmp
, phpVersion, apacheHttpd, sha }:
, phpVersion, apacheHttpd, sha
, php7 ? false, url ? null }:
let
libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@ -212,7 +213,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
imapSupport = config.php.imap or true;
ldapSupport = config.php.ldap or true;
mhashSupport = config.php.mhash or true;
mysqlSupport = config.php.mysql or true;
mysqlSupport = (!php7) && (config.php.mysql or true);
mysqliSupport = config.php.mysqli or true;
pdo_mysqlSupport = config.php.pdo_mysql or true;
libxml2Support = config.php.libxml2 or true;
@ -220,7 +221,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
bcmathSupport = config.php.bcmath or true;
socketsSupport = config.php.sockets or true;
curlSupport = config.php.curl or true;
curlWrappersSupport = config.php.curlWrappers or true;
curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
gettextSupport = config.php.gettext or true;
pcntlSupport = config.php.pcntl or true;
postgresqlSupport = config.php.postgresql or true;
@ -241,7 +242,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
ftpSupport = config.php.ftp or true;
fpmSupport = config.php.fpm or true;
gmpSupport = config.php.gmp or true;
mssqlSupport = config.php.mssql or (!stdenv.isDarwin);
mssqlSupport = (!php7) && (config.php.mssql or (!stdenv.isDarwin));
ztsSupport = config.php.zts or false;
calendarSupport = config.php.calendar or true;
};
@ -267,7 +268,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
'';
src = fetchurl {
url = "http://www.php.net/distributions/php-${version}.tar.bz2";
url = if url == null then
"http://www.php.net/distributions/php-${version}.tar.bz2"
else
url;
sha256 = sha;
};
@ -278,6 +282,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
maintainers = with maintainers; [ globin ];
};
patches = [ ./fix-paths.patch ];
patches = if !php7 then
[ ./fix-paths.patch ]
else
[ ./fix-paths-php7.patch ]
;
})

View file

@ -5,17 +5,17 @@
stdenv.mkDerivation rec {
name = "gst-vaapi-${version}";
version = "0.5.10";
version = "0.6.0";
src = fetchurl {
url = "${meta.homepage}/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.bz2";
sha256 = "179wnz4c4gnw9ibfgjrad9b44icygadaknsgjfw24lr2pz3kdlhd";
sha256 = "1f3ji0h0x49w4wpqc0widraa9kvq0b47idrdxq4znjb8c1bwd97n";
};
nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
buildInputs = with stdenv.lib; [ gstreamer gst-plugins-base gst-plugins-bad libva libdrm udev
xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr mesa nasm libvpx ];
xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM xorg.libICE mesa nasm libvpx ];
preConfigure = "
export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0

View file

@ -0,0 +1,34 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
version = "1.2.12";
name = "zlog-${version}";
src = fetchzip {
name = "${name}-src";
url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz";
sha256 = "1ychld0dcfdak2wnmkj941i0xav6ynlb3n6hz1kz03yy74ll2fqi";
};
configurePhase = ''
sed -i 's;-Werror;;' src/makefile
'';
buildPhase = ''
mkdir -p $out
make PREFIX=$out
'';
installPhase = ''
make PREFIX=$out install
'';
meta = with stdenv.lib; {
description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library";
homepage = http://hardysimpson.github.com/zlog;
license = licenses.lgpl21;
platforms = platforms.linux; # cannot test on something else
maintainers = [ maintainers.matthiasbeyer ];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "linux-pam-${version}";
version = "1.2.0";
version = "1.2.1";
src = fetchurl {
url = "http://www.linux-pam.org/library/Linux-PAM-${version}.tar.bz2";
sha256 = "192y2fgf24a5qsg7rl1mzgw5axs5lg8kqamkfff2x50yjv2ym2yd";
sha256 = "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl";
};
nativeBuildInputs = [ flex ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "dnscrypt-proxy-${version}";
version = "1.5.0";
version = "1.6.0";
src = fetchurl {
url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
sha256 = "1cp3ivxngrihil6i7b659d39v9v6iwjs16s2kj9wz1anzyx0j6nx";
sha256 = "0zfw9vi9qbsc55awncyigqfqp25v5adqk6jpg1jdfkmbqqfykk70";
};
configureFlags = ''

View file

@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
name = "sudo-1.8.13";
name = "sudo-1.8.14p1";
src = fetchurl {
urls =
[ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
"ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
];
sha256 = "09asw1hpxc39a6hhydr8n33m2pni1b5m37vaj7b00761ybnyax73";
sha256 = "1806kxnkjibky8y04s4f9mpj0403v4b6sqdnmyaa98mnq3qwsb5i";
};
configureFlags = [

View file

@ -4961,6 +4961,8 @@ let
php56 = callPackage ../development/interpreters/php/5.6.nix { };
php70 = callPackage ../development/interpreters/php/7.0.nix { };
picoc = callPackage ../development/interpreters/picoc {};
picolisp = callPackage ../development/interpreters/picolisp {};
@ -8395,6 +8397,8 @@ let
fetchurl = fetchurlBoot;
};
zlog = callPackage ../development/libraries/zlog { };
zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib {
static = true;
}));
@ -10764,6 +10768,8 @@ let
inherit (gnome) libglade;
};
calcurse = callPackage ../applications/misc/calcurse { };
calibre = callPackage ../applications/misc/calibre {
inherit (pythonPackages) pyqt5 sip_4_16;
};
@ -15104,4 +15110,6 @@ let
hbase = callPackage ../servers/hbase {};
udevil = callPackage ../applications/misc/udevil {};
}; in self; in pkgs

View file

@ -2272,6 +2272,33 @@ let
};
};
pkginfo = buildPythonPackage rec {
version = "1.2.1";
name = "pkginfo-${version}";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/p/pkginfo/${name}.tar.gz";
sha256 = "0g0g6avplfqw1adzqybbrh1a2z0kfjl8qn3annkrc7w3ibz6sgxd";
};
doCheck = false; # I don't know why, but with doCheck = true it fails.
meta = {
homepage = https://pypi.python.org/pypi/pkginfo;
license = licenses.mit;
description = "Query metadatdata from sdists / bdists / installed packages.";
longDescription = ''
This package provides an API for querying the distutils metadata
written in the PKG-INFO file inside a source distriubtion (an sdist)
or a binary distribution (e.g., created by running bdist_egg). It can
also query the EGG-INFO directory of an installed distribution, and the
*.egg-info stored in a development checkout (e.g, created by running
setup.py develop).
'';
};
};
pretend = buildPythonPackage rec {
name = "pretend-1.0.8";