Commit Graph
4874 Commits
Author SHA1 Message Date
Vincent Laporte fbbd88017f zarith: propagate build input gmp 2014-11-07 09:50:39 +00:00
Pascal Wittmann 3a0f2619ce ragel: update from 6.3 to 6.9 2014-11-07 00:31:21 +01:00
Vincent Laporte 3d049938c8 Adds some “branch” meta-data 2014-11-06 19:40:50 +00:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vincent Laporte fa09f72162 ccache: update from 3.1.9 to 3.1.10 2014-11-06 00:32:43 +00:00
Michael Raskin d66bf89faa Update PhantomJS; should also fix remarkjs 2014-11-06 00:32:31 +03:00
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