Commit Graph

2298 Commits

Author SHA1 Message Date
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Jaka Hudoklin
9fffaf43ba selenium-server-standalone: update -> 2.44, fix opera, create binary, chrome support 2014-11-05 13:02:59 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Michael Raskin
c874dc7d9d Merge pull request #4517 from FlorentBecker/eliom
ocsigen 2014-10
2014-11-04 12:41:59 +03:00
Vincent Laporte
be8209b93f ocaml-oasis: update from 0.4.4 to 0.4.5 2014-11-04 00:08:58 +00:00
Peter Simons
0346efdabf Merge pull request #4813 from bosu/fix-hscope
haskell: update to hscope 0.4.1
2014-11-03 23:01:37 +01:00
John Wiegley
4219c27632 threadscope: allow building with GHC 7.8.3, and on recent OS X 2014-11-03 15:27:31 -06:00
Boris Sukholitko
68183b8f5f Update to hscope 0.4.1 2014-11-03 23:04:10 +02:00
Arseniy Seroka
0c7a0f31f9 Merge pull request #4810 from vbgl/merlin
merlin: update from 1.7.1 to 2.0
2014-11-03 20:04:10 +03:00
Henry Till
5f2e7c71a4 opam: update to 1.2.0 2014-11-03 11:55:33 -05:00
Michael Raskin
420cadca9f Use Firefox instead of xulrunner in SlimerJS 2014-11-03 16:54:38 +03:00
Vincent Laporte
68b959d655 merlin: update from 1.7.1 to 2.0
Also adds an option to compile the emacs mode at install time.
2014-11-03 13:41:46 +00:00
Arseniy Seroka
e639e48c36 Merge pull request #4783 from vbgl/ocamlscript
ocamlscript: new derivation
2014-11-03 16:06:42 +03:00
Arseniy Seroka
c8ab037257 Merge pull request #4774 from henrytill/leiningen
leiningen: remove clojure dependency
2014-11-03 16:04:50 +03:00
Vladimír Čunát
5b00625aa4 vagrant: use bin/iconv from glibc on Linux
This fixes build after #4419.
2014-11-03 12:58:54 +01:00
Evgeny Egorochkin
cb981b9dad swig3: update from 3.0.0 to 3.0.2 2014-11-03 13:29:23 +02:00
Evgeny Egorochkin
08cb717c98 add meta.branch 2014-11-03 13:09:48 +02:00
Evgeny Egorochkin
3580f6dab5 automake: add meta.branch 2014-11-03 12:58:08 +02:00
Vincent Laporte
16150e1f1e ocamlscript: new derivation
Ocamlscript compiles scripts, i.e. one-file programs, into
natively-compiled binaries, and executes them.

Homepage: http://mjambon.com/ocamlscript.html
2014-11-02 21:41:24 +00:00
koral
0670f105cc cgdb: 0.6.6 -> 0.6.7 2014-11-02 21:47:54 +01:00
j-keck
129cde946b sbt: update to version 0.13.6 2014-11-02 20:03:57 +01:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Henry Till
4feafd7953 leiningen: remove clojure dependency 2014-11-01 19:47:52 -04:00
Peter Simons
67af48c420 haskell-ihaskell: update to version 0.4.3.0 2014-11-01 21:08:02 +01:00
Peter Simons
30122cd974 haskell-hslogger: update to version 1.2.6 2014-11-01 21:08:02 +01:00
Peter Simons
4e31c212ba haskell-ghcid: update to version 0.3.1 2014-11-01 21:08:02 +01:00
Peter Simons
b5f514a3f5 haskell-cabal2nix: update to version 1.71 2014-11-01 17:45:10 +01:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Michael Raskin
ca92086101 Force compatibility with fresh Firefox in SlimerJS 2014-10-31 00:35:00 +03:00
Vincent Laporte
58101991f7 cppo: update from 0.9.4 to 1.0.1 2014-10-29 17:43:05 +00:00
Domen Kožar
69aee03145 Merge pull request #4714 from sjmackenzie/new-pkg-hammer
A language security tool called Hammer is added
2014-10-29 09:52:58 +01:00
stewart
5d5fa6a484 changed version = e7aa734 2014-10-29 16:08:16 +08:00
stewart
61d7aaeea2 format changes + meta data changes to hammer package 2014-10-29 15:16:41 +08:00
stewart
c98ecd1e5f added git revision to nix hammer pkg to prevent nix build breaks on hammer update 2014-10-29 13:49:10 +08:00
stewart
be9f3af6c2 derp'ed the sha256 for hammer after patch landed 2014-10-29 13:35:33 +08:00
stewart
d625f62e51 kickstart travis after upstream patch landed 2014-10-29 13:14:04 +08:00
stewart
23819bf0b5 A language security tool called Hammer is added 2014-10-29 11:00:55 +08:00
Peter Simons
da029b982e Merge pull request #4705 from jirkamarsik/ghcid
Added ghcid-0.2
2014-10-28 19:57:54 +01:00
Jirka Marsik
ce6f7f6ff0 Added ghcid-0.2
The .nix file was generated by cabal2nix. However, I still had to set
doCheck = false since some of the tests try to run `cabal repl` which
presupposes access to $HOME/.cabal and thus cannot be done from the Nix
sandbox where HOME = /homeless-shelter.
2014-10-28 18:41:22 +01:00
cillianderoiste
f100b7221a Merge pull request #4703 from jirkamarsik/ocp-indent
Added ocp-indent-1.4.2b and its dependency ocp-build-1.99.8-beta
2014-10-28 18:16:07 +01:00
Jirka Marsik
0f1ada577c Added ocp-indent-1.4.2b 2014-10-28 18:09:42 +01:00
Jirka Marsik
0de41a6871 Added ocp-build-1.99.8-beta 2014-10-28 18:05:53 +01:00
Michael Raskin
83e59960b6 Merge pull request #4682 from the-kenny/chicken-eggs
Full support for CHICKEN eggs in Nix
2014-10-28 15:49:26 +04:00
Moritz Ulrich
685734f76f egg2nix: Fix transitive dependencies.
These are also dependencies of http-client, but egg2nix uses them itself
too.
2014-10-27 13:18:35 +01:00
Moritz Ulrich
44624b40ef egg2nix: Update to 0.4.
Let's hope this is the latest version.
2014-10-27 12:47:45 +01:00
Evgeny Egorochkin
a4300af71d checkstyle: update from 5.8 to 6.0 2014-10-27 07:33:29 +02:00
Charles Strahan
a8a9b93d98 chruby: allow for specifying Rubies to use
This allows the user to specify an attrset of Rubies to use with chruby by
overriding the default of ~/.rubies with a path to a symlink tree.
2014-10-27 03:48:30 +00:00
Moritz Ulrich
cdd2dd70aa Merge remote-tracking branch 'refs/remotes/origin/master' into chicken-eggs 2014-10-27 01:14:13 +01:00
Moritz Ulrich
3a0a389312 Update egg2nix to 0.3. 2014-10-27 01:13:23 +01:00
宋文武
f1935d8eb8 gradle: update to 2.1 2014-10-26 22:10:20 +08:00
Charles Strahan
d696f56324 chruby package: a utlity for switching the current ruby version. 2014-10-26 04:31:35 +00:00
Pascal Wittmann
c17096309e checkstyle: update from 5.7 to 5.8 and adopt it 2014-10-26 02:27:35 +01:00
Vladimír Čunát
89354b4b1a autoconf-2.13: add versioned executable
Needed by mozilla hg builds.
2014-10-25 21:40:23 +02:00
Vladimír Čunát
2cf17b0802 Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
Domen Kožar
efea92de19 fixes #1933 2014-10-23 00:14:09 +02:00
Peter Simons
c2861a1649 Merge pull request #4613 from edwtjo/ihaskell-quickfix
ihaskell: apply classy prelude patch
2014-10-22 22:58:47 +02:00
Edward Tjörnhammar
8ca1c6aba7 haskellPackages.ihaskell: apply compile patch 2014-10-22 20:50:50 +02:00
Bjørn Forsman
34ec068a46 quilt: set meta.platforms = all
We'll reduce it if/when Hydra reports some broken platforms.
2014-10-22 16:07:37 +02:00
Bjørn Forsman
97e0f851d9 quilt: set meta.platforms 2014-10-22 12:02:54 +02:00
Peter Simons
b0ea187001 ihaskell-wrapper: inherit the meta section from ihaskell 2014-10-22 11:47:08 +02:00
aszlig
0c968c9a0e
ihaskell/wrapper: Fix eval by marking as broken.
Introduced by 5e03d07621.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-22 09:21:53 +02:00
Peter Simons
8953fb5e7d haskell-ihaskell: set hydraPlatforms to none to avoid evaluation errors 2014-10-22 08:12:42 +02:00
Peter Simons
5e03d07621 ihaskell: broken by the recent classy-prelude update
@edwtjo: http://hydra.cryp.to/build/208767/nixlog/1/raw
2014-10-21 23:04:40 +02:00
Peter Simons
6b73aaed7f haskell-keter: update to version 1.3.5 2014-10-21 23:04:40 +02:00
Peter Simons
ff7dcbc8ba haskell-hlint: update to version 1.9.10 2014-10-21 15:36:21 +02:00
Peter Simons
279c2c8691 haskell-cabal-db: update to version 0.1.10 2014-10-21 15:36:21 +02:00
Peter Simons
1c8b3d9217 haskell-cpphs: update to version 1.18.6 2014-10-19 16:55:23 +02:00
Peter Simons
8a90c85f54 haskell-graphmod: update to version 1.2.6 2014-10-19 16:55:23 +02:00
Moritz Ulrich
6ff97809c5 egg2nix: Update to 0.2.
Also regenerate chicken-eggs.nix - the changeset is quite big, but
subsequent changes will be smaller as egg2nix now sorts its output.
2014-10-18 02:07:38 +02:00
Eelco Dolstra
09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Peter Simons
739025bd58 gnulib: update to version 0.1-228-gb155b06 2014-10-15 16:30:53 +02:00
Lluís Batlle i Rossell
83fb281d80 Making hydra build ddd.
(cherry picked from commit 4ba671ff113844267dbad307f8a5cbf8ac1d0f52)
2014-10-15 11:16:27 +02:00
Florent Becker
91fe0ddc62 Build js_of_ocaml with tyxml support 2014-10-15 11:13:58 +02:00
Mateusz Kowalczyk
a21d3b67e5 haskell-PastePipe: update to 1.6 2014-10-15 05:14:35 +01:00
Peter Simons
c549ac9c1a haskell-hlint: update to version 1.9.9 2014-10-15 00:24:33 +02:00
Eelco Dolstra
d4d0e449d7 Remove obsolete Hydra package 2014-10-14 22:49:12 +02:00
Rickard Nilsson
87bcb503aa kibana: Update from 3.1.0 to 3.1.1 2014-10-14 19:06:03 +02:00
Peter Simons
608c0271d8 haskell-SourceGraph: broken by haskell-src-exts update 2014-10-14 17:39:35 +02:00
Peter Simons
c0fa3d1b48 haskell-PastePipe: broken by update to network 2.6.x 2014-10-14 17:39:34 +02:00
Peter Simons
97118ad9c7 ihaskell: jailbreak to fix build with recent haskell-src-exts and classy-prelude 2014-10-14 17:39:34 +02:00
Peter Simons
e594ae66fa hscope: mark broken 2014-10-14 17:39:32 +02:00
Peter Simons
6651fe463e haskell-cabal-db: mark broken 2014-10-14 17:39:32 +02:00
Peter Simons
1408b26a0a haskell-pointfree: update to version 1.0.4.8 2014-10-14 17:39:26 +02:00
Peter Simons
2517c46673 haskell-hlint: update to version 1.9.8 2014-10-14 17:39:26 +02:00
Peter Simons
7772b86089 haskell-codex: update to version 0.2.0.2 2014-10-14 17:39:24 +02:00
Florent Becker
bb2a9941e5 add version number to the name of the js_of_ocaml package 2014-10-14 13:10:08 +02:00
Florent Becker
9c441c41d7 update js_of_ocaml to 2.5 2014-10-14 13:05:53 +02:00
Moritz Ulrich
36c5ec58c4 New package: egg2nix.
Generates nix-expressions from Chicken Scheme Eggs.
2014-10-14 00:41:03 +02:00
Bjørn Forsman
391c2778d4 lttng: update to latest (2.4.1 -> 2.5.0)
- This unbreaks lttng linux kernel modules[1]
- lttng-tools has grown a dependency on libxml2

[1]: Build tested (for default NixOS Linux kernel) and run tested with
lttng-sessiond (it successfully loads kernel modules).
2014-10-13 22:16:32 +02:00
Pascal Wittmann
f0ef22b1b7 help2man: update from 1.46.3 to 1.46.4 2014-10-13 17:40:22 +02:00
Peter Simons
89a1d681dd haskell-hsb2hs: add version 0.2 2014-10-13 10:16:23 +02:00
Peter Simons
fddc96be7e haskell-timeplot: update to version 1.0.27 2014-10-13 09:12:25 +02:00
Peter Simons
a0698ad5c2 haskell-BNFC: update to version 2.7.1 2014-10-13 09:12:24 +02:00
Aristid Breitkreuz
61ea009f3b Merge pull request #4458 from offlinehacker/pkgs/gotools
golang: add golint and gotags
2014-10-12 15:57:45 +02:00
Vincent Laporte
4f0bc8e060 ocaml-oasis: adds missing dependency to caml4 2014-10-10 17:00:30 +01:00
Jaka Hudoklin
47e8ee287f golang: add golint and gotags 2014-10-10 15:27:44 +02:00
Austin Seipp
c98592f200 re2c: 0.13.7.4 -> 0.13.7.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-09 17:08:28 -05:00
Aristid Breitkreuz
78b8a7794c Merge pull request #4443 from flazz/master
jq & thrift build on darwin
2014-10-09 20:35:41 +02:00
Francesco Lazzarino
9db29d7e5b jq builds on darwin 2014-10-09 12:00:34 -05:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00