Commit Graph

510 Commits

Author SHA1 Message Date
Shea Levy
c2b1ca0296 Revert "Revert "overrideDerivation: Simplify""
Now that `drv.passthru' actually is meaningful, this works.

This reverts commit d21bfddc57.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-03 09:09:58 -04:00
Eelco Dolstra
d21bfddc57 Revert "overrideDerivation: Simplify"
This reverts commit 6640000cb7, which
caused passthru attributes not to be passed correctly after calling
overrideDerivation.  E.g. in the evaluation of the Nix jobset:

at `deb_ubuntu1004i386' [officialRelease = false, nix = ...]:
attribute `fullName' missing
2013-05-03 11:50:39 +02:00
Shea Levy
932dd06f3f Revert "Add isPath to trivial.nix"
This breaks NixOS, and I don't actually need it, so someone who needs it
can bring this back without breaking NixOS :)

This reverts commit 2742087bdd.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-02 15:04:21 -04:00
Shea Levy
2742087bdd Add isPath to trivial.nix
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-02 14:03:43 -04:00
Evgeny Egorochkin
a8d1e3622f Google killed my old email 2013-04-24 16:22:28 +03:00
Rok Garbas
f39f369ff1 pythonPackages.buildout: update to 1.7.1 and also:
- rename to zc_builout* while keeping alias back to buildout (opening ticket
  later to remove it)
- meta: adding zpl licenses
- meta: adding me maintainer
2013-04-17 01:25:45 +02:00
Eelco Dolstra
7745357f0e meta.license should be a (list of) string(s), not an attribute set
http://hydra.nixos.org/build/4744513
2013-04-14 20:10:58 +02:00
Eelco Dolstra
4adad458e7 Remove the "proprietary" license
We already had "unfree".
2013-04-12 14:37:50 +02:00
Shea Levy
6640000cb7 overrideDerivation: Simplify
Since we're just calling derivation again, drvAttrs is exactly what we
want to pass, and we can get rid of the complicated "drop" logic. As a
bonus, this actually makes it correct, since before "drop" removed the
attribute named passthru but not actually the attributes added to the
top-level attrset via passthru.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-11 17:02:19 -04:00
Moritz Ulrich
05f2ea2d12 Add myself (the-kenny) to the maintainer list.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-03-30 21:05:15 +01:00
Eelco Dolstra
79eda8573e Remove broken ‘removeList’ function 2013-03-26 11:58:59 +01:00
Peter Simons
3388c3433e pkgs/lib/licenses.nix: strip trailing whitespace 2013-03-24 22:45:48 +01:00
Peter Simons
a06ec6bb62 pkgs/lib/licenses.nix: add 'unfree' and 'unfree-redistributable' licenses 2013-03-24 22:45:21 +01:00
Shea Levy
98860f429d Add the addPassthru library function
With multiple outputs, adding attributes to a derivation without
changing the {drv,out}Path is no longer as trivial as simply using the
`//' operator, as we usually want to add the attribute to _each_ output,
and even if we only care about one that one output can be reached via
multiple paths.

For stdenv.mkDerivation, we already had code in place to add passthru
and meta attributes to derivations. This commit simply factors part of
that code out into a lib function addPassthru, which takes a derivation
and an attribute set and appends the attribute set to each output of the
derivation.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-24 08:29:10 -04:00
orbitz
55be059467 Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me 2013-03-08 22:59:54 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Eelco Dolstra
5e83e93e97 Add a library function ‘genAttrs’
It generates an attribute set by mapping a function over a list of
attribute names.
2013-03-06 16:33:01 +01:00
Vladimír Čunát
26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Shea Levy
879c87d7fe Fix hiPrio.
Did this ever work?
2013-02-25 06:31:19 -05:00
Peter Simons
726574a5e4 pkgs/lib/strings.nix: strip trailing whitespace 2013-02-24 19:28:38 +01:00
Peter Simons
7181888c23 pkgs/lib/strings.nix: add 'enableFeature' function to simplify generation of GNU Autoconf "--{enable,disable}-feature" strings 2013-02-24 19:28:24 +01:00
Peter Simons
9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
Domen Kozar
77f61dd987 add deluge torrent client and it's dependencies 2013-02-18 00:00:39 +01:00
Lluís Batlle i Rossell
77bf593ea2 Adding some 'arm' as mesa platforms. Otherwise assertions won't let me
build some pieces.
2013-02-17 15:55:47 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Eelco Dolstra
e4ce304333 types.nix: Add a ‘lines’ type
This is like types.string, but values are merged by putting a newline
in between them.  This is mostly useful for configuration file
options, where we don't want values accidentally ending up on the same
line.

Note that almost all options with string type in NixOS should either
be unmergable (i.e. should be marked with ‘types.uniq’) or should
actually be of type ‘lines’.  So it might make sense to remove the
merge function for the ‘string’ type eventually.
2013-02-11 15:32:24 +01:00
Shea Levy
0d1b60d206 Document deepSeq 2013-02-04 07:20:14 -05:00
Shea Levy
da3be9c6b2 Add deepSeq lib function 2013-02-01 00:39:26 -05:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
aszlig
abe2993c4b
chromium: Add myself to maintainers.
Might come in handy to actually know when things going to break.

In case you're wondering: Yes, "aszlig" is the name everyone uses in real life
(even my family uses it) and is my pending stage name (not _yet_ officially).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-01-10 03:33:04 +01:00
Peter Simons
9e9cd7b529 Merge branch 'master' into stdenv-updates. 2013-01-04 21:00:53 +01:00
Shea Levy
c1598d167e Simplify lib.typeOf 2012-12-31 13:59:30 -05:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Sergey Mironov
f1e15325f9 maintainers: add myself to the maintainers list 2012-12-27 15:44:11 +04:00
Shea Levy
2eb0c6fba5 D'oh 2012-12-20 00:52:51 -05:00
Shea Levy
95679e1344 Misunderstood hasOptions, I think 2012-12-20 00:28:12 -05:00
Shea Levy
ce6d4070a6 Add a 'functionTo x' type.
This is mainly to for the 'merge' concept, but I made a guess as to what
iter and fold would mean for functions.
2012-12-19 22:49:37 -05:00
Peter Simons
e979e478a4 pkgs/lib/platforms.nix: fix specification of mesaPlatforms
Mesa is supported on i686-linux, x86_64-linux, and x86_64-darwin.
2012-12-06 11:25:08 +01:00
Eelco Dolstra
f4ec141869 Use "or" in a few places 2012-12-04 12:58:23 +01:00
Eelco Dolstra
3bdf95e05b Get rid of some error contexts that don't provide useful info 2012-12-04 12:58:22 +01:00
Eelco Dolstra
9a92f3fc35 Remove mkThenElse and mkAlways 2012-12-04 12:58:22 +01:00
Eelco Dolstra
abd06b220d Remove unused function ‘selectDeclsAndDefs’ 2012-12-03 20:48:52 +01:00
Eelco Dolstra
72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Eelco Dolstra
b481d4daf1 Update e-mail address 2012-11-26 14:49:05 +01:00
Michael Raskin
cae78ef3e3 Merge pull request #190 from MarcWeber/fixes/lists-sort
fix sort in lists.nix
2012-11-21 21:34:42 -08:00
Peter Simons
2f55f31f49 Merge pull request #155 from bbenoist/newpkgs
New pkgs: qtcreator fox xfe gmrun geany
2012-11-20 12:43:06 -08:00
Marc Weber
1a948d97a2 fix sort in lists.nix 2012-11-20 13:56:14 +01:00