Commit graph

453 commits

Author SHA1 Message Date
Armijn Hemel 8d40aeebb1 ocaml is not defined, hevea entry commented out
svn path=/nixpkgs/trunk/; revision=1177
2004-07-21 15:02:07 +00:00
Eelco Dolstra 0a32c85cb6 * Use a mirror (losser), since gnugrep-2.5.1 has been removed from the
FSF server.

svn path=/nixpkgs/trunk/; revision=1175
2004-07-18 21:16:45 +00:00
Eelco Visser 26e79fd44b prebuild ocaml and hevea
svn path=/nixpkgs/trunk/; revision=1172
2004-07-16 22:59:28 +00:00
Eelco Visser be48aa538b - O'Caml compiler for Object CaML
- hevea is an interpreter for latex producing html

svn path=/nixpkgs/trunk/; revision=1171
2004-07-16 22:58:15 +00:00
Martin Bravenboer c0b5981c45 Upgrade
svn path=/nixpkgs/trunk/; revision=1168
2004-07-14 07:59:37 +00:00
Martin Bravenboer ad8c419f15 Minor fix'
svn path=/nixpkgs/trunk/; revision=1166
2004-07-12 13:41:37 +00:00
Eelco Dolstra 0c7969f9c8 * Allow a build to finish "succesfully" as far as Nix is concerned
even if some build phase failed if the variable `$succeedOnFailure'
  is set to 1.  If that happens, the file `$out/nix-support/failed' is
  created to mark the build result as bad.  This is useful for release
  management systems that might want to publish failed releases.

svn path=/nixpkgs/trunk/; revision=1163
2004-07-12 12:34:02 +00:00
Eelco Dolstra 8b0e40b3d4 * Always make source writable.
svn path=/nixpkgs/trunk/; revision=1153
2004-07-11 20:02:57 +00:00
Eelco Dolstra 93efdb400a * Log support in the generic builder. Just set $logPhases to 1 and
it will write the output of each phase to a separate log file in
  $out/log/.

svn path=/nixpkgs/trunk/; revision=1152
2004-07-11 18:52:25 +00:00
Eelco Dolstra 331f913861 * Add write permission to sources copied from the store.
* A new `distPhase' to build source distributions (enabled when
  $doDist = 1).
* A new `checkPhase' to perform `make check' (enabled when $doCheck =
  1).
* Allow the prefix to be redirected, either by setting $prefix or by
  setting $useTempPrefix to 1.  Useful when making distributions.
* Allow the build or install phases to be skipped by setting
  $dontBuild $dontInstall to 1.
* Allow the order of phases to be changed by setting $phases.

svn path=/nixpkgs/trunk/; revision=1151
2004-07-11 16:32:34 +00:00
Martin Bravenboer e86a4a1112 Added the Ant wrapper. The ant script in this wrapper sets the config in environment variables and invokes core-ant.
svn path=/nixpkgs/trunk/; revision=1149
2004-07-10 16:17:48 +00:00
Martin Bravenboer feeff4dfb1 Working on improved Ant package in Nix: do configuration in wrapper scripts. This is the 'core' Ant.
svn path=/nixpkgs/trunk/; revision=1148
2004-07-10 13:59:21 +00:00
Eelco Dolstra d91c216e2c * Include gcc 3.4.x in the nixpkgs release.
* Remove precompiled headers, which are nice except that
  A) they don't work; and
  B) they make gcc take up 270% more disk space.

svn path=/nixpkgs/trunk/; revision=1129
2004-07-05 12:20:23 +00:00
Eelco Dolstra 2bf90b3fbf * gcc-wrapper: inherit gcc's name by default.
* gcc: upgraded to 3.4.1.

  Zie je wel, Martin, gcc is niet eng :-)

svn path=/nixpkgs/trunk/; revision=1128
2004-07-05 12:00:19 +00:00
Martin Bravenboer 6315d6d923 New version of ATerm library and SDF packages
svn path=/nixpkgs/trunk/; revision=1127
2004-07-03 10:47:58 +00:00
Eelco Dolstra 5a00ba432c * Don't strip debug info on Darwin, otherwise links by libtool fail
("/usr/bin/ld: can't use -s with -r (resulting file would not be
  relocatable)").
* Since stdenv/generic had to be modified for this, I forked it in
  situ.  This should be merged later.

svn path=/nixpkgs/trunk/; revision=1121
2004-07-02 10:05:53 +00:00
Eelco Dolstra ec6eb9c473 * On Darwin, use the system Perl instead of building our own for now.
* Build Subversion for Darwin.

svn path=/nixpkgs/trunk/; revision=1120
2004-07-01 16:57:31 +00:00
Eelco Dolstra 770e57d27c * Don't apply the libtool fix in Darwin, since it's not a pure build
environment.

svn path=/nixpkgs/trunk/; revision=1119
2004-07-01 16:56:19 +00:00
Eelco Dolstra 656151af3f * Ugh, let's not build GNU Hello.
svn path=/nixpkgs/trunk/; revision=1116
2004-07-01 14:55:23 +00:00
Eelco Dolstra 28c503f90f * Include all packages in powerpc-darwin.
svn path=/nixpkgs/trunk/; revision=1115
2004-07-01 14:43:41 +00:00
Eelco Dolstra 8884c47b3e * Start building packages for Mac OS X.
svn path=/nixpkgs/trunk/; revision=1113
2004-07-01 14:00:42 +00:00
Eelco Dolstra d92fa0bf37 * Add an option to GCC to build a profiled compiler (which is about
5-10% faster).

svn path=/nixpkgs/trunk/; revision=1108
2004-07-01 12:17:53 +00:00
Eelco Dolstra 56fd464a72 * GCC 3.4 now seems to work.
svn path=/nixpkgs/trunk/; revision=1105
2004-06-29 17:33:54 +00:00
Eelco Dolstra 62981b617d * Started adding gcc 3.4.
svn path=/nixpkgs/trunk/; revision=1103
2004-06-29 08:25:55 +00:00
Eelco Dolstra 49c1176ec6 * Upgraded Bison to the latest alpha release. This fixes a segfault
in Nix.

svn path=/nixpkgs/trunk/; revision=1092
2004-06-28 12:23:07 +00:00
Eelco Dolstra b8f20e51f4 * Added rte (real-time encoder) library.
svn path=/nixpkgs/trunk/; revision=1071
2004-06-21 20:41:32 +00:00
Eelco Dolstra 59bf3545de * Add libXext again.
svn path=/nixpkgs/trunk/; revision=1070
2004-06-21 18:56:26 +00:00
Eelco Dolstra 41548ccdab * Upgraded some xlibs.
* Upgraded zapping (probably doesn't build yet).

svn path=/nixpkgs/trunk/; revision=1069
2004-06-21 18:13:45 +00:00
Eelco Dolstra 3f9a589d53 * More updates.
svn path=/nixpkgs/trunk/; revision=1068
2004-06-21 17:00:00 +00:00
Eelco Dolstra 5503e2fc33 * Upgraded Glib, GTK, Sylpheed.
* Tried to upgrade Firefox to 0.9, but it's too broken.  It's
  basically impossible to build it automatically.  Firefox must be
  started once as a user with write permission to the Firefox
  directory to generate some files, and this can only be done
  interactively (apparently).  Hopefully 0.10 fixes this.  Firefox
  also barfs with link errors if the flag `--enable-single-profile' is
  not used.

svn path=/nixpkgs/trunk/; revision=1067
2004-06-21 15:49:03 +00:00
Martin Bravenboer 6ade14473a Latest daily distribution of StrategoXT in Nix
svn path=/nixpkgs/trunk/; revision=1066
2004-06-21 13:17:20 +00:00
Eelco Dolstra 8e22f2f58b * Unreal Tournament 2004 Demo. Also a binary-only component.
An interesting complication is that we have to change the ELF type
  of the executable from `Linux' to `SVR4', otherwise the
  `ld-linux.so.2' trick to override the glibc used doesn't work
  (apparently `Linux' is not a recognised ELF type!).

  UT doesn't work with software Mesa, so right now we impurily use
  `/usr/lib/libGL.so'.  I cannot really test whether it works with
  hardware Mesa, since it barfs with an error about missing OpenGL
  extensions.  But that's probably because I'm testing this on an
  iBook over an SSH connection to a Linux machine.

svn path=/nixpkgs/trunk/; revision=1047
2004-06-09 18:06:29 +00:00
Eelco Dolstra ce53f3736e * Quake 3 Arena Demo. The goal is to show that Nix can also be used
to deploy existing binary-only components.

  We use the `ld-linux.so.2 PROGRAM' trick to force the use of our own
  glibc, and set LD_LIBRARY_PATH to point to the required libraries
  (X11, Mesa).

  Since Mesa is software-only, Q3A is rather slow.  I'll have to
  figure out how to use the Mesa from XFree86 (X.Org), since it knows
  how to use DRI (or at least speak the GLX protocol).  Unfortunately
  the xlibs people haven't modularised that part of XFree86 yet.

  Also, the flag `+set s_initsound 0' has to be passed to Quake to
  disable sound, otherwise it segfaults on startup.  It doesn't do
  this with the normal glibc, which is strange.  Maybe it tries to
  dynamically load some sound library or something.

svn path=/nixpkgs/trunk/; revision=1046
2004-06-09 17:59:46 +00:00
Eelco Dolstra 7bbd1fd535 * Mesa (an OpenGL implementation).
svn path=/nixpkgs/trunk/; revision=1045
2004-06-09 17:53:30 +00:00
Eelco Dolstra 3ac1041bfa * Added libXi (Xinerama? In any case Mesa needs it).
svn path=/nixpkgs/trunk/; revision=1044
2004-06-09 17:52:19 +00:00
Martin Bravenboer 3d90f961b4 Added Happy parser generator and HaRP: Haskell Regular Patterns
svn path=/nixpkgs/trunk/; revision=1043
2004-06-09 14:23:05 +00:00
Eelco Dolstra 7226e94466 * Added GNU enscript.
svn path=/nixpkgs/trunk/; revision=1040
2004-06-03 17:16:16 +00:00
Martin Bravenboer ef73044b61 Upgrade to beta2
svn path=/nixpkgs/trunk/; revision=1039
2004-06-01 19:36:45 +00:00
Eelco Dolstra 106567146f * Subversion 1.0.4.
svn path=/nixpkgs/trunk/; revision=1038
2004-06-01 14:52:57 +00:00
Eelco Dolstra 1b47486557 * Darwin (Mac OS X) standard environment.
svn path=/nixpkgs/trunk/; revision=1031
2004-05-18 10:59:18 +00:00
Martin Bravenboer 6b2348542a Added asf library
svn path=/nixpkgs/trunk/; revision=1022
2004-05-13 18:33:12 +00:00
Martin Bravenboer 1d7474bae9 Moved the sdf2 distribution 2.0 packages to a separate Nix attribute set
svn path=/nixpkgs/trunk/; revision=1021
2004-05-13 18:16:56 +00:00
Martin Bravenboer fec8c962ab Added the packages that constitute the sdf2 distribution 2.1 as separate packages, collected in a Nix attribute set
svn path=/nixpkgs/trunk/; revision=1020
2004-05-13 18:06:09 +00:00
Martin Bravenboer 201a93cb13 Use propagated build inputs
svn path=/nixpkgs/trunk/; revision=1019
2004-05-12 16:26:48 +00:00
Martin Bravenboer 172421635c Upgraded all SDF packages
svn path=/nixpkgs/trunk/; revision=1018
2004-05-12 16:10:43 +00:00
Martin Bravenboer 100e0387e5 More upgrades
svn path=/nixpkgs/trunk/; revision=1017
2004-05-12 15:57:23 +00:00
Martin Bravenboer b410599fc4 More upgrades
svn path=/nixpkgs/trunk/; revision=1016
2004-05-12 15:48:39 +00:00
Martin Bravenboer 9ba11d2be6 Upgrade to generic build
svn path=/nixpkgs/trunk/; revision=1015
2004-05-12 15:35:06 +00:00
Martin Bravenboer ffade7689e Added j2sdk-1.5.0-beta
svn path=/nixpkgs/trunk/; revision=1014
2004-05-12 15:06:23 +00:00
Martin Bravenboer ecdac2b804 Upgrade strategoxt to 0.10
svn path=/nixpkgs/trunk/; revision=1013
2004-05-12 14:34:12 +00:00
Martin Bravenboer 487be25ceb Upgraded aterm to 2.1
svn path=/nixpkgs/trunk/; revision=1010
2004-05-12 13:53:53 +00:00
Eelco Dolstra 7dd8485e5f * Bump version number.
svn path=/nixpkgs/trunk/; revision=992
2004-05-03 14:36:37 +00:00
Eelco Dolstra d811b4c9d8 * Added libXv (XVideo).
* Zapping/VLC/MPlayer: use libXv.
* MPlayer: upgrade to 1.0pre4.
* Zapping: add libXext to the rpath.  I don't understand why this is
  necessary.  Zapping doesn't itself link against libXext, though some
  of its dependencies do.  (Maybe this is due to `--export-dynamic'?)

svn path=/nixpkgs/trunk/; revision=990
2004-05-01 18:17:56 +00:00
Eelco Dolstra d357f1a8ed * The contents of this file determines whether to build a stable (`1')
or unstable (`0') release.

svn path=/nixpkgs/trunk/; revision=984
2004-04-27 10:50:05 +00:00
Eelco Dolstra 163a382727 * Don't use gettext. Also use an internal (GNU) version of getopt.
This allows it to build on non-glibc platforms (e.g., Mac OS X).

svn path=/nixpkgs/trunk/; revision=970
2004-04-23 16:29:53 +00:00
Eelco Dolstra ec232441a2 * Valgrind: upgrade to 2.1.1.
svn path=/nixpkgs/trunk/; revision=966
2004-04-22 14:38:43 +00:00
Eelco Dolstra adf48bddba * Subversion upgraded to 1.0.2.
svn path=/nixpkgs/trunk/; revision=960
2004-04-21 11:44:07 +00:00
Eelco Dolstra 73ad8265a8 * Ugh. Typo.
svn path=/nixpkgs/trunk/; revision=959
2004-04-21 11:12:45 +00:00
Eelco Dolstra 7a1b8bfb71 * Upgrade to 0.5pre957 and pass `--disable-init-state'.
svn path=/nixpkgs/trunk/; revision=958
2004-04-21 11:08:36 +00:00
Eelco Dolstra 1049ba5906 * Specified MD5 hash.
svn path=/nixpkgs/trunk/; revision=940
2004-04-14 12:55:37 +00:00
Eelco Dolstra 5c847a370a * fetchsvn' now requires the MD5 hash (as computed by nix-hash') of
the tree being fetched from a Subversion repository.  The revision
  number is now optional (and defaults to HEAD).

  This makes `fetchsvn' more pure.  First, a URL/revision tuple does
  not uniquely identify a file resource, since the repository itself
  might change.  Second, `svn:external' attributes can cause arbitrary
  resources to be exported.

  A script `nix-prefetch-svn' has been provided to determine the hash
  of a URL.

svn path=/nixpkgs/trunk/; revision=938
2004-04-14 10:55:33 +00:00
Eelco Dolstra f7561cf00e * Obsolete.
svn path=/nixpkgs/trunk/; revision=936
2004-04-14 09:21:41 +00:00
Eelco Dolstra 11f838c363 * Add dependency on Curl.
svn path=/nixpkgs/trunk/; revision=931
2004-04-08 14:17:47 +00:00
Eelco Dolstra 9dddc7f142 * Scrollkeeper requires DocBook XML 4.2 (not 4.3).
svn path=/nixpkgs/trunk/; revision=930
2004-04-08 14:06:15 +00:00
Eelco Dolstra f1d1900a92 * Upgraded Nix to the latest version.
svn path=/nixpkgs/trunk/; revision=929
2004-04-08 13:50:29 +00:00
Eelco Dolstra a1c5ff3fb6 * Upgraded the DocBook DTD and the DocBook XSL stylesheets.
* Added the DocBook EBNF module.

svn path=/nixpkgs/trunk/; revision=926
2004-04-08 11:49:27 +00:00
Eelco Dolstra 02ec562596 * GHC now works again.
svn path=/nixpkgs/trunk/; revision=925
2004-04-07 14:16:57 +00:00
Eelco Dolstra 9c55897afc * Accept relative paths such as -I ..' (-I..' was already being
accepted).

svn path=/nixpkgs/trunk/; revision=924
2004-04-07 14:15:54 +00:00
Eelco Dolstra 32e4b9928d * Added xchm, a Windows help viewer for X.
svn path=/nixpkgs/trunk/; revision=923
2004-04-06 17:47:34 +00:00
Eelco Dolstra 381c8b926a * Some applications (notably, everything based on wxGTK) don't work
yet with GTK 2.4.  Fortunately, having several GTKs in parallel is
  no problem for Nix.

svn path=/nixpkgs/trunk/; revision=915
2004-04-05 14:09:01 +00:00
Eelco Dolstra a1ddfbc3a5 * Some renaming.
svn path=/nixpkgs/trunk/; revision=914
2004-04-05 13:42:41 +00:00
Eelco Dolstra 0233bc614d * Factor groups of strongly related packages out of
`all-packages-generic.nix'.

svn path=/nixpkgs/trunk/; revision=913
2004-04-05 13:34:13 +00:00
Eelco Dolstra b874f68d80 * Remove docs/ after build.
svn path=/nixpkgs/trunk/; revision=912
2004-04-05 09:34:43 +00:00
Eelco Dolstra beaff0a892 * Ensure that when building gcc, libstdc++ is linked against the
libgcc of the gcc being built, not the gcc building it.
* Only include a directory in the rpath of an executable/library if it
  is actually used.  Before, the `/lib' directory of every build input
  was added to the rpath, causing many unnecessary retained
  dependencies.  For instance, Perl has a `/lib' directory, but most
  applications whose build process uses Perl don't actually link
  against Perl.  (Also added a test for this.)
* After building glibc, remove glibcbug, to prevent a retained
  dependency on gcc.
* Add a newline after `building X' in GNU Make.

svn path=/nixpkgs/trunk/; revision=911
2004-04-04 22:02:41 +00:00
Eelco Dolstra 0d4967fc35 * Build Firefox in nixpkgs.
* Some TODOs.

svn path=/nixpkgs/trunk/; revision=910
2004-04-03 15:45:42 +00:00
Eelco Dolstra 1550034ac4 * Various bug fixes in setup.sh and ld-wrapper.sh.
svn path=/nixpkgs/trunk/; revision=909
2004-04-02 17:49:44 +00:00
Eelco Dolstra 798a009f1d * Print `building FOO' messages on standard error, not standard
output.  Some build processes actually parse the output of Make
  (like Firefox).

svn path=/nixpkgs/trunk/; revision=908
2004-04-02 17:45:20 +00:00
Eelco Dolstra 8776ba127c * Updated some more packages. However, bittorrent and vlc don't work
right now because wxGTK is broken (it depends on internal symbols in
  GTK which where made private in GTK 2.4).

svn path=/nixpkgs/trunk/; revision=907
2004-04-02 15:36:14 +00:00
Eelco Dolstra de759967c8 * Update to GTK 2.4.0.
svn path=/nixpkgs/trunk/; revision=906
2004-04-02 13:58:55 +00:00
Eelco Dolstra 36356d7694 * More sed breakage.
svn path=/nixpkgs/trunk/; revision=903
2004-04-01 20:36:40 +00:00
Eelco Dolstra 57c5759250 * Missing file.
svn path=/nixpkgs/trunk/; revision=902
2004-04-01 20:20:09 +00:00
Eelco Dolstra 5c9232e063 * Fix UML - poorly.
svn path=/nixpkgs/trunk/; revision=901
2004-04-01 20:12:54 +00:00
Eelco Dolstra 776554d9e1 * Fixed and/or updated some more components. The number of explicit
builders is dropping steadily.

svn path=/nixpkgs/trunk/; revision=900
2004-04-01 19:11:59 +00:00
Eelco Dolstra 7bf54b734e * Follow redirects.
svn path=/nixpkgs/trunk/; revision=899
2004-04-01 19:10:37 +00:00
Eelco Dolstra 2b58d63ab6 * MPlayer had an undeclared dependency on zlib; found using the
improved purity enforcement in the gcc/ld-wrappers.

svn path=/nixpkgs/trunk/; revision=898
2004-04-01 18:06:09 +00:00
Eelco Dolstra 6d3efc40c1 * I don't know why GHC is broken. But it is.
svn path=/nixpkgs/trunk/; revision=897
2004-04-01 17:10:36 +00:00
Eelco Dolstra 735076eb3c * Doh!.
svn path=/nixpkgs/trunk/; revision=895
2004-04-01 16:07:36 +00:00
Eelco Dolstra e50417845d * Fixed Stratego.
* Added Zoom, an interpreter for Z-Code.

svn path=/nixpkgs/trunk/; revision=894
2004-04-01 16:02:53 +00:00
Eelco Dolstra 8e4d58631e * Fixed flex-new.
svn path=/nixpkgs/trunk/; revision=893
2004-04-01 14:24:30 +00:00
Eelco Dolstra 9c711700e4 * Fix bison.
svn path=/nixpkgs/trunk/; revision=892
2004-04-01 13:48:08 +00:00
Eelco Dolstra 92b3cc5cfb * Working Graphviz / Athena widgets.
svn path=/nixpkgs/trunk/; revision=891
2004-04-01 13:36:31 +00:00
Eelco Dolstra 8feb5fab5b * Use an unofficial release of libXt.
svn path=/nixpkgs/trunk/; revision=890
2004-04-01 12:24:12 +00:00
Eelco Dolstra ab7af4709a * Add `--fail' to curl invocation to catch errors.
svn path=/nixpkgs/trunk/; revision=889
2004-04-01 12:23:02 +00:00
Eelco Dolstra 817d1b27ef * Provide a wrapper around `aclocal' (in Automake) that automatically
adds all directories specified in `ACLOCAL_PATH' to the `aclocal'
  command line as `-I' flags.  Also, it provides a setup hook that
  adds the `.../share/aclocal' directory of every build input to
  `ACLOCAL_PATH'.

* Upgraded Libtool.

* Graphviz requires the X Athena widgets, which in turn requires the X
  miscellaneous utilities library; added those.  However it doesn't
  work yet since libXt is broken.
  

svn path=/nixpkgs/trunk/; revision=888
2004-03-31 22:47:06 +00:00
Eelco Dolstra cbdf9a0408 * Disable some packages known not to build.
svn path=/nixpkgs/trunk/; revision=887
2004-03-31 10:19:24 +00:00
Eelco Dolstra 0376334dde * New Nix release.
svn path=/nixpkgs/trunk/; revision=886
2004-03-31 10:19:01 +00:00
Eelco Dolstra b3c93a41c1 * Some changes to get Firefox working (it doesn't work yet, since
the freedesktop.org libXt is broken, but never mind that).

svn path=/nixpkgs/trunk/; revision=885
2004-03-31 09:45:19 +00:00
Eelco Dolstra 24cb251dd0 * Some more updates.
svn path=/nixpkgs/trunk/; revision=884
2004-03-30 17:42:45 +00:00
Eelco Dolstra 00004fa6da * More freedesktop.org X11 modules.
* Cleaned up some packages.

svn path=/nixpkgs/trunk/; revision=883
2004-03-30 17:28:41 +00:00
Eelco Dolstra 5a4de2c5de * Remove builder attributes.
* MPlayer: pass stdenv to w32codecs.

svn path=/nixpkgs/trunk/; revision=882
2004-03-30 15:15:19 +00:00
Eelco Dolstra 01a1658c6b * Finally we have a working stdenvLinux again.
On the downside, the build process of stdenvLinux builds gcc 9 times
  (3 x 3 bootstrap stages).  That's a bit excessive.

svn path=/nixpkgs/trunk/; revision=880
2004-03-30 12:46:52 +00:00
Eelco Dolstra 68327c3a9d * Fix brokenness due to automatic transformations.
svn path=/nixpkgs/trunk/; revision=879
2004-03-30 12:40:55 +00:00
Eelco Dolstra 04c272508c * Fix brokenness due to automatic transformations.
svn path=/nixpkgs/trunk/; revision=878
2004-03-30 12:37:17 +00:00
Eelco Dolstra 4fc3dd4a5a * Remove builder.
svn path=/nixpkgs/trunk/; revision=877
2004-03-30 12:35:56 +00:00
Eelco Dolstra 085e197ea3 * Toss out all the linker flags, since any --rpath switch causes the
glibc build to fail.

svn path=/nixpkgs/trunk/; revision=876
2004-03-30 12:35:31 +00:00
Eelco Dolstra 8ed9ea8b51 * Use a Nix shell for gcc-wrapper and ld-wrapper.
svn path=/nixpkgs/trunk/; revision=875
2004-03-29 17:34:00 +00:00
Eelco Dolstra 12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra bc71554fc8 * Okay, so something did break.
svn path=/nixpkgs/trunk/; revision=871
2004-03-29 10:27:01 +00:00
Eelco Dolstra 2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing
broke.

svn path=/nixpkgs/trunk/; revision=870
2004-03-29 10:25:25 +00:00
Eelco Dolstra e3ff964291 * Fixing ltmain.sh is now done in setup.sh.
svn path=/nixpkgs/trunk/; revision=869
2004-03-29 10:15:12 +00:00
Eelco Dolstra 5862e56f26 * For simple Autotools-style packages (such as the ATerm library), the
builder may now be omitted entirely; the function `mkDerivation'
  will then use a default build script.

svn path=/nixpkgs/trunk/; revision=868
2004-03-28 21:17:56 +00:00
Eelco Dolstra 892b119c9d * It is now possible to execute a builder using a shell inside the Nix
store, rather than outside (such as /bin/sh).

  For instance, the Nix expression for the ATerm library now looks
  like this:

    {stdenv, fetchurl}:

    stdenv.mkDerivation {
      name = "aterm-2.0.5";
      builder = ./builder.sh;
      ...
    }

  where `mkDerivation' is a helper function in `stdenv' that massages
  the given attribute set into using the bash shell that is part of
  the standard environment:

    mkDerivation = attrs: derivation (att s // {
      builder = pkgs.bash ~ /bin/sh;
      args = ["-e" attrs.builder];
      stdenv = (...);
      system = (...).system;
    });

  Note that this makes it unnecessary to set the `stdenv' and `system'
  attributes, since `mkDerivation' already does that.


svn path=/nixpkgs/trunk/; revision=866
2004-03-28 21:07:43 +00:00
Eelco Visser f8f9f4d12c expression for strategoxt 0.9.5
svn path=/nixpkgs/trunk/; revision=863
2004-03-28 15:52:03 +00:00
Eelco Dolstra 3c699fe619 * Need to specify a dummy unpacker.
svn path=/nixpkgs/trunk/; revision=862
2004-03-27 23:39:02 +00:00
Eelco Dolstra f45695f7fa * Use $propagatedBuildInputs to find build inputs.
* Bug fix in setup.sh.

svn path=/nixpkgs/trunk/; revision=861
2004-03-27 22:09:34 +00:00
Eelco Dolstra bd56b7d65c * Started moving from XFree86 to the freedesktop.org Xlibs libraries.
svn path=/nixpkgs/trunk/; revision=860
2004-03-27 21:59:31 +00:00
Eelco Dolstra 8c4a80b585 * Upgrade to gcc 3.3.3. Starting at 3.3.3, the gcc makefile checks
whether the system header file directory actually exists (when
  calling fixinc), so passing a non-existent directory no longer
  works.  Instead we make a empty dummy directory.

svn path=/nixpkgs/trunk/; revision=858
2004-03-27 16:35:59 +00:00
Eelco Dolstra 9c4cfc02ce * Pass a `bootCurl' parameter.
svn path=/nixpkgs/trunk/; revision=857
2004-03-27 15:50:18 +00:00
Eelco Dolstra f1b459adfd * `aterm_2_0_5' is gone.
svn path=/nixpkgs/trunk/; revision=856
2004-03-27 15:49:59 +00:00
Eelco Dolstra e8295a80b4 * Upgrade to 0.9.7d (another security fix).
svn path=/nixpkgs/trunk/; revision=855
2004-03-27 15:49:20 +00:00
Eelco Dolstra f0b3c89f89 * Fix all files called `ltmain.sh' in the source tree.
svn path=/nixpkgs/trunk/; revision=854
2004-03-27 15:48:46 +00:00
Eelco Dolstra 4f155b0f7a * Upgrades.
svn path=/nixpkgs/trunk/; revision=853
2004-03-27 15:48:19 +00:00
Eelco Dolstra 158aa95f52 * Upgrade to 1.0.1.
svn path=/nixpkgs/trunk/; revision=852
2004-03-27 15:48:03 +00:00
Eelco Dolstra ee40be39a4 * Upgrade to 2.0.49.
svn path=/nixpkgs/trunk/; revision=851
2004-03-27 15:47:48 +00:00
Eelco Dolstra 4df6ec860c * Typo fix.
svn path=/nixpkgs/trunk/; revision=850
2004-03-27 15:44:05 +00:00
Eelco Dolstra cbe3e13bde * Style fix.
svn path=/nixpkgs/trunk/; revision=846
2004-03-19 17:01:46 +00:00
Eelco Dolstra 5941f66f0e * The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845
2004-03-19 16:53:04 +00:00
Eelco Dolstra 0fd59fd7a4 * Re-enabled purity checking: it should work now. First we only
checked whether absolute paths passed to gcc/ld refer to the store,
  which is wrong: they can also refer to the build tree
  (/tmp/nix-...).

* Less static composition in the construction of stdenv-nix-linux:
  gcc-wrapper and generic are now passed in as arguments, rather then
  referenced by relative path.  This makes it easier to hack on a
  specific stage of the bootstrap process (before, a change to, e.g.,
  generic/setup.sh would cause all bootstrap stages to be redone).

svn path=/nixpkgs/trunk/; revision=833
2004-03-12 11:12:18 +00:00
Eelco Dolstra de13527000 * Finally got stdenv-nix-linux working again. Still not perfect,
though.
* libxml2: upgrade to latest.
* octavefront/rna: keep debug info.

svn path=/nixpkgs/trunk/; revision=830
2004-03-11 17:26:14 +00:00
Eelco Dolstra a1b3ae0c81 * stdenv-nix-linux should more-or-less work again now.
svn path=/nixpkgs/trunk/; revision=826
2004-03-09 17:16:02 +00:00
Eelco Dolstra ab73ec398b * Removed the old gcc.
svn path=/nixpkgs/trunk/; revision=825
2004-03-09 17:10:23 +00:00
Eelco Dolstra b8b4f9ce4b * Reject inputs outside of the store in ld if NIX_ENFORCE_PURITY is
set.
* Various bug fixes.

svn path=/nixpkgs/trunk/; revision=824
2004-03-09 17:08:41 +00:00
Eelco Dolstra d74192ee38 * propagated-build-inputs should now be placed in $out/nix-support.
svn path=/nixpkgs/trunk/; revision=823
2004-03-09 10:59:55 +00:00
Eelco Dolstra c8455be838 * Use a setup hook to set PKG_CONFIG_PATH.
svn path=/nixpkgs/trunk/; revision=822
2004-03-09 10:45:01 +00:00
Eelco Dolstra 5c5db47443 * Set a flag to indicate whether we're doing a native build.
svn path=/nixpkgs/trunk/; revision=821
2004-03-09 10:36:45 +00:00
Eelco Dolstra e8d2b1cc36 * Allow Perl to be built using the native stdenv.
svn path=/nixpkgs/trunk/; revision=820
2004-03-09 10:29:30 +00:00
Eelco Dolstra 1b39a96d37 * Create a dummy linux/autoconf.h, which is needed by linux/config.h.
* Updated to 2.4.25.

svn path=/nixpkgs/trunk/; revision=819
2004-03-09 10:28:31 +00:00
Eelco Dolstra 70d26112f2 * Set the TZ variable to UTC to prevent silly errors in date strings.
* Bug fix in PATH initialisation.

svn path=/nixpkgs/trunk/; revision=818
2004-03-09 10:27:42 +00:00
Eelco Dolstra 946a2d4a48 * gcc-wrapper now filters out -L and -I flags referring to paths
outside the store (in pure builds).

svn path=/nixpkgs/trunk/; revision=817
2004-03-08 18:29:08 +00:00
Eelco Dolstra ce50734cf0 * Started reorganising stdenv:
- gcc/ld-wrappers have been factored out into a separate
    derivation.  This allows a working gcc to be installed in the user
    environment.  (Previously the Nix gcc didn't work because it
    needed a whole bunch of flags to point to glibc.)
    
  - Better modularity: packages can specify hooks into the setup
    scripts.  For instance, setup no longer knows about the
    PKG_CONFIG_PATH variable; pkgconfig can set it up instead.

  - gcc not longer depends on binutils.  This simplifies the bootstrap
    process.

svn path=/nixpkgs/trunk/; revision=816
2004-03-08 16:02:46 +00:00
Eelco Dolstra 1b8e9faf08 * Add octavefront to the cache.
svn path=/nixpkgs/trunk/; revision=815
2004-03-08 09:22:09 +00:00
Eelco Dolstra 287edecf42 * Added gperf, texinfo, ncurses.
* Started moving the gcc wrapper stuff out of stdenv.
* Added octavefront and rna.

svn path=/nixpkgs/trunk/; revision=814
2004-03-05 10:13:23 +00:00
Eelco Dolstra f82050134e * Perl nixification fixes. Oh, the humanity.
svn path=/nixpkgs/trunk/; revision=813
2004-02-20 16:25:34 +00:00
Eelco Dolstra 1999676d30 * Bug fix: don't pass -B to the linker.
svn path=/nixpkgs/trunk/; revision=811
2004-02-20 10:03:46 +00:00
Eelco Dolstra b7ad383924 * Bah. All this time gcc was linking programs against
/usr/lib/crt1.o, while it should be using $glibc/lib/crt1.o.  This
  quick hack (prepending $glibc/lib to the GCC search path using "-B")
  fixes the problem, but a better solution to prevent this sort of
  thing is to remove these static paths from gcc.

  Note: this problem was found using the pure UML Nix environment
  (where we don't have /usr/lib).

svn path=/nixpkgs/trunk/; revision=810
2004-02-19 16:55:23 +00:00
Eelco Dolstra 16c0047575 * Use a 2-stage bootstrap for creating the standard build environment
(stdenv) on Linux.  The previous 1-stage bootstrap was insufficient,
  because the tools in stdenv where built by native tools.  For
  instance, the Nix bash had a reference to /lib/libncurses.  This
  doesn't happen with a 2-stage bootstrap, since the bash built in
  stage 2 will be built with the gcc built in stage 1, which doesn't
  search in the "standard" locations.

  Motto: "Disparaging the boot is a bootable offense."

svn path=/nixpkgs/trunk/; revision=809
2004-02-19 16:33:10 +00:00
Eelco Dolstra 08dbd48e8d * Newer version.
svn path=/nixpkgs/trunk/; revision=808
2004-02-19 16:24:43 +00:00
Eelco Dolstra e5fd37f35d * Added net-tools (for ifconfig, route, hostname).
svn path=/nixpkgs/trunk/; revision=805
2004-02-19 12:46:35 +00:00
Eelco Dolstra cd0e06b9ef * Added the UML utilities (in particular for tunctl). mconsole is
not built since it requires readline, which we don't have right now.

svn path=/nixpkgs/trunk/; revision=804
2004-02-18 16:22:31 +00:00
Eelco Dolstra 428f8b4ca3 * Upgraded vlc to 0.7.0.
svn path=/nixpkgs/trunk/; revision=800
2004-02-18 08:17:48 +00:00