JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,934 Commits 2 Branches 0 Tags 13 GiB
fc8d1341f6
Commit Graph

559 Commits

Author SHA1 Message Date
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
Eelco Dolstra
431c55cbf1 Use builtin filter, elem, concatLists functions if available 2012-08-13 15:15:16 -04:00
Eelco Dolstra
3bf4437622 Remove obsolete backwards compatibility hack for getAttr 2012-08-13 15:15:16 -04:00
Andres Loeh
8984139215 Fix bug in uniqList. 2012-07-18 16:31:39 +02:00
Andres Loeh
3fbd694d7d Try to cut recursion depth in uniqList and closePropagation. 2012-07-18 11:18:15 +02:00
Carles Pagès
c93ecad6e2 Adding myself (page) to maintainers. 2012-07-17 23:31:19 +02:00
Eelco Dolstra
46dc120270 Fix the "path" option type 
Comparing a string with a context with "/" doesn't work because the
"==" operator also compares context.  So the context needs to be
discarded.
 2012-07-12 11:54:05 -04:00
Antono Vasiljev
76021a76cb Add myself to maintainers.nix 2012-06-23 02:22:38 +03:00
Eelco Dolstra
4b5c1dec62 * Add a function ‘mapAttrsToList’ that maps a function over the 
attributes in a set, returning a list.  (Note that the regular
  ‘mapAttrs’ returns an attribute set.)

svn path=/nixpkgs/trunk/; revision=34509
 2012-06-14 19:07:01 +00:00
Arie Middelkoop
3c74283d03 Committing some outstanding modifications that I cannot make into smaller chunks anymore. 
* added briss: a pdf cropper
* added compton, an improved fork of xcompmgr
* added myself to the maintainers list
* minor version bumps: xcompmgr, upower


svn path=/nixpkgs/trunk/; revision=34380
 2012-06-08 10:16:46 +00:00
Rickard Nilsson
ca5dfc9634 obnam 1.0 
obnam is a backup program with support for deduplication, compression and encryption. See http://liw.fi/obnam/.

svn path=/nixpkgs/trunk/; revision=34331
 2012-06-03 22:11:09 +00:00
Eelco Dolstra
040cf06388 * Add a type "path". 
svn path=/nixpkgs/trunk/; revision=34247
 2012-05-25 17:19:07 +00:00
Eelco Dolstra
89af9f3f4c * Add a variant of mapAttrs that allows rewriting the name of each 
attribute in addition to the value.

svn path=/nixpkgs/trunk/; revision=34246
 2012-05-25 17:01:58 +00:00
Andres Löh
5144845d71 Platform refinement. 
This should be stable under regeneration with hackage4nix.

svn path=/nixpkgs/trunk/; revision=34189
 2012-05-20 20:21:55 +00:00
Eelco Dolstra
069604730b * Work around some problems in tarball checks. Nix wants to open the 
DB even in read-only mode.  Should probably fix that.  Also, "or" no
  longer works like this because it's a keyword now.

svn path=/nixpkgs/trunk/; revision=34079
 2012-05-13 19:10:57 +00:00
Nicolas Pierron
82b308bf11 Add armv7l support. 
svn path=/nixpkgs/trunk/; revision=33798
 2012-04-15 23:41:25 +00:00
Nicolas Pierron
8a67709183 Add mkMerge and obsolete mkThenElse. 
svn path=/nixpkgs/trunk/; revision=33796
 2012-04-15 23:31:48 +00:00
Eelco Dolstra
e78a048265 * Add a function "filterAttrs" and clean up some comments. 
svn path=/nixpkgs/trunk/; revision=33626
 2012-04-05 15:37:52 +00:00
Lluís Batlle i Rossell
5d15ef0e7c Updating vimprobable2 to 1.0.0 
I took mainly the patch from Alexandr Foremny, but I had to solve conflicts.

Moreover it required the old webkit.


svn path=/nixpkgs/trunk/; revision=33596
 2012-04-04 21:30:49 +00:00
Eelco Dolstra
1c62133e9f * Fix email address. 
svn path=/nixpkgs/trunk/; revision=33575
 2012-04-04 16:36:17 +00:00
Eelco Dolstra
23957ac824 * Updated htop to 1.0.1. 
svn path=/nixpkgs/trunk/; revision=33566
 2012-04-04 14:46:17 +00:00
Lluís Batlle i Rossell
3153e80659 Adding tp_smapi. 
Patch by Rok Garbas, who also adds himself as a maintainer.


svn path=/nixpkgs/trunk/; revision=33495
 2012-03-31 13:40:34 +00:00
Yury G. Kudryashov
ec15b98631 Add memcached 
Patch by Corey O'Connor, see http://reviewboard.loegria.net/r/15/

svn path=/nixpkgs/trunk/; revision=33461
 2012-03-28 22:30:13 +00:00
Yury G. Kudryashov
613a8ecaf9 Remove some trailing spaces 
svn path=/nixpkgs/trunk/; revision=33456
 2012-03-28 15:43:39 +00:00
Peter Simons
1aa8a93bf6 pkgs/lib/maintainers.nix: re-enabled my e-mail account for Hydra notifications 
svn path=/nixpkgs/trunk/; revision=33393
 2012-03-24 10:21:43 +00:00
Rob Vermaas
e1873ada7f disable notification to Peter Simons for now 
svn path=/nixpkgs/trunk/; revision=33384
 2012-03-23 15:33:35 +00:00
Eelco Dolstra
2938819d7e * Remove an unnecessary function. 
svn path=/nixpkgs/trunk/; revision=33271
 2012-03-19 18:13:47 +00:00
Eelco Dolstra
6b4cd6673a * Add a utility function "versionOlder" to compare two version 
strings.

svn path=/nixpkgs/trunk/; revision=33267
 2012-03-19 18:04:47 +00:00
Eelco Dolstra
af2da39a04 * Remove unused function "checker". 
svn path=/nixpkgs/trunk/; revision=33266
 2012-03-19 18:01:49 +00:00
Florian Friesdorf
8e32380a79 add PSFL, update python meta (license, maintainers, unify description) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
 2012-02-26 17:23:16 +00:00
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
 2012-02-25 19:57:34 +00:00
Eelco Dolstra
5f78cfa108 * Add "..." to the trace message. 
svn path=/nixpkgs/trunk/; revision=32559
 2012-02-25 17:33:14 +00:00