Commit Graph

422 Commits

Author SHA1 Message Date
Frederik Rietdijk
3ba16c8234 Do not use top-level buildPythonPackage or buildPythonApplication
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Jaka Hudoklin
85e2b60b77 xpra: 0.17.4 -> 0.17.5 2016-09-04 16:57:23 +02:00
Parnell Springmeyer
98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Matthew Bauer
62ca3dd4b6 setroot: fix darwin build 2016-08-16 19:25:45 +00:00
Matthew Bauer
0528b8c94e runningx: fix darwin build 2016-08-16 19:25:45 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Nikolay Amiantov
6086328b2d primusLib: fix version, quote homepage for better clickability 2016-08-14 22:37:10 +03:00
Nikolay Amiantov
c60deb0266 quote homepages for better clickability
Done while I was traversing packages which I maintain to save extra clicks on
urxvt (it captures semicolon as a part of URL).
2016-08-14 22:37:10 +03:00
Frederik Rietdijk
7986b718f3 Remove pycairo from top-level
See #11567.
2016-08-14 13:52:42 +02:00
Frederik Rietdijk
11d1fdfd8b Remove top-level cython and cython3
See #11567.
2016-08-14 12:01:09 +02:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Robin Gloster
19f5e2a1cf x2vnc: disable format hardening 2016-08-05 18:09:35 +00:00
Franz Pletz
1f06067b01 x2x: disable format hardening 2016-08-04 11:05:29 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
wmapp
62ba6b07f2 sct: Updated sha256 in default.nix (#17163) 2016-07-28 09:21:21 +02:00
Robin Gloster
f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Andrew Miloradovsky
9dbf90d047 xmagnify: init at 0.1.0 (#17222) (#17222)
Tiny screen magnifier for X11
2016-07-25 06:00:27 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Bjørn Forsman
c5b7a9ffeb xpra: 0.17.3 -> 0.17.4 (important fixes) 2016-06-30 14:48:05 +02:00
Bjørn Forsman
6d48539fdb xpra: fix some runtime issues
* Add missing modules (fixes warnings and errors).
* Step 1 to unbreak starting Xvfb by making xpra invoke it with
  valid log dir ($HOME/.xpra). Without this fix, it is invoked with
  ~/.xpra, which Xvfb doesn't know how to interpret and uses it
  literally (fail). Step 2 will be fixing an Xvfb permission issue:
  "xf86OpenConsole: Cannot open virtual console 1 (Permission denied)".
* Use XPRA_INSTALL_PREFIX to make it find its icons.
2016-06-30 14:42:16 +02:00
Bjørn Forsman
ce8c1ab5e0 xpra: 0.17.0 -> 0.17.3 2016-06-23 19:17:20 +02:00
Bjørn Forsman
34363d77b0 xpra: add missing python 'rencode' module
Fixes this:

  $ xpra [...]
  2016-06-23 17:40:03,407 Warning: rencode import failed:
  2016-06-23 17:40:03,407  No module named rencode
  [...]
2016-06-23 19:17:20 +02:00
Bjørn Forsman
bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kamil Chmielewski
7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski
e2e3d8802f go-sct: extracted from goPackages 2016-06-09 11:21:30 +02:00
obadz
ca067ff248 xgeometry-select: remove license field. license is unknown. 2016-06-07 17:56:01 +01:00
obadz
d39d085adf xgeometry-select: init at 7e7361e 2016-06-07 14:44:55 +01:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Franz Pletz
90e8e00097 screen-message: 0.23 -> 0.24 2016-05-31 20:10:26 +02:00
José Romildo Malaquias
93a371ede7 runningx: init at 1.0 2016-05-31 09:55:55 -03:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Nikolay Amiantov
522b4b4b4d primusLib: move to fetchFromGitHub (and fix strange checksum error) 2016-05-20 13:05:17 +03:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Franz Pletz
bc233fa54e arandr: 0.1.8 -> 0.1.9 2016-05-03 16:15:20 +02:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Nikolay Amiantov
ac3ce1c26a bumblebee: fix outputs 2016-05-01 03:27:27 +03:00
David Guibert
8601f69072 xpra: 0.16.2 -> 0.17.0 2016-04-24 21:51:39 +02:00
Nathan Zadoks
ed6943ecbc virtualgl: fix libturbojpeg library path
Without this, it tries to link to the dev output of libjpeg_turbo, which
breaks the build.
2016-04-24 13:25:57 -04:00
Tuomas Tynkkynen
bd18cc3cdc Merge pull request #14888 from dezgeg/pr-kill-module-init-tools
Delete all usages of module_init_tools and remove the package
2016-04-23 14:29:41 +03:00
Tuomas Tynkkynen
01854a850a treewide: Replace module_init_tools -> kmod
The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
2016-04-22 10:40:57 +03:00
Hurshal Patel
9023722e77
xbanish: init at 1.4 👻 2016-04-19 23:33:38 -07:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster
696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Nikolay Amiantov
9b7edbeb2f primus: propagate stdenv to primusLibs 2016-03-31 19:52:33 +03:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
zimbatm
621ed35991 xdg_utils: fixes #14060 2016-03-20 00:52:10 +00:00
zimbatm
af1e32acd3 xdg_utils: 1.1.0-rc3p46 -> 1.1.1 2016-03-20 00:52:09 +00:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Vladimír Čunát
1df2a6431f xdg-utils: replace commands more precisely
Fix #13904, close #13908.
Previously many messages got clobbered. Now it should be better.

The solution is still relatively hacky, but I don't see how to improve
it without doing lots of work.
2016-03-14 11:00:05 +01:00
Domen Kožar
4471f144df Merge pull request #13810 from ts468/upstream.xpra
xpra: 0.14.19/0.15.3 -> 0.16.2
2016-03-10 12:35:04 +00:00
Thomas Strobel
83b15e2fc4 xpra: 0.14.19/0.15.3 -> 0.16.2 2016-03-10 12:06:55 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Nikolay Amiantov
2a7f56bc8f virtualgl: 2.4.1 -> 2.5 2016-03-04 14:46:45 +03:00
Robin Gloster
fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
José Romildo Malaquias
6cf907ba09 xsettingsd: 0.0.1 -> git-2015-06-14 2016-03-03 11:58:55 -03:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Robin Gloster
21b1e9e3da xbindkeys-config: disable format hardening 2016-02-24 16:00:25 +00:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Robin Gloster
92e7adef40 sct: fix hash 2016-02-19 21:15:59 +00:00
Arseniy Seroka
a2a5d234a5 Merge pull request #13101 from zimbatm/dispad
dispad: init at 0.3.1
2016-02-19 22:52:45 +03:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
zimbatm
cb10518806 dispad: init at 0.3.1 2016-02-18 17:14:17 +00:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Profpatsch
a708bce08b screen-message: add git mirror (darcs fails)
in response to #12868
2016-02-07 23:46:42 +01:00
Tuomas Tynkkynen
0b971a8134 ckbcomp: Builds on Darwin 2016-02-03 04:46:09 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Domen Kožar
9e8eba48ab xorg.xorgserver: wrap Xvfb with required flags 2016-01-17 21:14:49 +01:00
noctuid
db25c680c9 setroot: init at 1.4.4 2016-01-06 15:35:09 -05:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Michael Raskin
154e88ab3f xprintidel-ng: init at git-2015-09-01 2015-12-12 11:47:18 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Nikolay Amiantov
67c109efe5 bumblebee: use postPatch instead of patchPhase 2015-12-09 21:04:34 +03:00
Frederik Rietdijk
9cc4bb7f4c xpra: use pillow instead of pil 2015-12-08 15:15:41 +01:00
Nikolay Amiantov
c990a1ed4d Merge pull request #11262 from spwhitt/bumblebee_have
bumblebee: use _have not have in bash completion
2015-12-05 00:56:16 +03:00
Nikolay Amiantov
95629cf6f8 bumblebee: cleanup, fix virtualgl, add useNvidia flag 2015-12-05 00:54:09 +03:00
Nikolay Amiantov
3b1ab88428 virtualgl: 2.3.2 -> 2.4.1, fix multilib 2015-12-05 00:54:09 +03:00
Nikolay Amiantov
56ffc2ecd2 primus: 1.0.0748176 -> 20151204, add useNvidia flag 2015-12-05 00:54:09 +03:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Spencer Whitt
28d2ac416e bumblebee: use _have not have in bash completion
Fixes #10936
2015-11-25 10:42:21 -05:00
Domen Kožar
704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Michael Raskin
05129a3ee6 Add sct — a minimal utility to set display colour temperature 2015-11-17 01:50:09 +03:00
Benno Fünfstück
c7adb3d327 xvkbd: update from 3.6 to 3.7 2015-11-01 13:04:53 +01:00
Stéphane Jourdois
a39832a12c xdg-utils: allow build on darwin 2015-10-31 17:58:23 +01:00
William Casarin
a2f8585c39 dragon-drop: init at git-2014-08-14 2015-10-30 11:17:22 -07:00
Tuomas Tynkkynen
db81e22148 treewide: Mass-replace 'xorgserver}/bin' with correct output
vcunat added one fix in xdummy.
2015-10-28 10:17:12 +01:00
Josef Svenningsson
64b972acb9 Fix spelling mistakes
homepahe -> homepage
2015-10-27 11:49:48 +01:00
Tuomas Tynkkynen
a4e417d428 ckbcomp: 1.131 -> 1.133 2015-10-25 02:22:09 +03:00
Igor Sharonov
7a692670e3 numlockx: init at 1.2 2015-10-16 20:19:19 +03:00
Mariusz `shd` Gliwiński
eebbf15da9 dex: init at 0.7 2015-10-15 13:58:52 +02:00
Matthias Beyer
bebfc6ad82 wmutils-core: 1.0 -> 1.1 2015-09-29 12:25:38 +02:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Matthias Beyer
49b49a0172 arandr: 0.1.7.1 -> 0.1.8 2015-09-22 01:49:38 +02:00
Vladimír Čunát
aaa985e317 xgd-utils: update p7 -> p46 (close #9851)
This update probably contains a fix for CVE-2014-9622.
Thanks to @jb55 for the PR. We take even newer version.
2015-09-20 09:43:29 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Gabriel Ebner
a395ceed40 keynav: 0.20110708.0 -> 0.20150730.0 2015-09-13 08:16:42 +02:00
Gabriel Ebner
50b1ca6dcc xdotool: 2.20110530.1 -> 3.20150503.1 2015-09-12 13:18:31 +02:00
Pascal Wittmann
b493688c69 bgs: update from 0.7.1 to 0.8 2015-09-05 11:20:28 +02:00
William A. Kennington III
2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Benno Fünfstück
1f10b44d3e xvkbd: update from 3.5 to 3.6 2015-08-20 17:07:19 +02:00
Jan Malakhovski
a0f50dc665 xdg_utils: add mimi support 2015-08-16 20:23:01 +02:00
Thomas Strobel
50a5845855 xpra: fix rencode dependency 2015-08-10 23:14:29 +02:00
ts468
8958841d39 Merge pull request #9185 from akaWolf/xpra
xpra: 0.14.19 -> 0.15.3
2015-08-10 22:31:18 +02:00
Artjom Vejsel
fa2ee81a92 xpra: 0.14.19 -> 0.15.3 2015-08-09 20:58:39 +03:00
Pascal Wittmann
f104a6c008 Merge pull request #9145 from dezgeg/pr-ckbcomp-update
ckbcomp: 1.129 -> 1.131
2015-08-06 16:21:15 +02:00
Tuomas Tynkkynen
1bbcaf2eaf ckbcomp: 1.129 -> 1.131
Based on upstream commit logs; not much has happened: mostly translation
updates and a minor fix for Nokia N900 keyboards.
2015-08-06 16:51:42 +03:00
Eelco Dolstra
48efe637ac xdg-utils: Don't depend on "which" 2015-07-26 22:46:23 +02:00
Oliver Hunt
a855efe7db ksuperkey: init 2015-07-21 21:37:29 +00:00
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