* Mark as stable.

svn path=/nixpkgs/branches/0.9-release/; revision=4650

NEWS

@@ -1,20 +0,0 @@
-Nix Packages 0.7
-
-* The bootstrap process for the standard build environment on Linux
-  (stdenv-linux) has been improved.  It is no longer dependent in its
-  initial bootstrap stages on the system Glibc, GCC, and other tools.
-  Rather, Nixpkgs contains a statically linked bash and curl, and uses
-  that to download other statically linked tools.  These are then used
-  to build a Glibc and dynamically linked versions of all other
-  tools.
-
-  This change also makes the bootstrap process faster.  For instance,
-  GCC is built only once, not thrice.
-
-  (Contributed by Armijn Hemel.)
-
-* Many packages have been changed and added, but notably:
-
-  - Qt 3 has been added.
-
-  - Mysql has been added.

STABLE

@@ -1 +1 @@
-0
+1

VERSION

@@ -1 +1 @@
-0.7
+0.9

doc/Makefile

@@ -0,0 +1,27 @@
+ENV = SGML_CATALOG_FILES=$(docbookcatalog)
+
+XMLLINT = $(ENV) xmllint --catalogs
+XSLTPROC = $(ENV) xsltproc --catalogs \
+ --param section.autolabel 1 \
+ --param section.label.includes.component.label 1 \
+ --param html.stylesheet \'style.css\' \
+ --param xref.with.number.and.title 1 \
+ --param toc.section.depth 3
+
+NEWS_OPTS = \
+ --stringparam generate.toc "article nop" \
+ --stringparam section.autolabel.max.depth 0 \
+ --stringparam header.rule 0
+
+all: NEWS.html NEWS.txt
+
+NEWS.html: release-notes.xml
+	$(XSLTPROC) --nonet --xinclude --output $@ $(NEWS_OPTS) \
+	  $(docbookxsl)/html/docbook.xsl release-notes.xml
+
+NEWS.txt: release-notes.xml
+	$(XSLTPROC) --nonet --xinclude quote-literals.xsl release-notes.xml | \
+	  $(XSLTPROC) --nonet --output $@.tmp.html $(NEWS_OPTS) \
+	  $(docbookxsl)/html/docbook.xsl -
+	LANG=en_US w3m -dump $@.tmp.html > $@
+	rm $@.tmp.html

doc/quote-literals.xsl

@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:str="http://exslt.org/strings"
+  extension-element-prefixes="str">
+
+  <xsl:output method="xml"/>
+  
+  <xsl:template match="function|command|literal|varname|filename|option|quote">`<xsl:apply-templates/>'</xsl:template>
+  
+  <xsl:template match="token"><xsl:text>    </xsl:text><xsl:apply-templates /><xsl:text>
+</xsl:text></xsl:template>
+
+  <xsl:template match="screen|programlisting">
+    <screen><xsl:apply-templates select="str:split(., '&#xA;')" /></screen>
+  </xsl:template>
+
+  <xsl:template match="section[following::section]">
+    <section>
+      <xsl:apply-templates />
+      <screen><xsl:text>
+      </xsl:text></screen>        
+    </section>
+  </xsl:template>
+
+  <xsl:template match="*">
+    <xsl:element name="{name(.)}" namespace="{namespace-uri(.)}">
+      <xsl:copy-of select="namespace::*" />
+      <xsl:for-each select="@*">
+	<xsl:attribute name="{name(.)}" namespace="{namespace-uri(.)}">
+	  <xsl:value-of select="."/>
+	</xsl:attribute>
+      </xsl:for-each>
+      <xsl:apply-templates/>
+    </xsl:element>
+  </xsl:template>
+
+</xsl:stylesheet>

doc/release-notes.xml

@@ -0,0 +1,206 @@
+<?xml version="1.0"?>
+<!DOCTYPE book
+    PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+    "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip"
+[
+]>
+
+<article><title>Nixpkgs Release Notes</title>
+
+
+<section><title>Release 0.9 (January 31, 2006)</title>
+
+<para>There have been zillions of changes since the last release of
+Nixpkgs.  Many packages have been added or updated.  The following are
+some of the more notable changes:</para>
+
+<itemizedlist>
+
+  <listitem><para>Distribution files have been moved to <ulink
+  url="http://nix.cs.uu.nl/" />.</para></listitem>
+
+  <listitem><para>The C library on Linux, Glibc, has been updated to
+  version 2.3.6.</para></listitem>
+
+  <listitem><para>The default compiler is now GCC 3.4.5.  GCC 4.0.2 is
+  also available.</para></listitem>
+
+  <listitem><para>The old, unofficial Xlibs has been replaced by the
+  official modularised X11 distribution from X.org, i.e., X11R7.0.
+  X11R7.0 consists of 287 (!) packages, all of which are in Nixpkgs
+  though not all have been tested.  It is now possible to build a
+  working X server (previously we only had X client libraries).  We
+  use a fully Nixified X server on NixOS.</para></listitem>
+
+  <listitem><para>The Sun JDK 5 has been purified, i.e., it doesn't
+  require any non-Nix components such as
+  <filename>/lib/ld-linux.so.2</filename>.  This means that Java
+  applications such as Eclipse and Azureus can run on
+  NixOS.</para></listitem>
+
+  <listitem><para>Hardware-accelerated OpenGL support, used by games
+  like Quake 3 (which is now built from source).</para></listitem>
+
+  <listitem><para>Improved support for FreeBSD on
+  x86.</para></listitem>
+
+  <listitem><para>Improved Haskell support; e.g., the GHC build is now
+  pure.</para></listitem>
+
+  <listitem><para>Some support for cross-compilation: cross-compiling
+  builds of GCC and Binutils, and cross-compiled builds of the C
+  library uClibc.</para></listitem>
+
+  <listitem><para>Notable new packages:
+
+    <itemizedlist>
+
+      <listitem><para>teTeX, including support for building LaTeX
+      documents using Nix (with automatic dependency
+      determination).</para></listitem>
+      
+      <listitem><para>Ruby.</para></listitem>
+
+      <listitem><para>System-level packages to support NixOS,
+      e.g. Grub, GNU <literal>parted</literal> and so
+      on.</para></listitem>
+
+      <listitem><para><literal>ecj</literal>, the Eclipse Compiler for
+      Java, so we finally have a freely distributable compiler that
+      supports Java 5.0.</para></listitem>
+
+      <listitem><para><literal>php</literal>.</para></listitem>
+
+      <listitem><para>The GIMP.</para></listitem>
+
+      <listitem><para>Inkscape.</para></listitem>
+
+      <listitem><para>GAIM.</para></listitem>
+
+      <listitem><para><literal>kdelibs</literal>.  This allows us to
+      add KDE-based packages (such as
+      <literal>kcachegrind</literal>).</para></listitem>
+
+    </itemizedlist>
+
+  </para></listitem>
+
+</itemizedlist>
+
+<para>The following people contributed to this release:
+
+  Andres Löh,
+  Armijn Hemel,
+  Bogdan Dumitriu,
+  Christof Douma,
+  Eelco Dolstra,
+  Eelco Visser,
+  Mart Kolthof,
+  Martin Bravenboer,
+  Rob Vermaas and
+  Roy van den Broek.
+
+</para>
+
+</section>
+
+
+<section><title>Release 0.8 (April 11, 2005)</title>
+
+<para>This release is mostly to remain synchronised with the changed
+hashing scheme in Nix 0.8.</para>
+
+<para>Notable updates:
+
+<itemizedlist>
+
+  <listitem><para>Adobe Reader 7.0</para></listitem>
+
+  <listitem><para>Various security updates (zlib 1.2.2, etc.)</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+</section>
+
+
+<section><title>Release 0.7 (March 14, 2005)</title>
+
+<itemizedlist>
+
+<listitem>
+
+  <para>The bootstrap process for the standard build
+  environment on Linux (stdenv-linux) has been improved.  It is no
+  longer dependent in its initial bootstrap stages on the system
+  Glibc, GCC, and other tools.  Rather, Nixpkgs contains a statically
+  linked bash and curl, and uses that to download other statically
+  linked tools.  These are then used to build a Glibc and dynamically
+  linked versions of all other tools.</para>
+
+  <para>This change also makes the bootstrap process faster.  For
+  instance, GCC is built only once instead of three times.</para>
+
+  <para>(Contributed by Armijn Hemel.)</para>
+
+</listitem>
+
+<listitem>
+
+  <para>Tarballs used by Nixpkgs are now obtained from the same server
+  that hosts Nixpkgs (<ulink url="http://catamaran.labs.cs.uu.nl/" />).
+  This reduces the risk of packages being unbuildable due to moved or
+  deleted files on various servers.</para>
+
+</listitem>
+
+<listitem>
+
+  <para>There now is a generic mechanism for building Perl modules.
+  See the various Perl modules defined in
+  pkgs/system/all-packages-generic.nix.</para>
+
+</listitem>
+
+<listitem>
+
+  <para>Notable new packages:
+
+  <itemizedlist>
+
+    <listitem><para>Qt 3</para></listitem>
+    <listitem><para>MySQL</para></listitem>
+    <listitem><para>MythTV</para></listitem>
+    <listitem><para>Mono</para></listitem>
+    <listitem><para>MonoDevelop (alpha)</para></listitem>
+    <listitem><para>Xine</para></listitem>
+
+  </itemizedlist>
+
+  </para>
+
+</listitem>
+
+<listitem>
+
+  <para>Notable updates:
+
+  <itemizedlist>
+
+    <listitem><para>GCC 3.4.3</para></listitem>
+    <listitem><para>Glibc 2.3.4</para></listitem>
+    <listitem><para>GTK 2.6</para></listitem>
+
+  </itemizedlist>
+
+  </para>
+
+</listitem>
+
+</itemizedlist>
+
+</section>
+
+  
+</article>

doc/style.css

@@ -0,0 +1,234 @@
+/* Copied from http://bakefile.sourceforge.net/, which appears
+   licensed under the GNU GPL. */
+
+
+/***************************************************************************
+                             Basic headers and text:
+ ***************************************************************************/
+
+body
+{
+    font-family: sans-serif;
+    background: white;
+  
+    margin: 2em 1em 2em 1em;
+}
+
+h1,h2,h3
+{
+    color: #005aa0;
+    text-align: left;
+}
+
+h1 /* title */
+{
+    font-size: 200%;
+}
+
+h2 /* chapters, appendices, subtitle */
+{
+    font-size: 180%;
+}
+
+/* Extra space between chapters, appendices. */
+div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 
+{ 
+    margin-top: 1.5em;
+/*    border-top: solid #005aa0; */
+}
+
+div.sect1 h2 /* sections */
+{
+    font-size: 150%;
+}
+
+div.refnamediv h2, div.refsynopsisdiv h2, div.refsection h2 /* refentry parts */
+{
+    font-size: 125%;
+}
+
+div.refsection h3
+{
+    font-size: 110%;
+}
+
+h3 /* subsections */
+{
+    font-size: 125%;
+}
+
+
+
+/***************************************************************************
+                               Program listings:
+ ***************************************************************************/
+
+div.example
+{
+    border: 1px solid #6185a0;
+    padding: 6px 6px;
+    margin-left: 3em;
+    margin-right: 3em;
+    background: #eeeeee;
+}
+
+pre.programlisting
+{
+    color: #600000;
+    font-family: monospace;
+}
+
+
+/***************************************************************************
+                            Screen dumps:
+ ***************************************************************************/
+
+pre.screen
+{
+    border: 1px solid #6185a0;
+    padding: 6px 6px;
+    margin-left: 3em;
+    margin-right: 3em;
+    color: #600000;
+    background: #eeeeee;
+    font-family: monospace;
+    /* font-size: 90%; */
+}
+
+
+/***************************************************************************
+                               Notes, warnings etc:
+ ***************************************************************************/
+
+.note,.warning
+{
+    margin-top: 1em;
+    margin-bottom: 1em;
+    border: 1px solid #6185a0;
+    padding: 0px 1em;
+    background: #fffff5;
+}
+
+div.note,div.warning
+{
+    font-style: italic;
+}
+
+div.warning h3
+{
+    color: red;
+    font-size: 100%;
+}
+
+div.note h3
+{
+    color: blue;
+    font-size: 100%;
+}
+
+div.navfooter *
+{
+    font-size: 90%;
+}
+
+
+/***************************************************************************
+                        Links colors and highlighting: 
+ ***************************************************************************/
+
+a:link { color: #0048b3; }
+a:visited { color: #002a6a; }
+a:hover { background: #ffffcd; }
+
+
+/***************************************************************************
+                              Table of contents:
+ ***************************************************************************/
+
+.toc
+{
+    font-size: 90%;
+}
+
+
+
+/***************************************************************************
+                               Special elements:
+ ***************************************************************************/
+
+tt, code
+{
+    color: #400000;
+}
+
+.term
+{
+    font-weight: bold;
+    
+}
+
+div.variablelist dd
+{
+    margin-bottom: 1em;
+}
+
+.default
+{
+    font-style: italic;
+}
+
+.availability
+{
+    font-style: italic;
+}
+
+.varname
+{
+    color: #400000;
+}
+
+
+div.informaltable table
+{
+  border: 1px solid #6185a0;
+  width: 100%;
+}
+
+div.informaltable td
+{
+  border: 0;
+  padding: 5px;
+}
+
+div.informaltable td.default
+{
+  text-align: right;
+}
+
+div.informaltable th
+{
+  text-align: left;
+  color: #005aa0;
+  border: 0;
+  padding: 5px;
+  background: #fffff5;
+  font-weight: normal;
+  font-style: italic;
+}
+
+td.varname, td.tagname, td.paramname
+{
+  font-weight: bold;
+  vertical-align: top;
+}
+
+div.epigraph
+{
+    font-style: italic;
+    text-align: right;
+}
+
+table.productionset table.productionset
+{
+    font-family: monospace;
+}

maintainers/docs/bugs.txt

@@ -34,4 +34,29 @@ include/X11/IntrinsicP.h:202:25: X11/ObjectP.h: No such file or directory
 (moved to include/X11; should edit include/Makefile.am)
 
 
-* Add "exit 0" at the end of configure of rte package.
+* `ld' on Mac OS X barfs if the timestamp on static libraries has
+  changed (which happens if they are installed through a substitute).
+
+  Typical error:
+
+  /usr/bin/ld: table of contents for archive: libATerm.a is out of
+  date; rerun ranlib(1) (can't load from it)
+
+  Solution: patch ld.
+
+  Non-solution: extend NAR file format to include timestamps.  We
+  don't want that because they introduce a source of non-determinism.
+  To catch problems like this one determistically, we should change
+  the timestamp on store objects to 0.
+
+
+* In gtksourceview-sharp: does the prefix patch cause problems (e.g.,
+  makefile.am says "mimeinfodir should be the same as the gnome
+  prefix")?
+
+
+* fgrep/egrep: these fail if grep is not in the $PATH.
+
+
+* teTeX: some programs (such as epstopdf) depend on /usr/bin/env, and
+  expect perl to be in the environment.

maintainers/docs/classification.txt

@@ -53,6 +53,9 @@ ELSE IF it's a TOOL (or set of):
   ELSE IF it's a COMPRESSION program:
     ./tools/compression
     (e.g., gzip, bzip2)
+  ELSE IF it's a SECURITY program:
+    ./tools/security
+    (e.g., nmap, gnupg)
   ELSE
     ./tools/misc
 
@@ -96,7 +99,7 @@ ELSE IF it's an APPLICATION:
   ELSE
     ./applications/misc
 
-ELSE IF it's DATA (i.e., doe not have a straight-forward executable semantics):
+ELSE IF it's DATA (i.e., does not have a straight-forward executable semantics):
 
   IF it's related to SGML/XML processing:
     IF it's a XML DTD:

maintainers/docs/cross.txt

@@ -0,0 +1,331 @@
+Setting up a cross compiler with Nix
+
+"Cross compilation" means compiling a program on one machine for another
+type of machine. A typical use of cross compilation is to compile programs
+for embedded devices. These devices often don't have the computing power
+and memory to compile programs natively.
+
+For a fully working cross compiler the following are needed:
+
+* cross binutils: assembler, archiver, linker, etcetera that understand
+the format of the target system
+
+* cross compiler: a compiler that can generate binary code and object files
+for the target platform
+
+* cross C library: a library to link object files with to create fully
+functional programs
+
+Cross compilers are difficult to set up. A lot of people report that they
+cannot succeed in building a cross toolchain successfully. The answers
+usually consist of "download this pre-built toolchain", which is equally
+unhelpful.
+
+A toolchain is set up in five steps:
+
+1. build binutils to that can run on the host platform, but generate code
+for the target platform
+
+2. build Linux kernel headers for the target platform
+
+3. build a minimal C only version of GCC, that can run on the host platform
+and generate code for the target platform
+
+4. build a C library for the target platform. This includes the dynamic
+linker, C library, etc.
+
+5. build a full GCC
+
+****
+NB:
+
+Keep in mind that many programs are not very well suited for cross
+compilation. Either they are not intended to run on other platforms,
+because the code is highly platform specific, or the configuration proces
+is not written with cross compilation in mind.
+
+Nix will not solve these problems for you!
+***
+
+This document describes to set up a cross compiler to generate code for
+arm-linux with uClibc and runs on i686-linux. The "stdenv" used is the
+default from the standard Nix packages collection.
+
+Step 1: build binutils for arm-linux in the stdenv for i686-linux
+
+---
+{stdenv, fetchurl, noSysDirs}:
+
+stdenv.mkDerivation {
+  name = "binutils-2.16.1-arm";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2;
+    md5 = "6a9d529efb285071dad10e1f3d2b2967";
+  };
+  inherit noSysDirs;
+  configureFlags = "--target=arm-linux";
+}
+---
+
+This will compile binutils that will run on i686-linux, but knows the
+format used by arm-linux.
+
+Step 2: build kernel headers for the target architecture
+
+  default.nix for kernel-headers-arm:
+
+---
+{stdenv, fetchurl}:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "linux-headers-2.6.13.4-arm";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.4.tar.bz2;
+    md5 = "94768d7eef90a9d8174639b2a7d3f58d";
+  };
+}
+---
+
+  builder.sh for kernel-headers-arm:
+
+---
+source $stdenv/setup
+
+
+buildPhase() {
+    make include/linux/version.h
+}
+
+buildPhase=buildPhase
+
+
+installPhase() {
+    mkdir $out
+    mkdir $out/include
+    #cd $out/include
+    #ln -s asm-arm asm
+    make include/asm ARCH=arm
+    cp -prvd include/linux include/asm include/asm-arm include/asm-generic $out/include
+    echo -n > $out/include/linux/autoconf.h
+}
+
+installPhase=installPhase
+
+
+genericBuild
+---
+
+Step 3: build a minimal GCC
+
+Extra/different parameters include the target platform and the kernel
+headers argument (this needs a major cleanup, as well as the name, it
+needs to be different!). Profiled compilers are disabled. The tarball
+used here is just gcc-core. For some reason it doesn't install nicely
+if the whole tarball is used (or is this some braino on my side? -- AH).
+
+Only C is used, because for other languages (such as C++) extra libraries
+need to be compiled, for which libraries compiled for the target system
+are needed.
+
+There is a bit of evilness going on. The cross compiled utilities need
+to be either copied to or be linked from the output tree of the compiler.
+(Is this really true? Back this up with arguments! -- AH)
+
+Symbolic links are not something we want inside the Nix store.
+
+---
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langF77 ? false
+, profiledCompiler ? false
+, binutilsArm
+, kernelHeadersArm
+}:
+
+assert langC;
+
+stdenv.mkDerivation {
+  name = "gcc-4.0.2-arm";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2;
+    md5 = "f7781398ada62ba255486673e6274b26";
+    #url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-4.0.2.tar.bz2;
+    #md5 = "a659b8388cac9db2b13e056e574ceeb0";
+  };
+  # !!! apply only if noSysDirs is set
+  patches = [./no-sys-dirs.patch ./gcc-inhibit.patch];
+  inherit noSysDirs langC langCC langF77 profiledCompiler;
+  buildInputs = [binutilsArm];
+  inherit kernelHeadersArm binutilsArm;
+  platform = "arm-linux";
+}
+---
+
+The builder.sh for a cross-compiler. Note that the binutils are prefixed
+with the architecture name, so arm-linux-ld instead of ld, etc. This is
+necessary because when we cross-compile a lot of programs look for these
+tools with these specific names. The standard gcc-wrapper does not take this
+into account yet.
+
+---
+source $stdenv/setup
+
+
+export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
+mkdir $NIX_FIXINC_DUMMY
+
+
+if test "$noSysDirs" = "1"; then
+
+    if test "$noSysDirs" = "1"; then
+        # Figure out what extra flags to pass to the gcc compilers
+        # being generated to make sure that they use our glibc.
+        if test -e $NIX_GCC/nix-support/orig-glibc; then
+            glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+            # Ugh.  Copied from gcc-wrapper/builder.sh.  We can't just
+            # source in $NIX_GCC/nix-support/add-flags, since that
+            # would cause *this* GCC to be linked against the
+            # *previous* GCC.  Need some more modularity there.
+            extraCFlags="-B$glibc/lib -isystem $glibc/include"
+            extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \
+              -Wl,-dynamic-linker,$glibc/lib/ld-linux.so.2"
+
+            # Oh, what a hack.  I should be shot for this.
+            # In stage 1, we should link against the previous GCC, but
+            # not afterwards.  Otherwise we retain a dependency.
+            # However, ld-wrapper, which adds the linker flags for the
+            # previous GCC, is also used in stage 2/3.  We can prevent
+            # it from adding them by NIX_GLIBC_FLAGS_SET, but then
+            # gcc-wrapper will also not add them, thereby causing
+            # stage 1 to fail.  So we use a trick to only set the
+            # flags in gcc-wrapper.
+            hook=$(pwd)/ld-wrapper-hook
+            echo "NIX_GLIBC_FLAGS_SET=1" > $hook
+            export NIX_LD_WRAPPER_START_HOOK=$hook
+        fi
+
+        export NIX_EXTRA_CFLAGS=$extraCFlags
+        export NIX_EXTRA_LDFLAGS=$extraLDFlags
+        export CFLAGS=$extraCFlags
+        export CXXFLAGS=$extraCFlags
+        export LDFLAGS=$extraLDFlags
+    fi
+
+else
+    patches=""
+fi
+
+
+preConfigure=preConfigure
+preConfigure() {
+    
+    # Determine the frontends to build.
+    langs="c"
+    if test -n "$langCC"; then
+        langs="$langs,c++"
+    fi
+    if test -n "$langF77"; then
+        langs="$langs,f77"
+    fi
+
+    # Cross compiler evilness
+    ensureDir $out
+    ensureDir $out/arm-linux
+    ensureDir $out/arm-linux/bin
+    ln -s $binutilsArm/arm-linux/bin/as $out/arm-linux/bin/as
+    ln -s $binutilsArm/arm-linux/bin/ld $out/arm-linux/bin/ld
+    ln -s $binutilsArm/arm-linux/bin/ar $out/arm-linux/bin/ar
+    ln -s $binutilsArm/arm-linux/bin/ranlib $out/arm-linux/bin/ranlib
+
+    # Perform the build in a different directory.
+    mkdir ../build
+    cd ../build
+
+    configureScript=../$sourceRoot/configure
+    configureFlags="--enable-languages=$langs --target=$platform --disable-threads --disable-libmudflap --disable-shared --with-headers=$kernelHeadersArm/include --disable-multilib"
+}
+
+
+postInstall=postInstall
+postInstall() {
+    # Remove precompiled headers for now.  They are very big and
+    # probably not very useful yet.
+    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
+
+    # Remove `fixincl' to prevent a retained dependency on the
+    # previous gcc.
+    rm -rf $out/libexec/gcc/*/*/install-tools
+}
+
+
+#if test -z "$profiledCompiler"; then
+    #makeFlags="bootstrap"
+#else    
+    #makeFlags="profiledbootstrap"
+#fi
+
+genericBuild
+---
+
+Step 4: build a C library for the target platform.
+
+The previous steps are enough to compile a C library. In our case we take
+uClibc. It's intended to be a small sized replacement for glibc. It is widely
+used in embedded environments.
+
+...
+
+Step 5: Build a compiler to link with the newly built C library.
+
+...
+
+If we restrict the compiler to just C programs it is relatively easy,
+since we only need to wrap the GCC we built in the previous step with all
+the right tools and the right C library. Successfully compiled programs with
+this compiler and verified to be working on a HP Jornada 820 running Linux
+are "patch", "make" and "wget".
+
+If we want to build C++ programs it gets a lot more difficult. GCC has a
+three step compilation proces. In the first step a simple compiler, called
+xgcc, that can compile only C programs is built. With that compiler it
+compiles itself two more times: one time to build a full compiler, and another
+time to build a full compiler once again with the freshly built compiler from
+step 2. In the second and third step support for C++ is compiled, if this
+is configured.
+
+One of the libraries that has to be built for C++ support step is libstdc++.
+This library uses xgcc, even when cross compiling, since libstdc++ has to be
+compiled for arm-linux.
+
+One of the compiler flags that GCC uses for this compiler is called X_CFLAGS.
+This is used by the Nix build process to set the dynamic linker, glibc
+in the case of i686-linux using the default Nix packages collection.
+
+Obiously, since we need to compile libstc++ for arm-linux with uClibc linking
+will not be done correctly: you can't link object files built for arm-linux
+with a glibc built for i686-linux.
+
+Setting X_CFLAGS to use the uClibc libraries and dynamic linker will fail
+too. Earlier on in the build process these flags are used to compile important
+files like libgcc.a by the host system gcc, which does need to be linked
+to glibc. To make this work correctly you will need to carefully juggle
+with compilation flags. This is still work in progress for Nix.
+
+
+---
+
+After succesfully completing the whole toolchain you can start building
+packages with the newly built tools. To make everything build correctly
+you will need a stdenv for your target platform. Setting up this platform
+will take some effort. Right now there is a very experimental setup for
+arm-linux, which needs to be cleaned up before it is production ready.
+
+Please note that many packages are not well suited for cross-compilation.
+Even though the package itself might be very well portable often the
+buildscripts are not. One thing that we have seen that causes frequent
+build failures is the use of the LD variable. This is often set to 'ld'
+and not $(CROSS)-ld.

maintainers/docs/static-initial-env

@@ -0,0 +1,32 @@
+Upgrading the standard initial environment
+
+For Nix on i686-linux we make use of an environment of statically linked
+tools (see $nixpkgs/stdenv/linux). The first version of these tools were
+compiled outside of Nix, in an impure environment. They are used as some
+magical ingredient to make everything work. To keep these tools more in
+synchronization with the rest of nixpkgs and to make porting of nixpkgs
+to other platforms easier the static versions are now also built with Nix
+and nixpkgs.
+
+The tools can be found in nixpkgs in:
+
+- shells/bash-static
+- tools/networking/curl-diet
+- tools/archivers/gnutar-diet
+- tools/compression/gzip-diet
+- tools/compression/bzip2-static
+- tools/text/gnused-diet
+- tools/text/diffutils-diet
+- tools/text/gnupatch-diet
+- tools/misc/findutils-static
+
+Most packages are compiled with dietlibc, an alternate C library, apart
+from bash and findutils, which are statically linked to glibc. The reason
+we chose dietlibc has various reasons. First of all, curl cannot be built
+statically with glibc. If we do, we get a static binary, but it cannot resolve
+hostnames to IP addresses. glibc dynamically loads functionality at runtime
+to do resolving. When linking with dietlibc this doesn't happen.
+
+The static tools are not used as part of the input hashing (see Eelco's
+PhD thesis, paragraph 5.4.1), so changing them does not change anything and
+will not force a massive rebuild.

maintainers/docs/todo.txt

@@ -1,5 +1,3 @@
-* Bump freetype to 2.1.7 (but it breaks Pango 1.2.5).
-
 * Patch development/tools/misc/libtool not to search standard
   directories for libraries (like setup.sh does now). [do we want
   this?]
@@ -10,3 +8,7 @@
 
 * After building gcc, filter out references to /tmp/nix... in
   .../lib/libsupc++.la and .../lib/libstdc++.la
+
+* Add gettext to glib propagatedBuildInputs?  Glib's `gi18n.h' doesn't
+  seem to like Glibc `libintl.h'; needs the gettext one instead.
+  [Move from libbonoboui]

maintainers/docs/uclibc-cross.txt

@@ -0,0 +1,27 @@
+Adding uClibc support for a new platform
+
+Sometimes you want to cross-compile to another architecture, for example an
+embedded devices. For embedded devices the uClibc C library is popular.
+In Nixpkgs there is support for uClibc for several architectures but not
+everything is supported.
+
+Adding support is not very difficult, 
+
+* Add your architecture to the buildfiles in
+$nixpkgs/development/tools/misc/binutils-cross
+
+* Add your architecture to the buildfiles in
+$nixpkgs/development/compilers/gcc-4.0-cross
+
+* Add your architecture to the buildfiles in
+$nixpkgs/os-specific/linux/kernel-headers-cross
+
+* Add your architecture to the buildfiles in
+$nixpkgs/development/uclibc
+
+In the latter directory you will also need a configuration file for uClibc.
+You can make these by unpacking the uClibc sources and run a "make menuconfig".
+In the configuration a few things need to be adapted:
+
+- kernel sources -> need to point at our own kernel headers
+- install -> needs to point at $out

maintainers/scripts/evacuate-urls.sh

@@ -6,19 +6,27 @@ find . -name "*.nix" | while read fn; do
 
         if oldURL=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then
 
-            if ! echo "$oldURL" | grep -q -E ".cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a"; then
+            if ! echo "$oldURL" | grep -q -E "www.cs.uu.nl|nix.cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe"; then
                 base=$(basename $oldURL)
-                newURL="http://catamaran.labs.cs.uu.nl/dist/tarballs/$base"
-                newPath="/mnt/scratchy/eelco/public_html/tarballs/$base"
+                newURL="http://nix.cs.uu.nl/dist/tarballs/$base"
+                newPath="/data/webserver/dist/tarballs/$base"
                 echo "$fn: $oldURL -> $newURL"
 
-                if ! test -e "$newPath"; then
-                    curl --fail --location --max-redirs 20 "$oldURL" > "$newPath".tmp
-                    mv -f "$newPath".tmp "$newPath"
-                fi
+#		if test -e "$newPath"; then
+#		    echo "WARNING: $newPath exists!"
+#		else
+
+		    if ! test -e "$newPath"; then
+			curl --fail --location --max-redirs 20 "$oldURL" > "$newPath".tmp
+			mv -f "$newPath".tmp "$newPath"
+
+		    fi
+
+		    sed "s^$oldURL^$newURL^" < "$fn" > "$fn".tmp
+		    mv -f "$fn".tmp "$fn"
+
+#		fi
 
-                sed "s^$oldURL^$newURL^" < "$fn" > "$fn".tmp
-                mv -f "$fn".tmp "$fn"
             fi
             
         fi

pkgs/applications/audio/cdparanoia/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "cdparanoia-III-alpha9.8";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cdparanoia-III-alpha9.8.src.tgz;
+    url = http://nix.cs.uu.nl/dist/tarballs/cdparanoia-III-alpha9.8.src.tgz;
     md5 = "7218e778b5970a86c958e597f952f193" ;
   };
   

pkgs/applications/audio/flac/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "flac-1.1.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/flac-1.1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/flac-1.1.1.tar.gz;
     md5 = "c6ccddccf8ad344065698047c2fc7280" ;
   };
 

pkgs/applications/audio/lame/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "lame-3.96.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lame-3.96.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/lame-3.96.1.tar.gz;
     md5 = "e1206c46a5e276feca11a7149e2fc6ac" ;
   };
 }

pkgs/applications/audio/xmms/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, alsaLib, esound, libogg, libvorbis, glib, gtk}:
+
+stdenv.mkDerivation {
+  name = "xmms-1.2.10";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/xmms-1.2.10.tar.bz2;
+    md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c" ;
+  };
+
+  # Patch borrowed from SuSE 10.0 to fix pause/continue on ALSA.
+  patches = [./alsa.patch];
+
+  buildInputs = [alsaLib esound libogg libvorbis glib gtk];
+}

pkgs/applications/editors/eclipse/builder.sh

@@ -1,7 +1,37 @@
-set -e
+source $stdenv/setup
+source $makeWrapper
 
-. $stdenv/setup
-
-$unzip/bin/unzip $src 
-mkdir $out
+unpackFile $src 
+ensureDir $out
 mv eclipse $out/
+
+# Unpack the jars that contain .so files.
+#echo "unpacking some jars..."
+#for i in $(find $out -name "*.linux*.jar"); do
+#    echo $i
+#    cd $(dirname $i) && $jdk/bin/jar -x < $i
+#    rm $i
+#done
+
+# Set the dynamic linker and RPATH.
+rpath=
+for i in $libraries; do
+    rpath=$rpath${rpath:+:}$i/lib
+done
+glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+find $out \( -type f -a -perm +0100 \) \
+    -print \
+    -exec patchelf --interpreter $glibc/lib/ld-linux.so.* \
+    --set-rpath "$rpath" {} \;
+#find $out \( -type f -a -name "*.so*" \) \
+#    -print \
+#    -exec patchelf --set-rpath "$rpath" {} \;
+
+# Make a wrapper script so that the proper JDK is found.
+makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
+    --prefix PATH ":" "$jdk/bin" \
+    --prefix LD_LIBRARY_PATH ":" "$rpath"
+
+for i in $plugins; do
+    cp $i $out/eclipse/plugins
+done

pkgs/applications/editors/eclipse/default.nix

@@ -1,17 +1 @@
-{fetchurl, stdenv, unzip}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-sdk-3.0.1";
-      builder = ./builder.sh;
-      src = bindist;
-      inherit unzip;
-   };
-
-  bindist = 
-    fetchurl {
-      url = http://catamaran.labs.cs.uu.nl/dist/tarballs/eclipse-SDK-3.0.1-linux-gtk.zip;
-      md5 = "d0f743c972adf13e71a43b2dc6c9c55b";
-    };
-}
+import ./eclipse-sdk-3.1.1.nix

pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix

@@ -0,0 +1,18 @@
+{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst, plugins ? []}:
+
+let {
+  body =
+    stdenv.mkDerivation {
+      name = "eclipse-sdk-3.1.1";
+      builder = ./builder.sh;
+      src = bindist;
+      inherit makeWrapper jdk plugins;
+      libraries = [gtk glib libXtst];
+   };
+
+  bindist = 
+    fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/eclipse-SDK-3.1.1-linux-gtk.tar.gz;
+      md5 = "a2ae61431657e2ed247867b9a9948290";
+    };
+}

pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix

@@ -0,0 +1,18 @@
+{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst}:
+
+let {
+  body =
+    stdenv.mkDerivation {
+      name = "eclipse-sdk-3.1";
+      builder = ./builder.sh;
+      src = bindist;
+      inherit makeWrapper jdk;
+      libraries = [gtk glib libXtst];
+   };
+
+  bindist = 
+    fetchurl {
+      url = http://nix.cs.uu.nl/dist/tarballs/eclipse-SDK-3.1-linux-gtk.tar.gz;
+      md5 = "0441c11cc5af1e84ed3be322929899e8";
+    };
+}

pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix

@@ -0,0 +1,6 @@
+{stdenv, fetchurl}:
+
+fetchurl {
+  url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.0.jar;
+  md5 = "ff66d229c774f840ec8285f64c0f95bc";
+}

pkgs/applications/editors/eclipse/plugins/spoofax/default.nix

@@ -0,0 +1,6 @@
+{stdenv, fetchurl}:
+
+fetchurl {
+  url = http://nix.cs.uu.nl/dist/tarballs/org.spoofax.editor_0.3.10.jar;
+  md5 = "ff77853e750e19a9b8d380c17ea27f3d";
+}

pkgs/applications/editors/emacs-22-aa/builder.sh

@@ -0,0 +1,13 @@
+source $stdenv/setup
+
+myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
+echo "glibc: $myglibc" 
+
+postConfigure() {
+  cp $myglibc/lib/crt1.o src
+  cp $myglibc/lib/crti.o src
+  cp $myglibc/lib/crtn.o src
+}
+postConfigure=postConfigure
+
+genericBuild

pkgs/applications/editors/emacs-22-aa/default.nix

@@ -0,0 +1,34 @@
+{ xawSupport ? true
+, xpmSupport ? true
+, xaw3dSupport ? false
+, gtkGUI ? false
+, xftSupport ? false
+, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
+, pkgconfig ? null, gtk ? null, libXft ? null, libpng ? null
+}:
+
+assert xawSupport -> libXaw != null;
+assert xpmSupport -> libXpm != null;
+assert xaw3dSupport -> Xaw3d != null;
+assert gtkGUI -> pkgconfig != null && gtk != null;
+assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
+
+stdenv.mkDerivation {
+  name = "emacs-22.0.50-pre-xft";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/emacs-22.0.50-pre-xft.tar.bz2;
+    md5 = "4f96ada6f18513aeb70adc27b7ac862f";
+  };
+  patches = [./crt.patch];
+  buildInputs = [
+    x11
+    (if xawSupport then libXaw else null)
+    (if xpmSupport then libXpm else null)
+    (if xaw3dSupport then Xaw3d else null)
+  ]
+  ++ (if gtkGUI then [pkgconfig gtk] else [])
+  ++ (if xftSupport then [libXft libpng] else []);
+  configureFlags =
+    if gtkGUI then ["--with-x-toolkit=gtk" "--with-xft"] else [];
+}

pkgs/applications/editors/emacs-22-aa/modes/cua/builder.sh

@@ -0,0 +1,4 @@
+source $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+cp $src $out/emacs/site-lisp/cua.el

pkgs/applications/editors/emacs-22-aa/modes/cua/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "cua-mode-2.10";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
+    md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
+  };
+}

pkgs/applications/editors/emacs-22-aa/modes/haskell/builder.sh

@@ -0,0 +1,6 @@
+source $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+tar zxvf $src
+cp haskell-mode*/*.el $out/emacs/site-lisp
+cp haskell-mode*/*.hs $out/emacs/site-lisp

pkgs/applications/editors/emacs-22-aa/modes/haskell/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "haskell-mode-1.45";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
+    md5 = "c609998580cdb9ca8888c7d47d22ca3b";
+  };
+}

pkgs/applications/editors/emacs-22-aa/modes/nxml/builder.sh

@@ -0,0 +1,7 @@
+source $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+cd $out/emacs/site-lisp
+tar xvfz $src
+mv nxml-mode-*/* .
+rmdir nxml-mode-*

pkgs/applications/editors/emacs-22-aa/modes/nxml/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "nxml-mode-20041004";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
+    md5 = "ac137024cf337d6f11d8ab278d39b4db";
+  };
+}

pkgs/applications/editors/emacs-22/builder.sh

@@ -0,0 +1,13 @@
+source $stdenv/setup
+
+myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
+echo "glibc: $myglibc" 
+
+postConfigure() {
+  cp $myglibc/lib/crt1.o src
+  cp $myglibc/lib/crti.o src
+  cp $myglibc/lib/crtn.o src
+}
+postConfigure=postConfigure
+
+genericBuild

pkgs/applications/editors/emacs-22/crt.patch

@@ -0,0 +1,41 @@
+Only in emacs-21.3: configure.in~
+Only in emacs-21.3: patchfile
+Only in emacs-21.3/src: Makefile.in~
+diff -rc emacs-orig/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h
+*** emacs-orig/src/s/gnu-linux.h	2001-09-28 17:50:04.000000000 +0200
+--- emacs-21.3/src/s/gnu-linux.h	2004-10-06 13:13:19.000000000 +0200
+***************
+*** 173,179 ****
+  /* GNU/Linux usually has crt0.o in a non-standard place */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+  #else
+! #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+  #endif
+  
+  #ifdef __ELF__
+--- 173,179 ----
+  /* GNU/Linux usually has crt0.o in a non-standard place */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+  #else
+! #define START_FILES pre-crt0.o crt1.o crti.o
+  #endif
+  
+  #ifdef __ELF__
+***************
+*** 225,231 ****
+  #else
+  #undef LIB_GCC
+  #define LIB_GCC
+! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+  #endif
+  
+  /* Don't use -g in test compiles in configure.
+--- 225,231 ----
+  #else
+  #undef LIB_GCC
+  #define LIB_GCC
+! #define LIB_STANDARD -lgcc -lc -lgcc crtn.o
+  #endif
+  
+  /* Don't use -g in test compiles in configure.
+Only in emacs-21.3/src/s: gnu-linux.h~

pkgs/applications/editors/emacs-22/default.nix

@@ -0,0 +1,29 @@
+{ xawSupport ? true
+, xpmSupport ? true
+, xaw3dSupport ? false
+, gtkGUI ? false
+, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
+, pkgconfig ? null, gtk ? null
+}:
+
+assert xawSupport && !xaw3dSupport -> libXaw != null;
+assert xawSupport && xaw3dSupport -> Xaw3d != null;
+assert xpmSupport -> libXpm != null;
+assert gtkGUI -> pkgconfig != null && gtk != null;
+
+stdenv.mkDerivation {
+  name = "emacs-22.0.50-pre20051207";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/emacs-22.0.50-pre20051207.tar.bz2;
+    md5 = "011d40367015691e4319ddc65b4e7843";
+  };
+  patches = [./crt.patch];
+  buildInputs = [
+    x11
+    (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
+    (if xpmSupport then libXpm else null)
+  ] ++ (if gtkGUI then [pkgconfig gtk] else []);
+  configureFlags =
+    if gtkGUI then ["--with-x-toolkit=gtk"] else [];
+}

pkgs/applications/editors/emacs-22/modes/cua/builder.sh

@@ -0,0 +1,4 @@
+source $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+cp $src $out/emacs/site-lisp/cua.el

pkgs/applications/editors/emacs-22/modes/cua/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "cua-mode-2.10";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
+    md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
+  };
+}

pkgs/applications/editors/emacs-22/modes/haskell/builder.sh

@@ -0,0 +1,6 @@
+source $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+tar zxvf $src
+cp haskell-mode*/*.el $out/emacs/site-lisp
+cp haskell-mode*/*.hs $out/emacs/site-lisp

pkgs/applications/editors/emacs-22/modes/haskell/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "haskell-mode-1.45";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
+    md5 = "c609998580cdb9ca8888c7d47d22ca3b";
+  };
+}

pkgs/applications/editors/emacs-22/modes/nxml/builder.sh

@@ -0,0 +1,7 @@
+source $stdenv/setup
+
+mkdir -p $out/emacs/site-lisp
+cd $out/emacs/site-lisp
+tar xvfz $src
+mv nxml-mode-*/* .
+rmdir nxml-mode-*

pkgs/applications/editors/emacs-22/modes/nxml/default.nix

@@ -0,0 +1,8 @@
+{stdenv, fetchurl}: stdenv.mkDerivation {
+  name = "nxml-mode-20041004";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
+    md5 = "ac137024cf337d6f11d8ab278d39b4db";
+  };
+}

pkgs/applications/editors/emacs/builder.sh

@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
 echo "glibc: $myglibc" 

pkgs/applications/editors/emacs/crt.patch

@@ -0,0 +1,41 @@
+Only in emacs-21.3: configure.in~
+Only in emacs-21.3: patchfile
+Only in emacs-21.3/src: Makefile.in~
+diff -rc emacs-orig/src/s/gnu-linux.h emacs-21.3/src/s/gnu-linux.h
+*** emacs-orig/src/s/gnu-linux.h	2001-09-28 17:50:04.000000000 +0200
+--- emacs-21.3/src/s/gnu-linux.h	2004-10-06 13:13:19.000000000 +0200
+***************
+*** 173,179 ****
+  /* GNU/Linux usually has crt0.o in a non-standard place */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+  #else
+! #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+  #endif
+  
+  #ifdef __ELF__
+--- 173,179 ----
+  /* GNU/Linux usually has crt0.o in a non-standard place */
+  #define START_FILES pre-crt0.o /usr/lib/crt0.o
+  #else
+! #define START_FILES pre-crt0.o crt1.o crti.o
+  #endif
+  
+  #ifdef __ELF__
+***************
+*** 225,231 ****
+  #else
+  #undef LIB_GCC
+  #define LIB_GCC
+! #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+  #endif
+  
+  /* Don't use -g in test compiles in configure.
+--- 225,231 ----
+  #else
+  #undef LIB_GCC
+  #define LIB_GCC
+! #define LIB_STANDARD -lgcc -lc -lgcc crtn.o
+  #endif
+  
+  /* Don't use -g in test compiles in configure.
+Only in emacs-21.3/src/s: gnu-linux.h~

pkgs/applications/editors/emacs/default.nix

@@ -1,14 +1,24 @@
-{stdenv, fetchurl, xlibs}:
+{ xawSupport ? true
+, xpmSupport ? true
+, xaw3dSupport ? false
+, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
+}:
+
+assert xawSupport && !xaw3dSupport -> libXaw != null;
+assert xawSupport && xaw3dSupport -> Xaw3d != null;
+assert xpmSupport -> libXpm != null;
 
 stdenv.mkDerivation {
-  name = "emacs-21.3";
+  name = "emacs-21.4a";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/emacs-21.3.tar.gz;
-    md5 = "a0bab457cbf5b4f8eb99d1d0a3ada420";
+    url = http://nix.cs.uu.nl/dist/tarballs/emacs-21.4a.tar.gz;
+    md5 = "8f9d97cbd126121bd5d97e5e31168a87";
   };
-  patches = [./patchfile];
-  inherit (xlibs) libXaw libX11;
-
-  buildInputs = [xlibs.libXaw xlibs.libX11];
+  patches = [./crt.patch];
+  buildInputs = [
+    x11
+    (if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
+    (if xpmSupport then libXpm else null)
+  ];
 }

pkgs/applications/editors/emacs/modes/cua/builder.sh

@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/emacs/site-lisp
 cp $src $out/emacs/site-lisp/cua.el

pkgs/applications/editors/emacs/modes/cua/default.nix

@@ -2,7 +2,7 @@
   name = "cua-mode-2.10";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
+    url = http://nix.cs.uu.nl/dist/tarballs/cua-mode-2.10.el;
     md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
   };
 }

pkgs/applications/editors/emacs/modes/haskell/builder.sh

@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/emacs/site-lisp
 tar zxvf $src

pkgs/applications/editors/emacs/modes/haskell/default.nix

@@ -2,7 +2,7 @@
   name = "haskell-mode-1.45";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/haskell-mode-1.45.tar.gz;
     md5 = "c609998580cdb9ca8888c7d47d22ca3b";
   };
 }

pkgs/applications/editors/emacs/modes/nxml/builder.sh

@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/emacs/site-lisp
 cd $out/emacs/site-lisp

pkgs/applications/editors/emacs/modes/nxml/default.nix

@@ -2,7 +2,7 @@
   name = "nxml-mode-20041004";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/nxml-mode-20041004.tar.gz;
     md5 = "ac137024cf337d6f11d8ab278d39b4db";
   };
 }

pkgs/applications/editors/monodevelop/builder.sh

@@ -0,0 +1,29 @@
+source $stdenv/setup
+source $makeWrapper
+
+export MONO_GAC_PREFIX=$monodoc:$gtksharp
+
+postInstall=postInstall
+postInstall() {
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+
+    moz=$(ls $mozilla/lib/*/libgtkembedmoz.so)
+
+    for i in $out/bin-orig/*; do
+        echo "wrapping $(basename $i)"
+        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
+        makeWrapper "$i" "$out/bin/$(basename $i)" \
+            --suffix PATH ':' "$(dirname $(type -p mono))" \
+            --suffix PATH ':' "$(dirname $(type -p mono))" \
+            --suffix LD_LIBRARY_PATH ':' "$gtksharp/lib" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
+            --suffix MONO_GAC_PREFIX ':' "$gtkmozembedsharp" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksourceviewsharp" \
+            --suffix MONO_GAC_PREFIX ':' "$monodoc" \
+            --set MOZILLA_FIVE_HOME "$(dirname $moz)"
+    done
+}
+
+genericBuild
+

pkgs/applications/editors/monodevelop/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
+, gtkmozembedsharp, monodoc
+, perl, perlXMLParser, pkgconfig
+, glib, gtk, GConf, gnomevfs, libbonobo, libglade, libgnome
+, mozilla
+}:
+
+stdenv.mkDerivation {
+  name = "monodevelop-0.6-pre2315";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/monodevelop-0.6-pre2315.tar.bz2;
+    md5 = "8c33df5629b0676b7ab552854c1de6fd";
+  };
+
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+  
+  patches = [./prefix.patch];
+  
+  buildInputs = [
+    file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
+    glib gtk GConf gnomevfs libbonobo libglade libgnome
+    gtkmozembedsharp monodoc
+  ];
+  
+  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp;
+}

pkgs/applications/editors/monodevelop/prefix.patch

@@ -0,0 +1,44 @@
+diff -rc MonoDevelop-orig/Makefile.in MonoDevelop/Makefile.in
+*** MonoDevelop-orig/Makefile.in	2005-03-09 17:43:58.000000000 +0100
+--- MonoDevelop/Makefile.in	2005-03-09 18:10:20.000000000 +0100
+***************
+*** 298,304 ****
+  # (mkdir ../../build/bin/ hack)
+  SUBDIRS = Core build po Extras
+  bin_SCRIPTS = monodevelop
+! gnome_data = @gnome_prefix@/share
+  desktopdir = $(gnome_data)/applications
+  desktop_DATA = monodevelop.desktop
+  pixmapdir = $(gnome_data)/pixmaps
+--- 298,304 ----
+  # (mkdir ../../build/bin/ hack)
+  SUBDIRS = Core build po Extras
+  bin_SCRIPTS = monodevelop
+! gnome_data = @prefix@/share
+  desktopdir = $(gnome_data)/applications
+  desktop_DATA = monodevelop.desktop
+  pixmapdir = $(gnome_data)/pixmaps
+***************
+*** 809,818 ****
+  all:
+  
+  install-data-hook:
+! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  uninstall-hook:
+! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  run: runmd
+  
+--- 809,818 ----
+  all:
+  
+  install-data-hook:
+! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  uninstall-hook:
+! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
+  
+  run: runmd
+  
+Only in MonoDevelop: Makefile.in~

pkgs/applications/editors/monodoc/builder.sh

@@ -0,0 +1,21 @@
+source $stdenv/setup
+source $makeWrapper
+
+postInstall=postInstall
+postInstall() {
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+
+    for i in $out/bin-orig/*; do
+        echo "wrapping $(basename $i)"
+        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
+        makeWrapper "$i" "$out/bin/$(basename $i)" \
+            --suffix PATH ':' "$(dirname $(type -p mono))" \
+            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
+            --suffix MONO_GAC_PREFIX ':' "$out"
+    done
+}
+
+genericBuild
+
+

pkgs/applications/editors/monodoc/default.nix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "monodoc-1.0.6";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/monodoc-1.0.6.tar.gz;
+    md5 = "f2fc27e8e4717d90dc7efa2450625693";
+  };
+
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+
+  buildInputs = [mono gtksharp pkgconfig];
+
+  inherit gtksharp;
+}

pkgs/applications/editors/nano/builder.sh

@@ -1,4 +0,0 @@
-. $stdenv/setup
-
-export CFLAGS="$CFLAGS -I$ncurses/include/ncurses"
-genericBuild

pkgs/applications/editors/nano/default.nix

@@ -2,12 +2,9 @@
 
 stdenv.mkDerivation {
   name = "nano-1.2.4";
-  builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/nano-1.2.4.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/nano-1.2.4.tar.gz;
     md5 = "2c513310ec5e8b63abaecaf48670ac7a";
   };
-
-  inherit ncurses;
   buildInputs = [ncurses];
 }

pkgs/applications/editors/nedit/builder.sh

@@ -0,0 +1,11 @@
+source $stdenv/setup
+
+export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"
+
+installPhase=installPhase
+installPhase() {
+    ensureDir $out/bin
+    cp -p source/nedit source/nc $out/bin
+}
+
+genericBuild

pkgs/applications/editors/nedit/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl, x11, motif, libXpm}:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "nedit-5.5";
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/nedit-5.5-src.tar.bz2;
+    md5 = "48cb3dce52d44988f3a4d7c6f47b6bbe";
+  };
+  patches = [./dynamic.patch];
+
+  inherit motif;
+  buildInputs = [x11 motif libXpm];
+
+  makeFlags = if stdenv.system == "i686-linux" then "linux" else "";
+}

pkgs/applications/editors/nedit/dynamic.patch

@@ -0,0 +1,27 @@
+diff -rc nedit-5.5-orig/makefiles/Makefile.linux nedit-5.5/makefiles/Makefile.linux
+*** nedit-5.5-orig/makefiles/Makefile.linux	2003-05-20 02:27:56.000000000 +0200
+--- nedit-5.5/makefiles/Makefile.linux	2005-12-03 00:42:23.000000000 +0100
+***************
+*** 17,27 ****
+  # To test if the Motif library exports the runtime version
+  # add -DHAVE__XMVERSIONSTRING to CFLAGS
+  #
+! CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+  
+  ARFLAGS=-urs
+  
+! LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
+  
+  include Makefile.common
+  
+--- 17,27 ----
+  # To test if the Motif library exports the runtime version
+  # add -DHAVE__XMVERSIONSTRING to CFLAGS
+  #
+! CFLAGS=-O -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+  
+  ARFLAGS=-urs
+  
+! LIBS= -lXm -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
+  
+  include Makefile.common

pkgs/applications/editors/vim-diet/default.nix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, ncurses, dietgcc}:
+ 
+stdenv.mkDerivation {
+  name = "vim-6.3";
+ 
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/vim-6.3.tar.bz2;
+    md5 = "821fda8f14d674346b87e3ef9cb96389";
+  };
+ 
+  inherit ncurses;
+  buildInputs = [ncurses];
+
+  NIX_GCC = dietgcc;
+  NIX_GLIBC_FLAGS_SET=1;
+  NIX_CFLAGS_COMPILE="-D_BSD_SOURCE=1";
+}

pkgs/applications/editors/vim/builder.sh

@@ -1,3 +1,9 @@
-. $stdenv/setup
+source $stdenv/setup
+
+postInstall=postInstall
+
+postInstall() {
+  ln -s $out/bin/vim $out/bin/vi
+}
 
 genericBuild

pkgs/applications/editors/vim/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation {
  
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/vim-6.3.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/vim-6.3.tar.bz2;
     md5 = "821fda8f14d674346b87e3ef9cb96389";
   };
  

pkgs/applications/graphics/batik/builder.sh

@@ -0,0 +1,7 @@
+set -e
+
+source $stdenv/setup
+
+unzip $src
+mkdir $out
+mv batik-* $out/batik

pkgs/applications/graphics/batik/default.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation {
+  name = "batik-1.6";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/batik-1.6.zip;
+    md5 = "edff288fc64f968ff96ca49763d50f3c";
+  };
+
+  buildInputs = [unzip];
+}

pkgs/applications/graphics/f-spot/builder.sh

@@ -0,0 +1,28 @@
+source $stdenv/setup
+source $makeWrapper
+
+postInstall=postInstall
+postInstall() {
+    mv $out/bin $out/bin-orig
+    mkdir $out/bin
+
+    for i in $out/bin-orig/*; do
+        echo "wrapping $(basename $i)"
+        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
+        makeWrapper "$i" "$out/bin/$(basename $i)" \
+            --prefix PATH ':' "$(dirname $(type -p mono))" \
+            --prefix LD_LIBRARY_PATH ':' "$sqlite/lib" \
+            --prefix LD_LIBRARY_PATH ':' "$libgnomeui/lib/libglade/2.0" \
+            --prefix MONO_GAC_PREFIX ':' "$gtksharp"
+    done
+    
+    # !!! hack
+    export ALL_INPUTS="$out $pkgs"
+
+    find $out -name "*.dll.config" -o -name "*.exe.config" | while read configFile; do
+        echo "modifying config file $configFile"
+        $monoDLLFixer "$configFile"
+    done
+}
+
+genericBuild

pkgs/applications/graphics/f-spot/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif
+, libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2
+, monoDLLFixer
+}:
+
+stdenv.mkDerivation {
+  name = "f-spot-0.0.10";
+
+  builder = ./builder.sh;
+  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
+  
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/f-spot-0.0.10.tar.bz2;
+    md5 = "19cc6e067ccc261b0502ff6189b79832";
+  };
+
+  patches = [./dllmap.patch];
+
+  buildInputs = [
+    perl perlXMLParser pkgconfig mono libexif
+    libgnome libgnomeui gtksharp libjpeg sqlite
+    lcms libgphoto2
+  ];
+
+  inherit monoDLLFixer gtksharp sqlite libgnomeui;
+}

pkgs/applications/graphics/f-spot/dllmap.patch

@@ -0,0 +1,28 @@
+diff -rc f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config
+*** f-spot-0.0.10-orig/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-02-27 19:25:09.000000000 +0100
+--- f-spot-0.0.10/libgphoto2-sharp/libgphoto2-sharp.dll.config	2005-03-11 12:13:12.000000000 +0100
+***************
+*** 1,3 ****
+  <configuration>
+!   <dllmap dll="libgphoto2.so" target="/usr/lib/libgphoto2.so.2"/>
+  </configuration>
+--- 1,3 ----
+  <configuration>
+!   <dllmap dll="libgphoto2.so" target="libgphoto2.so.2"/>
+  </configuration>
+diff -rc f-spot-0.0.10-orig/src/f-spot.exe.config.in f-spot-0.0.10/src/f-spot.exe.config.in
+*** f-spot-0.0.10-orig/src/f-spot.exe.config.in	2005-02-27 18:03:02.000000000 +0100
+--- f-spot-0.0.10/src/f-spot.exe.config.in	2005-03-11 12:48:03.000000000 +0100
+***************
+*** 9,13 ****
+    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
+    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
+    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
+!   <dllmap dll="libexif.dll" target="libexif.so.@EXIF_SOVERSION@"/>
+  </configuration>
+--- 9,13 ----
+    <dllmap dll="libfspoteog" target="@prefix@/lib/f-spot/libfspoteog.so.0"/>
+    <dllmap dll="libfspotjpeg" target="@prefix@/lib/f-spot/libfspotjpg.so.0"/>
+    <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
+!   <dllmap dll="libexif.dll" target="libexif.so"/>
+  </configuration>

pkgs/applications/graphics/gimp/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, glib, pango, atk, freetype, fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl, perlXMLParser, python, pygtk}:
+
+stdenv.mkDerivation {
+  name = "gimp-2.3.6";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/gimp-2.3.6.tar.bz2;
+    md5 = "ce8ad77f4eb47abb868e6b4eb1f97943" ;
+  };
+  
+  buildInputs = [ pkgconfig gtk libgtkhtml glib pango atk freetype fontconfig libart_lgpl libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk] ;
+
+  configureFlags = [ "--disable-print" ];
+}

pkgs/applications/graphics/gqview/default.nix

@@ -6,11 +6,11 @@ assert pkgconfig != null && gtk != null && libpng != null;
 # !!! assert libpng == gtk.libpng;
 
 stdenv.mkDerivation {
-  name = "gqview-1.4.5";
+  name = "gqview-2.1.1";
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-1.4.5.tar.gz;
-    md5 = "b196935767c2d3dc61243d9ed0801c2e";
+    url = http://nix.cs.uu.nl/dist/tarballs/gqview-2.1.1.tar.gz;
+    md5 = "2cd110305cfe4c530fcd6e34bb52e1f2";
   };
 
   buildInputs = [pkgconfig gtk libpng];

pkgs/applications/graphics/inkscape/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig,
+  perl, perlXMLParser,
+  gtk, libXft, fontconfig,
+  libpng,
+  zlib, popt,
+  boehmgc,
+  libxml2, libxslt,
+  glib,
+  gtkmm, glibmm, libsigcxx
+}:
+
+stdenv.mkDerivation {
+  name = "inkscape-0.42.2";
+
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/inkscape-0.42.2.tar.bz2;
+    md5 = "a27172087018e850e92e97e52b5dad08";
+  };
+
+  buildInputs = [
+    pkgconfig
+    perl perlXMLParser
+    gtk libXft fontconfig
+    libpng
+    zlib popt
+    boehmgc
+    libxml2 libxslt
+    glib
+    gtkmm glibmm libsigcxx
+  ];
+}

pkgs/applications/misc/acrobat-reader/builder.sh

@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 echo "unpacking $src..."
 tar xvfz $src
@@ -6,16 +6,23 @@ tar xvfz $src
 mkdir $out
 
 echo "unpacking reader..."
-tar xvf ./COMMON.TAR -C $out
-tar xvf ./LINUXRDR.TAR -C $out
+tar xvf AdobeReader/COMMON.TAR -C $out
+tar xvf AdobeReader/ILINXR.TAR -C $out
+
+# Disable this plugin for now (it needs LDAP, and I'm too lazy to add it).
+rm $out/Reader/intellinux/plug_ins/PPKLite.api
+
+if test -n "$fastStart"; then
+    rm $out/Reader/intellinux/plug_ins/*.api
+fi
 
 glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
 
-patchelf --interpreter $glibc/lib/ld-linux.so.* $out/Reader/intellinux/bin/acroread
+fullPath=
+for i in $libPath; do
+    fullPath=$fullPath${fullPath:+:}$i/lib
+done
 
-sed "s^REPLACE_ME^$out/Reader^" $out/bin/acroread.sh > $out/bin/acroread.sh.tmp
-echo "#! /bin/sh" > $out/bin/acroread.sh
-echo "LD_LIBRARY_PATH=$libXt/lib:$libXp/lib:$libXext/lib:$libX11/lib" >> $out/bin/acroread.sh
-cat $out/bin/acroread.sh.tmp >> $out/bin/acroread.sh
-chmod 755 $out/bin/acroread.sh
-mv $out/bin/acroread.sh $out/bin/acroread
+patchelf --interpreter $glibc/lib/ld-linux.so.* \
+    --set-rpath $fullPath \
+    $out/Reader/intellinux/bin/acroread

pkgs/applications/misc/acrobat-reader/default.nix

@@ -1,12 +1,19 @@
-{stdenv, fetchurl, patchelf, libXt, libXp, libXext, libX11}:
+{ xineramaSupport ? false
+, stdenv, fetchurl, libXt, libXp, libXext, libX11, libXinerama ? null
+, glib, pango, atk, gtk, libstdcpp5, zlib
+, fastStart ? false
+}:
 
 stdenv.mkDerivation {
-  name = "acrobat-reader-5.0.9";
+  name = "acrobat-reader-7.0.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/linux-509.tar.gz;
-    md5 = "53b7ca0fc83ab81214ba82050ce89c64";
+    url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz;
+    md5 = "79e5a40aca6b49f7015cb1694876f87a";
   };
-  buildInputs = [patchelf];
-  inherit libXt libXp libXext libX11;
+  libPath = [
+    libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib
+    (if xineramaSupport then libXinerama else null)
+  ];
+  inherit fastStart;
 }

pkgs/applications/misc/cdrtools/builder.sh

@@ -0,0 +1,11 @@
+source $stdenv/setup
+
+prefix=$out
+
+configurePhase() {
+ echo ;
+}
+
+configurePhase=configurePhase
+
+genericBuild

pkgs/applications/misc/cdrtools/cdrtools-2.01-install.patch

@@ -0,0 +1,13 @@
+diff -ruN cdrtools-2.01/DEFAULTS/Defaults.linux cdrtools-2.01.new/DEFAULTS/Defaults.linux
+--- cdrtools-2.01/DEFAULTS/Defaults.linux	2003-02-16 01:01:48.000000000 +0100
++++ cdrtools-2.01.new/DEFAULTS/Defaults.linux	2005-08-30 21:13:55.000000000 +0200
+@@ -27,7 +27,8 @@
+ # Installation config stuff
+ #
+ ###########################################################################
+-INS_BASE=	/opt/schily
++#INS_BASE=	/opt/schily
++INS_BASE=	$(out)
+ INS_KBASE=	/
+ #
+ DEFUMASK=	002

pkgs/applications/misc/cdrtools/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "cdrtools-2.01";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/cdrtools-2.01.tar.bz2;
+    md5 = "d44a81460e97ae02931c31188fe8d3fd";
+  };
+  patches = [./cdrtools-2.01-install.patch];
+}

pkgs/applications/misc/gphoto2/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt}:
+
+stdenv.mkDerivation {
+  name = "gphoto2-2.1.99";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/gphoto2-2.1.99.tar.bz2;
+    md5 = "549a9dfae6910ab6456b194ea86b55a2";
+  };
+  buildInputs = [pkgconfig libgphoto2 libexif popt];
+}

pkgs/applications/misc/hello/ex-1/builder.sh

@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 PATH=$perl/bin:$PATH
 

pkgs/applications/misc/hello/ex-1/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "hello-2.1.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
   inherit perl;

pkgs/applications/misc/hello/ex-2/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "hello-2.1.1";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/hello-2.1.1.tar.gz;
     md5 = "70c9ccf9fac07f762c24f2df2290784d";
   };
   buildInputs = [perl];

pkgs/applications/misc/pinfo/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation {
+  name = "pinfo-0.6.8";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/pinfo-0.6.8.tar.gz;
+    md5 = "55feb4ebaa709b52bd00a15ed0fb52fb";
+  };
+  buildInputs = [ncurses];
+}

pkgs/applications/misc/xchm/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, wxGTK, chmlib}:
 
 stdenv.mkDerivation {
-  name = "xchm-0.9.1";
+  name = "xchm-1.2";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/xchm-0.9.1.tar.gz;
-    md5 = "5ba671e09e4c3ac46ffb5ce9d2c985eb";
+    url = http://nix.cs.uu.nl/dist/tarballs/xchm-1.2.tar.gz;
+    md5 = "17f2cda873f61470636dbfeebb4a531d";
   };
   buildInputs = [wxGTK chmlib];
 }

pkgs/applications/misc/xpdf/builder.sh

@@ -0,0 +1,10 @@
+source $stdenv/setup
+
+if test -n "$freetype"; then
+    configureFlags="\
+      --with-freetype2-library=$freetype/lib \
+      --with-freetype2-includes=$freetype/include/freetype2 \
+      $configureFlags"
+fi
+
+genericBuild

pkgs/applications/misc/xpdf/default.nix

@@ -0,0 +1,24 @@
+{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? true
+, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null
+}:
+
+assert enableGUI -> x11 != null && motif != null && freetype != null;
+assert enablePDFtoPPM -> freetype != null;
+assert useT1Lib -> t1lib != null;
+
+stdenv.mkDerivation {
+  name = "xpdf-3.01";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/xpdf-3.01.tar.gz;
+    md5 = "e004c69c7dddef165d768b1362b44268";
+  };
+  
+  buildInputs =
+    (if enableGUI then [x11 motif] else []) ++
+    (if useT1Lib then [t1lib] else []);
+  freetype = if enableGUI || enablePDFtoPPM then freetype else null;
+    
+  configureFlags = "--enable-a4-paper"; /* We obey ISO standards! */
+}

pkgs/applications/misc/xterm/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, libXaw, xproto, libXt, libX11, libSM, libICE, ncurses}:
+
+stdenv.mkDerivation {
+  name = "xterm-208";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/xterm.tar.gz;
+    md5 = "a062d0b398918015d07c31ecdcc5111a";
+  };
+  buildInputs = [libXaw xproto libXt libX11 libSM libICE ncurses];
+}

pkgs/applications/networking/browsers/firefox-wrapper/builder.sh

@@ -1,6 +1,7 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 makeWrapper "$firefox/bin/firefox" "$out/bin/firefox" \
     --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
-    --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))"
+    --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))" \
+    --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"

pkgs/applications/networking/browsers/firefox/builder.sh

@@ -1,9 +1,9 @@
-. $stdenv/setup
+source $stdenv/setup
 
 preConfigure=preConfigure
 preConfigure() {
     cat > .mozconfig <<EOF
-. \$topsrcdir/browser/config/mozconfig
+source \$topsrcdir/browser/config/mozconfig
 ac_add_options --prefix=$out
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
@@ -43,8 +43,8 @@ postInstall() {
     echo "running regxpcom..."
     (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false
     
-    echo "running regchrome..."
-    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false
+#    echo "running regchrome..."
+#    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false
     
 }
 

pkgs/applications/networking/browsers/firefox/default.nix

@@ -2,16 +2,17 @@
 
 # !!! assert libIDL.glib == gtk.glib;
 
-(stdenv.mkDerivation {
-  name = "firefox-1.0";
+stdenv.mkDerivation {
+  name = "firefox-1.5";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/firefox-1.0-source.tar.bz2;
-    md5 = "49c16a71f4de014ea471be81e46b1da8";
+    url = http://nix.cs.uu.nl/dist/tarballs/firefox-1.5-source.tar.bz2;
+    md5 = "fa915ddcadecda30ed3e13694f26a779";
   };
 
   buildInputs = [pkgconfig gtk perl zip libIDL libXi];
+  inherit gtk;
 
   patches = [./writable-copies.patch];
-}) // {inherit gtk;}
+}

pkgs/applications/networking/browsers/links/default.nix

@@ -0,0 +1,9 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "links-1.00pre15";
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/links-1.00pre15.tar.gz;
+    md5 = "f64823b9a1ac2d79df578a991dfae8b8";
+  };
+}

pkgs/applications/networking/browsers/lynx/builder.sh

@@ -1,5 +0,0 @@
-. $stdenv/setup
-
-export CFLAGS="-I$ncurses/include/ncurses"
-
-genericBuild

pkgs/applications/networking/browsers/lynx/default.nix

@@ -6,12 +6,10 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation {
   name = "lynx-2.8.5";
-  builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/lynx2.8.5.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/lynx2.8.5.tar.bz2;
     md5 = "d1e5134e5d175f913c16cb6768bc30eb";
   };
-  inherit ncurses;
   configureFlags = (if sslSupport then "--with-ssl" else "");
   buildInputs = [ncurses (if sslSupport then openssl else null)];
 }

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh

@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 dontBuild=1
 dontMakeInstall=1

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix

@@ -5,7 +5,7 @@
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz;
     md5 = "79c59a5ea29347e01c8e6575dd054cd1";
   };
 

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh

@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 # The Firefox pkgconfig files are buggy; they are called firefox-*.pc,
 # but they refer to mozilla-*.pc.  Also, mplayerplug-in requires

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix

@@ -5,12 +5,12 @@
 # think).
 
 (stdenv.mkDerivation {
-  name = "mplayerplug-in-2.70";
+  name = "mplayerplug-in-2.80";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mplayerplug-in-2.70.tar.gz;
-    md5 = "90784c7ccb40037b446053f0c1d1c2b4";
+    url = http://nix.cs.uu.nl/dist/tarballs/mplayerplug-in-2.80.tar.gz;
+    md5 = "ce3235ff7d46fae416cfb175193a5f25";
   };
 
   buildInputs = [pkgconfig firefox (firefox.gtk) libXpm];

pkgs/applications/networking/browsers/mozilla/builder.sh

@@ -0,0 +1,53 @@
+source $stdenv/setup
+
+preConfigure=preConfigure
+preConfigure() {
+    cat > .mozconfig <<EOF
+#. \$topsrcdir/browser/config/mozconfig
+ac_add_options --prefix=$out
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --enable-xft
+ac_add_options --disable-freetype2
+#ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+#ac_add_options --disable-shared
+#ac_add_options --enable-static
+#ac_add_options --with-system-jpeg
+#ac_add_options --with-system-png
+#ac_add_options --with-system-zlib
+EOF
+}
+
+#postInstall=postInstall
+postInstall() {
+
+    # Strip some more stuff
+    strip -S $out/lib/*/* || true
+
+    # We don't need this (do we?)
+#    rm -rf $out/include
+
+    # This fixes starting Firefox when there already is a running
+    # instance.  The `firefox' wrapper script actually expects to be
+    # in the same directory as `run-mozilla.sh', apparently.
+    cd $out/bin
+    mv firefox ../lib/firefox-*/
+    ln -s ../lib/firefox-*/firefox .
+
+    # Register extension etc.
+    echo "running firefox -register..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
+
+    echo "running regxpcom..."
+    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regxpcom) || false
+    
+#    echo "running regchrome..."
+#    (cd $out/lib/firefox-* && LD_LIBRARY_PATH=. ./regchrome) || false
+    
+}
+
+makeFlags="-f client.mk build"
+
+genericBuild

pkgs/applications/networking/browsers/mozilla/default.nix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
+
+# !!! assert libIDL.glib == gtk.glib;
+
+stdenv.mkDerivation {
+  name = "mozilla-1.7.12";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/mozilla-1.7.12-source.tar.bz2;
+    md5 = "f1ad6adbbc0510eb76d352c94c801fac";
+  };
+
+  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
+  inherit gtk;
+
+  #patches = [./writable-copies.patch];
+}

pkgs/applications/networking/browsers/w3m/bsd.patch

@@ -0,0 +1,37 @@
+diff -rc w3m-0.5.1-orig/configure w3m-0.5.1/configure
+*** w3m-0.5.1-orig/configure	2004-04-28 20:19:24.000000000 +0200
+--- w3m-0.5.1/configure	2005-09-16 11:33:48.000000000 +0200
+***************
+*** 5642,5648 ****
+   echo "$as_me:$LINENO: checking for -l$lib" >&5
+  echo $ECHO_N "checking for -l$lib... $ECHO_C" >&6
+   extlib="not found"
+!  for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
+   do
+     if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then
+      LIBS="$LIBS -l$lib"
+--- 5642,5648 ----
+   echo "$as_me:$LINENO: checking for -l$lib" >&5
+  echo $ECHO_N "checking for -l$lib... $ECHO_C" >&6
+   extlib="not found"
+!  for dir in /no-such-path
+   do
+     if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then
+      LIBS="$LIBS -l$lib"
+***************
+*** 5768,5774 ****
+   if test x"$enable_ipv6" = xno; then
+      echo "$as_me:$LINENO: checking for libinet6" >&5
+  echo $ECHO_N "checking for libinet6... $ECHO_C" >&6
+!     for dir in /usr/local/v6/lib /usr/local/lib /usr/lib
+      do
+  	if test -f $dir/libinet6.a; then
+  	  if test $dir != "/usr/lib"; then
+--- 5768,5774 ----
+   if test x"$enable_ipv6" = xno; then
+      echo "$as_me:$LINENO: checking for libinet6" >&5
+  echo $ECHO_N "checking for libinet6... $ECHO_C" >&6
+!     for dir in /no-such-path
+      do
+  	if test -f $dir/libinet6.a; then
+  	  if test $dir != "/usr/lib"; then