nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,819 Commits 340 Branches 124 Tags 7.3 GiB
8a080a699e
Commit Graph

444 Commits

Author SHA1 Message Date
Eelco Dolstra
39c3cd4259 * Get rid of all the phase wrapper functions, just do that generically 
in genericBuild.  This also means that you can override a phase
  function by redefining it, like

    buildPhase() {
      ... do something ...
    }

  and you still get the log nesting stuff.

* GNUmakefile is also a valid makefile name.

* Evaluate the variables $preHook and $postHook to allow more stdenv
  overrideability.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10786
 2008-02-20 17:10:36 +00:00
Eelco Dolstra
0ebff4e1d0 * buildPhase: skip if there is no Makefile (just like configurePhase 
is skipped when there is no configure script).  So you don't need to
  set

    buildPhase = "true";

  for derivations that don't have any build action.

* Variable $makefile to allow the makefile to be specified.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10784
 2008-02-20 15:16:48 +00:00
Michael Raskin
2a087141cb Ported replace renaming to replace-literal to avoid conflict with MySQL package supplying own tool with name replace. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10704
 2008-02-15 11:14:40 +00:00
Eelco Dolstra
89815eb9a0 * gcc-wrapper: Propagate the wrapped gcc, binutils and glibc to the 
user environment.  (NIXPKGS-63)

svn path=/nixpkgs/branches/stdenv-updates/; revision=10664
 2008-02-13 19:41:37 +00:00
Eelco Dolstra
908d8286ce * Add --disable-dependency-tracking to the configure flags if 
possible.  This should speed up builds a bit.  (Suggested by Ludovic
  Courtès.)

svn path=/nixpkgs/branches/stdenv-updates/; revision=10662
 2008-02-13 18:27:19 +00:00
Eelco Dolstra
5f45fb3ae9 * substitute() in stdenv: use the replace program instead of awful 
sed hackery.
* Some indentation fixes in setup.sh.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10658
 2008-02-13 14:23:09 +00:00
Eelco Dolstra
fec087c826 * Bootstrap binaries for powerpc-linux. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10283
 2008-01-25 01:34:20 +00:00
Eelco Dolstra
4c83147793 * Hack, hack, hack. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10282
 2008-01-25 01:28:11 +00:00
Eelco Dolstra
4e01864742 * PowerPC hackery. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10281
 2008-01-24 23:49:02 +00:00
Yury G. Kudryashov
da57804fff Merged with trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10267
 2008-01-23 18:11:03 +00:00
Michael Raskin
776393982c Removed unused setup-sh-defs.nix 
svn path=/nixpkgs/trunk/; revision=10254
 2008-01-22 22:53:40 +00:00
Eelco Dolstra
f516036cbb * Updated bootstrap binaries except for bash which now somehow 
segfaults totally randomly.

svn path=/nixpkgs/branches/stdenv-updates/; revision=9840
 2007-12-03 17:56:44 +00:00
Eelco Dolstra
ff95bc3eea * Use gzip -d / bzip2 -d instead of gunzip / bunzip2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9839
 2007-12-03 17:55:41 +00:00
Eelco Dolstra
31034cb3d1 * Some fixes for rebuilding the bootstrap binaries on x86_64. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9836
 2007-12-03 15:40:29 +00:00
Eelco Dolstra
9a89e44870 * Use gzip/bzip2 instead of gunzip/bunzip2 in the bootstrap binaries. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9834
 2007-12-03 12:15:35 +00:00
Eelco Dolstra
d04b560dc3 * fgrep and egrep aren't shell scripts anymore. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9802
 2007-11-26 15:59:07 +00:00
Eelco Dolstra
3237b446b9 svn path=/nixpkgs/branches/stdenv-updates/; revision=9775 2007-11-22 12:39:51 +00:00
Eelco Dolstra
8b3186528e * pcre: don't compile with C++ support when doing a dietlibc build. 
* GCC 4.2: restore the ability to build a statically linked compiler,
  needed for the Nixpkgs bootstrap.
* GCC 4.2: use symlinks instead of hard links in $out/bin
  (NIXPKGS-62).

svn path=/nixpkgs/branches/stdenv-updates/; revision=9771
 2007-11-21 19:28:54 +00:00
Yury G. Kudryashov
784227b421 Removed setup-new-2.sh and setup-new.sh symlinks 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9745
 2007-11-17 15:29:48 +00:00
Yury G. Kudryashov
b37d00ce1f Now all the files setup-new-2.sh, setup-new.sh and setup.sh are the same file. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9744
 2007-11-17 15:29:42 +00:00
Yury G. Kudryashov
5adba2d3f3 Removed setup-new-2.sh and setup-new.sh symlinks 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9742
 2007-11-17 15:18:56 +00:00
Yury G. Kudryashov
dd837dae4e Now all the files setup-new-2.sh, setup-new.sh and setup.sh are the same file. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9741
 2007-11-17 15:17:01 +00:00
Yury G. Kudryashov
a6797a6f4e Removed setup-new-2.sh and setup-new.sh symlinks 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9739
 2007-11-17 14:34:56 +00:00
Yury G. Kudryashov
f2b2932ee2 Spacing in setup.sh 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9738
 2007-11-17 14:34:49 +00:00
Yury G. Kudryashov
51a3cde784 Now all the files setup-new-2.sh, setup-new.sh and setup.sh are the same file. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9736
 2007-11-17 14:34:27 +00:00
Michael Raskin
43b208bbb9 Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant) 
svn path=/nixpkgs/trunk/; revision=9613
 2007-11-09 13:54:02 +00:00
Marc Weber
a589bdf7db createShScript proposal added 
svn path=/nixpkgs/trunk/; revision=9609
 2007-11-08 19:03:23 +00:00
Yury G. Kudryashov
2a79431f99 add_to_var renamed to addToSearchPath 
svn path=/nixpkgs/trunk/; revision=9498
 2007-10-19 20:26:06 +00:00
Yury G. Kudryashov
c4c17a7843 Fixed typo, added function add_to_var 
The function for use in setup hooks. The syntax is very simple:

add_to_var varName needDir addDir prefix

If the directory $prefix$needDir exists, directory $prefix$addDir is added to
variable named varName (using PATH_DELIMITER as delimiter). If addDir is "", it
defaults to needDir (this is a most common case).

svn path=/nixpkgs/trunk/; revision=9496
 2007-10-19 19:29:36 +00:00
Marc Weber
ec3c6e932a Thanks urkud for pointing me to the wrong implementation of PATH_DELIMITER - fixed 
svn path=/nixpkgs/trunk/; revision=9352
 2007-09-20 21:06:26 +00:00
Yury G. Kudryashov
b840189493 Added prefixKey to stdenv/generic/setup-new-2.sh 
Now you can write prefixKey="-prefix " and "-prefix ${out}" will be inserted in
configureFlags (instead of "--prefix ${out}").

svn path=/nixpkgs/trunk/; revision=9351
 2007-09-20 19:52:38 +00:00
Michael Raskin
de45e0e929 svn path=/nixpkgs/trunk/; revision=9347 2007-09-20 18:25:43 +00:00
Marc Weber
98e33c38df removing by accident added -x 
svn path=/nixpkgs/trunk/; revision=9321
 2007-09-13 10:25:56 +00:00
Marc Weber
78587bf74b PATH_DELIMITER added and some trailing whitespaces removed 
svn path=/nixpkgs/trunk/; revision=9320
 2007-09-13 09:34:21 +00:00
Yury G. Kudryashov
6fc617391d setup-new-2.sh: rewritten stripping code in more configurable way. 
svn path=/nixpkgs/trunk/; revision=9237
 2007-09-01 18:40:06 +00:00
Yury G. Kudryashov
d215554ba4 Removed duplicated code for moving doc, man and info into share/ subdir. 
svn path=/nixpkgs/trunk/; revision=9236
 2007-09-01 18:34:16 +00:00
Marc Weber
c383f04b8f I don't like cluttering up scripts using many ifs.. Do you like an assertEnvExists function ? I think we might want to use it more than twice in the future. 
svn path=/nixpkgs/trunk/; revision=9224
 2007-08-31 03:58:40 +00:00
Marc Weber
b3d955ae2e installBin proposal 
svn path=/nixpkgs/trunk/; revision=9220
 2007-08-30 15:50:30 +00:00
Michael Raskin
c263b309e1 Added setup-sh-defs, a draft for composing builder from predefined strings, so that substitution change doesn't ruin every package. Not cleaned.. 
svn path=/nixpkgs/trunk/; revision=9215
 2007-08-28 23:28:21 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/. 
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
 2007-08-27 13:01:33 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl 
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
 2007-08-24 12:32:36 +00:00
Marc Weber
f1cf8d1d7a adding purityPhase hasen't been such a good idea - untested and if a small thing changes everything has to be rebuilt.. 
svn path=/nixpkgs/trunk/; revision=9174
 2007-08-20 13:39:59 +00:00
Marc Weber
a9f676e098 unpackSource is to be included in phases .. So you can set phases after calling unpackSource manually 
cd $rootSource is called at end of unpackPhase

svn path=/nixpkgs/trunk/; revision=9161
 2007-08-18 18:42:18 +00:00
Michael Raskin
b184b70ee4 Added setup-new-2.sh, mostly based on patch to setup.sh by Yurii Kudryashov (urkud). 
svn path=/nixpkgs/trunk/; revision=9154
 2007-08-18 14:47:09 +00:00
Yury G. Kudryashov
67d41efde1 Added some parts of kde-4. It doesn't work yet, but I need version control 
svn path=/nixpkgs/trunk/; revision=9049
 2007-08-05 13:54:42 +00:00
Eelco Dolstra
acddd261c8 * substituteAll: support arbitrary characters in replacements 
(including newlines, backslash, etc.).

svn path=/nixpkgs/trunk/; revision=8882
 2007-06-15 11:34:46 +00:00
Eelco Dolstra
210f4950ac * Merge setup-new.sh. 
svn path=/nixpkgs/trunk/; revision=8757
 2007-05-24 15:29:32 +00:00
Eelco Dolstra
cbc8eee7ac * stdenv: new attribute is64bit. 
* stdenv: for convience, provide the library functions in
  pkgs/lib/default.nix through the lib attribute.

svn path=/nixpkgs/trunk/; revision=8740
 2007-05-24 13:32:18 +00:00
Eelco Dolstra
9e960a4fb6 * Predicate `isi686'. 
svn path=/nixpkgs/trunk/; revision=8721
 2007-05-20 20:25:06 +00:00
Eelco Dolstra
a86e3bbf54 * Rebuilt the bootstrap binaries, mostly to fix curl (DNS resolution 
in dietlibc was broken).

svn path=/nixpkgs/trunk/; revision=7745
 2007-01-22 15:08:16 +00:00
Eelco Dolstra
c240a4774d * ensureDir: allow multiple directories. 
* Eval $unpackCmd.

svn path=/nixpkgs/trunk/; revision=7617
 2007-01-10 15:44:44 +00:00
Eelco Dolstra
75b6eec2d5 * Second attempt. 
svn path=/nixpkgs/trunk/; revision=7521
 2006-12-31 19:52:41 +00:00
Eelco Dolstra
5c192229b0 * Urgh. 
svn path=/nixpkgs/trunk/; revision=7520
 2006-12-31 19:10:40 +00:00
Eelco Dolstra
a26e70c2af * Quick attempt at fixing stdenv-mingw. 
svn path=/nixpkgs/trunk/; revision=7519
 2006-12-31 19:07:33 +00:00
Eelco Dolstra
1d4d77179c * Always set the prefix. 
svn path=/nixpkgs/trunk/; revision=7513
 2006-12-28 21:12:44 +00:00
Eelco Dolstra
98e5779a9b * Don't clobber $shell. 
svn path=/nixpkgs/trunk/; revision=7512
 2006-12-28 11:32:20 +00:00
Eelco Dolstra
bb9f4a2280 * Workaround a bug in older versions of bash. 
svn path=/nixpkgs/trunk/; revision=7511
 2006-12-28 11:15:12 +00:00
Eelco Dolstra
0eff9a5236 * Fix stdenv-initial. 
svn path=/nixpkgs/trunk/; revision=7510
 2006-12-28 10:54:39 +00:00
Eelco Dolstra
d15205f8b8 * Set the shell. 
svn path=/nixpkgs/trunk/; revision=7504
 2006-12-27 18:42:58 +00:00
Eelco Dolstra
138c0ae751 * Merge the new generic builder. 
* Removed substitute, it's part of the generic builder now.
* stdenv-initial (Linux): use the real generic builder script.  This
  does require that sed is in the path of the builder of the initial
  stdenv.

svn path=/nixpkgs/trunk/; revision=7498
 2006-12-27 18:14:57 +00:00
Eelco Dolstra
7a2c0d1793 * Doh. 
svn path=/nixpkgs/trunk/; revision=7496
 2006-12-27 17:55:57 +00:00
Eelco Dolstra
2dd4e1b9d3 * Remove dontMakeInstall, it's no longer necessary (just set 
installCommand to true or something).

svn path=/nixpkgs/trunk/; revision=7495
 2006-12-27 17:48:46 +00:00
Eelco Dolstra
8ab9a58e0d * Split the installPhase into installPhase and fixupPhase. The 
fixupPhase strips binaries, runs patchelf, etc.  This is so that
  those things still happen when somebody overrides installPhase.

svn path=/nixpkgs/trunk/; revision=7494
 2006-12-27 17:47:09 +00:00
Eelco Dolstra
1d9dcbba22 * Allow the patch flags to be overriden through $patchFlags. 
svn path=/nixpkgs/trunk/; revision=7493
 2006-12-27 17:33:37 +00:00
Eelco Dolstra
8988c16eea * Pass makeFlags to `make check'. 
svn path=/nixpkgs/trunk/; revision=7492
 2006-12-27 17:31:55 +00:00
Eelco Dolstra
ed8fff32af * Pass makeFlags to `make install' as well. This is because quite 
often the same flags need to be passed to both `make' and `make
  install'.  Added a variable buildFlags for flags that should only be
  passed to `make'.

svn path=/nixpkgs/trunk/; revision=7491
 2006-12-27 17:30:40 +00:00
Eelco Dolstra
81025a05df * Variable $installTargets to override the install target in 
installPhase.

svn path=/nixpkgs/trunk/; revision=7490
 2006-12-27 17:26:43 +00:00
Eelco Dolstra
592cb44e52 * Fix the quadratic performance in substitute(). 
svn path=/nixpkgs/trunk/; revision=7488
 2006-12-27 17:14:00 +00:00
Eelco Dolstra
0a91ca3091 * Allow "make install" to be overriden using $installCommand. 
svn path=/nixpkgs/trunk/; revision=7340
 2006-12-13 20:08:24 +00:00
Eelco Dolstra
e002f96a56 * TMI. 
svn path=/nixpkgs/trunk/; revision=7315
 2006-12-11 15:46:54 +00:00
Eelco Dolstra
7dfbf0eba7 * Move the substitution functions into stdenv (not merged yet). 
* If the environment variable buildCommand is set, then eval that
  instead of doing the build phases.  This is used by the runCommand
  function in all-packages.nix to allow one-lines like

    foo = runCommand "foo" {} "mkdir $out; echo foo > $out/foo";
    

svn path=/nixpkgs/trunk/; revision=7298
 2006-12-10 22:24:42 +00:00
Martin Bravenboer
d7fcf2f810 Added /usr/local/bin to the initial search path to support Massala 
svn path=/nixpkgs/trunk/; revision=7011
 2006-11-13 10:09:56 +00:00
Eelco Dolstra
9a6683d6a2 * Linux kernel: updated to 2.6.18.1. 
* Kernel: accept a list of kernel patches through the kernelPatches
  argument.  The names of the patches are added to the description
  attribute (e.g., "The Linux kernel (with patches:
  skas-2.6.18-v9-pre9)").
* Generic builder (forked in setup-new.sh): support patches that are
  compressed using gzip or bzip2.

svn path=/nixpkgs/trunk/; revision=6913
 2006-10-31 11:40:35 +00:00
Eelco Dolstra
9050bc10fe * Latest bootstrap binaries for x86_64. 
svn path=/nixpkgs/trunk/; revision=6907
 2006-10-30 13:40:18 +00:00
Eelco Dolstra
37bbcde566 * Don't nuke unconditionally. 
svn path=/nixpkgs/trunk/; revision=6905
 2006-10-30 12:57:30 +00:00
Eelco Dolstra
f0a239989e * __currentSystem is evil. 
svn path=/nixpkgs/trunk/; revision=6899
 2006-10-29 00:05:17 +00:00
Eelco Dolstra
0c0d30d248 * Fix the URLs / hashes. 
svn path=/nixpkgs/trunk/; revision=6891
 2006-10-28 13:51:49 +00:00
Eelco Dolstra
bfa469d192 * New (smaller) bootstrap binaries for powerpc. 
svn path=/nixpkgs/trunk/; revision=6889
 2006-10-28 13:35:22 +00:00
Eelco Dolstra
64f8e95cf8 * Remove references from some GCC header file on powerpc. 
svn path=/nixpkgs/trunk/; revision=6888
 2006-10-28 13:32:49 +00:00
Eelco Dolstra
3a6754f6bb * gcc-4.1-temp -> gcc-4.1. 
* Use real URLs.

svn path=/nixpkgs/trunk/; revision=6884
 2006-10-27 23:14:41 +00:00
Eelco Dolstra
c37304db96 * Oops, the bootstrap tools contained an impure gzip/gunzip. 
* To prevent this kind of thing, check that all tools are statically
  linked.
* Use findutils 4.2.27, 4.2.28 doesn't build with dietlibc.

svn path=/nixpkgs/trunk/; revision=6881
 2006-10-27 22:50:58 +00:00
Eelco Dolstra
de25bee83d * Of course, the latest GNU tar has the same gnulib header file shit 
as coreutils.

svn path=/nixpkgs/trunk/; revision=6880
 2006-10-27 20:14:19 +00:00
Eelco Dolstra
3ea7d9d272 * Fix static linking in gcc. 
* Use the coreutils in dietlibc.
* Add objdump to the binutils static tarball.

svn path=/nixpkgs/trunk/; revision=6879
 2006-10-27 20:08:53 +00:00
Eelco Dolstra
01fbf62a2c * nativeGlibc -> nativeLibc (gcc-cross-wrapper is probably broken 
right now; should merge gcc-wrapper changes).

svn path=/nixpkgs/trunk/; revision=6876
 2006-10-27 13:44:17 +00:00
Eelco Dolstra
0e776c19d2 * Real URLs. 
svn path=/nixpkgs/trunk/; revision=6869
 2006-10-26 22:55:04 +00:00
Eelco Dolstra
609710f102 * Enable the pure stdenv-linux for powerpc. 
svn path=/nixpkgs/trunk/; revision=6867
 2006-10-26 22:41:46 +00:00
Eelco Dolstra
0b7e256162 * Hook variables in the generic builder are now executed using eval. 
This has a major advantage: you can write hooks directly in Nix
  expressions.  For instance, rather than write a builder like this:

    source $stdenv/setup

    postInstall=postInstall
    postInstall() {
        ln -sf gzip $out/bin/gunzip
        ln -sf gzip $out/bin/zcat
    }

    genericBuild

  (the gzip builder), you can just add this attribute to the
  derivation:

    postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat";

  and so a separate build script becomes unnecessary.  This should
  allow us to get rid of most builders in Nixpkgs.

* Allow configure and make arguments to contain whitespace.
  Previously, you could say, for instance

    configureFlags="CFLAGS=-O0"

  but not

    configureFlags="CFLAGS=-O0 -g"

  since the `-g' would be interpreted as a separate argument to
  configure.  Now you can say

    configureFlagsArray=("CFLAGS=-O0 -g")

  or similarly

    configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar")

  which does the right thing.  Idem for makeFlags, installFlags,
  checkFlags and distFlags.

  Unfortunately you can't pass arrays to Bash through the environment,
  so you can't put the array above in a Nix expression, e.g.,

    configureFlagsArray = ["CFLAGS=-O0 -g"];

  since it would just be flattened to a since string.  However, you
  can use the inline hooks described above:

    preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";


svn path=/nixpkgs/trunk/; revision=6863
 2006-10-26 22:20:25 +00:00
Eelco Dolstra
43fb5626d6 * Bootstrap tools for the pure stdenv-linux on powerpc-linux. 
svn path=/nixpkgs/trunk/; revision=6860
 2006-10-26 20:07:49 +00:00
Eelco Dolstra
554ea561dd * coreutils won't build with dietlibc on ppc. 
svn path=/nixpkgs/trunk/; revision=6858
 2006-10-26 15:02:16 +00:00
Eelco Dolstra
47d7e73abb * Real URLs. 
svn path=/nixpkgs/trunk/; revision=6853
 2006-10-25 17:27:32 +00:00
Eelco Dolstra
b831b236ba * Use the pure stdenv on x86_64. 
svn path=/nixpkgs/trunk/; revision=6849
 2006-10-25 13:27:43 +00:00
Eelco Dolstra
371d2ddbf2 * Back out r6830. 
svn path=/nixpkgs/trunk/; revision=6846
 2006-10-25 11:06:44 +00:00
Eelco Dolstra
3ba5d075a4 * New binaries. 
svn path=/nixpkgs/trunk/; revision=6845
 2006-10-25 10:56:26 +00:00
Eelco Dolstra
9c611a19c6 * Glibc no longer containing profiling libraries. 
* GCC no longer does a multilib build.

svn path=/nixpkgs/trunk/; revision=6842
 2006-10-25 09:51:32 +00:00
Eelco Dolstra
c8b1035c4f * Doh. 
svn path=/nixpkgs/trunk/; revision=6839
 2006-10-25 07:48:59 +00:00
Eelco Dolstra
69ee353dc7 * glibc-2.5 is the default now. 
* Remove gcc-static-3.4.

svn path=/nixpkgs/trunk/; revision=6831
 2006-10-24 22:23:20 +00:00
Eelco Dolstra
f6f207e054 * Simplify, simplify. 
svn path=/nixpkgs/trunk/; revision=6830
 2006-10-24 22:20:45 +00:00
Eelco Dolstra
821b647832 * Rename. 
svn path=/nixpkgs/trunk/; revision=6829
 2006-10-24 20:57:51 +00:00
Eelco Dolstra
18d730980c * Switching to the new stdenv-linux. 
svn path=/nixpkgs/trunk/; revision=6828
 2006-10-24 20:57:06 +00:00
Eelco Dolstra
60a9aa66bf * Switching. 
svn path=/nixpkgs/trunk/; revision=6827
 2006-10-24 20:53:54 +00:00
Eelco Dolstra
ec0d20103c * Fixed tar. 
svn path=/nixpkgs/trunk/; revision=6826
 2006-10-24 19:35:26 +00:00
Eelco Dolstra
6e2f394e6d * Strip tar, curl. 
svn path=/nixpkgs/trunk/; revision=6824
 2006-10-24 19:29:12 +00:00
Eelco Dolstra
b342dcb13b * gcc-wrapper: separately store the flags necessary to find GCC and 
Glibc.  This is useful when building GCC.
* gcc-wrapper: the dynamic linker has a different name on x86_64 and
  powerpc.
* gcc-wrapper: "glibc" -> "libc", because someday we might support
  different C libraries.
* gcc: don't do a multilib build (e.g., 32-bit support on x86_64),
  don't need it.
* gcc: merge in support for static builds.
* gcc: various simplifications in the compiler/linker flags, hope they
  work.

svn path=/nixpkgs/trunk/; revision=6823
 2006-10-24 18:26:23 +00:00
Eelco Dolstra
5e25253768 * Dietlibc tar doesn't work on x86_64, use one statically linked with 
glibc.
* Doh!  $tar/bin/tar should have been $gnutar/bin/tar, so we copied
  /bin/tar!

svn path=/nixpkgs/trunk/; revision=6821
 2006-10-24 17:24:04 +00:00
Eelco Dolstra
a6d3ed3074 * Copy gcc's lib64 to the bootstrap tarball. 
svn path=/nixpkgs/trunk/; revision=6819
 2006-10-24 12:45:55 +00:00
Eelco Dolstra
0cf5154681 * Build a static GCC, properly. (Reminder: when building GCC on an 
impure x86_64 environment, make sure that the 32-bit GCC / Glibc
  libraries are installed, such as /usr/lib/crti.o.)

svn path=/nixpkgs/trunk/; revision=6818
 2006-10-24 11:36:19 +00:00
Eelco Dolstra
8298be4ccf * Statically linked binaries for the stdenv-linux bootstrap on 
x86_64.  Glibc doens't build yet, though (it needs libgcc_eh, which
  is strangely missing from the static GCC build).

svn path=/nixpkgs/trunk/; revision=6815
 2006-10-23 21:56:49 +00:00
Eelco Dolstra
1a060e3b81 * x86_64 changes. 
svn path=/nixpkgs/trunk/; revision=6814
 2006-10-23 21:52:36 +00:00
Eelco Dolstra
87e86fb538 * Cleanup. 
svn path=/nixpkgs/trunk/; revision=6811
 2006-10-23 20:20:25 +00:00
Eelco Dolstra
4db491be54 * Can't use dietlibc for gawk on x86_64, not enough libm functionality. 
svn path=/nixpkgs/trunk/; revision=6810
 2006-10-23 20:16:37 +00:00
Eelco Dolstra
b495d3f65e * Trying to get gcc-static to build on x86_64. Still doesn't work though. 
svn path=/nixpkgs/trunk/; revision=6809
 2006-10-23 18:56:43 +00:00
Eelco Dolstra
13c3591485 * Add x86_64-linux to the isLinux attribute. 
svn path=/nixpkgs/trunk/; revision=6806
 2006-10-23 17:43:03 +00:00
Eelco Dolstra
84dd812f33 Finally, the new stdenv-linux. 
* The statically linked bootstrap tools are now automatically
  reproducable, just do:

  $ nix-build ./make-bootstrap-tools.nix

  The resulting binaries in result/in-nixpkgs go to
  stdenv/linux/bootstrap/<platform>/, and the tarballs in
  result/on-server go to
  https://svn.cs.uu.nl:12443/repos/trace/tarballs/trunk/stdenv-linux/<platform>/<revision>/.
  These are checked out on nix.cs.uu.nl under http://.../dist/tarballs.

* The statically linked libraries all use dietlibc now (except
  patchelf and glibc), so they are much smaller.  This is especially
  nice for the tools in the Nixpkgs tree, since it makes Nixpkgs
  tarballs smaller.

* Use Binutils 2.17 and GCC 4.1.1 for the bootstrap.

* The stdenv is now based on Glibc 2.5.  I hope it works ;-)

svn path=/nixpkgs/trunk/; revision=6803
 2006-10-23 14:27:34 +00:00
Eelco Dolstra
03a243a5e1 * We do need libgcc_s.so. 
svn path=/nixpkgs/trunk/; revision=6800
 2006-10-23 12:21:35 +00:00
Eelco Dolstra
2caebdb82d * Use Binutils 2.17. 
svn path=/nixpkgs/trunk/; revision=6799
 2006-10-23 11:43:36 +00:00
Eelco Dolstra
ffdf59a99d * Glibc needs gzip. 
svn path=/nixpkgs/trunk/; revision=6797
 2006-10-21 22:22:04 +00:00
Eelco Dolstra
0b85530440 * Add diffutils. 
svn path=/nixpkgs/trunk/; revision=6795
 2006-10-20 22:23:36 +00:00
Eelco Dolstra
f5502aaba7 * Add gawk. 
svn path=/nixpkgs/trunk/; revision=6794
 2006-10-20 20:57:31 +00:00
Eelco Dolstra
207bba1367 * Add GNU make. 
svn path=/nixpkgs/trunk/; revision=6793
 2006-10-20 20:18:21 +00:00
Eelco Dolstra
3d2e573eff * GNU sed 4.1.5 compiled with dietlibc gives "Memory exhausted" errors 
on trivial patterns, so use an older sed instead (4.1.2).  See
  http://linuxfromscratch.org/pipermail/hlfs-dev/2005-September/002447.html.

svn path=/nixpkgs/trunk/; revision=6792
 2006-10-20 20:05:26 +00:00
Eelco Dolstra
65bbb45ab7 * Add findutils to the bootstrap tools. 
svn path=/nixpkgs/trunk/; revision=6791
 2006-10-20 16:01:38 +00:00
Eelco Dolstra
692168db6c * Add the glibc static tarball. 
svn path=/nixpkgs/trunk/; revision=6789
 2006-10-20 12:50:45 +00:00
Eelco Dolstra
9cfda380c8 * Add a statically linked patchelf. 
svn path=/nixpkgs/trunk/; revision=6788
 2006-10-20 11:50:08 +00:00
Eelco Dolstra
263e4dd623 * Add the statically linked GCC. 
svn path=/nixpkgs/trunk/; revision=6785
 2006-10-20 11:16:15 +00:00
Eelco Dolstra
63720cf493 * Add gzip, binutils. Getting there... 
svn path=/nixpkgs/trunk/; revision=6784
 2006-10-20 10:13:07 +00:00
Eelco Dolstra
884e8571c3 * Add grep. 
svn path=/nixpkgs/trunk/; revision=6783
 2006-10-19 22:47:51 +00:00
Eelco Dolstra
1acd2157cc * Add patch, sed. 
svn path=/nixpkgs/trunk/; revision=6782
 2006-10-19 22:31:08 +00:00
Eelco Dolstra
c6ecc900cf * Add more stuff to the bootstrap builder. 
* Remove some redundant *Diet values in all-packages.nix.

svn path=/nixpkgs/trunk/; revision=6780
 2006-10-19 21:36:51 +00:00
Eelco Dolstra
fc56793b67 * Start of a Nix expression that builds and gathers all the statically 
linked tools necessary for bootstrapping stdenv-linux.

svn path=/nixpkgs/trunk/; revision=6778
 2006-10-19 18:03:13 +00:00
Eelco Dolstra
1ef55666d0 * Dead file. 
svn path=/nixpkgs/trunk/; revision=6777
 2006-10-19 17:55:11 +00:00
Eelco Dolstra
8c61b6b62d * No longer used. 
svn path=/nixpkgs/trunk/; revision=6757
 2006-10-18 10:11:42 +00:00
Eelco Dolstra
76405f2b7f * `drv + /path' is deprecated, so don't do that anymore. 
svn path=/nixpkgs/trunk/; revision=6754
 2006-10-17 14:06:18 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=6711
 2006-10-12 13:50:54 +00:00
Eelco Dolstra
368c196a62 * More descriptions. 
svn path=/nixpkgs/trunk/; revision=6709
 2006-10-12 10:53:16 +00:00
Martin Bravenboer
bef5dd93a8 Use ++ for constructing builder args 
svn path=/nixpkgs/trunk/; revision=6643
 2006-10-02 21:16:55 +00:00
Eelco Dolstra
1014ca2ad5 * stdenv.mkDerivation: add any attributes in the "passthru" attribute 
set to the result, but don't use them in the actual derivation (so
  they're not inputs).  Useful to pass through extra attributes that
  are not inputs, but should be made available to Nix expressions
  using the derivation (e.g., in assertions).

svn path=/nixpkgs/trunk/; revision=6521
 2006-09-14 13:30:47 +00:00
Eelco Dolstra
0617704deb * Step 2. Too bad we can't replace files atomically in SVN! 
svn path=/nixpkgs/trunk/; revision=6315
 2006-08-29 18:07:52 +00:00
Eelco Dolstra
5df13f87f4 * Step 1... 
svn path=/nixpkgs/trunk/; revision=6314
 2006-08-29 18:07:33 +00:00
Armijn Hemel
c2f5345172 add attribute isLinux. Nice for packages we only want to build on linux, but on different platforms (currently i686-linux and powerpc-linux) 
svn path=/nixpkgs/trunk/; revision=6306
 2006-08-29 13:45:21 +00:00
Eelco Dolstra
9b3c21b9a4 * Well-typedness. 
svn path=/nixpkgs/trunk/; revision=6296
 2006-08-28 21:23:36 +00:00
Martin Bravenboer
5634042fa9 M stdenv/mingw/pkgs/default.nix 
A    stdenv/mingw/pkgs/pkgconfig-builder.sh

Bootstrap pkg-config: support the setup hook.

M    stdenv/mingw/fix-builder.sh

Fix the "system" variable.


svn path=/nixpkgs/trunk/; revision=6267
 2006-08-27 12:52:06 +00:00
Martin Bravenboer
1838237d25 More variables to fix 
svn path=/nixpkgs/trunk/; revision=6266
 2006-08-27 11:27:25 +00:00
Martin Bravenboer
a2dd4f8905 More variables to fix 
svn path=/nixpkgs/trunk/; revision=6265
 2006-08-27 03:56:58 +00:00
Martin Bravenboer
4b5fd3990a Fix in install of curl 
svn path=/nixpkgs/trunk/; revision=6258
 2006-08-27 00:28:53 +00:00
Martin Bravenboer
961b20c1b7 Added pre release of stratego libraries, fixed support for configureFlags in MinGW, add binary pkg-config distribution for bootstrapping. Optionally use pkgconfig from the stdenv (again, for bootstrapping) 
svn path=/nixpkgs/trunk/; revision=6253
 2006-08-26 20:11:31 +00:00
Martin Bravenboer
f0129a3f44 Fixes to support the new stdenvType 
svn path=/nixpkgs/trunk/; revision=6242
 2006-08-25 20:58:02 +00:00
Eelco Dolstra
a177a9ac7c * When calling all-packages.nix, pass system explicitly and don't rely 
on __currentSystem being "i686-linux", because we might not be on
  "i686-linux".

svn path=/nixpkgs/trunk/; revision=6218
 2006-08-23 16:18:02 +00:00
Eelco Dolstra
ca6ae0b53d * Support different kinds of stdenvs on a particular system (like 
"i686-cygwin") by adding an argument "stdenvType" to specify which
  stdenv to use (like "i686-mingw").

svn path=/nixpkgs/trunk/; revision=6213
 2006-08-23 15:58:54 +00:00
Martin Bravenboer
97202ee3b7 Patch for aterm library on mingw (see meta-devel-list) 
Moved all the shell fixes to fix-builder.sh, which is now always invoked.

Added aterm to the list of packages provided by mingw.nix

svn path=/nixpkgs/trunk/; revision=6152
 2006-08-17 15:33:49 +00:00
Martin Bravenboer
77a5272922 Added a fix-builder to fix most of the builder scripts automatically. Basic packages, such as zlib and getopt now build. 
svn path=/nixpkgs/trunk/; revision=6143
 2006-08-17 01:49:53 +00:00
Martin Bravenboer
18d81e23fe Cleanup of various echo and debug messages. Added top-level mingw.nix for use with nix-env, because many asserts are broken all-packages.nix does not work with mingw stdenv. 
svn path=/nixpkgs/trunk/; revision=6142
 2006-08-17 01:25:46 +00:00
Martin Bravenboer
bda8fc5621 Dropped gcc-wrapper 
svn path=/nixpkgs/trunk/; revision=6141
 2006-08-17 00:55:03 +00:00
Martin Bravenboer
688fff92de Major work on the mingw stdenv. Basics now works. 
- clone of fetchurl that invokes a given chmod to workaround problems
with inappropriate file permissions (executable files are not allowed
by Nix)

- cygpath tool to determine the full windows path of a cygwin
tool. This tool is used to give fetchurl the windows path to chmod.

- native curl.exe

- gcc-wrapper no longer used

- all-packages.nix: allows stdenv to specify fetchurl.


svn path=/nixpkgs/trunk/; revision=6140
 2006-08-17 00:54:32 +00:00
Martin Bravenboer
44f6c2ef74 Build the mingw w32api from source for the mingw stdenv 
svn path=/nixpkgs/trunk/; revision=6137
 2006-08-16 19:13:43 +00:00
Martin Bravenboer
d1f3a668a0 Victory: mingw stdenv with mingw-runtime from source 
svn path=/nixpkgs/trunk/; revision=6136
 2006-08-16 18:35:39 +00:00
Martin Bravenboer
890ce7f266 Cleanup 
svn path=/nixpkgs/trunk/; revision=6135
 2006-08-16 15:48:20 +00:00
Martin Bravenboer
38de63873c Another initial MinGW environment, having some more basic tools. This will allow us to compile some packages for the stdenv from source. 
svn path=/nixpkgs/trunk/; revision=6134
 2006-08-16 15:43:34 +00:00
Martin Bravenboer
4957325c31 Use gcc wrapper 
svn path=/nixpkgs/trunk/; revision=6133
 2006-08-16 15:03:13 +00:00
Martin Bravenboer
5f88a929cc Added mingw gcc 
svn path=/nixpkgs/trunk/; revision=6132
 2006-08-16 14:35:43 +00:00
Martin Bravenboer
884b6f9a0d Added make 
svn path=/nixpkgs/trunk/; revision=6131
 2006-08-16 14:15:00 +00:00
Martin Bravenboer
5992b95b64 Basic stdenv for mingw. No compiler yet and setup needs more fixing. 
svn path=/nixpkgs/trunk/; revision=6124
 2006-08-15 21:25:14 +00:00
Martin Bravenboer
42187add34 Various mingw fixes 
svn path=/nixpkgs/trunk/; revision=6123
 2006-08-15 16:26:21 +00:00
Martin Bravenboer
56315425c9 Initial work on MinGW/MSYS standard environment 
svn path=/nixpkgs/trunk/; revision=6122
 2006-08-15 14:46:41 +00:00
Eelco Dolstra
bf1e734f85 * Don't use the subpath operator (~) anymore, it's subsumed by normal 
concatenation (+).

svn path=/nixpkgs/trunk/; revision=6080
 2006-08-09 15:05:30 +00:00
Eelco Dolstra
f1166e0bbb * Through the magic of functional programming, let stdenv export a 
function to regenerate itself with a different setup script.  This
  is useful for experimenting with changes to the setup script in
  specific packages without triggering a rebuild of everything.

* stdenv/generic/setup-latest.sh is a branch of setup.sh containing
  pending changes that will be merged into setup.sh eventually.

* setup-latest.sh: don't use tar's "z" and "j" flags.  Rather, call
  gzip and bunzip2 directly.

svn path=/nixpkgs/trunk/; revision=6066
 2006-08-07 13:31:18 +00:00
Martin Bravenboer
835f452e70 * Allow packages to enabled shared libraries on cygwin. 
(ideally, this should be the other way around, but I have no idea how
many packages will break if we enable shared libraries by default)


svn path=/nixpkgs/trunk/; revision=5923
 2006-07-24 21:20:49 +00:00
Eelco Dolstra
4c68a103e8 * Pass along realCurl. 
svn path=/nixpkgs/trunk/; revision=5830
 2006-07-20 15:21:36 +00:00
Eelco Dolstra
3defd9a3d3 * On Darwin, use Apple's gcc fork. 
svn path=/nixpkgs/trunk/; revision=5715
 2006-07-14 22:34:24 +00:00
Eelco Dolstra
bf7ca59eaa * Doh! 
svn path=/nixpkgs/trunk/; revision=5708
 2006-07-14 13:34:39 +00:00
Eelco Dolstra
dd325103df * Better stdenv for Darwin: uses gcc, coreutils etc. built in Nix, but 
external binutils (i.e., Apple's cctools in /usr/bin).

svn path=/nixpkgs/trunk/; revision=5706
 2006-07-14 11:59:38 +00:00
Eelco Dolstra
10d67f5c7a * Reviving stdenvNix. 
svn path=/nixpkgs/trunk/; revision=5702
 2006-07-14 09:28:09 +00:00
Eelco Dolstra
b2f6e204a2 * Remove redundant files, move path.nix around a bit. 
svn path=/nixpkgs/trunk/; revision=5701
 2006-07-14 08:35:59 +00:00
Eelco Dolstra
02e13f0eb4 * Regularize the treatment of the "gcc" attributes in 
all-packages.nix.  All "gcc*" attributes are wrapped GCC instances
  now.

svn path=/nixpkgs/trunk/; revision=5671
 2006-07-10 15:42:19 +00:00
Martin Bravenboer
bb9f6fbc59 Support i686-darwin 
svn path=/nixpkgs/trunk/; revision=5597
 2006-07-05 16:33:41 +00:00
Eelco Dolstra
d9d8a1dd57 * Disable dynamic linking on Cygwin until we figure out how to deal 
with the lack of an RPATH.

svn path=/nixpkgs/trunk/; revision=5362
 2006-06-01 09:41:31 +00:00
Eelco Dolstra
c067e6afa2 * Fix stdenv-nix. 
svn path=/nixpkgs/trunk/; revision=5358
 2006-05-31 15:08:25 +00:00
Eelco Dolstra
4a00c41986 * Fix stdenv-native. 
svn path=/nixpkgs/trunk/; revision=5354
 2006-05-31 12:18:01 +00:00
Eelco Dolstra
c4ea3e8d77 * Filter out the meta attribute, again. 
svn path=/nixpkgs/trunk/; revision=5093
 2006-03-24 16:07:42 +00:00
Eelco Dolstra
bb28c87406 * Filter out the meta attribute. 
svn path=/nixpkgs/trunk/; revision=5091
 2006-03-24 14:20:31 +00:00
Eelco Dolstra
baec8f5b38 * stdenv.mkDerivation now takes an optional attribute "meta" that 
contains arbitrary information about a package, like this:

  meta = {
    homepage = "http://gcc.gnu.org/";
    license = "GPL/LGPL";
    description = "GNU Compiler Collection, 4.0.x";
  };

  The "meta" attribute is not passed to the actual derivation
  operation, so it's not a dependency --- changes to "meta" attributes
  don't trigger a recompilation.

  Now we have to standardise some useful attributes ;-)

svn path=/nixpkgs/branches/usability/; revision=5024
 2006-03-10 16:12:46 +00:00
Eelco Dolstra
03aef934d1 * Fix "infinite recursion" errors on FreeBSD and Darwin. 
svn path=/nixpkgs/branches/usability/; revision=4997
 2006-03-08 15:34:05 +00:00
Eelco Dolstra
07bc3fbf00 * Push packages from the final stdenv bootstrapping phase to 
all-packages.  That is, an attribute like "bash" in all-packages.nix
  should evaluate to the "bash" used to build stdenv, it shouldn't
  build a new one.

  Hm, this would be a lot cleaner if we had lazy_rec ;-)

svn path=/nixpkgs/branches/usability/; revision=4775
 2006-02-09 17:04:18 +00:00
Eelco Dolstra
29c64c6c67 * Move top-level/stdenvs.nix to the stdenv/ directory. 
svn path=/nixpkgs/branches/usability/; revision=4774
 2006-02-09 15:55:20 +00:00
Eelco Dolstra
ffe91d36c3 * Merge all-packages.nix into all-packages-generic.nix. 
svn path=/nixpkgs/branches/usability/; revision=4765
 2006-02-08 17:37:45 +00:00
Armijn Hemel
7bd6a3599b use newer curl. This fixes a few security bugs and this static version of curl 
has been built using Nix itself. I've tested this, it works.

svn path=/nixpkgs/trunk/; revision=4451
 2005-12-28 02:02:56 +00:00
Armijn Hemel
62c3e9e7a1 add the statically linked curl-7.15.1 here. 
Now, switching the curl to this version did not trigger a massive rebuild on
my system, which puzzles me. Maybe it is because no checksum is recorded?
Am I doing something wrong?

svn path=/nixpkgs/trunk/; revision=4434
 2005-12-25 01:36:49 +00:00
Eelco Dolstra
82e678362f * "." -> "source". 
svn path=/nixpkgs/trunk/; revision=4335
 2005-12-05 14:11:09 +00:00
Eelco Dolstra
552de99c19 * Update a bunch of base packages. 
svn path=/nixpkgs/trunk/; revision=4065
 2005-10-11 14:29:30 +00:00
Eelco Dolstra
49220563df * Purity fixes, courtesy of NixOS :-) 
svn path=/nixpkgs/trunk/; revision=3675
 2005-08-24 09:21:37 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=3660
 2005-08-22 08:39:27 +00:00
Eelco Dolstra
6f8e9bc2f6 * Make the grep call optional. 
svn path=/nixpkgs/trunk/; revision=3330
 2005-07-13 09:07:54 +00:00
Eelco Dolstra
5b15f75a13 * mkDerivation: accept an argument `realBuilder' (stupid name) to 
override the default builder (i.e., bash).  For example,

    stdenv.mkDerivation {
      realBuilder = perl ~ "bin/perl";
      args = [ "-w" ./builder.pl ];
    }

svn path=/nixpkgs/trunk/; revision=3219
 2005-06-20 15:03:52 +00:00
Eelco Dolstra
0a2f531aea * Don't patch symlinked shared libraries. 
svn path=/nixpkgs/trunk/; revision=3195
 2005-06-17 13:46:04 +00:00
Eelco Dolstra
32d7a746a2 * Move ensureDir() up, otherwise calls to fail() might fail. 
svn path=/nixpkgs/trunk/; revision=3192
 2005-06-17 11:42:53 +00:00
Eelco Dolstra
a3407f79dd * Alias make to gmake on FreeBSD. 
svn path=/nixpkgs/trunk/; revision=3049
 2005-05-16 01:21:53 +00:00
Eelco Dolstra
0217d8b204 * Add a simple standard environment for FreeBSD. 
* Use the system Perl on all non-i686-linux platforms.
* Don't build Python support in libxml2 on most platforms.

svn path=/nixpkgs/trunk/; revision=3019
 2005-05-10 12:59:28 +00:00
Eelco Dolstra
edbfa75d01 * Use /bin/bash, not /bin/sh, since we really do need bash. 
svn path=/nixpkgs/trunk/; revision=3018
 2005-05-10 09:22:14 +00:00
Eelco Dolstra
6b8a8c92da * Fix regexp to match base-32 hashes. 
svn path=/nixpkgs/trunk/; revision=2375
 2005-03-10 17:32:09 +00:00
Eelco Dolstra
12c0a6351d * Use --strip-debug', not --strip-all', so that we can at least get 
proper backtraces.  Otherwise debugging of Nix binaries is very
  hard.

svn path=/nixpkgs/trunk/; revision=2292
 2005-02-23 22:01:54 +00:00
Eelco Dolstra
5b6b8d3e3e * Use the latest patchelf. This fixes broken gconv modules (e.g., 
$glibc/lib/gconv/ISO-2022-JP.so has an RPATH of `$ORIGIN' so that it
  can find glibc/lib/gconv/libJIS.so; `$ORIGIN' should not be filtered
  out of the RPATH).

svn path=/nixpkgs/trunk/; revision=2290
 2005-02-23 14:15:33 +00:00