Commit Graph

2185 Commits

Author SHA1 Message Date
Vladimír Čunát
b4214da14e gcc_multi: sync the change to 4.6 and 4.9 as well 2014-11-13 22:38:57 +01:00
Vladimír Čunát
457850397a gcc_multi: prevent overwritten libs after 51f1b4ec48 2014-11-13 22:30:32 +01:00
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
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Michael Raskin
6c39bbde6d Set correct current platform support for Mozart binary 2014-11-11 13:57:00 +03:00
Domen Kožar
eba10b008f fix tarball eval 2014-11-11 07:21:43 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Michael Raskin
b6203b804b Mark binary distribution of Mozart/Oz 2.0 as such 2014-11-09 19:26:55 +03:00
stewart
076677d0bf removed shebang in builder.sh 2014-11-09 19:26:55 +03:00
stewart
a5756e79f2 depricate mozart-1.4 for mozart-2 2014-11-09 19:26:55 +03:00
Ricardo M. Correia
12a19684c7 rustcMaster: Fix test failure under grsec kernels 2014-11-09 04:59:31 +01:00
Ricardo M. Correia
4fc73a7873 rustcMaster: Update to newer rev 2014-11-09 04:59:31 +01:00
Maciek Starzyk
f72c460abf ocaml: 4.02.0 -> 4.02.1 2014-11-08 23:15:53 +01: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
484b26569a ghc-head: update to version 7.9.20141106 2014-11-07 23:22:27 +01:00
Michael Raskin
689f1af563 Refactor Lazarus build a bit and build it with all the components by default 2014-11-07 11:41:12 +03: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
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
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
karsten gebbert
9cbbd93c74 add elm-reactor to the package list 2014-11-04 11:47:32 +01:00
Peter Simons
b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Peter Simons
030a044800 Merge pull request #4812 from krgn/elm-repl
add elm-preprepl to package list
2014-11-03 23:00:50 +01:00
Michael Raskin
f1f5ac184f Update GCL 2014-11-04 00:37:42 +03:00
Michael Raskin
e4c64a6805 Update Lazarus 2014-11-04 00:37:42 +03:00
karsten gebbert
9868f13799 add elm-get to haskell packages 2014-11-03 21:46:20 +01:00
karsten gebbert
f646d1f6ec add elm-preprepl to package list 2014-11-03 21:31:32 +01:00
Peter Simons
984b0cbd8a uhc: remove broken package
https://github.com/NixOS/nixpkgs/issues/3565
2014-11-03 18:33:02 +01:00
Evgeny Egorochkin
9b05a425cd golang: add meta.branch 2014-11-03 13:12:47 +02:00
Peter Simons
a9560e3497 nasm: Revert "update from 2.11.05 to 2.11.06"
This reverts commit bce477f846, which
breaks syslinux.
2014-11-03 11:29:18 +01:00
William A. Kennington III
aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Michael Raskin
8b092fe505 Adding Julia 0.3.2 — will make default after a little testing 2014-11-02 23:51:59 +03:00
Michael Raskin
db7d2c753e Update SBCL to 1.2.5 2014-11-02 21:52:11 +03:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Peter Simons
f12ef69336 idris: jailbreak to fix build with recent version of 'lens' 2014-11-01 21:08:06 +01:00
Peter Simons
aa91690dad agda: jailbreak to fix build with recent versions of 'text' 2014-11-01 21:08:03 +01:00
Peter Simons
2dac9abdde scala: fix the sha256 checksum from https://github.com/NixOS/nixpkgs/pull/4753 2014-11-01 21:07:36 +01:00
Evgeny Egorochkin
bce477f846 nasm: update from 2.11.05 to 2.11.06 2014-11-01 14:52:11 +02:00
taku0
2ee464a83d scala: Bump up version from 2.11.2 to 2.11.4 2014-10-31 22:35:03 +09:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Maciek Starzyk
6296d967fd haskell-idris: update to version 0.9.15.1 2014-10-29 21:03:08 +01:00
taku0
d019bcf8ec oraclejdk: bump to 8u25, 7u71, and 7u72 2014-10-28 05:24:33 -07: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
Peter Simons
12fd14c453 haskell-idris: update to version 0.9.15 2014-10-28 00:41:25 +01:00
Shea Levy
130d817286 Ats2: bump 2014-10-27 19:11:58 -04:00
Evgeny Egorochkin
a506faf9f9 swiProlog: update from 6.6.5 to 6.6.6 2014-10-27 07:16:33 +02:00
Moritz Ulrich
cdd2dd70aa Merge remote-tracking branch 'refs/remotes/origin/master' into chicken-eggs 2014-10-27 01:14:13 +01:00
Bjørn Forsman
52243083ca gcc-arm-embedded: add missing dependency on 'ncurses'
Fixes this:

  $ arm-none-eabi-gdb
  arm-none-eabi-gdb: error while loading shared libraries: libncurses.so.5: cannot open shared object file: No such file or directory
2014-10-26 19:45:34 +01:00
Austin Seipp
551ead935c gambit: 4.6.1 -> 4.7.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-10-24 23:04:48 -05:00