Commit graph

62 commits

Author SHA1 Message Date
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
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
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
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
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
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
Michael Raskin 3b8b925153 Commented someadditions out and corrected spelling - mkDerivationByConfiguration ruins all-packages.nix
svn path=/nixpkgs/trunk/; revision=9408
2007-10-05 07:26:23 +00:00
Eelco Dolstra 33238a2bbf * findSingle: return a caller-specified value if there are multiple
matching elements in the list.

svn path=/nixpkgs/trunk/; revision=9397
2007-10-03 13:26:24 +00:00
Michael Raskin 43e0727f04 corrected /dev/null patch
svn path=/nixpkgs/trunk/; revision=9363
2007-09-23 18:05:11 +00:00
Eelco Dolstra bd0e895bad * Release notes.
* Linux 2.6.22.6.
* w3m 0.5.2.

svn path=/nixpkgs/trunk/; revision=9305
2007-09-11 20:05:54 +00:00
Marc Weber ddb31307de fix: adding defaults
svn path=/nixpkgs/trunk/; revision=9283
2007-09-10 06:05:38 +00:00
Marc Weber a38eb565b7 configuration examples / tests added which demonstrate all features.
svn path=/nixpkgs/trunk/; revision=9282
2007-09-09 18:14:19 +00:00
Marc Weber 4c44560d95 new patch. now specifying settings if flags are not set is also possible.
svn path=/nixpkgs/trunk/; revision=9281
2007-09-09 00:15:17 +00:00
Michael Raskin 28784956a0 Added function for defining just a bundle of dependencies.
svn path=/nixpkgs/trunk/; revision=9216
2007-08-28 23:29:23 +00:00
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
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
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
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 54a1f25c4c Added conditional concatenation and used it for name and configureFlags generation.
svn path=/nixpkgs/trunk/; revision=9136
2007-08-15 21:17:11 +00:00
Michael Raskin 75747d3b1c Added possibility for flags= in calls to proposed template. As usual, look at huge Vim.
svn path=/nixpkgs/trunk/; revision=9135
2007-08-15 20:54:11 +00:00
Michael Raskin 118e9d6ebf Corrected a flaw that made automated package silently accept any extra arguments
svn path=/nixpkgs/trunk/; revision=9101
2007-08-11 11:14:36 +00:00
Michael Raskin efbabdb598 Converted Vim package to a template-based form with only lists filled in manually. Added library functions to support it. Added two proposed package templates to top-level, so that every discussion about package format can result in just editing templates or adding new ones.
svn path=/nixpkgs/trunk/; revision=9100
2007-08-11 10:34:07 +00:00