Commit graph

11980 commits

Author SHA1 Message Date
Austin Seipp
21cb0c9bbb Merge pull request #2621 from CodeBlock/fldigi
Package hamlib and fldigi; Bump perlPackages.ExtUtilsMakeMaker
2014-05-13 19:45:34 -05:00
Austin Seipp
11373a9d05 Merge pull request #2520 from CodeBlock/scala
scala: Bump to 2.11.0, bump 2.10 to 2.10.4
2014-05-13 19:44:42 -05:00
Austin Seipp
738622282b Merge pull request #2622 from CodeBlock/minimodem
Add minimodem package
2014-05-13 19:43:52 -05:00
Peter Simons
633e396f3e python-avro3k: use more reliable download link 2014-05-13 23:35:39 +02:00
Peter Simons
61cd66944e all-packages.nix: ensure that python3 and python3Packages refer to the same version!
Thanks to Vladimír for the suggestion.
2014-05-13 23:31:44 +02:00
Peter Simons
b86f217281 python-shapely: bake path to libgeos_c into the library 2014-05-13 16:49:34 +02:00
Peter Simons
2083a23073 all-packages.nix: switch 'python3' to python 3.4.x 2014-05-13 16:33:05 +02:00
Peter Simons
acca749e66 python-avro3k: test suite no work 2014-05-13 16:13:49 +02:00
Peter Simons
55a99f6bd5 python-avro3k: add version 1.7.7 2014-05-13 16:10:35 +02:00
Peter Simons
ade6cd25be python-astroid: add version 1.1.1 2014-05-13 16:10:17 +02:00
Peter Simons
50cf5549c2 python-flask: update to 0.10.1 2014-05-13 15:55:23 +02:00
Peter Simons
f8e185776a python-werkzeug: update to 0.9.4 2014-05-13 15:55:09 +02:00
Peter Simons
9bea798163 python-itsdangerous: add version 0.24 2014-05-13 15:54:54 +02:00
Peter Simons
45e1c78a81 python-shapely: add version 1.3.1 2014-05-13 15:47:03 +02:00
Peter Simons
e9aa157ab9 python-redis: add version 2.9.1 2014-05-13 13:19:56 +02:00
Peter Simons
9120a5a717 python-avro: add version 1.7.6 2014-05-13 13:19:56 +02:00
Linquize
977248ba15 codeblocks: new package 13.12 (close #2533)
@vcunat: minor refactoring.
2014-05-13 12:59:19 +02:00
AndersonTorres
64948222ba Aegisub: update to 3.1.3 (close #2550)
New dependencies: icu, intltool, boost (default = 1.55), wxGTK 3.0
Fixes a bug on Boost detection
@vcunat: minor refactoring.
2014-05-13 12:28:47 +02:00
Ricky Elrod
b56e41aebe Add eb-garamond font (close #2553)
@vcunat added license, changed attribute name according to the [rules],
and trivial refactoring.
[rules]: http://nixos.org/nixpkgs/manual/#idm140333184443184 ("package naming")
2014-05-13 12:07:50 +02:00
lethalman
8051101362 Merge pull request #2375 from lethalman/gnome3
gtkhtml, evolution, gnome-photos, gnome-clocks, zeitgeist, bijiben
2014-05-13 12:04:11 +02:00
Peter Simons
6db0e3efe5 python-packages.nix: drop trailing whitespace 2014-05-13 11:48:48 +02:00
Shea Levy
89238a251c Merge branch 'sysdig-0.1.82-now-with-osx' of git://github.com/proger/nixpkgs
sysdig: updated to 0.1.82, starting to support Darwin builds (includes
luajit Darwin support)
2014-05-12 09:34:23 -04:00
Ricky Elrod
6e2fe51190 Add minimodem package
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:44:38 -04:00
Ricky Elrod
913e340c9a Add fldigi package
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:03:33 -04:00
Ricky Elrod
951ad60025 Package hamlib library
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 16:45:49 -04:00
Ricky Elrod
36c6072b8c perlPackages.ExtUtilsMakeMaker: Bump to 6.98
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 16:37:19 -04:00
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