philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

6279 commits

Author SHA1 Message Date
Wouter den Breejen eec829aad5 vsftpd userlist options added 
svn path=/nixpkgs/trunk/; revision=14649
 2009-03-22 15:32:28 +00:00
Lluís Batlle i Rossell ba1b5fe28c Removing the just added pdflrf. It violates the GPL. 
svn path=/nixpkgs/trunk/; revision=14647
 2009-03-22 13:36:19 +00:00
Lluís Batlle i Rossell eb87994383 Adding pdflrf (to get nice LRF files for Sony PRS) 
svn path=/nixpkgs/trunk/; revision=14646
 2009-03-22 13:25:12 +00:00
Lluís Batlle i Rossell d52b60af22 Adding upx. 
svn path=/nixpkgs/trunk/; revision=14645
 2009-03-22 13:03:37 +00:00
Ludovic Courtès a3f009935f GNU IceCat 3.0.7-g1. 
svn path=/nixpkgs/trunk/; revision=14644
 2009-03-22 12:37:16 +00:00
Lluís Batlle i Rossell e7dc9a15ae Adding pipe viewer. 
svn path=/nixpkgs/trunk/; revision=14643
 2009-03-22 12:34:30 +00:00
Ludovic Courtès a117d3ac9a Build Compiz*. 
svn path=/nixpkgs/trunk/; revision=14642
 2009-03-21 22:20:45 +00:00
Armijn Hemel 78c4691007 update to 1.6 
svn path=/nixpkgs/trunk/; revision=14637
 2009-03-20 21:20:06 +00:00
Armijn Hemel 19eaf90e36 update to 2.6.6 
svn path=/nixpkgs/trunk/; revision=14636
 2009-03-20 21:11:37 +00:00
Eelco Dolstra bec9f4b0c3 * JasPer: build without OpenGL/X support - it's only used to build a 
trivial example program (a barebones image viewer), but it gives
  everybody else a dependency on Mesa ;-)

svn path=/nixpkgs/trunk/; revision=14633
 2009-03-20 16:27:32 +00:00
Eelco Dolstra 3be3abe6ab * Removed makePortmap; use makeOverridable. 
svn path=/nixpkgs/trunk/; revision=14631
 2009-03-20 16:17:08 +00:00
Eelco Dolstra 32d1c53b10 * Fix portmap. 
svn path=/nixpkgs/trunk/; revision=14630
 2009-03-20 16:08:43 +00:00
Eelco Dolstra e14c41e728 svn path=/nixpkgs/trunk/; revision=14629 2009-03-20 15:45:51 +00:00
Marc Weber d8f8d0f620 fix tcng 
svn path=/nixpkgs/trunk/; revision=14626
 2009-03-20 13:12:26 +00:00
Lluís Batlle i Rossell 874e0ac032 Updating tightvnc, and fixing the Xsecurity problems. 
svn path=/nixpkgs/trunk/; revision=14625
 2009-03-20 10:49:05 +00:00
Eelco Dolstra 84b78f7489 * Work around a bug in java-front. 
svn path=/nixpkgs/trunk/; revision=14620
 2009-03-19 17:34:59 +00:00
Ludovic Courtès c04af1186d Build Impressive. 
svn path=/nixpkgs/trunk/; revision=14619
 2009-03-19 16:42:00 +00:00
Ludovic Courtès 3a43ab3860 Add Impressive (formerly known as `KeyJNote'). 
svn path=/nixpkgs/trunk/; revision=14618
 2009-03-19 16:40:28 +00:00
Eelco Dolstra bbf6b46178 * Updated WebDSL. 
svn path=/nixpkgs/trunk/; revision=14614
 2009-03-19 16:04:32 +00:00
Eelco Dolstra e0b48bbdec * Added javafront & dryad. 
svn path=/nixpkgs/trunk/; revision=14611
 2009-03-19 14:46:38 +00:00
Eelco Dolstra 5986a4d175 * More cleanup. Updated to the latest Stratego/XT 0.17. 
svn path=/nixpkgs/trunk/; revision=14610
 2009-03-19 14:34:16 +00:00
Eelco Dolstra b460175a7e * Backwards compatibility hack for Stratego/XT packages. 
svn path=/nixpkgs/trunk/; revision=14608
 2009-03-19 13:59:31 +00:00
Michael Raskin 79bfd749a0 DataMatrix update 
svn path=/nixpkgs/trunk/; revision=14607
 2009-03-19 13:59:00 +00:00
Eelco Dolstra 468ffe8466 * Turn on nullglob globally so that distPhase works when we copy 
"*.tar.bz2 *.tar.gz" and there are no *.tar.gz files.  Maybe we
  should turn this on in stdenv (nullglob just seems like the right
  thing to do in general).

svn path=/nixpkgs/trunk/; revision=14606
 2009-03-19 13:39:07 +00:00
Eelco Dolstra 33a5e03bfe * Merged r13888 (ATerm cleanup) from the stdenv branch back into the 
trunk.

svn path=/nixpkgs/trunk/; revision=14605
 2009-03-19 12:29:14 +00:00
Eelco Dolstra 399ee394d4 * Cleaned up some Stratego-related stuff. 
svn path=/nixpkgs/trunk/; revision=14603
 2009-03-19 12:21:28 +00:00
Lluís Batlle i Rossell 20dad1f68d Making wine 32bit work in x86_64, using Dolstra suggestions, 
which worked at first try.


svn path=/nixpkgs/trunk/; revision=14602
 2009-03-19 11:03:32 +00:00
Michael Raskin 3969f00c27 build mono.. 
svn path=/nixpkgs/trunk/; revision=14601
 2009-03-19 10:10:54 +00:00
Michael Raskin 1e385684e2 gr layout contained polytonic symbols not mentioned in keysymdefs.h 
svn path=/nixpkgs/trunk/; revision=14597
 2009-03-19 06:18:26 +00:00
Ludovic Courtès 80306de64c Build a few games on Hydra. 
svn path=/nixpkgs/trunk/; revision=14596
 2009-03-18 23:35:59 +00:00
Eelco Dolstra 5477ffdfe5 * man-pages 3.19. 
svn path=/nixpkgs/trunk/; revision=14595
 2009-03-18 21:30:26 +00:00
Michael Raskin 441f2de840 Testing showed that these keys do not work well in non-us layout.. 
svn path=/nixpkgs/trunk/; revision=14583
 2009-03-18 05:42:53 +00:00
Lluís Batlle i Rossell e72f1929b0 Adding multitran. I added a note in the 'data' expression, regarding 
a locale that should be added into the system.

svn path=/nixpkgs/trunk/; revision=14582
 2009-03-17 21:49:39 +00:00
Lluís Batlle i Rossell 7fd91b8736 Adding lrzip and rzip. 
svn path=/nixpkgs/trunk/; revision=14581
 2009-03-17 21:17:51 +00:00
Michael Raskin 1dada801c7 Fix SQLite attr name 
svn path=/nixpkgs/trunk/; revision=14580
 2009-03-17 20:44:42 +00:00
Peter Simons 22e1286711 Updated ANTLR version 2 from 2.7.6 to 2.7.7. 
svn path=/nixpkgs/trunk/; revision=14576
 2009-03-17 15:42:54 +00:00
Michael Raskin 2345d0c8aa hyphen, nbsp, plusminus for rich kb layout 
svn path=/nixpkgs/trunk/; revision=14575
 2009-03-17 15:11:18 +00:00
Marc Weber 89a634a2a4 adding tcng package 
tcc can be used to generate tc traffic shaping commands.
It even can compile kernel modules to classify packages (untested)

svn path=/nixpkgs/trunk/; revision=14574
 2009-03-17 14:18:45 +00:00
Peter Simons ae474690ea Added bash 4.0 (and readline 6.0, which is required by bash). 
svn path=/nixpkgs/trunk/; revision=14573
 2009-03-17 14:03:03 +00:00
Michael Raskin 3a59128510 Some packages fail on hydra and are better off being fixed one-after-one. 
svn path=/nixpkgs/trunk/; revision=14572
 2009-03-17 12:29:34 +00:00
Michael Raskin 6a07017f9e restrict problematic packages to Linux.. 
svn path=/nixpkgs/trunk/; revision=14568
 2009-03-17 06:16:10 +00:00
Michael Raskin dbab1ae680 Added arrows into rich international layout 
svn path=/nixpkgs/trunk/; revision=14567
 2009-03-17 05:12:03 +00:00
Michael Raskin 32154f3dac Updated monotone 
svn path=/nixpkgs/trunk/; revision=14565
 2009-03-16 21:30:43 +00:00
Marc Weber 8fa77b44cb added iperf (a tool to measure network bandwidth) 
svn path=/nixpkgs/trunk/; revision=14564
 2009-03-16 18:39:04 +00:00
Eelco Dolstra 808f12e369 * Dosbox 0.72. 
svn path=/nixpkgs/trunk/; revision=14556
 2009-03-16 12:22:47 +00:00
Eelco Dolstra e9593080b6 * Added Catalyst::View::Download. 
svn path=/nixpkgs/trunk/; revision=14555
 2009-03-16 12:20:28 +00:00
Ludovic Courtès dff2bbe342 Build more typesetting tools on Hydra. 
svn path=/nixpkgs/trunk/; revision=14552
 2009-03-16 10:45:55 +00:00
Ludovic Courtès c2199227b4 Add Rubber, a LaTeX wrapper that does the right thing. 
svn path=/nixpkgs/trunk/; revision=14551
 2009-03-16 10:42:51 +00:00
Michael Raskin 3c7430198b Some more jobs... 
svn path=/nixpkgs/trunk/; revision=14550
 2009-03-16 10:19:38 +00:00
Eelco Dolstra 46f7027688 * Reverted r14547, r14526 -> these belong in the stdenv-branch. 
svn path=/nixpkgs/trunk/; revision=14549
 2009-03-16 10:00:26 +00:00
Ludovic Courtès a8c3cbdf0b Sudo: Set the right LOGFILE' and TIMEDIR' paths. 
This fixes `sudo' so that it can actually remember your password
across invocations.


svn path=/nixpkgs/trunk/; revision=14548
 2009-03-16 08:31:23 +00:00
Marc Weber 9e82d3dd08 version bump to coreutils-7.1 
7.1 adds the new flag iflag=fullblock!

This line without fullblock copies a different amount of data each
time !
cat /dev/zero | dd iflag=fullblock bs=1M count=1000 of=/dev/null;

svn path=/nixpkgs/trunk/; revision=14547
 2009-03-16 00:20:34 +00:00
Nicolas Pierron 44b6165af2 * Update suckless package location. 
* Update dmenu version (3.8 -> 3.9)
* Update wmii version (20070516 -> 20071116)

svn path=/nixpkgs/trunk/; revision=14544
 2009-03-15 20:09:50 +00:00
Ludovic Courtès d9cfe67b9f lsh: Change the PAM service name in accordance with NixOS (had forgotten to commit it). 
svn path=/nixpkgs/trunk/; revision=14542
 2009-03-15 14:11:21 +00:00
Ludovic Courtès b161fd2921 Linux: Build the `sdhci' module, for Ricoh SD readers. 
svn path=/nixpkgs/trunk/; revision=14541
 2009-03-15 14:03:59 +00:00
Ludovic Courtès 35ff1b6a6a More work for Hydra. 
svn path=/nixpkgs/trunk/; revision=14538
 2009-03-14 23:29:33 +00:00
Ludovic Courtès 9c308037b3 More work for Hydra. 
svn path=/nixpkgs/trunk/; revision=14536
 2009-03-14 23:19:49 +00:00
Ludovic Courtès 24857265fa Don't build Avahi on Cygwin. 
svn path=/nixpkgs/trunk/; revision=14534
 2009-03-14 21:43:37 +00:00
Ludovic Courtès 5d213515ad release: Add `allBut' function. 
svn path=/nixpkgs/trunk/; revision=14533
 2009-03-14 21:43:09 +00:00
Ludovic Courtès 363dc0f8aa Don't build Guile on Cygwin. 
svn path=/nixpkgs/trunk/; revision=14532
 2009-03-14 19:40:29 +00:00
Michael Raskin 2a5f69f318 Fix typo 
svn path=/nixpkgs/trunk/; revision=14531
 2009-03-14 15:41:20 +00:00
Ludovic Courtès 8599649b6f Some more work for Hydra. 
svn path=/nixpkgs/trunk/; revision=14530
 2009-03-14 15:32:39 +00:00
Michael Raskin 9e690c6c3a Some more jobs for hydra 
svn path=/nixpkgs/trunk/; revision=14529
 2009-03-14 09:44:15 +00:00
Nicolas Pierron f624a70ee7 Fix mkThenElse and mkAlways evaluation. 
svn path=/nixpkgs/trunk/; revision=14528
 2009-03-14 07:20:31 +00:00
Lluís Batlle i Rossell de8bbafb53 Adding -fPIC code for static library code in perl and vxl, for x86_64. 
svn path=/nixpkgs/trunk/; revision=14526
 2009-03-13 16:46:10 +00:00
Eelco Dolstra 6425d2017d * Updated DBIx::Class and SQL::Abstract. 
svn path=/nixpkgs/trunk/; revision=14520
 2009-03-13 13:07:44 +00:00
Michael Raskin e4722f955c Build OO.o on hydra 
svn path=/nixpkgs/trunk/; revision=14517
 2009-03-13 09:41:40 +00:00
Eelco Dolstra dbfcf0c5f4 * Install genfkey, a tool for creating triggers from foreign key 
constraints (which Sqlite doesn't support directly).

svn path=/nixpkgs/trunk/; revision=14515
 2009-03-12 14:37:39 +00:00
Eelco Dolstra cef5be0bc9 * Sqlite 3.6.10. 
svn path=/nixpkgs/trunk/; revision=14512
 2009-03-12 12:56:55 +00:00
Sander van der Burg 18874b164f Added ConsoleKit package 
svn path=/nixpkgs/trunk/; revision=14511
 2009-03-11 16:31:01 +00:00
Sander van der Burg cddf378de3 Added ConsoleKit package 
svn path=/nixpkgs/trunk/; revision=14510
 2009-03-11 16:30:38 +00:00
Eelco Dolstra 7ab993d0c4 * Catalyst::Engine::HTTP::Prefork: terminate chunked transfers 
correctly.

svn path=/nixpkgs/trunk/; revision=14504
 2009-03-11 13:34:18 +00:00
Eelco Dolstra 33a3895d78 * Added Catalyst::Engine::HTTP::Prefork and its dependencies. 
svn path=/nixpkgs/trunk/; revision=14503
 2009-03-11 11:40:52 +00:00
Eelco Dolstra 8ac53703f0 * vlc: use faad. 
svn path=/nixpkgs/trunk/; revision=14502
 2009-03-10 23:28:06 +00:00
Eelco Dolstra 1485c905f7 * ffmpeg: build with faad2 support. However, vlc still won't play 
mp4a audio.
* faad2: latest version.
* vlc: fix the hard-coded OSD font path name.  Dunno why they don't
  use fontconfig.

svn path=/nixpkgs/trunk/; revision=14501
 2009-03-10 22:45:27 +00:00
Eelco Dolstra 44ac9e249c * MPlayer: updated to the SVN version. 
* VLC: updated to 0.9.8a.  It now uses Qt for the GUI, which looks a
  lot better than the wxWidgets one.
* libdvdread, libdvdnav: updated to 4.1.3.
* ffmpeg: updated to 0.5 (a new release!).  Got rid of the SVN
  version, which shouldn't be necessary anymore.

svn path=/nixpkgs/trunk/; revision=14500
 2009-03-10 21:03:51 +00:00
Eelco Dolstra 199155087e * A Gentoo mirror disappeared. 
svn path=/nixpkgs/trunk/; revision=14499
 2009-03-10 21:00:07 +00:00
Eelco Dolstra 2ae9a1c947 * Doh. 
svn path=/nixpkgs/trunk/; revision=14498
 2009-03-10 20:04:08 +00:00
Eelco Dolstra dfb3345149 * Updated fribidi. 
svn path=/nixpkgs/trunk/; revision=14497
 2009-03-10 17:24:15 +00:00
Eelco Dolstra 731b77ac35 * Nicer notation for Nixpkgs' Hydra jobs. The packages to build are 
given as a nested attribute set isomorphic to all-packages.nix,
  where the value for each attribute is a list of platforms on which
  to build the package.  For instance,

    {
      wine = ["i686-linux"];
      xorg = {
        libX11 = ["i686-linux" "x86_64-linux"];
      };
    }

    says that the "wine" attribute in all-packages.nix should be built
    on "i686-linux" only, while the "xorg.libX11" attribute should be
    built on "i686-linux" and "x86_64-linux".

    There are some aliases for common platform groups (currently "all"
    for all supported platforms, "linux" for all supported Linux
    platforms).

svn path=/nixpkgs/trunk/; revision=14496
 2009-03-10 15:23:27 +00:00
Eelco Dolstra b53ef57554 * Moved mapAttrs to attrsets.nix. 
* Added a function mapAttrsRecursive, which is like mapAttrs, but
  recursively applies itself to attribute sets.
* Commented and cleaned up some functions.

svn path=/nixpkgs/trunk/; revision=14495
 2009-03-10 15:18:38 +00:00
Sander van der Burg e629ce0e07 Updated openbabel to 2.2.1 and fixed style so that kdeedu can use it. Enabled ocaml support in kdeedu 
svn path=/nixpkgs/trunk/; revision=14494
 2009-03-10 14:41:50 +00:00
Eelco Dolstra f81bbde9d2 * Urgh, this is why duplication is bad... 
svn path=/nixpkgs/trunk/; revision=14493
 2009-03-10 12:54:12 +00:00
Sander van der Burg 6529b6d14f Added builder script for kdesdk 
svn path=/nixpkgs/trunk/; revision=14492
 2009-03-10 12:50:30 +00:00
Eelco Dolstra f1203df6b5 * Add all KDE 4 packages. 
svn path=/nixpkgs/trunk/; revision=14491
 2009-03-10 12:34:12 +00:00
Eelco Dolstra 29daeec109 * pciutils: build a shared libpci. 
* pciutils: updated to the latest pci.ids.

svn path=/nixpkgs/trunk/; revision=14490
 2009-03-10 12:25:45 +00:00
Peter Simons 610aac30c3 Fixed Python StringTemplate library. 
Most importantly, this change required updating the ANTLR 2.x expression to
install the Python run-time library. While we're at it, we're building the
run-time library for C++ and Java, too. There is still work to be done: the
stringtemplate library doesn't find antlr.py without help yet.

svn path=/nixpkgs/trunk/; revision=14489
 2009-03-10 12:01:22 +00:00
Sander van der Burg 68e6471a70 Fixed detection of apr-utils 
svn path=/nixpkgs/trunk/; revision=14487
 2009-03-10 10:18:11 +00:00
Eelco Dolstra f8641d34a2 * Latest kernels. 
svn path=/nixpkgs/trunk/; revision=14486
 2009-03-10 09:05:43 +00:00
Eelco Dolstra 9ab4720b85 * Latest libdvdcss. 
svn path=/nixpkgs/trunk/; revision=14483
 2009-03-10 08:06:50 +00:00
Eelco Dolstra 9be9f5b2bb * Build some KDE 4 packages in Hydra. 
svn path=/nixpkgs/trunk/; revision=14482
 2009-03-10 08:01:35 +00:00
Eelco Dolstra 9fee9c7be4 * Some renaming: kde -> kde-3, kde-4 -> kde-4-old (we can delete it 
eventually, but it seems to contain some packages that aren't in
  kde-4.2 yet).

svn path=/nixpkgs/trunk/; revision=14481
 2009-03-10 07:58:12 +00:00
Eelco Dolstra c94f5f7862 * Put the tarball job in a separate file. 
svn path=/nixpkgs/trunk/; revision=14476
 2009-03-09 17:49:13 +00:00
Sander van der Burg 3979b5359b Added aprutil as buildinput to kdesdk 
svn path=/nixpkgs/trunk/; revision=14472
 2009-03-09 16:05:57 +00:00
Sander van der Burg 94371463b6 Added gphoto2 support to kdegraphics 
svn path=/nixpkgs/trunk/; revision=14471
 2009-03-09 16:00:22 +00:00
Sander van der Burg f0614c79ff Disabled plasma python modules 
svn path=/nixpkgs/trunk/; revision=14469
 2009-03-09 15:52:48 +00:00
Eelco Dolstra b763e1d520 * makeOverridable: call the override function "override" instead of 
"function", which isn't very descriptive ;-)

  Also, the argument to "override" can be either a function (that
  takes the old arguments and returns the overriding arguments), or a
  plain attribute set that contains the overriding arguments.
  E.g. you can say

    nixUnstable.override { supportOldDBs = false; }

  and

    nixUnstable.override (oldArgs: { name = oldArgs.name + "-my-version"; })

svn path=/nixpkgs/trunk/; revision=14468
 2009-03-09 15:49:58 +00:00
Sander van der Burg b3c8857f60 Fixed detection of PCI utils 
svn path=/nixpkgs/trunk/; revision=14467
 2009-03-09 15:43:05 +00:00
Sander van der Burg 01519d1005 Added subversion support for kdesdk 
svn path=/nixpkgs/trunk/; revision=14466
 2009-03-09 15:29:17 +00:00
Eelco Dolstra 5c7cd50c25 * Latest unstable version. 
svn path=/nixpkgs/trunk/; revision=14465
 2009-03-09 15:27:23 +00:00
Sander van der Burg f9d5952ed5 Added support for X11 VidMode extension to kdenetwork 
svn path=/nixpkgs/trunk/; revision=14462
 2009-03-09 15:01:37 +00:00
Sander van der Burg a901776a5f Added support for KDE 4.2 python modules 
svn path=/nixpkgs/trunk/; revision=14461
 2009-03-09 14:44:42 +00:00
Armijn Hemel a61ee3644c bump powertop to 1.11 
svn path=/nixpkgs/trunk/; revision=14458
 2009-03-09 13:53:48 +00:00
Sander van der Burg 2c11f47c8c Added CUPS administration tools in kdeadmin 
svn path=/nixpkgs/trunk/; revision=14457
 2009-03-09 13:29:37 +00:00
Peter Simons f8c360148e Moved python stringtemplate library from tools/text/py-string-template 
to development/python-modules/stringtemplate.

svn path=/nixpkgs/trunk/; revision=14455
 2009-03-09 10:46:42 +00:00
Lluís Batlle i Rossell 8e2956c4cb Fixing wxGTK28 for x86_64, for the mesa references. 
svn path=/nixpkgs/trunk/; revision=14454
 2009-03-09 10:42:24 +00:00
Michael Raskin 1dd385c5b9 Updated Squid 
svn path=/nixpkgs/trunk/; revision=14451
 2009-03-08 12:29:34 +00:00
Armijn Hemel 4578b29f2c bump to 1.17 
svn path=/nixpkgs/trunk/; revision=14450
 2009-03-08 12:11:05 +00:00
Michael Raskin 13a25d33d3 My attempts to build Thunderbird3beta on Xulrunner. Maybe it is impossible; if not - there are some things others could reuse... 
svn path=/nixpkgs/trunk/; revision=14438
 2009-03-07 17:18:48 +00:00
Armijn Hemel a952ab93ab bump to 5.0.77 
svn path=/nixpkgs/trunk/; revision=14437
 2009-03-07 14:11:45 +00:00
Marc Weber e69b4bd8ed remove error context in all-packages.nix again 
this partially reverts -r14429

svn path=/nixpkgs/trunk/; revision=14435
 2009-03-07 13:10:53 +00:00
Ludovic Courtès e97aa4bb01 GNU libidn 1.13. 
svn path=/nixpkgs/trunk/; revision=14434
 2009-03-07 11:47:40 +00:00
Ludovic Courtès e9917baddd GNU Zile 2.3.4. 
svn path=/nixpkgs/trunk/; revision=14432
 2009-03-07 11:28:56 +00:00
Marc Weber 23ca0bb3c2 vim version (7.2), optional .nix filetype detection and syntax highlighting 
svn path=/nixpkgs/trunk/; revision=14431
 2009-03-07 00:27:13 +00:00
Marc Weber 08e1c08bc7 moved debugging functions into lib module "debug" 
svn path=/nixpkgs/trunk/; revision=14430
 2009-03-06 23:21:35 +00:00
Marc Weber 49b115132d add error context to all top level attr names of all-packages.nix 
svn path=/nixpkgs/trunk/; revision=14429
 2009-03-06 23:21:31 +00:00
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs 
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
 2009-03-06 23:21:28 +00:00
Marc Weber 51289a41b0 adjust packages to overridableDelayableArgs 
svn path=/nixpkgs/trunk/; revision=14427
 2009-03-06 23:21:24 +00:00
Marc Weber f1183f33e3 added simple lib test case for overridableDelayableArgs 
svn path=/nixpkgs/trunk/; revision=14426
 2009-03-06 23:21:17 +00:00
Marc Weber 5ddfa7ed64 moved catAttrs, attrVals into attrsets.nix, adding attrValues 
svn path=/nixpkgs/trunk/; revision=14425
 2009-03-06 23:21:14 +00:00
Marc Weber be3a9f2346 added overridableDelayableArgs replacing applyAndFun 
svn path=/nixpkgs/trunk/; revision=14424
 2009-03-06 23:21:12 +00:00
Marc Weber e917282535 added eqStrict (deep, strict test for equality) 
it can replace eqList and can compare attrs as well

svn path=/nixpkgs/trunk/; revision=14423
 2009-03-06 23:21:09 +00:00
Eelco Dolstra d0691bf1d7 * We don't need all that src.outPath / src.path hackery anymore. 
svn path=/nixpkgs/trunk/; revision=14419
 2009-03-06 16:53:44 +00:00
Eelco Dolstra bd5aed6fd6 * Set argv[0] to a nicer value. 
svn path=/nixpkgs/trunk/; revision=14418
 2009-03-06 16:53:02 +00:00
Ludovic Courtès f301e8423b GNU Gnash 0.8.5. 
svn path=/nixpkgs/trunk/; revision=14415
 2009-03-06 14:24:27 +00:00
Ludovic Courtès fac7dc875a Build Doxygen. 
svn path=/nixpkgs/trunk/; revision=14352
 2009-03-05 15:42:42 +00:00
Ludovic Courtès a2317f6997 Doxygen 1.5.8. 
svn path=/nixpkgs/trunk/; revision=14350
 2009-03-05 15:17:53 +00:00
Eelco Dolstra e263446442 * Firefox 3.0.7. 
* Chatzilla 0.9.84.

svn path=/nixpkgs/trunk/; revision=14346
 2009-03-05 14:06:07 +00:00
Sander van der Burg 628c3d0929 Changed download location of phonon 
svn path=/nixpkgs/trunk/; revision=14341
 2009-03-05 11:44:54 +00:00
Sander van der Burg 5e8908c481 Upgrade to KDE 4.2.1 
svn path=/nixpkgs/trunk/; revision=14340
 2009-03-05 11:09:47 +00:00
Armijn Hemel 53bf781136 update to 2.5.5 
svn path=/nixpkgs/trunk/; revision=14339
 2009-03-04 23:05:11 +00:00
Lluís Batlle i Rossell 08a1042318 Adding neverball 1.5.0, which comes with neverputt. Fun. 
svn path=/nixpkgs/trunk/; revision=14338
 2009-03-04 17:28:25 +00:00
Ludovic Courtès 70657dbb83 GnuPG 2.0.11. 
svn path=/nixpkgs/trunk/; revision=14329
 2009-03-04 13:41:52 +00:00
Marc Weber b288a02e9a nixUnstable version bump to 0.13pre14314 
svn path=/nixpkgs/trunk/; revision=14326
 2009-03-04 12:08:56 +00:00
Marc Weber 62a0aafa04 nixUnstable version bump to 0.13pre13641 
svn path=/nixpkgs/trunk/; revision=14325
 2009-03-04 12:08:51 +00:00
Lluís Batlle i Rossell f3a4388ddc Updating flashplayer10 for i686, and adding it for x64. 
I haven't tried the builder for i686, but I think it should work. The fix should be easy in any cas.
I don't think I've written pretty nix code, so I'm looking forward for revision.


svn path=/nixpkgs/trunk/; revision=14324
 2009-03-04 11:04:16 +00:00
Ludovic Courtès fb9ace2e56 CEDET: Run the test suite the right way. 
svn path=/nixpkgs/trunk/; revision=14318
 2009-03-03 19:45:04 +00:00
Ludovic Courtès 1c7bf2d846 GNU Zile 2.3.3. 
svn path=/nixpkgs/trunk/; revision=14317
 2009-03-03 19:35:56 +00:00
Eelco Dolstra fcad0b0a5a * Cleaned up a lot of description fields that contained newlines. 
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
 2009-03-03 13:27:40 +00:00
Eelco Dolstra 9efba4b3b0 * Added IO::Compress::Bzip2. 
svn path=/nixpkgs/trunk/; revision=14306
 2009-03-03 10:36:29 +00:00
Eelco Dolstra 2c0558e11c * Valgrind 3.4.1. 
svn path=/nixpkgs/trunk/; revision=14304
 2009-03-03 09:19:50 +00:00
Armijn Hemel 2d1a047761 add stunnel 
svn path=/nixpkgs/trunk/; revision=14301
 2009-03-02 15:23:52 +00:00
Ludovic Courtès fd93dfbe9d CEDET 1.0pre6. 
svn path=/nixpkgs/trunk/; revision=14298
 2009-03-02 15:11:54 +00:00
Eelco Dolstra 6bb95494e7 * Use the version attribute if available. 
svn path=/nixpkgs/trunk/; revision=14297
 2009-03-02 14:33:33 +00:00
Eelco Dolstra 84a0bd9c83 * Use qcow2. 
svn path=/nixpkgs/trunk/; revision=14296
 2009-03-02 14:31:33 +00:00
Eelco Dolstra 45081f330d * Append the version to the "name" attribute to make the store paths 
of Hydra builds more distinct (e.g. "patchelf-build-0.5pre1234"
  instead of just "patchelf-build").  If the version isn't known,
  append at least the revision.

* Propagate the release name of the source tarball to Nix builds.
  Useful to provide sensible package names in channels.

svn path=/nixpkgs/trunk/; revision=14294
 2009-03-02 13:45:48 +00:00
Eelco Dolstra f19aea6d5a * Added openSUSE 11.0. 
* Create some device nodes in the RPM/Deb disk images, since modern
  distributions may not provide any device nodes (they're all
  generated by udev).

svn path=/nixpkgs/trunk/; revision=14293
 2009-03-02 13:22:31 +00:00
Sander van der Burg df84d143c1 Some kdebindings-4.2 fixes 
svn path=/nixpkgs/trunk/; revision=14291
 2009-03-02 10:19:20 +00:00
Lluís Batlle i Rossell 301c3d31c9 Adding tunctl. I didn't know how to build the manpage, though. 
svn path=/nixpkgs/trunk/; revision=14290
 2009-03-01 21:34:39 +00:00
Lluís Batlle i Rossell 247ad8bfcf Adding LUKS cryptsetup for the devicemapper. 
svn path=/nixpkgs/trunk/; revision=14289
 2009-03-01 11:11:21 +00:00
Armijn Hemel 67cbb2c3fb update to 0.13.0 
svn path=/nixpkgs/trunk/; revision=14288
 2009-03-01 00:48:25 +00:00
Nicolas Pierron e18a10d0ae * Refactor mkIf to extract the concept of properties. 
Properties can be delay on any attribute set and have
functions which are used to define the semantic of each
property.

* Introduce the mkOverride property.

svn path=/nixpkgs/trunk/; revision=14285
 2009-02-28 18:21:25 +00:00
Eelco Dolstra 02b2540b15 svn path=/nixpkgs/trunk/; revision=14284 2009-02-27 16:25:27 +00:00
Eelco Dolstra 30d188f92d * Graphviz 2.20.3. 
svn path=/nixpkgs/trunk/; revision=14281
 2009-02-27 15:36:14 +00:00
Peter Simons c7e3110299 Use $NIXPKGS_CONFIG to determine whether ghostscript has cups support. 
svn path=/nixpkgs/trunk/; revision=14275
 2009-02-27 13:44:31 +00:00
Eelco Dolstra 0175270bf9 * Wine 1.1.15. 
svn path=/nixpkgs/trunk/; revision=14273
 2009-02-27 12:52:55 +00:00
Michael Raskin 9d06868cda Updated Lazarus 
svn path=/nixpkgs/trunk/; revision=14263
 2009-02-26 15:49:55 +00:00
Pjotr Prins 17e2100b03 Updated PAML package to 4.2a 
svn path=/nixpkgs/trunk/; revision=14262
 2009-02-26 15:22:13 +00:00
Michael Raskin d6682c9514 Updated FPC. Patch partially by Felix Breuer 
svn path=/nixpkgs/trunk/; revision=14261
 2009-02-26 15:14:17 +00:00
Marc Weber 6a1ecaee94 added tightvnc note about solving connecting trouble 
svn path=/nixpkgs/trunk/; revision=14260
 2009-02-26 13:16:25 +00:00
Peter Simons 9cab85dd63 git: updated from 1.6.0.4 to 1.6.1.3 
svn path=/nixpkgs/trunk/; revision=14259
 2009-02-26 10:54:52 +00:00
Peter Simons 6febac4529 git.el: added fill-paragraph patch 
The patch makes Emacs recognize "--- log message follows this line ---"
as a paragraph separator. It's going to be part of the distribution in
the foreseeable future.

svn path=/nixpkgs/trunk/; revision=14258
 2009-02-26 10:54:44 +00:00
Ludovic Courtès 5ee528446d Build GNU Zile. 
svn path=/nixpkgs/trunk/; revision=14257
 2009-02-26 09:57:48 +00:00
Ludovic Courtès 9aabbea00e Build portmap' and nfs-utils'. 
svn path=/nixpkgs/trunk/; revision=14256
 2009-02-26 09:57:27 +00:00
Ludovic Courtès e221d7ce61 TCP Wrappers: Use the Debian patches. 
It has the following side effects (among others):

  * Fix compilation on x86_64.  We now only install the shared
    library and one of the Debian patches makes sure its objects
    are compiled with `-fPIC'.

  * Provide IPv6 support.

  * Fix man pages.

  * Fix `linux' makefile target.


svn path=/nixpkgs/trunk/; revision=14255
 2009-02-26 09:53:31 +00:00
Lluís Batlle i Rossell a54392bc53 Adding nylon. 
svn path=/nixpkgs/trunk/; revision=14254
 2009-02-25 23:21:44 +00:00
Lluís Batlle i Rossell 17abbe36d4 Adding remind and netpbm (maybe without all possible programs). 
I agree the netpbm installation script is quite ugly, but I left a comment there.

svn path=/nixpkgs/trunk/; revision=14253
 2009-02-25 22:44:08 +00:00
Marc Weber daf2cd23dc gpm updated to version 1.20.6 so it compiles on x86_64 
svn path=/nixpkgs/trunk/; revision=14252
 2009-02-25 21:17:25 +00:00
Ludovic Courtès 38dd615de3 CEDET: Fix installation. 
svn path=/nixpkgs/trunk/; revision=14250
 2009-02-25 21:12:13 +00:00
Ludovic Courtès 8fba10c951 Add GNU Zile, a tiny Emacs clone. 
svn path=/nixpkgs/trunk/; revision=14249
 2009-02-25 20:24:18 +00:00
Ludovic Courtès 820ee6e61b G-Wrap 1.9.12. 
svn path=/nixpkgs/trunk/; revision=14248
 2009-02-25 16:57:41 +00:00
Sander van der Burg 3a1c208a69 Added pycups,desktop_file_utils,system_config_printer packages and added python kdebindings closure 
svn path=/nixpkgs/trunk/; revision=14246
 2009-02-25 16:05:13 +00:00
Ludovic Courtès 44ecf2a4b0 Build CEDET. 
svn path=/nixpkgs/trunk/; revision=14241
 2009-02-25 14:31:22 +00:00
Ludovic Courtès a7cf0b2f02 Add CEDET, the umbrella project for Semantic and EIEIO. 
svn path=/nixpkgs/trunk/; revision=14240
 2009-02-25 14:30:50 +00:00
Marc Weber c0dd6fd3c9 telling gnu id utils that .nix files should be treated as text 
svn path=/nixpkgs/trunk/; revision=14237
 2009-02-25 04:53:06 +00:00
Marc Weber 312c697fef added tig (git console browser) 
svn path=/nixpkgs/trunk/; revision=14236
 2009-02-24 22:00:35 +00:00
Michael Raskin edfe20b2ac Fixes implemented inside kqemu expression 
svn path=/nixpkgs/trunk/; revision=14234
 2009-02-24 21:17:54 +00:00
Michael Raskin 8bf73286a4 add eqStrings back.. 
svn path=/nixpkgs/trunk/; revision=14228
 2009-02-24 16:19:08 +00:00
Sander van der Burg cb40899b8d Fixed compilation bug of kdepim with qgpgme 
svn path=/nixpkgs/trunk/; revision=14226
 2009-02-24 13:40:11 +00:00
Sander van der Burg 02aa7e7d96 Fixed gpgme detection of kdepimlibs 
svn path=/nixpkgs/trunk/; revision=14224
 2009-02-24 13:00:26 +00:00
Michael Raskin 8f51ff86fd Qemu SVN head.. 
svn path=/nixpkgs/trunk/; revision=14222
 2009-02-24 12:22:15 +00:00
Sander van der Burg e8a25c32bc Added KDE 4.2 plasma addons package to buildfarm 
svn path=/nixpkgs/trunk/; revision=14221
 2009-02-24 12:17:44 +00:00
Sander van der Burg f056ebe614 Added KDE 4.2 plasma addons package 
svn path=/nixpkgs/trunk/; revision=14220
 2009-02-24 12:16:53 +00:00
Eelco Dolstra a8b75358b3 svn path=/nixpkgs/trunk/; revision=14219 2009-02-24 12:14:48 +00:00
Eelco Dolstra 7782a3189e * Added Debian 5.0 (Lenny). Added the "login" package to the base 
image, otherwise the post-installs script of the "passwd" package
  will fail because /etc/login.defs is missing.  This also fixes the
  Ubuntu 8.10 image generation, woohoo!

svn path=/nixpkgs/trunk/; revision=14217
 2009-02-24 10:56:42 +00:00
Eelco Dolstra 370e545be5 svn path=/nixpkgs/trunk/; revision=14216 2009-02-24 10:29:54 +00:00
Michael Raskin 958a01ffa6 These changes to kernel builder are obviously needed. kQemu is built, but causes kernel oops 
svn path=/nixpkgs/trunk/; revision=14213
 2009-02-24 05:10:36 +00:00
Sander van der Burg 1dba159995 Added KDE 4.2 network, pim packages to the buildfarm 
svn path=/nixpkgs/trunk/; revision=14212
 2009-02-23 23:10:44 +00:00
Sander van der Burg 9b24c0a5e8 Implemented fixes to the KDE 4.2 network and pim packages 
svn path=/nixpkgs/trunk/; revision=14211
 2009-02-23 22:26:58 +00:00
Ludovic Courtès 160b00c8b4 GNU Emacs 23.x: D-Bus support. 
svn path=/nixpkgs/trunk/; revision=14207
 2009-02-23 16:06:59 +00:00
Sander van der Burg 17dc18fd56 Added libmsn package 
svn path=/nixpkgs/trunk/; revision=14206
 2009-02-23 15:30:07 +00:00
Eelco Dolstra 7c45744373 * Urhg. Dpkg releases tend to just disappear... 
svn path=/nixpkgs/trunk/; revision=14203
 2009-02-23 11:53:31 +00:00
Eelco Dolstra dab3b03a14 * Debian 4.0r7. 
svn path=/nixpkgs/trunk/; revision=14202
 2009-02-23 10:58:48 +00:00
Lluís Batlle i Rossell 098d9937a2 Adding a license tag for fmod: "unfree", as advised by Ludo. 
svn path=/nixpkgs/trunk/; revision=14197
 2009-02-22 23:15:01 +00:00
Lluís Batlle i Rossell 5b3759c30d Adding zdoom. 
svn path=/nixpkgs/trunk/; revision=14194
 2009-02-22 22:06:34 +00:00
Lluís Batlle i Rossell 9ab8cb9ec1 Adding fmod. 
svn path=/nixpkgs/trunk/; revision=14193
 2009-02-22 22:06:20 +00:00
Lluís Batlle i Rossell f9b79d752a Fixing in general the module construction (there were wrong paths in modules/build). Now kqemu works well for me, for instance. I will take the commit back, if it annoys anyone. 
svn path=/nixpkgs/trunk/; revision=14192
 2009-02-22 20:49:35 +00:00
Ludovic Courtès 5c3c2d9860 Poppler: Disable test suite when `qt4Support' is true. 
svn path=/nixpkgs/trunk/; revision=14155
 2009-02-21 21:53:50 +00:00
Ludovic Courtès 5e508b5753 Poppler data 0.2.1. 
svn path=/nixpkgs/trunk/; revision=14154
 2009-02-21 20:35:55 +00:00
Michael Raskin b5b6c12d56 All-packages.nix updates.. 
svn path=/nixpkgs/trunk/; revision=14153
 2009-02-21 18:59:15 +00:00