JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,356 Commits 1 Branch 0 Tags 12 GiB
e89dc9d2f0
Commit Graph

590 Commits

Author SHA1 Message Date
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
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Marc Weber
b50b9bf2b7 add versionedDerivation 2013-05-08 15:43:07 +03:00
Marc Weber
e0fab80c27 experimental/multiple-versions-in-one-file 
This patch introduces mergeAttrsByVersion to lib.

In some cases it does make sense to keep "experimental" and "older" versions of
the same package in one file because it follows the "do it once only" principle.
Very often many versions share their build instructions - so even though I
understand Eelcos opinion that different versions should be put into their own
.nix files - its my feeling telling me that this is fastest for most cases.

I agree with Eelco that if tweaks for individual versions become too much they
should be split into individual files.

See comments above mergeAttrsByVersion learn about its usage.

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
 2013-05-08 15:43:07 +03:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates 
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
 2013-05-08 13:46:46 +02:00
Eelco Dolstra
abf2d36773 Revert "Revert "Revert "overrideDerivation: Simplify""" 
This reverts commit c2b1ca0296.

It still breaks VM builds: http://hydra.nixos.org/build/4858140
 2013-05-07 10:49:22 +02:00
Eelco Dolstra
18df66f466 Revert "overrideDerivation: Re-attatch passthru and meta to all outputs" 
This reverts commit 6b0e94a516.

It still breaks VM builds: http://hydra.nixos.org/build/4858140
 2013-05-07 10:48:53 +02:00
Shea Levy
6b0e94a516 overrideDerivation: Re-attatch passthru and meta to all outputs 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-03 09:12:55 -04:00
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
Vladimír Čunát
8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Evgeny Egorochkin
a8d1e3622f Google killed my old email 2013-04-24 16:22:28 +03:00
Vladimír Čunát
5e4aa51173 poppler: share most things between glib and qt4 versions 
Most of the stuff was duplicated (headers, the core library).
The new solution makes the _qt4 package use the _glib one,
because it depended on glib through cairo anyway
(and _glib bindings themselves are just ~350kB).

This also fixes a problem that mergeAttrsByFuncDefaultsClean
didn't merge patches, which affected dbus.libs.
 2013-04-21 20:15:38 +00:00
Vladimír Čunát
ec736312d4 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
 2013-04-17 18:26:28 +02: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
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates 
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
 2013-04-13 12:21:31 +02:00
Eelco Dolstra
4adad458e7 Remove the "proprietary" license 
We already had "unfree".
 2013-04-12 14:37:50 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates 
Needed that to fix the tarball.
 2013-04-11 23:31:33 +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
Vladimír Čunát
7d9607f151 dbus: minor update, reorganize and polish the expression 2013-04-11 22:17:26 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02: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
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01: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
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell
bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +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
Vladimír Čunát
9abff7a85e Major Xfce refactoring, also adding versions 4.10.* 
Please, comment on #296.
 2013-02-09 18:38:26 +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
Eelco Dolstra
a05198b6ea Typos 2012-11-14 11:38:47 +01:00
Eelco Dolstra
56cee6fe5c Make Firefox 16 the default 2012-10-23 15:35:48 +02:00
Baptist BENOIST
e45d4e2722 Add bbenoist as maintainer 
Signed-off-by: Baptist BENOIST <return_0@live.com>
 2012-10-16 18:03:11 +02:00
Jack Cummings
8a911c889b Merge branch 'master' into zfs 2012-10-11 13:16:41 -07:00
Jack Cummings
a4978228e2 Merge remote-tracking branch 'upstream/master' 2012-10-06 20:27:01 -07:00
Eelco Dolstra
e0be32f676 Add a function ‘getVersion’ to get the version of a derivation 2012-10-05 13:48:57 -04:00
Jack Cummings
e7f3ff803e - zfs 0.6.0-rc11, spl 0.6.0-rc11 2012-10-05 09:11:25 -07:00
Jack Cummings
ccad09d3b9 Revert " - zfs-0.6.0-rc11, and spl-0.6.0-rc11" 
This reverts commit 8eb9491a22.
 2012-10-05 09:07:33 -07:00
Jack Cummings
8eb9491a22 - zfs-0.6.0-rc11, and spl-0.6.0-rc11 2012-10-05 00:09:49 -07:00
Jack Cummings
27ec277359 - add myself as a maintainer for the packages I've added 2012-10-04 23:39:00 -07:00
Michael Raskin
de5be50b2d Adding a function capable of extracting the name with version out of url/file path 2012-09-13 13:59:23 +04:00
aszlig
ce1c6fe0fd
licenses: Add Tcl/Tk license. 
It is similar to the BSD license but has a few restrictions regarding government
use. But as I am not a lawyer, I'm not sure if that could be merged with bsd3,
so I'm listing it here separately just to be sure.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2012-09-09 07:00:00 +02:00
Marc Weber
aa583c8cf4 experimental/lib-fold-attr 
adding useful function foldAttr which behave like fold on attr values grouped by name
(without assertions now)

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
 2012-08-28 15:06:14 +02:00
Eelco Dolstra
9d516f16fc Fix evaluation problem 
http://hydra.nixos.org/build/2940128
 2012-08-14 13:42:43 -04:00
Eelco Dolstra
4f7917ac62 Remove obsolete flattenAttrs function 2012-08-13 18:26:19 -04:00
Eelco Dolstra
8225460f82 Remove obsolete eqLists function 2012-08-13 18:19:06 -04:00
Eelco Dolstra
37159c1b9a Remove obsolete eqStrict function 
Use the "==" operator instead.
 2012-08-13 18:08:35 -04:00
Eelco Dolstra
0b4fb4e4f6 Replace some calls to attrByPath with "or" 2012-08-13 15:15:16 -04:00
Eelco Dolstra
c68c95d55a Provide O(n) time implementations of fold/foldl/any/all 
Previous implementations were O(n^2) because tail takes O(n) time.
 2012-08-13 15:15:16 -04:00
Eelco Dolstra
c0a483632c Eliminate some calls to ‘tail’ 2012-08-13 15:15:16 -04:00