Commit graph

578 commits

Author SHA1 Message Date
Eelco Dolstra 62585a363f Support "imports" in abbreviated modules
In abbreviated modules (those without a "config" attribute), you can
use "require", but it doesn't behave in the same way.  For consistency
we should use "imports" everywhere.
2013-09-04 13:04:50 +02:00
modulistic a09d595c77 Add 'modulistic' to the maintainers list 2013-08-23 13:52:35 +02:00
Evgeny Egorochkin 2d310a91c8 Trivial change of wording of error messages 2013-08-23 09:01:12 +03:00
Evgeny Egorochkin 993deb1a4a Hopefully a fixed version of Refactor: introduce isType reducing redundancy.
Coding-by-sed wasn't a good idea :(
2013-08-22 23:17:30 +03:00
Eelco Dolstra d28a189af6 Revert "Refactor: introduce isType reducing redundancy (trivial change)"
This reverts commit 52204af457.  It
breaks Nixpkgs evaluation.

http://hydra.nixos.org/build/5758197
2013-08-22 16:40:27 +02:00
Marc Weber 7a76598447 Improve error messages.
Improve function name: ensureDefaultType: It runs the check function, so
checkDefault is much easier to understand.
2013-08-22 11:20:57 +03:00
Marc Weber 52204af457 Refactor: introduce isType reducing redundancy (trivial change) 2013-08-22 11:10:53 +03:00
Marc Weber acd4dcde63 Always merge functions "merge" and "check" if type defines them. 2013-08-22 10:32:13 +03:00
Marc Weber 53994036d3 Replace fold by all because its more readable and shorter 2013-08-22 10:16:00 +03:00
Evgeny Egorochkin fcbc4fe9ff Deprecate lib.zip in favor of lib.zipAttrsWith.
Add deprecation trace message.
Nixos has been ported away from lib.zip in d705c0c3a4b84768907ade90b3f420d62db422a2.
2013-08-22 10:06:43 +03:00
Marc Weber a3f148ce96 Improve option types documentation. 2013-08-22 10:01:27 +03:00
Marc Weber 983c87a1dd Improve the error message for uniq option type. 2013-08-22 09:50:25 +03:00
Marc Weber fd803fce60 List should be an alias of listOf, and it should no longer be used.
Add deprecation notice to list.
Nixos has already been ported from list to listOf (8b2256686b).
2013-08-22 09:45:22 +03:00
Marc Weber b00d824930 Drop inferred, because "it was supposed to be used at every location
which has no type" according to pierron - but isn't used in
nixos/nixpkgs
2013-08-22 09:37:20 +03:00
Bodil Stokke de462dcae2 Cleaned up ponysay build, and added maintainer metadata. 2013-08-18 18:23:35 +02:00
Domen Kožar 3882056313 typo 2013-08-13 12:22:40 +02:00
Domen Kožar 1974c55d91 add python application substanced and it's dependencies 2013-08-13 11:14:24 +02:00
Song Wenwu 5f4fc730b1 add myself to maintainers list, keep it sorted
orc: add myself as a maintainer
2013-08-11 15:14:12 +08:00
Michael Raskin bfbbb12e35 Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations 2013-08-02 09:39:20 +04:00
Ertugrul Söylemez fc8d1341f6 Maintainers: added ertes. 2013-07-19 19:52:11 +02:00
Shea Levy 6b0d6593e8 Create a mkEnableOption function for an extremely common NixOS idiom
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-18 15:13:42 -04:00
Eelco Dolstra 329a705005 nvidia-x11: Fix the library-only build
Also, introduce a function ‘versionAtLeast’ which is probably more
natural than ‘versionOlder’.
2013-07-17 11:14:26 +02:00
Shea Levy 8a66c8b8f8 imap previously mapped with 1-based indices
Why????

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-12 13:06:32 -04:00
Shea Levy a4c333474c lib/lists.nix: Remove uses of the tail function
nix lists are not like haskell lists, and tail is an O(n) operation.
This makes recursion using tail less efficient than recursion using
length + elemAt.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-12 12:36:36 -04:00
Eelco Dolstra 074acec50b Doh 2013-07-03 16:35:13 +02:00
Eelco Dolstra 80213cbb05 meta.license is a list of strings (not attribute sets)
http://hydra.nixos.org/build/5453648
2013-07-03 12:41:27 +02:00
Rob Vermaas 4278f778b4 Improve error message for option that is not defined and has now default value. 2013-06-28 21:34:33 +02:00
Vladimír Čunát 38a59aa953 maintainers: change my attrname to be uniform 2013-06-27 20:43:56 +02:00
Vladimír Čunát 6bcf790d05 Merge branch 'master' into x-updates 2013-06-17 22:08:16 +02:00
Shea Levy 8179bad658 Merge branch 'allow-imports-in-submodules' into upstream-master
This allows submodules to use the full power of the module system.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-17 10:06:08 -04:00
Shea Levy abfca0ad14 When printing submodule keys, print just the file name if known
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-17 10:05:46 -04:00
Jaka Hudoklin a826c359c2 Add amdadl-sdk: amd display library sdk, usefull for ati gpu statistics 2013-06-16 21:39:54 +00:00
Jaka Hudoklin 4817f34f2b Add amdapp-sdk: accelerated parallel processing sdk with OpenCL support 2013-06-16 21:39:43 +00:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Michael Raskin ed51d54610 Merge pull request #606 from fignuts/master
Add keepass password manager and update mono DLLMap.
2013-06-13 05:42:53 -07:00
Jason "Don" O'Conal 4fe22e28cb Add sup expression 2013-06-13 10:42:30 +10:00
Andrew Morsillo e1bd332758 Added keepass password manager. Updated mono DLLMap to allow mono to run WinForms applications (keepass). 2013-06-09 23:17:09 +02:00
Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates
Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix
2013-06-08 15:41:39 +00:00
Shea Levy 6d64b1d92c Give unique keys to submodule components
I'm not wed to the outPath values I chose, other options are probably
valid there too. It would be nice if we could track which file each
merged value came from as well.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-07 03:42:46 -04:00
Shea Levy d465d6764a Allow imports in submodules
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-06 14:00:10 -04:00
Domen Kozar b6f7f05b35 adding unfree-redistributable-firmware 2013-06-05 22:44:17 +02:00
Shea Levy 2952d7d114 Merge submodule extraArgs and individualExtraArgs
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-05 11:20:59 -04:00
Vladimír Čunát 7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Shea Levy 888c7f2757 modules: Enable setting extraArgs for all submodules or by name
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-04 17:47:42 -04:00
Ricardo M. Correia 17119e38e3 licenses: Add AGPLv3 and fix links to BSD licenses 2013-05-31 01:07:36 +00:00
Vladimír Čunát b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Jaka Hudoklin f55b58bcc0 Add offline <Jaka Hudoklin> as a maintainer, so i can latter add myself as maintainer to packages 2013-05-26 13:23:28 +00:00
Bjørn Forsman eaeb0c9c7d maintainers.nix: add myself (Bjørn Forsman)
And keep the list sorted.
2013-05-20 20:09:48 +02:00
Shea Levy 03b6fe7422 Revert "Revert "overrideDerivation: Re-attatch passthru and meta to all outputs""
This reverts commit 18df66f466.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-15 00:39:17 -04:00
Shea Levy 05a02c639e Revert "Revert "Revert "Revert "overrideDerivation: Simplify""""
This reverts commit abf2d36773.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-15 00:38:03 -04:00