Vladimír Čunát
089da3ee5c
Merge master into x-updates
...
Conflicts (simple):
pkgs/top-level/all-packages.nix
2013-12-10 13:00:02 +01:00
Vladimír Čunát
c11747b3f5
merge #1197 : gnuplot darwin changes
2013-12-10 12:46:45 +01:00
Song Wenwu
9c8789e8bc
add webkitgtk 2.2.3
...
With minor changes from @vcunat, see #1197 .
2013-12-10 12:45:21 +01:00
Song Wenwu
7ae520404f
libsoup: update from 2.44.1 to 2.44.2
...
Enable introspection
Renamed from libsoup_2_40 to libsoup_2_44
2013-12-10 10:48:59 +01:00
Peter Simons
685ec102ef
Merge pull request #1348 from ocharles/intervalmap
...
haskellPackages.IntervalMap: New expression
2013-12-09 16:08:30 -08:00
Peter Simons
c1c1de4c02
Merge pull request #1349 from ocharles/ex-pool
...
haskellPackages.exPool: New expression
2013-12-09 16:08:11 -08:00
Peter Simons
5a54eed058
Merge pull request #1350 from ocharles/haskelldb
...
haskellPackages.haskelldb: New expression
2013-12-09 16:08:02 -08:00
Oliver Charles
192cca63ef
haskellPackages.haskelldb: New expression
2013-12-09 23:35:59 +00:00
Oliver Charles
11668c9273
haskellPackages.exPool: New expression
2013-12-09 23:32:00 +00:00
Oliver Charles
7317135edc
haskellPackages.IntervalMap: New expression
2013-12-09 23:13:44 +00:00
Oliver Charles
9e4a60d54e
haskellPackages.extensibleEffects: New expression
2013-12-09 23:11:50 +00:00
Shea Levy
088f472fe5
Add oracle jdk 7
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-09 11:37:40 -05:00
Peter Simons
6dfc18dc00
gnumake: add version 4.0
2013-12-09 16:14:41 +01:00
Peter Simons
e2f8c7a208
all-packages.nix: strip trailing whitespace
2013-12-09 16:09:43 +01:00
Peter Simons
aa58b5f571
gnumake: clean up directory structure; no functional change
2013-12-09 16:09:33 +01:00
Domen Kožar
c1df906704
vlc: specify meta.platforms
2013-12-08 19:19:11 +01:00
Evgeny Egorochkin
a0d8196f60
Use old giflib for packages which lack new versions/compatibility patches for giflib5
2013-12-08 12:36:46 +02:00
Michael Raskin
4d33a94fae
Passing giflib 4.1.x to OpenSceneGraph for now
2013-12-08 13:20:07 +04:00
Vladimír Čunát
b36ed39f2e
cinnamon: various fixes
...
cinnamon-translations: use $out/share instead of $out/usr/share,
add version into name
all-packages.nix: refactor
2013-12-07 14:27:21 +01:00
Vladimír Čunát
6690c97569
Merge branch 'master' into x-updates
...
Conflicts (just different styles, same semantics):
pkgs/development/libraries/libusb1/default.nix
2013-12-07 14:17:16 +01:00
Michael Raskin
fa6e689dcb
Use fresh libnl for ntrack
2013-12-07 12:36:31 +04:00
Michael Raskin
2afb58a8d5
Merge pull request #1316 from roelof1967/cinnamon-translations
...
new pakage: Cinnamon translations
2013-12-07 00:13:24 -08:00
Michael Raskin
1ce105394b
Merge pull request #1337 from codename68/master
...
Add ocaml packages for version 4.01.0
2013-12-07 00:04:49 -08:00
Michael Raskin
0c63a9283d
Merge pull request #1338 from ktosiek/quassel
...
Rename quassel packages
2013-12-07 00:04:14 -08:00
Lluís Batlle i Rossell
142298495e
Fixing the Ultrastardx build. Not tested if it works and how.
2013-12-07 00:07:35 +01:00
Andrew Morsillo
3814415be4
Add robomongo, a GUI for exploring mongodb data and building queries.
2013-12-06 19:40:40 +01:00
David Cadé
ba2b36a1d7
Add ocaml packages for version 4.01.0
2013-12-06 15:16:58 +01:00
Peter Simons
46e1f71e2d
haskell-defaults.nix: ghc-head builds 'cabal-install' using its internal version of Cabal, which is newer or equal to the latest release
2013-12-06 12:02:24 +01:00
Tomasz Kontusz
b4c5a6f15f
Rename quassel packages
2013-12-05 23:56:11 +01:00
Vladimír Čunát
3d3b19d767
Merge #1325 : linux-3.2 and grsecurity updates
2013-12-05 23:20:18 +01:00
David Cadé
9bda7275ce
added OCaml package ocamlsdl
2013-12-05 16:20:32 +01:00
Michael Raskin
990d9684a4
Merge pull request #1321 from wkennington/mumble
...
Break mumble into client and server components
2013-12-04 20:56:36 -08:00
Michael Raskin
a6087d9139
Merge pull request #1328 from lovek323/drush
...
drush: add expression
2013-12-04 20:54:52 -08:00
Jason "Don" O'Conal
1d7108d5f5
drush: add expression
2013-12-05 04:38:35 +00:00
Lluís Batlle i Rossell
ad90f2f0b8
Adding ffmpeg 2.x
2013-12-04 21:04:30 +01:00
Ricardo M. Correia
61adb5962c
grsecurity: Update to 3.0-3.2.53-201312021727 and 3.0-3.12.2-201312021733
2013-12-04 15:28:21 +01:00
Evgeny Egorochkin
b0d281dd58
privoxy: update the build script, add documentation dependency
2013-12-04 04:41:25 +02:00
Peter Simons
3c181313e6
haskell-src-exts: drop obsolete version 1.13.5
2013-12-04 00:08:08 +01:00
Peter Simons
fcc9ea7d4c
haskell-network: update to version 2.4.2.1
2013-12-03 22:23:21 +01:00
Peter Simons
cf2fbb3502
haskell-packages.nix: enable dynamic linking in GHC 7.7 or later
...
The current snapshot requires shared libraries to be built (otherwise
some packages won't build). I'm sure that's a mistake in the way it's
configured that should be fixed. Anyway, enabling shared library support
is an easy way out (and an interesting experiment).
2013-12-03 22:23:20 +01:00
Peter Simons
f1633d5af9
haskell-packages.nix: update 'cgi' to version 3001.1.8.4 when building with GHC 7.7 or later
...
Not that it helps much ... the package depends on MonadCatchIO-mtl, which is
broken in the latest version of GHC.
2013-12-03 22:23:20 +01:00
Peter Simons
d0d8f88d9b
haskell-packages.nix: disable transformers 0.3.0.0 when building with GHC 7.7 or later
...
It's a core package now.
2013-12-03 22:23:20 +01:00
Peter Simons
7c6bc645bd
haskell-GLUT: update to version 2.5.0.1
2013-12-03 22:23:20 +01:00
Peter Simons
3dd9e512c2
haskell-packages.nix: cosmetic
2013-12-03 22:23:20 +01:00
Peter Simons
dc662dcaa2
ghc-head: update to today's git snapshot and arbitrarily dub it version 7.7.20131202
2013-12-03 22:23:20 +01:00
Peter Simons
e5e129a4d0
Fix references to haskell-opengl 2.9.1.0.
2013-12-03 22:23:19 +01:00
Peter Simons
01f13be7ae
all-packages.nix: cosmetic, no functional change
2013-12-03 22:23:19 +01:00
Peter Simons
64feb74f44
happy: update to version 1.19.2
2013-12-03 22:23:19 +01:00
Peter Simons
07ce265406
alex: update to version 3.1.3
2013-12-03 22:23:19 +01:00
Shea Levy
3b1f887d58
Update node packages
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-12-03 14:40:19 -05:00