3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

12084 commits

Author SHA1 Message Date
Peter Simons aae174b361 haskell-temporary-rc: add version 1.2.0.3 2014-05-16 18:51:34 +02:00
Rob Vermaas 1cf51eb3fc Merge pull request #2589 from linquize/cccc
cccc: New package 3.1.4
2014-05-16 09:16:25 +02:00
Rob Vermaas 3589c095ad Merge pull request #2620 from linquize/non-java
Move non-java libraries to "DEVELOPMENT / LIBRARIES" section
2014-05-16 09:15:40 +02:00
Georges Dubus 658c136615 add Posterazor (close #2538)
@vcunat patched for newer gcc.
2014-05-15 21:32:21 +02:00
Peter Simons 485ad34b9c Merge pull request #2647 from crooney/master
cabal2nix derivation for haskellPackages.fayText
2014-05-15 18:12:24 +02:00
chris rooney cc51572bd5 Register expression for fay-text in catalog. 2014-05-15 11:11:47 -04:30
Eelco Dolstra 168fe56f3b Merge branch 'monit-5.8' of github.com:wmertens/nixpkgs 2014-05-15 14:42:20 +02:00
Christoph Hrdinka b1feffd1a1 haskell-glfw-b: add package version 1.4.6 2014-05-15 13:46:20 +02:00
aszlig 4be7e939a0
Merge pull request #2645 from vandenoever/ori.
Add ori, a secure distributed filesystem.
2014-05-15 06:31:23 +02:00
Karn Kallio 432998852c Add the Mercury compiler to nixpkgs. 2014-05-14 22:44:38 +02:00
Jason "Don" O'Conal b11c9c582b perlPackages.MHonArc: add expression 2014-05-14 22:43:19 +02:00
Benjamin Podszun 2ce5162252 Bump virt-viewer to 0.6.0, from the 2009 version 2014-05-14 22:24:01 +02:00
lethalman 0bf388b697 Merge pull request #2618 from coreyoconnor/jmtpfs-upstream
add jmtpfs - a FUSE filesystem for MTP
2014-05-14 22:17:13 +02:00
Austin Seipp a82e8cbb3d Merge pull request #2415 from cstrahan/libmx
libmx: Add package
2014-05-14 15:04:39 -05:00
Austin Seipp 832c1abc91 Merge pull request #2632 from cstrahan/biosdevname
biosdevname: add package
2014-05-14 15:00:10 -05:00
Austin Seipp aaf7f570c1 Merge pull request #2438 from falsifian/gnunet_deps
fix GNUnet missing dependencies
2014-05-14 14:56:25 -05:00
Bjørn Forsman 77000f7af0 python-usbtmc: new package
This Python package supports the USBTMC instrument control protocol for
controlling instruments over USB.

http://alexforencich.com/wiki/en/python-usbtmc/start
2014-05-14 21:50:36 +02:00
Bjørn Forsman bc847600a9 python-pyusb: new package
PyUSB is a Python module that wraps libusb 1.0. (It can wrap other USB
libraries too, but I've hardcoded it for libusb as it seems the most
appropriate.)
2014-05-14 21:50:35 +02:00
Shea Levy 2baeefee27 Add function for fetching from a private git repo 2014-05-14 14:47:42 -04:00
Jos van den Oever 8d6a940057 Add ori, a secure distributed filesystem. 2014-05-14 20:07:39 +02:00
Peter Simons 3c656b702c haskell-defaults.nix: don't provide gloss to ghc < 7.8 2014-05-14 15:02:35 +02:00
Peter Simons edd71867e5 haskell-websockets: require QuickCheck 2.6 2014-05-14 15:02:35 +02:00
Peter Simons 438a8d1cb8 haskell-HTTP-4000.2.5: require network < 2.5 2014-05-14 15:02:34 +02:00
Peter Simons f77b806b46 haskell-Pathfinder and DSH: remove broken packages 2014-05-14 15:02:34 +02:00
Peter Simons 514a57c6d9 haskell-AspectAG: remove broken package 2014-05-14 15:02:33 +02:00
Peter Simons 5d1b8ea3b5 haskell-MazesOfMonad: remove broken package 2014-05-14 15:02:33 +02:00
Peter Simons 6be622c178 haskell-NanoProlog: remove broken package 2014-05-14 15:02:33 +02:00
Peter Simons d5307df65f haskell-Hipmunk: remove broken package 2014-05-14 15:02:33 +02:00
Peter Simons 7dcce5b013 ebnf2ps: drop un-maintained package that doesn't compile 2014-05-14 15:02:33 +02:00
Peter Simons 6c61d41dc9 Drop obsolete Haskell packages WebBits, WebBitsHtml, JsContracts, and flapjax.
None of our compilers can build these packages. I suppose that stuff has
been replaced by language-ecmascript.
2014-05-14 15:02:33 +02:00
Peter Simons cb644cafa8 Agda: require QuickCheck < 2.7 2014-05-14 15:02:32 +02:00
Peter Simons 45bd1ddb7d haskell-ChasingBottoms: require QuickCheck < 2.7 2014-05-14 15:02:32 +02:00
Peter Simons d51617e877 haskell-pipes-binary: fix build with ghc < 7.8 2014-05-14 15:02:32 +02:00
Peter Simons b7e383487b haskell-packages: remove obsolete parsec2 and parsec3 aliases 2014-05-14 15:02:31 +02:00
Peter Simons f6341cb43f haskell-checkers: require QuickCheck < 2.7 2014-05-14 15:02:31 +02:00
Peter Simons 5e7de2f457 haskell-ariadne: fix build with ghc < 7.8 2014-05-14 15:02:31 +02:00
Peter Simons 8fe9c64b13 haskell-binary-conduit: fix build with ghc < 7.8 2014-05-14 15:02:30 +02:00
Peter Simons 44d03082d4 haskell-GLUT-2.3.1.0: fix build 2014-05-14 15:02:30 +02:00
Peter Simons 16958ffaf9 haskell-bson: fix build with ghc < 7.8 2014-05-14 15:02:30 +02:00
Peter Simons 8de3955037 haskell-packages.nix: remove references to parsec2 2014-05-14 15:02:27 +02:00
Peter Simons fd0f9e6fc1 Re-write the Haskell Platform out of haskell-defaults.nix.
1) Packages formerly called haskell-haskell-platform-ghcXYZ-VVVV.X.Y.Z are
    now called haskell-platform-VVVV.X.Y.Z. The latest version can be
    installed by running "nix-env -i haskell-platform".

 2) The attributes haskellPackages_ghcXYZ.haskellPlatform no longer exist.
    Instead, we have attributes like haskellPlatformPackages."2012_4_0_0".
    (The last numeric bit must be quoted when used in a Nix file, but not on
    the command line to nix-env, nix-build, etc.) The latest Platform has a
    top-level alias called simply haskellPlatform.

 3) The haskellPackages_ghcXYZ package sets offer the latest version of every
    library that GHC x.y.z can compile. For example, if 2.7 is the latest
    version of QuickCheck and if GHC 7.0.4 can compile that version, then
    haskellPackages_ghc704.QuickCheck refers to version 2.7.

 4) All intermediate GHC releases were dropped from all-packages.nix to
    simplify our configuration. What remains is a haskellPackages_ghcXYZ set
    for the latest version of every major release branch, i.e. GHC 6.10.4,
    6.12.3, 7.0.4, 7.2.2, 7.4.2, 7.6.3, 7.8.2, and 7.9.x (HEAD snapshot).

 5) The ghcXYZPrefs functions in haskell-defaults.nix now inherit overrides
    from newer to older compilers, i.e. an override configured for GHC 7.0.4
    will automatically apply to GHC 6.12.3 and 6.10.4, too. This change has
    reduced the redundancy in those configuration functions. The downside is
    that overriding an attribute for only one particular GHC version has become
    more difficult. In practice, this case doesn't occur much, though.

 6) The 'cabal' builder has a brand-new argument called 'extension'. That
    function is "self : super : {}" by default and users can override it to
    mess with the attribute set passed to cabal.mkDerivation. An example use
    would be the definition of darcs in all-packages.nix:

    | darcs = haskellPackages.darcs.override {
    |   cabal = haskellPackages.cabal.override {
    |     extension = self : super : {
    |       isLibrary = false;
    |       configureFlags = "-f-library " + super.configureFlags or "";
    |     };
    |   };
    | };

    In this case, extension disables building the library part of the package
    to give us an executable-only version that has no dependencies on GHC or
    any other Haskell packages.

    The 'self' argument refers to the final version of the attribute set and
    'super' refers to the original attribute set.

Note that ...

 - Haskell Platform packages always provide the Haddock binary that came with
   the compiler.

 - Haskell Platform 2009.2.0.2 is broken because of build failures in cgi and
   cabal-install.

 - Haskell Platform 2010.1.0.0 is broken becasue of build failures in cgi.
2014-05-14 14:59:52 +02:00
Lluís Batlle i Rossell 4fcdc32924 Adding rkflashtool, to flash MK802IV. 2014-05-14 09:59:36 +02:00
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
Charles Strahan f43d070865 biosdevname: add package 2014-05-13 19:20:44 -04: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
Linquize 70c682b837 Move non-java libraries to "DEVELOPMENT / LIBRARIES" section 2014-05-12 05:08:47 +08: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
Corey O'Connor 2efda9dce7 add jmtpfs - a FUSE filesystem for MTP 2014-05-11 12:36:51 -07: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
Linquize 349d87d47c cccc: New package 3.1.4 2014-05-09 16:50:36 +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
Mateusz Kowalczyk a9f85aa4e9 cantata: create version 1.3.4 2014-05-09 03:22:45 +02: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