Commit graph

23564 commits

Author SHA1 Message Date
Eric Seidel c94b24fa4a fix fallout from merge of master 2015-04-06 19:48:44 -07:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Peter Simons d751367d70 haskell-gloss: keep old version around for GHC 7.8.x 2015-04-06 21:24:34 +02:00
Peter Simons 16dd6caec0 haskell-safecopy: upstream has fixed the test suite 2015-04-06 21:24:34 +02:00
Peter Simons 696513be2c haskell-mysql: manually pass the correct "lib" derivation
Apparently, automatic propagation to "mysql" still doesn't work. Anyway,
it's nicer to link "lib" only anyway.
2015-04-06 21:24:34 +02:00
Peter Simons e3925a3478 hackage-packages.nix: re-generate from Hackage 2015-04-06T20:16:31+0200 2015-04-06 21:24:34 +02:00
Nikolay Amiantov 25618c3670 agda: migrate to haskell-ng, update and cleanup
Resolves https://github.com/NixOS/nixpkgs/pull/7172.
2015-04-06 21:24:33 +02:00
Peter Simons 434f129c62 Agda: fix build by providing the required older versions of its dependencies
Resolves https://github.com/NixOS/nixpkgs/issues/7201.
2015-04-06 21:24:33 +02:00
Peter Simons d9b67dd5a5 haskell-idris: update override for lens 2015-04-06 21:24:33 +02:00
Peter Simons cb01f21063 hackage-packages.nix: re-generate from Hackage 2015-04-06T16:01:20+0200 2015-04-06 21:24:33 +02:00
Peter Simons 66c587013b Merge pull request #7168 from cstrahan/pandoc-fix
pandoc: fix on GHC 7.10
2015-04-06 15:56:25 +02:00
Austin Seipp 715b961bf9 nixpkgs: adopt smlnj, 110.76 -> 110.78
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-06 06:28:26 -05:00
Vladimír Čunát 4041fc3e85 libzip: fix CVE-2015-2331 by Debian patch
Rebuild impact seems low, except for LibreOffice.
2015-04-06 12:13:19 +02:00
Markus Kohlhase 40db8b6ffd nixpkgs: removed sloc duplicate 2015-04-06 11:53:06 +02:00
Domen Kožar 7c7f426b3f Merge pull request #7164 from rzetterberg/master
Fixes minetest mesa 10.* incompatibility, adds minetest server service
2015-04-06 10:46:26 +02:00
Vincent Laporte 8553d212c7 ocaml-stringext: update from 1.2.0 to 1.3.0 2015-04-06 10:14:48 +02:00
William A. Kennington III 5275eebad7 asio: 1.10.4 -> 1.10.6 2015-04-05 23:04:23 -07:00
Arseniy Seroka c7a099d4aa Merge pull request #7192 from KoviRobi/gnu-apl-update
Updated GNU APL to 1.5
2015-04-06 00:42:14 +03:00
Michael Raskin b783b69326 Merge pull request #6044 from sjmackenzie/erlang-javac-hipe
Problem: erlang in nixpkgs doesn't support jinterface + no hipe
2015-04-05 21:07:11 +03:00
Michael Raskin 7d80aed6e2 Update mdds 2015-04-05 20:27:26 +03:00
Michael Raskin 67e055501f Update intltool 2015-04-05 20:27:25 +03:00
Michael Raskin 73c6c4ecde Update sbcl 2015-04-05 20:27:25 +03:00
Michael Raskin e4ce4e9f5b Update unstable Botan 2015-04-05 20:27:25 +03:00
Michael Raskin 25317cf30c Update cl-launch 2015-04-05 20:27:25 +03:00
Michael Raskin 3179728482 Update libre 2015-04-05 20:27:25 +03:00
Michael Raskin c6eafc4eef Update lush 2015-04-05 20:27:25 +03:00
Nikolay Amiantov 250a39dc79 bundler: update 2015-04-05 16:04:54 +03:00
Cray Elliott 5c866dc5e9 yesod-bin patch : use stripLen instead of patchFlags 2015-04-05 01:06:28 -07:00
Cray Elliott 880e0950d8 Revert "add patchFlags to haskell-ng's generic-builder"
Oops! Didn't realize that the stripLen option can be passed to fetchpatch.
Seems a cleaner than my method

This reverts commit eb7362a36c.
2015-04-05 01:06:20 -07:00
Domen Kožar 4c449b86ea Merge pull request #7173 from ryantm/fetchurlGnome
Get rid of fetchurlGnome
2015-04-05 10:03:37 +02:00
Cray Elliott 2f180f6888 yesod-bin : pull in patch from PR to support GHC 7.10.1 2015-04-05 00:49:39 -07:00
Cray Elliott eb7362a36c add patchFlags to haskell-ng's generic-builder
I use this to get yesod-bin working with ghc 7.10.1
2015-04-05 00:48:12 -07:00
Cray Elliott fd85ddcd50 remove ghc 7.10 patches for yesod-auth, wai-extra, and persistent-template
these patches have all landed upstream
2015-04-05 00:47:49 -07:00
Ryan Mulligan 93f1029b0f Get rid of fetchurlGnome
closes #1707
2015-04-04 22:22:12 -07:00
William A. Kennington III 35b442abc3 krb5: Make linux only 2015-04-04 20:04:15 -07:00
William A. Kennington III 74c2500206 librelp: Make linux only 2015-04-04 20:03:33 -07:00
William A. Kennington III 88cfd89c16 ntdb: Attempt darwin fix and use patchShebangs 2015-04-04 19:57:13 -07:00
William A. Kennington III db9d5601f2 mtvdev: Make linux only 2015-04-04 19:45:09 -07:00
William A. Kennington III 7578bbea27 ctdb: Remove as it is now part of samba 2015-04-04 19:19:00 -07:00
William A. Kennington III 7fdb95d9a3 ti-rpc: Add platforms.linux 2015-04-04 13:56:27 -07:00
Arseniy Seroka 5fa1644d28 Merge pull request #7162 from spwhitt/simple_darwin_fixes
sl, astyle, uncrustify, mediainfo: Darwin fixes
2015-04-04 23:03:15 +03:00
Charles Strahan d652fdedcb pandoc: fix on GHC 7.10 2015-04-04 15:31:44 -04:00
Cray Elliott 1ec78db3c6 GHC 7.10.1 no longer requires a patch to build foldl 2015-04-04 11:02:44 -07:00
Domen Kožar b9e0e67604 ftp://xmlsoft.org -> http://xmlsoft.org 2015-04-04 16:07:31 +02:00
Oliver Charles 63a4722d7b garmin-plugin: New expression
This is a web browser plugin that allows one to use their Garmin device
on the myGarmin website. It provides a Linux version of the Garmin
Communicator plugin.
2015-04-04 11:51:23 +01:00
Michael Raskin ba82a5d609 Merge pull request #5142 from bosu/static-proot
proot: allow static compilation
2015-04-04 13:26:21 +03:00
William A. Kennington III 445d789243 Fix some platforms 2015-04-03 23:23:52 -07:00
William A. Kennington III 43d114c74b bundler-head: Fix hash 2015-04-03 23:18:23 -07:00
Spencer Whitt a12fb39d1e mediainfo: build on Darwin 2015-04-04 02:07:55 -04:00
Spencer Whitt 171225ab1c uncrustify: build on Darwin 2015-04-04 02:07:55 -04:00