Commit graph

25392 commits

Author SHA1 Message Date
Peter Simons
e655c6afd7 libxslt: revert impurity fix on 'native-stdenv' platforms
Commit 16863d8ffe caused massive re-builds.
This change needs to be made differently.
2013-03-25 13:02:03 +01:00
Peter Simons
ab98d72fad git: fix build on FreeBSD
Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
2013-03-25 12:47:39 +01:00
Peter Simons
16863d8ffe libxslt: fix impurity on 'native-stdenv' platforms
libxslt has optional dependencies which may be found in /usr or
/usr/local on platforms that have a native stdenv. With those features
enabled, the build generated binaries that depend on libraries outside
of the store. In this particular case, the NixOS channel had binaries
for FreeBSD that depended on libgcrypt, apparently because that packages
happens to be installed outside of Nix on the build machine. On other
machines, however, those binaries failed with unresolvable references.
2013-03-25 12:44:23 +01:00
Peter Simons
ac86eed59c gnumake: disable test suite on FreeBSD
One test fails, unfortunately, but I'm not sure what to do about it.
2013-03-25 12:44:23 +01:00
Peter Simons
03149a85dc rsync: fix build an FreeBSD (by disabling ACL support) 2013-03-25 12:44:22 +01:00
Peter Simons
b08ba87b36 rsync: add meta.license attribute 2013-03-25 12:44:22 +01:00
Peter Simons
67c9b39b60 haskell-hakyll: update to version 4.2.2.0 2013-03-25 11:47:58 +01:00
Peter Simons
7943ac41cd haskell-circle-packing: add myself as maintainer 2013-03-25 11:47:58 +01:00
Peter Simons
aff27c669e haskell-cuda: add version 0.5.0.1 2013-03-25 11:47:58 +01:00
Peter Simons
58211c125a Merge pull request #407 from maggesi/proofgeneral_updates
Update ProofGeneral to version 4.2
2013-03-25 03:33:21 -07:00
Marco Maggesi
fa2d85fded Update HOL Light to rev 157 2013-03-25 10:56:57 +01:00
Mathijs Kwik
b1200f1a28 mongodb: upgrade to 2.4.0 2013-03-25 08:08:46 +01:00
Florian Friesdorf
9f7aef51ea Revert "chromium-25.0.1364.172, 26.0.1410.40, 27.0.1448.0"
This reverts commit 6617f5ca9e.

The old situation was definitely better. Sorry for waiting so long for
the revert.
2013-03-25 07:17:20 +01:00
Jack Cummings
94a3a5e00a shntool-3.0.10 2013-03-24 22:08:09 -07:00
Peter Simons
438e23b45b htop: update to version 1.0.2 2013-03-25 00:01:56 +01:00
Marco Maggesi
7b35dcdc62 ProofGeneral: remove dead code (compatibility with emacs 23). 2013-03-24 23:43:18 +01:00
Peter Simons
d2fff5ed22 gnulib: add version 0.0-7898-gdb9cad7 2013-03-24 23:32:14 +01:00
Peter Simons
41020224ad nvidia-x11: use the brand-new 'unfree-redistributable' license for this package 2013-03-24 22:47:12 +01:00
Peter Simons
3388c3433e pkgs/lib/licenses.nix: strip trailing whitespace 2013-03-24 22:45:48 +01:00
Peter Simons
a06ec6bb62 pkgs/lib/licenses.nix: add 'unfree' and 'unfree-redistributable' licenses 2013-03-24 22:45:21 +01:00
Peter Simons
6f85323164 haskell-circle-packing: add version 0.1.0.2 2013-03-24 18:08:35 +01:00
Peter Simons
8de45f4da4 haskell-arithmoi: add version 0.4.0.3 2013-03-24 17:44:05 +01:00
Peter Simons
194673f1f5 haskell-wai-extra: update to version 1.3.3.2 2013-03-24 17:33:53 +01:00
Peter Simons
62480ce404 haskell-hamlet: update to version 1.1.7 2013-03-24 17:33:53 +01:00
Peter Simons
40b194caf9 haskell-diagrams-contrib: update to version 0.6.1 2013-03-24 17:33:53 +01:00
Peter Simons
9497164f61 haskell-conduit: update to version 1.0.4.1 2013-03-24 17:33:53 +01:00
Peter Simons
17a4e0f13c haskell-blaze-builder: update to version 0.3.1.1 2013-03-24 17:33:53 +01:00
Peter Simons
b6aaccc816 haskell-attoparsec-conduit: update to version 1.0.1 2013-03-24 17:33:52 +01:00
Peter Simons
1670613203 haskell-editline: add myself as maintainer 2013-03-24 17:33:26 +01:00
Florian Friesdorf
c93aebb87e get iptraf to compile 2013-03-24 14:44:10 +01:00
Shea Levy
98860f429d Add the addPassthru library function
With multiple outputs, adding attributes to a derivation without
changing the {drv,out}Path is no longer as trivial as simply using the
`//' operator, as we usually want to add the attribute to _each_ output,
and even if we only care about one that one output can be reached via
multiple paths.

For stdenv.mkDerivation, we already had code in place to add passthru
and meta attributes to derivations. This commit simply factors part of
that code out into a lib function addPassthru, which takes a derivation
and an attribute set and appends the attribute set to each output of the
derivation.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 08:29:10 -04:00
Shea Levy
4fa4ab3a6e Partially revert my recent kernelPackages changes
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 07:45:00 -04:00
Vladimír Čunát
f8fb55b4cc gparted: update 2013-03-23 20:25:35 +01:00
Peter Simons
35c86a3d99 release-haskell.nix: configure package set for ghc 6.10.4, 6.12.3 and 7.0.4 2013-03-23 18:44:44 +01:00
Peter Simons
439809b6c6 Fix build of haskell-platform 2009.2.0.2. 2013-03-23 18:44:44 +01:00
Peter Simons
f684ed19ba haskell-editline: add old version 0.2.1.0 2013-03-23 18:44:44 +01:00
Peter Simons
32fb6ed5e3 pkgs/build-support/cabal: disable doCheck by default on GHC 7.0.x platforms
Trying to run the unit tests with GHC 7.0.4 causes so many builds to
fail that it's probably not worth-while.
2013-03-23 18:44:44 +01:00
Florian Friesdorf
6617f5ca9e chromium-25.0.1364.172, 26.0.1410.40, 27.0.1448.0
26.0.1410.28 was broken for me
2013-03-23 18:20:38 +01:00
Peter Simons
c0e0604c4d nvidia-x11: change meta.license from "unfree" to "proprietary"
I'm not entirely sure what the appropriate license attribute for this
package is. The license [1] says:

 | 2.1.2 Linux/FreeBSD Exception. Notwithstanding the foregoing terms of
 | Section 2.1.1, SOFTWARE designed exclusively for use on the Linux or
 | FreeBSD operating systems, or other operating systems derived from
 | the source code to these operating systems, may be copied and
 | redistributed, provided that the binary files thereof are not
 | modified in any way (except for unzipping of compressed files).

It sounds to me like this gives NixOS the right to re-distribute the
files (because we don't modify them). The 'proprietary' license sort-of
fits that. On the other hand, we seem to assume that proprietary
software cannot be redistributed, which doesn't apply here.

[1] http://www.nvidia.com/content/DriverDownload-March2009/licence.php?lang=us
2013-03-23 15:58:15 +01:00
Peter Simons
83d0a3a37c ghc: add meta.license attribute to all compiler versions 2013-03-23 15:58:14 +01:00
Peter Simons
573e61ea6f pkgs/top-level/release-haskell.nix: configure Hydra to verify that important Haskell packages build
At the moment, this file is used only by my own Hydra instance.
2013-03-23 15:58:14 +01:00
Peter Simons
6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Peter Simons
ac8b39f66a haskell-wai-extra: jailbreak to fix build with latest version of 'void' 2013-03-23 15:58:14 +01:00
Peter Simons
81970ff445 haskell-conduit: jailbreak to fix build with latest version of 'void' 2013-03-23 15:58:14 +01:00
Peter Simons
9e5910620f haskell-void: update to version 0.6 2013-03-23 15:58:14 +01:00
Peter Simons
3aab8525ed haskell-bytestring-lexing: update to version 0.4.3 2013-03-23 15:58:14 +01:00
Sander van der Burg
5add198e3d nijs: updated to 0.0.5 2013-03-23 15:24:59 +01:00
Rok Garbas
54d81f1b6b opencv: python bindings 2013-03-23 00:44:19 +01:00
Rok Garbas
fb127d28cb ipython: adding depenencies for ipython's notebook 2013-03-23 00:38:18 +01:00
Domen Kožar
b6e9ec2b93 Merge pull request #401 from cpages/master
doxygen: update to 1.8.3.1
2013-03-22 11:36:22 -07:00