Vladimír Čunát
ac6761c908
Merge master into stdenv-updates
...
Conflicts:
pkgs/applications/version-management/gource/default.nix
pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Peter Simons
8088837dc8
haskell-hakyll: jailbreak to fix build with recent version of pandoc-citeproc
2014-01-20 18:28:04 +01:00
Peter Simons
9c065f77d8
haskell-yesod-platform: update to version 1.2.6
2014-01-20 18:28:04 +01:00
Peter Simons
c13a56a036
haskell-yesod-form: update to version 1.3.4.3
2014-01-20 18:28:04 +01:00
Peter Simons
e7302c891e
haskell-yesod-auth: update to version 1.2.5.3
2014-01-20 18:28:04 +01:00
Peter Simons
119d4b8d5c
haskell-wai-extra: update to version 2.0.3
2014-01-20 18:28:04 +01:00
Peter Simons
a58a0b17c9
haskell-vector-space-points: update to version 0.1.3
2014-01-20 18:28:04 +01:00
Peter Simons
75672819ea
haskell-threepenny-gui: update to version 0.4.0.2
2014-01-20 18:28:04 +01:00
Peter Simons
80658f3cfb
haskell-stm-conduit: update to version 2.2
2014-01-20 18:28:03 +01:00
Peter Simons
c0270c7dfa
haskell-snap: update to version 0.13.2.1
2014-01-20 18:28:03 +01:00
Peter Simons
eaf5b1cde1
haskell-pipes-bytestring: update to version 1.0.3
2014-01-20 18:28:03 +01:00
Peter Simons
19466e48fc
haskell-heist: update to version 0.13.0.5
2014-01-20 18:28:03 +01:00
Peter Simons
e90fb2442a
haskell-hakyll: update to version 4.4.3.1
2014-01-20 18:28:03 +01:00
Peter Simons
3a0f4d4fcd
haskell-gnuidn: update to version 0.2.1
2014-01-20 18:28:03 +01:00
Peter Simons
df89207c9e
haskell-gloss: update to version 1.8.1.2
2014-01-20 18:28:03 +01:00
Peter Simons
496b53e44f
haskell-gloss-raster: update to version 1.8.1.2
2014-01-20 18:28:02 +01:00
Peter Simons
032ea31c47
haskell-cryptohash: update to version 0.11.2
2014-01-20 18:28:02 +01:00
Peter Simons
c5456a7f89
haskell-conduit: update to version 1.0.11.1
2014-01-20 18:28:02 +01:00
Peter Simons
0178eba86e
haskell-base16-bytestring: update to version 0.1.1.6
2014-01-20 18:28:02 +01:00
Peter Simons
e6226d7d3c
haskell-JuicyPixels: update to version 3.1.3
2014-01-20 18:28:02 +01:00
Peter Simons
e701d2b062
haskell-aeson: add version 0.7.0.0 (but don't use it yet)
2014-01-20 18:28:02 +01:00
Peter Simons
12bb3d783b
haskell-case-insensitive: update to version 1.1.0.3
2014-01-20 18:28:02 +01:00
Peter Simons
f0740ac2bc
happy: add version 1.19.3
2014-01-20 18:28:02 +01:00
Peter Simons
2991fdca52
root: enable parallel building
2014-01-20 18:26:32 +01:00
Peter Simons
630dc74638
all-packages.nix: move 'science/misc' builds into the proper place and add attribute for 'fricas'
2014-01-20 18:24:56 +01:00
Peter Simons
baeb19d0ce
root: clean up meta section and move build into 'science/misc' section
2014-01-20 18:24:27 +01:00
Peter Simons
6475f0d1fe
fricas: clean up meta section
2014-01-20 18:20:08 +01:00
Peter Simons
43d59a9a3b
lib/maintainers.nix: add missing entry for 'sprock'
2014-01-20 18:18:35 +01:00
Roger Mason
e9928a1f25
Add CERN's 'root' Application Framework.
2014-01-20 18:11:09 +01:00
Roger Mason
3d1f6e3a75
Add fricas, a computer algebra system
2014-01-20 18:11:09 +01:00
Peter Simons
5333854aa4
haskell-cabal2nix: re-generate with cabal2nix
2014-01-20 18:06:05 +01:00
Peter Simons
75934cbe09
haskell-xournal-types: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
6fd153677b
haskell-xournal-parser: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
4350308ec7
haskell-transformers-free: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
22727d9507
haskell-hoodle-types: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
b26ab6c8f0
haskell-hoodle-render: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
bf487fed15
haskell-hoodle-parser: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
86e1775cf4
haskell-hoodle-core: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
a1adb429ec
haskell-hoodle-builder: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
fecb119e5e
haskell-coroutine-object: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
ee890f01f8
haskell-TypeCompose: re-generate with cabal2nix
2014-01-20 18:05:00 +01:00
Peter Simons
b4e1774272
haskell-hoodle: re-generate with cabal2nix
2014-01-20 18:04:59 +01:00
Oliver Charles
e217fd9ae8
haskellPackages.tastyRerun: New expression
2014-01-20 15:45:55 +00:00
Ian-Woo Kim
7b51e24de9
add hoodle (pen notetaking program written in haskell) to nixpkgs
2014-01-20 15:18:04 +00:00
Eelco Dolstra
8890492872
openjdk: Ugly hack to fix nix-env installation
...
Nix-env always wants to install all outputs of a derivation, but this
failed for openjdk/openjre because openjdk has some symlinks (such as
bin/java) to openjre. Also, it prevents installing the openjre
without the openjdk. So as a workaround, mess with the "outputs"
attribute to fool nix-env.
Also, give openjre a separate name and description.
Fixes #1535 .
2014-01-20 14:58:09 +01:00
Bas van Dijk
9068ba2bb4
postgresql: Add version 9.3
2014-01-20 14:58:09 +01:00
Eelco Dolstra
37a44d4055
libvpx: Don't install static library
2014-01-20 14:58:09 +01:00
Domen Kožar
e1602a5e21
Merge pull request #1551 from urv/master
...
calibre: upgrade from 1.17.0 to 1.20.0
2014-01-20 05:53:08 -08:00
Lluís Batlle i Rossell
3faf620e8a
Updating libvpx to 1.3.0, and making ffmpeg include vpx
...
I don't think there is any reason not to have vpx there. It's
part of webm.
2014-01-20 13:47:24 +01:00
Lluís Batlle i Rossell
4a4950f323
Setting license to elinks.
...
Disabling guile, due to licence incompatibility.
2014-01-20 13:47:24 +01:00