3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

26034 commits

Author SHA1 Message Date
Bjørn Forsman c2a8e5e609 qt53: sync plugin/import/qml dirs with qt54
It seems like a sensible thing to keep these in sync.
2015-08-23 09:56:09 +02:00
Peter Simons 75cf3a2767 Merge pull request #9377 from teh/master
haskell-purescript: Disable tests.
2015-08-22 20:50:14 +02:00
Vladimír Čunát c250748a54 mesa: maintenance update 10.6.4 -> 10.6.5
Currently we have lots of failures on the branch,
most of them look unreproducible, and Hydra is idling.
2015-08-22 15:12:22 +02:00
Aycan iRiCAN afe6f05310 cabal2nix: fixed sha256 hash
I was getting below error:
output path ‘/nix/store/i73iz0id6ap6qg1p6jaqadl053h2cgfz-cabal2nix-9f58996’ should have r:sha256 hash ‘1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d’, instead has ‘0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv’
2015-08-22 11:04:09 +03:00
William A. Kennington III 64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Jude Taylor ba57bbf8dc go-1.4: fix a few more possibly impure tests 2015-08-21 13:25:49 -07:00
Jude Taylor 65dd349574 update mysteriously varying git hashes 2015-08-21 12:00:35 -07:00
Moritz Ulrich ff162a70c6 chicken: 4.9.0.1 -> 4.10.0 2015-08-21 15:43:52 +02:00
Eelco Dolstra e1fe23a4be libevent: Use fetchurl 2015-08-21 15:28:30 +02:00
Tom Hunger 9303783649 haskell-purescript: Disable tests.
Tests need network + /homeless-shelter.
2015-08-21 13:39:13 +01:00
Nikolay Amiantov 65e2f18885 Merge pull request #9381 from doshitan/fix-elm
elm: fix patch hashes
2015-08-21 13:59:10 +03:00
Eelco Dolstra b1104d6082 gdk-pixbuf: Disable tests
The tests take an excessive amount of time (> 1.5 hours) and memory (>
6 GB).

http://hydra.nixos.org/build/24911713
http://hydra.nixos.org/build/24470055#tabs-buildsteps
2015-08-21 12:56:55 +02:00
Eelco Dolstra aba76f23a5 Revert "add Darwin's flavor of lsof"
This reverts commit 7024b4dc62. It
breaks evaluation (possibly related to earlier reverts):

http://hydra.nixos.org/build/24887643
2015-08-21 12:05:06 +02:00
Michael Raskin a2b718fc80 Switch to the git version for now to get Gecko 40 compatibility 2015-08-21 09:28:23 +03:00
Tanner Doshier 5adba5cf6f elm: fix patch hashes 2015-08-20 21:54:40 -05:00
William A. Kennington III b5d599af8c nss: 3.19.3 -> 3.20 2015-08-20 15:32:47 -07:00
William A. Kennington III 8aece3d1ee nspr: 4.10.8 -> 4.10.9 2015-08-20 15:32:47 -07:00
Benno Fünfstück c51f0dbd52 haskell: disable haddock on GHC <7.8 on darwin
Fixes NixOS/nixpkgs#812
2015-08-20 21:51:19 +02:00
Eelco Dolstra 6769633b64 autogen: Fix build outside of chroot
http://hydra.nixos.org/build/24870256
2015-08-20 20:42:41 +02:00
William A. Kennington III 2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Benno Fünfstück e059070ad3 ocamlPackages.ocurl: update from 0.7.2 to 0.7.5 2015-08-20 17:07:18 +02:00
Jascha Geerds 50d90a2538 gtkdialog: Add missing dependency on hicolor_icon_theme (#9369) 2015-08-20 16:03:58 +02:00
Vladimír Čunát d911cc8d63 harfbuzz: minor update 1.0.1 -> 1.0.2 2015-08-20 15:21:20 +02:00
Vladimír Čunát 3f1fa380b2 gdk-pixbuf: fix CVE-2015-4491 by maintenance update 2015-08-20 15:18:46 +02:00
Ryan Scheel (Havvy) 088cc7f5f7 iojs: 3.0.0 -> 3.1.0 2015-08-20 13:21:53 +02:00
Eelco Dolstra fd38b5fa49 Revert gcc darwin fixes
This reverts commits cb7c053383,
ebda45e6b9,
4a495cfbab because they broke Nixpkgs
evaluation.

http://hydra.nixos.org/build/24813270
2015-08-20 11:49:55 +02:00
Bjørn Forsman ac8f2391f3 pcl: 1.6.0 -> 1.7.2 (unbreaks build)
New deps added: libXt (required), libpcap (optional).

Releases are now at github.
2015-08-20 07:45:37 +02:00
William A. Kennington III 4f22eadf2c Merge branch 'master.upstream' into staging.upstream 2015-08-19 20:52:17 -07:00
William A. Kennington III d730646832 go1.5: Fix pcre and port the remove-tools patch 2015-08-19 20:49:11 -07:00
William A. Kennington III 15a7e0ab71 go1.4: Fix some of the tests by adding missing pcre 2015-08-19 20:49:10 -07:00
William A. Kennington III 5344252155 go1.4: Cleanup compiler expression 2015-08-19 14:54:38 -07:00
Arseniy Seroka bbc7812d37 Merge pull request #9341 from taku0/oraclejdk-8u60
oraclejdk: 8u51 -> 8u60
2015-08-20 00:33:47 +03:00
Luca Bruno d05cb3e0ea go: add 1.5 compiler and packages 2015-08-19 23:25:16 +02:00
William A. Kennington III bf0da55a8c gotools: Fix build and update to 2015-08-19 2015-08-19 13:54:54 -07:00
William A. Kennington III 901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
William A. Kennington III c3592084cf golint: Update to 2015-06-23 2015-08-19 13:51:09 -07:00
William A. Kennington III e27567cff1 golang: Remove old, unused compilers 2015-08-19 13:25:44 -07:00
Peter Simons 24664e9cb3 Merge pull request #9345 from kquick/haskell-vty-ui-disable-tests
Specify no-tests cabal flag for vty-ui under ghc 7.10.x
2015-08-19 22:00:36 +02:00
William A. Kennington III 62b589a54f libressl: 2.2.1 -> 2.2.2 2015-08-19 10:42:55 -07:00
Kevin Quick 2066ac2956 Specify no-tests cabal flag for vty-ui under ghc 7.10.x 2015-08-19 10:15:38 -07:00
taku0 ec24fc6ecc oraclejdk: 8u51 -> 8u60 2015-08-19 22:04:29 +09:00
Peter Simons e297442b62 Merge pull request #9327 from oxij/better-hoogle
haskell-packages: bring hoogle and haddock to the masses
2015-08-19 15:00:23 +02:00
Eelco Dolstra bed96a585f libmtp: Update to 1.1.9 2015-08-19 14:29:27 +02:00
Michael Alan Dorman 57c276110f haskell-ghcjs: use ghcjs compatible with new vector
Closes https://github.com/NixOS/nixpkgs/issues/9328.
2015-08-19 13:59:40 +02:00
Moritz Ulrich 2ffc2099be leiningen: 2.5.1 -> 2.5.2. 2015-08-19 12:25:50 +02:00
Eelco Dolstra e91523aab5 Merge pull request #9325 from vcunat/p/glibc-security
glibc: apply four security fixes from upstream
2015-08-19 11:50:03 +02:00
Peter Simons fabeee76bd haskell-configurator fails its test suite. 2015-08-19 11:01:48 +02:00
Michael Alan Dorman 09e5107d3b haskell-hbro: fixed by upstream 2015-08-19 11:01:48 +02:00
Kevin Quick d58753b994 Newer haskell cmdlib version 0.3.6 is no longer marked as broken.
Closes https://github.com/NixOS/nixpkgs/pull/9316.
2015-08-19 11:01:48 +02:00
Peter Simons f2fc95686c haskell-shelly has transient test suite failures. 2015-08-19 11:01:48 +02:00
Peter Simons 7e48c52aaa haskell-singletons: update documentation for override 2015-08-19 11:01:47 +02:00
Nikolay Amiantov 1a590a6185 haskell: use postPatch instead of patchPhase where possible
Closes https://github.com/NixOS/nixpkgs/pull/9297.
2015-08-19 11:01:47 +02:00
Peter Simons d8650d5d6c haskell-commutative: re-enable test suite
All files, dependencies, etc. appear to now be set correctly.  Tested
with 'cabal test' in a local nix-shell environment.

Closes https://github.com/peti/nixpkgs/pull/20.
2015-08-19 11:01:47 +02:00
Peter Simons 0eca00a544 haskell-sets-with was deprecated. 2015-08-19 11:01:47 +02:00
Peter Simons f92eb718eb haskell-sets still can't compile its test suite. 2015-08-19 11:01:47 +02:00
Peter Simons b591bec333 haskell-yi: fixed by upstream 2015-08-19 11:01:41 +02:00
Peter Simons 574e2a5f81 hackage-packages.nix: update to 83e7ec0b31 with hackage2nix v20150807-45-gbadda1e 2015-08-19 11:00:06 +02:00
Jan Malakhovski c80af74a84 haskell-packages: throw withHoogle away from the lib 2015-08-18 19:56:17 +00:00
Jan Malakhovski 0013743845 haskell-packages: make hoogle wrapper much more helpful
* Build most of the stuff on /tmp, not in /nix/store.
* Generate hoogle database for all the dependencies.
* Generate haddock index and contents files.
* Cleanup.
2015-08-18 19:56:17 +00:00
Jan Malakhovski d8487667cf haskell-packages: bring hoogle to the masses by imlementing ghcWithHoogle
Replace `ghcWithPackages` to `ghcWithHoogle` in your config and enjoy.
2015-08-18 19:56:16 +00:00
William A. Kennington III 15a6f0ba7b openldap: Fix hash 2015-08-18 12:35:51 -07:00
Vincent Laporte 7e80417fa8 coq-QuickChick: 21f50a02 -> 20150605 2015-08-18 21:28:33 +02:00
Peter Simons 4cc5be347a haskell-configuration-ghc-head: update obsolete jailbreak-cabal override 2015-08-18 21:13:23 +02:00
Vladimír Čunát 1fbbeff0c1 glibc: apply four security fixes from upstream
Fixes CVE-2014-8121, CVE-2015-1781 and two unnumbered problems (apparently).
All these commits should be contained in the 2.22 release,
but we don't want that yet due to unresolved locale incompatibilites.
2015-08-18 20:58:39 +02:00
William A. Kennington III 2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
William A. Kennington III ecdda8ddc9 openldap: 2.4.41 -> 2.4.42 2015-08-18 11:35:37 -07:00
William A. Kennington III 1438112613 libpcap: 1.5.3 -> 1.7.4 2015-08-18 11:35:09 -07:00
William A. Kennington III e1ac7ad7cc libpipeline: 1.4.0 -> 1.4.1 2015-08-18 11:31:25 -07:00
William A. Kennington III 7af1960345 libdrm: 2.4.62 -> 2.4.64 2015-08-18 11:27:01 -07:00
Bjørn Forsman 38880d19cb freeglut: 2.8.1 -> 3.0.0
* Upstream switched to cmake => remove autoreconfHook
* Makefile.am is gone => remove darwin specific patch (untested)

The new version has a pkg-config file. Yay!

Tested locally with `nox-review wip`; no regressions found.
2015-08-18 18:45:14 +02:00
Bjørn Forsman e1f7e7128b freeglut: add meta attributes 2015-08-18 18:45:14 +02:00
Bjørn Forsman 4a75883932 freeglut: remove unused patch 2015-08-18 18:45:13 +02:00
Bjørn Forsman 836fa19651 cudatoolkit: fixup path to samples
This is needed for cuda 6.5 or else nsight will not find them. In cuda 7.0 the
samples are already in $out/samples. Older versions do not build due to broken
dependency (python-minimal).
2015-08-18 17:06:42 +02:00
Domen Kožar f044c31174 Merge pull request #9298 from abbradar/python-env
python: add .env for convenient nix-shell's
2015-08-18 13:09:04 +02:00
Peter Simons 1fc3e769e3 haskell-hindent: byte-compile installed elisp code 2015-08-18 12:59:36 +02:00
Peter Simons 6d0fee82c5 haskell-structured-haskell-mode: byte-compile installed elisp code 2015-08-18 12:40:18 +02:00
Peter Simons 13024a48a3 haskell-ghc-mode: byte-compile installed elisp code 2015-08-18 12:40:18 +02:00
Peter Simons 62a85cb205 haskell-cabal-helper: test suite has been fixed upstream 2015-08-18 12:40:18 +02:00
Sophie Taylor 2e41646441 nixpkgs: llvm v3.5.0 -> v3.5.2 2015-08-18 02:18:04 -07:00
Arseniy Seroka d33170a3d2 Merge pull request #9311 from ro6/master
urweb: 20150214 -> 20150520
2015-08-18 03:42:51 +03:00
ro6 15ef1f3a7e urweb: 20150214 -> 20150520 2015-08-17 21:00:49 -03:00
Austin Seipp 55e5bd4e9b nixpkgs: arcanist 20150707 -> 20150817
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-17 17:18:10 -05:00
Thomas Tuegel 9b5242b625 Merge pull request #9223 from danshapero/metis-5.1.0
metis: init at 5.1.0
2015-08-17 16:51:01 -05:00
Nikolay Amiantov 43cba717d2 haskell: partially revert marking Elm packages as broken
See https://github.com/NixOS/nixpkgs/pull/9233#issuecomment-131596192
2015-08-17 21:32:38 +03:00
Nikolay Amiantov 89a2f87011 elm: add the platform and helpful scripts 2015-08-17 21:32:30 +03:00
Nikolay Amiantov 344e522166 python: add .env for convenient nix-shell's 2015-08-17 21:22:50 +03:00
Michael Alan Dorman 0ccf8eae2f Disable some stuff that won't work with 7.6 anyway.
Closes https://github.com/peti/nixpkgs/pull/19.
2015-08-17 17:56:38 +02:00
Peter Simons c845fcfbb3 uhc: broken by recent uhc-util update
https://github.com/UU-ComputerScience/uhc/issues/60
2015-08-17 17:56:38 +02:00
Peter Simons 053e52fbd5 darcs: patch to cope with vector 0.11.x 2015-08-17 17:56:38 +02:00
Peter Simons a3de6a15c1 haskell-lens-aeson: test suite was broken by vector update 2015-08-17 17:56:38 +02:00
Peter Simons 7e2da20a97 haskell-sets can't compile its test suite. 2015-08-17 17:56:38 +02:00
Peter Simons c8616b488b haskell-set-with can't compile its test suite. 2015-08-17 17:56:37 +02:00
Peter Simons 441e8a1590 hackage-packages.nix: update to d2f0ba57b0 with hackage2nix v20150807-40-g9d40586
Notable updates changes include:

 - vector: update to version 0.11.x
 - errors: update to version 2.x
2015-08-17 17:56:37 +02:00
Tuomas Tynkkynen 65020eef40 pixman: Enable '--disable-arm-iwmmxt' on ARM
Otherwise the build fails on ARMv6:

  CC       libpixman_iwmmxt_la-pixman-mmx.lo
pixman-mmx.c: In function 'mmx_fetch_x8r8g8b8':
pixman-mmx.c:3812:1: internal compiler error: Max. number of generated reload insns per insn is achieved (90)
2015-08-17 16:05:01 +03:00
Vladimír Čunát a64cee8c78 ghc-7.4.2-binary: fix on i686 after 6c4364041
I'm not sure what was the compatibility problem before that commit,
but ghc at least builds now on both x86 Linux platforms
(and this commit doesn't cause a rebuild on x86_64-linux).
2015-08-17 10:36:36 +02:00
Vladimír Čunát c56adc9e01 cgal: fix src
I'm sorry for the wrong combination of URL and hash.
These release tarballs are much smaller; I don't know the difference,
but they still seem to work (openscad, rpacad).

Also comment on modules that aren't built.
2015-08-17 08:35:25 +02:00
Vladimír Čunát 844bfc605a cgal: fix build by update 4.5 -> 4.6.1
It was broken by cmake updates (between 3.2.2 and 3.3.1).
I chose the github tarballs because they have a predictable URL,
although they're much larger due to not supporting xz.

/cc maintainer @7c6f434c.
2015-08-16 18:32:27 +02:00
Arseniy Seroka 296f0d07c6 Merge pull request #9272 from AndersonTorres/xiphos
Xiphos
2015-08-16 16:39:07 +03:00
AndersonTorres 0935ef2913 BibleSync: init at 1.1.2
Biblesync is a dependency of new Xiphos.
2015-08-15 22:36:44 -03:00
Peter Simons 4c7d928f0b haskell-msgpack-rpc can't execute its test suite in a chroot environment. 2015-08-15 20:25:01 +02:00
Peter Simons b0784c2dc8 haskell-commutative can't compile its test suite. 2015-08-15 20:25:01 +02:00
Peter Simons 23761a4fd6 haskell-yi is broken 2015-08-15 20:25:01 +02:00
Peter Simons aae5f5d80e ghc-mod has been fixed upstream. 2015-08-15 20:25:00 +02:00
Peter Simons b34371b5e5 hackage-packages.nix: update to ba50dba1bc with hackage2nix v20150807-31-g34b77b8 2015-08-15 20:25:00 +02:00
AndersonTorres 9413a340db Sword: 1.7.3 -> 1.7.4 2015-08-15 09:35:41 -03:00
Aycan iRiCAN 482c29f8c6 haskell-hans: disable building example webserver which includes double main. 2015-08-15 10:35:36 +03:00
Peter Simons c4c2ee0d52 haskell-configuration-ghc-7.10.x: fix Hydra evaluation errors 2015-08-15 08:59:46 +02:00
Peter Simons 8347e3f19f Disable all Hackage packages related to Elm.
Upstream created its own distribution mechanism and doesn't rely on
Hackage any more.
2015-08-15 08:59:46 +02:00
Peter Simons 8647667e93 haskell-bro is broken 2015-08-15 08:59:46 +02:00
Peter Simons 19b26260ca haskell-exinst is broken because of singletons 2015-08-15 08:59:46 +02:00
Peter Simons b2fd8c4685 haskell-configuration-ghc-7.10.x: fix evaluation error 2015-08-15 08:59:46 +02:00
Peter Simons b87dd90e56 hackage-packages.nix: update to c6a74c3fdc with hackage2nix v20150807-31-g34b77b8 2015-08-15 08:59:39 +02:00
William A. Kennington III a106080623 Merge branch 'master.upstream' into staging.upstream 2015-08-14 13:22:00 -07:00
Shea Levy c541c23692 nix-exec: Bugfix bump 2015-08-14 15:56:01 -04:00
Peter Simons 167e54b257 haskell-generic-builder: allow users to specify their own install phase 2015-08-14 21:23:42 +02:00
Vladimír Čunát e46e461685 Revert "gfortran: disable parallel building"
This reverts commit 3d6bd6a1fa.
The problem wasn't fortran-specific and should be fixed now. See #9212.
2015-08-14 18:16:00 +02:00
Shea Levy 529596fd31 Bump nix-exec for new nix 2015-08-14 09:49:41 -04:00
Vladimír Čunát 0799ebf5b7 gcc: fix parallel building (fixes #9212)
Tested building 5-times on an idle 8-core.
2015-08-14 15:49:06 +02:00
Bjørn Forsman 90768003a4 openscenegraph: update download url
The current one returns HTTP error 404.
2015-08-14 11:03:31 +02:00
William A. Kennington III 6fccef2be0 cmake: 3.3.0 -> 3.3.1 2015-08-14 00:12:59 -07:00
Tobias Geerinckx-Rice 9a3a70ed2b rote: init at 0.2.8 2015-08-14 03:10:38 +02:00
Arseniy Seroka c0e03e4647 Merge pull request #9236 from Szczyp/rhc
rhc: init at 1.36.4
2015-08-14 01:32:24 +03:00
William A. Kennington III 0bbe804f0a epoxy: 1.2 -> 1.3.1 2015-08-13 15:00:18 -07:00
Jascha Geerds 0039622d64 pyatspi: init at 2.16.0 2015-08-13 23:52:06 +02:00
William A. Kennington III 952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
William A. Kennington III bc9bd5c02c libinput: 0.20.0 -> 0.21.0 2015-08-13 11:39:42 -07:00
William A. Kennington III a74ddd8c28 libinput: Don't enable documentation by default 2015-08-13 11:39:42 -07:00
William A. Kennington III 257db17ee9 Revert "Revert "texinfo: 5.2 -> 6.0""
This reverts commit dc74a81129.

This doesn't actually break gcc.
2015-08-13 11:33:00 -07:00
Pascal Wittmann 26939eee79 Remove unreferenced files
This commit removes files that are not referenced in nixpkgs anymore. I
have created this list by finding potential candidates using

  find nixpkgs/pkgs -type d -links 2 | parallel -N 1 'out=`grep -L {}  top-level/all-packages.nix`;  test -n "$out" && echo  {}'

and have then searched for those candidates with grep in whole nixpkgs.
2015-08-13 18:29:49 +02:00
Szczyp cbe6badab9 rhc: init at 1.36.4
OpenShift client tools
Add szczyp as a maintainer
2015-08-13 18:02:55 +02:00
danshapero 8885889b48 metis: init at 5.1.0 2015-08-13 16:53:18 +02:00
Arseniy Seroka 47acbac546 Merge pull request #9229 from Xe/update/nim
Update nim to version 0.11.2
2015-08-13 17:27:36 +03:00
Christine Dodrill 01b455dd66 nim: 0.11 -> 0.11.2 2015-08-13 07:25:16 -07:00
Nikolay Amiantov 745c60dfaa haskell packages: fix webkit build
cc @peti
2015-08-13 15:20:55 +03:00
Eelco Dolstra fd75bf0c7d nettle: Disable static libraries 2015-08-13 13:26:45 +02:00
Pascal Wittmann 2139f487c3 libaudclient: init at 3.5-rc2 2015-08-13 13:13:51 +02:00
Peter Simons f741d426da ghc-nokinds: remove "nokinds" tag from derivation name
The name of the GHC derivation must match the name and version tuple GHC
uses to identify itself, because the withPackages wrapper uses that name
to construct installation library paths etc., and those paths must match
those constructed by the compiler. If we add another tag to the name
that GHC itself doesn't use, then the paths assumed to exist by the
wrapper are wrong.
2015-08-13 12:26:41 +02:00
Peter Simons 95b98116c2 haskell-ihaskell-widgets is broken because of singletons. 2015-08-13 11:29:52 +02:00
Peter Simons 354df047e7 haskell-diagrams-lib has been fixed upstream. 2015-08-13 11:29:52 +02:00
Peter Simons 45e7bb6b83 haskell-multi-cabal is broken. 2015-08-13 11:29:50 +02:00
Peter Simons d167418c7e hackage-packages.nix: update to 610dc41e61 with hackage2nix v20150807-25-gce03fdf 2015-08-13 11:29:23 +02:00
Simon Vandel Sillesen 1fa791a243 libtorrent-rasterbar: 0.16.17 -> 0.16.19 + 1.0.2 -> 1.0.6 2015-08-13 04:07:08 +02:00
William A. Kennington III 31a128b32b gnutls: Security Fixes
3.3.16 -> 3.3.17
3.4.3 -> 3.4.4
2015-08-12 17:02:14 -07:00
William A. Kennington III 78377e02c5 autogen: 5.18 -> 5.18.5 2015-08-12 17:02:14 -07:00
William A. Kennington III 73f0cfdc7b libassuan: 2.2.0 -> 2.2.1 2015-08-12 17:02:14 -07:00
Jude Taylor 6cd4dacebe fix some broken haskell packages 2015-08-12 11:45:12 -07:00
Jude Taylor a8d69a7153 disable haskell-mockery check on Darwin 2015-08-12 11:27:55 -07:00
Jude Taylor ef95107ddc make isClang work the way a user might expect 2015-08-12 11:27:54 -07:00
Jascha Geerds 1ce6590bad libchamplain: Enable gobject introspection 2015-08-12 15:56:18 +02:00
Eelco Dolstra dc74a81129 Revert "texinfo: 5.2 -> 6.0"
This reverts commit b1ed04ad1d. It breaks gcc:

http://hydra.nixos.org/build/24651204
2015-08-12 13:25:15 +02:00
Peter Simons 5a0f0bc0ca ghc: make sure the nokinds version is built with a deterministic version number 2015-08-12 13:16:27 +02:00
Rickard Nilsson cef8f0180d Merge pull request #9213 from j-keck/sbt0.13.9
sbt: 0.13.8 -> 0.13.9
2015-08-12 11:02:42 +02:00
Vladimír Čunát 9bafea0f6d mesa: maintenance update 10.6.3 -> 10.6.4 2015-08-12 09:33:58 +02:00
j-keck 5e7d2e2003 sbt: 0.13.8 -> 0.13.9 2015-08-12 07:45:25 +02:00
William A. Kennington III 6c43640410 ghc: Fix compatability with new versions of ncurses 2015-08-11 12:17:35 -07:00
Vladimír Čunát c5db72671c libgsf: small update 1.14.32 -> 1.14.34
This is needed to update gnumeric.
/cc #9206, maintainer @lovek323.
2015-08-11 21:17:33 +02:00
Tobias Geerinckx-Rice 6a0dd91e02 libpsl: list 2015-08-03 -> 2015-08-07 2015-08-11 21:08:45 +02:00
Eelco Dolstra 36ab9c695a nss: Update to 3.19.3 2015-08-11 14:26:30 +02:00
Eelco Dolstra 64b3974d13 php: Use callPackages 2015-08-11 13:24:23 +02:00
Eelco Dolstra e7504ebf71 php: Update to 5.4.44, 5.5.28, 5.6.12 2015-08-11 13:24:23 +02:00
William A. Kennington III b1ed04ad1d texinfo: 5.2 -> 6.0 2015-08-10 23:42:17 -07:00
Ricardo M. Correia 4af085c4d2 rustcMaster: 2015-07-28 -> 2015-08-09 2015-08-10 16:54:47 +02:00
William A. Kennington III 6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Peter Simons bfa187de68 ghc-head: bump version to current git HEAD 2015-08-09 20:16:19 +02:00
Peter Simons eb5f4d3d36 ghc: make sure the HEAD version is built with a deterministic version number 2015-08-09 20:16:19 +02:00
Peter Simons 230a448fe6 hackage-packages.nix: update to 5d8c308f9f with hackage2nix revision v20150807-15-ge2a125b 2015-08-09 20:16:08 +02:00
Peter Simons d3ac5c534d ghc: patch start scripts to add 'readelf' and 'cat' into $PATH
Fixes https://github.com/NixOS/nixpkgs/issues/8192.
2015-08-09 15:17:58 +02:00
Peter Simons e8e206aa42 Merge pull request #9148 from Profpatsch/sbt-java-home
wrap sbt with $JAVA_HOME
2015-08-09 00:45:44 +02:00
Thomas Tuegel 28f0eb5af8 qt54: gdb required only for developerBuild 2015-08-08 15:23:48 -05:00
Thomas Tuegel bdb24b90c8 qt53: gdb required only for developerBuild 2015-08-08 15:23:05 -05:00
Profpatsch 062cdfb3a1 sbt: add JAVA_HOME to sbt script 2015-08-08 20:08:00 +02:00
Michael Raskin 3e86c32254 ASDF: 3.1.4 -> 3.1.5 2015-08-08 21:01:31 +03:00
Michael Raskin bd09d75b96 CL-Launch: 4.1.3.3 -> 4.1.4 2015-08-08 21:01:31 +03:00
Michael Raskin 9786c74792 libgphoto2: 2.5.7 -> 2.5.8 2015-08-08 21:01:31 +03:00
Michael Raskin f89b651008 Botan: stable: 1.10.9 -> 1.10.10; unstable: 1.11.16 -> 1.11.19 2015-08-08 21:01:31 +03:00
Michael Raskin a04b6f729a SBCL: 1.2.13 -> 1.2.14 2015-08-08 21:01:31 +03:00
Michael Raskin 93dc62187b Update MDDS homepage and version, needed for LibreOffice 5.0.0 2015-08-08 16:24:44 +03:00
Peter Simons cfaa75a7c9 haskell-mockery: test suite fixed upstream 2015-08-08 10:55:49 +02:00
Peter Simons 102c690ee9 haskell-hinotify: test suite fixed upstream 2015-08-08 10:55:00 +02:00
Peter Simons 711d7a87ba hackage-packages.nix: update to 886308a014 with hackage2nix revision v20150807-9-gbccef2c 2015-08-08 10:54:00 +02:00
Peter Simons c25d82f64f haskell-ide-backend: test suite depends on external processes 2015-08-08 10:49:10 +02:00
Peter Simons e75e0d9aa4 haskell-hinotify: test suite won't compile 2015-08-08 10:49:10 +02:00
Damien Cassou 00b48f5069 Merge pull request #9165 from DamienCassou/update-pharo
Update Pharo VM and Launcher
2015-08-08 08:23:30 +02:00
Damien Cassou ffa58ba098 Update Pharo VM and Launcher 2015-08-08 08:22:07 +02:00
Peter Simons 7151c0be17 haskell-mockery: disable the failing test suite altogether 2015-08-08 01:54:34 +02:00
Ricardo M. Correia f49da34d82 rustc: 1.1.0 -> 1.2.0 2015-08-08 01:12:46 +02:00
Ricardo M. Correia ad4adbdcb2 rustc: rename beta.patch to stable.patch 2015-08-08 01:12:46 +02:00
Pascal Wittmann 6f5c2ec311 checksyle: update from 6.8.2 to 6.9 2015-08-08 00:08:50 +02:00
William A. Kennington III 46acdd1608 rocksdb: 3.11.2 -> 3.12.1 2015-08-07 14:42:57 -07:00
William A. Kennington III 8dd3ee6bae jsoncpp: 1.6.2 -> 1.6.5 2015-08-07 14:42:45 -07:00
Peter Simons 3dbfcdc3d4 cabal2nix: make the package visible from the top-level
This means that "nix-env -i cabal2nix" suffices to install this package.
2015-08-07 23:08:13 +02:00
Peter Simons 13dc24f5c3 cabal2nix: update to version 20150807-6-g9f58996
The generated shell.nix file accepts a string argument called "compiler" that
determines the package set used to instantiate the generated expression. For
example, running "nix-shell --argstr compiler ghc7102" would evaluate the build
inside of "pkgs.haskell.packages.ghc7102". Earlier versions of cabal2nix had the
current default compiler hard-coded in the expression, but after this change this
is no longer the case. When "compiler" remains unspecified, it defaults to
"default", and this value causes evaluation in "pkgs.haskellPackages", which is
the package set most people would like to use by default. That change has to
benefits:

 1) Generated expression no longer contain any particular compiler version. The
    choice of the default compiler depends on the version of Nixpkgs that's used
    to build the expression.

 2) When the default compiler is used, overrides configured for the default
    package set apply, which was not the case in earlier versions.
2015-08-07 23:08:13 +02:00
Peter Simons fe04998994 haskell-llvm-general-pure has been fixed upstream. 2015-08-07 23:08:13 +02:00
Michael Alan Dorman 1ab9c7d7e0 Add build-tool override for hlibgit2. 2015-08-07 23:08:13 +02:00
Peter Simons e7084d1a82 haskell-thyme can't compile its test suite. 2015-08-07 23:08:12 +02:00
Peter Simons 66a2dbbd77 hackage-packages.nix: update to 1f18eb6546 with hackage2nix revision v20150807-5-g2b9cf46 2015-08-07 23:08:12 +02:00
Peter Simons 825a8a8623 jailbreak-cabal: build ghc-7.10.x version from source again
https://github.com/peti/jailbreak-cabal/issues/9 forced us to use a
binary version of jailbreak-cabal built with ghc 7.8.x in the 7.10.x
package set, which is awkward. Upstream fixed the underlying issue
in https://github.com/haskell/cabal/issues/2598, but unfortunately
that fix didn't make it into the Cabal 1.22.4.0 release shipped by
ghc 7.10.2.

Now, we work around that issue by building jailbreak-cabal with an
unreleased development snapshot of Cabal in the ghc 7.10.x package
set.

Closes https://github.com/NixOS/nixpkgs/issues/8901.
2015-08-07 23:07:50 +02:00
William A. Kennington III 4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Peter Simons fd53387bba haskell-imagemagick: test suite is broken 2015-08-07 15:13:16 +02:00
Peter Simons 2f03c42736 haskell-hscurses does not compile. 2015-08-07 15:13:16 +02:00