Commit Graph

8751 Commits

Author SHA1 Message Date
Peter Simons
f47d100de7 Switch GHC 7.6.x to Haskell Platform 2013.2.0.0. 2013-05-12 16:13:10 +02:00
Peter Simons
631d59adc3 haskell-platform: add release candidate for 2013.2.0.0 2013-05-12 16:13:10 +02:00
Peter Simons
2c96335b6d haskell-case-insensitive: use version 1.0.0.1 for HP 2013.2.0.0 2013-05-12 16:12:59 +02:00
Peter Simons
a6b8852b9a haskell-attoparsec: rename file for inclusion in HP 2013.2.0.0 2013-05-12 16:12:58 +02:00
Peter Simons
480ac921fb haskell-GLURaw: rename file for inclusion in HP 2013.2.0.0 2013-05-12 16:12:58 +02:00
Peter Simons
026700b527 haskell-OpenGLRaw: rename file for inclusion in HP 2013.2.0.0 2013-05-12 16:12:58 +02:00
Peter Simons
1884de2f6f haskell-attoparsec-enumerator: move this package into its own directory 2013-05-12 16:12:58 +02:00
Peter Simons
58b81e21f0 haskell-unordered-containers: use version 0.2.3.0 for HP 2013.2.0.0 2013-05-12 16:12:36 +02:00
Bjørn Forsman
df09b7fb5f tcptrack: new package
tcptrack is a small libpcap based program (with ncurses UI) for live TCP
connection monitoring.

It seems upstream homepage is down, so download the source code from a
fedora server instead.
2013-05-12 14:03:24 +02:00
Tim Dysinger
c2c129d378 Add Jansson C JSON lib 2013-05-11 11:38:01 -10:00
Evgeny Egorochkin
cef9ee5aab Merge pull request #513 from offlinehacker/firefox_libcanberra
firefoxWrapper: Add libcanberra gtk module to firefox
2013-05-11 14:29:38 -07:00
Eelco Dolstra
534c5c5d9c e2fsprogs: Update to 1.42.7 2013-05-11 18:09:05 +02:00
Peter Simons
5c54449663 haskell-accelerate-fft: add version 0.13.0.0 2013-05-11 15:55:35 +02:00
Peter Simons
bbbb8f833c haskell-cufft: add version 0.1.0.1 2013-05-11 15:55:35 +02:00
Peter Simons
daec67fbf5 haskell-cuda: drop obsolete version 0.4.1.1 2013-05-11 15:55:35 +02:00
Peter Simons
5735fd0128 haskell-language-c-quote: remove obsolete version 0.4.4 2013-05-11 15:55:35 +02:00
Evgeny Egorochkin
c7b3fbddf0 Merge pull request #520 from dysinger/t/leveldb
Add Google's LevelDB (BSD) to Nix
2013-05-11 04:35:23 -07:00
Bjørn Forsman
5ab346a327 ninja: move out of pythonPackages
ninja is a build system written in C++ that just happens to use python
to build/install *itself*. It is not a "python package".

After this commit, ninja will be at pkgs.ninja instead of
pkgs.pythonPackages.ninja.
2013-05-11 12:01:00 +02:00
Tim Dysinger
3fc7f4e68f add leveldb 2013-05-10 21:00:31 -10:00
Evgeny Egorochkin
8d7e1a79cc AppArmor: add a sample patched kernel. 2013-05-11 08:50:34 +03:00
Evgeny Egorochkin
a35052c2e6 Ninja build system: package version 1.2.0 2013-05-11 00:13:17 +03:00
Jaka Hudoklin
67af13dbf8 Add libgit2, pygit2 and powerline beta 2013-05-10 20:41:12 +00:00
Peter Simons
c413721d7c haskell-atomic-primops: add version 0.1.0.2 2013-05-10 22:23:32 +02:00
Domen Kozar
4b166d6944 deluge: install icons 2013-05-10 19:17:52 +02:00
Domen Kozar
1aaa1a7b5b add networ-manager-openvpn, WIP 2013-05-10 19:17:51 +02:00
Nikita Ofitserov
73c9e1706e webtest depends on unittest2 on python 2.x
This fixes its build with python 2.7.
2013-05-10 17:52:01 +04:00
Evgeny Egorochkin
c3767704f4 KWebKitPart: new package 2013-05-10 05:03:54 +03:00
Jaka Hudoklin
09f342edc9 firefoxWrapper: Add libcanberra gtk module to firefox 2013-05-10 00:44:03 +00:00
Lluís Batlle i Rossell
ac4dcaba52 Adding pygobject3 (for bluez4).
bluez-simple-agent fails to work otherwise.
We discussed this a bit on #486, and this looks like the simplest way to
get bluez-simple-agent again.
2013-05-09 19:11:30 +00:00
Lluís Batlle i Rossell
4e7208fe2e Adding a KDE wrapper, to easily have KDE programs in nix-env.
Specially for those not running KDE.
2013-05-09 18:40:29 +00:00
Michael Raskin
9d92fe013e Adding E-KRHyper theorem prover 2013-05-09 17:47:58 +04:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Lluís Batlle i Rossell
f1e2c585b6 Adding pcl. (Also updating flann, reworking vtk) 2013-05-09 12:36:22 +02:00
Michael Raskin
646868b2e6 Adding Otter theorem prover. The development is frozen, but because of that Otter is considered a very reliable prover from soundness point of view. 2013-05-09 12:23:27 +04:00
Tim Dysinger
d52b1931f7 added libcello 2013-05-08 16:18:45 -10:00
Phreedom
7a4b06e0e8 Merge pull request #511 from bjornfor/buildbot
Buildbot version bump and add buildbot-slave
2013-05-08 15:45:20 -07:00
Lluís Batlle i Rossell
e9cbe5439e Adding udptunnel
(Fixing a semicolon in pwnat expr too)
2013-05-08 22:51:39 +02:00
Lluís Batlle i Rossell
a8b576ecaf Adding pwnat. 2013-05-08 22:51:39 +02:00
Bjørn Forsman
9fa9afe71e buildbot-slave: new package
Tested with buildbot (master).
2013-05-08 22:26:43 +02:00
Bjørn Forsman
a36577367e buildbot: bump to version 0.8.7p1 (latest stable)
* 0.8.7p1 doesn't contain *.info documentation; use manpage
  instead
* Update meta.description to not contain the package name (redundant)
* 0.8.7p1 only builds with python dateutil==1.5, so that has to be added
  as well

Runtime tested with the buildbot slave that is added in the next commit.
2013-05-08 22:09:05 +02:00
Marc Weber
b50b9bf2b7 add versionedDerivation 2013-05-08 15:43:07 +03:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Phreedom
53799435a2 Merge pull request #509 from coroa/elpy-pkg
Add python-elpy-1.0.1: Backend for the elpy Emacs mode
2013-05-07 16:45:29 -07:00
Jonas Hoersch
17be4b85a3 Add python-elpy-1.0.1: Backend for the elpy Emacs mode 2013-05-07 12:27:10 +02:00
Evgeny Egorochkin
083637896d Removing konq-plugins, since they have been included in kdebase in all KDE versions we have currently
packaged.
2013-05-07 10:18:35 +03:00
Evgeny Egorochkin
026b9971f5 Remove KBluetooth. BlueDevil should be used instead. 2013-05-07 09:37:53 +03:00
Evgeny Egorochkin
eb4c9efb50 KOffice: superceded by Calligra long time ago. Removing. 2013-05-07 09:27:23 +03:00
Phreedom
008308168f Merge pull request #507 from bjornfor/spyder
Spyder: add dependencies to make it more featured and make a desktop item
2013-05-06 13:30:25 -07:00
Bjørn Forsman
78169ec020 spyder: add recommended and optional dependencies
Spyder says about itself that it has

  ...the support of IPython (enhanced interactive Python interpreter) and
  popular Python libraries such as NumPy (linear algebra), SciPy (signal
  and image processing) or matplotlib (interactive 2D/3D plotting).

So I think having those available as default is a the right thing to to.
(We can easily make a stripped down spyder expression if needed later.)

I've added the list of recommended and optional dependencies as
described here:

  http://pythonhosted.org/spyder/installation.html#dependencies
2013-05-06 20:36:17 +02:00
Shea Levy
a88306b15f nodePackages.underscore: Update
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-06 12:56:15 -04:00
Shea Levy
c2a2a03210 Add extend nodePackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-06 12:47:46 -04:00
Shea Levy
15bdde9071 Add express nodePackage
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-06 09:29:33 -04:00
Joachim Schiele
fd8e249b5d byobu 5.37 integration 2013-05-06 11:06:59 +00:00
Rickard Nilsson
d0a58b3536 python-cherrypy: Update to 3.2.2 2013-05-06 12:14:34 +02:00
Domen Kozar
7cc21354d5 pa-applet: add pulseaudio applet 2013-05-05 23:09:59 +02:00
Domen Kozar
db04466380 xarchive: add gtk archiver 2013-05-05 22:03:50 +02:00
Bjørn Forsman
8095d76a73 spyder: new package
Spyder (previously known as Pydee) is a powerful interactive development
environment for the Python language with advanced editing, interactive
testing, debugging and introspection features.

The name Spyder comes from Scientific PYthon Development EnviRonment.
2013-05-05 13:13:45 +02:00
Shea Levy
0f633fdfc6 Make some arguments passed to all-packages.nix available in the pkgs set
These are needed to re-call <nixpkgs/pkgs/stdenv> to, say, deeply override glibc

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 21:21:31 -04:00
Phreedom
c3f34e54a1 Merge pull request #381 from ierton/bluez5
bluez5: add experimental expression for bluez5
2013-05-03 10:54:39 -07:00
Peter Simons
a0ec8bd020 haskell-cgi: downgrade to version 3001.1.7.5 in GHC 7.6.x
The next Haskell Platform will contain this fairly old version, because
3001.1.8.4 depends on monad-catchio, which is not part of HP.
2013-05-03 11:38:57 +02:00
Peter Simons
0b946a6374 haddock: update to version 2.13.2 2013-05-03 11:38:57 +02:00
Peter Simons
c0eca109ed haskell-text: update to version 0.11.3.1 2013-05-03 11:38:56 +02:00
Peter Simons
98dae954cf haskell-vector-binary-instances: add version 0.2.1.0 2013-05-03 11:38:56 +02:00
Peter Simons
14660eb7e5 haskell-hashable: update to version 1.2.0.7 2013-05-03 11:38:55 +02:00
Peter Simons
54d9cf1c65 Merge pull request #499 from bjornfor/perl-modules
Add perl modules needed to build "slic3r"
2013-05-03 00:43:16 -07:00
Bjørn Forsman
fbae002717 Add perl modules needed to build "slic3r"
Slic3r is a tool to convert a digital 3D model into printing
instructions for your 3D printer. I have some build/run issues with it
so add it later.

These perl modules are added:
  AlienWxWidgets
  BoostGeometryUtils
  constant-defer
  ExtUtilsCppGuess
  ExtUtilsTypemapsDefault
  ExtUtilsXSpp
  GrowlGNTP
  MathLibm
  MathClipper
  MathConvexHullMonotoneChain
  MathGeometryVoronoi
  MathPlanePath
  ModuleBuildWithXSpp
  NetDBus
  Spiffy
  TestBase
  Wx

A couple of old modules were no longer available on CPAN so I bumped
them:
  DataUUID
  ExtUtilsMakeMaker
  ExtUtilsManifest
  version
  VersionRequirements

XMLTwig fails in the test phase (it is missing a dependencies), so the
test is skipped. (How did it pass the test before?)
2013-05-03 09:31:12 +02:00
Peter Simons
318b7e2eeb Merge pull request #495 from bjornfor/stlink
stlink: new package
2013-05-02 06:21:37 -07:00
Eelco Dolstra
14169da6f5 vdrift: Remove from the channel
It's 564 MiB compressed.
2013-05-02 13:26:15 +02:00
Eelco Dolstra
7846ad9a90 alienarena: Remove from the channel
387 MiB compressed, 898 uncompressed.
2013-05-02 13:26:01 +02:00
Eelco Dolstra
40cd4a8a9d xonotic: Remove from the channel
It's 878 MiB compressed.
2013-05-02 13:25:57 +02:00
Eelco Dolstra
a1bc05bb55 ufoai: Remove from the channel
It's 898 MiB compressed.
2013-05-02 13:25:52 +02:00
Lluís Batlle i Rossell
bd55358159 Adding filegive, my file sending program 2013-05-02 11:32:58 +04:00
Bjørn Forsman
8df1afa9c9 stlink: new package
stlink is an in-circuit debugging and programming tool for ST-Link v1
and v2 devices. It is similar to OpenOCD but just for ST-Link devices.

  https://github.com/texane/stlink

IMPORTANT: You need permissions to access the stlink usb devices. Here
are example udev rules for stlink v1 and v2 so you don't need to have
root permissions (copied from <stlink>/49-stlink*.rules):

  SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n"
  SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n"
2013-05-01 23:29:59 +02:00
Shea Levy
e3a920feec DBIxClass: Update
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-01 10:04:26 -04:00
Vladimír Čunát
8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Lluís Batlle i Rossell
d4ac42ae11 Adding go 1.1 beta 2013-04-30 11:58:22 +04:00
Mathijs Kwik
bfc245f7de linux-3.9: no longer marked as RC, updated "latest" reference. 2013-04-30 09:29:58 +02:00
Eelco Dolstra
1e316e8eac sqlite: Make 3.7.16 the default again
I've fixed the Hydra problem and the DBIx::Class issue is only a
problem in its test suite, apparently.
2013-04-30 00:16:56 +02:00
Eelco Dolstra
9c8923b5e6 sqlite: Don't include the last component of the version in the filenames
SQLite point releases are conservative, so we don't need to refer to
SQLite versions at this level of precision.
2013-04-30 00:04:46 +02:00
Eelco Dolstra
50c9c1c938 sqlite: Update to 3.7.16.2 2013-04-30 00:04:29 +02:00
Eelco Dolstra
61ec5a1ca4 DBI: Update to 1.625 2013-04-30 00:03:56 +02:00
Shea Levy
c60a1f67cc Add doxypy nixpkg
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-29 14:25:25 -04:00
Shea Levy
27b3ab6a8d Make it possible to enable vbox extension pack easily from nixpkgs config
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-29 13:54:22 -04:00
Evgeny Egorochkin
b2ad60553b Revert "Fix incorrect attribute name"
This reverts commit 699d6a0bde.
2013-04-28 13:39:45 +03:00
Evgeny Egorochkin
699d6a0bde Fix incorrect attribute name 2013-04-28 13:30:13 +03:00
Peter Simons
cbf9bbd5f4 sqlite: downgrade from version 3.7.16.1 to 3.7.14.1
The recent sqlite update broke -- among other things -- the Hydra regression
test suite. Until these issues have been resolved, we stick to the older
reliable version.
2013-04-27 22:36:03 +02:00
Domen Kozar
197ca4d677 add bittorrent sync 2013-04-27 18:43:43 +02:00
Peter Simons
319ac481b8 sqlite: clean up
- Add version 3.7.14.1 again, so that we can work around issues caused
   by the recent 3.7.16.1 update.

 - Drop obsolete version 3.6.x.

 - Consistently use the sqlite version number to name the file of the
   expression.
2013-04-26 22:46:45 +02:00
Lluís Batlle i Rossell
678e983f5e Adding reaver-wps. 2013-04-26 17:14:09 +04:00
Lluís Batlle i Rossell
b4687c6966 tahoe-lafs: update to 1.9.2
I had to update a python package too (foolscap)
2013-04-24 22:41:17 +04:00
Peter Simons
79fd846654 release-haskell.nix: fsnotify won't build with ghc 6.x 2013-04-24 13:21:06 +02:00
Peter Simons
6080adb28e release-haskell.nix: run test builds of fsnotify with all GHC versions 2013-04-24 13:21:06 +02:00
Peter Simons
cd470bc296 idris: drop obsolete package, it doesn't compile anywhere 2013-04-24 13:21:05 +02:00
Vladimír Čunát
49f12fe878 remove old references to xorgserver_1_13_0 2013-04-24 06:44:43 +00:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Cillian de Róiste
50d66b945e Add limnoria, a well maintained fork of Supybot, an IRC bot 2013-04-24 01:41:31 +02:00
Rok Garbas
f1184916dd Merge pull request #477 from coroa/offlineimap
offlineimap: enable support for the sqlite status backend
2013-04-23 03:47:15 -07:00
Lluís Batlle i Rossell
031d1ee8c5 Merge branch of 'hatari' 2013-04-23 11:06:17 +04:00
Michael Raskin
ad214d8d0c Merge pull request #473 from errge/master
Update ack to 2.02 (and File-Next to 1.12, only used by ack)
2013-04-22 22:38:35 -07:00
Michael Raskin
bc623ee480 Merge pull request #471 from vcunat/p/xorg
xorg updates
2013-04-22 22:38:05 -07:00
Michael Raskin
b1ff6273d9 Merge pull request #468 from zefhemel/dartsdk
Added Google Dart M4
2013-04-22 22:34:18 -07:00
Rok Garbas
7b9fc733dd python-deform: unittest2 needed on python 26 2013-04-22 22:57:58 +02:00
Florian Friesdorf
b67cf97f5c Revert "let hydra also build python26Packages"
This reverts commit a2ddd3643e.

@peti pointed out that python2.6 packages are now prefered over
python2.7. In a local test it was the other way round. seems to be
arbitrary or I messed up the test.
2013-04-22 22:49:40 +02:00
Jordi
019472eaa3 Add hatari Atari St emulator. 2013-04-22 22:10:15 +02:00
viric
4311ba66e0 Merge pull request #474 from logann2019/autocutsel
Autocutsel
2013-04-22 10:32:37 -07:00
Eelco Dolstra
4539668937 php: Add 5.4
We'll keep 5.3 around for a while.
2013-04-22 19:17:35 +02:00
Lluís Batlle i Rossell
078ddf4746 Adding doodle. 2013-04-22 20:57:14 +04:00
Rickard Nilsson
51bf1ae795 munge 0.5.10: New package, a credentials handler for clusters 2013-04-22 16:04:41 +02:00
Peter Simons
56b504a1cd Merge pull request #476 from coroa/emacs-jedi-deps
Add python packages necessary for emacs-jedi
2013-04-22 05:21:48 -07:00
Peter Simons
6626810adb haskell-hashable: update to version 1.2.x
Except for Agda, which still needs old version.
2013-04-22 14:14:39 +02:00
Peter Simons
9faf34d0a8 pkgs/top-level/release-haskell.nix: cosmetic 2013-04-22 14:14:39 +02:00
Peter Simons
1cc5307410 haskell-haskeline: drop obsolete version 0.6.4.7 2013-04-22 14:14:39 +02:00
Peter Simons
5a28754957 haskell-hashable: add version 1.2.0.6 2013-04-22 14:14:39 +02:00
Florian Friesdorf
a2ddd3643e let hydra also build python26Packages
for `nix-env -i` the later defined python27Packages seems to win.
Another solution might be to have python26 oder python27 either in the
name or the version. Let's have a look at haskelPackages for that.
2013-04-22 13:56:29 +02:00
Jonas Hoersch
ea3dc7a6ea Add python-epc-0.0.3: EPC implementation in Python 2013-04-22 11:30:32 +02:00
Jonas Hoersch
85d2971a2e Add python-sexpdata-0.0.2: S-expression parser for Python 2013-04-22 11:30:17 +02:00
Jonas Hoersch
dbe6dcd8af python-argparse: update to 1.2.1 2013-04-22 11:25:37 +02:00
Florian Friesdorf
b6c87f9f29 python-packages: python2.6 fixes 2013-04-22 11:17:23 +02:00
Florian Friesdorf
3c1b5246ad python-requests-1.2.0 2013-04-22 11:16:42 +02:00
Jonas Hoersch
93c39d24b5 offlineimap: enable support for the sqlite status backend 2013-04-22 10:40:36 +02:00
Peter Simons
3e523751cd GHC 7.6.3 is the new 7.6.2. 2013-04-21 23:05:09 +02:00
Vladimír Čunát
5e4aa51173 poppler: share most things between glib and qt4 versions
Most of the stuff was duplicated (headers, the core library).
The new solution makes the _qt4 package use the _glib one,
because it depended on glib through cairo anyway
(and _glib bindings themselves are just ~350kB).

This also fixes a problem that mergeAttrsByFuncDefaultsClean
didn't merge patches, which affected dbus.libs.
2013-04-21 20:15:38 +00:00
Peter Simons
c9182f112a ledger: update 3.x version to the latest Git snapshot 2013-04-21 20:37:53 +02:00
Peter Simons
2340c84a00 all-packages.nix: strip trailing whitespace 2013-04-21 20:10:40 +02:00
Peter Simons
fdf1d45a38 ghc: add version 7.6.3 (and a corresponding package set) 2013-04-21 20:10:27 +02:00
Jordi
e140b6a454 Add autocutsel to all-packages 2013-04-21 18:46:16 +02:00
Gergely Risko
5c29fcc427 Update ack to 2.02 (and File-Next to 1.12, only used by ack) 2013-04-21 13:10:44 +02:00
Evgeny Egorochkin
e83c2fa4a0 Add KDE 4.10.2. Not ready for production yet, but does compile. 2013-04-21 05:46:18 +03:00
Patrick John Wheeler
3bf0d2b960 ghc-wrapper: install the GHC documentation into the user's profile
The freaky implementation was done that way in order to avoid unnecessary
re-builds of all Haskell packages by changing the wrapper script used
internally in those builds.

See <https://github.com/NixOS/nixpkgs/pull/466> for further details.
2013-04-20 22:14:44 +02:00
Peter Simons
65b95b159e haskell-checkers: add version 0.3.1 2013-04-20 20:36:57 +02:00
Peter Simons
7dd399abc1 haskell-wai-handler-launch: add version 1.3.1.4 2013-04-20 20:21:38 +02:00
Peter Simons
916aa90491 haskell-pretty-show: add old version 1.2, which still builds fine with GHC 7.0.4 2013-04-20 20:16:27 +02:00
cillianderoiste
96e8703be0 Merge pull request #460 from cillianderoiste/plymouth
It works enough to display bootsplash animations in an xorg session and a VT.

I haven't figured out how to run it successfully from the initrd yet and I'm also not happy with the postInstall mess, but I'd rather merge it now than let it get lost. It seems like it should be possible for a user to activate it by using boot.initrd.extraUtilsCommands and boot.initrd.postMountCommands
2013-04-20 08:07:30 -07:00
Vladimír Čunát
7a25aa94cd gphoto*: update for changed libgphoto version 2013-04-20 12:44:05 +02:00
Vladimír Čunát
e8823c9e5e Merge pull request #441 from ierton/udisks2-xfce
udisks2 for xfce
2013-04-20 01:37:14 -07:00
Peter Simons
00ed85ec25 release-haskell.nix: optparse-applicative won't build with ghc 6.10.4 because it needs a newer version of Cabal 2013-04-19 10:46:18 +02:00
Peter Simons
98130c0b35 release-haskell.nix: build jailbreakCabal with all available compilers 2013-04-19 10:46:18 +02:00
Peter Simons
6f1cec9acb haskell-packages.nix: fix the implementation of 'cabalNoTest'
The previous implementation used the following tying-the-knot trickery to
override 'doCheck' to false for the given build:

  cabalNoTest = {
    mkDerivation = x: rec {
      final = self.cabal.mkDerivation (self: (x final) // { doCheck = false; });
    }.final;
  };

That seemed to work, but for some reason it caused trouble with some builds --
not all -- that use jailbreakCabal. The problem was the 'stdenv' attribute
couldn't be evaluated properly anymore:

  $ nix-build ~/pkgs/top-level/release-haskell.nix -A optparseApplicative.ghc6104.x86_64-linux --show-trace
  error: while evaluating the attribute `drvPath' at `/nix/store/qkj5cxknwspz8ak0ganm97zfr2bhksgn-nix-1.5.2pre3082_2398417/share/nix/corepkgs/derivation.nix:19:9':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `haskell-optparse-applicative-ghc6.10.4-0.5.2.1' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:40:13':
  while evaluating the derivation attribute `configurePhase' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:107:13':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/strings.nix:55:26':
  while evaluating the attribute `outPath' at `/nix/store/qkj5cxknwspz8ak0ganm97zfr2bhksgn-nix-1.5.2pre3082_2398417/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `jailbreak-cabal-1.1' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:40:13':
  while evaluating the derivation attribute `nativeBuildInputs' at `/home/simons/.nix-defexpr/pkgs/stdenv/generic/default.nix:76:17':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/lists.nix:135:21':
  while evaluating the attribute `buildInputs' at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:22:17':
  while evaluating the builtin function `filter':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:22:60':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/top-level/haskell-packages.nix:119:17':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/customisation.nix:61:22':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/lib/customisation.nix:56:24':
  while evaluating the builtin function `isAttrs':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/development/libraries/haskell/Cabal/1.14.0.nix:1:1':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/top-level/haskell-packages.nix:113:20':
  while evaluating the attribute `final' at `/home/simons/.nix-defexpr/pkgs/top-level/haskell-packages.nix:114:7':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/build-support/cabal/default.nix:9:5':
  while evaluating the function at `/home/simons/.nix-defexpr/pkgs/stdenv/generic/default.nix:51:24':
  while evaluating the attribute `meta.license' at `/home/simons/.nix-defexpr/pkgs/development/libraries/haskell/Cabal/1.14.0.nix:17:5':
  infinite recursion encountered

I tried to figure out why this happens, but eventually gave up. The new
implementation passes an argument called 'enableCheckPhase' to the Cabal
builder, which determines whether the user-specified doCheck value has any
effect or not. Now, a normal override can be used to disable unit testing.
2013-04-19 10:46:18 +02:00
Peter Simons
67acbf8f37 release-haskell.nix: generate properly nested attribute sets to fix evaluation with nix-build 2013-04-19 10:46:18 +02:00
Peter Simons
49cbf42556 release-haskell.nix: build optparse-applicative with all available GHC versions 2013-04-19 10:46:18 +02:00
Rickard Nilsson
6e8404a7cb New Haskell library: haskell-acid-state 2013-04-19 07:09:12 +02:00
Rickard Nilsson
8a3f6e8e76 New Haskell library: haskell-safecopy 2013-04-19 07:07:44 +02:00
Vladimír Čunát
c859a46712 xorg: update xorgserver to 1.13.4, and more
- update some modules to work with the newer server
- fix many other modules via overrides
- huge cleanup in overrides via better propagation
  and pixman include flattening
- URLs of XCB stuff have been moved
2013-04-18 21:33:17 +02:00
Vladimír Čunát
7716b78fc7 pixman: use pixman_cairo for xorg, flatten its includes 2013-04-18 21:31:56 +02:00
Vladimír Čunát
b37b73a56c poppler: update, include qt4+cairo patches
The patches should provide smoother font rendering, like it's with poppler+gtk+cairo.
The code was taken from @mornfall f4fce48c #470, thanks.
2013-04-18 20:54:47 +02:00
Rickard Nilsson
40ac613f85 obnam: Update to 1.4 2013-04-18 16:09:35 +02:00
Peter Simons
4a8492884c pkgs/top-level/release-haskell.nix: re-structure Hydra job set
The new job set has the following structure:

  pkg.ghc762.x86_64-linux  = pkgs_x86_64_linux.haskellPackages_ghc762.pkg;
  pkg.ghc762.i686-linux    = pkgs_i686_linux.haskellPackages_ghc762.pkg;
  pkg.ghc6123.x86_64-linux = pkgs_x86_64_linux.haskellPackages_ghc6123.pkg;
  pkg.ghc6123.i686-linux   = pkgs_i686_linux.haskellPackages_ghc6123.pkg;

This gives us (in theory) the ability to generate a Hydra page that displays
the build status of a package across all versions of GHC and all systems. Right
now, Hydra is not up to it, but Eelco says the feature is "on the todo list".

This file doesn't specify the supported build systems explicitly. Instead, that
information is taken from the respective pkg.meta.platforms attribute.
2013-04-18 12:53:06 +02:00
Evgeny Egorochkin
70ba1888a2 Make kde 4.8 default. Shouldn't cause too many problems. 2013-04-18 03:12:12 +03:00
Zef Hemel
a5e11c08bb Now using callPackage. 2013-04-17 19:38:02 +02:00
Vladimír Čunát
c122eb61fb kopete: fix build by using libotr_3_2 again 2013-04-17 19:32:44 +02:00