1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00
Commit graph

43058 commits

Author SHA1 Message Date
John Wiegley 0a6b317071 Make Coq buildable on any Unix 2014-05-05 00:58:23 -05:00
Peter Simons 66bcd77f0e R: simplify the generic builder 2014-05-04 23:54:11 +02:00
Peter Simons 401f4a28c1 cryptol: fix reference to text library 2014-05-04 23:21:39 +02:00
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 18f49692ec haskell-wreq: fix reference to attoparsec 2014-05-04 22:25:56 +02:00
Peter Simons 4e1e248cf1 r-generic-builder: clean up the expression 2014-05-04 22:24:57 +02:00
Peter Simons ef05fad51a R: don't restrict meta.platforms to Linux; other architectures should build fine 2014-05-04 22:04:44 +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 a306b28baa haskell-defaults: prefer cabal-install 1.20.x on ghc-head 2014-05-04 21:19:11 +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
Peter Simons 834679ddab all-packages.nix: move all R-related attributes into one place 2014-05-04 20:51:36 +02:00
Peter Simons 0d264c1761 r-packages.nix: add an auto-generated list of all CRAN packages 2014-05-04 20:51:36 +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 a9a3cbfae3 xbmc: 12.3 -> 13.0
- add support for vaapi, bluray
- depend on gnutls
- by default enable pulseaudio
2014-05-04 18:04:22 +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 35d2c4b741 r-packages.nix: added various new libraries 2014-05-04 15:33:15 +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 adce4233af all-packages.nix: strip trailing whitespace 2014-05-04 15:33:15 +02:00
aszlig f6e31fadd8
chromium: Update all channels to latest versions.
With this commit, the following new upstream versions are introduced:

stable: 34.0.1847.116 -> 34.0.1847.132 (builds fine, tested)
beta:   35.0.1916.47  -> 35.0.1916.86  (builds fine, tested)
dev:    36.0.1941.0   -> 36.0.1964.2   (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-04 14:50:07 +02:00
aszlig 17807c8b6c
chromium: Link against pulse instead of dlopen().
This fixes the issue of Chromium not being able to load the pulseaudio
librarp

We could also propagate the build inputs, but it would end up being the
same as just directoly linking against the library.

Thanks to @aristidb for noticing this in #2421:

https://github.com/NixOS/nixpkgs/pull/2421#issuecomment-42113656

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-04 14:50:07 +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
cillianderoiste c1181af456 Merge pull request #2397 from Fuuzetsu/mpv-0.3.8
Bump mpv to 0.3.8
2014-05-04 13:07:24 +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 07aaea85d4 pam: upstream patch to fix CVE-2014-2583 2014-05-03 21:30:48 +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