mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
Code Issues Wiki Activity
52886 commits 339 branches 124 tags 6.9 GiB
Commit graph

2273 commits

Author SHA1 Message Date
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
wmertens ded8797d0f Merge pull request #4944 from aflatter/enable-leiningen-on-darwin 
Allow leiningen to build on darwin
 2014-11-11 16:08:43 +01:00
Alexander Flatter 064f10ba3c Allow leiningen to build on darwin 2014-11-11 15:44:45 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Peter Simons 2650bdf417 Merge pull request #4894 from peti/haskell-updates 
Drop obsolete versions of Haskell Platform ...
 2014-11-11 13:42:03 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Vincent Laporte e69dc2be2d fastjar: update from 0.94 to 0.98 2014-11-10 01:04:19 +00:00
Michael Raskin ffbd1d011b Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist 2014-11-09 18:31:46 +03:00
Mateusz Kowalczyk ce4f49cec1 EZTrace: new package 2014-11-09 12:05:44 +00:00
Vincent Laporte ff86c33f1d Fixes camlp4 2014-11-09 01:49:37 +00:00
Luca Bruno 83221f3886 Merge branch 'master' into staging 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
 2014-11-08 15:56:40 +01:00
Peter Simons b8d631a604 happy: drop obsolete versions 1.18.10 1.18.4, 1.18.5, 1.18.6, and 1.18.9 2014-11-08 15:50:21 +01:00
Peter Simons e1af9e865d haddock: drop obsolete versions 2.4.2, 2.7.2, 2.9.2, 2.9.4, 2.11.0, 2.12.0, 2.13.2, 2.13.2.1, 2.14.2, and 2.14.3 2014-11-08 15:50:16 +01:00
Peter Simons 57bdeaa375 alex: drop obsolete versions 2.3.1, 2.3.2, 2.3.3, 3.0.1, 3.0.2, and 3.0.5 2014-11-08 15:50:16 +01:00
Vincent Laporte aa2fd47e9d Fixes ocamlscript 2014-11-08 14:28:38 +00:00
Peter Simons a93512d71f hasktags: jailbreak to fix build with latest 'json' 2014-11-07 23:22:27 +01:00
Peter Simons f9db7db531 haskell-keter: update to version 1.3.5.1 2014-11-07 23:22:27 +01:00
Peter Simons 183c297ea1 haskell-hdevtools: update hash of the patch after its pull request has been rebased 2014-11-07 12:21:48 +01:00
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