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
2016-10-22 17:23:24 +02:00
parent bd12c10993 8c465c5201
commit e56832d730
221 changed files with 10778 additions and 4428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/apcupsd/default.nix
View File

@@ -6,11 +6,11 @@ assert enableCgiScripts -> gd != null;
stdenv.mkDerivation rec {
pname = "apcupsd";
name = "${pname}-3.14.13";
name = "${pname}-3.14.14";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "1y83bly5bgpjbfaxxwmdk2mndbi4cw0svq5z9n6byj043phbvv2p";
sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv";
};
buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;

5
pkgs/servers/dns/bind/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, libtool, perl, libxml2
{ stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
, libseccomp ? null }:
let version = "9.10.4-P3"; in
@@ -33,8 +33,7 @@ stdenv.mkDerivation rec {
"--without-pkcs11"
"--without-purify"
"--without-python"
"--enable-seccomp"
];
] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) "--enable-seccomp";
postInstall = ''
moveToOutput bin/bind9-config $dev

4
pkgs/servers/dns/nsd/default.nix
View File

@@ -13,11 +13,11 @@
}:
stdenv.mkDerivation rec {
name = "nsd-4.1.12";
name = "nsd-4.1.13";
src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
sha256 = "fd1979dff1fba55310fd4f439dc9f3f4701d435c0ec4fb9af533e12c7f27d5de";
sha256 = "1bwiabj1m7h14ppsa2azw017dqkqjgdl9gmj6ghjg80146xd8p64";
};
buildInputs = [ libevent openssl ];

4
pkgs/servers/emby/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "emby-${version}";
version = "3.0.7300";
version = "3.0.8300";
src = fetchurl {
url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz";
sha256 = "0xm3jw8ll49akr4fxa5qjbsglcgb6fq6nc54zppannxdlfkqj5jk";
sha256 = "13hr87jrhw8kkh94rknzjmlshd2a6kbbkygikigmfyvf3g7r4jf8";
};
buildInputs = with pkgs; [

10
pkgs/servers/fleet/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "fleet-${version}";
version = "0.11.5";
version = "0.11.8";
src = fetchFromGitHub {
owner = "coreos";
repo = "fleet";
rev = "v${version}";
sha256 = "0dc95dpqqc2rclbvgdqjcilrkji7lrpigdrzpwm3nbgz58vkfnz3";
sha256 = "13kwaa4hkiic602wnvnk13pflrxqhk2vxwpk1bn52ilwxkjyvkig";
};
buildInputs = [ go ];
@@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
description = "A distributed init system";
homepage = http://coreos.com/using-coreos/clustering/;
license = licenses.asl20;
maintainers = with maintainers; [ cstrahan offline ];
maintainers = with maintainers; [
cstrahan
jgeerds
offline
];
platforms = platforms.unix;
};
}

4
pkgs/servers/mail/opensmtpd/default.nix
View File

@@ -11,14 +11,14 @@
stdenv.mkDerivation rec {
name = "opensmtpd-${version}";
version = "6.0.0p1";
version = "6.0.2p1";
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ libasr libevent zlib openssl db pam ];
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
sha256 = "07gq21bx62w367512d0bbp9hm3pfgqh3kksg2by7n574kxc7jzm9";
sha256 = "1b4h64w45hpmfq5721smhg4s0shs64gbcjqjpx3fbiw4hz8bdy9a";
};
patches = [ ./proc_path.diff ];

2
pkgs/servers/nextcloud/default.nix
View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/
cp -R ./* $out/
cp -R . $out/
'';
meta = {

4
pkgs/servers/quagga/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "quagga-${version}";
version = "1.0.20160315";
version = "1.0.20161017";
src = fetchurl {
url = "mirror://savannah/quagga/${name}.tar.gz";
sha256 = "0qrjhp6l1hw35jrvcwyl0df4zjx1kqhrsafx307i6pzgs2xbgzr1";
sha256 = "0629f7bkyh0a3n90kkr202g2i44id09qzkl05y8z66blvd6p49lg";
};
buildInputs =

13
pkgs/servers/samba/4.x-fix-ctdb-deps.patch
View File

@@ -1,13 +0,0 @@
diff --git a/ctdb/wscript b/ctdb/wscript
index 3e2a992..3fe15cc 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -568,7 +568,7 @@ def build(bld):
source='ib/ibwrapper_test.c',
includes='include include/internal',
deps='''replace talloc ctdb-client ctdb-common
- ctdb-system''' +
+ ctdb-system ctdb-common-util''' +
ib_deps,
install_path='${CTDB_TEST_LIBDIR}')

68
pkgs/servers/samba/4.x-no-persistent-install.patch
View File

@@ -1,26 +1,7 @@
diff --git a/dynconfig/wscript b/dynconfig/wscript
index aa4e66e..d53f433 100755
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -379,9 +379,9 @@ def build(bld):
cflags=cflags)
# install some extra empty directories
- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
+ #bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
+ #bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
+ #bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
# these might be on non persistent storage
- bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
+ #bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
diff --git a/ctdb/wscript b/ctdb/wscript
index 3e2a992..1b93a4d 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -473,10 +473,10 @@ def build(bld):
diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript
--- samba-4.4.6/ctdb/wscript 2016-09-22 09:42:48.000000000 +0300
+++ samba-4.4.6-new/ctdb/wscript 2016-10-15 23:31:13.932088237 +0300
@@ -581,7 +581,7 @@
for t in etc_subdirs:
files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
for fmode in files:
@@ -28,12 +9,8 @@ index 3e2a992..1b93a4d 100755
+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0],
destname=fmode[0], chmod=fmode[1])
- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/functions',
+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/functions',
destname='functions')
etc_scripts = [
@@ -489,18 +489,18 @@ def build(bld):
bld.SAMBA_GENERATOR('ctdb-functions',
@@ -601,23 +601,19 @@
]
for t in etc_scripts:
@@ -41,8 +18,12 @@ index 3e2a992..1b93a4d 100755
+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t,
destname=t, chmod=0755)
- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
+ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
bld.SAMBA_GENERATOR('ctdb-sudoers',
source='config/ctdb.sudoers',
target='ctdb.sudoers',
rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
+ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
destname='ctdb')
- bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
@@ -52,9 +33,22 @@ index 3e2a992..1b93a4d 100755
- bld.install_dir(bld.env.CTDB_LOGDIR)
- bld.install_dir(bld.env.CTDB_RUNDIR)
- bld.install_dir(bld.env.CTDB_VARDIR)
+ #bld.install_dir(bld.env.CTDB_LOGDIR)
+ #bld.install_dir(bld.env.CTDB_RUNDIR)
+ #bld.install_dir(bld.env.CTDB_VARDIR)
sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
t = bld.SAMBA_GENERATOR('ctdb-pc',
-
# Unit tests
ctdb_unit_tests = [
'db_hash_test',
diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript
--- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300
+++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300
@@ -416,11 +416,3 @@
public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
header_path='samba',
cflags=cflags)
-
- # install some extra empty directories
- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
-
- # these might be on non persistent storage
- bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")

6
pkgs/servers/samba/4.x.nix
View File

@@ -18,18 +18,18 @@
with lib;
stdenv.mkDerivation rec {
name = "samba-4.3.11";
name = "samba-${version}";
version = "4.4.6";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
sha256 = "1v2grwivm6rasz1ganbybs0ikz1lydaniy65kxf1v8rl1qqngach";
sha256 = "1361ijz7vpgf66w3j9z7qb37rnlrydxw01ibjnfhjqqcb7fj7i1p";
};
outputs = [ "out" "dev" "man" ];
patches =
[ ./4.x-no-persistent-install.patch
./4.x-fix-ctdb-deps.patch
];
buildInputs =

4
pkgs/servers/sql/mysql/5.5.x.nix
View File

@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mysql-${version}";
version = "5.5.52";
version = "5.5.53";
src = fetchurl {
url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
sha256 = "1zb2h6nmmm42qcc808bwa3sdlhyyyglv44jy4pfxmx5kwqyy283q";
sha256 = "1snnyz8s7dd3ypm73vbpw36pflz7wqh2bawdvp4riri44pa6va57";
};
patches = if stdenv.isCygwin then [

4
pkgs/servers/sql/mysql/5.7.x.nix
View File

@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mysql-${version}";
version = "5.7.15";
version = "5.7.16";
src = fetchurl {
url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
sha256 = "0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch";
sha256 = "198qhd9bdm0fnpp307mgby2aar92yzya0937kxi7bcpdfjcvada9";
};
preConfigure = stdenv.lib.optional stdenv.isDarwin ''

60
pkgs/servers/web-apps/shaarli/default.nix Normal file
View File

@@ -0,0 +1,60 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "shaarli-${version}";
version = "0.8.0";
src = fetchurl {
url = "https://github.com/shaarli/Shaarli/releases/download/v0.8.0/shaarli-v0.8.0-full.tar.gz";
sha256 = "04151fl62rs8vxsmdyq4qm8fi7fr7i6x0zhrg1zgssv8w8lfx1ww";
};
outputs = [ "out" "doc" ];
patchPhase = ''
substituteInPlace index.php \
--replace "new ConfigManager();" "new ConfigManager(getenv('SHAARLI_CONFIG'));"
'';
# Point $SHAARLI_CONFIG to your configuration file, see https://github.com/shaarli/Shaarli/wiki/Shaarli-configuration.
# For example:
# <?php /*
# {
# "credentials": {
# "login": "user",
# "hash": "(password hash)",
# "salt": "(password salt)"
# },
# "resource": {
# "data_dir": "\/var\/lib\/shaarli",
# "config": "\/var\/lib\/shaarli\/config.json.php",
# "datastore": "\/var\/lib\/shaarli\/datastore.php",
# "ban_file": "\/var\/lib\/shaarli\/ipbans.php",
# "updates": "\/var\/lib\/shaarli\/updates.txt",
# "log": "\/var\/lib\/shaarli\/log.txt",
# "update_check": "\/var\/lib\/shaarli\/lastupdatecheck.txt",
# "raintpl_tmp": "\/var\/lib\/shaarli\/tmp",
# "thumbnails_cache": "\/var\/lib\/shaarli\/cache",
# "page_cache": "\/var\/lib\/shaarli\/pagecache"
# },
# "updates": {
# "check_updates": false
# }
# }
# */ ?>
installPhase = ''
rm -r {cache,pagecache,tmp,data}/
mv doc/ $doc/
mkdir $out/
cp -R ./* $out
'';
meta = with stdenv.lib; {
description = "The personal, minimalist, super-fast, database free, bookmarking service";
license = licenses.gpl3Plus;
homepage = https://github.com/shaarli/Shaarli;
maintainers = with maintainers; [ schneefux ];
platforms = platforms.all;
};
}

12
pkgs/servers/x11/xorg/default.nix
View File

@@ -1880,11 +1880,11 @@ let
}) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
xf86videonouveau = (mkDerivation "xf86videonouveau" {
name = "xf86-video-nouveau-1.0.12";
name = "xf86-video-nouveau-1.0.13";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2;
sha256 = "07irv1zkk0rkyn1d7f2gn1icgcz2ix0pwv74sjian763gynmg80f";
url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2;
sha256 = "1js7vak68g2800f1cy5r41wl5x2j7dbmbd7zxypzfgcw2fx454kd";
};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -2353,11 +2353,11 @@ let
}) // {inherit ;};
xorgserver = (mkDerivation "xorgserver" {
name = "xorg-server-1.18.3";
name = "xorg-server-1.18.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.18.3.tar.bz2;
sha256 = "1ka206v4nbw6qz072gh0543aq44azq2zv9f0yysy5nvwa4i9qwza";
url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2;
sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
};
buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
meta.platforms = stdenv.lib.platforms.unix;

4
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2
mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
@@ -183,7 +183,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2
mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.18.3.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/individual/app/xprop-1.2.2.tar.bz2