Commit graph

1789 commits

Author SHA1 Message Date
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
ec232441a2 * Valgrind: upgrade to 2.1.1.
svn path=/nixpkgs/trunk/; revision=966
2004-04-22 14:38:43 +00:00
Eelco Dolstra
1049ba5906 * Specified MD5 hash.
svn path=/nixpkgs/trunk/; revision=940
2004-04-14 12:55:37 +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
02ec562596 * GHC now works again.
svn path=/nixpkgs/trunk/; revision=925
2004-04-07 14:16:57 +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
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
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
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
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
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
68327c3a9d * Fix brokenness due to automatic transformations.
svn path=/nixpkgs/trunk/; revision=879
2004-03-30 12:40:55 +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
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
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
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
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
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
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
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
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
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
428f8b4ca3 * Upgraded vlc to 0.7.0.
svn path=/nixpkgs/trunk/; revision=800
2004-02-18 08:17:48 +00:00
Eelco Dolstra
56712d5032 * Export a variation point `zlibSupport'.
svn path=/nixpkgs/trunk/; revision=796
2004-02-17 20:02:31 +00:00
Eelco Dolstra
9261c1eaa5 * Added wxPython.
svn path=/nixpkgs/trunk/; revision=795
2004-02-17 19:19:26 +00:00
Eelco Dolstra
057ad6798c * Export a variation point `compat22' to specify compatibility with
wxWindows 2.2.

svn path=/nixpkgs/trunk/; revision=794
2004-02-17 19:18:46 +00:00
Eelco Dolstra
191a465665 * Added GHC and Helium. Note that GHC is built using a pre-built GHC
for Linux/x86, which is not pure and doesn't work on other
  platforms!

svn path=/nixpkgs/trunk/; revision=776
2004-02-12 13:18:24 +00:00
Martin Bravenboer
103d1b2c83 Added version 2.6.5 of libxml2
svn path=/nixpkgs/trunk/; revision=750
2004-02-04 16:36:22 +00:00
Eelco Dolstra
9a4afa3f94 * Fix undefined variables.
svn path=/nixpkgs/trunk/; revision=744
2004-02-03 14:44:48 +00:00
Eelco Dolstra
3f6bf521fc * Flex required M4 at runtime.
svn path=/nixpkgs/trunk/; revision=734
2004-01-30 17:23:34 +00:00
Eelco Dolstra
9249f4c892 * Bleeding edge Bison.
svn path=/nixpkgs/trunk/; revision=730
2004-01-30 15:52:17 +00:00
Eelco Dolstra
c0bdcfe274 * A much newer version of flex. The old (GNU) one was from 1997.
svn path=/nixpkgs/trunk/; revision=727
2004-01-30 10:10:06 +00:00
Eelco Dolstra
66c3040dbb * Semicolons at the end of an attrset are now required.
svn path=/nixpkgs/trunk/; revision=726
2004-01-29 14:28:16 +00:00
Eelco Dolstra
41c54dd4d9 * j2sdk should not refer to /tmp/j2sdk-1_4_2_03-linux-i586.bin in this
way, since it prevents store expression from being instantiated from
  all-packages-generic.nix. 

svn path=/nixpkgs/trunk/; revision=721
2004-01-26 11:05:07 +00:00
Eelco Dolstra
91184df3b2 * Teletext support for zapping.
svn path=/nixpkgs/trunk/; revision=719
2004-01-25 08:51:03 +00:00
Martin Bravenboer
d9cebb072f Added Apache Ant, including configuration of JAVA_HOME and ANT_HOME. Currently only the shell script is patched, but this one is used most in practice.
svn path=/nixpkgs/trunk/; revision=718
2004-01-25 00:50:00 +00:00
Martin Bravenboer
067726f3e2 * Added the j2sdk of Sun for Linux. Downloading this thing is
a big problem, so I decided to require to user to get the
          file and put it in some location in the file system. wget
          doesn't seem to accept the file scheme however, so I had to
          move the copying into the builder itself. The builder checks
          the md5 hash of the downloaded file. Maybe having a separate
          'fetchfile' would be useful to make a file in the outside
          world pure. I tried to add this to build-support, but this
          obviously did not work. I still committed it. Just remove it
          if you think that it sucks.

svn path=/nixpkgs/trunk/; revision=716
2004-01-24 23:46:00 +00:00
Martin Bravenboer
02a4d8ece5 Added jikes, IBM's open source java compiler.
svn path=/nixpkgs/trunk/; revision=715
2004-01-24 22:50:47 +00:00
Martin Bravenboer
94f9bd408e Added the j2re for Linux. My installation of Eclipse runs on an j2re installed in Nix, so I guess it works pretty well. Of course other platforms should be added. This version will not be installed if the platform is not i686-linux.
svn path=/nixpkgs/trunk/; revision=714
2004-01-24 22:04:09 +00:00
Martin Bravenboer
7e813f0999 Added all indivudual packages of the sdf2-bundle
svn path=/nixpkgs/trunk/; revision=708
2004-01-22 19:55:37 +00:00
Martin Bravenboer
4c14c369fe Added sglr
svn path=/nixpkgs/trunk/; revision=707
2004-01-22 19:09:49 +00:00
Martin Bravenboer
362cba8ada Added pt-support 1.0
svn path=/nixpkgs/trunk/; revision=706
2004-01-22 18:57:34 +00:00
Martin Bravenboer
3d0e24c639 Added toolbuslib. This is fun
svn path=/nixpkgs/trunk/; revision=705
2004-01-22 18:46:26 +00:00
Martin Bravenboer
ffa5434646 Expression for aterm 2.0.5 at CWI
svn path=/nixpkgs/trunk/; revision=704
2004-01-22 18:13:16 +00:00
Eelco Dolstra
7bee8f0414 * Added Valgrind.
svn path=/nixpkgs/trunk/; revision=685
2004-01-21 14:50:18 +00:00
Eelco Dolstra
823b3e4770 * Added `zapping', a TV viewer application. It depends on Gnome, so
lots of packages are needed.

svn path=/nixpkgs/trunk/; revision=681
2004-01-21 09:34:19 +00:00
Eelco Visser
5fb4265643 clone trunk.nix for building distribution
svn path=/nixpkgs/trunk/; revision=602
2003-12-25 12:21:41 +00:00
Eelco Visser
e2570fd7b7 built StrategoXT from subversion; not sure whether there are problems
with shared libraries.

svn path=/nixpkgs/trunk/; revision=601
2003-12-24 15:58:48 +00:00
Eelco Visser
02a743eb7a junk
svn path=/nixpkgs/trunk/; revision=598
2003-12-23 21:32:25 +00:00
Eelco Visser
d5ec705667 Apparently libtool cannot be installed separately from autoconf
and automake. Copying the files in $libtool/share/aclocal to 
$autoconf/share/aclocal does not work (and causes collisions when
installing the tools in the user environment). The solution seems to
be to install the three distributions in one single $out directory,
i.e., consider them as one package.
 

svn path=/nixpkgs/trunk/; revision=597
2003-12-23 21:31:06 +00:00
Eelco Visser
b4ce40af2b added packages: which, libtool
aggregation in all-packages-generic: autotools
building strategoxt from svn

not complete yet since autconf cannot find libtool


svn path=/nixpkgs/trunk/; revision=596
2003-12-23 20:51:58 +00:00
Eelco Dolstra
5e7f5b2ada * Upgrade to Subversion 0.35.1, Berkeley DB 4.2.52.
svn path=/nixpkgs/trunk/; revision=595
2003-12-22 18:30:38 +00:00
Eelco Dolstra
480d68ece3 * Added some missing semicolons.
* Some packages needed for the Subversion server.

svn path=/nixpkgs/trunk/; revision=586
2003-12-21 20:52:13 +00:00
Eelco Visser
e995558293 Nix expressions for sdf, strategoxt, and tiger.
svn path=/nixpkgs/trunk/; revision=581
2003-12-12 14:46:30 +00:00
Eelco Dolstra
57fd5644d2 * vlc and required packages. Finally a good DVD player :-)
svn path=/nixpkgs/trunk/; revision=574
2003-12-03 21:58:16 +00:00
Eelco Dolstra
58c20ef428 * Added autoconf/automake.
svn path=/nixpkgs/trunk/; revision=540
2003-11-25 13:46:24 +00:00
Eelco Dolstra
ef2f51e930 * Added libxslt.
svn path=/nixpkgs/trunk/; revision=539
2003-11-25 13:45:51 +00:00
Eelco Dolstra
cf9df60603 * Propagate libz.
svn path=/nixpkgs/trunk/; revision=538
2003-11-25 13:45:35 +00:00
Eelco Dolstra
026ff9466a * Rename .fix -> .nix.
svn path=/nixpkgs/trunk/; revision=511
2003-11-18 12:12:56 +00:00
Eelco Dolstra
48c3faca51 * Renamed pkgs-ng to pkgs.
svn path=/nixpkgs/trunk/; revision=502
2003-11-14 09:59:13 +00:00