1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Commit graph

92017 commits

Author SHA1 Message Date
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
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
Carl Sverre 71a94dfd93 ctrlp-cmatcher: init at 09-22-2016
Faster matcher for the ctrlp vim plugin.
2016-09-22 22:59:37 -07: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