Commit graph

92040 commits

Author SHA1 Message Date
Peter Hoeg
f2c3e29ac4 simple-scan: 3.21 -> 3.22
Additionally, fix the icons and use a newer version of vala.
2016-10-12 19:14:25 +08:00
Frederik Rietdijk
adfcc2d953 Merge pull request #18906 from aneeshusa/update-salt-to-2016.3.3
Update salt to 2016.3.3
2016-09-24 09:10:56 +02:00
Arseniy Seroka
e3c14a385e Merge pull request #18902 from winksaville/update-contributor.md
Update broken link in CONTRIBUTING.md
2016-09-24 10:05:37 +04:00
Aneesh Agrawal
9f7d9def4c as31: Apply Debian patch for CVE-2012-0808 (#18904) 2016-09-24 03:54:52 +02:00
Franz Pletz
53c660dbc8
asterisk: fix source url 2016-09-24 02:51:00 +02:00
Franz Pletz
fc0f3ebb20
jansson: 2.7 -> 2.8
Fixes CVE-2016-4425.

cc #18856
2016-09-24 02:46:25 +02:00
Aneesh Agrawal
34b5d639c6 SaltTesting: 2015.7.10 -> 2016.9.7 2016-09-23 20:33:36 -04:00
Aneesh Agrawal
f61b23cd23 salt: 2015.8.8 -> 2016.3.3 2016-09-23 20:31:20 -04:00
Franz Pletz
89a5f7de83
brogue: disable fortify hardening to fix runtime error
See #18888.
2016-09-24 02:10:08 +02:00
Profpatsch
67bec77c68 brogue: fix crash by stackprotector hardening (#18888) 2016-09-24 02:06:47 +02:00
Franz Pletz
06395c6baf
bedup: 0.10 -> 0.10.1, fix eval
bedup is not available for Python 2, our current default.
2016-09-24 02:03:30 +02:00
Graham Christensen
93da6c9578 Merge pull request #18859 from grahamc/tomcat
Tomcat: 7.0.70 -> 7.0.72 for CVE (HTTPoxy)
2016-09-23 20:00:51 -04:00
Graham Christensen
f388b0dda2 Merge pull request #18875 from NeQuissimus/openjdk_1_7_111_b01
openjdk7: 1.7.0-91 -> 1.7.0-111
2016-09-23 19:58:05 -04:00
Tim Steinbach
dbbff67754 bind: 9.10.4 -> 9.10.4-P2 (#18880) 2016-09-24 01:55:00 +02:00
Joachim F
468b2d9c00 Merge pull request #18862 from cmfwyp/calibre-2.68.0
calibre: 2.66.0 -> 2.68.0
2016-09-24 01:34:08 +02:00
Wink Saville
0f386457e3 Update broken link in CONTRIBUTING.md
The current link returns a 404 error
2016-09-23 16:33:47 -07:00
Tim Steinbach
084fa30411 gradle: 3.0 -> 3.1 (#18898) 2016-09-24 00:57:09 +02:00
Daiderd Jordan
306bfa889a Merge pull request #18869 from couchemar/erlang-r19.1
erlang: 19.0.2 -> 19.1
2016-09-24 00:48:38 +02:00
Wilhelm Schuster
c37e76b4d2 nixos-container: Use machinectl shell (#18825)
Using nsenter+su was suboptimal since the environment they provided was
not quite the same as the real container environment. See [1] for more
background.

Note that we directly invoke /bin/sh for `nixos-container root-login`
since setting the user's shell is quite complex. See [2] for a related
systemd issue.

[1]: https://github.com/systemd/systemd/issues/825#issuecomment-127917622
[2]: https://github.com/systemd/systemd/issues/1395
2016-09-24 00:40:41 +02:00
Thomas Tuegel
84f7009994
nixos/input-methods: use gtk2 attribute for GTK 2 2016-09-23 17:28:47 -05:00
Thomas Tuegel
564b12656e
firefox-bin: update hashes 2016-09-23 17:28:47 -05:00
José Romildo Malaquias
40c4e80935 vivaldi: 1.3 -> 1.4 (#18886) 2016-09-24 00:27:36 +02:00
Joachim F
25828b546f Merge pull request #18867 from carlsverre/add/ctrlp-cmatcher
ctrlp-cmatcher: init at 09-22-2016
2016-09-24 00:11:06 +02:00
Graham Christensen
785e416188 Merge pull request #18882 from NeQuissimus/mariadb_10_1_17
mariadb: 10.1.16 -> 10.1.17
2016-09-23 17:58:19 -04:00
Daiderd Jordan
fef18bdedc Merge pull request #18801 from winksaville/update-vim_configurable-to-vim.8.0005
vim_configurable: 7.4.826 -> 8.0005
2016-09-23 23:54:34 +02:00
Graham Christensen
455772e8c6 Merge pull request #18884 from NeQuissimus/mysql_5_5_52
mysql55: 5.5.50 -> 5.5.52
2016-09-23 17:38:27 -04:00
Graham Christensen
4b7deb86d1 Merge pull request #18893 from regnat/ocaml_4_02
ocaml_4_02 : Fix src
2016-09-23 16:18:26 -04:00
Théophane Hufschmitt
acc608d88e ocaml_4_02 : Fix src
#08b85f5f9917cad7 introduced a wrong src url for ocaml 4.02 (and thus
  broke a lot of stuff),
  This restores the correct url.
2016-09-23 21:47:42 +02:00
Tobias Geerinckx-Rice
0a2f4e4d56 Merge pull request #17850 from regnat/hplip
hplip: Allow building with plugins on arm
2016-09-23 21:39:36 +02:00
Eelco Dolstra
fda18e432e Merge pull request #18889 from groxxda/wwwcurl
perlPackages.WWWCurl: fix broken build after curl update
2016-09-23 20:25:45 +02:00
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
Alexander Ried
123f81b866 perlPackages.WWWCurl: fix broken build after curl update
upstream bugreport:
https://rt.cpan.org/Public/Bug/Display.html?id=117793

patch also taken from there
2016-09-23 20:04:16 +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
Wink Saville
d81a6e6f9c Remove python_framework.patch
In the [discussion](https://github.com/NixOS/nixpkgs/pull/18801) of this pull
request @LnL7 was unable to complete a darwin build because the
python_framework.patch does not apply and suggests it should be removed.
2016-09-23 09:13:23 -07: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
Tim Steinbach
85b6923ba9
mysql55: 5.5.50 -> 5.5.52 2016-09-23 12:02:35 -04: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
Tim Steinbach
e525217269
mariadb: 10.1.16 -> 10.1.17 2016-09-23 11:45:42 -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