philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

380 commits

Author SHA1 Message Date
Eelco Dolstra b7a90c11d3 * selectMaintained (renamed): don't use meta.maintainer, just use 
meta.platforms.
* Valgrind *should* work on Darwin now, except that our GCC doesn't
  recognise the -arch flag.

svn path=/nixpkgs/trunk/; revision=17372
 2009-09-23 19:45:02 +00:00
Eelco Dolstra 12395c36a9 * Typos. 
svn path=/nixpkgs/trunk/; revision=17348
 2009-09-22 09:26:18 +00:00
Marc Weber 88e66ae7f4 rename mapRecordFlatten to mapAttrsFlatten 
svn path=/nixpkgs/trunk/; revision=17315
 2009-09-20 21:54:20 +00:00
Nicolas Pierron dc8f469349 Fix the merge function of the "attrsOf" type: handle multiple of the same 
attribute name.

svn path=/nixpkgs/trunk/; revision=17297
 2009-09-20 10:29:06 +00:00
Lluís Batlle i Rossell 8515a7fa68 Adding me as a maintainer, with a pair of packages. 
svn path=/nixpkgs/trunk/; revision=17295
 2009-09-20 09:37:55 +00:00
Nicolas Pierron 6041b78fa4 Report bad default values which would have cause a build failure if they 
were used to build a NixOS system.

svn path=/nixpkgs/trunk/; revision=17286
 2009-09-19 22:10:11 +00:00
Nicolas Pierron 5f138aebde Fix: Use the check function defined in the option declaration if it exists. 
svn path=/nixpkgs/trunk/; revision=17277
 2009-09-19 16:49:31 +00:00
Eelco Dolstra 1885909e93 * More typos. 
svn path=/nixpkgs/trunk/; revision=17257
 2009-09-18 15:18:23 +00:00
Nicolas Pierron c6267a8c9d Add declarations and definitions to options. This allow you to retrieve 
the location of the definition with the defined value.

Filter the source location for the documentation.

svn path=/nixpkgs/trunk/; revision=17253
 2009-09-18 15:10:11 +00:00
Nicolas Pierron e07f5d2a2c Add location to declared sub-modules. 
svn path=/nixpkgs/trunk/; revision=17252
 2009-09-18 15:10:05 +00:00
Michael Raskin a9dc68b1ea Specify some obvious platform sets 
svn path=/nixpkgs/trunk/; revision=17205
 2009-09-16 15:12:24 +00:00
Eelco Dolstra d7d80e8fdc * Typos. 
svn path=/nixpkgs/trunk/; revision=17182
 2009-09-16 11:37:07 +00:00
Nicolas Pierron 0c16b00cbd Replace the traversal of modules: 
- Remove handleOptionSets which used option declarations & definitions
in the same set.
- Add a traversal of modules where "config" and "options" are traverse at
the same time.

This allow to have accruate error messages with the incriminated files
playing a role in the error.

This system add a new restriction compare to the previous system:
- A module with no structure (option definitions & option declarations
& require) should not contain any option declarations.  If such module
exists you must convert it to the following form:

{ imports = <content of the require attribute>;
  options = <set of option declarations>;
  config = <set of option definitions>;
}

svn path=/nixpkgs/trunk/; revision=17163
 2009-09-15 13:36:30 +00:00
Nicolas Pierron 37ce2ca949 Handles cases where developers ""cannot"" put their initial modules in 
other files.

Imports of imported attribute set are not working anymore because this
feature is hard to maintain and because this a potential source of error.

Imports are only accepted inside named modules where the system has some
control over mutual inclusion.

svn path=/nixpkgs/trunk/; revision=17144
 2009-09-15 00:21:39 +00:00
Michael Raskin b98b622ef0 Fix NixOS evaluation. As I understand, configuration gets added to the list of modules as an attrSet (not as a file name). Just add a trivial check to passthrough such modules. 
svn path=/nixpkgs/trunk/; revision=17116
 2009-09-14 20:10:41 +00:00
Nicolas Pierron 1557cfd0c6 split moduleClosure in two parts: 
* unifyModuleSyntax: handle all kind of module syntax to convert them into
  a module which has the following form:

  {
    imports = [ <paths> ];
    options = <attribute set of options declarations>;
    config = <attribute set (with properties) of option definitions>;
  }

  This function assume that there is at most one imported attribute set which
  correspond to option declarations.

* moduleClosure: handle a list of module's paths which are converted with
  the previous function to do the closure of the imports with the function
  lazyGenericClosure (which does the same as builtins.genericClosure except
  that it doesn't evaluate the content of modules).  The "key" and "paths"
  attributes are left to be used as debug information in futur
  implementation(s).

svn path=/nixpkgs/trunk/; revision=17108
 2009-09-14 13:19:00 +00:00
Ludovic Courtès b7fa5f13c9 Add gnu' as an alias for linux'. 
The rationale is that usually applications don't care about the kernel
but rather about the C library, tool chain, and standard utilities,
which are GNU, not Linux.

svn path=/nixpkgs/trunk/; revision=17069
 2009-09-12 18:46:04 +00:00
Marc Weber 60aa746f6b removing dropPath. It's used once and in that case it behaves like 
builtins.dropPath

svn path=/nixpkgs/trunk/; revision=17018
 2009-09-10 16:57:26 +00:00
Eelco Dolstra 5b7f46ea43 * A utility function `optionalAttrs', similar to optional and 
optionalString but for attribute sets.

svn path=/nixpkgs/trunk/; revision=17002
 2009-09-10 10:52:51 +00:00
Michael Raskin a1ea759dd9 Adding libev - an even loop library remotely similar to libevent 
svn path=/nixpkgs/trunk/; revision=16877
 2009-08-27 07:17:57 +00:00
Eelco Dolstra 921de5b511 * Remove the warning, it's rather annoying. 
svn path=/nixpkgs/trunk/; revision=16862
 2009-08-26 14:13:05 +00:00
Michael Raskin 9e928bb1e9 Adding eProver to buildfarm via maintanership 
svn path=/nixpkgs/trunk/; revision=16854
 2009-08-25 08:28:08 +00:00
Marc Weber 3235c889b9 fix of warning. It should be correct now 
svn path=/nixpkgs/trunk/; revision=16813
 2009-08-22 18:13:56 +00:00
Marc Weber 9c49ad9f70 trace warning when using attrs for textClosureList 
svn path=/nixpkgs/trunk/; revision=16810
 2009-08-22 09:35:59 +00:00
Marc Weber e7dc062579 adding xapian and xapian-bindings 
svn path=/nixpkgs/trunk/; revision=16788
 2009-08-20 20:18:58 +00:00
Eelco Dolstra 9f59fb9377 * findFirst is used by the LaTeX function. Forgot to commit. 
svn path=/nixpkgs/trunk/; revision=16438
 2009-07-22 14:43:39 +00:00
Eelco Dolstra 10c4ec0ed8 svn path=/nixpkgs/trunk/; revision=16412 2009-07-17 12:04:34 +00:00
Eelco Dolstra 80cab44fce * Options / config: these should be attrsets, not lists (IMHO). 
svn path=/nixpkgs/trunk/; revision=16359
 2009-07-14 16:22:42 +00:00
Nicolas Pierron b09382fcd1 Extract properties.nix and modules.nix from options.nix. 
svn path=/nixpkgs/trunk/; revision=16339
 2009-07-13 16:18:52 +00:00
Andres Löh 9f9ec8d2c6 Added myself as a maintainer. 
svn path=/nixpkgs/trunk/; revision=16327
 2009-07-10 19:50:04 +00:00
Nicolas Pierron 5cd8eefb26 Allow to set priority which are below the default priority level. 
This help to define default values which can be override without any extra syntax.

svn path=/nixpkgs/trunk/; revision=16304
 2009-07-10 09:44:09 +00:00
Marc Weber 07df330fd5 maintainers + marcweber 
svn path=/nixpkgs/trunk/; revision=16294
 2009-07-09 22:23:56 +00:00
Sander van der Burg 9c2379e263 Added myself (sander) to the maintainers list 
svn path=/nixpkgs/trunk/; revision=16275
 2009-07-09 13:42:22 +00:00
Marc Weber 6abf8471fb fix sourceWithTagsDerivation, myhasktags now based on current haskell derivations 
svn path=/nixpkgs/trunk/; revision=16263
 2009-07-09 03:50:47 +00:00
Eelco Dolstra edd198ee8b * Doh. 
svn path=/nixpkgs/trunk/; revision=16259
 2009-07-08 16:14:51 +00:00
Eelco Dolstra 73ac7f5876 svn path=/nixpkgs/trunk/; revision=16256 2009-07-08 15:56:05 +00:00
Michael Raskin dd89941fb2 Added myself as the maintainer of some packages 
svn path=/nixpkgs/trunk/; revision=16221
 2009-07-07 15:05:15 +00:00
Nicolas Pierron aec4341cb4 Fix: (in moduleClosure) remove key attribute of inlined sets. 
svn path=/nixpkgs/trunk/; revision=16198
 2009-07-06 23:20:14 +00:00
Nicolas Pierron c49dddb1ab Substitute fixOptionSetsFun by multiple functions which are: 
- well named,
- capable to handle the proposal of Eelco Dolstra { imports= [..]; options = {}; config = {}; } in addition to the current { require = [..]; .. } syntax.

svn path=/nixpkgs/trunk/; revision=16192
 2009-07-06 16:20:05 +00:00
Nicolas Pierron a89f3bca50 allow the argument set of modules to be defined outside of option.nix file. 
svn path=/nixpkgs/trunk/; revision=16191
 2009-07-06 16:20:00 +00:00
Nicolas Pierron 736523d992 cleanSource: Avoid copying git files. 
svn path=/nixpkgs/trunk/; revision=16190
 2009-07-06 16:19:52 +00:00
Eelco Dolstra 0281a7deb8 svn path=/nixpkgs/trunk/; revision=16131 2009-07-02 08:58:30 +00:00
Ludovic Courtès 7b7ed8f1af Add `stdenv.lib.maintainers'. 
Suggested by Eelco Dolstra.

svn path=/nixpkgs/trunk/; revision=16126
 2009-07-01 15:38:55 +00:00
Eelco Dolstra a440fba8e3 * Refactoring: move the types out of options.nix, which is much too 
big.  Also, they could be useful beyond option handling.

svn path=/nixpkgs/trunk/; revision=16055
 2009-06-26 13:53:31 +00:00
Nicolas Pierron dd50af4923 Add a description of values which cause a bad type the failure. 
svn path=/nixpkgs/trunk/; revision=16054
 2009-06-26 12:42:00 +00:00
Nicolas Pierron 6c0912ee9c - partition based on the content of the properties. (rmProperties * isOption) 
- Do not eval properties on option declarations.
  -> mkIf does not mask option declarations if the condition is evaluated to false.

svn path=/nixpkgs/trunk/; revision=16043
 2009-06-25 21:25:33 +00:00
Eelco Dolstra 36b4a9b3f3 * Rename types.enable -> types.bool. 
svn path=/nixpkgs/trunk/; revision=15955
 2009-06-14 11:06:16 +00:00
Nicolas Pierron 6f0b3b683e option types: Fix the generated template name used for the documentation. 
svn path=/nixpkgs/trunk/; revision=15938
 2009-06-11 16:03:43 +00:00
Nicolas Pierron 8f8971144f optionAttrSetToDocList: Re-implement with the collect function. 
Use the option name computed by "handleOptionSets" instead of
computing it a second time.  Handle option containing option sets.

svn path=/nixpkgs/trunk/; revision=15937
 2009-06-11 16:03:38 +00:00
Nicolas Pierron 0f6a67814a Add 'collect' a function which recursively collects all attribute values verifying a predicate. 
svn path=/nixpkgs/trunk/; revision=15936
 2009-06-11 16:03:33 +00:00
Nicolas Pierron b32002c3a3 Add support for a new module syntax. 
Introduce optional argument to optionSet options.

svn path=/nixpkgs/trunk/; revision=15935
 2009-06-11 16:03:26 +00:00
Eelco Dolstra 6408a6a6fd * Trivial function to create a singleton list. Can reduce unnecessary 
indentation in expressions like

    environent.extraJobs =
      [ { name = "foo";
          job =
            ''
              bla bla
            '';
        }
      ];

  which becomes

    environent.extraJobs = singleton
      { name = "foo";
        job =
          ''
            bla bla
          '';
      };

svn path=/nixpkgs/trunk/; revision=15892
 2009-06-08 22:42:42 +00:00
Eelco Dolstra ac7eb7d25a * nix-env gets confused when an attrset contains an attribute named 
"type".

svn path=/nixpkgs/trunk/; revision=15781
 2009-05-29 09:47:55 +00:00
Nicolas Pierron 49b4942f0e Add option types. 
svn path=/nixpkgs/trunk/; revision=15749
 2009-05-27 20:25:17 +00:00
Eelco Dolstra ded055c896 * Remove an attrset comparison. 
svn path=/nixpkgs/trunk/; revision=15736
 2009-05-26 16:25:59 +00:00
Eelco Dolstra 8b52e84e1a * Fix a comparison of function values (disallowed in the Nix trunk). 
Thanks to Nicolas.

svn path=/nixpkgs/trunk/; revision=15734
 2009-05-26 16:00:30 +00:00
Eelco Dolstra 1635ec4bdf * Put strings-with-deps in lib. 
svn path=/nixpkgs/trunk/; revision=15729
 2009-05-25 18:22:19 +00:00
Eelco Dolstra 8d7bf1a11e * Typo. 
svn path=/nixpkgs/trunk/; revision=15699
 2009-05-24 18:12:39 +00:00
Marc Weber ed69e9ed94 getAttr can call builtins.getAttr 
svn path=/nixpkgs/trunk/; revision=15694
 2009-05-24 10:57:49 +00:00
Marc Weber 3157bb1098 removed all __primops from nixpkgs 
svn path=/nixpkgs/trunk/; revision=15693
 2009-05-24 10:57:46 +00:00
Marc Weber f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath 
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
 2009-05-24 10:57:41 +00:00
Marc Weber ea3688db98 added documentation illustrating behaviour of the new textClosureMap 
implementation

svn path=/nixpkgs/trunk/; revision=15663
 2009-05-19 23:26:08 +00:00
Marc Weber 52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry 
svn path=/nixpkgs/trunk/; revision=15662
 2009-05-19 23:25:58 +00:00
Nicolas Pierron 1500252e6f * options.nix: 
Remove attribute set comparison.  Imported attribute sets
        are traverse assuming that no duplicate could exists.

svn path=/nixpkgs/trunk/; revision=15659
 2009-05-19 23:07:07 +00:00
Nicolas Pierron 47679b20af Remove unused feature which allowed to add properties on the required elements. 
svn path=/nixpkgs/trunk/; revision=15658
 2009-05-19 23:07:02 +00:00
Nicolas Pierron 36dcabd7be Add support for require attribute with a filename as argument. 
svn path=/nixpkgs/trunk/; revision=15657
 2009-05-19 23:06:56 +00:00
Eelco Dolstra b9d560d30e * Get rid of __primop. 
* newMergeOptionSets -> mergeOptionSets.

svn path=/nixpkgs/trunk/; revision=15652
 2009-05-19 14:54:41 +00:00
Eelco Dolstra abf71d5352 * textClosure: don't use uniqList, and don't rely on buggy behaviour 
in the Nix expression evaluator (namely that comparison of attribute
  sets works properly).
* Removed some redundant parentheses in builder-defs.

svn path=/nixpkgs/trunk/; revision=15551
 2009-05-11 15:21:42 +00:00
Eelco Dolstra 2f33cdec38 * Die tabs die. Also, renamed FullDepEntry and PackEntry to 
fullDepEntry and packEntry for consistency.

svn path=/nixpkgs/trunk/; revision=15549
 2009-05-11 11:55:05 +00:00
Marc Weber 8cc8965379 enhance escapeShellArg funtion. It should be pretty correct now 
svn path=/nixpkgs/trunk/; revision=15475
 2009-05-06 16:06:41 +00:00
Eelco Dolstra 671d53dd35 * Allow the user to install stdenv (nix-env -i stdenv) and get all the 
packages in the stdenv as propagated user environment packages.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15300
 2009-04-25 14:08:29 +00:00
Eelco Dolstra 730f8c2b4d * Added a function to make Unix-style search paths. This generalises 
`makeLibraryPath'.

svn path=/nixpkgs/trunk/; revision=14884
 2009-04-05 18:05:11 +00:00
Eelco Dolstra 1f9740e01c * Added some regression tests for lib that I wrote a while ago but 
didn't commit.  Also, run the tests when making a Nixpkgs tarball.

svn path=/nixpkgs/trunk/; revision=14802
 2009-03-31 13:03:50 +00:00
Eelco Dolstra 2405d87230 * Move some functions for manipulating meta and name attributes out of 
all-packages.nix and into lib.

svn path=/nixpkgs/trunk/; revision=14778
 2009-03-30 13:22:19 +00:00
Eelco Dolstra 6b24d7bebe * mapAttrsRecursiveCond', which is like mapAttrsRecursive' but takes 
a predicate to tell it whether to recursive into a given attribute
  set.

svn path=/nixpkgs/trunk/; revision=14776
 2009-03-30 13:19:57 +00:00
Marc Weber e06491168b tidied up pkgs/lib/debug.nix 
more consistent naming:
  debugVal -> traceVal
  debugXMLVal -> traceXMLVal

  whatis -> showVal
  traceWhatis -> traceShowVal
  traceMarked -> traceShowValMarked

removed some parenthesis

svn path=/nixpkgs/trunk/; revision=14701
 2009-03-25 13:48:55 +00:00
Nicolas Pierron f624a70ee7 Fix mkThenElse and mkAlways evaluation. 
svn path=/nixpkgs/trunk/; revision=14528
 2009-03-14 07:20:31 +00:00
Eelco Dolstra b53ef57554 * Moved mapAttrs to attrsets.nix. 
* Added a function mapAttrsRecursive, which is like mapAttrs, but
  recursively applies itself to attribute sets.
* Commented and cleaned up some functions.

svn path=/nixpkgs/trunk/; revision=14495
 2009-03-10 15:18:38 +00:00
Marc Weber 08e1c08bc7 moved debugging functions into lib module "debug" 
svn path=/nixpkgs/trunk/; revision=14430
 2009-03-06 23:21:35 +00:00
Marc Weber 49b115132d add error context to all top level attr names of all-packages.nix 
svn path=/nixpkgs/trunk/; revision=14429
 2009-03-06 23:21:31 +00:00
Marc Weber b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs 
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
 2009-03-06 23:21:28 +00:00
Marc Weber 51289a41b0 adjust packages to overridableDelayableArgs 
svn path=/nixpkgs/trunk/; revision=14427
 2009-03-06 23:21:24 +00:00
Marc Weber f1183f33e3 added simple lib test case for overridableDelayableArgs 
svn path=/nixpkgs/trunk/; revision=14426
 2009-03-06 23:21:17 +00:00
Marc Weber 5ddfa7ed64 moved catAttrs, attrVals into attrsets.nix, adding attrValues 
svn path=/nixpkgs/trunk/; revision=14425
 2009-03-06 23:21:14 +00:00
Marc Weber be3a9f2346 added overridableDelayableArgs replacing applyAndFun 
svn path=/nixpkgs/trunk/; revision=14424
 2009-03-06 23:21:12 +00:00
Marc Weber e917282535 added eqStrict (deep, strict test for equality) 
it can replace eqList and can compare attrs as well

svn path=/nixpkgs/trunk/; revision=14423
 2009-03-06 23:21:09 +00:00
Nicolas Pierron e18a10d0ae * Refactor mkIf to extract the concept of properties. 
Properties can be delay on any attribute set and have
functions which are used to define the semantic of each
property.

* Introduce the mkOverride property.

svn path=/nixpkgs/trunk/; revision=14285
 2009-02-28 18:21:25 +00:00
Michael Raskin 8bf73286a4 add eqStrings back.. 
svn path=/nixpkgs/trunk/; revision=14228
 2009-02-24 16:19:08 +00:00
Eelco Dolstra f9b9844949 * Doh. 
svn path=/nixpkgs/trunk/; revision=14014
 2009-02-09 17:03:18 +00:00
Eelco Dolstra 599015e8b0 * Split lib/default.nix into several files, as it had become a big 
mess.  Also cleaned up some functions:

  - foldl appeared broken (it recursively called fold).
  - Renamed logicalAND/logicalOR to and/or.
  - Removed listOfListsToAttrs, eqStrings: obsolete.
  - Removed isInList, which does the same thing as elem.
  - stringToCharacters: don't return a "" at the end of the list.
  - Renamed concatList to concat, as concatList (singular) is a
    misnomer: it takes two lists.  Likewise, renamed mergeAttr to
    mergeAttrs.

  misc.nix still contains a lot of stuff that should be refactored and
  moved to other files.

svn path=/nixpkgs/trunk/; revision=14013
 2009-02-09 16:51:03 +00:00
Eelco Dolstra 6ed4aa7ecb * Qt updated to 4.4.3 in preparation of upgrading KDE to 4.2. 
svn path=/nixpkgs/trunk/; revision=13974
 2009-02-03 16:32:56 +00:00
Nicolas Pierron 74630be169 Replace addLocation by addErrorContext. 
pkgs.lib.addErrorContext add a new line inside the stack trace if this is supported by your nix version.

svn path=/nixpkgs/trunk/; revision=13886
 2009-01-27 14:46:41 +00:00
Nicolas Pierron aa27e34a2e Remove python reference from comment. 
svn path=/nixpkgs/trunk/; revision=13883
 2009-01-27 14:08:49 +00:00
Nicolas Pierron a130392234 Suggest nice/readable example first for composableDerivation. 
svn path=/nixpkgs/trunk/; revision=13882
 2009-01-27 14:01:00 +00:00
Nicolas Pierron c333a6ab6b Add missing arguments to the "notHandle" functions of mergeOptionSets and filterOptionSets. 
svn path=/nixpkgs/trunk/; revision=13872
 2009-01-25 22:37:10 +00:00
Nicolas Pierron 74df154f73 Fix previous commit. 
svn path=/nixpkgs/trunk/; revision=13870
 2009-01-25 22:25:38 +00:00
Nicolas Pierron c2be87e132 Remove support for merge function with name argument. 
svn path=/nixpkgs/trunk/; revision=13869
 2009-01-25 21:23:47 +00:00
Nicolas Pierron c1b9946c28 Name argument of option's merge functions are now obsolete. 
svn path=/nixpkgs/trunk/; revision=13842
 2009-01-25 00:31:43 +00:00
Nicolas Pierron daa6f9c7ef Add a common merge function. (mergeOneOption) 
This merge function allow only one definition for an option.

svn path=/nixpkgs/trunk/; revision=13841
 2009-01-25 00:31:38 +00:00
Nicolas Pierron 9581664fb9 Add the "notdef" value when no else-part is defined. 
Remove the "notdef" values from the user-defined values.

svn path=/nixpkgs/trunk/; revision=13840
 2009-01-25 00:31:33 +00:00
Nicolas Pierron 57f66db54c Remove extra arguments from uniqFlatten. 
Clean-up fixOptionSetsFun.

svn path=/nixpkgs/trunk/; revision=13839
 2009-01-25 00:31:29 +00:00
Nicolas Pierron 13d5c8923d factor mergeOptionSets and filterOptionSets into the function handleOptionSets. 
svn path=/nixpkgs/trunk/; revision=13838
 2009-01-25 00:31:23 +00:00
Michael Raskin c87887ddd0 Oops. A typo fix 
svn path=/nixpkgs/trunk/; revision=13727
 2009-01-08 23:04:18 +00:00
Michael Raskin 46fec9e4c9 Add a (failure-prone) last-chance string merger 
svn path=/nixpkgs/trunk/; revision=13726
 2009-01-08 23:02:44 +00:00
Marc Weber 5638574907 fixes for previous commit 
svn path=/nixpkgs/trunk/; revision=13662
 2008-12-20 02:15:26 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead 
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
 2008-12-20 01:20:35 +00:00
Nicolas Pierron 071c62a942 Rewrite uniqFlattenAttr to handle any type of elements with associated keys. 
Keys are introduced because manipulated sets cannot be compared safely.

svn path=/nixpkgs/trunk/; revision=13574
 2008-12-03 18:56:00 +00:00
Marc Weber a7e33ec60c updates: istanbul starts without errors. But no window appears. 
svn path=/nixpkgs/trunk/; revision=13554
 2008-12-02 12:28:45 +00:00
Marc Weber 9e7846d214 added Haskell's foldl 
svn path=/nixpkgs/trunk/; revision=13553
 2008-12-02 12:28:21 +00:00
Marc Weber d8e1f6c976 adding lib function composableDerivation 
providing easy setups of flags and configurations for derivations.
configuration is passed via passthru automatically,
additional names can be merged with final attrs in an automatic sensible way
even supporting fix.
fun and funMerge idea by Michael Raskin

svn path=/nixpkgs/trunk/; revision=13546
 2008-12-02 12:26:53 +00:00
Marc Weber 429df4f864 added prepareDerivationArgs 
svn path=/nixpkgs/trunk/; revision=13545
 2008-12-02 12:26:43 +00:00
Marc Weber 570a103136 adding mergeAttrsByFunc function - its easiy to customize how a name should be merged - the merge function is passed by the attr set itself (and can be overridden/ extended this way) This code can probably be shortened using zip and the like as proposed by Nicolas Pierron (mailinglist) 
svn path=/nixpkgs/trunk/; revision=13544
 2008-12-02 12:26:36 +00:00
Marc Weber 55976c6f8d depreceating functions which have been sud by me only replacements are in the following commits.. I still have to remove and adopt the code using them 
svn path=/nixpkgs/trunk/; revision=13543
 2008-12-02 12:26:28 +00:00
Marc Weber bd0b75fe28 added mergeAttr and concatList functions giving // and ++ a name 
svn path=/nixpkgs/trunk/; revision=13542
 2008-12-02 12:26:20 +00:00
Marc Weber 1f69d4d1eb enhancing whatis trace function 
svn path=/nixpkgs/trunk/; revision=13541
 2008-12-02 12:26:12 +00:00
Marc Weber 01fc783e7f added debug functions tracing function arguments and result 
svn path=/nixpkgs/trunk/; revision=13540
 2008-12-02 12:26:05 +00:00
Nicolas Pierron 53e6c77aca Fix previous commit. 
svn path=/nixpkgs/trunk/; revision=13373
 2008-11-23 01:23:32 +00:00
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
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
Marc Weber 2bf82b4470 added examples for composedArgsAndFun, introducing setAttrMerge 
svn path=/nixpkgs/trunk/; revision=13193
 2008-11-04 21:40:51 +00:00
Michael Raskin c5363217ad meta.function -> passthru.function, not killing other contents of passthru 
svn path=/nixpkgs/trunk/; revision=13190
 2008-11-04 21:24:10 +00:00
Marc Weber 1bdbe847f7 removed finalReference not beeing used anywhere 
svn path=/nixpkgs/trunk/; revision=13137
 2008-10-28 14:20:52 +00:00
Marc Weber a9b19788fb simplified isOption reusing typeOf 
svn path=/nixpkgs/trunk/; revision=13119
 2008-10-26 17:44:23 +00:00
Marc Weber 892db3bb8c update bleeding edge repo management 
it now figures out the dist name from the url and the revision is added to the url
This way a new version doesn't override the old one and you can keep multiple dist tar.gz files

svn path=/nixpkgs/trunk/; revision=13065
 2008-10-14 14:01:00 +00:00
Michael Raskin 29149e5385 The even more incredibly verbose debugging machine... 
svn path=/nixpkgs/trunk/; revision=12758
 2008-08-27 21:23:49 +00:00
Michael Raskin c406fcf194 Some diagnostics for NixOS manual helper 
svn path=/nixpkgs/trunk/; revision=12756
 2008-08-27 21:19:03 +00:00
Nicolas Pierron 042bc846df Handle new configuration file argument notation: 
{pkgs, config, ...}:

svn path=/nixpkgs/trunk/; revision=12753
 2008-08-27 17:54:24 +00:00
Nicolas Pierron ae163f596e Replace "finalReference" prefix by "fix". 
svn path=/nixpkgs/trunk/; revision=12740
 2008-08-27 13:58:36 +00:00
Michael Raskin d7acaeb096 Refactorings and removing hard-coded assumptions 
svn path=/nixpkgs/trunk/; revision=12668
 2008-08-20 11:20:32 +00:00
Michael Raskin a921f752b8 Saner tracing of booleans 
svn path=/nixpkgs/trunk/; revision=12667
 2008-08-20 08:41:53 +00:00
Michael Raskin ff0d85fdc8 Added traceMarked; it is traceWhatis with the extra (first) argument to distinguish the output of that exat statement. 
svn path=/nixpkgs/trunk/; revision=12666
 2008-08-20 08:21:54 +00:00
Michael Raskin a8da119da4 Silly mistake fixed 
svn path=/nixpkgs/trunk/; revision=12665
 2008-08-20 07:17:55 +00:00
Michael Raskin 97e15cc2b8 Noticed an associativity direction problem 
svn path=/nixpkgs/trunk/; revision=12664
 2008-08-20 06:45:14 +00:00
Michael Raskin 69e4f17372 Added null recognition to whatis 
svn path=/nixpkgs/trunk/; revision=12663
 2008-08-20 04:34:28 +00:00
Marc Weber 6394358c9a fix of cosmetic commit (sry) 
svn path=/nixpkgs/trunk/; revision=12646
 2008-08-17 07:40:35 +00:00
Marc Weber bab435592b cosmetic var name change 
svn path=/nixpkgs/trunk/; revision=12644
 2008-08-17 00:06:01 +00:00
Michael Raskin 99c46f200c Forgot to make composedArgsAndFun support function overrides in addition to attrSet-merging ones. 
svn path=/nixpkgs/trunk/; revision=12627
 2008-08-14 22:12:50 +00:00
Michael Raskin f1f9e38e94 Big breaking change. I have radically reduced number of nulls used in all-packages.nix and generally switched to composedArgsAndFun which simply adds .meta.function to everything that has come through it.. I have not tested the build, because OO.o has to be updated... 
svn path=/nixpkgs/trunk/; revision=12625
 2008-08-14 22:04:30 +00:00
Michael Raskin eb50dd2c0d Added StumpWM 
svn path=/nixpkgs/trunk/; revision=12566
 2008-08-09 20:21:33 +00:00
Nicolas Pierron 692c5a62a4 Use "abort" instead of "throw" when option values cannot be merged. 
Fix mergeListOption.
Add error support in mergeEnableOption.

svn path=/nixpkgs/trunk/; revision=12522
 2008-08-06 19:24:36 +00:00
Nicolas Pierron 0ce4cafd88 * Do not always use the current result as argument. 
* "filterOptionSets" returns the only option per attribute instead of a list of options.

svn path=/nixpkgs/trunk/; revision=12520
 2008-08-06 18:34:11 +00:00
Nicolas Pierron 0e25bb67cf Add a new way to handle option sets. 
svn path=/nixpkgs/trunk/; revision=12505
 2008-08-05 17:16:35 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch 
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
 2008-06-13 11:46:39 +00:00
Michael Raskin e8e0d1665c traceWhatIs works for empty lists 
svn path=/nixpkgs/trunk/; revision=12046
 2008-06-12 06:58:07 +00:00
Eelco Dolstra dcf01e5925 * A convenience function `makeLibraryPath' that adds "/lib" to each 
element of a list and concatenates them separated by colons.

svn path=/nixpkgs/branches/stdenv-updates/; revision=11970
 2008-06-04 09:56:11 +00:00
Marc Weber e17c96c881 Support for profiling (all libraries) enabled by custom config 
moved flapjax to ghcExecutables
added haskelldb mysql
added ghc darcs build (left in comments)

svn path=/nixpkgs/trunk/; revision=11742
 2008-04-28 22:27:03 +00:00
Michael Raskin 55f4987f42 Added optionalString (similar to optional) 
svn path=/nixpkgs/trunk/; revision=11733
 2008-04-27 23:17:24 +00:00
Marc Weber 772fd74b99 Updated my ghc stuff. 
New is the file containing executables (such as alex/ happy)
some new libraries
The wrapper no longer installs tags by default. You have to add it to your config
So I'm ready to start merging

svn path=/nixpkgs/trunk/; revision=11554
 2008-04-11 00:40:10 +00:00
Michael Raskin 003a6d10b5 Added CDDA support to MPlayer 
svn path=/nixpkgs/trunk/; revision=10978
 2008-03-06 09:34:36 +00:00
Marc Weber a277b420ee annotatedDerivation removed 
svn path=/nixpkgs/trunk/; revision=10975
 2008-03-06 02:48:09 +00:00
Michael Raskin d02d11636b Fixed a typo in lib/default.nix 
svn path=/nixpkgs/trunk/; revision=10904
 2008-03-02 14:26:40 +00:00
Eelco Dolstra e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't 
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
 2008-02-20 23:02:41 +00:00
Michael Raskin ca34aa0514 Forward port of lib 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10700
 2008-02-15 08:41:31 +00:00
Eelco Dolstra 329cf0523e * Doh. 
svn path=/nixpkgs/trunk/; revision=10685
 2008-02-14 13:34:55 +00:00
Eelco Dolstra 3be8e7c28e * Function concatMapStrings. 
svn path=/nixpkgs/trunk/; revision=10681
 2008-02-14 13:16:22 +00:00
Marc Weber 9c211b094e added whatis, traceWhatis, subsetmap, escapeShellArg, stringToCharacters, defineShList 
stringToCharacters is only used by escapeShellArg and should be implemented as primop

svn path=/nixpkgs/trunk/; revision=10655
 2008-02-13 10:09:29 +00:00
Marc Weber 260c0c9c96 new version - annotated derivation proposal - used to install addtiontal /src 
and /tag/ source code which to build up develop environments more easily ( TODO
make this optional for ghcWrapper )

svn path=/nixpkgs/trunk/; revision=10648
 2008-02-12 16:24:02 +00:00
Marc Weber 2fbd55bb6b lib/default-unstable.nix removed 
svn path=/nixpkgs/trunk/; revision=10647
 2008-02-12 16:15:27 +00:00
Eelco Dolstra 28d2f608c6 * Doh! cleanSource was broken; it didn't actually get rid of 
.svn and CVS directories.

svn path=/nixpkgs/trunk/; revision=10635
 2008-02-12 10:08:57 +00:00
Yury G. Kudryashov e7bc12a932 * Function concatMap as in Haskell. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10588
 2008-02-10 17:38:56 +00:00
Michael Raskin 4df190c703 Various fixes and updates to build that all. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10568
 2008-02-10 16:44:43 +00:00
Eelco Dolstra 48f544d2e3 * Function optionals. 
svn path=/nixpkgs/trunk/; revision=10553
 2008-02-08 11:48:06 +00:00
Eelco Dolstra 937f8663ac * Function concatMap as in Haskell. 
svn path=/nixpkgs/trunk/; revision=10501
 2008-02-05 11:41:09 +00:00
Yury G. Kudryashov 0aef28a212 Rewritten gettext-version stuff. 
I've added listOfListsToAttrs to lib because I don't like to type "name =" and
"value =".


svn path=/nixpkgs/trunk/; revision=10315
 2008-01-28 19:30:13 +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
Marc Weber b4b61eccce svn path=/nixpkgs/trunk/; revision=10233 2008-01-20 22:47:08 +00:00
Marc Weber f22d19c128 slightly modified stringsWithDeps script Builder proposal adding the feature 
overriding steps and has better documentation (IMHO) reusing as much as
possible of the code already written by raskin

svn path=/nixpkgs/trunk/; revision=10225
 2008-01-19 01:23:48 +00:00
Michael Raskin bc46eaf404 Some review of builder-defs and dependent files. No rebuild needed. Now it should be possible to override elements in builderDefs 
svn path=/nixpkgs/trunk/; revision=10214
 2008-01-18 12:36:56 +00:00
Marc Weber 735d2a4f66 added small comment on how to use textClosure, also added reference to builder-defs.nix 
svn path=/nixpkgs/trunk/; revision=10186
 2008-01-17 11:14:00 +00:00
Marc Weber e054e91e8b renamed av/avs (create attr/value set) to nv nvs 
because niksnut has renamed the attr names in listToAttrs long time ago.

svn path=/nixpkgs/trunk/; revision=10185
 2008-01-17 11:08:24 +00:00
Marc Weber 42dd0cdac8 added some comments/examples (sumArgs, pairMap, whenFlip) 
svn path=/nixpkgs/trunk/; revision=10184
 2008-01-17 01:31:07 +00:00
Marc Weber 2cfe440b02 Merge lib and lib_unstable. lift lib_unstabel in place in case I've broken something - can be deleted in some days 
svn path=/nixpkgs/trunk/; revision=10166
 2008-01-16 03:29:56 +00:00
Yury G. Kudryashov a7703662a4 Merged with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
 2008-01-15 00:55:21 +00:00
Michael Raskin 5116a523a9 A few library functions added. 
svn path=/nixpkgs/trunk/; revision=10118
 2008-01-11 16:58:55 +00:00
Eelco Dolstra 8c615616c7 * New functions: id, any, all, same as in Haskell. 
* Function `sourceFilesBySuffices' to import all files matching given
  extensions in a directory.

svn path=/nixpkgs/trunk/; revision=10072
 2008-01-04 15:06:16 +00:00
Marc Weber 9a4e9e7a3b vim_configurable example added. broken see comment. 
svn path=/nixpkgs/trunk/; revision=9923
 2007-12-12 07:20:41 +00:00
Marc Weber 054d0e3076 chooseOptionsByFlags2 supports now propagatedBuildInputs (not yet used) 
I've also added enableDisableFeature adding --enable-feature or --disable-feature
(see broken vim_configurable example)

svn path=/nixpkgs/trunk/; revision=9922
 2007-12-12 07:14:27 +00:00
Yury G. Kudryashov 8515c17966 Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9893
 2007-12-08 01:10:32 +00:00
Yury G. Kudryashov 356c077ecf Added XScreensaver; also changed version-stub.nix (now it does sumArgs itself, and requires builderDefs to be used) and added a merge of composing-builder and declarative flag processing. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9880
 2007-12-08 01:07:13 +00:00
Michael Raskin 1bbc6fe55a Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes. 
svn path=/nixpkgs/trunk/; revision=9812
 2007-12-01 16:20:23 +00:00
Michael Raskin 2b5369552c Added XScreensaver; also changed version-stub.nix (now it does sumArgs itself, and requires builderDefs to be used) and added a merge of composing-builder and declarative flag processing. 
svn path=/nixpkgs/trunk/; revision=9776
 2007-11-22 20:26:00 +00:00
Yury G. Kudryashov 606b413f1f Rewritten gettext-version stuff. 
I've added listOfListsToAttrs to lib because I don't like to type "name =" and
"value =".

svn path=/nixpkgs/branches/stdenv-updates/; revision=9734
 2007-11-17 14:05:55 +00:00
Yury G. Kudryashov 8792fb81c7 Merged with trunk. 
The following is autogenerated by git:

commit 9aaede75e73be646f35069d0717c8c70004ba3f0
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 18:37:23 2007 +0000

    This was needed for me to get a working gnome-doc-utils package

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9726 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 751a9e6d19fc9e6c96b04eca450ea1b836d00865
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:30:34 2007 +0000

    gdb upgraded

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9725 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit bb908853924046681d1cd6a85b05273aed14fd9f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:29:11 2007 +0000

    gphoto2 upgraded to 2.4.0: all-packages.nix

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9724 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 619c7004d7140d6016927cd1114fd778aca3ecce
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:53 2007 +0000

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9723 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit f09310ed8403428021d2d751e273fc0add438032
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:28:17 2007 +0000

    gphoto2 upgraded to 2.4.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9722 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 26d5cc1628e51853fdb9a7d162361b3a13581461
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:27:27 2007 +0000

    missing catalog added. Now you can open files

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9721 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 4eb1f68d61077e66b9ca3a0de3c86b1024f06db1
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:09:32 2007 +0000

    nix expression creating startup wrapper for jedit

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9720 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 69701148e45d29b1712c9f14628459def54be076
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 17:06:53 2007 +0000

    The nice programmers editor jedit is now built on nix as well.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9719 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 15ecdd411e78b952d8004323ec871ce6c4969c2e
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:41:15 2007 +0000

    Missing gecko now.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9715 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6975eb6f2a972cca2adb2943190a41880e3bedf7
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:36:15 2007 +0000

    Fix path of libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9714 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ef985f4e88db03a0861fe8ccc8b35ec329ef616a
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:34:02 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9713 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7fb35510feb89fecc9d92810a723baead232dff4
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:33:36 2007 +0000

    added libnotify

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9712 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7a9eb1e172ef5b111556d78a30003a87aee7f775
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:24:24 2007 +0000

    libnotify is missing

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9711 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 433cc0578ce00860ddfac7d7934818ec0584f6e1
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:08:04 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9710 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 194a84b18965e9a3c8f9fa1305fac57690e683cb
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 14:07:30 2007 +0000

    Added libsexy

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9709 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1d832560cf94bfa6793d90ff43f2235415bc3958
Author: wbreejen <wbreejen@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:49:02 2007 +0000

    Added openftd. Doesnt work (yet)

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9708 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 58e8a73f63a85a22ca45f046579d89bd0359f8ee
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 13:08:20 2007 +0000

    * GCC 3.4: pass --disable-multilib to make it build on x86_64.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9704 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 5ff88d858692e89120a4efa4acc2224eaf78d9a9
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Fri Nov 16 03:45:42 2007 +0000

    bzip2 dependency added in a couple of places

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9702 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 128ac8a7ee8668fc933f4933a66f491c44234379
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 23:47:03 2007 +0000

    Added python to libgsf dependencies

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9699 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 1847defee6331b03ba8a54ae9e3e68033310f7a2
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 17:05:45 2007 +0000

    * Use latest Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9695 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit cb1992780c20cb5885cf4d3932e7352f8b912533
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 04:23:46 2007 +0000

    Added a currently more functional URL for libgcrypt

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9688 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 9d099dbef1a5721065bff5f2edd73844c829f538
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:16:03 2007 +0000

    facile: fixed a typo

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9686 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 031c5b7d0797f5eee7be0a06856530c29adee710
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:11:56 2007 +0000

    Added kde-4

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9685 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 81b3a7d92f2e9552c46ab47c75a2d3a40e151d43
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Thu Nov 15 00:08:58 2007 +0000

    Added new kde-4 staff

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9684 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 18edb608ee7822438d4b2dc2a76af7567efd646a
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:48:40 2007 +0000

    kde-4: removed old staff from kde-4 dir

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9683 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 00d9b75d85f3a7de4db3feb313fe8d2d29f6bc2d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:46:48 2007 +0000

    lame: upgrade to 3.97

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9682 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52f8f699f29b6def41eee392f489c7e8ecd9399d
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:44:21 2007 +0000

    libgsf: meta written

    0.14.7 in my previous commit was a typo: 1.14.7 of course

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9681 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6e426380fc8c67b7dae57d4404ee7ca76d3e1d62
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:40:39 2007 +0000

    libgsf: upgraded to 0.14.7

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9680 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 7787b342945cb13856168a353fdc9b0062e5f32b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:37:51 2007 +0000

    clucene: upgrade, kde4: remove

    clucene-core upgraded to 0.9.20
    clucene-contrib removed (can't find any version later than 0.9.16a and don't
    know whether it's compatible with new clucene-core)
    kde4: old staff removed, will add new tonight

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9679 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b4900dece179788dfb8879518b8ec639ba089980
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:25:32 2007 +0000

    Strigi removed

    I'll add a version from kdesupport trunk today

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9678 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ffad224993440be069d4f15cf5e73ed018979311
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:23:36 2007 +0000

    dbus-glib upgraded to 0.74, meta written

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9677 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 6ae133a8d5d472d9f475cacb7f3ff3e6703fb34b
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:13:29 2007 +0000

    xine-lib: upgraded to 1.1.8

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9676 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d56f2643e631f8b3ce6e8228c35f2cc19755e2aa
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:11:37 2007 +0000

    chmlib: upgraded to 0.39

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9675 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit c31c27f328fdd4ae99d48bcc512231639dfcf6e5
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:05:11 2007 +0000

    Added facile library

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9674 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 28f915ee41410b6f278faf07b0135bd4e9aeaf2f
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 23:03:29 2007 +0000

    libgcrypt-1.3.1

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9673 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ca314a236b855b73024677f6dc5bc021070c4e72
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:49:24 2007 +0000

    Fixed a typo in ocaml-3.10.0

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9672 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit b3fa79d09289ab61a30f63692e7c475d0aec142e
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:39:58 2007 +0000

    ocaml: Added 3.10.0, using getVersion staff

    I've added the latest (3.10.0) version of ocaml and let the user choose default
    version.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9671 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 853d65d8a9fd65f7bf918c42342baf6690008f54
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 22:22:06 2007 +0000

    Let user to choose python2.4 or python2.5

    Currently, there is some code duplication. I'll try to rewrite it without
    modifying resulting derivations.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9670 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 65567e8e2e96d1a2e62af148fe043c86df0c5b60
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:57:26 2007 +0000

    useVersion function added

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9669 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2e5e12d1fc1faded72235fa66eb8efaa92e597ba
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 21:41:01 2007 +0000

    git: upgraded to 1.5.3.5; meta added; nix-expr slightly rewritten

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9668 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit dd564f36bd54d4900aefa759bc94cfac7496d1a2
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 19:07:38 2007 +0000

    added small script fixing the shebang (#!/bin/...) path.
    It searches the PATH env variable for the same executable.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9667 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 2f9213e49fbaa40634ccb9699e44aec239212aea
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Wed Nov 14 01:20:17 2007 +0000

    Now SVN Nix builds as a purely alternative Nix choice

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9666 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 016b6bfcc67244964251d68d86e1fa6de2062e54
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 15:52:16 2007 +0000

    Added possibility to use non-default Nix.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9663 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 89f53d7b8dae8d4ec537322340be212602524102
Author: MarcWeber <MarcWeber@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Tue Nov 13 01:26:54 2007 +0000

    implemented proposal by niksnut.
    Now you have to use either date= or tag= when specifying cvs revision

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9661 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit ced4ab4c8b5750a0f0a6a685830c8cb5340b6d52
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:45:47 2007 +0000

    * Symlink $out/bin to $out/libexec.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9659 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit d454ab8861882e18ed3b79287727890ec6668455
Author: raskin <raskin@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:42:13 2007 +0000

    Beta-version of builderDefs fixes.

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9657 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 959e395c49753d902201d457cee102b40608d3f9
Author: urkud <urkud@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 16:12:50 2007 +0000

    djview location corrected

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9655 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 52530f607a15017e94225ee50e2698963325ed80
Author: eelco <eelco@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:51:46 2007 +0000

    * Revert the setup hook changes on the trunk (but they remain on the
      stdenv-updates branch).

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9652 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

commit 977bdfec49557f48bc1e121e3375c21d4991434f
Author: skolthof <skolthof@70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb>
Date:   Mon Nov 12 13:48:33 2007 +0000

    * added Haskell package gtk2hs

    git-svn-id: https://svn.cs.uu.nl:12443/repos/trace/nixpkgs/trunk@9651 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

svn path=/nixpkgs/branches/stdenv-updates/; revision=9727
 2007-11-16 21:05:15 +00:00
Michael Raskin e18c7cec9d Beta-version of builderDefs fixes. 
svn path=/nixpkgs/trunk/; revision=9657
 2007-11-12 16:42:13 +00:00
Michael Raskin 0ba29c56f8 Added converter from new option description format to needed for docbook generation. 
svn path=/nixpkgs/trunk/; revision=9626
 2007-11-11 09:27:52 +00:00
Eelco Dolstra 9d1fc7c5ba svn path=/nixpkgs/trunk/; revision=9617 2007-11-09 18:07:14 +00:00
Eelco Dolstra b5f893d92a * Moved the functions for option processing to lib. 
svn path=/nixpkgs/trunk/; revision=9616
 2007-11-09 18:05:32 +00:00
Michael Raskin a8db1746a5 Fixed log nesting; added Qi. 
svn path=/nixpkgs/trunk/; revision=9601
 2007-11-08 14:34:54 +00:00
Marc Weber 2a8bb1725d fix: listToAttr takes name instead of attr as argument 
svn path=/nixpkgs/trunk/; revision=9599
 2007-11-07 21:45:12 +00:00
Marc Weber 0acef47d44 Is it time to uncomment mkDerivationByConfiguration and start using listToAttrs etc? 
Let's try
* fixes attr -> name change in function av of unstable lib

svn path=/nixpkgs/trunk/; revision=9590
 2007-11-05 21:27:32 +00:00
Michael Raskin 7b1c9a7a82 Added Compiz Fusion (main plugins). Also some dependencies, and made wmii build under setup-new-2.sh also. 
svn path=/nixpkgs/trunk/; revision=9577
 2007-11-05 08:32:20 +00:00
Eelco Dolstra dbc1928af6 * Kernel configuration for Linux 2.6.23. 
* More compact way to override kernel configuration options, e.g.
  extraFlags = ["CONFIG_NO_HZ=y" "# CONFIG_IRQBALANCE is not set"];

svn path=/nixpkgs/trunk/; revision=9562
 2007-10-31 14:39:43 +00:00
Michael Raskin d352d54b11 Added a new setup proposal, builder is no more derived from shell script (where edit=glibc rebuild), but is composed from a nix attribute set with strings and dependencies - so if you add a function, old expressions ignore it; collateral damage are packages in this style: Fastest Fourier Transform in the West, Audacity sound editor, Falling Sand game. Also added string equality that ignores dependencies to lib. Note that hasSuffixHack is now the more predictable version, but hasSuffix is left to remind us to fix the bug. 
svn path=/nixpkgs/trunk/; revision=9549
 2007-10-29 10:52:04 +00:00
Michael Raskin 98a0a257e0 Added sumArgs - it takes a function and gives a function to accpet any number of arguments and then (after getting null) apply original function to the resulting attribute set. 
svn path=/nixpkgs/trunk/; revision=9542
 2007-10-27 17:54:20 +00:00
Eelco Dolstra 2243a1f496 * Backward compatibility with Nix 0.10. 
svn path=/nixpkgs/trunk/; revision=9449
 2007-10-12 09:20:36 +00:00
Michael Raskin 8c7f215381 Uncommented mkDerivationByName. Now it doesn't break everything 
svn path=/nixpkgs/trunk/; revision=9415
 2007-10-06 18:17:47 +00:00