Commit graph

19065 commits

Author SHA1 Message Date
Thomas Tuegel 26ebd25844 Merge branch 'maintainer-updates' 2014-09-20 15:55:25 -05:00
roconnor bbd58db13a Merge pull request #4133 from vbgl/coq-8-3
Fixes coq-8.3: requires OCaml 3.12 and lablgtk 2.14
2014-09-20 16:24:10 -04:00
Thomas Tuegel cfcf643bb9 Version bump: libfm-1.2.2.1 and menu-cache-0.7.0 2014-09-20 13:20:19 -05:00
Vincent Laporte 40e79043b0 mkOcamlPackages: simpler rule for lablgtk 2014-09-20 18:53:43 +01:00
Peter Simons b608f55590 wai-websockets: jailbreak to fix build with recent io-streams 2014-09-20 18:02:43 +02:00
Peter Simons d1edaee3c0 haskell-websockets-snap: jailbreak to fix build with recent io-streams 2014-09-20 18:00:08 +02:00
Peter Simons 2f21cb77f1 haskell-websockets: jailbreak to fix build with current versions of io-streams 2014-09-20 18:00:08 +02:00
Peter Simons c06999c6c2 haskell-monad-journal: update to version 0.4.0.2 2014-09-20 18:00:07 +02:00
Peter Simons 1f7ec8cff5 haskell-fsnotify: re-generate expression with cabal2nix 2014-09-20 18:00:07 +02:00
Abhinav Gupta d16452df12 fsnotify: 0.0.11 -> 0.1.0.3 2014-09-20 18:00:07 +02:00
Peter Simons 7d9d6cc482 haskell-streaming-commons: update to version 0.1.5 2014-09-20 18:00:07 +02:00
Peter Simons f1a3b0fd58 haskell-shake: update to version 0.13.4 2014-09-20 18:00:07 +02:00
Peter Simons 8b4bcc1f98 haskell-rest-wai: update to version 0.1.0.4 2014-09-20 18:00:07 +02:00
Peter Simons 17185c1078 haskell-rest-types: update to version 1.11 2014-09-20 18:00:07 +02:00
Peter Simons 6ec3a69766 haskell-rest-snap: update to version 0.1.17.14 2014-09-20 18:00:06 +02:00
Peter Simons ccc75f996b haskell-rest-happstack: update to version 0.2.10.3 2014-09-20 18:00:06 +02:00
Peter Simons 1d946eedd6 haskell-rest-gen: update to version 0.16 2014-09-20 18:00:06 +02:00
Peter Simons 9325c8b3b4 haskell-rest-core: update to version 0.33 2014-09-20 18:00:06 +02:00
Peter Simons 0270a7543c haskell-rest-client: update to version 0.4.0.1 2014-09-20 18:00:06 +02:00
Peter Simons 2f21c72199 haskell-random-fu: update to version 0.2.6.1 2014-09-20 18:00:06 +02:00
Peter Simons b85511a86d haskell-pipes-binary: update to version 0.4.0.3 2014-09-20 18:00:05 +02:00
Peter Simons c4123c06c6 haskell-persistent: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons bb61652583 haskell-persistent-template: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons bb847199fb haskell-persistent-sqlite: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons 245d5feee7 haskell-persistent-postgresql: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons 10d06ad787 haskell-persistent-mysql: update to version 2.0.4 2014-09-20 18:00:05 +02:00
Peter Simons a833646da9 haskell-io-streams: update to version 1.2.0.0 2014-09-20 18:00:05 +02:00
Peter Simons c72457f3e8 haskell-http-streams: update to version 0.7.2.0 2014-09-20 18:00:04 +02:00
Peter Simons 212c5e73a7 haskell-ghc-mod: update to version 5.1.0.2 2014-09-20 18:00:04 +02:00
Peter Simons e95208ea86 haskell-ghc-mod: update default to version 5.x 2014-09-20 18:00:04 +02:00
Domen Kožar dc09a2610f Merge pull request #4183 from nathanielbaxter/dev/quazip
quazip: Fix $out variable in installFlags.
2014-09-20 17:59:20 +02:00
Peter Simons 71230bafab Merge pull request #4182 from dmalikov/cabalg
haskellPackages.cabalg: 0.2.9
2014-09-20 12:07:10 +02:00
Nathaniel Baxter 5c898b15f3 quazip: Fix $out variable in installFlags. 2014-09-20 19:43:14 +10:00
Dmitry Malikov 7ad0646dc0 haskellPackages.cabalg: 0.2.9 2014-09-20 13:32:43 +04:00
Peter Simons 5d3bddf6ca haskell-http-streams: jailbreak to fix build with current openssl-streams 2014-09-20 11:29:36 +02:00
Peter Simons 377a1094cc haskell-lens: disable hlint test suite to fix the build
https://github.com/ekmett/lens/issues/478
2014-09-20 11:29:36 +02:00
Peter Simons e444af5eb3 haskell-uuagc-cabal: update to version 1.0.6.0 2014-09-20 11:29:36 +02:00
Peter Simons 3e81fd4126 haskell-yesod-bin: update to version 1.2.13 2014-09-20 11:29:36 +02:00
Peter Simons 02d0b6e4fd haskell-yesod-auth: update to version 1.3.4.6 2014-09-20 11:29:36 +02:00
Peter Simons 16a701b8c5 haskell-shake: update to version 0.13.3 2014-09-20 11:29:36 +02:00
Peter Simons 3ada930077 haskell-rest-core: update to version 0.32.0.2 2014-09-20 11:29:36 +02:00
Peter Simons 5c34e9ecf4 haskell-markdown: update to version 0.1.11 2014-09-20 11:29:36 +02:00
Peter Simons b4c812641c haskell-cabal-bounds: update to version 0.8.7 2014-09-20 11:29:36 +02:00
Peter Simons 93045512db haskell-persistent: update to version 2.0.3.1 2014-09-20 11:29:36 +02:00
Peter Simons 2a8b13edc1 haskell-persistent-template: update to version 2.0.3.2 2014-09-20 11:29:36 +02:00
Peter Simons ec1d8b1b46 haskell-persistent-sqlite: update to version 2.0.3 2014-09-20 11:29:36 +02:00
Peter Simons 2b1ec2f9d0 haskell-persistent-postgresql: update to version 2.0.3 2014-09-20 11:29:36 +02:00
Peter Simons 681e8c7a11 haskell-persistent-mysql: update to version 2.0.3 2014-09-20 11:29:36 +02:00
Peter Simons 110db03506 haskell-openssl-streams: update to version 1.2.0.0 2014-09-20 11:29:36 +02:00
Peter Simons 55038f1cda haskell-language-c-inline: update to version 0.7.6.1 2014-09-20 11:29:35 +02:00
Peter Simons 67280d9701 haskell-hint: update to version 0.4.2.1 2014-09-20 11:29:35 +02:00
Peter Simons 664040624b haskell-haskell-generate: update to version 0.2.1 2014-09-20 11:29:35 +02:00
Peter Simons 8b47088786 haskell-gloss-raster-accelerate: update to version 1.8.15.0 2014-09-20 11:29:35 +02:00
Peter Simons e5fb9135f6 haskell-gloss-accelerate: update to version 1.8.15.0 2014-09-20 11:29:35 +02:00
Peter Simons 47064f2730 haskell-foldl: update to version 1.0.7 2014-09-20 11:29:35 +02:00
Peter Simons ea80932802 haskell-fay: update to version 0.20.2.0 2014-09-20 11:29:35 +02:00
Peter Simons 1be933998c haskell-esqueleto: update to version 2.0.1 2014-09-20 11:29:35 +02:00
Peter Simons 7010a5177d haskell-dimensional-tf: update to version 0.3.0.1 2014-09-20 11:29:35 +02:00
Peter Simons ff76b34a2d haskell-cmdargs: update to version 0.10.10 2014-09-20 11:29:35 +02:00
Peter Simons 7568fe974b haskell-clock: update to version 0.4.1.1 2014-09-20 11:29:35 +02:00
Peter Simons 26e459816a haskell-cabal-cargs: update to version 0.7.3 2014-09-20 11:29:35 +02:00
Peter Simons 7bdbfa8595 haskell-boomerang: update to version 1.4.4 2014-09-20 11:29:35 +02:00
Peter Simons 2de7b6b47c haskell-blaze-builder: update to version 0.3.3.4 2014-09-20 11:29:35 +02:00
Peter Simons 6c4fc6e686 haskell-aws: update to version 0.10.5 2014-09-20 11:29:35 +02:00
Peter Simons 1bd318b389 haskell-aeson-qq: update to version 0.7.4 2014-09-20 11:29:35 +02:00
Peter Simons d40a83ea53 haskell-ad: update to version 4.2.1 2014-09-20 11:29:35 +02:00
Peter Simons abfb5085d9 haskell-MonadPrompt: update to version 1.0.0.5 2014-09-20 11:29:34 +02:00
Peter Simons c63b7ccfa7 haskell-HTF: update to version 0.12.1.0 2014-09-20 11:29:34 +02:00
Peter Simons eaa4dac188 haskell-Boolean: update to version 0.2.2 2014-09-20 11:29:34 +02:00
Peter Simons f13d04368a haskell-pandoc: re-generate expression with new flags 2014-09-20 11:29:34 +02:00
Vladimír Čunát c1c8d561b1 fix evaluation (bogus licenses in ocaml-modules) 2014-09-20 10:34:47 +02:00
Michael Raskin 18ca33ee7c Adopt fix from ewemoa to give more memory to acl2 build 2014-09-20 12:13:43 +04:00
Shea Levy d9716fb642 ats2: bump 2014-09-20 02:15:42 -04:00
Daniel Peebles 4cb2357782 Drop the jakarta name from BCEL and update its version.
Closes #4180.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 07:13:24 +01:00
Domen Kožar 9cad5e755f Merge pull request #4170 from vbgl/ocaml-sexplib-camlp5
Updates ocaml-sexplib and ocaml-typeconv
2014-09-19 20:45:14 +02:00
Vincent Laporte 8febae5dfd Updates ocaml-sexplib and ocaml-typeconv
Fixes OCaml / camlp5 version mismatch
2014-09-19 19:09:37 +01:00
Mateusz Kowalczyk 6c36a7581c haskell-bv: update to 0.3.0
Fixes the package, original problem reported and fixed at
https://bitbucket.org/iago/bv-haskell/issue/1/does-not-build-with-ghc-783.
2014-09-19 17:12:28 +01:00
Marco Maggesi 9068262b66 Merge pull request #4123 from falsifian/krb5
krb5: Update to 12.2.2.  (Please test before merging.)
2014-09-19 16:56:53 +02:00
Eelco Dolstra 9f12c8bde8 valgrind: Update to 3.10.0 2014-09-19 14:55:39 +02:00
Peter Simons 93884f2d23 Merge pull request #4163 from Twey/tasty-program
New Haskell package: tasty-program
2014-09-19 14:40:36 +02:00
Rok Garbas 602f7e5aa4 python: collision in names when developing 2 and more python packages with nix
when you run nix-shell 2 times at the same time of project (but different
branches) you get collision in names inside /tmp folder. i solved this by
hashing current path of developing folder and using that as indentifier while
still keeping name at the end.

diff --git a/pkgs/development/python-modules/generic/default.nix
b/pkgs/development/python-modules/generic/default.nix index 4c9c53a..6ec7934
100644 --- a/pkgs/development/python-modules/generic/default.nix +++
b/pkgs/development/python-modules/generic/default.nix @@ -161,11 +161,12 @@ if
disabled then throw "${name} not supported for interpreter ${python.executabl

   shellHook = attrs.shellHook or ''
     if test -e setup.py; then
-       mkdir -p /tmp/$name/lib/${python.libPrefix}/site-packages
+       tmp_path=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name
+       mkdir -p $tmp_path/lib/${python.libPrefix}/site-packages
        ${preShellHook}
-       export PATH="/tmp/$name/bin:$PATH"
-       export PYTHONPATH="/tmp/$name/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-       ${python}/bin/${python.executable} setup.py develop --prefix /tmp/$name
+       export PATH="$tmp_path/bin:$PATH"
+       export PYTHONPATH="$tmp_path/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+       ${python}/bin/${python.executable} setup.py develop --prefix $tmp_path
        ${postShellHook}
     fi
   '';
2014-09-19 14:23:45 +02:00
Peter Simons bbca3a51a7 Merge pull request #4090 from michelk/r-jsonlite
r-jsonlite: update to 0.9.11
2014-09-19 12:41:00 +02:00
Peter Simons d236e61327 Merge pull request #4091 from michelk/r-gdal-geos
r-rgdal/rgeos: adding gdal geos and proj as dependency
2014-09-19 12:40:43 +02:00
Peter Simons 58e233afbe Merge pull request #4159 from ftrvxmtrx/erlang-17.3
erlang/R17: update to 17.3
2014-09-19 12:26:10 +02:00
Vladimír Čunát 84b791ddd8 libav: update all branches, probably with security fixes
(cherry picked from commit ead6603b60)
2014-09-19 11:51:28 +02:00
James ‘Twey’ Kay 6b40a3aa17 New Haskell package: tasty-program 2014-09-19 10:30:55 +01:00
Siarhei Zirukin 56106d8e4c erlang/R17: update to 17.3 2014-09-19 09:23:28 +02:00
Moritz Ulrich 05c02b06f7 Leiningen: Bump to 2.5.0. 2014-09-19 00:29:16 +02:00
Bjørn Forsman f6148e10a3 grails: new package
Grails is an Open Source, full stack, web application framework for the
JVM. It takes advantage of the Groovy programming language and
convention over configuration to provide a productive and stream-lined
development experience.

http://grails.org/
2014-09-18 22:57:03 +02:00
ambrop7@gmail.com 2bdc12eeed Update KDevelop to 4.7.0. 2014-09-18 22:23:23 +02:00
Peter Simons aa67e95bb5 haskell-here: revert "new expression"
This reverts commit 3e5bcdc327. The
package doesn't compile.
2014-09-18 21:16:44 +02:00
Charles Strahan e38d7cbfb2 Fix the new Ruby interpreters (fixes #3509).
Ruby >= 2.1.0 will try to download config.{sub,guess} if not already present.
This provides both files in a pure manner, and also deletes the download script
to prevent any future confusion.
2014-09-18 11:43:16 -04:00
Domen Kožar cee221bc84 setuptools: 2.1 -> 5.8 2014-09-18 14:03:16 +02:00
Domen Kožar 4742c886dd libtoxcore: disable tests for now 2014-09-18 13:53:40 +02:00
Domen Kožar b851e970da Revert "protobuf: 2.5.0 -> 2.6.0"
This reverts commit 5dff5ede0a.
2014-09-18 13:12:01 +02:00
Michael Raskin a87e5507c0 More specific Ocsigen license checked by FlorentBecker 2014-09-18 14:42:54 +04:00
Eelco Dolstra 8e2e4216ba boehm-gc: Support --enable-large-config 2014-09-18 12:19:09 +02:00
Nikolay Amiantov ab56d9c344 libbluray: adopt and update the package to meet cmplayer's requirements 2014-09-18 14:08:39 +04:00
William A. Kennington III b2600df4a8 protobuf-c: 0.15 -> 1.0.2 2014-09-18 00:49:18 -07:00
William A. Kennington III 5dff5ede0a protobuf: 2.5.0 -> 2.6.0 2014-09-18 00:49:18 -07:00