1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

79 commits

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