Commit Graph

2756 Commits

Author SHA1 Message Date
Michael Raskin
a08c8b12f0 Add Apache Jena Fuseki instead of obsolete and unavailable Jena Joseki 2016-02-28 10:39:33 +01:00
Hoang Xuan Phu
6bb016101f postfix: use relative symlinks for mailq and newaliases 2016-02-28 16:19:18 +08:00
Christoph Hrdinka
a0753c7cb2 nsd: 4.1.6 -> 4.1.7 2016-02-28 09:17:46 +01:00
Graham Christensen
0a2c3ec971 mysql: 5.5.45 -> 5.5.48 for multiple CVEs: CVE-2015-4792 CVE-2015-4802 CVE-2015-4815 CVE-2015-4816 CVE-2015-4819 CVE-2015-4826 CVE-2015-4830 CVE-2015-4836 CVE-2015-4858 CVE-2015-4861 CVE-2015-4870 CVE-2015-4879 CVE-2015-4913 2016-02-27 15:31:52 -06:00
zimbatm
17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
zimbatm
09c14170d8 Merge pull request #13125 from abbradar/uwsgi
Refactor uWSGI
2016-02-23 22:32:54 +00:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Cole Mickens
f0061cb039 plexpass: 0.9.15.4.1679 -> 0.9.15.5.1712 2016-02-22 20:22:07 -08:00
Pascal Wittmann
5d6d841d58 Merge pull request #13373 from tomberek/revert_kippo_twisted
kippo: revert twisted dependency
2016-02-22 23:50:17 +01:00
Thomas Bereknyei
e31c8922e0 kippo: revert twisted dependency 2016-02-22 13:57:24 -05:00
Vladimír Čunát
5e26e698b9 Merge #13081: update plex and plexpass 2016-02-21 11:47:07 +01:00
Moritz Ulrich
0e96c96b84 mosquitto: Use built-in Makefile for installation.
This will also install man pages, client-binaries (mosquitto_sub,
mosquitto_pub), libs, headers, etc.
2016-02-20 14:46:20 +01:00
Arseniy Seroka
bce982e082 Merge pull request #13076 from romildo/update-opensmtpd
opensmtpd: 5.7.3p1 -> 5.7.3p2
2016-02-19 22:53:59 +03:00
Nikolay Amiantov
d39d87bb81 uwsgi: disable built-in yaml support 2016-02-19 17:02:40 +03:00
Nikolay Amiantov
c6f143307c uwsgi: refactor, throw sensible error if plugin is not found 2016-02-19 17:02:40 +03:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Shea Levy
c4910af815 Merge branch 'redis-3.0.7' of https://github.com/kragniz/nixpkgs 2016-02-18 13:30:57 -05:00
Louis Taylor
6326172fed redis: 3.0.6 -> 3.0.7 2016-02-18 17:36:36 +00:00
Franz Pletz
30213ffa3b rspamd: git-2016-01-16 -> 1.1.3 2016-02-18 13:03:01 +01:00
Franz Pletz
799a3f8147 rmilter: 1.6.7 -> 1.7.3
Fixes #13080.
2016-02-18 13:02:35 +01:00
Cole Mickens
454be2f4d7 plex: 0.9.15.3.1663 -> 0.9.15.3.1674 2016-02-17 14:47:55 -08:00
Cole Mickens
2abb0ddb53 plex: plexpass 0.9.5.3.1674 -> 0.9.15.4.1679 2016-02-17 14:46:06 -08:00
José Romildo Malaquias
1199288de9 opensmtpd: 5.7.3p1 -> 5.7.3p2 2016-02-17 17:21:28 -02:00
Arseniy Seroka
d13adb4f8d Merge pull request #12984 from colemickens/plexpass
plex: add enablePlexPass
2016-02-16 17:13:54 +03:00
Wout Mertens
18474ac84d Merge pull request #13021 from kragniz/rethinkdb-2.2.4
rethinkdb: 2.1.3 -> 2.2.4
2016-02-16 09:40:23 +01:00
Louis Taylor
ab19061df8 rethinkdb: 2.1.3 -> 2.2.4 2016-02-16 03:25:12 +00:00
Cole Mickens
5e2fd638cc plex: add enablePlexPass (init at 0.9.15.3.1674)
enables plex pass subscribers to opt-in to the pre-release downloads
2016-02-15 17:05:11 -08:00
Michael Raskin
9e7c28cb56 nginxUnstable: 1.9.10 -> 1.9.11 2016-02-14 21:17:07 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Markus Wotringer
4bc9e8a785 elasticsearch2: init at 2.2.0
changes by @globin:
 * updated 2.1.0 to 2.2.0
 * moved to a new derivation

closes #11446

Signed-off-by: Robin Gloster <mail@glob.in>
2016-02-13 15:03:09 +00:00
Rickard Nilsson
2ce19d0ba4 Merge pull request #12935 from romildo/fix-opensmtp
opensmtpd: compile with support for 'db' tables
2016-02-13 08:02:26 +01:00
Nikolay Amiantov
59d1339c80 dspam: fix maintenance script 2016-02-12 18:00:01 +03:00
Eelco Dolstra
5e6962ff2e postgresql: Update to 9.5.1, 9.4.6, 9.3.11, 9.2.15, 9.1.20 2016-02-12 13:20:11 +01:00
Eelco Dolstra
0140591eab postgresql: Remove EOL 9.0 branch 2016-02-12 13:20:11 +01:00
Franz Pletz
bfa4ff779c Merge pull request #12760 from jerith666/pfixtools-init
pfixtools: init at 0.9
2016-02-12 11:56:33 +01:00
Tobias Geerinckx-Rice
ccf73a5f67 cassandra: 2.1.12 -> 2.1.13 2016-02-12 00:17:39 +01:00
José Romildo Malaquias
3971194490 opensmtpd: compile with support for 'db' tables 2016-02-11 11:29:10 -02:00
Nikolay Amiantov
37e1a9c844 ejabberd: 15.11 -> 16.01 2016-02-11 02:36:33 +03:00
JC Brand
007c558be8 prosody: 0.9.8 -> 0.9.10 2016-02-10 18:26:32 +00:00
Eelco Dolstra
aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
Matt McHenry
92dc00d0fd pfixtools: init at 0.9 2016-02-06 12:58:13 -05:00
Vladimír Čunát
54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Arseniy Seroka
77d94825d4 Merge pull request #12781 from tvon/plex
plex: 0.9.14.6.1620-e0b7243 -> 0.9.15.2.1663-7efd046
2016-02-03 18:31:34 +03:00
Tom von Schwerdtner
3701e7b74e plex: 0.9.14.6.1620-e0b7243 -> 0.9.15.2.1663-7efd046 2016-02-03 10:27:32 -05:00
Octavian Cerna
3c011d0f1c quagga: init at 0.99.24.1 2016-02-02 11:56:30 +02:00
Vladimír Čunát
d6a30fccbf xorg xf86-input-evdev: bugfix update 2.10.0 -> 2.10.1 2016-02-02 07:29:43 +01:00
Tuomas Tynkkynen
e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
13b3f3f246 treewide: Mass replace 'openssl}/bin' to refer the 'bin' output 2016-02-01 20:46:16 +02:00
Tuomas Tynkkynen
5f4a8de754 treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output 2016-02-01 20:45:57 +02:00
Robin Gloster
96350a9ec9 pyMAILt: use mkDerivation 2016-01-30 20:31:02 +00:00
Robin Gloster
63e6cca2a9 pyIRCt: use mkDerivation 2016-01-30 20:31:02 +00:00
Louis Taylor
7dcb901bad pulseaudio: 7.1 -> 8.0
closes #12569

Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
Signed-off-by: Robin Gloster <mail@glob.in>
2016-01-30 14:47:22 +00:00
Charles Strahan
5583ecf361 mongodb: 3.0.7 -> 3.2.1
Fixes #12639
2016-01-28 14:15:59 -05:00
Frederik Rietdijk
e366168d22 Merge pull request #12552 from NixOS/python-wip
pythonPackages: update setuptools, many updates and fixes
2016-01-27 13:19:00 +01:00
Rok Garbas
cf40e86fb0 nginx: 1.8.0->1.8.1, 1.9.9->1.9.10 2016-01-26 18:12:01 +01:00
Tobias Geerinckx-Rice
ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Shea Levy
495e8a6906 rt: Include version in drv 2016-01-25 10:21:09 -05:00
obadz
3a9983b45d couchdb: add platform, remove maintainer that was added accidentally, fixes #12502 2016-01-24 14:39:47 +01:00
Frederik Rietdijk
8535503556 pythonPackages.twisted: 11.1 -> 15.5 2016-01-24 14:33:56 +01:00
Tuomas Tynkkynen
ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tuomas Tynkkynen
d91c7347d1 treewide: Mass replace 'openssl}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen
8eb5d7d037 treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output 2016-01-24 10:03:38 +02:00
Tuomas Tynkkynen
a1909d7380 treewide: Mass replace 'glibc}/lib' to refer the 'out' output 2016-01-24 10:03:35 +02:00
Tobias Geerinckx-Rice
32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Benjamin Staffin
9bad9c8bf3 nginx: add statsd to the available modules 2016-01-23 17:25:49 -05:00
Nikolay Amiantov
bf208745ab Merge pull request #12290 from abbradar/dovecot-updates
Rework dovecot module, add and update plugins, default Dovecot to 2.2
2016-01-23 12:02:23 +03:00
Peter Simons
e6d42dfe04 Merge pull request #12459 from avnik/fix-var-lib-postfix-permissions
Make /var/lib/postfix world-readable
2016-01-22 17:25:07 +01:00
Vladimír Čunát
0957359568 Merge branch 'staging' 2016-01-22 13:48:35 +01:00
knupfer
8e604f7937 nginxModules.brotli: init at 788615e 2016-01-21 22:14:39 +01:00
Nikolay Amiantov
ec15cea84f dovecot_antispam: init at 20130429 2016-01-21 12:53:24 +03:00
Nikolay Amiantov
c956bc774b dovecot_pigeonhole: 0.4.3 -> 0.4.10 2016-01-21 12:53:21 +03:00
Nikolay Amiantov
57234b97df dovecot22: specify sysconfdir to use system-wide config 2016-01-21 12:50:03 +03:00
Nikolay Amiantov
cc0e255ab9 dovecot22: add options for building auth modules 2016-01-21 12:50:03 +03:00
Nikolay Amiantov
97e3c42523 dovecot22: move modules dir to /etc 2016-01-21 12:50:03 +03:00
Nikolay Amiantov
2e5b76ecc6 dovecot22: 2.2.19 -> 2.2.21 2016-01-21 12:50:03 +03:00
Pascal Wittmann
e6cc519856 Merge pull request #12497 from philandstuff/bump-ct-xjson-cluster-fix
certificate-transparency: 2015-11-27 -> 2016-01-14
2016-01-20 16:24:29 +01:00
Nikolay Amiantov
dd09d2357c postfix: fix etc/etc path 2016-01-20 16:42:07 +03:00
Alexander V. Nikolaev
39bd9be5a9 postfix: use built-in set-permission tool to setup queue
Make top level /var/lib/postfix as root:root 0755

After generating custom configs in /var/lib/postfix/conf,
`postfix set-permissions` called, to perform all required tricks
related to queue handling (postfix use file mode bits to keep
some internal statuses, so `chmod -R` not recommended by authors,
see comments in $out/libexec/postfix/post-install for details)

Also post-install script was patched, to skip permission check/update
for files inside $out, as well as symlinks following to $NIX_STORE.

Config file `main.cf` extended with all default directory locations,
to prevent post-install script from guessing and overwrite them.

And finally all actions in activation script snippets performed
by postmap/postalias/postfix tools from current build, not random one
from paths.
2016-01-20 14:52:59 +02:00
Philip Potter
a11c1f8e39 certificate-transparency: 2015-11-27 -> 2016-01-14
Bump to latest master.  Among other things, this pulls in
google/certificate-transparency#1088 which fixes a problem with running
xjson-server in clustering mode.
2016-01-20 12:27:25 +00:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Robin Gloster
53b389327e refactor to use autoreconfHook where possible
Close #12446.
2016-01-18 10:45:31 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Tobias Geerinckx-Rice
3f10b2874f Merge pull request #12450 from eduarrrd/pshs
pshs: 0.2.6 -> 0.3
2016-01-18 04:55:25 +01:00
Eduard Bachmakov
f3ae60295f pshs: 0.2.6 -> 0.3 2016-01-17 22:44:48 -05:00
Domen Kožar
9e8eba48ab xorg.xorgserver: wrap Xvfb with required flags 2016-01-17 21:14:49 +01:00
Domen Kožar
07dcea52e6 Merge pull request #12419 from avnik/rmilter+rspamd
Rmilter+rspamd packages and NixOS modules
2016-01-17 12:57:51 +01:00
Christoph Hrdinka
a3e3b76363 nginxModules.lua: 0.9.19 -> 0.10.0 2016-01-16 16:35:07 +01:00
Alexander V. Nikolaev
480083922c rspamd: init at git-2016-01-11 2016-01-16 15:10:36 +02:00
Alexander V. Nikolaev
59f0090ded rmilter: init at 1.6.7 2016-01-16 15:10:36 +02:00
Shea Levy
d9fa9b1a45 Add rt and perl packages it needs 2016-01-15 12:05:43 -05:00
roblabla
7e10bf4327 matrix-synapse: init at 0.12.0 2016-01-15 15:17:14 +01:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Nikolay Amiantov
f48d1f088d rpcbind: fix for libtiprc 1.0.1 2016-01-13 21:21:43 +03:00
Peter Simons
ae6fc4c5be Merge pull request #12293 from abbradar/postfix-updates
Rework postfix module and package
2016-01-13 14:12:50 +01:00
Nikolay Amiantov
f5835ce77f dspam: init at 3.10.2 2016-01-13 13:08:38 +03:00
Nikolay Amiantov
2053b3a32a postsrsd: init at 1.3 2016-01-13 13:03:07 +03:00
Louis Taylor
9516c065ba redis: 3.0.2 -> 3.0.6 2016-01-13 05:28:00 +00:00
Nikolay Amiantov
be2b989842 postfix30: build with pcre, add database drivers support 2016-01-12 18:00:57 +03:00
Nikolay Amiantov
d65850e56f postfix30: split meta_directory from configuration, fix queue_directory and data_directory 2016-01-12 16:41:35 +03:00
Nikolay Amiantov
57c1d09857 postfix30: add patch to silence setuid-in-nix-store related warnings 2016-01-12 16:41:35 +03:00
Tobias Geerinckx-Rice
521f903b80 xorgVideoUnichrome: remove dead package
Broken since 2013, upstream very dead.
2016-01-11 00:16:01 +01:00
Aristid Breitkreuz
01eea878ad Merge pull request #12291 from abbradar/ejabberd
Update ejabberd, new NixOS module for it
2016-01-10 21:15:33 +01:00
Aristid Breitkreuz
bca9ecdd05 Merge pull request #12238 from bfrog/postgresql95
postgresql: 9.4 -> 9.5
2016-01-10 21:01:19 +01:00
Nikolay Amiantov
757857613a ejabberd: 2.1.13 -> 15.11 2016-01-10 21:28:27 +03:00
Tobias Geerinckx-Rice
4e66300411 radius: remove dead package
Broken since 2013. Untouched since its addition in 2010 (final
release was in 2008). Mailing list abandoned by upstream.
2016-01-10 19:14:31 +01:00
Arseniy Seroka
84631f3227 Merge pull request #12253 from mydaum/bird-update
bird: 1.4.5 -> 1.5.0
2016-01-09 19:13:53 +03:00
Arseniy Seroka
12e01b734d Merge pull request #12263 from thall/ums_5_4
ums: 5.3.1 -> 5.4.0
2016-01-09 19:11:50 +03:00
Niclas Thall
0c7bf8309c ums: 5.3.1 -> 5.4.0 2016-01-09 14:09:35 +01:00
Tomas Vestelind
76bf3ab961 bird: 1.4.5 -> 1.5.0 2016-01-08 23:18:24 +01:00
Franz Pletz
70e47ab981 grafana: 2.5.0 -> 2.6.0 2016-01-08 17:19:02 +01:00
Tom Burdick
2c23a311cd postgresql: (94 -> 95)
Updates postgresql to its latest versions
2016-01-08 10:13:01 -06:00
Jakob Gillich
ff02a4e3c2 axis2: 1.6.3 -> 1.6.4
fixes CVE-2013-0248
2016-01-07 05:59:15 +01:00
Vladimír Čunát
b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Vladimír Čunát
556a28908e Merge: xorg and gtk-related updates 2016-01-05 09:53:01 +01:00
Vladimír Čunát
16d0cd7c68 xorg: update tarballs list
There've been some updates of default.nix without corresponding updates
in the tarball list. Re-generation then added lots of downgrade cruft.

The intel driver can't be added this way, but at least we get much closer.
2016-01-04 12:03:37 +01:00
Vladimír Čunát
62bb0329ae xorg.xf86*{libinput,nouveau}: minor driver updates 2016-01-04 12:00:28 +01:00
Vladimír Čunát
cba685ba45 xorg.xorgcffiles: update 1.0.5 -> 1.0.6 (probably unused) 2016-01-04 11:58:30 +01:00
Vladimír Čunát
9714056914 xorg: small but mass-rebuild updates 2016-01-04 11:57:11 +01:00
Vladimír Čunát
a6812c1ca5 xorg.xf86videorendition: init at 4.2.6 2016-01-04 11:54:10 +01:00
Vladimír Čunát
88dff78662 xorg.libXfont2: init at 2.0.1 2016-01-04 11:52:51 +01:00
Vladimír Čunát
b559020e27 xorgReplacements: remove this ancient cruft 2016-01-04 10:31:58 +01:00
Mateusz Kowalczyk
268f3353e6 mpd: 0.19.11 -> 0.19.12 2016-01-03 20:51:14 +00:00
Augustin Borsu
31dcefeee6 owncloud 7.0.11 -> 7.0.12 2016-01-02 09:10:54 +01:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
Michael Raskin
f638adb107 apache-jena: 3.0.0 -> 3.0.1 2016-01-01 12:30:17 +03:00
Michael Raskin
ab3277e68a nginxUnstable: 1.9.7 -> 1.9.9 2016-01-01 12:30:17 +03:00
Domen Kožar
680659023c Merge pull request #12034 from bjornfor/add-meta-platforms-to-xorg
xorg: add meta.platforms
2015-12-31 13:41:13 +01:00
Hoang Xuan Phu
ff49b7f91e postfix: patch to stop hard coding SHELL 2015-12-31 17:03:48 +08:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Austin Seipp
d97ae517fb nixpkgs: plex 0.9.12.19.1537 -> 0.9.14.6.1620
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-12-30 20:12:03 -06:00
Bjørn Forsman
a5b68eb4f6 xorg: add meta.platforms
Add it to the generator script (generate-expr-from-tarballs.pl) and then
add the updated generated file (pkgs/servers/x11/xorg/default.nix) after
performing the steps outlined in the generator script.

NOTE: People seem to have updated .../default.nix manually (even though
it has a "THIS IS A GENERATED FILE.  DO NOT EDIT!" header), so I had to
skip some changes to not downgrade several packages.
2015-12-30 12:50:54 +01:00
Vladimír Čunát
08dd527cc7 Merge branch 'staging'
http://hydra.nixos.org/eval/1234895
The mass errors on Hydra seem transient; I verified ghc on i686-linux.
Only darwin jobs are queued ATM. There's a libpng security update
included in this merge, so I don't want to wait too long.
2015-12-29 17:14:35 +01:00
Robin Gloster
566c06c5a7 apacheHttpd: 2.4.17 -> 2.4.18 2015-12-27 21:31:30 +00:00
Vladimír Čunát
39c43bc6e2 archiveopteryx: improve install paths, parallel build 2015-12-27 08:19:19 +01:00
Franz Pletz
0e07172c6d bind: Fix patching Makefile.in
There is no postPatchPhase.
2015-12-25 21:39:56 -05:00
Hoang Xuan Phu
b8bc82a459 archiveopteryx: init at 3.2.0 2015-12-24 15:22:44 +08:00
Robin Gloster
bdfc4efd67 bind: add patch to build with libressl 2.3 2015-12-23 22:08:33 +00:00
Domen Kožar
810695216a uwsgi: add a type comment 2015-12-21 12:58:26 +01:00
Lancelot SIX
53a3294e95 pkgs.slurm-llnl-full: Add full variant of slurm-llnl
Add a variant of slurm-llnl that includes sview (based on gtk).
pkgs.slurm-llnl also gains the ncurses-based smap tool.
2015-12-19 16:50:24 +01:00
Arseniy Seroka
8fcf525baa Merge pull request #11813 from simonvandel/update-tvheadend-4.0.8
tvheadend: 4.0.7 -> 4.0.8
2015-12-18 22:36:19 +03:00
Simon Vandel Sillesen
640ca7e975 tvheadend: 4.0.7 -> 4.0.8 2015-12-18 17:40:56 +01:00
Eric Sagnes
eab677ea21 eventstore: fix source hash (close #11732) 2015-12-18 09:11:51 +01:00
Vladimír Čunát
adb2b803b9 net-snmp: avoid nested list, /cc #11739 2015-12-17 12:35:15 +01:00
lethalman
e11741ff99 Merge pull request #11739 from cleverca22/master
net-snmp: fix mnttab path when built under chroot
2015-12-17 12:14:29 +01:00
Eric Sagnes
f9eb378eb8 riak: fix leveldb hash, fixes #11731 2015-12-16 23:07:22 +01:00
Jude Taylor
848064cef6 remove old patches and attributes from xorgserver 2015-12-16 12:03:29 -08:00
Lancelot SIX
8638952ede pkgs.slurm-llnl: 14-11-5-1 -> 15-08-5-1 2015-12-15 22:54:05 +01:00
michael bishop
88bccd83fe
net-snmp: fix mnttab path when built under chroot 2015-12-15 08:45:58 -04:00
Eric Sagnes
2c36e9cf5f slurm-llnl: 14.11.5 -> 14-11-5-1 2015-12-15 10:22:00 +09:00