1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
Commit graph

5619 commits

Author SHA1 Message Date
Nicolas Pierron 249a3a314f Add: Handle a way to factor conditions.
mkIf config.foo.enable {
  require = [ .. ];

  environment = {
    // infer the else part.
    extraPackages = [pkgs.foo];
    etc = mkThenElse {
      thenPart = { .. };
      elsePart = { .. };
    };
  };
}

Fix: UniqFlattenAttr compare configuration without the "require" attribute.

svn path=/nixpkgs/trunk/; revision=13372
2008-11-23 00:19:18 +00:00
Nicolas Pierron 0f2bd6c305 mergeDefaultOption: handle boolean values.
svn path=/nixpkgs/trunk/; revision=13371
2008-11-23 00:19:12 +00:00
Nicolas Pierron b62298f7c7 Add a common pattern used in jobs definition.
svn path=/nixpkgs/trunk/; revision=13370
2008-11-23 00:19:06 +00:00
Marc Weber 26212b62c7 (last) fcron fix for now because the service works as expected
svn path=/nixpkgs/trunk/; revision=13368
2008-11-22 16:57:31 +00:00
Marc Weber 57c012cd8c zsh update to 4.3.9
svn path=/nixpkgs/trunk/; revision=13367
2008-11-22 16:57:16 +00:00
Marc Weber eb0f06a162 default locations for fcron config settings (don't use store path)
svn path=/nixpkgs/trunk/; revision=13366
2008-11-21 23:53:31 +00:00
Eelco Dolstra a4a95f2962 * Latest stable, unstable releases.
svn path=/nixpkgs/trunk/; revision=13365
2008-11-21 17:06:49 +00:00
Marc Weber ce242a0bd8 ghc-6.10 binary
svn path=/nixpkgs/trunk/; revision=13345
2008-11-19 21:46:19 +00:00
Marc Weber 7aa7f85bb5 gstreamer update (needed by gstPython)
dropping dep gnomevfs (see code commment)

svn path=/nixpkgs/trunk/; revision=13344
2008-11-19 21:46:01 +00:00
Marc Weber 96aade5a27 hackish fix to build cdrtools again
svn path=/nixpkgs/trunk/; revision=13343
2008-11-19 21:45:43 +00:00
Ludovic Courtès 42f234343b GnuTLS 2.6.2.
svn path=/nixpkgs/trunk/; revision=13341
2008-11-19 18:49:53 +00:00
Eelco Dolstra 3d52d1593a * Revert to version 76, 77 gives strange hangs.
svn path=/nixpkgs/trunk/; revision=13338
2008-11-19 17:21:49 +00:00
Nicolas Pierron 14b2be147f Use composedArgsAndFun on utilliinux to remove some references to nixPkgs from Nixos.
svn path=/nixpkgs/trunk/; revision=13311
2008-11-16 19:23:06 +00:00
Nicolas Pierron 34f916700d Add mergeStringOption and factor mergeSomethingOption by introducing mergeTypedOption.
svn path=/nixpkgs/trunk/; revision=13310
2008-11-16 19:23:00 +00:00
Nicolas Pierron b196bab378 Remove obsolete functions.
svn path=/nixpkgs/trunk/; revision=13309
2008-11-16 19:22:55 +00:00
Nicolas Pierron 08b583682a Handle apply attribute for each option declared with MkOption.
This is similar to the new-proposal in upstart-jobs except that the default value is also processed with this function. (the existing merge function acts only on extra values).

svn path=/nixpkgs/trunk/; revision=13308
2008-11-16 19:22:47 +00:00
Michael Raskin ed57af85a7 Maybe it was Boost 1.37.0 that broke OO.o ?
svn path=/nixpkgs/trunk/; revision=13307
2008-11-16 12:35:59 +00:00
Michael Raskin a0604dd47b Added qrencode and qrdecode - tools for QR code. Qrdecode behaves strangely (Debian package does the same, so probably upstream bug)
svn path=/nixpkgs/trunk/; revision=13304
2008-11-15 17:54:09 +00:00
Peter Simons c2417256a8 Finalized maude 2.4 release.
- Updated full-maude to 2.4. 
 - Added program wrapper to set ${MAUDE_LIB} correctly.
 - TODO: the documentation is still not quite up-to-date.

svn path=/nixpkgs/trunk/; revision=13303
2008-11-14 22:53:09 +00:00
Eelco Dolstra 31dc7a4c2f * Don't abort when we're not on Linux.
svn path=/nixpkgs/trunk/; revision=13302
2008-11-14 17:28:11 +00:00
Eelco Dolstra f7f25d81a7 * Oops.
svn path=/nixpkgs/trunk/; revision=13301
2008-11-14 17:27:54 +00:00
Eelco Dolstra 6a05e154a8 * Get rid of nix-static, it's no longer needed and horribly
out-dated.

svn path=/nixpkgs/trunk/; revision=13300
2008-11-14 16:59:02 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Eelco Dolstra c1cbd437dc * Doh.
svn path=/nixpkgs/trunk/; revision=13297
2008-11-14 16:28:15 +00:00
Eelco Dolstra f61fbc205b * Firefox 3.0.4.
svn path=/nixpkgs/trunk/; revision=13296
2008-11-14 15:55:17 +00:00
Eelco Dolstra 704e51d3e2 * Reenable the check phase in Bison 2.4.
* Use the passthru attribute.

svn path=/nixpkgs/trunk/; revision=13295
2008-11-14 15:53:07 +00:00
Eelco Dolstra 30d9dba60c * Use mirror://kde. (Contributed by Bas van Dijk.)
svn path=/nixpkgs/trunk/; revision=13293
2008-11-14 14:15:46 +00:00
Eelco Dolstra d21051e84c * Added cryopid (contributed by Marco Maggesi).
svn path=/nixpkgs/trunk/; revision=13291
2008-11-14 12:34:18 +00:00
Eelco Dolstra bf1625e3f6 * Cleanup plus a purity fix (don't look in /usr for libraries).
svn path=/nixpkgs/trunk/; revision=13290
2008-11-14 11:16:54 +00:00
Eelco Dolstra 4ac5792c71 * Downloads in the stdenv bootstrap should respect the user's proxy
settings.  Contributed by Jeevakan Suresh.

svn path=/nixpkgs/trunk/; revision=13289
2008-11-14 10:51:17 +00:00
Peter Simons 8310f66a92 Updated boost libraries to version 1.37.0.
svn path=/nixpkgs/trunk/; revision=13288
2008-11-14 10:48:11 +00:00
Peter Simons 6a051f96a2 Updated cmake to version 2.6.2.
svn path=/nixpkgs/trunk/; revision=13286
2008-11-13 21:05:01 +00:00
Peter Simons 893757cfd9 Updated maude to 2.4 release.
TODO: The full-maude distribution is missing from the web site. The
expression installs 2.3j until that is fixed. Also, the documentation
that's installed isn't up-to-date yet, it's from version 2.3.

svn path=/nixpkgs/trunk/; revision=13285
2008-11-13 19:35:48 +00:00
Michael Raskin 6f509e20a3 Added DataMatrix (2D bar code) processing utilities
svn path=/nixpkgs/trunk/; revision=13281
2008-11-13 13:31:10 +00:00
Eelco Dolstra 957a8b876a svn path=/nixpkgs/trunk/; revision=13280 2008-11-13 12:45:08 +00:00
Eelco Dolstra d22734c3e7 svn path=/nixpkgs/trunk/; revision=13273 2008-11-12 17:19:12 +00:00
Eelco Dolstra 8a3757b7f1 * Added Ubuntu 8.10. It doesn't work yet though (the passwd package
fails to install).

svn path=/nixpkgs/trunk/; revision=13272
2008-11-12 17:15:09 +00:00
Eelco Dolstra fb91bc3530 * libunwind: pass -fPIC on x86_64-linux. This is necessary for Samba
to compile.

svn path=/nixpkgs/trunk/; revision=13267
2008-11-12 15:59:38 +00:00
Eelco Dolstra 4f61f1a7bc * Debian 4.0r5.
svn path=/nixpkgs/trunk/; revision=13261
2008-11-12 12:07:35 +00:00
Michael Raskin c4e1f47334 More Io fixes - hopefully final for now
svn path=/nixpkgs/trunk/; revision=13259
2008-11-12 11:13:49 +00:00
Ludovic Courtès 9ec27e7dfd Gnash: Use gst-ffmpeg and set the right `GST_PLUGIN_PATH'.
This makes viewing YouTube videos work out-of-the-box!

svn path=/nixpkgs/trunk/; revision=13256
2008-11-12 08:37:39 +00:00
Ludovic Courtès 2b9e883591 GStreamer: Add a setup hook to define `GST_PLUGIN_PATH'.
svn path=/nixpkgs/trunk/; revision=13253
2008-11-11 17:05:07 +00:00
Michael Raskin d7528deba0 More Io binding dependencies..
svn path=/nixpkgs/trunk/; revision=13246
2008-11-11 13:07:09 +00:00
Ludovic Courtès ec0aba1ee1 Add `gst-ffmpeg'.
svn path=/nixpkgs/trunk/; revision=13244
2008-11-11 12:08:28 +00:00
Michael Raskin add91332e8 Added Io programming language
svn path=/nixpkgs/trunk/; revision=13241
2008-11-11 08:53:47 +00:00
Ludovic Courtès ee32d677ab GnuTLS 2.6.1.
svn path=/nixpkgs/trunk/; revision=13240
2008-11-10 19:08:10 +00:00
Peter Simons 0eed283de0 maudeUnstable: updated to alpha91d
svn path=/nixpkgs/trunk/; revision=13227
2008-11-07 22:46:03 +00:00
Peter Simons 9018fe1507 libsigsegv: build shared library and run regression test suite
svn path=/nixpkgs/trunk/; revision=13226
2008-11-07 22:45:56 +00:00
Ludovic Courtès cd3f1ecd82 Git 1.6.0.3.
svn path=/nixpkgs/trunk/; revision=13222
2008-11-07 13:45:46 +00:00
Eelco Dolstra 6c107b6706 * CUPS 1.3.9.
svn path=/nixpkgs/trunk/; revision=13217
2008-11-07 13:36:57 +00:00