Commit graph

3281 commits

Author SHA1 Message Date
Eelco Dolstra
d897fc5501 * Some prototype code to make dealing with options in Nixpkgs/NixOS
easier.  Instead of writing

    config.get ["foo" "bar"]

  it would be much cleaner to just write

    config.foo.bar

  only this doesn't handle the case where option foo.bar is not
  supplied in the configuration; in that case we need to take the
  default value from some set of option definitions
  (system/options.nix in NixOS).

  Following a suggestion from Martin, the function `combine' (need
  better name) takes a set of option definitions (which follow the
  attribute set structure of the options) and a set of options and
  fills in missing values in the latter with default values from the
  former.  This only works with very recent versions of Nix (it needs
  Marc Weber's listToAttrs primop).

svn path=/nixpkgs/trunk/; revision=9203
2007-08-27 15:10:48 +00:00
Eelco Dolstra
d39fd2a578 * Rewrite all the kernel.org URLs to mirror://kernel/.
svn path=/nixpkgs/trunk/; revision=9202
2007-08-27 13:59:40 +00:00
Eelco Dolstra
544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/.
svn path=/nixpkgs/trunk/; revision=9201
2007-08-27 13:42:00 +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
45a2c87402 * Support for mirror:// URLs a la Gentoo (NIXPKGS-70). Instead of
fetchurl {
      url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zapping-0.9.6.tar.bz2;
      md5 = "8306775c6a11de4d72345b5eee970ea6";
    };

  you can write

    fetchurl {
      url = mirror://sourceforge/zapping/zapping-0.9.6.tar.bz2;
      md5 = "8306775c6a11de4d72345b5eee970ea6";
    };

  which causes fetchurl to try the SourceForge mirrors listed in the
  `sourceforge' attribute in build-support/fetchurl/mirrors.nix.
  (They're currently tried in sequence, and the lists of mirrors are
  not configurable yet.)

  The syntax for mirror URLs is mirror://site/path/to/file, where
  `site' is currently one of `sourceforge', `gnu' (mirrors of
  ftp://ftp.gnu.org/pub/gnu) and `kernel' (mirrors of
  http://www.all.kernel.org/pub/).

svn path=/nixpkgs/trunk/; revision=9197
2007-08-27 12:44:01 +00:00
Michael Raskin
6d4fa01f1e Added strings-with-deps, a set of functions that are intended to
build a minimal text which includes given strings and satisfies
'dependencies' of type A requires B to go before it. Just like
global variable intialization must occur before using them. Supposed
to be used for constructing builder.sh .

svn path=/nixpkgs/trunk/; revision=9196
2007-08-26 21:59:31 +00:00
Andres Löh
1cb9fc74b7 * added propagated-user-env-packages for lhs2tex and polytable
svn path=/nixpkgs/trunk/; revision=9195
2007-08-24 20:15:00 +00:00
Eelco Dolstra
c5ac83d138 * Docbook 5 XSL updated to 1.73.1 (1.73.0 was broken).
svn path=/nixpkgs/trunk/; revision=9193
2007-08-24 13:06:07 +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
Eelco Dolstra
c9bd5b7397 * Add Wine to the channel.
svn path=/nixpkgs/trunk/; revision=9191
2007-08-24 11:37:07 +00:00
Eelco Dolstra
50321b735b * Basic transparent mirror support in fetchurl (NIXPKGS-70). When
fetching a file with hash HASH of type TYPE, we first try to
  download <base-url>/<type>/<hash>, where <base-url> is one of a list
  of mirrors.  For instance, given

    src = fetchurl {
      url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.6/source/firefox-2.0.0.6-source.tar.bz2;
      sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082";
    };

  and the mirror list [http://nix.cs.uu.nl/dist/tarballs], we first
  try to download

    eb72f55e4a

  and if that fails, we use the original URL.

  The list of mirrors is not yet user-configurable.

* `fetchurl' now also accepts an argument `urls' instead of `url' for
  a list of alternative download locations, which fetchurl will try in
  sequence.

svn path=/nixpkgs/trunk/; revision=9190
2007-08-23 15:22:30 +00:00
Armijn Hemel
ec9d5c9471 update to 2.1.1
svn path=/nixpkgs/trunk/; revision=9187
2007-08-22 12:29:26 +00:00
Eelco Dolstra
d0d721b0da * Latest libxml2, libxslt.
svn path=/nixpkgs/trunk/; revision=9186
2007-08-22 10:51:14 +00:00
Armijn Hemel
04fc7a2c92 bumpetybump for dovecot. This is untested. However, it is a nice and clean server to add upstart scripts for
svn path=/nixpkgs/trunk/; revision=9183
2007-08-21 21:30:16 +00:00
Armijn Hemel
5021eefe40 0.6 -> 0.8
svn path=/nixpkgs/trunk/; revision=9182
2007-08-21 20:51:34 +00:00
Eelco Dolstra
2f21c59a3f * Use FontForge to give Wine better fonts.
svn path=/nixpkgs/trunk/; revision=9181
2007-08-21 12:31:33 +00:00
Wouter den Breejen
1a6cd0ce1a ln -sf isn't strong enough sometimes..
svn path=/nixpkgs/trunk/; revision=9180
2007-08-21 12:29:46 +00:00
Eelco Dolstra
0481f172f6 * Assert Linux.
svn path=/nixpkgs/trunk/; revision=9179
2007-08-21 10:16:34 +00:00
Eelco Dolstra
3a3a9183a1 * Patch to fix Baldur's Gate 2 and other programs. See
http://bugs.winehq.org/show_bug.cgi?id=6975 and
  http://bugs.winehq.org/show_bug.cgi?id=2398.
  Based on http://bugs.winehq.org/attachment.cgi?id=5708.

svn path=/nixpkgs/trunk/; revision=9178
2007-08-21 09:10:20 +00:00
Eelco Dolstra
38ace454e9 * Wine locates a lot of libraries dynamically through dlopen(). Add
them to the RPATH so that the user doesn't have to set them in
  LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=9177
2007-08-21 00:00:23 +00:00
Eelco Dolstra
aa983025d6 * Linux 2.6.21.7.
svn path=/nixpkgs/trunk/; revision=9176
2007-08-20 14:26:32 +00:00
Eelco Dolstra
16c6da0129 * Emacs 22.1. This is the default now, but 21.4 is still around
(as is the 23.0.0.1 alpha).

svn path=/nixpkgs/trunk/; revision=9175
2007-08-20 13:48:56 +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
Eelco Dolstra
b5db5e6e61 * Fix /bin/pwd and /bin/ls so that `firefox <filename>' works on
NixOS.

svn path=/nixpkgs/trunk/; revision=9173
2007-08-20 13:04:14 +00:00
Eelco Dolstra
a6407349b1 * Updated Email::Simple, Email::Address.
svn path=/nixpkgs/trunk/; revision=9172
2007-08-20 12:11:07 +00:00
Marc Weber
3e6eebc6e5 fltk-2.0
svn path=/nixpkgs/trunk/; revision=9171
2007-08-20 10:42:09 +00:00
Marc Weber
0c9f5dc6a4 fltk-2.0
svn path=/nixpkgs/trunk/; revision=9170
2007-08-20 10:40:48 +00:00
Marc Weber
911556d127 hugs98
svn path=/nixpkgs/trunk/; revision=9169
2007-08-20 10:34:49 +00:00
Marc Weber
88640db58e hugs98 expression
svn path=/nixpkgs/trunk/; revision=9168
2007-08-20 10:33:42 +00:00
Marc Weber
8f3a8b5006 renamed chosenOptions to chooseOptionsByFlags and added support for optionals
(thus you don't need to write flag definitions, passing a dependency or not is enough)

svn path=/nixpkgs/trunk/; revision=9167
2007-08-19 17:24:05 +00:00
Marc Weber
ee347e49c1 renamened assert to assertion because assert is a resnerved word,
fix of blocks errors ( blocking does work in all cases now )

svn path=/nixpkgs/trunk/; revision=9166
2007-08-19 04:32:02 +00:00
Eelco Dolstra
a8bd020fe0 * Get Wine to work (basically) by linking it against Glibc 2.6 with
NPTL.  Apparently Wine doesn't work with Glibc 2.5 + LinuxThreads.

svn path=/nixpkgs/trunk/; revision=9165
2007-08-18 23:58:30 +00:00
Marc Weber
a3a9d407da fix: listToAttrs added (which I had forgotten) when evaluating flags
svn path=/nixpkgs/trunk/; revision=9164
2007-08-18 22:29:00 +00:00
Marc Weber
6af4bd3ca6 primop functions listToAttrs (+test), __isAttrs, __trace added
new configuration style proposal in lib/default-unstable.nix

svn path=/nixpkgs/trunk/; revision=9163
2007-08-18 22:12:00 +00:00
Michael Raskin
cfab5a8cf9 Now glibc-NPTL builds...
svn path=/nixpkgs/trunk/; revision=9162
2007-08-18 19:04:19 +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
e6c5500d42 Changed package name to glibc-2.5-nptl ...
svn path=/nixpkgs/trunk/; revision=9160
2007-08-18 16:23:11 +00:00
Michael Raskin
88483fdb70 Noticed it is glibc-nptl, not ntpl as I mistyped.
svn path=/nixpkgs/trunk/; revision=9159
2007-08-18 16:22:10 +00:00
Michael Raskin
ac311eb30a Added glibc-ntpl to all-packages.nix . I also do not know if it works.
svn path=/nixpkgs/trunk/; revision=9158
2007-08-18 16:20:14 +00:00
Eelco Dolstra
9cc12e9f05 * Old work on Glibc with NPTL. No idea if it compiles/works.
svn path=/nixpkgs/trunk/; revision=9157
2007-08-18 16:15:09 +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
Michael Raskin
7625cdadfb Added libwmf for handling embedded graphics in .doc files.
svn path=/nixpkgs/trunk/; revision=9153
2007-08-18 09:35:54 +00:00
Michael Raskin
8fd03a4dac Added wvVare - tools for converting Microsoft Word formats to usable ones.
svn path=/nixpkgs/trunk/; revision=9152
2007-08-18 08:32:12 +00:00
Armijn Hemel
cf9bc5c79c update to 2.4.0-rc1. Does not fix NIXPKGS-54
svn path=/nixpkgs/trunk/; revision=9151
2007-08-18 01:20:34 +00:00
Eelco Dolstra
eeb42a6dae * Doh.
svn path=/nixpkgs/trunk/; revision=9149
2007-08-17 13:37:53 +00:00
Eelco Dolstra
f3b3d53600 * Sudo 1.6.9p4.
svn path=/nixpkgs/trunk/; revision=9148
2007-08-17 13:37:28 +00:00
Michael Raskin
282c064669 Moved pidgin-latex to pidgin-plugins, added aggregatable link for pidgin-otr.
svn path=/nixpkgs/trunk/; revision=9147
2007-08-17 09:31:09 +00:00
Armijn Hemel
c8c3eb7c18 add Off The Record, encryption plugin for pidgin. Needs a pidgin wrapper to work nicely.
svn path=/nixpkgs/trunk/; revision=9146
2007-08-16 23:16:42 +00:00
Armijn Hemel
813f26af95 move some buildInputs to propagatedBuildInputs, since these are also used by some external Pidgin plugins
svn path=/nixpkgs/trunk/; revision=9145
2007-08-16 23:14:52 +00:00
Armijn Hemel
38871bf455 make libgcrypt propagated
svn path=/nixpkgs/trunk/; revision=9144
2007-08-16 22:05:38 +00:00