Commit Graph

26821 Commits

Author SHA1 Message Date
William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Peter Simons 9405a67858 uhc: the build is broken
src/ehc/Base/Debug.chs:22:34:
        Ambiguous occurrence `showPP'
        It could refer to either `UHC.Compiler.Base.Debug.showPP',
                                 defined at src/ehc/Base/Debug.chs:19:1
                              or `UHC.Util.Pretty.showPP',
                                 imported from `UHC.Util.Pretty' at UHC/Compiler/Base/Debug.hs:5:1-22

    src/ehc/Base/Debug.chs:28:32:
        Ambiguous occurrence `showPP'
        It could refer to either `UHC.Compiler.Base.Debug.showPP',
                                 defined at src/ehc/Base/Debug.chs:19:1
                              or `UHC.Util.Pretty.showPP',
                                 imported from `UHC.Util.Pretty' at UHC/Compiler/Base/Debug.hs:5:1-22
2015-10-30 23:16:25 +01:00
Peter Simons e2db6af4b6 configuration-hackage2nix.yaml: update broken builds 2015-10-30 23:16:19 +01:00
Peter Simons 51ce51a60f hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-26-gcb66650 using the following inputs:

  - Nixpkgs: 62a178f86b
  - Hackage: d288879f8a
  - LTS Haskell: 4622b913dc
  - Stackage Nightly: 61e6f9dbeb
2015-10-30 23:16:10 +01:00
Jude Taylor 9b4ba3c5da style fix in ffmpeg expression 2015-10-30 11:40:35 -07:00
Asko Soukka aa12640cb9 darwin: ffmpeg: add needed inputs 2015-10-30 11:40:35 -07:00
Peter Simons c9e3a8facc Merge pull request #10710 from datakurre/datakurre-irkernel
r-modules: init IRkernel packages
2015-10-30 14:21:29 +01:00
Domen Kožar 0509252e28 python: don't pass disabled to derivation 2015-10-30 11:31:19 +01:00
Domen Kožar df6a869ea7 Merge pull request #10712 from FRidh/matplotlib
python matplotlib: 1.4.3 -> 1.5.0
2015-10-30 11:27:23 +01:00
Frederik Rietdijk d320d3dcbf python matplotlib: 1.4.3 -> 1.5.0 2015-10-30 10:14:38 +01:00
Vincent Laporte a25d7d523e ocaml-csv: 1.4.1 -> 1.4.2 2015-10-30 06:03:50 +01:00
Asko Soukka d8e3a981c5 r-modules: init IRkernel packages 2015-10-30 03:48:23 +02:00
Vincent Laporte 7cb6dbc3d0 merlin: 2.2 -> 2.3 2015-10-29 21:35:41 +01:00
Luca Bruno e6a7834a56 valum: init at 0.2.0 2015-10-29 16:58:14 +01:00
Luca Bruno 62b567bf56 ctpl: init at 0.3.4 2015-10-29 16:58:13 +01:00
Jude Taylor f0dd213295 propagate AGL from wxmac for erlang's sake 2015-10-29 00:51:39 -07:00
Jude Taylor 56f053120b erlang: remove nested lists 2015-10-28 17:36:27 -07:00
Jude Taylor 3b2b2ab046 wxmac: clean up and provide with stub packages 2015-10-28 17:36:20 -07:00
Jude Taylor e6bc23a801 Merge pull request #10603 from datakurre/datakurre-rabbitmq
darwin: erlangR18 + rabbitmq_server: add needed inputs
2015-10-28 17:23:11 -07:00
Jude Taylor 74416dc40a wxmac: fix build 2015-10-28 17:15:16 -07:00
Henry Till a7784cafa3 SDL: fix on darwin 2015-10-28 19:44:30 -04:00
Jude Taylor 7f0e9659f7 double-conversion: propagate libcxx
Packages that depend on double-conversion may fail their doctests if dlopen(libc++.dylib)
fails.
2015-10-28 14:20:02 -07:00
Jude Taylor 07849565ed SDL2: add darwin frameworks 2015-10-28 13:34:53 -07:00
Jude Taylor 1786f6bd4d make mesa inputs more specific 2015-10-28 13:34:53 -07:00
Pascal Wittmann 36a529e566 icmake: 7.22.01 -> 7.23.02 2015-10-28 17:43:41 +01:00
Asko Soukka efd652965b darwin: gfortran: add needed inputs and other fixes
Close #10532.
2015-10-28 13:37:02 +01:00
vbgl 0ad5dc11e1 Merge pull request #10499 from jb55/fix-lmdb-osx
lmdb: fix build on OSX
2015-10-28 12:34:55 +01:00
Domen Kožar d60718d57a pythonPackages.suds: apply patch CVE-2013-2217 2015-10-28 11:55:30 +01:00
Peter Simons af1237688e Merge pull request #10605 from LnL7/haskell-darwin
haskell: added darwin frameworks for stack and halive
2015-10-28 11:35:03 +01:00
Luca Bruno b080efe4dc goPackages.tools: add setup-hook for setting GOTOOLDIR 2015-10-28 11:01:26 +01:00
Domen Kožar b0b97bd5ea Merge pull request #10601 from FRidh/h5py
python: h5py update and new package pkgconfig
2015-10-28 00:30:30 +01:00
Daiderd Jordan cbc666fc60 fixed darwin frameworks for halive and fsevents 2015-10-27 22:49:08 +01:00
Domen Kožar 6a9aeea26d setuptools: revert back to 18.2 as 18.4 breaks packages 2015-10-27 19:43:53 +01:00
Vladimír Čunát 4ba34e7055 openssl: fix darwin patch
The things around this file are rather confusing, but judging from master,
1.0.2 branch doesn't need this patch to build on darwin.
This just takes back the patch to the state for 1.0.1.
2015-10-27 18:08:10 +01:00
Domen Kožar 612b6b7a8d fix a bunch of PYthon packages on py3k 2015-10-27 17:06:24 +01:00
Domen Kožar 1ee3e26552 Merge pull request #10399 from domenkozar/openstack-nova-liberty
OpenStack (Liberty): Nova, Glance, Neutron, Keystone
2015-10-27 11:53:32 +01:00
Domen Kožar 3ee4747675 OpenStack: package Glance, Keystone, Neutron 2015-10-27 11:52:40 +01:00
Domen Kožar 24cbc374cf nova: 2011.2 -> 12.0.0 2015-10-27 11:52:40 +01:00
Josef Svenningsson 64b972acb9 Fix spelling mistakes
homepahe -> homepage
2015-10-27 11:49:48 +01:00
Jude Taylor 950261bb9a darwin: fix gtk+3 dependencies 2015-10-27 00:38:06 -07:00
Moritz Ulrich 5baf95cc71 clojure: 1.6.0 -> 1.7.0 2015-10-27 08:11:37 +01:00
Asko Soukka a5ac419236 darwin: erlangR18: add needed inputs for Darwin 2015-10-26 22:02:56 +02:00
Domen Kožar 3b85cf704c Merge pull request #10632 from grwlf/urweb-bump
Urweb bump
2015-10-26 20:11:36 +01:00
Sergey Mironov 2cfa1e8f98 urweb: bump to 20151018 2015-10-26 21:48:33 +03:00
Luca Bruno acfe53e61f urweb: add back openssl configure flags to fix build, cc @aseipp 2015-10-26 21:48:33 +03:00
Pascal Wittmann 0358140690 Merge pull request #10608 from devhell/libstrophe
libstrophe: 0.8.7 -> 0.8.8
2015-10-26 15:40:56 +01:00
Peter Simons 60bc7e764d git-annex: update overrides 2015-10-26 13:15:16 +01:00
Peter Simons 7fbc2abf6a hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-23-g9db0d61 using the following inputs:

  - Nixpkgs: 1146c867e3
  - Hackage: 1791c0e414
  - LTS Haskell: 4622b913dc
  - Stackage Nightly: f51b9b1513
2015-10-26 13:14:51 +01:00
Domen Kožar 8f977608f4 add sslmate: easy to buy, deploy, and manage your SSL certs 2015-10-26 12:57:27 +01:00
Chris Double e261492bb0 Package for Pony programming language compiler 0.2.1.
Pony is an open-source, object-oriented, actor-model,
capabilities-secure, high performance programming language.
2015-10-26 08:32:57 +13:00