Commit graph

8201 commits

Author SHA1 Message Date
Eelco Dolstra fcf92435e3 * apr 1.3.9.
svn path=/nixpkgs/trunk/; revision=17767
2009-10-12 17:57:27 +00:00
Nicolas Pierron b15cbb639e Refactor a bit to add names to intermediate computations. Add a cross
temporary result to fetch information from the evaluation to make them
available inside the option declaration.

Add: isNotDefined flag inside the option.

svn path=/nixpkgs/trunk/; revision=17766
2009-10-12 17:51:21 +00:00
Nicolas Pierron 81694a7f54 * modules.nix: use catAttrs function instead of hand made code.
svn path=/nixpkgs/trunk/; revision=17760
2009-10-12 15:50:59 +00:00
Nicolas Pierron 19648abc05 Revert previous commit because this is implicit. Fix property evaluation
error which arose when one module define a value with "mkDefaultValue"
and another module define its value with "mkIf <false>".

svn path=/nixpkgs/trunk/; revision=17759
2009-10-12 15:16:22 +00:00
Nicolas Pierron e82843144c do not delay mkOverride on options which are does not have sub modules.
svn path=/nixpkgs/trunk/; revision=17758
2009-10-12 15:07:31 +00:00
Lluís Batlle i Rossell 7e3bcbd4c2 Made the small vim (attribute 'vim') have --enable-multibyte. Not that a luxurious
features, in these times of utf-8, and at the end our ncurses has multibyte.

svn path=/nixpkgs/trunk/; revision=17757
2009-10-12 14:29:07 +00:00
Nicolas Pierron 03eab95618 Only allow properties with a onGlobalEval function to go through specific
types.

svn path=/nixpkgs/trunk/; revision=17756
2009-10-12 13:37:00 +00:00
Eelco Dolstra c6efc69ad2 * -lgcc_s is also needed on i686-linux.
svn path=/nixpkgs/trunk/; revision=17754
2009-10-12 11:22:16 +00:00
Lluís Batlle i Rossell 331d7185f2 Adding vnstat. Unless using "vnstat -l", it wants some directories in /var, where
it collects information.

svn path=/nixpkgs/trunk/; revision=17753
2009-10-12 11:08:52 +00:00
Lluís Batlle i Rossell 71fab59b62 Adding iptraf 3.0.0 (the last iptraf I found, last updated in 2005)
It runs without complains if you "mkdir -p /var/run/iptraf /var/local/iptraf"

svn path=/nixpkgs/trunk/; revision=17752
2009-10-12 10:52:47 +00:00
Sander van der Burg 9444b0f4a4 Increased the maximum heap size of GWT to prevent out of memory errors
svn path=/nixpkgs/trunk/; revision=17751
2009-10-12 10:42:36 +00:00
Ludovic Courtès 666754f7aa GDB: Reinstate removal of duplicate Info files.
svn path=/nixpkgs/trunk/; revision=17750
2009-10-12 10:06:41 +00:00
Lluís Batlle i Rossell fa036cce46 Adding exiftags
svn path=/nixpkgs/trunk/; revision=17748
2009-10-11 15:52:27 +00:00
Lluís Batlle i Rossell ebe0bc809d Adding jhead
svn path=/nixpkgs/trunk/; revision=17747
2009-10-11 15:52:14 +00:00
Lluís Batlle i Rossell 585654955f Removing references to libkipi. I just discovered it is for kde 3.x.
svn path=/nixpkgs/trunk/; revision=17746
2009-10-11 15:52:03 +00:00
Lluís Batlle i Rossell 613ae5e387 Trying to add kde43.libkipi. It still doesn't work, but the actual expression
triggers "nix-instantiate killed by signal 6 (SIGABRT)". Try it with:
nix-build -A kde43.libkipi /etc/nixos/nixpkgs

svn path=/nixpkgs/trunk/; revision=17745
2009-10-11 15:16:46 +00:00
Lluís Batlle i Rossell 57a544d59c Adding 'remake': a patched and modernized version of GNU make utility that adds
improved error reporting, the ability to trace execution in a comprehensible
way, and a debugger.

svn path=/nixpkgs/trunk/; revision=17744
2009-10-11 15:03:13 +00:00
Lluís Batlle i Rossell 9d71e990a1 Updating the openchrome xorg video driver
svn path=/nixpkgs/trunk/; revision=17743
2009-10-11 14:41:31 +00:00
Michael Raskin e131df67ee Update GDB
svn path=/nixpkgs/trunk/; revision=17742
2009-10-10 14:45:38 +00:00
Sander van der Burg 4232caa53f Added konversation for KDE 4.x package
svn path=/nixpkgs/trunk/; revision=17741
2009-10-10 12:51:51 +00:00
Nicolas Pierron 926f20a1ee Revert "* Revert the last two commits ..." (rev 17738) & Fix.
svn path=/nixpkgs/trunk/; revision=17740
2009-10-09 23:03:24 +00:00
Eelco Dolstra 037a777b7d * Enable builds on OpenBSD.
svn path=/nixpkgs/trunk/; revision=17739
2009-10-09 19:42:59 +00:00
Eelco Dolstra 24b50e92ee * Revert the last two commits since they break every job in the
buildfarm ("undefined variable `delayPropertiesTemplate'").

svn path=/nixpkgs/trunk/; revision=17738
2009-10-09 19:34:28 +00:00
Nicolas Pierron d11481e9bf Add mkOverrideTemplate (currently the same as mkOverride).
svn path=/nixpkgs/trunk/; revision=17737
2009-10-09 18:11:36 +00:00
Nicolas Pierron bb16a7f08d Replace a counter intuitive behaviour of module evaluations.
- types.nix:
Introduce a new flag named "delayProperties" which define either that
properties should be evaluated (when false) or that they should be delaied
through the type structure.

- properties.nix:
Generalized the delayProperties function to make it work with the iter
functions of option types.

- modules.nix:
Replace evalProperties by a condition based on the value of the
"delayProperties" flag of the option type.  If the flag does not exists or
if it is false, then the system behaves as always.  Otherwise it delays
the properties from the current value to each values contained inside it.

svn path=/nixpkgs/trunk/; revision=17736
2009-10-09 18:11:30 +00:00
Nicolas Pierron fd0396037a extract function unifyOptionModule from moduleMerge. This function is
used to convert option sets, provided inside option declarations, to a
module.

svn path=/nixpkgs/trunk/; revision=17735
2009-10-09 18:11:24 +00:00
Rob Vermaas 67bf96d424 enable freebsd for mesa
svn path=/nixpkgs/trunk/; revision=17733
2009-10-09 13:57:20 +00:00
Andres Löh 895520c5e1 Added uniqueid Haskell package.
svn path=/nixpkgs/trunk/; revision=17732
2009-10-09 13:30:52 +00:00
Andres Löh 1a1a661f4b Version bump for darcs.
svn path=/nixpkgs/trunk/; revision=17729
2009-10-08 14:07:13 +00:00
Eelco Dolstra ad6a69e0f5 svn path=/nixpkgs/trunk/; revision=17728 2009-10-08 13:14:52 +00:00
Eelco Dolstra 55ad6675dc * Fix some packages that broke because libuuid can be null on Darwin.
buildDefs doesn't like buildInputs containing nulls.
* In all-packages.nix: xfsProgs -> xfsprogs, jfsUtils -> jfsutils to
  match the upstream name.

svn path=/nixpkgs/trunk/; revision=17726
2009-10-08 13:07:56 +00:00
Sander van der Burg 0f20924465 - Upgraded VirtualBox to 3.0.8
- Fixed location of the VirtualBox icon
- Removed qt3 as dependency of VirtualBox since it's obsolete since 3.0.x


svn path=/nixpkgs/trunk/; revision=17725
2009-10-08 12:57:05 +00:00
Eelco Dolstra c4d7f1dc82 svn path=/nixpkgs/trunk/; revision=17724 2009-10-08 12:48:44 +00:00
Eelco Dolstra a32ea15fd4 * debootstrap is missing subst.patch.
svn path=/nixpkgs/trunk/; revision=17723
2009-10-08 12:47:05 +00:00
Marc Weber 6533cfe95d debootstrap: missing patch
svn path=/nixpkgs/trunk/; revision=17722
2009-10-08 12:36:31 +00:00
Andres Löh 0b5b512471 Added HList package for Haskell.
svn path=/nixpkgs/trunk/; revision=17715
2009-10-08 09:46:56 +00:00
Rob Vermaas dc242687b2 updated pgadmin to 1.10.0
svn path=/nixpkgs/trunk/; revision=17713
2009-10-08 09:26:47 +00:00
Rob Vermaas e7c3f330d3 added pg_top
svn path=/nixpkgs/trunk/; revision=17711
2009-10-08 08:53:21 +00:00
Rob Vermaas 6132b946ac added eggdrop, iftop
svn path=/nixpkgs/trunk/; revision=17710
2009-10-08 07:01:55 +00:00
Marc Weber 5fe030ee0a adding debootstrap (bootstrap debian in a chroot)
svn path=/nixpkgs/trunk/; revision=17709
2009-10-08 00:54:31 +00:00
Marc Weber 0e6c476d60 fix some typos in comments
svn path=/nixpkgs/trunk/; revision=17708
2009-10-08 00:54:26 +00:00
Peter Simons 49a1368712 pigz: an implementation of gzip that can take advantage of multi-core CPUs
Initial version.

svn path=/nixpkgs/trunk/; revision=17707
2009-10-07 20:18:11 +00:00
Rob Vermaas 7aae02cb99 added DBD-mysql, maatkit
svn path=/nixpkgs/trunk/; revision=17703
2009-10-07 15:08:34 +00:00
Sander van der Burg 49124816cc Upgraded GWT to 1.5.3
svn path=/nixpkgs/trunk/; revision=17698
2009-10-07 13:03:38 +00:00
Eelco Dolstra 1608964306 svn path=/nixpkgs/trunk/; revision=17689 2009-10-07 11:29:23 +00:00
Eelco Dolstra 8cb83682c4 * p7zip updated to 9.04.
svn path=/nixpkgs/trunk/; revision=17688
2009-10-07 11:28:35 +00:00
Eelco Dolstra 672d3856df * Unzip 6.0.
svn path=/nixpkgs/trunk/; revision=17687
2009-10-07 11:18:54 +00:00
Lluís Batlle i Rossell 1ebd86987c Updating googleearth.
I had to use a newer patchelf (0.5), otherwise patchelf (0.4) died with an error at
setting the rpath for a lib.
("virtual address overrun" or something like that)

I still don't know of any stable url for a given version, so we will have this working
until they change the package file again updating.

svn path=/nixpkgs/trunk/; revision=17680
2009-10-06 17:37:39 +00:00
Ludovic Courtès 1028742c3b libedit update (the former upstream tarball vanished).
svn path=/nixpkgs/trunk/; revision=17679
2009-10-06 16:47:37 +00:00
Nicolas Pierron d7897d0d1a Change fetchsvn as well as nix-prefect-svn to use the repository name and
the revision number inside the derivation name.

svn path=/nixpkgs/trunk/; revision=17677
2009-10-06 13:36:52 +00:00
Nicolas Pierron e528b920bb Add the reverseList function.
svn path=/nixpkgs/trunk/; revision=17676
2009-10-06 13:36:46 +00:00
Sander van der Burg 730c14b4b7 Upgraded KDE to version 4.3.2
svn path=/nixpkgs/trunk/; revision=17675
2009-10-06 12:38:37 +00:00
Nicolas Pierron 088e6995a2 Improve the efficiency of stringToCharacters.
svn path=/nixpkgs/trunk/; revision=17671
2009-10-06 09:21:58 +00:00
Nicolas Pierron 915fa6a08f introduce the stringAsChars ans replaceChars functions.
svn path=/nixpkgs/trunk/; revision=17670
2009-10-06 09:21:52 +00:00
Nicolas Pierron bbb4ce1dd7 Extract the path done inside the iteration process of the option type and
give it as argument to each sub-module.

With the type "types.attrsOf types.optionSet", you will obtain the name of
the attribute in which the sub-modules are contained.

svn path=/nixpkgs/trunk/; revision=17669
2009-10-06 09:21:46 +00:00
Nicolas Pierron 1f68748a8b Add removePrefix function.
svn path=/nixpkgs/trunk/; revision=17667
2009-10-06 09:21:39 +00:00
Nicolas Pierron c3d328ca48 Fix sub-module argument manipulation: Avoid using an empty set to check
the type of the module.

svn path=/nixpkgs/trunk/; revision=17666
2009-10-06 09:21:17 +00:00
Michael Raskin 1a093f3b73 Updating 2.6.31-zen2 sliding head
svn path=/nixpkgs/trunk/; revision=17664
2009-10-06 06:15:22 +00:00
Michael Raskin cd2e2948a8 Adding a zen-stable head version
svn path=/nixpkgs/trunk/; revision=17663
2009-10-06 06:12:08 +00:00
Michael Raskin 7469c3da48 move to fetchgit as github tarballs are unpredictable
svn path=/nixpkgs/trunk/; revision=17662
2009-10-06 05:58:56 +00:00
Michael Raskin edbbddce1d A case study in transitive overrides. WebKit needs fresh glib. This means it needs a whole slice of system built against glib-2.22.. Added overrides are generic enough, though. So the same way can be used to override everything. I have failed (so far?) to add mkOverridable into stdenv, though.
svn path=/nixpkgs/trunk/; revision=17661
2009-10-06 05:43:51 +00:00
Ludovic Courtès 3c9c17990e guile-2-test: Add guile-gnome.
svn path=/nixpkgs/trunk/; revision=17658
2009-10-05 22:21:55 +00:00
Ludovic Courtès efb5018a8f Add GNU guile-gnome.
svn path=/nixpkgs/trunk/; revision=17657
2009-10-05 22:21:50 +00:00
Ludovic Courtès c1e5a9d2fb G-Wrap: Propagate libffi.
svn path=/nixpkgs/trunk/; revision=17656
2009-10-05 22:21:45 +00:00
Ludovic Courtès 14dc82302c libffi: Install headers under "$out/include".
svn path=/nixpkgs/trunk/; revision=17655
2009-10-05 22:21:40 +00:00
Ludovic Courtès 0183a14c05 guile-2-test: Add Guile-Cairo.
svn path=/nixpkgs/trunk/; revision=17654
2009-10-05 22:21:35 +00:00
Ludovic Courtès 9fe05496fb Add Guile-Cairo.
svn path=/nixpkgs/trunk/; revision=17653
2009-10-05 22:21:24 +00:00
Lluís Batlle i Rossell 92dbfb5b9d Marking comical as maintained by me, and let hydra build it.
svn path=/nixpkgs/trunk/; revision=17652
2009-10-05 21:01:50 +00:00
Nicolas Pierron ba09982edb Fix merge function of types.
svn path=/nixpkgs/trunk/; revision=17649
2009-10-05 18:10:42 +00:00
Rob Vermaas 9ae6664a5b remove coreutils argument of privoxy
svn path=/nixpkgs/trunk/; revision=17648
2009-10-05 17:12:19 +00:00
Rob Vermaas 3e8d1bbe6f coreutils not needed as input for privoxy
svn path=/nixpkgs/trunk/; revision=17647
2009-10-05 15:56:36 +00:00
Rob Vermaas b7321eddce added privoxy
svn path=/nixpkgs/trunk/; revision=17645
2009-10-05 14:15:28 +00:00
Eelco Dolstra 06e0f87d6e svn path=/nixpkgs/trunk/; revision=17642 2009-10-05 13:04:07 +00:00
Eelco Dolstra 339e5b8f8b * Latest DocBook XSL.
svn path=/nixpkgs/trunk/; revision=17641
2009-10-05 12:57:15 +00:00
Sander van der Burg 4b80c924ca openssl support or sitecopy
svn path=/nixpkgs/trunk/; revision=17640
2009-10-05 12:21:50 +00:00
Rob Vermaas 163cceeb54 ssl support for sitecopy
svn path=/nixpkgs/trunk/; revision=17639
2009-10-05 12:18:51 +00:00
Rob Vermaas bd4ef3cbfc added sitecopy
svn path=/nixpkgs/trunk/; revision=17638
2009-10-05 10:37:30 +00:00
Michael Raskin 5e1c057878 If this url then this hash
svn path=/nixpkgs/trunk/; revision=17637
2009-10-04 22:01:26 +00:00
Ludovic Courtès 4ba5d3dc6d Add GNU GRUB 1.97~beta3 (aka. "GRUB 2").
svn path=/nixpkgs/trunk/; revision=17636
2009-10-04 21:39:34 +00:00
Lluís Batlle i Rossell 954a8d0cdc Adding amr support in mplayer. That should be enabled by the user, because those libraries are not redistributable.
I don't know if the 'unfree' in the amr libraries will stop mplayer being built without its support. We would have to write the all-packages MPlayer expression different, in this case.

svn path=/nixpkgs/trunk/; revision=17635
2009-10-04 21:31:34 +00:00
Andres Löh ad30d22e82 Added ansi-wl-pprint lib for Haskell.
svn path=/nixpkgs/trunk/; revision=17634
2009-10-04 09:28:05 +00:00
Lluís Batlle i Rossell d34b69e638 Adding all kde language files, and a script to update them for next kde versions.
I added recurseIntoAttrs in the kde43 expression in order to get the next recurseIntoAttrs
in l10n working. But as I checked, the kde43 attributes were already shown by
nix-env -qa '*' without any recurseIntoAttrs, I don't know why. If anyone knows, let me know.

svn path=/nixpkgs/trunk/; revision=17628
2009-10-03 13:37:31 +00:00
Peter Simons efaa637d76 subversion: fixed definition of meta.platforms
svn path=/nixpkgs/trunk/; revision=17627
2009-10-03 12:48:29 +00:00
Sander van der Burg a9e0071c02 Added builder script for KDE PIM runtime
svn path=/nixpkgs/trunk/; revision=17626
2009-10-03 12:25:57 +00:00
Sander van der Burg a23bcc282d Changed DBUS module prefix of KDE PIM runtime, so that it won't complain when it is installed
svn path=/nixpkgs/trunk/; revision=17625
2009-10-03 12:25:27 +00:00
Sander van der Burg 6437240b8e Fixed compilation of KDE PIM runtime
svn path=/nixpkgs/trunk/; revision=17624
2009-10-03 11:30:16 +00:00
Lluís Batlle i Rossell d0157e7b45 He afegit la traducció del kde al català.
Adding the kde Catalan localisation.

svn path=/nixpkgs/trunk/; revision=17623
2009-10-02 22:01:23 +00:00
Lluís Batlle i Rossell e5654ae80f Reverting simons' r17618, which causes a major stdenv rebuild.
svn path=/nixpkgs/trunk/; revision=17622
2009-10-02 19:05:39 +00:00
Lluís Batlle i Rossell 14433eb1e2 Updating ts to 0.6.5
svn path=/nixpkgs/trunk/; revision=17621
2009-10-02 19:05:29 +00:00
Peter Simons b9b57c6149 Move libXaw fix from default.nix to overrides.nix.
svn path=/nixpkgs/trunk/; revision=17620
2009-10-02 18:03:23 +00:00
Peter Simons 67cea803fa perl-5.8 and perl-5.10: fixed build on MacOS X
On MacOS X, we used to use the native perl interpreter from /usr/bin.
Unfortunately, that interpreter fails to build a number of packages
(Subversion, Git, etc. ...), because it assumes knowledge about the underlying
C compiler that is not valid for the compiler used by Nix. For example,
/usr/bin/perl assumes that the compiler can build binaries for both the ppc and
the x86 architecture. /usr/bin/FCC can do that, but the gcc from Nix can't.

The solution is to compile Perl 5.10 via Nix so that it can properly configure
itself. However, note that the resulting binary is impure: it will find headers
in /usr/include and libraries in /usr/lib -- something a pure perl binary
wouldn't do. In this respect our Nix-compiled perl binary is not better than
the native one from /usr/bin -- it's just more accurately configured.

svn path=/nixpkgs/trunk/; revision=17618
2009-10-02 16:26:05 +00:00
Peter Simons 99fe875609 pstree: updated to version 2.32; the previous version no longer exists upstream
svn path=/nixpkgs/trunk/; revision=17617
2009-10-02 16:25:59 +00:00
Sander van der Burg e615e1e0de Renamed extension to tar.gz
svn path=/nixpkgs/trunk/; revision=17615
2009-10-02 15:37:12 +00:00
Eelco Dolstra 68082057fe * Urgh.
svn path=/nixpkgs/trunk/; revision=17614
2009-10-02 15:15:18 +00:00
Eelco Dolstra e4672f42e5 svn path=/nixpkgs/trunk/; revision=17613 2009-10-02 15:06:07 +00:00
Sander van der Burg fe23ec7ba9 Upgraded Qt to 4.5.3
svn path=/nixpkgs/trunk/; revision=17612
2009-10-02 14:59:17 +00:00
Peter Simons 49afefdb19 emacs-23: hacky fix to libXaw linker errors on MacOS X
When building Emacs on MacOS X, the configure script believes that libXaw is
available and tries to link it (even when, in fact, libXaw is not available).
To work around that problem, we make Xaw support mandatory on MacOS X.

svn path=/nixpkgs/trunk/; revision=17610
2009-10-02 13:57:26 +00:00
Peter Simons 1570ccf3cf libXaw: fixed broken installation in MacOS X
See comments in file for further details.

svn path=/nixpkgs/trunk/; revision=17609
2009-10-02 13:57:21 +00:00
Eelco Dolstra 317fd0edd5 * Revert the manual changes to default.nix
* Build libSM with the system libuuid on Darwin (in such a way that we
  don't get a rebuild on all other platforms).

svn path=/nixpkgs/trunk/; revision=17606
2009-10-02 13:06:35 +00:00
Eelco Dolstra 6e6473940d * Fix the Exult build.
svn path=/nixpkgs/trunk/; revision=17605
2009-10-02 13:01:31 +00:00