Commit graph

91999 commits

Author SHA1 Message Date
Joachim F
a8d4f747a4 Merge pull request #18864 from acowley/mlton-clang
mlton: fix build with clang (darwin)
2016-09-23 20:18:24 +02:00
Rushmore Mushambi
7192bab9ba Merge pull request #18885 from rushmorem/vault
vault: 0.6.0 -> 0.6.1
2016-09-23 20:03:50 +02:00
rushmorem
c2cae61392 vault: 0.6.0 -> 0.6.1 2016-09-23 19:57:07 +02:00
Joachim F
aa9227828b Merge pull request #18572 from maurer/janestreet
Janestreet
2016-09-23 19:57:05 +02:00
Joachim F
ac8206e31d Merge pull request #17147 from regnat/ocamlUpdates
ocamlPackages : update some packages
2016-09-23 19:55:10 +02:00
Eelco Dolstra
057bfdb689 Merge pull request #18877 from NeQuissimus/openvpn_2_3_12
openvpn: 2.3.11 -> 2.3.12
2016-09-23 18:06:18 +02:00
Eelco Dolstra
fe8dedf4ef Merge pull request #18879 from NeQuissimus/curl_7_50_3
curl: 7.50.1 -> 7.50.3
2016-09-23 18:05:27 +02:00
Frederik Rietdijk
5cda2be21a Merge pull request #18883 from NeQuissimus/mercurial_3_9_1
mercurial: 3.8.2 -> 3.9.1
2016-09-23 17:56:40 +02:00
Tim Steinbach
d965064280
tortoisehg: 3.8.1 -> 3.9.1 2016-09-23 11:51:54 -04:00
Tim Steinbach
18b5e607d9
mercurial: 3.8.2 -> 3.9.1 2016-09-23 11:50:14 -04:00
Wei-Ming Yang
e330807e1f
murmur service: welcome -> welcometext
fixed incorrect option name `welcome` to `welcometext`.

joachifm added a rename for backwards compat.

Closes https://github.com/NixOS/nixpkgs/pull/18570
2016-09-23 16:08:14 +02:00
Matt McHenry
de9546307f
nix-optimise service: init
Closes https://github.com/NixOS/nixpkgs/pull/18378
2016-09-23 16:08:03 +02:00
Tim Steinbach
cda53e434e
curl: 7.50.1 -> 7.50.3 2016-09-23 09:59:14 -04:00
Joachim F
5f0302b4a1 Merge pull request #18704 from Ralith/purple-hangouts
purple-hangouts-hg: 2016-07-17 -> 2016-08-31
2016-09-23 15:27:25 +02:00
Tim Steinbach
244aee5cd1
openvpn: 2.3.11 -> 2.3.12 2016-09-23 09:24:00 -04:00
Joachim F
7529fd3bff Merge pull request #18818 from Jookia/RFC_htpdate
Rfc htpdate
2016-09-23 15:19:49 +02:00
Graham Christensen
24135d6072 Merge pull request #18874 from NeQuissimus/nginx1_11_4
nginxMainline: 1.11.3 -> 1.11.4
2016-09-23 08:37:27 -04:00
Tim Steinbach
f091686a18
nginxMainline: 1.11.3 -> 1.11.4 2016-09-23 08:20:03 -04:00
Eelco Dolstra
30899bba14 Merge pull request #18858 from groxxda/sudo
sudo: 1.8.17p1 -> 1.8.18
2016-09-23 13:25:45 +02:00
Graham Christensen
7b7a9b3473 Merge pull request #18860 from grahamc/php5
php5: 5.6.25 -> 5.6.26 for CVEs
2016-09-23 07:15:53 -04:00
Lancelot SIX
9b4a56e312 Merge pull request #18830 from paperdigits/darktable-206
Updated darktable to version 2.0.6
2016-09-23 12:43:09 +02:00
Rushmore Mushambi
161d057e82 Merge pull request #18872 from rushmorem/cockroach
cockroachdb: build only on x86_64-linux
2016-09-23 12:33:52 +02:00
rushmorem
65198a9082 cockroachdb: build only on x86_64-linux
CockroachDB is failing to build on `x86_64-darwin` according to
Hydra. I don't have a Mac or Windows machine to debug the builds
on so I can't support those.
2016-09-23 12:22:31 +02:00
Mica Semrick
e6633ad504 gmic: 1.7.4 -> 1.7.7 2016-09-23 12:17:02 +02:00
Rushmore Mushambi
776c6ae4de Merge pull request #18870 from rushmorem/rkt
rkt: 1.14.0 -> 1.15.0
2016-09-23 12:04:52 +02:00
rushmorem
faf14cbcee rkt: 1.14.0 -> 1.15.0 2016-09-23 11:59:55 +02:00
Tuomas Tynkkynen
6bca04c57b retroshare06: Disable parallel build
http://hydra.nixos.org/build/40998820/nixlog/1/raw
2016-09-23 12:45:21 +03:00
Anthony Cowley
7181d20a4f mlton: fix build with clang (darwin)
A minor tweak is necessary to avoid raising an error when building with
clang. This gets mlton building on darwin.
2016-09-22 23:02:03 -04:00
Joachim F
cdec20ac58 Merge pull request #18790 from michalrus/xmind
xmind: init at 7.5-update1
2016-09-23 03:47:57 +02:00
Tuomas Tynkkynen
8c1f927258 pythonPackages.cryptography: 1.5 -> 1.5.1, fixes build 2016-09-23 04:42:47 +03:00
Graham Christensen
f01e56e576
php5: 5.6.25 -> 5.6.26 for CVEs (http://www.php.net/ChangeLog-5.php\#5.6.26) 2016-09-22 21:36:30 -04:00
Charles Strahan
3fe8eca17b Merge pull request #18853 from kvz/patch-2
Run riak with its `dataDir` as `HOME` so Erlang cookie can be written
2016-09-22 20:51:25 -04:00
Mica Semrick
9e661620ea darktable: 2.0.5 -> 2.0.6 2016-09-22 17:33:01 -07:00
Alexander Ried
8e0d456daa sudo: 1.8.17p1 -> 1.8.18 2016-09-23 02:01:57 +02:00
Daiderd Jordan
f62fef5fcb Merge pull request #18714 from RamKromberg/init/2mdoc
init: docbook2mdoc, texi2mdoc & pod2mdoc
2016-09-23 00:42:06 +02:00
Daiderd Jordan
9a4d60ef53 Merge pull request #18757 from romildo/upd.pnmixer
pnmixer: 2016-04-23 -> 0.7
2016-09-23 00:39:05 +02:00
Daiderd Jordan
0027c7119d Merge pull request #18806 from kvz/patch-1
riak: update service example
2016-09-23 00:31:06 +02:00
Daiderd Jordan
992b59c9a1 Merge pull request #18605 from LnL7/darwin-fzf
fzf: fix cycle in bin output
2016-09-23 00:29:40 +02:00
Tuomas Tynkkynen
5dcc389afc Merge pull request #18834 from DamienCassou/hub-2.2.8
hub: 2.2.5 -> 2.2.8
2016-09-23 01:10:36 +03:00
Joachim Fasting
64816cd972
grsecurity: 4.7.4-201609152234 -> 201609211951 2016-09-22 23:40:50 +02:00
Robert Helgesson
53d8a9d1dc
perl-String-Flogger: 1.101244 -> 1.101245 2016-09-22 23:24:00 +02:00
Robert Helgesson
897bdd061f
perl-Sub-Identify: 0.04 -> 0.12 2016-09-22 23:24:00 +02:00
Luca Bruno
da514a2cf9 Merge pull request #18798 from siddharthist/doc/node-readme
manual: add node.js to languages & frameworks
2016-09-22 22:12:37 +01:00
Luca Bruno
9d99bbab89 Merge pull request #18775 from chris-martin/lato
lato: init at 2.0
2016-09-22 21:53:18 +01:00
Joachim F
fc4751eccc Merge pull request #18751 from TvoroG/rtlwifi
rtlwifi_new: init at 2016-09-12
2016-09-22 22:50:46 +02:00
Kevin van Zonneveld
6d3b06ce37 Run riak with its dataDir as HOME so Erlang cookie can be written
See https://github.com/NixOS/nixpkgs/issues/18852
2016-09-22 22:49:30 +02:00
Luca Bruno
cf6815275a Merge pull request #18814 from tavyc/nvme-cli
nvme-cli: init at 0.9
2016-09-22 21:47:57 +01:00
Luca Bruno
f125e2c9bb Merge pull request #18820 from danbst/pg_repack
pg_repack: init at 1.3.4
2016-09-22 21:46:47 +01:00
Luca Bruno
19dc2ff732 Merge pull request #18824 from aske/xflux-gui
xflux-gui: 2016-08-08 -> 2016-09-21, fix icon display
2016-09-22 21:45:31 +01:00
Luca Bruno
c42c908f32 Merge pull request #18850 from groxxda/webkitgtk
webkitgtk: remove 2.10.x, add 2.14.x
2016-09-22 21:38:23 +01:00