JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,984 Commits 2 Branches 0 Tags 12 GiB
86639d9bb9
Commit Graph

500 Commits

Author SHA1 Message Date
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