Commit graph

4071 commits

Author SHA1 Message Date
Franz Pletz b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Vladimír Čunát 20d2bfa4ff
knot-resolver: remove unused inputs 2017-07-28 15:34:27 +02:00
Vladimír Čunát 62e4e3301b
knot-resolver: maintenance 1.3.1 -> 1.3.2 2017-07-28 15:12:23 +02:00
Vladimír Čunát 69c67371db
knot-dns: maintenance 2.5.2 -> 2.5.3 2017-07-28 15:12:07 +02:00
Nikolay Amiantov e9520bab01 ejabberd: 17.01 -> 17.07 2017-07-27 17:07:45 +03:00
John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
John Ericson ea7d13cf1a stdenv-setup and misc hooks: Work with bash-3.4 for MacOS nix-shell
This is a temporary measure until this impurity is removed from Nix.
2017-07-26 09:08:01 -04:00
Peter Hoeg b23b1345f7 lcdproc: init at 0.5.9 2017-07-26 16:32:06 +08:00
Frederik Rietdijk 29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00
Joel Thompson 9dc51dc00d exhibitor: Fix bugs in previous package
The previous package didn't build properly due to a bug in the build
script, and the nixos module didn't evaluate due to missing descriptions
in the options. This fixes both issues.

It also adds missing command-line options that weren't able to be set
and properly converts bools to the strings exhibitor expects.
2017-07-21 16:14:04 -04:00
Joel Thompson 4b42fc4b8a exhibitor: init at 3.4.9
Initial Exhibitor nix package and nixos module for Netflix's Exhibitor,
which is a manager for Apache Zookeeper.
2017-07-21 09:45:37 -04:00
Franz Pletz 226964861f Merge pull request #27405 from rvl/postgresql-xml
postgresql: fix nixos tests and add xml support
2017-07-20 20:31:38 +02:00
Jörg Thalheim 4936e99d56 Merge pull request #27470 from AtnNn/rethinkdb
RethinkDB 2.3.5 -> 2.3.6
2017-07-19 00:35:54 +01:00
Oliver Charles ba1392dafd Merge pull request #27391 from adisbladis/postgres_cves
Postgres CVE fixes
2017-07-18 21:03:05 +01:00
Etienne Laurin 119a0fe53c RethinkDB 2.3.5 -> 2.3.6 2017-07-18 15:42:14 +00:00
Frederik Rietdijk 3eceecb90d Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-17 13:52:01 +02:00
Nadrieril c226ee619a tt-rss: 16.3 -> 17.4 2017-07-17 02:20:16 +02:00
Rodney Lorrimar 502a272ee7 postgresql: enable XML functions
I suspect these functions aren't widely used, but they are enabled in
PostgreSQL on Ubuntu and Arch.
2017-07-15 14:58:17 +01:00
Vladimír Čunát e2b7b09960
Merge branch 'master' into staging 2017-07-15 12:15:56 +02:00
adisbladis b5c6543de3
postgresql-9.2.20 -> postgresql-9.2.21
postgresql-9.3.16 -> postgresql-9.3.17
postgresql-9.4.11 -> postgresql-9.4.12
postgresql-9.5.6 -> postgresql-9.5.7
postgresql-9.6.2 -> postgresql-9.6.3

Fixes:
  * CVE-2017-7484
  * CVE-2017-7485
  * CVE-2017-7486

See:
  * https://www.postgresql.org/about/news/1746/
2017-07-15 03:47:38 +08:00
Yegor Timoshenko 245e4a3801 darkhttpd: update homepage 2017-07-14 03:31:53 +03:00
John Ericson ea9af6e3bd Merge pull request #27336 from obsidiansystems/stdenv-setup-cleanup
Stdenv setup misc cleanups
2017-07-13 18:41:33 -04:00
Franz Pletz 6943cd3ebd
darkhttpd: 1.11 -> 1.12 2017-07-14 00:40:51 +02:00
Will Dietz 04aa269fb1 opensmtpd: Fix attempt to set unsupported permissions during install 2017-07-14 00:23:16 +02:00
Daiderd Jordan e39e869fa3 Merge pull request #27361 from yegortimoshenko/patch-2
darkhttpd: platforms.linux → platforms.all
2017-07-14 00:13:32 +02:00
Franz Pletz 6e1aaeacfc
nginx: 1.12.0 -> 1.12.1 for CVE-2017-7529 2017-07-14 00:03:41 +02:00
Franz Pletz af70b8fc23
nginxMainline: 1.13.2 -> 1.13.3 for CVE-2017-7529 2017-07-14 00:03:41 +02:00
Yegor Timoshenko a9ea9d4f56 darkhttpd: platforms.linux → platforms.all 2017-07-13 22:49:12 +03:00
Dmitry Kalinkin b917a8760e slurm: 15-08-5-1 -> 17.02.6, slurm-llnl -> slurm 2017-07-13 03:13:05 -04:00
John Ericson 8d76effc17 stdenv-setup: Make the package accumulators associative arrays instead of strings
This is generally cleaner: less eval, less worrying about separators,
and probably also faster. I got the idea from that python wrapper
script.
2017-07-12 15:30:56 -04:00
Charles Strahan 47868cbfb8 Merge pull request #26127 from gabesoft/upstream-master
Fixed meteor Future is not defined error
2017-07-11 17:59:51 -04:00
Vladimír Čunát 3678981f9f
knot-resolver: remove aarch64 from meta.platforms
It will compile but won't really work ATM.
2017-07-10 18:11:40 +02:00
Tuomas Tynkkynen 299af45989 wallabag: Move docs to correct directory 2017-07-10 14:52:47 +03:00
Tuomas Tynkkynen 217bd1fb38 shaarli: Move docs to correct place 2017-07-10 14:44:29 +03:00
Franz Pletz 90f9d52b73
matrix-synapse: 0.21.0 -> 0.22.1 2017-07-10 09:36:05 +02:00
Gabriel Adomnicai bc7c311c4d Fixed meteor Future is not defined error 2017-07-09 09:15:33 -07:00
zimbatm 466e7e23c6 caddy: 0.10.3 -> 0.10.4
The dependencies are now fully vendored
2017-07-09 17:04:04 +01:00
Daiderd Jordan 980346592c
Merge branch 'staging' into master 2017-07-08 22:22:17 +02:00
Dmitry Marakasov 382285b34b Fix homepage 2017-07-07 19:50:10 +03:00
Eelco Dolstra 8fc5beb855 httpd: 2.4.25 -> 2.4.26
CVE-2017-3167, CVE-2017-3169, CVE-2017-7659, CVE-2017-7668,  CVE-2017-7679
2017-07-07 17:24:13 +02:00
Hector Jusforgues 0f2db06540 consul_exporter: init at 0.3.0 (#27162) 2017-07-07 10:01:45 +01:00
Eelco Dolstra 942422a646
Merge branch 'glibc' of https://github.com/rnhmjoj/nixpkgs into staging 2017-07-06 15:14:57 +02:00
Franz Pletz c71989022e
nginxMainline: 1.13.1 -> 1.13.2 2017-07-05 19:04:17 +02:00
Vladimír Čunát 9e1c7ddaae
Merge branch 'master' into staging 2017-07-05 09:53:53 +02:00
Vladimír Čunát 5328aac7be
Merge branch 'staging'
Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497
2017-07-05 08:55:26 +02:00
Volth b935b21ffd fix regressions where "${repo}-${rev}-scr" pattern was hardcoded 2017-07-04 20:22:13 +00:00
Peter Simons edb587633c Merge pull request #26420 from roblabla/feature-postfix
postfix: Add optional LDAP support, allow changing package in service
2017-07-04 14:57:40 +02:00
Pascal Bach 68b5e964ae unifi: 5.5.11 -> 5.5.19 2017-07-03 23:10:51 +02:00
Vladimír Čunát d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Sebastian Hagen cb9fe8cead Mariadb: Fix URL for source tarball.
mariadb.org appears to have changed their URL schemes, and the tarball URL used
by this derivation no longer works, which makes this unbuildable from scratch.

This change updates that URL to a mariadb.org location that will still serve
this tarball.

Hash is unchanged.
2017-07-03 02:53:13 +01:00