1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Commit graph

192 commits

Author SHA1 Message Date
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
aszlig 2467c437b7
xdg_utils: Fix wrong substitution of grep command.
Fixes regression introduced by 16406e63b3.

Not replacing "egrep" with a negated character class on [^e] needs to be
put back into the replacement, because if we have something like:

foo="$(grep xxx)"

The replacement would be something like this:

foo="$/nix/store/.../bin/grep xxx)"

Which will lead to wrong behavior and in cases of for example
"xdg-screensaver", even directly to a syntax error:

xdg-screensaver: line 178: syntax error near unexpected token `('
xdg-screensaver: line 178: `command="/nix/store/.../bin/grep -E
                            "^Exec(\[[^]=]*])?=" "$file" |
                            /nix/store/.../bin/cut -d= -f 2- |
                            first_word`"'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-05 09:25:13 +02:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Pascal Wittmann 16406e63b3 xdg_utils: fix handling of runtime dependencies, closes #8564
'egrep' was substituted with the path to the grep binary
2015-06-30 15:45:09 +02:00
William A. Kennington III 282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Tuomas Tynkkynen 4ac3bc3330 ckbcomp: init at 1.129 2015-06-22 15:32:42 +03:00
Vladimír Čunát 61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
lethalman e5f9ffbb99 Merge pull request #8267 from hiberno/bump-xcape
xcape: bump to latest revision
2015-06-18 14:46:06 +02:00
Rok Garbas ca407f3738 xdg_utils: fixing some of the impurities in xdg-utilso, #8377 2015-06-18 10:51:35 +02:00
Luca Bruno aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Michael Raskin d9354c6a2a Add xwinmosaic window switcher 2015-06-14 23:26:58 +03:00
Michael Raskin 649b0affe1 Adding Skippy-XD window switcher 2015-06-14 23:26:58 +03:00
Michael Raskin a6d54b3fdd A comment about the license 2015-06-14 23:26:58 +03:00
Michael Raskin 14695867cb Add ratmen X11 menu generator 2015-06-14 23:26:58 +03:00
Eelco Dolstra 4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts:
	pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
hiberno 429461c3e2 xcape: bump to latest revision 2015-06-10 14:37:49 +02:00
Clemens Fruhwirth 1db87a34e9 Add xsettingsd. 2015-06-04 09:16:05 +00:00
Eelco Dolstra 553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Pascal Wittmann bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Eelco Dolstra 94389cb8c6 xdg-utils, libclc: Use fetchzip 2015-05-13 18:17:26 +02:00
Pascal Wittmann e504a9301d bgs: update from 0.7 to 0.7.1 2015-05-12 17:24:50 +02:00
Pascal Wittmann d9383746e6 bgs: update from 0.6 to 0.7 2015-05-11 18:16:12 +02:00
Dmitry Bushev e7f4d36621 xdg-utils: http-based fetchgit url
Change xdg-utils fetchgit url to `http` alternative since it is
more proxy-friendly. The list of repository url alternatives
can be found at http://cgit.freedesktop.org/xdg/xdg-utils/
2015-04-17 16:36:41 +03:00
William A. Kennington III 65b74314e8 vdpauinfo: 0.9 -> 1.0 2015-03-26 13:59:24 -07:00
Nikolay Amiantov a1440a679d primus: remove old workaround, fix LD_LIBRARY_PATH 2015-03-09 23:02:47 +03:00
Vladimír Čunát 3d0a6819da wmutils-core: add to tools/X11 (close #6585)
@vcunat fixed and cleaned this a little.
2015-03-08 15:46:02 +01:00
Thomas Strobel c6ef0727c3 Fix/update Xpra 2015-02-25 01:09:39 +01:00
Henry Till a0830c9039 hsetroot: fix libX11 error 2015-02-20 20:49:33 -05:00
Franz Pletz 6265123f7a Add new package screen-message 2015-02-19 19:19:33 +01:00
Benjamin Staffin ea446390fa New package: xbindkeys-config
The patch is borrowed verbatim from Debian. It is under the same
license as the rest of the package, and is necessary for the app to
work.

There does not seem to be a canonical upstream homepage for this app
other than Debian itself.

Change-Id: I4f0bec32a95778fb12a48bfb280386b65a0d0f9a
2015-02-09 01:36:01 -08:00
Vladimír Čunát 346c8d7a98 xdg-utils: update from git to fix CVE-2014-9622
Fixes #6193.
Disabling docs generation might be another alternative
to the build-time dependency blowup.

That KDE patch no longer applies, but the code seems to take KDE5 into
account already. CC @ttuegel.
2015-02-07 07:35:21 +01:00
Thomas Tuegel dfe1dc0c02 xdg-utils: patch xdg-open to use KDE 5 tools 2015-01-26 21:01:06 -06:00
lethalman d957d9e6bc Merge pull request #5517 from paraseba/bumblebee
Bumblebee config to enable multiple monitors
2015-01-19 15:00:11 +01:00
Renzo Carbonara a850749447 xbrightness: remove unnecessary x11 parameter 2015-01-16 20:37:22 -03:00
Renzo Carbonara 11e3503f10 Improve packaging of xbrightness 2015-01-16 20:23:44 -03:00
Renzo Carbonara ce8651ba1e Add package xbrightness
xbrightness allows controlling by software the screen gamma and
brigthness settings for individual color channels.
2015-01-16 03:03:41 -03:00
Kirill Elagin 75e211b102 xkb-switch: Update 2015-01-04 02:48:05 +03:00
Sebastián Bernardo Galkin 24abe2b2b3 Bumblebee config to enable multiple monitors
Added configurations to `bumblebee` package to easy multiple monitors on Optimus
machines.

The behaviour of the default `bumblebee` package hasn't change, so this change
is backwards compatible. Users who want to connect a monitor to their discrete
card should use the package `bumblebee_display` instead.

Also added new configuration option to nixos bumblebee module:

```
hardware.bumblebee.connectDisplay = true
```

will enable the new configuration, but the default is still false.
2014-12-30 19:17:42 -08:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Vladimír Čunát 3421d4c470 libvdpau, vdpauinfo: update to 0.9, extend meta
Add myself as a maintainer.
The rebuild impact is large, mostly through mesa -> {qt, gtk}.
2014-12-25 09:46:04 +01:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Pascal Wittmann f55545c0c9 fix maintainer information
s/maintainer/maintainers
2014-12-20 21:54:22 +01:00
Corey O'Connor b2f3e10a35 Add primus and extend bumblebee to support 32bit/64bit multilib architectures.
Using primusrun will work as expected in a multilib environment. Even if the initial program
executes a antoehr program of the another architecture. Assuming the program does not modify
LD_LIBRARY_PATH inappropriately.

This does not update virtualgl for seemless multilib. I was unable to get a mixed 64/32 bit
environment to work with VirtualGL. The mechanism VirtualGL uses to inject the fake GL library would
fail if both 32bit and 64 bit libraries were in the environment. Instead the bumblebee package
creates a optirun32 executable that can be used to run a 32bit executable with optimus on a 64 bit
host. This is not created if the host is 32bit.

For my usage, gaming under wine, the primusrun executable works as expected regardless of
32bit/64bit.
2014-11-29 16:42:00 -08:00
Bart Brouns 647617885d added platforms and maintainers 2014-11-27 21:30:36 +01:00
Bart Brouns b7f51920ee sselp prints X selection to standard out 2014-11-27 21:06:24 +01:00
Benno Fünfstück aa9c9aecbe xvkbd: set meta.platforms 2014-11-19 12:40:32 +01:00
Benno Fünfstück a1bca683f4 xvkbd: new expression 2014-11-15 21:37:34 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Michael Raskin bc5f55cc91 Adopt a few packages 2014-11-05 11:56:19 +03:00
aszlig 08d2f3340d
xdotool: Update to upstream version 2.20110530.1.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-17 09:14:34 +02:00