3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

12004 commits

Author SHA1 Message Date
cillianderoiste 885a2d9c53 Merge pull request #2410 from pSub/potrace
Add potrace-1.11, a tool for tracing bitmaps
2014-05-11 14:46:12 +02:00
Vladimír Čunát ce02e8c1db bedup: add top-level attribute
Currently I see no standard way of having package name
without the "pythonX.Y-" prefix.

This is replacement to #2339.
2014-05-11 14:29:13 +02:00
Henry Till 6223cbd7a8 supercollider: added emacs support 2014-05-10 22:18:03 -04:00
mornfall 7d1d270a7a Merge pull request #2599 from darklajid/bump_libvirt-python
nixpkgs: Bump libvirt-python to 1.2.4 - libvirt is already updated and ...
2014-05-10 19:37:18 +02:00
Benjamin Podszun 8999a7c550 nixpkgs: Bump libvirt-python to 1.2.4 - libvirt is already updated and this package is therefor broken 2014-05-10 14:34:50 +02:00
Vladimir Kirillov 96903d5e48 sysdig: support builds without the kernel module, add pkgs.sysdig attr 2014-05-10 13:50:49 +03:00
Peter Simons 06f9fed0ac Merge pull request #2592 from bennofs/haskell-new-expressions
Add a few haskell expressions
2014-05-09 22:59:40 +02:00
Benno Fünfstück 631e74963f haskell-dynamic-cabal: new expression 2014-05-09 22:50:41 +02:00
Benno Fünfstück fb2d8ab9aa haskell-th-lift-instances: new expression 2014-05-09 22:50:40 +02:00
Benno Fünfstück 52bd5978a0 haskell-quickcheck-property-monad: new expression 2014-05-09 22:50:39 +02:00
Benno Fünfstück e61e23b6c7 haskell-hcltest: new expression 2014-05-09 22:50:38 +02:00
Benno Fünfstück b49de7164e haskell-generate: new expression 2014-05-09 22:50:37 +02:00
Benno Fünfstück 97dde61662 haskell-system-time-monotonic: new expression 2014-05-09 22:50:36 +02:00
Benno Fünfstück 2525aac134 haskell-unix-memory: new expression 2014-05-09 22:50:35 +02:00
Peter Simons 0e0e03976c Merge pull request #2576 from NixOS/haskellPackagesFixpoint
Rework the knot-tying code for defining Haskell packages.
2014-05-09 18:11:47 +02:00
Eelco Dolstra ea36f3b868 fetchFromGitHub: Use .tar.gz instead of .zip
Also clean up the name attribute of fetchzip derivations a bit.
2014-05-09 15:53:44 +02:00
Pascal Wittmann 8b0d0e3601 Add potrace-1.11, a tool for tracing bitmaps 2014-05-09 14:23:00 +02:00
Russell O'Connor 46ccebe413 Allow for later binding in ghcPrefs
Now that both self and super are available to prefFun, we can use self, where appropriate to access late bound versions of most
packages.

When extensions are not used, there is no difference between self and super.
2014-05-08 22:01:36 -04:00
Russell O'Connor d4bd4650d6 Rework the knot-tying code for defining Haskell packages.
The existing knot-tying code I felt was a bit incoherent with result, finalReturn, self, refering to different various forms of the "haskellPackages" value and often
different forms in the same place.

This commit instills some object-oriented discipline to the construction of hasekllPackages using a small number of fundamental OO concepts:

* An class is a open recursive function of the form (self : fooBody) where fooBody is a set.
* An instance of a class is the fixed point of the class.
  This value is sometimes refered to as an object and the values in the resulting set are sometimes refered to as methods.
* A class, foo = self : fooBody, can be extended by an extension which is a function bar = (self : super : barBody) where barBody a set of overrides for fooBody.
  The result of a class extension is a new class whose value is self : foo self // bar self (foo self).
  The super parameter gives access to the original methods that barBody may be overriding.

This commit turns the haskell-packages value into a "class".

The knot-tying, a.k.a the object instanitation, is moved into haskells-defaults.  The "finalReturn" is no longer needed and is eliminated from the body of
haskell-packages. All the work done by prefFun is moved to haskell-defaults, so that parameter is eliminated form haskell-packages.  Notice that the old prefFun took
two pameters named "self" and "super", but both parameters got passed the same value "result".  There seems to have been some confusion in the old code.

Inside haskell-defaults, the haskell-packages class is extended twice before instantiation.  The first extension is done using prefFun argument.
The second extension is done the extension argument, which is a renamed version of extraPrefs.

This two stage approach means that extension's super gets access to the post "perfFun" object while previously the extraPrefs only had access to the pre "prefFun"
object.  Also the extension function has access to both the super (post "perfFun") object and to self, the final object.  With extraPrefs, one needed to use the
"finalReturn" of the haskell packages to get access to the final object.  Due to significant changes in semantics, I thought it best to replace extraPrefs with
extension so that people using extraPrefs know to update thier cod.

Lastly, all the Prefs functions have renamed the "self" parameter to "super".  This is because "self" was never actually a self-reference in the object oriented sense
of the word.  For example

    Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };

doesn't actually make sense from an object oriented standpoint because, barring further method overriding, the value of Cabal_1_18_1_3 would be trying to override it's
own value which simply causes a loop exception.  Thankfully all these uses of self were really uses of super:

    Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };

In this notation the overriden Cabal_1_18_1_3 method calls the Cabal_1_18_1_3 of the super-class, which is a well-founded notion.

Below is an example use of using "extension" parameter

{
  packageOverrides = pkgs : {
    testHaskellPackages = pkgs.haskellPackages.override {
      extension = self : super : {
        transformers_0_4_1_0 = self.cabal.mkDerivation (pkgs: {
        pname = "transformers";
        version = "0.4.1.0";
        sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg";
        meta = {
          description = "Concrete functor and monad transformers";
          license = pkgs.stdenv.lib.licenses.bsd3;
          platforms = pkgs.ghc.meta.platforms;
          maintainers = [ pkgs.stdenv.lib.maintainers.andres ];
        };
       });

      transformers = self.transformers_0_4_1_0;

      lensFamilyCore = super.lensFamilyCore.override { transformers = self.transformers_0_3_0_0; };
     };
   };
 };
}

Notice the use of self in the body of the override of the transformers method which references the newly defined transformers_0_4_1_0 method.

With the previous code, one would have to instead akwardly write

      transformers = super.finalReturn.transformers_0_4_1_0;

or use a rec clause, which would prevent futher overriding of transformers_0_4_1_0.
2014-05-08 12:01:45 -04:00
aszlig c833d7ce16
chromium: Allow config.chromium for PPAPI plugins.
This should make it easier to enable proprietary pepper API plugins
though nixpkgs config, so it can be easily installed using something
like:

nix-env -i chromium-stable

With something like:

{ chromium.enablePepperFlash = true; }

In ~/.nixpkgs/config.nix to enable pepper API based Flash and to avoid
the browser wrapper from Firefox entirely.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-08 16:41:38 +02:00
Eelco Dolstra 6aeb59bbe0 Rename fetchGitHub -> fetchFromGitHub
We're not fetching all of GitHub, after all.
2014-05-08 15:49:39 +02:00
Eelco Dolstra ebd8573046 Add a utility function "fetchGitHub"
This is a small wrapper around fetchzip. It allows you to say:

  src = fetchGitHub {
    owner = "NixOS";
    repo = "nix";
    rev = "924e19341a5ee488634bc9ce1ea9758ac496afc3"; # or a tag
    sha256 = "1ld1jc26wy0smkg63chvdzsppfw6zy1ykf3mmc50hkx397wcbl09";
  };
2014-05-08 15:30:18 +02:00
Eelco Dolstra c8df888858 Add a function "fetchzip"
This function downloads and unpacks a file in one fixed-output
derivation. This is primarily useful for dynamically generated zip
files, such as GitHub's /archive URLs, where the unpacked content of
the zip file doesn't change, but the zip file itself may (e.g. due to
minor changes in the compression algorithm, or changes in timestamps).

Fetchzip is implemented by extending fetchurl with a "postFetch" hook
that is executed after the file has been downloaded. This hook can
thus perform arbitrary checks or transformations on the downloaded
file.
2014-05-08 15:30:17 +02:00
Eelco Dolstra 2a43a4163a Fix indentation 2014-05-08 15:30:17 +02:00
Eelco Dolstra 46b77d3bb4 fetchurl_gnome -> fetchurlGnome 2014-05-08 15:30:17 +02:00
Peter Simons 8c75363c71 The logic behind 'libiconvOrLibc' is flawed and that attribute should be removed.
See https://github.com/NixOS/nixpkgs/pull/2532 for further details.
2014-05-07 23:11:51 +02:00
Rob Vermaas 31428612c2 Upgrade rtmpdump and get_iplayer 2014-05-07 20:56:37 +02:00
Peter Simons b8bb480212 cabal-install: fix build of 1.20.0.1 with GHC 7.2.2 2014-05-07 19:13:06 +02:00
Peter Simons 4ee0cd2bbb haskell-gloss: Revert "update to version 1.8.2.1"
This reverts commit 37df971a49. The new
version doesn't compile.
2014-05-07 19:13:06 +02:00
Peter Simons ee1a03577c haskell-statistics: drop obsolete version 0.10.5.2 2014-05-07 19:13:06 +02:00
Peter Simons 6f5ee37d5c haskell-HTTP: update to version 4000.2.14 2014-05-07 19:13:04 +02:00
Peter Simons 715efa1948 R: don't recurse into the rPackages set to conserve memory and CPU time
The addition of CRAN has made "nix-env -qa \*" run ~30% longer than before [1].

[1] 0d264c1761
2014-05-07 19:12:15 +02:00
Peter Simons 5b52d17d3f Mark the development version of weechat 'lowPrio' so that user install
the stable release version by default.
2014-05-07 17:39:27 +02:00
Peter Simons 437ed5aae4 haskell-defaults.nix: fix the "highPrio" variant of the haskell package set
"High priority" is not the same the thing as "not explicitly marked as
low priority".
2014-05-07 17:04:23 +02:00
Shea Levy 4b6be7ba9f Merge branch 'phpPackages-xdebug' of git://github.com/proger/nixpkgs
re-introduce phpXdebug as phpPackages.xdebug and bump to 2.2.5
2014-05-07 09:32:25 -04:00
Rob Vermaas 1a6a797ec3 Add liblbfgs 1.10 2014-05-07 14:22:04 +02:00
Vladimir Kirillov 16e7ae3b10 re-introduce phpXdebug as phpPackages.xdebug and bump to 2.2.5
this uses buildPecl now.
2014-05-07 14:18:18 +03:00
Peter Simons af8d34c35e Merge pull request #2531 from jwiegley/djinn
Add an expression for the Haskell library djinn
2014-05-07 11:36:56 +02:00
Austin Seipp b6c7f18711 nixpkgs: add COPRTHR 1.6
COPRTHR is a very excellent little SDK implementing OpenCL and related
tech for regular multicore processors, as well as things like my new
Parallella (along with remote/networked OpenCL compute support).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-07 04:13:47 -05:00
Austin Seipp 23d023008b pythonPackages: add pyrax
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-07 04:13:47 -05:00
Oliver Charles fcc3ae1d84 haskellPackages.snapletStripe: New expression 2014-05-07 09:57:27 +01:00
cillianderoiste 366e220c25 Merge pull request #2551 from CodeBlock/source-code-pro
Add Source Code Pro font
2014-05-07 09:48:49 +02:00
cillianderoiste 45ed706cea Merge pull request #2536 from CodeBlock/poly-font
Poly font
2014-05-07 09:48:26 +02:00
Ricky Elrod df9427c535 Source Code Pro font 2014-05-06 19:49:15 -04:00
Eelco Dolstra 535de5e45a Add nifskope 2014-05-07 00:08:40 +02:00
Shea Levy 0d0f7d2681 Merge branch 'buildLocalCabal-drvArgs' of git://github.com/proger/nixpkgs
buildLocalCabal: allow drvArgs in buildLocalCabalWithArgs
2014-05-06 09:27:40 -04:00
Peter Simons 81a05aabbe haskell-packages.nix: update (unused) reference to cabal-install 2014-05-06 10:59:23 +02:00
Vladimir Kirillov 7eff825487 buildLocalCabal: allow cabalDrvArgs in buildLocalCabalWithArgs
allows to write neat expressions like (as we're still generating an
expression string):

```
{
  build = haskellPackages.buildLocalCabalWithArgs {
    inherit src name;
    cabalDrvArgs = {
      jailbreak = false;
      doCheck = false;
    };
  };
}
```

without resorting to weird kung-fu like darcs does:

```
darcs = haskellPackages.darcs.override {
  # A variant of the Darcs derivation that containts only the
  # executable and
  # thus has no dependencies on other Haskell packages.
  cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // {
            isLibrary = false;
            configureFlags = "-f-library"; }); }.final;
          };
};
```

While here, move the `jailbreak = true;` as the default `cabalDrvArgs`
option.
2014-05-06 11:00:48 +03:00
Ricky Elrod df0014488a First attempt at data/fonts/poly 2014-05-06 03:48:04 -04:00
John Wiegley 7848f96b58 Add an expression for the Haskell library djinn 2014-05-05 19:48:50 -05:00
Cillian de Róiste 7c2c5987d1 Add setBfree a DSP tonewheel organ emulator 2014-05-05 22:57:48 +02:00
Peter Simons f69be7d8af haskell-defaults.nix: let ghc 7.8.2 builds use the binary library shipped with the compiler 2014-05-05 22:34:58 +02:00
Peter Simons d56bbd6364 haskell-defaults.nix: let ghc-7.8.2 use the HEAD prefs for the time being
The whole notion of per-compiler HP-compliant environments has failed
anyway and I'll try to get rid of that ASAP, so it feels pointless to
configure that stuff for GHC 7.8.2 to begin with.
2014-05-05 22:25:19 +02:00
Vladimir Kirillov 9aa231abfa buildLocalCabal: include cabalInstall to buildDepends to preserve developer experience 2014-05-05 14:43:55 +03:00
Peter Simons 66997bba1e haskell-gloss: require the latest OpenGL and GLUT libraries 2014-05-05 10:54:12 +02:00
Peter Simons dbb561ae62 haskell-packages.nix: strip trailing whitespace 2014-05-05 10:52:11 +02:00
Peter Simons f5a6b58374 cabal-install: update to version 1.20.0.1 2014-05-05 10:46:40 +02:00
Peter Simons 986a42dfe7 haskell-cabal-lenses: add version 0.1 2014-05-05 10:46:39 +02:00
Peter Simons e7c207e10d haskell-hourglass: add version 0.1.1 2014-05-05 10:46:39 +02:00
Ricky Elrod d66cdd3c43 scala: Bump to 2.11.0, bump 2.10 to 2.10.4 2014-05-05 02:14:57 -04:00
Mathijs Kwik 00a70b454c v8: remove old version 3.14 2014-05-05 07:32:37 +02: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
Benno Fünfstück d385835c38 haskell-profiteur: new expression 2014-05-04 23:02:46 +02:00
Peter Simons 18f49692ec haskell-wreq: fix reference to attoparsec 2014-05-04 22:25:56 +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 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
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
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 ce21d883c0 haskell-vinyl: add version 0.3 2014-05-04 13:19:56 +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 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 eca445a408 Bootstrap ghc-head with GHC 7.6.3 to see if that solves our weird compiler errors:
compiler/simplCore/CoreMonad.lhs:835:10:
      Non type-variable argument in the constraint: MonadPlus IO
      (Use -XFlexibleContexts to permit this)
      In the context: (MonadPlus IO)
      While checking an instance declaration
      In the instance declaration for `A.Alternative CoreM'

  compiler/simplCore/CoreMonad.lhs:841:10:
      Non type-variable argument in the constraint: MonadPlus IO
      (Use -XFlexibleContexts to permit this)
      In the context: (MonadPlus IO)
      While checking an instance declaration
      In the instance declaration for `MonadPlus CoreM'
2014-05-03 20:03:30 +02:00
Vladimir Kirillov 599f9a09fe haskell: bump ekg to 0.4, add ekg-core 2014-05-03 17:36:03 +03: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
John Wiegley 7d788d5e4f Add expression for the Agda standard library 2014-05-02 19:15:38 -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
Luca Bruno 63cdda1f4e zeitgeist: new package
Zeitgeist is a service which logs the users's activities and events

https://launchpad.net/zeitgeist
2014-05-02 17:43:02 +02:00
Austin Seipp b10f4af8f9 nginx: upgrade to 1.6.0, expose many more modules
By default, we now build all the optional nginx modules, including the
out-of-band ones like moreheaders and rtmp support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 01:24:38 -05: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 e81ac36bff haskell-spoon: add version 0.3.1 2014-05-01 21:57:02 +02:00
Peter Simons 39c3cb1d99 haskell-groom: add version 0.1.2 2014-05-01 21:57:02 +02:00
Emery Hemingway 3b1a171c05 qtbitcointrader: initial expression 2014-05-01 15:50:57 +02:00