Commit Graph

37013 Commits

Author SHA1 Message Date
Peter Simons
8ae67934ce haskell-iCalendar: update to version 0.4.0.1 2014-05-14 15:02:29 +02:00
Peter Simons
2fff26941e haskell-hledger: update to version 0.23.2 2014-05-14 15:02:28 +02:00
Peter Simons
b82a30aa8d haskell-hledger-web: update to version 0.23.2 2014-05-14 15:02:28 +02:00
Peter Simons
91ecc85a37 haskell-hledger-lib: update to version 0.23.2 2014-05-14 15:02:28 +02:00
Peter Simons
b3ea4264b9 haskell-esqueleto: update to version 1.4.1 2014-05-14 15:02:28 +02:00
Peter Simons
acaad29162 haskell-digestive-functors-aeson: update to version 1.1.8 2014-05-14 15:02:28 +02:00
Peter Simons
bebeef404d haskell-data-lens: update to version 2.10.5 2014-05-14 15:02:28 +02:00
Peter Simons
a984b8a012 haskell-RepLib: update to version 0.5.3.3 2014-05-14 15:02:28 +02:00
Peter Simons
f2e81ce7cb haskell-Glob: update to version 0.7.5 2014-05-14 15:02:27 +02:00
Peter Simons
fde79166cc haskell-ConfigFile: update to version 1.1.2 2014-05-14 15:02:27 +02:00
Peter Simons
6ca2c509c1 haskell-wxcore: jailbreak to fix build with recent versions of array 2014-05-14 15:02:27 +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
Eelco Dolstra
3d1d9bb7dd linux-3.12: Apply patch for CVE-2014-0196 2014-05-14 14:11:48 +02:00
Moritz Ulrich
172391272d chicken(-dev): Update to 4.8.0.5 / 4.9.0rc1 2014-05-14 12:22:52 +02:00
Lluís Batlle i Rossell
418f0b0169 Revert "go: updating to 1.2.2"
Now I've read in Release Notes that the '.2' affected only binary releases.
http://golang.org/doc/devel/release.html#go1.2.minor
2014-05-14 10:16:35 +02:00
Lluís Batlle i Rossell
950fd7644c go: updating to 1.2.2 2014-05-14 10:14:28 +02:00
Lluís Batlle i Rossell
4fcdc32924 Adding rkflashtool, to flash MK802IV. 2014-05-14 09:59:36 +02:00
Austin Seipp
158462e323 Merge pull request #2637 from wkennington/master.openvpn
openvpn: Update 2.3.3 -> 2.3.4
2014-05-13 19:49:16 -05:00
Austin Seipp
dde404325b Merge pull request #2552 from CodeBlock/font-find
Use `find` instead of cp for installFonts.
2014-05-13 19:46:44 -05:00
Austin Seipp
564e685d35 Merge pull request #2609 from CodeBlock/wicd-curses
wicd: enable curses, urwid is packaged now
2014-05-13 19:45:49 -05: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
William A. Kennington III
6ddafad82a openvpn: Update 2.3.3 -> 2.3.4 2014-05-13 16:49:31 -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
Vladimír Čunát
cc9b8a8b6f Merge pull request #2634 from doublec/tor
Update Tor to 0.2.4.21 and tor-browser to 3.6.1
2014-05-13 21:38:00 +02:00
Vladimír Čunát
93e65a4d53 codeblocks: fix eval on non-linux, minor refactoring 2014-05-13 20:07:13 +02:00
Vladimír Čunát
9c8ee7a7e5 linux: minor updates, probably often fixing CVE-2014-0196 2014-05-13 20:00:21 +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
1fe094d2b8 pylint: update to version 1.2.1 2014-05-13 16:11:06 +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
Chris Double
1d1a1c2585 Update tor-browser to 3.6 2014-05-14 02:03:51 +12: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
Chris Double
f76e56fb38 Update tor to 0.2.4.21 2014-05-14 01:53:25 +12:00
Peter Simons
45e1c78a81 python-shapely: add version 1.3.1 2014-05-13 15:47:03 +02:00
Eelco Dolstra
abbf643ae2 linux: Update to 3.12.19
Backport: 14.04
2014-05-13 13:28:14 +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
Dario Bertini
11f1d0e377 redis: update to 2.8.9 (close #2541) 2014-05-13 12:30:34 +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
Rickard Nilsson
dd592d7ef3 spotify: Fix missing src url for qt. Add missing dependencies. 2014-05-13 12:04:45 +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
lethalman
e4361dfa02 Merge pull request #2624 from lethalman/uzbl
uzbl: Add gsettings_desktop_schemas as build input. Closes #2332
2014-05-13 12:03:26 +02:00
Vladimír Čunát
7f3dba49e5 Merge #2556: update xpra, pygtk and ffmpeg2 2014-05-13 11:50:56 +02:00
Peter Simons
6db0e3efe5 python-packages.nix: drop trailing whitespace 2014-05-13 11:48:48 +02:00
Linquize
8f5fea5ab0 cppcheck: Build the cfg files (close #2572) 2014-05-13 11:39:33 +02:00
Luca Bruno
9e7e3978f9 shadow: Fix lastlog and faillog to find logs in /var/log
Fixes #2575 and closes #2586.
2014-05-13 11:32:10 +02:00
Vladimír Čunát
9c039b26e6 Merge pull request #2580 from ttuegel/qtcurve
kde.qtcurve: update and patch
2014-05-13 11:30:50 +02:00
Linquize
f40db99c7b fetchurl: Fix typo in comment (close #2591) 2014-05-13 11:23:50 +02:00
Russell O'Connor
5bbcebf2db Bump coq version to 8.4pl4. 2014-05-12 22:17:00 -04:00
Domen Kožar
ed890ab85f Merge pull request #2628 from pSub/nm-connection-editor
nm-connection-editor: fix missing schema for gtk3 FileChooser
2014-05-12 23:37:38 +02:00
Michael Raskin
f8a62ff002 Allow no-kernel-module build of SysDig 2014-05-13 00:08:45 +04:00
Pascal Wittmann
1b22c53fa6 nm-connection-editor: fix missing schema for gtk3 FileChooser 2014-05-12 16:15:04 +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
Luca Bruno
f63b1038e9 uzbl: Add gsettings_desktop_schemas as build input. Closes #2332 2014-05-12 10:32:46 +02: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
0c45c81812 Use name and pname to follow conventions
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 18:17:12 -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
ce5dd5681e use 0.5 archive of jmtpfs 2014-05-11 13:06:26 -07:00
Corey O'Connor
2efda9dce7 add jmtpfs - a FUSE filesystem for MTP 2014-05-11 12:36:51 -07:00
cillianderoiste
c202f6b09d Merge pull request #2606 from linquize/pandoc
pandoc: Update to 1.12.4
2014-05-11 14:47:52 +02: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
Benno Fünfstück
4b87687a84 cloogppl: patch to use ppl version 1.0 (close #2236) 2014-05-11 14:34:32 +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
宋文武
e47172ce38 fcitx: build im modules for gtk2, gtk3 and qt4
Close #2498.
2014-05-11 14:01:53 +02:00
Ricky Elrod
c0a30a4b51 htop: Bump to 1.0.3 (close #2611)
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 13:45:25 +02:00
Cillian de Róiste
68325d8eae setbfree: build the GUI 2014-05-11 12:51:29 +02:00
Ricky Elrod
31a0844f79 wicd: enable curses, urwid is packaged
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-11 05:41:08 -04:00
cillianderoiste
a18757c0a4 Merge pull request #2426 from henrytill/supercollider
supercollider: add Emacs support (aka SCEL)
2014-05-11 10:36:19 +02:00
cillianderoiste
7adc00b8bc Merge pull request #2484 from chexxor/feature/bump-docker-0.10.0
Bump docker version to 0.10.0
2014-05-11 10:33:43 +02:00
cillianderoiste
ca5e65c4bd Merge pull request #2371 from iyzsong/herbstluftwm
herbstluftwm: update to 0.6.2
2014-05-11 10:31:14 +02:00
Robert M. Mather
3729ead3af Ur/Web compiler: new release, 20130421 -> 20140426 2014-05-10 20:42:35 -07:00
Linquize
c43003b87c pandoc: Update to 1.12.4 2014-05-11 05:29:11 +02:00
Henry Till
6223cbd7a8 supercollider: added emacs support 2014-05-10 22:18:03 -04:00
Bjørn Forsman
cb7c920e24 virt-manager: add missing gsettings schema
Without this it'll complain and abort when clicking "Take Screenshot" or
"Browse Local" when creating a new VM and looking for an CD-ROM image to boot
from:

GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
2014-05-11 01:03:27 +02: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
Vladimir Kirillov
e5f7e4ec3c luajit: support Darwin builds 2014-05-10 13:50:49 +03:00
Vladimir Kirillov
96373a4041 sysdig: update to 0.1.82 2014-05-10 13:50:49 +03:00
Mathijs Kwik
06c8438bd8 conkeror: upgrade to latest snapshot 2014-05-10 12:23:45 +02:00
Peter Simons
4ec21f6ecd haskell-Strafunski-StrategyLib: jailbreak to fix build with GHC 7.8.2 2014-05-09 23:48:42 +02: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
Wout Mertens
1e711ee42d Fix OpenSSL requirement 2014-05-09 22:47:45 +02:00
cillianderoiste
32a61189dc Merge pull request #2588 from c9/node-0-10-28
Update Node.js to 0.10.28
2014-05-09 18:50:05 +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
Lennart Kats
3e3e9daafe Update Node.js to 0.10.28 2014-05-09 15:45:21 +02:00
Rob Vermaas
c7b8dd8581 Merge pull request #2506 from ikervagyok/mutt
Updated to mutt-1.5.23
2014-05-09 15:15:02 +02:00
Rob Vermaas
9e2350504f Merge pull request #2583 from CodeBlock/update-httpie
httpie: Update -> 0.8.0
2014-05-09 15:13:24 +02:00
Pascal Wittmann
8b0d0e3601 Add potrace-1.11, a tool for tracing bitmaps 2014-05-09 14:23:00 +02:00
John Wiegley
fcd7d741e2 Make geoip buildable on any Unix 2014-05-09 13:33:42 +02:00
Emery Hemingway
265c489391 rsyncd: default read/write permissions should be nobody:nogroup 2014-05-09 13:31:52 +02:00
Benjamin Podszun
3db83835a8 nixpkgs: Bump libvirt to 1.2.4 2014-05-09 13:29:15 +02:00
Linquize
2d5462e29c jquery-ui: Update to 1.10.4 2014-05-09 13:28:31 +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
Vladimír Čunát
08834b061c pidgin-sipe: fix build by updating
Also add platforms (linux).
2014-05-08 23:59:42 +02:00
Benjamin Podszun
0008a4b6c4 sylpheed: 3.2 (2012) -> 3.4.1 (2014) (close #2558)
vcunat fixed eval and tested it runs.
2014-05-08 23:35:51 +02:00
Benjamin Podszun
07a5187063 taskwarrior: bump to 2.3.0 (close #2567)
vcunat fixed the evaluation
2014-05-08 23:17:08 +02:00
Benjamin Podszun
08aba1d669 nixpkgs: Bump spice-gtk to 0.24 (close #2571) 2014-05-08 22:56:15 +02:00
Benjamin Podszun
ae6a65e811 nixpkgs: Bump filezilla to 3.8.0 (close #2578) 2014-05-08 22:46:32 +02:00
Ricky Elrod
db98ce61d2 httpie: Update -> 0.8.0
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-05-08 16:39:24 -04:00
Thomas Tuegel
3a9917bf18 zotero: version bump 4.0.19 -> 4.0.20 (close #2581) 2014-05-08 22:31:56 +02:00
Rob Vermaas
14eebb54df Merge pull request #2564 from darklajid/bump_tmux
nixpkgs: bump tmux to 1.9
2014-05-08 21:42:06 +02:00
Rob Vermaas
4169bda163 Merge pull request #2579 from darklajid/bump_lftp
nixpkgs: Bump lftp to 4.4.16
2014-05-08 21:40:36 +02:00
Rob Vermaas
99c46b7eb3 Merge pull request #2562 from offlinehacker/pkgs/nginx/syslog_fix
nginx: fix syslog module
2014-05-08 21:39:50 +02:00
Thomas Tuegel
119414ddcd qtcurve: add toolbar alpha patch 2014-05-08 14:05:09 -05:00
Thomas Tuegel
e5fcc04632 qtcurve version bump 1.8.17 -> 1.8.18 2014-05-08 14:04:59 -05:00
Benjamin Podszun
69188e87c3 nixpkgs: Bump lftp to 4.4.16 2014-05-08 20:55:03 +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
Vladimír Čunát
84031981a5 dropbox-cli: use stable URL, version 1.6.2
Thanks to @darklajid for reporting and testing on IRC.
2014-05-08 17:00:16 +02: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
Benjamin Podszun
141d1a1253 nixpkgs: Bump screen to 4.2.1 2014-05-08 16:25:27 +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
aszlig
709ccd520b
patchutils: Update to new upstream version 0.3.3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-05-08 15:01:55 +02:00
Benjamin Podszun
313900d819 nixpkgs: Bump feh to 2.11 2014-05-08 13:15:09 +02:00
Rickard Nilsson
5a0c8ff040 Merge pull request #2548 from proger/sysdig-0.1.81
sysdig: update to 0.1.81
2014-05-08 10:45:18 +02:00
Benjamin Podszun
719bcde6cc nixpkgs: bump tmux to 1.9 2014-05-08 08:59:32 +02:00
Cillian de Róiste
aa5c229223 androidsdk: upgrade 22.3 -> 22.6.2 2014-05-08 00:49:19 +02:00
Jaka Hudoklin
eabfc509ef nginx: fix syslog module 2014-05-07 23:54:57 +02:00
Austin Seipp
130cb5d005 criu: upgrade, hopefully fix Hydra build
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-07 16:43:48 -05:00
Peter Simons
c61d607340 tkgate: rewrite expressions to get along without the broken 'libiconvOrLibc' attribute 2014-05-07 23:11:51 +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
Austin Seipp
3b873648b3 coprthr: ensure we use the right perl
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-07 15:34:21 -05:00
Austin Seipp
ba085ee318 libevent: fix event_rpcgen.py
This should help fix the COPRTHR build. Although a Python dependency was
added, it was broken anyway...

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-07 15:34:21 -05:00
Rob Vermaas
31428612c2 Upgrade rtmpdump and get_iplayer 2014-05-07 20:56:37 +02:00
Peter Simons
366e3bd7a1 ghc-7.0.1: fix download URL 2014-05-07 20:33:32 +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
fc51c1d163 cabal: enable the split-objects feature again for current versions of GHC 2014-05-07 19:13:06 +02:00
Peter Simons
bd36eadf98 haskell-zeromq4-haskell: update to version 0.6 2014-05-07 19:13:06 +02:00
Peter Simons
9acc4ccb29 haskell-yesod-test: update to version 1.2.1.5 2014-05-07 19:13:06 +02:00
Peter Simons
06d91b1f0e haskell-yesod-static: update to version 1.2.3 2014-05-07 19:13:06 +02:00
Peter Simons
5034c2b1f9 haskell-streaming-commons: update to version 0.1.2.3 2014-05-07 19:13:05 +02:00
Peter Simons
390b804b23 haskell-snap: update to version 0.13.2.5 2014-05-07 19:13:05 +02:00
Peter Simons
bb66957987 haskell-shelly: update to version 1.5.3 2014-05-07 19:13:05 +02:00
Peter Simons
ce57c7aac1 haskell-semigroupoids: update to version 4.0.2 2014-05-07 19:13:05 +02:00
Peter Simons
98c5572642 haskell-resourcet: update to version 1.1.2.2 2014-05-07 19:13:05 +02:00
Peter Simons
08549cdb02 haskell-network-multicast: update to version 0.0.11 2014-05-07 19:13:05 +02:00
Peter Simons
1ca94859d3 haskell-mmorph: update to version 1.0.3 2014-05-07 19:13:05 +02:00
Peter Simons
b127783bf4 haskell-largeword: update to version 1.2.3 2014-05-07 19:13:05 +02:00
Peter Simons
a688dd0687 haskell-language-c-inline: update to version 0.5.0.0 2014-05-07 19:13:05 +02:00
Peter Simons
de899153b1 haskell-criterion: update to version 0.8.1.0 2014-05-07 19:13:05 +02:00
Peter Simons
1ca4ac68d7 haskell-conduit: update to version 1.1.2.1 2014-05-07 19:13:05 +02:00
Peter Simons
d1fdb0cbb0 haskell-concurrent-extra: update to version 0.7.0.7 2014-05-07 19:13:05 +02:00
Peter Simons
2ac07cfc00 haskell-JuicyPixels: update to version 3.1.5.2 2014-05-07 19:13:05 +02:00
Peter Simons
8a446a01d7 haskell-HsSyck: update to version 0.52 2014-05-07 19:13:05 +02:00
Peter Simons
d43c34b6a4 haskell-derive: update to version 2.5.16 2014-05-07 19:13:05 +02:00
Peter Simons
23b0bb002b haskell-comonad: update to version 4.2 2014-05-07 19:13:05 +02:00
Peter Simons
efaac7c006 haskell-syb-0.4.1: disable the test suite when compiling with GHC HEAD
The test suite fails in a seemingly harmless way:

  ### Failure in: All:0
  expected: "(MyDataType Int,(DataType {tycon = \"MyDataType\", datarep = AlgRep [MyDataType]},(\"\",(\"MyDataType\",(\"\",\"MyDataType\")))))"
   but got: "(MyDataType Int,(DataType {tycon = \"Datatype.MyDataType\", datarep = AlgRep [MyDataType]},(\"\",(\"MyDataType\",(\"Datatype\",\"MyDataType\")))))"
2014-05-07 19:13:05 +02:00
Peter Simons
895a8648c9 haskell-yesod-core: update to version 1.2.15.1 2014-05-07 19:13:05 +02:00
Peter Simons
b45c5cdd32 haskell-transformers-compat: update to version 0.3 2014-05-07 19:13:04 +02:00
Peter Simons
00302921b3 haskell-resourcet: update to version 1.1.2.1 2014-05-07 19:13:04 +02:00
Peter Simons
7b52cc9676 haskell-pandoc-citeproc: update to version 0.3.1 2014-05-07 19:13:04 +02:00
Peter Simons
33c1a9599c haskell-optparse-applicative: update to version 0.8.1 2014-05-07 19:13:04 +02:00
Peter Simons
2fda5952a8 haskell-monad-logger: update to version 0.3.6.1 2014-05-07 19:13:04 +02:00
Peter Simons
0c60cac67f haskell-http-client: update to version 0.3.2.2 2014-05-07 19:13:04 +02:00
Peter Simons
375c29810d haskell-html-conduit: update to version 1.1.0.5 2014-05-07 19:13:04 +02:00
Peter Simons
8d6975cc75 haskell-hourglass: update to version 0.1.2 2014-05-07 19:13:04 +02:00
Peter Simons
32ca02ffac haskell-gtk-traymanager: update to version 0.1.4 2014-05-07 19:13:04 +02:00
Peter Simons
3f1571b5a1 haskell-distributive: update to version 0.4.4 2014-05-07 19:13:04 +02:00
Peter Simons
1b81577f09 haskell-contravariant: update to version 0.5.2 2014-05-07 19:13:04 +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
Rob Vermaas
7cd55c7744 USe maven.test.skip in stead of maven.test.skip.exec in mvn assembly, to prevent unnecessary compilation. 2014-05-07 16:37:38 +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
Chris Double
1c7d11ac2a Update xpra to 0.12.5 2014-05-08 00:54:15 +12:00
Chris Double
b799aa697d Update pygtk to 2.24.0 to fix CPU pegging issues in xpra 2014-05-08 00:53:07 +12:00
Chris Double
30c3b81cc2 Update ffmpeg to 2.2.2 2014-05-08 00:52:38 +12:00
Peter Simons
b30798a0a3 dovecot-2.2.x: add missing sqlite build input
Fixes <http://hydra.nixos.org/build/10863508/nixlog/1/raw>.
2014-05-07 14:45:52 +02:00
Rob Vermaas
1a6a797ec3 Add liblbfgs 1.10 2014-05-07 14:22:04 +02:00
Eelco Dolstra
255a6a9da8 libav: Disable tests
These appear to fail randomly sometimes:

http://hydra.nixos.org/build/10854615
2014-05-07 14:02:25 +02:00