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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2016-07-09 16:49:48 +02:00
commit 95a9fa0ba0
18 changed files with 178 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nixos/modules/services/networking/ddclient.nix
View File

@ -7,22 +7,8 @@ let
stateDir = "/var/spool/ddclient";
ddclientUser = "ddclient";
ddclientFlags = "-foreground -verbose -noquiet -file ${ddclientCfg}";
ddclientFlags = "-foreground -verbose -noquiet -file /etc/ddclient.conf";
ddclientPIDFile = "${stateDir}/ddclient.pid";
ddclientCfg = pkgs.writeText "ddclient.conf" ''
daemon=600
cache=${stateDir}/ddclient.cache
pid=${ddclientPIDFile}
use=${config.services.ddclient.use}
login=${config.services.ddclient.username}
password=${config.services.ddclient.password}
protocol=${config.services.ddclient.protocol}
server=${config.services.ddclient.server}
ssl=${if config.services.ddclient.ssl then "yes" else "no"}
wildcard=YES
${config.services.ddclient.domain}
${config.services.ddclient.extraConfig}
'';
in
@ -122,10 +108,30 @@ in
home = stateDir;
};
environment.etc."ddclient.conf" = {
uid = config.ids.uids.ddclient;
mode = "0600";
text = ''
daemon=600
cache=${stateDir}/ddclient.cache
pid=${ddclientPIDFile}
use=${config.services.ddclient.use}
login=${config.services.ddclient.username}
password=${config.services.ddclient.password}
protocol=${config.services.ddclient.protocol}
server=${config.services.ddclient.server}
ssl=${if config.services.ddclient.ssl then "yes" else "no"}
wildcard=YES
${config.services.ddclient.domain}
${config.services.ddclient.extraConfig}
'';
};
systemd.services.ddclient = {
description = "Dynamic DNS Client";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
restartTriggers = [ config.environment.etc."ddclient.conf".source ];
serviceConfig = {
# Uncomment this if too many problems occur:

30
pkgs/applications/misc/mop/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, lib, buildGoPackage, fetchgit }:
buildGoPackage rec {
name = "mop-${version}";
version = "0.2.0";
rev = "bc666ec165d08b43134f7ec0bf29083ad5466243";
goPackagePath = "github.com/michaeldv/mop";
goDeps = ./deps.json;
preConfigure = ''
for i in $(find . -type f);do
substituteInPlace $i --replace michaeldv/termbox-go nsf/termbox-go
done
substituteInPlace Makefile --replace mop/cmd mop/mop
mv cmd mop
'';
src = fetchgit {
inherit rev;
url = "https://github.com/mop-tracker/mop";
sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx";
};
meta = {
description = "Simple stock tracker implemented in go";
homepage = https://github.com/mop-tracker/mop;
platforms = stdenv.lib.platforms.all;
};
}

8
pkgs/applications/misc/mop/deps.json Normal file
View File

@ -0,0 +1,8 @@
[
{
"include": "../../libs.json",
"packages": [
"github.com/nsf/termbox-go"
]
}
]

4
pkgs/applications/video/handbrake/default.nix
View File

@ -20,7 +20,7 @@
libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,
lame, faac, ffmpeg, libdvdread, libdvdnav, libbluray,
mp4v2, mpeg2dec, x264, libmkv,
fontconfig, freetype,
fontconfig, freetype, hicolor_icon_theme,
glib, gtk, webkitgtk, intltool, libnotify,
gst_all_1, dbus_glib, udev, libgudev,
useGtk ? true,
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ];
buildInputs = [
fribidi fontconfig freetype
fribidi fontconfig freetype hicolor_icon_theme
libass libsamplerate libxml2 bzip2
libogg libtheora libvorbis libdvdcss a52dec libmkv fdk_aac
lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264

10
pkgs/data/misc/geolite-legacy/default.nix
View File

@ -8,20 +8,20 @@ let
in
stdenv.mkDerivation rec {
name = "geolite-legacy-${version}";
version = "2016-07-04";
version = "2016-07-08";
srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
"1msm12a6m7rszvdbfldaq3d2hpq0rmpb0af678xwk1m6ff1rinm6";
"03rp862snj4pxpz272az2mjp0vdw9a6rzbzcml9bzwvsi1ap5sl7";
srcGeoIPv6 = fetchDB
"GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
"0sjh77cawlv5jix148r0kg5hy5xymgwsw1lf02dhn1mwqy9k4j9p";
"1s5y6r4ji1ljsl1d3w9mcqppxy2kvxjk5aq5lldbj616rbcp2v72";
srcGeoLiteCity = fetchDB
"GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
"02g7qhjk1mh4gnplyry3nashkl3whlr4mv1lr56fh7qmi2fhjpk3";
"07dp3wf5b6g62y6zgm9f1zfc7gn2wnss7fjdips879373kj3lgbr";
srcGeoLiteCityv6 = fetchDB
"GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
"0dq5rh08xgwsrmkniww001b2dpd1d7db4sd385p70hkbbry496l3";
"1y7c8f84x99dbrqij124bylddc7bmcld1xp4h3qxvmmp8ch5hcxz";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
"168z6j6adrn80sl3ip41fa0jfv2p26lfa8qil6w17sqhg8f61rnp";

10
pkgs/development/libraries/gnutls/generic.nix
View File

@ -7,7 +7,11 @@
, ...}:
assert guileBindings -> guile != null;
let
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
in
stdenv.mkDerivation {
name = "gnutls-${version}";
@ -43,9 +47,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
inherit doCheck;
# Fixup broken libtool and pkgconfig files
preFixup = lib.optionalString (!stdenv.isDarwin) ''

4
pkgs/development/libraries/libxcomp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }:
{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng, libX11, zlib }:
stdenv.mkDerivation rec {
name = "libxcomp-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
};
buildInputs = [ libjpeg libpng12 libX11 zlib ];
buildInputs = [ libjpeg libpng libX11 zlib ];
nativeBuildInputs = [ autoreconfHook ];
preAutoreconf = ''

15
pkgs/development/tools/build-managers/gnumake/4.2/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }:
assert guileSupport -> ( pkgconfig != null && guile != null );
let
version = "4.2";
@ -19,12 +21,16 @@ stdenv.mkDerivation {
./impure-dirs.patch
];
buildInputs = stdenv.lib.optionals guileSupport [ guile pkgconfig ];
configureFlags = stdenv.lib.optional guileSupport "--with-guile";
outputs = [ "out" "doc" ];
meta = {
meta = with stdenv.lib; {
homepage = http://www.gnu.org/software/make/;
description = "A tool to control the generation of non-source files from sources";
license = stdenv.lib.licenses.gpl3Plus;
license = licenses.gpl3Plus;
longDescription = ''
Make is a tool which controls the generation of executables and
@ -37,6 +43,7 @@ stdenv.mkDerivation {
to build and install the program.
'';
platforms = stdenv.lib.platforms.all;
platforms = platforms.all;
maintainers = [ maintainers.vrthra ];
};
}

23
pkgs/servers/smcroute/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
name = "smcroute-${version}";
version = "2.1.0";
src = fetchFromGitHub {
owner = "troglobit";
repo = "smcroute";
rev = version;
sha256 = "0mmwvjqbzhzwii4g6rz3ms9fhzppnhbsrhr4jqpih2y95cz039gg";
};
nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
description = "Static multicast routing daemon";
homepage = "http://troglobit.com/smcroute.html";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fpletz ];
platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd);
};
}

4
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View File

@ -6,8 +6,8 @@ rec {
coreutils_ = coreutils.override (args: {
# We want coreutils without ACL support.
aclSupport = false;
# Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
singleBinary = "symlinks";
# Cannot use a single binary build, or it gets dynamically linked against gmp.
singleBinary = false;
});
# Avoid debugging larger changes for now.

9
pkgs/tools/backup/borg/default.nix
View File

@ -2,14 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "borgbackup-${version}";
version = "1.0.3";
version = "1.0.5";
namePrefix = "";
src = fetchurl {
url = "https://pypi.python.org/packages/"
+ "c9/c6/1efc338724b054d4d264dfeadfcba11cefa6c3c50f474cec91b8f0c21d3a/"
+ "${name}.tar.gz";
sha256 = "0kzr0xa00yjfxx27aipli67qg5ffj52yrnqhpf3sdy6k5wzwaybs";
url = "https://github.com/borgbackup/borg/releases/download/"
+ "${version}/${name}.tar.gz";
sha256 = "0xr7w57pb3z8vyn4jrwb61g9hkgfabikxv3lbwk0a94n8rwbxkx5";
};
nativeBuildInputs = with python3Packages; [

3
pkgs/tools/cd-dvd/brasero/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
, libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs
, vcdimager, wrapGAppsHook }:
, vcdimager, wrapGAppsHook, hicolor_icon_theme }:
# libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590
@ -21,6 +21,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs
hicolor_icon_theme
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ];

4
pkgs/tools/compression/zstd/default.nix
View File

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "zstd-${version}";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
sha256 = "1n88hb7a1x5xq4asq31yr92nkjylzdp21q0mxnrc6sd4kibcmbcs";
sha256 = "1kdz1mk2lgf46dc7afjzdyzpdxng2cwirhpm1wsj8dy929hi3687";
rev = "v${version}";
repo = "zstd";
owner = "Cyan4973";

20
pkgs/tools/graphics/glmark2/default.nix
View File

@ -1,19 +1,22 @@
{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xorg, libX11, mesa, libdrm, python27 }:
{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm, python27, wayland }:
stdenv.mkDerivation rec {
name = "glmark2-${version}";
version = "2014.03";
version = "2015-06-11";
src = fetchurl {
url = "https://launchpad.net/glmark2/trunk/${version}/+download/${name}.tar.gz";
sha256 = "1dgn7ln115ivk13d1yagpj06lgllpv2jrr41kcnhdkhqz6m43vdx";
src = fetchFromGitHub {
owner = "glmark2";
repo = "glmark2";
rev = "fa71af2dfab711fac87b9504b6fc9862f44bf72a";
sha256 = "1razwrmwk94wf8y7rnqpas9520gidixzcwa65pg946n823105znw";
};
buildInputs = [
pkgconfig libjpeg libpng12 xorg.libxcb libX11 mesa libdrm python27
pkgconfig libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland
];
buildPhase = ''
python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2
python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2
python2 ./waf
'';
@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "OpenGL (ES) 2.0 benchmark";
homepage = https://launchpad.net/glmark2;
homepage = https://github.com/glmark2/glmark2;
license = licenses.gpl3Plus;
longDescription = ''
glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of
@ -33,4 +36,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.wmertens ];
};
}

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

@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "openvpn-2.3.10";
name = "openvpn-2.3.11";
src = fetchurl {
url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
sha256 = "1xn8kv4v4h4v8mhd9k4s9rilb7k30jgb9rm7n4fwmfrm5swvbc7q";
sha256 = "0qv1flcz4q4mb7zpkxsnlmpvrv3s9gw7xvprjk7n2pnk9x1s85wi";
};
patches = optional stdenv.isLinux ./systemd-notify.patch;

6
pkgs/tools/networking/traceroute/default.nix
View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "traceroute-${version}";
version = "2.0.21";
version = "2.1.0";
src = fetchurl {
url = "mirror://sourceforge/traceroute/${name}.tar.gz";
sha256 = "1q4n9s42nfcc4fmnwmrsiabvqrcaagiagmmqj9r5hfmi63pr7b7p";
sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6";
};
makeFlags = "prefix=$(out)";
makeFlags = "prefix=$(out) LDFLAGS=-lm";
preConfigure = ''
sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules

4
pkgs/top-level/all-packages.nix
View File

@ -10443,6 +10443,8 @@ in
sipwitch = callPackage ../servers/sip/sipwitch { };
smcroute = callPackage ../servers/smcroute { };
spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
squid = callPackage ../servers/squid { };
@ -13655,6 +13657,8 @@ in
inherit (gnome) libgnomecanvas glib;
};
mop = callPackage ../applications/misc/mop { };
mopidy = callPackage ../applications/audio/mopidy { };
mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { };

41
pkgs/top-level/python-packages.nix
View File

@ -1638,6 +1638,22 @@ in modules // {
};
};
backports_shutil_get_terminal_size = if !(pythonOlder "3.3") then null else buildPythonPackage rec {
name = "backports.shutil_get_terminal_size-${version}";
version = "1.0.0";
src = pkgs.fetchurl {
url = "mirror://pypi/b/backports.shutil_get_terminal_size/${name}.tar.gz";
sha256 = "713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80";
};
meta = {
description = "A backport of the get_terminal_size function from Python 3.3’s shutil.";
homepage = https://github.com/chrippa/backports.shutil_get_terminal_size;
license = with licenses; [ mit ];
};
};
backports_ssl_match_hostname_3_4_0_2 = self.buildPythonPackage rec {
name = "backports.ssl_match_hostname-3.4.0.2";
@ -11363,7 +11379,8 @@ in modules // {
buildInputs = with self; [ nose pkgs.glibcLocales pygments ] ++ optionals isPy27 [mock];
propagatedBuildInputs = with self;
[decorator pickleshare prompt_toolkit simplegeneric traitlets requests2 pexpect sqlite3]
[ backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
simplegeneric traitlets requests2 pathlib2 pexpect sqlite3 ]
++ optionals stdenv.isDarwin [appnope];
LC_ALL="en_US.UTF-8";
@ -16237,6 +16254,25 @@ in modules // {
};
};
pathlib2 = if !(pythonOlder "3.4") then null else buildPythonPackage rec {
name = "pathlib2-${version}";
version = "2.1.0";
src = pkgs.fetchurl {
url = "mirror://pypi/p/pathlib2/${name}.tar.gz";
sha256 = "deb3a960c1d55868dfbcac98432358b92ba89d95029cddd4040db1f27405055c";
};
propagatedBuildInputs = with self; [ six ];
meta = {
description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems.";
homepage = https://pypi.python.org/pypi/pathlib2/;
license = with licenses; [ mit ];
};
};
pathpy = buildPythonPackage rec {
version = "8.1.2";
name = "path.py-${version}";
@ -17064,6 +17100,9 @@ in modules // {
url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
};
# No tests included in archive
doCheck = false;
#Only <3.4 expressly supported.
disabled = isPy35;