Commit Graph

31066 Commits

Author SHA1 Message Date
Rok Garbas
17e8dda597 Merge pull request #17473 from lancelotsix/add_django_1_10
Add django 1.10
2016-08-07 04:08:26 +02:00
Vladimír Čunát
dddf84ff61 Merge #17512: gcc49: 4.9.3 -> 4.9.4 2016-08-06 21:10:51 +02:00
Daiderd Jordan
d764e55a1c Merge pull request #17564 from LnL7/darwin-haskell-fsnotify
haskellPackages.fsnotify: add darwin build dependency
2016-08-06 17:56:18 +02:00
Daiderd Jordan
7aaf75608f
haskellPackages.fsnotify: add darwin build dependency 2016-08-06 17:29:25 +02:00
Tuomas Tynkkynen
89c867196c SDL2_{gfx,image,net}: Broken on Darwin
Last successful Darwin build was 11 months ago, presumably nobody cares.

http://hydra.nixos.org/build/38317749
http://hydra.nixos.org/build/38318268
http://hydra.nixos.org/build/38322306
2016-08-06 18:27:20 +03:00
Benno Fünfstück
22281009b7 haskell/GLUT: fix "unkown GLUT entry glutInit"
This fixes #17547
2016-08-06 17:21:12 +02:00
Tuomas Tynkkynen
ea14f5c86d http-parser: Broken on Darwin
http://hydra.nixos.org/build/38320273
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
9c0a090afe colm: Broken on i686
http://hydra.nixos.org/build/38072668
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
1db43e0c18 rtags: Broken on i686
http://hydra.nixos.org/build/38304790
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
0498573573 drumstick: Broken on i686
http://hydra.nixos.org/build/38323068
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
fcc3a1b41d bazel: Broken on i686
http://hydra.nixos.org/build/38314298
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
3c513ebc13 assimp: Broken on Darwin
http://hydra.nixos.org/build/38315116
2016-08-06 17:06:45 +03:00
Aycan iRiCAN
983ab7be1e haskellPackages.hans: fixed major version bugs (#17555) 2016-08-06 14:29:01 +03:00
Joachim F
af8b7d3a28 Merge pull request #17526 from RamKromberg/fix/wavpack
wavpack: 4.75.0 -> 4.80.0
2016-08-06 00:59:08 +02:00
Robin Gloster
fae6264d3a Merge pull request #17533 from wizeman/u/upd-containers
ocamlPackages.containers: 0.16 -> 0.18
2016-08-05 19:15:01 +02:00
Ricardo M. Correia
e5db1995a6 ocamlPackages.containers: 0.16 -> 0.18 2016-08-05 14:35:17 +02:00
Ram Kromberg
76c2988e33 wavpack: 4.75.0 -> 4.80.0 2016-08-05 13:54:56 +03:00
Lancelot SIX
8420753239
gcc49: 4.9.3 -> 4.9.4
Bugfix release of the 4.9 branch. See
http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00001.html for
announcement
2016-08-05 00:01:15 +02:00
koral
b3beab9f03 webkitgtk: 2.10.4 -> 2.10.9 2016-08-04 21:18:38 +02:00
obadz
fbea275286 haskellPackages.ghc-mod: remove override as 5.6.0.0 is ghc8 compatible
cc @peti
2016-08-04 17:40:17 +01:00
Brad Ediger
f0f9172017 elm: Constrain aeson-pretty to <0.8 (#17511)
https://github.com/elm-lang/elm-compiler/pull/1431
2016-08-04 18:08:32 +02:00
Thomas Tuegel
9a29551636 Merge branch 'plasma-5.7' 2016-08-04 10:44:43 -05:00
Thomas Tuegel
5b008e30b4 kdeWrapper: avoid excessive file collisions 2016-08-04 10:40:36 -05:00
Peter Simons
2627b09b82 haskell-applicative-quoters: fix build with GHC 8.x 2016-08-04 17:38:44 +02:00
Peter Simons
8f52a0f926 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-22-ga83e456 using the following inputs:

  - Hackage: 07ee4666b6
  - LTS Haskell: dfe21a3b8d
  - Stackage Nightly: 7c2bfd83db
2016-08-04 15:20:31 +02:00
Tobias Geerinckx-Rice
06966f4955
icmake: 8.01.00 -> 9.00.00 2016-08-04 00:25:20 +02:00
Shea Levy
ca81eef753 Merge branch 'fix-clang-35' of git://github.com/expipiplus1/nixpkgs 2016-08-03 15:36:14 -04:00
Tobias Geerinckx-Rice
37528197a3
libpsl: 0.13.0 -> 0.14.0 2016-08-03 20:02:25 +02:00
Joe Hermaszewski
c7281d14f7 clang-3.5: fix build
Make Obj public in llvm's IntrusiveRefCntPtr

This fixes NixOs/nixpkgs#15974

It's not a nice fix, as it's really clang's problem. The proper fix
should modify clang's usage of IntrusiveRefCntPtr.
2016-08-03 19:00:39 +01:00
Joachim F
70bf931498 Merge pull request #17410 from knedlsepp/motif-on-darwin
motif: Add support for darwin
2016-08-03 18:31:43 +02:00
Michael Raskin
ef46388c48 neovim-qt: 0pre -> 0.2.1, use libmsgpack 1.4 2016-08-03 17:58:22 +02:00
mimadrid
5c017832e9
strace: 4.12 -> 4.13 2016-08-03 11:09:43 +02:00
Lancelot SIX
af154d1ca6
pythonPackags.django: default from 1_9 to 1_10 2016-08-03 09:20:37 +02:00
Alexey Shmalko
61a5c24209 cmocka: cross-compilation support (#17462) 2016-08-03 08:16:01 +02:00
Bart Brouns
0621828bb7 supercollider: 3.6.6 -> 3.7.2 (#17395) 2016-08-03 00:27:03 +02:00
Tuomas Tynkkynen
16d48b8280 Re-enable bunch of packages on Darwin
Prior to 1bf5ded193 these contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
2016-08-03 00:55:42 +03:00
Tuomas Tynkkynen
3875690d80 lua5: Re-enabel on Darwin
Prior to 1bf5ded193 this contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
2016-08-02 23:14:21 +03:00
Tuomas Tynkkynen
dc26ac6e04 libmng: Re-enable on Darwin
Prior to 1bf5ded193 this contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
2016-08-02 23:10:31 +03:00
Tuomas Tynkkynen
b7e9207a67 androidenv: Don't build on Hydra
Output limit exceeded:

http://hydra.nixos.org/build/38236076
http://hydra.nixos.org/build/38235851
2016-08-02 22:55:43 +03:00
Franz Pletz
9cfcf90832 libressl: 2.3.6 -> 2.3.7, 2.4.1 -> 2.4.2
Version 2.2.x is removed because it is not maintained by upstream anymore.
2016-08-02 21:21:02 +02:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
898c3436f3 kcov: Fix indentation 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
102ffa6be7 treewide: Wrap some really long package descriptions 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
63de40099f treewide: Move some meta sections to end-of-file
That seems to be the overwhelming convention.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Frederik Rietdijk
8fad3e81b0 pythonPackages.setuptools: specify priority
Both python3 and setuptools come with easy-install. For some magic
reason this hasn't caused any collisions yet, but it does with #17428.
We hereby prioritize the version that comes with setuptools.
2016-08-02 12:23:15 +02:00
Frederik Rietdijk
0af0a20e1d Merge pull request #17140 from michelk/gdal/update
gdal: 2.0.2 -> 2.1.1
2016-08-02 10:57:25 +02:00