Commit Graph

16005 Commits

Author SHA1 Message Date
Peter Simons
d03b49c88c Merge pull request #2505 from bennofs/haskell-profiteur
haskell-profiteur: new expression
2014-05-04 23:07:20 +02:00
Benno Fünfstück
d385835c38 haskell-profiteur: new expression 2014-05-04 23:02:46 +02:00
Peter Simons
f604021658 Merge pull request #2504 from bennofs/haskell-jailbreak-case-insensitive
haskell-case-insensitive-1.0.0.1: jailbreak
2014-05-04 23:01:10 +02:00
Peter Simons
912d615fb3 Merge pull request #2503 from bennofs/haskell-jailbreak-async
async-2.0.1.3: jailbreak (see
2014-05-04 22:42:23 +02:00
Benno Fünfstück
14c4249b37 haskell-case-insensitive-1.0.0.1: jailbreak 2014-05-04 22:40:00 +02:00
Peter Simons
950393924f Merge pull request #2501 from bennofs/wreq-disable-check
haskell-wreq: disable check phase, it requires network
2014-05-04 22:36:09 +02:00
Peter Simons
0cb97aa2ac Merge pull request #2500 from ikervagyok/testing
URL-Fix
2014-05-04 22:29:49 +02:00
Peter Simons
4e1e248cf1 r-generic-builder: clean up the expression 2014-05-04 22:24:57 +02:00
Benno Fünfstück
9dd7896cba async-2.0.1.3: jailbreak (see http://hydra.nixos.org/build/10766630/nixlog/1/raw) 2014-05-04 22:00:08 +02:00
Benno Fünfstück
49d62325ea haskell-wreq: disable check phase, it requires network 2014-05-04 21:37:28 +02:00
Peter Simons
a9258080b1 R: don't install the "recommended packages"
These packages come with R, but if we install them as part of this build, then
we cannot update them without re-building R as well. Instead, we add those
packages to the R environment through the r-wrapper. This means that
recommended packages can be updated in cran-packgaes.nix, and those updates
have an effect on the installation without re-building R itself.
2014-05-04 21:12:34 +02:00
Peter Simons
a329900977 Move r-packages.nix into the r-modules directory. 2014-05-04 21:09:38 +02:00
Peter Simons
ac6bcc7836 cosmetic: move the R-wrapper into its own directory 2014-05-04 21:07:54 +02:00
Lengyel Balázs
5f025b6505 Changed URL to upstream, as the old URL was dead 2014-05-04 19:58:16 +02:00
Domen Kožar
26a1763d4b Merge pull request #2408 from scubed2/ffmpeg
Add subtitle support to ffmpeg
2014-05-04 17:04:23 +02:00
Peter Simons
7c6a730e0b R: added wrapper script that provides "R" and "Rscript" binaries that know about extra libraries
Configure an override in ~/.nixpkgs/config.nix as follows:

  {
    packageOverrides = pkgs: {

      rWrapper = pkgs.rWrapper.override {
        packages = with pkgs.rPackages; [ Defaults dataTable foreach xtable ];
      };

    };
  }
2014-05-04 15:33:15 +02:00
Peter Simons
9e5f7ada34 haskell-ghc-mod: revert "wrap the newly added ghc-modi executable"
This reverts commit eba689ad05. ghc-modi
stopped working for me after this change.

https://github.com/NixOS/nixpkgs/pull/2490
2014-05-04 14:07:42 +02:00
Peter Simons
80d39a273e HTTP-4000.2.13: patch Cabal file to declare FlexibleContexts extension to fix the build with ghc-head
https://github.com/haskell/HTTP/issues/62
2014-05-04 13:46:18 +02:00
Peter Simons
911d9d5b1b Merge pull request #2489 from jwiegley/haskexprs
Add several new Haskell expressions
2014-05-04 13:22:13 +02:00
Peter Simons
1220084354 haskell-httpd-shed: jailbreak to fix build with latest version of 'network' 2014-05-04 13:19:56 +02:00
Peter Simons
ce21d883c0 haskell-vinyl: add version 0.3 2014-05-04 13:19:56 +02:00
Peter Simons
b3f3d111ad haskell-graphviz: jailbreak to fix build with fgl 5.x 2014-05-04 13:19:56 +02:00
Peter Simons
eba689ad05 haskell-ghc-mod: wrap the newly added ghc-modi executable
Cherry-picked from <https://github.com/NixOS/nixpkgs/pull/2490>.
2014-05-04 13:03:18 +02:00
Peter Simons
7c06d93c0f haskell-download-curl: jailbreak to fix build with recent versions of tagsoup 2014-05-04 12:53:45 +02:00
Peter Simons
a2ae6ebb7b haskell-HTTP-4000.2.13: disable test suite to fix the build
https://github.com/haskell/HTTP/issues/60
2014-05-04 12:40:58 +02:00
Peter Simons
cfb6902526 HTTP-4000.2.13: jailbreak to fix build with latest version of conduit
https://github.com/haskell/HTTP/issues/61
https://github.com/NixOS/nixpkgs/issues/2495
2014-05-04 12:40:01 +02:00
Peter Simons
c2fd001fd4 Remove obsolete Agda-executable package; the compiler is not part of 'Agda'. 2014-05-04 12:17:35 +02:00
John Wiegley
9bc6893712 Add several new Haskell expressions 2014-05-03 23:01:00 -05:00
Bjørn Forsman
70b39119c3 qwt: add version 6.x (we already have 5.x)
'qgis', one of the few 'qwt' dependees in nixpkgs, fails to build with
qwt 6. So I'm not moving the default version away from 5.x. Also, not
changing the default allows easy/safe cherry-picking to the stable
branch.
2014-05-04 00:11:26 +02:00
Vladimír Čunát
d96f262166 json-c: update to 0.12, fixing CVE-2013-{6370,6371} 2014-05-03 21:30:48 +02:00
Peter Simons
208e7cae1a happy-1.19.3: patch code to build with ghc-head
https://github.com/simonmar/happy/issues/20
2014-05-03 20:22:12 +02:00
Peter Simons
1bfeca7a90 haddock-2.14.2: re-generate with cabal2nix
Fixes <https://github.com/NixOS/nixpkgs/issues/2481>.
2014-05-03 20:03:33 +02:00
Peter Simons
4b307a7b96 haskell-network: update to version 2.5.0.0 2014-05-03 20:03:33 +02:00
Peter Simons
dd1dd06b88 haskell-text: update to version 1.1.1.1 2014-05-03 20:03:32 +02:00
Peter Simons
c1705e8b33 haskell-fgl: add version 5.5.0.1 2014-05-03 20:03:32 +02:00
Peter Simons
eb7958247a haskell-unordered-containers: update to version 0.2.4.0 2014-05-03 20:03:32 +02:00
Peter Simons
074c128fec haskell-attoparsec: update to version 0.11.3.0 2014-05-03 20:03:32 +02:00
Peter Simons
c0d742110f haskell-threadscope: update to version 0.2.3 2014-05-03 20:03:32 +02:00
Peter Simons
0cb0810c96 haskell-hslogger: update to version 1.2.4 2014-05-03 20:03:32 +02:00
Peter Simons
0e4d6747ee haskell-HaRe: update to version 0.7.2.3 2014-05-03 20:03:32 +02:00
Peter Simons
1940a89112 haskell-stringable: update to version 0.1.3 2014-05-03 20:03:32 +02:00
Peter Simons
3aa5ae8f31 haskell-pcre-light: update to version 0.4.0.2 2014-05-03 20:03:31 +02:00
Peter Simons
e0a257ae59 haskell-monad-extras: update to version 0.5.8 2014-05-03 20:03:31 +02:00
Peter Simons
45165186dc haskell-logging: update to version 1.4.1 2014-05-03 20:03:31 +02:00
Peter Simons
f899787872 haskell-libmpd: update to version 0.8.0.3 2014-05-03 20:03:31 +02:00
Peter Simons
9953352f3e haskell-github: update to version 0.8 2014-05-03 20:03:31 +02:00
Peter Simons
b851ea759e haskell-ghc-events: update to version 0.4.3.0 2014-05-03 20:03:31 +02:00
Peter Simons
3a784a6b8c haskell-JuicyPixels: update to version 3.1.5.1 2014-05-03 20:03:31 +02:00
Peter Simons
0f6bd32324 haskell-Hipmunk: update to version 5.2.0.14 2014-05-03 20:03:30 +02:00
Peter Simons
13b246b221 ghc-head: update snapshot to 7.9.20140430 (and download the tarball from Debian)
https://github.com/NixOS/nixpkgs/pull/2480
2014-05-03 20:03:30 +02:00
Peter Simons
0138b81ed6 Merge pull request #2483 from proger/haskell-ekg-0.4
haskell: bump ekg to 0.4, add ekg-core
2014-05-03 19:30:02 +02:00
Cillian de Róiste
f3e0a29338 aubio: update from 0.4.0 to 0.4.1 2014-05-03 17:12:06 +02:00
Vladimir Kirillov
599f9a09fe haskell: bump ekg to 0.4, add ekg-core 2014-05-03 17:36:03 +03:00
Rob Vermaas
837ddd22f2 Merge pull request #2388 from bennofs/update-jdk7
jdk7: update patchversion 51 -> 55.
2014-05-03 15:59:49 +02:00
Peter Simons
64d662e056 Agda: move compiler and standard library into a common directory
Also renamed AgdaStdLib attribute to AgdaStdlib, since upstream doesn't
seem to capitalize that name.
2014-05-03 12:37:17 +02:00
Peter Simons
801a4818c8 Merge pull request #2474 from jwiegley/agda-stdlib
Add expression for the Agda standard library
2014-05-03 12:33:26 +02:00
Mateusz Kowalczyk
ab7e2f1dc5 haskell-HTTP: update to version 4000.2.13 2014-05-03 12:27:25 +02:00
Oliver Charles
4e70c764f5 Merge pull request #2473 from jwiegley/these
Add expression for Haskell library 'these'
2014-05-03 11:19:18 +01:00
Vladimír Čunát
6faa50e11d libmms: bugfix update, including CVE-2014-2892 2014-05-03 11:38:20 +02:00
Vladimír Čunát
3bb121e50e dbus: minor update 1.8.0 -> .2 2014-05-03 11:31:28 +02:00
Vladimír Čunát
e0be3df0eb harfbuzz: minor update 0.9.27 -> .28 2014-05-03 11:31:27 +02:00
Peter Simons
ca35c44408 haskell-streaming-commons: update to version 0.1.2.1 2014-05-03 10:53:22 +02:00
Peter Simons
49503c10c7 haskell-hledger: update to version 0.23 2014-05-03 10:53:22 +02:00
Peter Simons
bad008d48a haskell-hledger-web: update to version 0.23 2014-05-03 10:53:22 +02:00
Peter Simons
7cbf87792a haskell-hledger-lib: update to version 0.23 2014-05-03 10:53:22 +02:00
Peter Simons
92c9b2eb8f haskell-conduit: update to version 1.1.1.1 2014-05-03 10:53:22 +02:00
Peter Simons
6e58bbe32b haskell-conduit-extra: update to version 1.1.0.3 2014-05-03 10:53:22 +02:00
Peter Simons
6fe44baced haskell-conduit-combinators: update to version 0.2.5.1 2014-05-03 10:53:22 +02:00
Peter Simons
b4893842d2 haskell-classy-prelude: update to version 0.9.1 2014-05-03 10:53:22 +02:00
Peter Simons
48f2ae7dec haskell-classy-prelude-conduit: update to version 0.9.1 2014-05-03 10:53:22 +02:00
Peter Simons
084cec9404 haskell-arithmoi: update to version 0.4.1.0 2014-05-03 10:53:21 +02:00
John Wiegley
7d788d5e4f Add expression for the Agda standard library 2014-05-02 19:15:38 -05:00
宋文武
388d32d966 gst-plugins-bad: build with wildmidi and fluidsynth
remove timidity, the plugin does not build at all
2014-05-02 21:31:06 +02:00
宋文武
da98b7d65e renpy: update from 6.17.3 to 6.17.4 2014-05-02 21:31:05 +02:00
宋文武
b57c9ed9d5 gstreamer: update from 1.2.3 to 1.2.4 2014-05-02 21:31:05 +02:00
宋文武
69c4dae379 gst-plugins-ugly: update from 1.2.3 to 1.2.4 2014-05-02 21:31:05 +02:00
宋文武
cd5702da47 gst-plugins-good: update from 1.2.3 to 1.2.4 2014-05-02 21:31:05 +02:00
宋文武
98dd37afad gst-plugins-bad: update from 1.2.3 to 1.2.4 2014-05-02 21:31:05 +02:00
宋文武
6324296900 gst-libav: update from 1.2.3 to 1.2.4 2014-05-02 21:31:05 +02:00
Austin Seipp
59528d9f0e clang-analyzer: respect $NIX_CFLAGS_COMPILE
When using scan-build, you're often going to want to use it in the
context of a Nix expression with buildInputs, and the default wrapper
scripts will put things like include locations for those inputs
$NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the
analyzer - while the link flags aren't relevant, the include flags are.

This is because the analyzer executable that gets run by scan-build is
*not* clang-wrapper, but the actual clang executable, so it doesn't
implicitly add such arguments. The build is two-stage - it runs the real
clang wrapper once, and then the analyzer once.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 14:07:37 -05:00
Austin Seipp
27a0d56514 compcert: Fix Hydra platforms
Copy-pasta error, and compcert doesn't really make sense on Darwin or
64bit linux (it's callPackage_i686 anyway).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 14:07:36 -05:00
John Wiegley
fb778b705f Add expression for Haskell library 'these' 2014-05-02 13:43:34 -05:00
Michael Raskin
feddcfaf1e Readding Erlang R16B02: R17 is a major update and it breaks Ejabberd. 2014-05-02 20:50:58 +04:00
Peter Simons
de26954b30 Merge pull request #2470 from sol/master
Update haskell-hspec to version 0.9.5
2014-05-02 12:09:08 +02:00
Simon Hengel
e4dead3171 Update haskell-hspec to version 0.9.5 2014-05-02 14:57:46 +08:00
Austin Seipp
f21d619558 nixpkgs: move frama-c to a more appropriate directory
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 19:14:08 -05:00
Austin Seipp
0c51a4ac98 nixpkgs: add CompCert
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-01 19:11:46 -05:00
Peter Simons
303ddfab4c haskell-ghc-mod: re-generate with cabal2nix 2014-05-01 23:40:13 +02:00
Peter Simons
baa1543dbc cabal-bounds: re-generate with cabal2nix 2014-05-01 23:38:20 +02:00
Peter Simons
8b67834bf3 haskell-ghc-mod: make sure GHC <7.8 and >7.8 pick the same datadir install path 2014-05-01 22:57:09 +02:00
Peter Simons
d6dd5688a2 haskell-ghc-mod: disable test suite to fix build with GHC 7.8.2
https://github.com/kazu-yamamoto/ghc-mod/issues/242
2014-05-01 22:56:44 +02:00
Peter Simons
74a9767c5e haskell-libmpd: jailbreak to fix build with recent versions of 'text' 2014-05-01 22:28:13 +02:00
Peter Simons
b5113c90a4 haskell-yesod-form: update to version 1.3.8.3 2014-05-01 21:57:04 +02:00
Peter Simons
cf871089b5 haskell-warp: update to version 2.1.5.1 2014-05-01 21:57:04 +02:00
Peter Simons
373defe9cd haskell-sqlite-simple: update to version 0.4.7.0 2014-05-01 21:57:04 +02:00
Peter Simons
eead385738 haskell-snap-cors: update to version 1.2.4 2014-05-01 21:57:04 +02:00
Peter Simons
07b80292a0 haskell-pandoc-types: update to version 1.12.3.3 2014-05-01 21:57:04 +02:00
Peter Simons
f1ce1480df haskell-nanospec: update to version 0.2.0 2014-05-01 21:57:04 +02:00
Peter Simons
e942079d46 haskell-mono-traversable: update to version 0.5.0 2014-05-01 21:57:03 +02:00
Peter Simons
c4eb80e485 haskell-lifted-async: update to version 0.2.0 2014-05-01 21:57:03 +02:00