Commit graph

281 commits

Author SHA1 Message Date
Shea Levy
2d38aee71b xpra: Use new ffmpeg attribute
It still builds, but it's a pythonPackage so who knows if it works
right. Was breaking the tarball, though.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 06:49:23 -04:00
Jaka Hudoklin
06425fca37 Upgrading xpra to 0.8.8 2013-03-30 15:23:51 +01:00
Song Wenwu
9cbcbc5323 add xchainkeys-0.11 2013-03-08 13:55:32 +08: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
Lluís Batlle i Rossell
097705cd86 virtualgl: fixing and updating to 2.3.2 2013-03-01 10:18:00 +01:00
Shea Levy
c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Shea Levy
ad057db2d6 x11vnc: Fix more hard-coded /bin/su 2013-02-16 11:29:28 -05:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Michael Raskin
09ee51c442 Fixing xlaunch for systemd branch 2013-02-05 17:21:51 +04: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
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
Sergey Mironov
c27b556673 xkb_switch: command line tool to switch X keyboard layouts 2012-12-27 17:45:08 +04:00
Rickard Nilsson
023f5a098b xcalib: Fix maintainer 2012-12-11 15:10:55 +01:00
Rickard Nilsson
71f4666903 xcalib: Fix license 2012-12-11 13:45:04 +01:00
Rickard Nilsson
bdfe779d2c Add xcalib 0.8, a tiny monitor calibration loader 2012-12-11 11:36:02 +01:00
Rickard Nilsson
24298db823 xdg-utils: Fix reference to /usr/bin/file in xdg-mime 2012-10-04 13:38:26 +02:00
aszlig
ceff799efc xpra: Add python notify module.
This is not needed to run XPRA, but gets rid of a few nasty errors.

XPRA is using the notify library to display nice desktop notifications, so there
might be users who actually like to have those funny things.
2012-07-06 03:41:32 +02:00
aszlig
5cf8899673 xpra: Don't include cython into store requisites.
Cython is not required in order to run XPRA, so we now explicitly specify what
should be put into PYTHONPATH instead of using the PYTHONPATH which is set
during build time.

That way we don't get unnecessary stuff in /nix/store, like the mentioned
cython compiler/interpreter.
2012-07-06 03:40:47 +02:00
aszlig
d802bacdd9 xpra: New version from the fork.
This is because the original version is no longer in development, as stated on
the website at http://code.google.com/p/partiwm/wiki/xpra:

"This project is in deep hibernation; I haven't had time to devote for several
years now. If you are looking for xpra, you may prefer Antoine Martin's fork,
which receives more support. It is available at: http://xpra.org/"

So I guess its safe to switch over to that fork.
2012-07-06 03:39:55 +02:00
Ludovic Courtès
4bca5587a6 GNU Xnee 3.12.
svn path=/nixpkgs/trunk/; revision=33710
2012-04-09 20:52:00 +00:00
Yury G. Kudryashov
776bedbb5f Remove some files not reachable from all-packages.nix
List of removed files:
* pkgs/applications/misc/kiwixbuilder/default.nix
* pkgs/applications/misc/simgrid/default.nix
* pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
* pkgs/applications/networking/mailreaders/thunderbird/7.x.nix
* pkgs/applications/networking/mailreaders/thunderbird/thunderbird-build-deps.patch
* pkgs/development/libraries/bluez-libs/default.nix
* pkgs/development/libraries/libjingle/0.4.0.nix
* pkgs/development/perl-modules/Font-TTF/default.nix
* pkgs/tools/X11/xauth/default.nix
* pkgs/tools/security/p0f/default.nix
* pkgs/tools/security/p0f/p0f.patch

svn path=/nixpkgs/trunk/; revision=33205
2012-03-17 17:20:30 +00:00
Yury G. Kudryashov
68fe867e19 Get rid of most references to gtkLibs
svn path=/nixpkgs/trunk/; revision=33088
2012-03-14 21:57:32 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Arie Middelkoop
3f1054b1ec Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11.
Note: it relies heavily on 'virtualgl'. This also makes the approach taken
by bumblebee not very effective.
So, this package is actually mainly useful for shutting down your card so that
it does not consume power/produce heat.

See the comments in bumblebee/default.nix

svn path=/nixpkgs/trunk/; revision=32036
2012-02-05 00:51:35 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Ludovic Courtès
9975a56711 GNU xnee 3.11.
svn path=/nixpkgs/trunk/; revision=31675
2012-01-18 20:52:50 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
e6cbed31ee * Hard-code the path to xdpyinfo rather than expecting it to be in
$PATH.  This is necessary because x11vnc does a "su - <user>
  ... xdpyinfo" somewhere.

svn path=/nixpkgs/trunk/; revision=30387
2011-11-11 03:11:09 +00:00
Eelco Dolstra
75b527df8e * Fix some hard-coded paths.
svn path=/nixpkgs/trunk/; revision=30373
2011-11-10 19:06:02 +00:00
Eelco Dolstra
43b5478d1d * x11vnc updated to 0.9.13.
svn path=/nixpkgs/trunk/; revision=30356
2011-11-09 16:44:49 +00:00
Michael Raskin
e9a5a5d819 Fix xmacro build
svn path=/nixpkgs/trunk/; revision=28787
2011-08-23 17:52:05 +00:00
Ludovic Courtès
f62b53ee19 GNU Xnee 3.10.
svn path=/nixpkgs/trunk/; revision=28754
2011-08-22 17:38:53 +00:00
Lluís Batlle i Rossell
167912d19e Adding xdotool
svn path=/nixpkgs/trunk/; revision=26896
2011-04-19 20:51:40 +00:00
Lluís Batlle i Rossell
4fce3aceb0 Adding xbindkeys (now with all the files)
svn path=/nixpkgs/trunk/; revision=26448
2011-03-21 18:10:20 +00:00
Michael Raskin
23f8f4d7b6 Update x11vnc
svn path=/nixpkgs/trunk/; revision=26405
2011-03-17 21:08:01 +00:00
Ludovic Courtès
f1f647e6fc GNU Xnee 3.09.
svn path=/nixpkgs/trunk/; revision=26078
2011-02-23 17:36:28 +00:00
Ludovic Courtès
4a5c37a70f GNU Xnee 3.08.
svn path=/nixpkgs/trunk/; revision=25726
2011-01-30 16:11:36 +00:00
Eelco Dolstra
1f5b61713e * Added libvdpau and vdpauinfo.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25296
2010-12-27 18:30:52 +00:00
Lluís Batlle i Rossell
ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Peter Simons
dffe4189e7 pkgs/tools/X11/x11vnc: move --mandir and --infodir to standard locations
svn path=/nixpkgs/trunk/; revision=25012
2010-12-06 18:01:46 +00:00
Ludovic Courtès
c50a240e3d xtrace 1.0.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24854
2010-11-25 09:38:28 +00:00
Eelco Dolstra
907bb1aac6 * ltrace: updated to 0.5.3.
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
2010-07-29 18:55:16 +00:00
Eelco Dolstra
ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency.
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
2010-07-29 08:21:21 +00:00
Eelco Dolstra
749b8607ca * More cleanup.
svn path=/nixpkgs/trunk/; revision=22795
2010-07-28 15:35:01 +00:00
Lluís Batlle i Rossell
d0f681d657 Fixing virtualgl for 'vglrun' to work fine and simple, under xproxy (like tigervnc).
svn path=/nixpkgs/trunk/; revision=22586
2010-07-13 19:12:42 +00:00
Lluís Batlle i Rossell
a8c5534849 Adding virtualgl (and therefore, libjpeg-turbo, a SIMD API-compatible libjpeg)
svn path=/nixpkgs/trunk/; revision=22553
2010-07-10 08:45:44 +00:00
Lluís Batlle i Rossell
4df5343e78 Adding x2x.
Patch by Oleksandr Kozachuk

svn path=/nixpkgs/trunk/; revision=21796
2010-05-16 16:23:17 +00:00
Eelco Dolstra
48e1c2df80 * Added xdg-utils, a package that contains desktop integration
commands such as `xdg-open' (which opens a URL with the user's
  default browser).

svn path=/nixpkgs/trunk/; revision=20829
2010-03-25 19:48:06 +00:00
Lluís Batlle i Rossell
d1f8da3ae7 Adding xtrace (not that of glibc, but a X protocol tracer)
svn path=/nixpkgs/trunk/; revision=19013
2009-12-17 11:58:05 +00:00
Michael Raskin
fe10a3aed5 Update xlaunch to match NixOS update
svn path=/nixpkgs/trunk/; revision=18655
2009-11-26 20:17:20 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Michael Raskin
ddae0905e3 Update x11vnc arguments
svn path=/nixpkgs/trunk/; revision=18171
2009-11-05 22:27:46 +00:00
Eelco Dolstra
f53195f29e * Improved a bunch of "name" attributes (mostly missing version
numbers).

svn path=/nixpkgs/trunk/; revision=17991
2009-10-28 14:06:56 +00:00
Michael Raskin
3c62e3bb95 Adding option to xlaunch to terminate X server after original client closes connection
svn path=/nixpkgs/trunk/; revision=16575
2009-08-04 10:14:29 +00:00
Marc Weber
f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +00:00
Marc Weber
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Michael Raskin
72b1cefae9 For xlaunch authority reset makes little sense
svn path=/nixpkgs/trunk/; revision=15449
2009-05-05 12:37:23 +00:00
Eelco Dolstra
fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Michael Raskin
c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00
Michael Raskin
87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
2008-08-19 05:54:09 +00:00
Michael Raskin
61b285d660 Added xnee utility for X11 action recording
svn path=/nixpkgs/trunk/; revision=12612
2008-08-14 09:25:26 +00:00
Eelco Dolstra
26a152653d * Adde xpra. Doesn't quite work yet.
* Removed python_alts.

svn path=/nixpkgs/trunk/; revision=11161
2008-03-17 13:45:50 +00:00
Michael Raskin
7698f380a0 Added x2vnc, a tool to control physically close but formally remote VNC display as an extension of local one.
svn path=/nixpkgs/trunk/; revision=11148
2008-03-17 06:29:32 +00:00
Michael Raskin
5204d562cc Keynav fix
svn path=/nixpkgs/trunk/; revision=11147
2008-03-17 06:28:22 +00:00
Michael Raskin
71f8e0911a Added src to meta for builderDefs-based packages.
svn path=/nixpkgs/trunk/; revision=10913
2008-03-02 18:49:31 +00:00
Michael Raskin
8ea6496a10 -
svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10823
2008-02-22 03:06:12 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00
Michael Raskin
498d47b583 Added module_aggregator. Pass some directories with modules to it, and it will give you a directory to use instead of pkgs.kernel . addSbinPath in builderDefs to use sbin/ in addToEnv . Some catching up in xlaunch.
svn path=/nixpkgs/trunk/; revision=10075
2008-01-04 17:02:12 +00:00
Michael Raskin
2d08dca911 Now xlaunch can launch more than one X session. Use first argument starting with : for that.
svn path=/nixpkgs/trunk/; revision=10053
2008-01-02 16:43:36 +00:00
Michael Raskin
a677869546 Looks like final fix for xlaunch
svn path=/nixpkgs/trunk/; revision=10044
2008-01-01 21:01:58 +00:00
Michael Raskin
e0317df04f Yet another attempt to fix xlaunch
svn path=/nixpkgs/trunk/; revision=10039
2008-01-01 12:15:40 +00:00
Michael Raskin
9784b59b8b Another attempt to fix xlaunch
svn path=/nixpkgs/trunk/; revision=10038
2008-01-01 11:49:18 +00:00
Michael Raskin
af2c151d9d Fix for xlaunch
svn path=/nixpkgs/trunk/; revision=10037
2008-01-01 11:33:25 +00:00
Michael Raskin
fa272cab14 Fixed bridge-utils, added qemu, tuned builder-defs unpack, added xlaunch - a tool to launch X using everything possible from the job except slim.
svn path=/nixpkgs/trunk/; revision=9985
2007-12-31 08:49:41 +00:00
Michael Raskin
d2c1953e8d Updated keynav; new features; do not forget to copy keynavrc from share/keynav/doc to ~/.keynavrc
svn path=/nixpkgs/trunk/; revision=9391
2007-10-01 19:47:53 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Michael Raskin
4d137ad014 Added xmacro; updated clisp - well, it compiles now...
svn path=/nixpkgs/trunk/; revision=9098
2007-08-10 18:54:44 +00:00
Michael Raskin
5708413b42 Added keynav.
svn path=/nixpkgs/trunk/; revision=9045
2007-08-04 13:21:09 +00:00
Eelco Dolstra
9f898a586b * Copy even more files (in particular from losser.st-lab.cs.uu.nl,
can't assume that it will live forever).

svn path=/nixpkgs/trunk/; revision=4624
2006-01-30 16:11:00 +00:00
Eelco Dolstra
6b41222b5c * Added Xauth (pilfered from the modular X.org tree).
svn path=/nixpkgs/trunk/; revision=3466
2005-07-29 10:06:49 +00:00