3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

5227 commits

Author SHA1 Message Date
Eelco Dolstra 6dbbd93d03 * Allow packages to be overriden globally via the `packageOverrides'
configuration option.  For instance, to override GCC globally for
  all of Nixpkgs, you can put the following in ~/.nixpkgs/config.nix:

  {
    packageOverrides = pkgs: {
      gcc = pkgs.gcc41;
    }
  }

  This should make a lot of configuration support in Nixpkgs
  unnecessary, like selectVersion and many little-used configuration
  options.

  It also provides a somewhat convenient place to put custom,
  private additions to Nixpkgs, e.g.

  {
    packageOverrides = pkgs: {
      myHello = pkgs.stdenv.mkDerivation {
        name = "my-hello-0.1";
        buildCommand = ...;
      };
    };
  };

  Note that this requires Nix >= 0.12pre12726.

* Removed the `myPackages' option `packageOverrides' obsoletes it.

svn path=/nixpkgs/trunk/; revision=12727
2008-08-26 15:35:00 +00:00
Eelco Dolstra 698328c2af svn path=/nixpkgs/trunk/; revision=12724 2008-08-26 13:27:50 +00:00
Peter Simons f6374fbc5b Add recent versions of the Haskell libraries HTTP, HaXml, haxr, and haxr-th. Unfortunately, the latter library doesn't build successfully because of the following error:
Setup: ../LICENSE: copyFile: does not exist (No such file or directory)

I'm not sure where this comes from. Also, it seems that passing haxr-th the
library haxr as a build input doesn't suffice; it also needs to be passed the
libraries that haxr depends on to configure successfully. Something isn't
right. Andreas, do you know how to fix this?

svn path=/nixpkgs/trunk/; revision=12722
2008-08-26 12:50:03 +00:00
Eelco Dolstra 5b732a061f * QEMU_SMBD_COMMAND is gone.
svn path=/nixpkgs/trunk/; revision=12719
2008-08-26 11:39:10 +00:00
Eelco Dolstra f69b6b4d49 * Remove the QEMU_SMBD_COMMAND environment variable. Instead use
"smbd" from $PATH.

svn path=/nixpkgs/trunk/; revision=12718
2008-08-26 11:28:13 +00:00
Eelco Dolstra 73a050a804 * Create the smbd temporary directory properly (don't fail if it
already exists, but just try another name).  Should send this
  upstream...

svn path=/nixpkgs/trunk/; revision=12717
2008-08-26 11:16:41 +00:00
Eelco Dolstra bb45f8360f * Samba 3.0.32.
svn path=/nixpkgs/trunk/; revision=12716
2008-08-26 11:10:10 +00:00
Ludovic Courtès 74d72ee6bf Cscope: Fix erroneous substitution that caused Cscope to depend on all
of stdenv.

svn path=/nixpkgs/trunk/; revision=12714
2008-08-25 19:34:14 +00:00
Michael Raskin 988a1f1ef3 One more bison inheritance fix
svn path=/nixpkgs/trunk/; revision=12713
2008-08-25 17:55:09 +00:00
Ludovic Courtès 956a4e1ed2 Add Cscope, a C code browser.
svn path=/nixpkgs/trunk/; revision=12711
2008-08-25 15:34:14 +00:00
Eelco Dolstra e33f6df6fa * Test whether "libcursesw" actually exists before symlinking to it.
(Does it ever exist?)

svn path=/nixpkgs/trunk/; revision=12710
2008-08-25 15:29:04 +00:00
Eelco Dolstra 3d6376be35 * nix.cs.uu.nl -> nixos.org.
svn path=/nixpkgs/trunk/; revision=12709
2008-08-25 15:00:29 +00:00
Michael Raskin dbce08a664 Minor fix of "inherit"s.
svn path=/nixpkgs/trunk/; revision=12708
2008-08-25 14:52:53 +00:00
Peter Simons 2d7a15266f bison: use version 2.3 by default (the latest)
svn path=/nixpkgs/trunk/; revision=12703
2008-08-25 13:25:07 +00:00
Peter Simons 0ee3317bc5 boost: added version 1.36.0
Also added support for expat library (used by the graph library). This package
should probably be built on the compile farm because it takes quite a while to
complete, even on a fast machine. Having pre-built binaries would be very nice.

svn path=/nixpkgs/trunk/; revision=12702
2008-08-25 10:00:46 +00:00
Peter Simons 4dba81501f replace: makeFlags is an array
svn path=/nixpkgs/trunk/; revision=12701
2008-08-25 10:00:17 +00:00
Ludovic Courtès eddce10d13 Add GNUnet, GNU's anonymous peer-to-peer communication framework.
svn path=/nixpkgs/trunk/; revision=12699
2008-08-24 18:48:09 +00:00
Armijn Hemel a5deaa8e07 update to 2.4.7, python problems are still there
svn path=/nixpkgs/trunk/; revision=12698
2008-08-23 08:47:14 +00:00
Ludovic Courtès 396ef44630 Git 1.6.0.
svn path=/nixpkgs/trunk/; revision=12697
2008-08-22 21:35:25 +00:00
Ludovic Courtès 3328fd9d3d Add Sparse, a static analysis tool for C.
svn path=/nixpkgs/trunk/; revision=12696
2008-08-22 18:33:52 +00:00
Eelco Dolstra eebb241519 * Write the list of mirrors to a file that we can reuse between
fetchurl instantiations, instead of passing the mirrors to fetchurl
  instantiations via environment variables.  This makes the resulting
  store derivations (.drv files) much smaller, which in turn makes
  nix-env/nix-instantiate faster (4.8 -> 4.2 seconds on nix-env -qa
  --out-path).

svn path=/nixpkgs/trunk/; revision=12695
2008-08-22 15:53:21 +00:00
Eelco Dolstra 4457e49a90 * Linux 2.6.25.16.
svn path=/nixpkgs/trunk/; revision=12693
2008-08-22 12:25:51 +00:00
Michael Raskin 75f1995c0e Atheros update..
svn path=/nixpkgs/trunk/; revision=12692
2008-08-22 12:10:04 +00:00
Eelco Dolstra eb63b86c6d * Doh doh doh! Use the right config file for the 2.6.26 kernel.
svn path=/nixpkgs/trunk/; revision=12690
2008-08-22 10:55:00 +00:00
Eelco Dolstra f27856e3fa * KVM 73.
svn path=/nixpkgs/trunk/; revision=12689
2008-08-22 10:51:37 +00:00
Marc Weber 3091c81082 tm (terminal mixer), ts (task spooler) added, provided by viric
svn path=/nixpkgs/trunk/; revision=12688
2008-08-21 21:35:14 +00:00
Marc Weber 01979f7940 add window-manager dwm contributed by viric
svn path=/nixpkgs/trunk/; revision=12687
2008-08-21 20:44:08 +00:00
Marc Weber 2d354aa6f1 added ngspice
svn path=/nixpkgs/trunk/; revision=12686
2008-08-21 20:43:53 +00:00
Marc Weber a98da2c748 rename devEnvs -> myPackgages in all-packages.nix
The usage is not tight to devEnvs, you can add arbitrary
packages to .nixpkgs/config.nix this way

svn path=/nixpkgs/trunk/; revision=12685
2008-08-21 20:43:37 +00:00
Ludovic Courtès 4162dfe9c5 EMMS: Default to the libtag info back-end for MP3s.
svn path=/nixpkgs/trunk/; revision=12683
2008-08-21 14:56:57 +00:00
Marc Weber e75a56c88e updated repo versions of ghc cabal and http package
svn path=/nixpkgs/trunk/; revision=12682
2008-08-21 11:07:58 +00:00
Marc Weber fa321143d1 bleeding edge repos: only use local tar.gz files when enabled by custom config
svn path=/nixpkgs/trunk/; revision=12681
2008-08-21 11:07:52 +00:00
Marc Weber c4270fb9b8 moved hasktags to ghc68executables, updated url to new location
svn path=/nixpkgs/trunk/; revision=12680
2008-08-21 11:07:44 +00:00
Marc Weber 0686eecf4f slsnif-0.4.4 added
svn path=/nixpkgs/trunk/; revision=12679
2008-08-21 11:07:29 +00:00
Marc Weber d4cf308de6 haxml_darcs updated (it can now parse xhtml dtd)
svn path=/nixpkgs/trunk/; revision=12678
2008-08-21 11:07:16 +00:00
Ludovic Courtès d9bacf89d2 Build EMMS, mpg321 and Vorbis Tools.
svn path=/nixpkgs/trunk/; revision=12676
2008-08-21 09:37:04 +00:00
Ludovic Courtès d4e5ed0596 Add EMMS, the Emacs Multimedia System.
svn path=/nixpkgs/trunk/; revision=12675
2008-08-21 08:58:51 +00:00
Eelco Dolstra 16d317e709 * Linux 2.6.26.3.
svn path=/nixpkgs/trunk/; revision=12674
2008-08-21 08:33:46 +00:00
Eelco Dolstra 6315177c7f * wis-go7007: updated for Linux 2.6.26.
svn path=/nixpkgs/trunk/; revision=12673
2008-08-21 07:43:38 +00:00
Michael Raskin f972b13ac5 A paranoia-induced refactoring, a cleanup of buildInputs bypass in font-related part, fix for builderDefsPackage for cleaner overrides.
svn path=/nixpkgs/trunk/; revision=12671
2008-08-20 11:30:06 +00:00
Michael Raskin a84989091f Refactoring to work with refactored builderDefs
svn path=/nixpkgs/trunk/; revision=12670
2008-08-20 11:21:58 +00:00
Michael Raskin 8ad11e65a7 Version bump
svn path=/nixpkgs/trunk/; revision=12669
2008-08-20 11:21:15 +00:00
Michael Raskin d7acaeb096 Refactorings and removing hard-coded assumptions
svn path=/nixpkgs/trunk/; revision=12668
2008-08-20 11:20:32 +00:00
Michael Raskin a921f752b8 Saner tracing of booleans
svn path=/nixpkgs/trunk/; revision=12667
2008-08-20 08:41:53 +00:00
Michael Raskin ff0d85fdc8 Added traceMarked; it is traceWhatis with the extra (first) argument to distinguish the output of that exat statement.
svn path=/nixpkgs/trunk/; revision=12666
2008-08-20 08:21:54 +00:00
Michael Raskin a8da119da4 Silly mistake fixed
svn path=/nixpkgs/trunk/; revision=12665
2008-08-20 07:17:55 +00:00
Michael Raskin 97e15cc2b8 Noticed an associativity direction problem
svn path=/nixpkgs/trunk/; revision=12664
2008-08-20 06:45:14 +00:00
Michael Raskin 69e4f17372 Added null recognition to whatis
svn path=/nixpkgs/trunk/; revision=12663
2008-08-20 04:34:28 +00:00
Marc Weber 9d181d621f updated nixRepositoryManager
now you can use specify another source file for testing in a nix way

svn path=/nixpkgs/trunk/; revision=12662
2008-08-19 13:31:52 +00:00
Eelco Dolstra 1acf5fa9f0 * Make Valgrind's default suppressions useful for Nix-compiled
programs (e.g. a rule should match any libc.so, not just
  /lib/libc.so).

svn path=/nixpkgs/trunk/; revision=12661
2008-08-19 13:03:08 +00:00
Marc Weber 57d4d2d830 redland libxml2 missing fix
svn path=/nixpkgs/trunk/; revision=12659
2008-08-19 12:36:13 +00:00
Marc Weber 9075ea2218 moved nix-repository-manager to add additional feature automatically updating given bleeding-edge-fetch-infos.nix
svn path=/nixpkgs/trunk/; revision=12658
2008-08-19 12:36:00 +00:00
Michael Raskin 87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
2008-08-19 05:54:09 +00:00
Sander van der Burg b5b68ce414 Upgrade to newer version
svn path=/nixpkgs/trunk/; revision=12654
2008-08-18 21:05:32 +00:00
Marc Weber fea2f910e5 snd shows it's help in firefox now
svn path=/nixpkgs/trunk/; revision=12651
2008-08-18 16:03:38 +00:00
Marc Weber 9a0fc0863b added qjackctl
svn path=/nixpkgs/trunk/; revision=12650
2008-08-18 16:03:21 +00:00
Marc Weber ba6c703918 jackaudio connection kit (jackd) is back
svn path=/nixpkgs/trunk/; revision=12649
2008-08-18 16:03:04 +00:00
Marc Weber 5479dfea93 added beast Sound Engine
svn path=/nixpkgs/trunk/; revision=12647
2008-08-18 10:50:16 +00:00
Marc Weber 6394358c9a fix of cosmetic commit (sry)
svn path=/nixpkgs/trunk/; revision=12646
2008-08-17 07:40:35 +00:00
Marc Weber bab435592b cosmetic var name change
svn path=/nixpkgs/trunk/; revision=12644
2008-08-17 00:06:01 +00:00
Marc Weber 0e9584fe8b fixed x86_64 nvidia hash
svn path=/nixpkgs/trunk/; revision=12643
2008-08-17 00:05:38 +00:00
Michael Raskin 1e33a71c90 A small function not unlike symlinkJoin.
svn path=/nixpkgs/trunk/; revision=12641
2008-08-16 18:48:50 +00:00
Eelco Dolstra 813c7e87f6 * Wine updated to 1.1.2.
svn path=/nixpkgs/trunk/; revision=12638
2008-08-15 21:54:19 +00:00
Eelco Dolstra 77ce75b095 * Disable splashutils on x86_64 for now; it fails to link statically
because of an issue in Glibc (see
  http://bugs.gentoo.org/show_bug.cgi?id=198949).

svn path=/nixpkgs/trunk/; revision=12635
2008-08-15 14:18:11 +00:00
Eelco Dolstra 64c003f97f * Partially reverted r12554: don't build devicemapper and lvm2 with
makeStaticBinaries, because it stubbornly tries to build dynamic
  libraries as well.

svn path=/nixpkgs/trunk/; revision=12633
2008-08-15 14:14:55 +00:00
Eelco Dolstra 8582a0130a * splashutils 1.5.4.2.
svn path=/nixpkgs/trunk/; revision=12632
2008-08-15 12:05:20 +00:00
Eelco Dolstra 85897fa31a * iptables updated to 1.4.1.1.
svn path=/nixpkgs/trunk/; revision=12630
2008-08-15 09:49:43 +00:00
Michael Raskin a031f1cbf0 Trying to fix OO.o 2.4.1
svn path=/nixpkgs/trunk/; revision=12629
2008-08-15 07:28:53 +00:00
Michael Raskin 65ce0411d8 Make all-packages.nix instantiatable again (problem was with *Base packages that were only supposed as .meta.function carriers, so some critical arguments were omitted)
svn path=/nixpkgs/trunk/; revision=12628
2008-08-14 22:18:44 +00:00
Michael Raskin 99c46f200c Forgot to make composedArgsAndFun support function overrides in addition to attrSet-merging ones.
svn path=/nixpkgs/trunk/; revision=12627
2008-08-14 22:12:50 +00:00
Michael Raskin f1f9e38e94 Big breaking change. I have radically reduced number of nulls used in all-packages.nix and generally switched to composedArgsAndFun which simply adds .meta.function to everything that has come through it.. I have not tested the build, because OO.o has to be updated...
svn path=/nixpkgs/trunk/; revision=12625
2008-08-14 22:04:30 +00:00
Ludovic Courtès a8b28c34af Try out expression for OpenOffice.org 2.4.1.
Warning: I have *not* built it locally, so the main purpose is
to run the whole build on the build farm, hoping it won't fail.
Feel free to fix or revert if it does.

svn path=/nixpkgs/trunk/; revision=12622
2008-08-14 15:09:41 +00:00
Pjotr Prins 48d8e0779c Fixed Ruby download path, new version 1.8.7-p72
svn path=/nixpkgs/trunk/; revision=12618
2008-08-14 11:47:51 +00:00
Michael Raskin 61b285d660 Added xnee utility for X11 action recording
svn path=/nixpkgs/trunk/; revision=12612
2008-08-14 09:25:26 +00:00
Ludovic Courtès 2f5212ef5a Add KeyJnote, a nifty presentation tool.
svn path=/nixpkgs/trunk/; revision=12610
2008-08-13 09:15:14 +00:00
Ludovic Courtès 25e77977b9 PyOpenGL: Propagate build inputs that need it.
svn path=/nixpkgs/trunk/; revision=12609
2008-08-13 09:10:11 +00:00
Eelco Dolstra e35ac23ac8 * Disable splashutils, need to investigate...
svn path=/nixpkgs/trunk/; revision=12608
2008-08-13 08:08:21 +00:00
Eelco Dolstra 60e10c5f5a svn path=/nixpkgs/trunk/; revision=12607 2008-08-13 07:06:57 +00:00
Eelco Dolstra 7493ae8010 * Added convertlit, a tool for converting Microsoft Reader ebooks,
plus its dependency libtommath.

svn path=/nixpkgs/trunk/; revision=12606
2008-08-12 19:57:35 +00:00
Eelco Dolstra 8db29f5628 * Grmbl grmbl.
svn path=/nixpkgs/trunk/; revision=12605
2008-08-12 19:27:23 +00:00
Eelco Dolstra f6a55ce2ff * Don't build iwlwifi for Linux 2.6.{25,26}.
svn path=/nixpkgs/trunk/; revision=12604
2008-08-12 18:10:11 +00:00
Ludovic Courtès b5f9171704 Build Xpdf.
svn path=/nixpkgs/trunk/; revision=12603
2008-08-12 16:08:50 +00:00
Sander van der Burg 21cc160792 Another update to a new revision
svn path=/nixpkgs/trunk/; revision=12602
2008-08-12 15:56:49 +00:00
Ludovic Courtès 135147ca6c Fix invocation of the PIL expression.
svn path=/nixpkgs/trunk/; revision=12600
2008-08-12 15:43:36 +00:00
Ludovic Courtès cf56d20b0d Remove duplicate expression for PIL (Python Imaging Library).
svn path=/nixpkgs/trunk/; revision=12599
2008-08-12 15:42:21 +00:00
Ludovic Courtès 61c0f30155 Add PyOpenGL.
svn path=/nixpkgs/trunk/; revision=12598
2008-08-12 15:40:01 +00:00
Ludovic Courtès 9c161c21e7 Add PIL, the Python Imaging Library.
svn path=/nixpkgs/trunk/; revision=12597
2008-08-12 15:10:53 +00:00
Sander van der Burg 7bb4aae65f Updated to later revision
svn path=/nixpkgs/trunk/; revision=12595
2008-08-12 13:09:14 +00:00
Eelco Dolstra c920af8a7f * Include the kernel packages in the channel.
svn path=/nixpkgs/trunk/; revision=12593
2008-08-12 12:55:52 +00:00
Sander van der Burg 66b7b8c6d8 Small disnix bugfix
svn path=/nixpkgs/trunk/; revision=12592
2008-08-12 12:03:35 +00:00
Sander van der Burg 92c6c54cdc Updated to newer version of disnix
svn path=/nixpkgs/trunk/; revision=12591
2008-08-12 11:25:46 +00:00
Sander van der Burg a65819332f Also install the Nix expressions
svn path=/nixpkgs/trunk/; revision=12587
2008-08-11 21:09:43 +00:00
Eelco Dolstra 73eaeefcfd * Linux 2.6.25.15.
svn path=/nixpkgs/trunk/; revision=12583
2008-08-11 12:01:55 +00:00
Eelco Dolstra b65d095ad7 * module-init-tools updated to 3.4.
svn path=/nixpkgs/trunk/; revision=12581
2008-08-11 11:31:57 +00:00
Eelco Dolstra 3a057ce066 * Build Linux 2.6.{23,25,26} in the build farm.
svn path=/nixpkgs/trunk/; revision=12580
2008-08-11 11:28:53 +00:00
Eelco Dolstra 9858c56592 * sshfs updated to 2.1.
svn path=/nixpkgs/trunk/; revision=12579
2008-08-11 09:39:14 +00:00
Eelco Dolstra 1fcc348a01 * Disable scsi_id on udev/klibc for now, as it doesn't compile on
Linux 2.6.26.

svn path=/nixpkgs/trunk/; revision=12578
2008-08-11 09:38:22 +00:00
Sander van der Burg ac3582350e Updated DisnixService to new revision
svn path=/nixpkgs/trunk/; revision=12577
2008-08-10 20:07:53 +00:00
Armijn Hemel e60a0c2591 7.1 -> 7.2
svn path=/nixpkgs/trunk/; revision=12573
2008-08-10 15:05:08 +00:00
Marc Weber 0589d47760 added compatibility patch making reiserfsck ignore -v flag
svn path=/nixpkgs/trunk/; revision=12571
2008-08-10 12:41:53 +00:00
Michael Raskin 6bfd25923d Made possible stumpwm debug run now - install lisp sources, too
svn path=/nixpkgs/trunk/; revision=12567
2008-08-09 22:10:46 +00:00
Michael Raskin eb50dd2c0d Added StumpWM
svn path=/nixpkgs/trunk/; revision=12566
2008-08-09 20:21:33 +00:00
Michael Raskin 83509605b3 Added possibility to change klibc version
svn path=/nixpkgs/trunk/; revision=12563
2008-08-09 08:40:37 +00:00
Michael Raskin abe260b6c5 Now CLisp builds with full CLX (XShape included)
svn path=/nixpkgs/trunk/; revision=12559
2008-08-08 22:37:37 +00:00
Eelco Dolstra 537fa9185a * Some awful hackery to get volume_id to build with klibc. We'll need
it for mounting by label in the initrd.

svn path=/nixpkgs/trunk/; revision=12558
2008-08-08 19:54:48 +00:00
Eelco Dolstra a9d19f45db * A function `useKlibc' to build a package using klibc as the C
library.
* Removed devicemapperStatic, e2fsprogsDiet, lvm2Static since they're
  redundant (it's what you get when you use pkgsDiet/pkgsStatic).

svn path=/nixpkgs/trunk/; revision=12554
2008-08-08 19:05:32 +00:00
Sander van der Burg e920df26c6 Added two useful packages that I don't want to compile over and over again
svn path=/nixpkgs/trunk/; revision=12543
2008-08-08 14:36:51 +00:00
Eelco Dolstra 3dc0ad3aa9 * KVM no longer needs GCC 3.4.
svn path=/nixpkgs/trunk/; revision=12542
2008-08-08 11:53:01 +00:00
Eelco Dolstra d4f7a93f31 * KVM 72, plus stable 2.6.26 kernel headers (needed for KVM).
svn path=/nixpkgs/trunk/; revision=12541
2008-08-08 11:49:06 +00:00
Michael Raskin aaba3d2440 Added lincity - a city simulation. And if I build houses, I build houses here.
svn path=/nixpkgs/trunk/; revision=12539
2008-08-08 07:16:34 +00:00
Marc Weber 8302b6ba69 some fixes for bash completion (git, darcs) (-> etc/bash_completion.d/*)
svn path=/nixpkgs/trunk/; revision=12538
2008-08-07 17:30:35 +00:00
Eelco Dolstra 5030b79f44 * NVIDIA driver updated to 173.14.12.
svn path=/nixpkgs/trunk/; revision=12537
2008-08-07 16:47:08 +00:00
Eelco Dolstra ee17d755ca * Zabbix updated to 1.4.6.
svn path=/nixpkgs/trunk/; revision=12536
2008-08-07 15:05:52 +00:00
Pjotr Prins 07595b0397 Introduced biolib package
svn path=/nixpkgs/trunk/; revision=12535
2008-08-07 15:01:21 +00:00
Eelco Dolstra 9d0b7c4aa9 * Linux 2.6.26.2. Totally untested of course.
svn path=/nixpkgs/trunk/; revision=12534
2008-08-07 14:57:10 +00:00
Eelco Dolstra 6e8d8a1614 * sysstat 8.0.4.1.
svn path=/nixpkgs/trunk/; revision=12533
2008-08-07 11:15:11 +00:00
Pjotr Prins f222b38f00 Added rightly named package gfortran and updated gcc version for compiling gfortran
r-lang debends on gfortran


svn path=/nixpkgs/trunk/; revision=12529
2008-08-07 08:33:03 +00:00
Eelco Dolstra 590ba6453e * GCC 3.3.x doesn't build on x86_64.
svn path=/nixpkgs/trunk/; revision=12528
2008-08-07 08:01:22 +00:00
Marc Weber 468c075ecc added storable vector
svn path=/nixpkgs/trunk/; revision=12527
2008-08-06 21:21:54 +00:00
Marc Weber 9e55727832 Added:
* dmenu
* gftp
* micropolis
* byacc as a build-time dependency for micropolis
contributed by baldo <baldo@quimby.lan>

svn path=/nixpkgs/trunk/; revision=12526
2008-08-06 20:39:01 +00:00
Nicolas Pierron 692c5a62a4 Use "abort" instead of "throw" when option values cannot be merged.
Fix mergeListOption.
Add error support in mergeEnableOption.

svn path=/nixpkgs/trunk/; revision=12522
2008-08-06 19:24:36 +00:00
Nicolas Pierron 0ce4cafd88 * Do not always use the current result as argument.
* "filterOptionSets" returns the only option per attribute instead of a list of options.

svn path=/nixpkgs/trunk/; revision=12520
2008-08-06 18:34:11 +00:00
Marc Weber ec717200c8 ghc68extralibraries: tidied up, no longer many small files, nicer indentation (at least same level now)
svn path=/nixpkgs/trunk/; revision=12517
2008-08-06 16:56:05 +00:00
Eelco Dolstra decf974c94 * Command for mounting CIFS file systems.
svn path=/nixpkgs/trunk/; revision=12515
2008-08-06 15:43:03 +00:00
Eelco Dolstra 0a884b25f9 * util-linux: added an option to build just mount/umount, and an
option to set the path to the mount helpers programs
  (mount.<fstype>) to something other than /sbin.  Needed in NixOS to
  get the mount command to work for NTFS-3G, CIFS, etc.

svn path=/nixpkgs/trunk/; revision=12514
2008-08-06 15:27:50 +00:00
Sander van der Burg 63b9500b88 Added support for custom context.xml for Tomcat
svn path=/nixpkgs/trunk/; revision=12512
2008-08-06 14:59:45 +00:00
Sander van der Burg c282368077 Some tomcat common lib fixes
svn path=/nixpkgs/trunk/; revision=12510
2008-08-06 13:25:51 +00:00
Marc Weber 7608d6f063 update ghc stuff (hsp is now supported as well except hsp-xml)
svn path=/nixpkgs/trunk/; revision=12509
2008-08-06 11:41:17 +00:00
Marc Weber cc44e2bb54 updated jwm's url as suggested by Saadfuijk Naas <tachermourir@rambler.ru>
svn path=/nixpkgs/trunk/; revision=12508
2008-08-06 09:50:41 +00:00
Michael Raskin e0db29c8f5 Removed 5 offending packages that caused latest build to fail
svn path=/nixpkgs/trunk/; revision=12507
2008-08-05 19:21:05 +00:00
Peter Simons cea5d01592 git-git: change ${name} to reflect that this is not a pristine version
The git-git expression promises to build the current git HEAD, but in
fact it builds git HEAD plus a fairly extensive, undocumented, untested
patch that is apparently not part of the repository. By changing the
name of the installed package to 'git-git-with-glob-patch', we ensure
that users aren't mislead about what exactly they'll get when installing
this package. Technically, GIT-VERSION-FILE should be patched so that
the installed git binaries reflect this change too when called with
'--version', but the current solution is probably good enough.

svn path=/nixpkgs/trunk/; revision=12506
2008-08-05 17:31:13 +00:00
Nicolas Pierron 0e25bb67cf Add a new way to handle option sets.
svn path=/nixpkgs/trunk/; revision=12505
2008-08-05 17:16:35 +00:00
Sander van der Burg 7abbe5889f Added expect
svn path=/nixpkgs/trunk/; revision=12502
2008-08-05 13:44:13 +00:00
Sander van der Burg 90d46bba63 Added GCC 3.3 because it takes ages to compile and some proprietary components depends on libstdc++
svn path=/nixpkgs/trunk/; revision=12501
2008-08-05 13:28:32 +00:00
Michael Raskin 915909ecfa Now build-for-release.nix can be instantiated.
svn path=/nixpkgs/trunk/; revision=12498
2008-08-05 08:37:12 +00:00
Eelco Dolstra d0aa54c8fa * Pan 0.133.
svn path=/nixpkgs/trunk/; revision=12496
2008-08-04 18:00:49 +00:00
Eelco Dolstra f6935cfd98 * Linux 2.6.25.14.
svn path=/nixpkgs/trunk/; revision=12495
2008-08-04 17:54:34 +00:00
Michael Raskin e8cc5fedb0 Fixing build-for-release.nix typo
svn path=/nixpkgs/trunk/; revision=12494
2008-08-04 17:50:23 +00:00
Pjotr Prins b156f58d3e Added R-language to build-for-release
svn path=/nixpkgs/trunk/; revision=12492
2008-08-04 17:02:23 +00:00
Eelco Dolstra 0846ca2e5b * Don't fixup "#! /bin/sh" in Autoconf/Automake/Libtool, otherwise they
will use the "fixed" path in generated files.

svn path=/nixpkgs/trunk/; revision=12485
2008-08-04 14:37:51 +00:00
Eelco Dolstra c62b4b2135 * Add Automake 1.10.x to the channel.
* Fix some incorrect x86_64-linux attributes.

svn path=/nixpkgs/trunk/; revision=12484
2008-08-04 14:07:00 +00:00
Sander van der Burg 6dd7896b4e Added shared JDBC driver support for tomcat
svn path=/nixpkgs/trunk/; revision=12476
2008-08-04 12:04:24 +00:00
Sander van der Burg b23b849ba3 Updated MySQL JDBC driver
svn path=/nixpkgs/trunk/; revision=12475
2008-08-04 11:50:57 +00:00
Pjotr Prins 7b5ab1117d Added two (large) biology builds
svn path=/nixpkgs/trunk/; revision=12471
2008-08-03 21:19:31 +00:00
Michael Raskin c4216c4aba Updated OpenFire
svn path=/nixpkgs/trunk/; revision=12470
2008-08-03 17:08:52 +00:00
Marc Weber 407b3e2e0d added bleeding-edge source info file
svn path=/nixpkgs/trunk/; revision=12469
2008-08-03 17:05:19 +00:00
Marc Weber 43d7fe0cfb Merge branch 'git_patch_glob'
svn path=/nixpkgs/trunk/; revision=12468
2008-08-03 12:23:27 +00:00
Michael Raskin 6458ed36d8 Should repair the buildfarm build: if stdenv does not know it has DietLibc, it does not have it
svn path=/nixpkgs/trunk/; revision=12467
2008-08-03 03:55:27 +00:00
Pjotr Prins bc6b7a3213 Updated Ruby package to support shared libs and pthreads
svn path=/nixpkgs/trunk/; revision=12466
2008-08-02 22:25:54 +00:00
Michael Raskin f10cfdbcc5 Adding xulrunner for Firefox3. Unfortunately, interface updates kill MPlayer plugin anyway
svn path=/nixpkgs/trunk/; revision=12464
2008-08-02 15:14:54 +00:00
Eelco Dolstra eccb86b79b * Udev 125.
svn path=/nixpkgs/trunk/; revision=12457
2008-07-31 14:46:11 +00:00
Andres Löh e53cbfbeae * added Haskell editline library
svn path=/nixpkgs/trunk/; revision=12455
2008-07-31 12:38:09 +00:00
Andres Löh 25fa56e74f * updated the ghc HEAD snapshot
svn path=/nixpkgs/trunk/; revision=12454
2008-07-31 12:36:47 +00:00
Sander van der Burg 2b11bc18f7 Undone seccure commit
svn path=/nixpkgs/trunk/; revision=12451
2008-07-30 13:41:01 +00:00
Sander van der Burg 3bd550f170 Some fixes
svn path=/nixpkgs/trunk/; revision=12450
2008-07-30 13:37:44 +00:00
Sander van der Burg 4f13fdc34d Fixed kile
svn path=/nixpkgs/trunk/; revision=12448
2008-07-30 11:43:47 +00:00
Ludovic Courtès 3b1eea4c83 aMule 2.2.1.
svn path=/nixpkgs/trunk/; revision=12446
2008-07-29 16:52:26 +00:00
Ludovic Courtès 2a5a982ad1 Add Crypto++, a C++ cryptography library.
svn path=/nixpkgs/trunk/; revision=12444
2008-07-29 14:26:03 +00:00
Ludovic Courtès e79ae4bec4 Autobuild: Wrap `abbuild-sourceforge'.
svn path=/nixpkgs/trunk/; revision=12443
2008-07-28 22:54:31 +00:00
Ludovic Courtès 95fb46a440 Add Simon Josefsson's Autobuild tool.
svn path=/nixpkgs/trunk/; revision=12442
2008-07-28 21:29:17 +00:00
Ludovic Courtès 00230d4132 IceCat: Use GNOME VFS and libgnomeui.
svn path=/nixpkgs/trunk/; revision=12441
2008-07-28 20:41:14 +00:00
Ludovic Courtès adec4e74f5 Mozilla MPlayer plug-in 3.55.
svn path=/nixpkgs/trunk/; revision=12440
2008-07-28 16:43:16 +00:00
Ludovic Courtès 6cb7c2fa68 Generalize `firefox-wrapper' so that it can be used for GNU IceCat.
svn path=/nixpkgs/trunk/; revision=12439
2008-07-28 16:25:09 +00:00
Ludovic Courtès b3bc47784c IceCat: Remove useless file.
svn path=/nixpkgs/trunk/; revision=12438
2008-07-28 15:55:51 +00:00
Ludovic Courtès a898666dc4 Add GNU IceCat 3, GNU's free variant of Mozilla Firefox 3.
Currently, MPlayerPlugin can't be built with IceCat 3.

svn path=/nixpkgs/trunk/; revision=12437
2008-07-28 15:55:11 +00:00
Ludovic Courtès b0fb32ef3c Build Evince on the build farm.
svn path=/nixpkgs/trunk/; revision=12436
2008-07-28 10:22:44 +00:00
Eelco Dolstra ec8d941064 * Subversion 1.5.1.
svn path=/nixpkgs/trunk/; revision=12435
2008-07-28 08:14:55 +00:00
Ludovic Courtès 1e63385865 Add Evince, GNOME's document viewer (PS, PDF, DVI, DjVu, TIFF, etc.).
Currently, a few theme icons provided by Evince are not found.  This is
possibly due to the lack of an `index.theme' file under `share/evince/icons',
but there's no rule to make it.

svn path=/nixpkgs/trunk/; revision=12434
2008-07-27 10:24:08 +00:00
Marc Weber 01cbcd94b3 added support for building uml_mconsole
svn path=/nixpkgs/trunk/; revision=12433
2008-07-26 01:02:27 +00:00
Nicolas Pierron 0abfffc0f2 Add pcmcia-utils.
Merge branch 'tmp' into tmp2

svn path=/nixpkgs/trunk/; revision=12432
2008-07-25 15:54:19 +00:00
Nicolas Pierron e2d94c740c Add sysfsutils.
svn path=/nixpkgs/trunk/; revision=12431
2008-07-25 15:53:23 +00:00
Andres Löh 49804a43be * ghc-6.9 should have low priority
svn path=/nixpkgs/trunk/; revision=12430
2008-07-25 14:21:54 +00:00
Eelco Dolstra a2613e936a * Move dvd+rw-tools and cdrkit to tools/cd-dvd.
* Added cdrdao.

svn path=/nixpkgs/trunk/; revision=12426
2008-07-25 13:04:51 +00:00
Eelco Dolstra 8ea9bd1d83 * cdrkit 1.1.8.
svn path=/nixpkgs/trunk/; revision=12425
2008-07-25 12:32:12 +00:00
Eelco Dolstra 0558b3587d * dvd+rw-tools updated to 7.1.
svn path=/nixpkgs/trunk/; revision=12424
2008-07-25 11:31:33 +00:00
Armijn Hemel e664596bf4 1.5.0 -> 1.6.0
svn path=/nixpkgs/trunk/; revision=12423
2008-07-24 22:50:30 +00:00
Eelco Dolstra 3ccb8aeda1 * man-pages 3.05.
svn path=/nixpkgs/trunk/; revision=12422
2008-07-24 15:08:51 +00:00
Eelco Dolstra 874804eb04 * Security fix for CVE-2007-5191.
svn path=/nixpkgs/trunk/; revision=12417
2008-07-24 13:48:23 +00:00
Eelco Dolstra c32f7569dc * ntfs-3g: install sbin/mount.ntfs-3g. Don't pass FUSE as
a dependency (ntfs-3g has its own copy of FUSE).

svn path=/nixpkgs/trunk/; revision=12416
2008-07-24 13:11:02 +00:00
Eelco Dolstra 8f309bc83e * Add a meta attribute.
svn path=/nixpkgs/trunk/; revision=12415
2008-07-24 13:02:22 +00:00
Eelco Dolstra 0d7a514a68 * Use the latest unstable version.
svn path=/nixpkgs/trunk/; revision=12414
2008-07-24 13:02:10 +00:00
Eelco Dolstra a7c209e474 * Interface to support mirror:// in nix-prefetch-url. The function
resolveMirrorURLs produces a file containing the URLs to which a
  mirror:// URL resolves.

svn path=/nixpkgs/trunk/; revision=12410
2008-07-23 16:04:10 +00:00
Eelco Dolstra 839eb46cda * Fix installing the Ghostscript fonts.
svn path=/nixpkgs/trunk/; revision=12408
2008-07-23 14:40:16 +00:00
Eelco Dolstra 32fc747f3e * Tab removal.
svn path=/nixpkgs/trunk/; revision=12405
2008-07-23 13:40:03 +00:00
Eelco Dolstra 39cfcd6929 * clustalw2 removed.
svn path=/nixpkgs/trunk/; revision=12403
2008-07-23 10:39:40 +00:00
Pjotr Prins 2a845ebb7a Removing clustalw2 package - may come back later
svn path=/nixpkgs/trunk/; revision=12400
2008-07-23 08:37:00 +00:00
Pjotr Prins 0014ffcbae Updated emboss package to 6.0.1
svn path=/nixpkgs/trunk/; revision=12399
2008-07-23 08:22:23 +00:00
Marc Weber 60eabad296 install port-helper in /bin so that xterm can find it when its used as terminal for (uml)
svn path=/nixpkgs/trunk/; revision=12394
2008-07-22 15:43:55 +00:00
Andres Löh a52d7b00f3 * missing file from last commit
svn path=/nixpkgs/trunk/; revision=12393
2008-07-22 13:02:11 +00:00
Andres Löh cf7b225cf4 * changed from haddock-2.0.0.0 to haddock-2.1.0
(both only work with ghc-6.8.2, not ghc-6.8.3)
* added haddock-0.9 as a version that compiles with
  nearly all ghc's we have
* added haddock-0.9-boot the works with ghc-6.4.2-boot
* the haddock-0.9-boot is now used to generate library
  documentation while building ghc-6.8.3

svn path=/nixpkgs/trunk/; revision=12392
2008-07-22 13:01:30 +00:00
Andres Löh dd4a4a1dc4 * Added ghc-6.8.3 as the new default version of ghc.
* Added a ghc HEAD snapshot (ghc-6.9.x).

svn path=/nixpkgs/trunk/; revision=12391
2008-07-21 14:43:33 +00:00
Wouter den Breejen 26e6eb0f7f truecrypt
svn path=/nixpkgs/trunk/; revision=12389
2008-07-19 16:14:24 +00:00
Wouter den Breejen c65a64c8c5 Added truecrypt, but it does not compile yet since it's dependency wxWidgets fails to build ...
Maybe someone wants to take a look at it.

--------------------
building wxbuild
Configuring wxWidgets library...
configure: WARNING: libSM not found; disabling session management detection
Building wxWidgets library...
building .pch/wxprec_baselib/wx/wxprec.h.gch
/nix/store/b2gmgy8y6nidjj7n34jx4sanrjdaxrw3-glibc-2.7/lib/crt1.o: In function `_start':
(.text+0x18): undefined reference to `main'
collect2: ld returned 1 exit status
make[1]: *** [.pch/wxprec_baselib/wx/wxprec.h.gch] Error 1
make: *** [wxbuild] Error 2
builder for `/nix/store/2587m38s6cjjpx7mvn85x8z65brf6nps-trueCrypt-6.0a.drv' failed with exit code 2
error: build of `/nix/store/2587m38s6cjjpx7mvn85x8z65brf6nps-trueCrypt-6.0a.drv' failed
--------------------

svn path=/nixpkgs/trunk/; revision=12388
2008-07-19 16:13:48 +00:00
Marc Weber e2a6d56a0d added patchutils
svn path=/nixpkgs/trunk/; revision=12387
2008-07-18 23:36:28 +00:00
Peter Simons a16eebd0a6 Cosmetic, no functional change intended.
This patch moves curly braces to the end of the line, i.e.

  foo = { 
    ...
  };

instead of the previously used style:

  foo = 
  { 
    ...
  };

I commit this change hoping that my contributions to this project now conform
to the rules described in maintainers/docs/coding-conventions.txt so that the
self-appointed indention sheriff of the NixOS community can finally get off my
back and rest assured knowing that all i's are dotted and all t's are crossed.

svn path=/nixpkgs/trunk/; revision=12386
2008-07-18 20:11:25 +00:00
Peter Simons 057bd7c1c2 maude: build of unstable beta version because it has less bugs in full-maude
svn path=/nixpkgs/trunk/; revision=12385
2008-07-18 20:11:12 +00:00
Peter Simons b64e42ce35 added maude beta version
svn path=/nixpkgs/trunk/; revision=12384
2008-07-18 20:11:02 +00:00
Eelco Dolstra 9d741c88bf * Linux 2.6.25.11.
svn path=/nixpkgs/trunk/; revision=12381
2008-07-18 14:53:48 +00:00
Eelco Dolstra 8734e020db * ghostscript: force the use of the -fpic flag, otherwise it doesn't
build on x86_64-linux.

svn path=/nixpkgs/trunk/; revision=12380
2008-07-18 14:52:20 +00:00
Eelco Dolstra f1d9c0a852 * Build Firefox 3 in the channel.
svn path=/nixpkgs/trunk/; revision=12378
2008-07-18 10:41:27 +00:00