Volth
fd61a33d2b
icewm: fix CFGDIR
2017-03-16 16:43:33 +00:00
romildo
1872f24c1b
jwm: 1580 -> 1582
2017-02-24 06:29:24 -03:00
ndowens
e67416f7e2
awesome-4.0: Add hicolor-icon-theme for theme support
...
Closes #22888 .
2017-02-17 21:58:28 +03:00
Nikolay Amiantov
a72dc9f3bf
compton: 0.1_beta2 -> 0.1_beta2.5
2017-02-16 17:50:58 +03:00
Nikolay Amiantov
434affb14d
openbox: fix openbox-xdg-autostart
...
Also add more optional dependencies.
2017-02-16 15:32:03 +03:00
Jaanus Torp
8978a9ee48
sway: 0.9 -> 0.11 ( #22835 )
2017-02-15 16:28:01 +01:00
romildo
14ca10f8c5
jwm: 1575 -> 1580
2017-02-07 16:35:58 -02:00
Michael Raskin
30b51af27b
Merge pull request #22108 from yorickvP/master
...
i3status: 2.10 -> 2.11
2017-01-24 21:35:11 +00:00
romildo
b56d87c962
jwm: 1563 -> 1575
2017-01-24 19:19:34 -02:00
Yorick van Pelt
c91aa18070
i3status: 2.10 -> 2.11
2017-01-24 20:35:29 +01:00
Franz Pletz
9b92a07843
treewide: use lib.maintainers for meta.maintainers
2017-01-20 15:44:28 +01:00
Francis St-Amour
3f3f0d978b
stumpwm: 0.9.9 -> 1.0.0
2017-01-15 21:23:39 -05:00
Michael Raskin
bc2e81f610
i3blocks: fix platforms
2017-01-13 19:09:28 +01:00
Birger J. Nordølum
32f991f094
i3blocks: specify supported platforms
2017-01-13 17:09:42 +01:00
Kier Davis
90b3648f9c
i3blocks: search for config in correct system directory
...
The SYSCONFDIR variable used in the Makefile servers two purposes:
1) During buildPhase, it is hardcoded into the executable as one of
the locations that will be searched for the i3blocks.conf config
file. We want this set to "/etc", so that "/etc/i3blocks.conf"
will be automatically loaded if it exists, as specified in the
manpage.
2) During installPhase, it specifies the location that the sample
i3blocks.conf should be installed to. We want this to be "$out/etc".
Case 2 was already handled correctly, but case 1 was not. This resulted
in i3blocks instead searching for i3blocks.conf in the default value of
SYSCONFDIR, which is "/usr/local/etc", a directory which generally does
not exist on NixOS. This commit remedies this problem by setting
SYSCONFDIR=/etc during buildPhase.
A minor stylistic fix (correcting a usage of "makeFlags" to "buildFlags"
in the expression) has also been applied in this commit.
2017-01-12 20:15:15 +00:00
Michael Raskin
9fb0d83c83
compiz: 0.9.13.0 -> 0.9.13.1
2017-01-02 20:18:51 +01:00
Alexey Shmalko
b33907075f
awesome: 3.5.9 -> 4.0
2016-12-27 11:39:51 +02:00
Rory McNamara
53a44eff92
bspwm: 1.9.1 -> 1.9.2
2016-12-22 23:27:32 +00:00
Joachim Fasting
db0bd30a7c
ion3: specify meta.{platforms,license}
2016-12-06 15:48:45 +01:00
Vladimír Čunát
dc451ad3ea
i3-gaps: enableParallelBuilding = false;
...
http://hydra.nixos.org/build/44530327
2016-12-04 16:59:13 +01:00
romildo
163e1ee7bd
windowmaker: 0.95.6 -> 0.95.7
2016-11-24 19:48:32 -02:00
Nikolay Amiantov
be95ceaff2
treewide: quote URLs in my packages
2016-11-24 01:17:52 +03:00
Pascal Wittmann
f7e0bc2ae7
Make all meta.maintainers attributes lists
2016-11-20 18:06:03 +01:00
Vladimír Čunát
b5e89fe9bf
Merge branch 'master' into staging
2016-11-15 00:20:19 +01:00
Franz Thoma
092d7e9705
i3-gaps: 4.12 -> 4.13
2016-11-11 14:03:33 +01:00
Franz Pletz
2673604708
i3: 4.12 -> 4.13
...
Fixes #20296 .
2016-11-10 02:45:53 +01:00
Frederik Rietdijk
660585b32d
compiz: use python2
2016-11-08 22:48:54 +01:00
Christian Lask
2d524a37f8
Remove myself as maintainer.
2016-11-03 11:54:54 +01:00
romildo
167e4b351a
jwm: 1548 -> 1563
2016-10-27 07:52:23 -02:00
Frederik Rietdijk
7077a270bf
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-26 13:06:43 +02:00
Anderson Torres
0a3968edc7
Sawfish: 1.11.90 -> 1.12.0 ( #19792 )
2016-10-23 13:06:47 +02:00
Joachim Fasting
53fa9e8651
ratpoison: reduce closure size
...
- Move contrib to separate output
- Move doc and info to separate outputs
Reduces the closure size from 96 to 38M
2016-10-22 21:06:21 +02:00
Frederik Rietdijk
e56832d730
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-22 17:23:24 +02:00
Jörg Thalheim
b0c38f450f
Merge pull request #19347 from cedeel/bspwm-git
...
bspwm-unstable: init at 2016-09-30
2016-10-22 11:49:24 +02:00
Jörg Thalheim
10167aaf56
Merge pull request #19350 from cedeel/sxhkd-git
...
sxhkd-unstable: init at 2016-08-29
2016-10-22 11:48:04 +02:00
Vladimír Čunát
4d5b893002
Merge #19081 : gnome-3.22
...
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Chris Darnell
137ce58317
bspwm-unstable: init at 2016-09-30
2016-10-16 01:28:11 -04:00
Tim Steinbach
5e1c84e475
i3lock-fancy: 2016-05-05 -> 2016-10-13
2016-10-15 07:28:14 -04:00
Vladimír Čunát
6eeea6effd
Python: more evaluation fixups.
2016-10-14 00:03:12 +02:00
Jörg Thalheim
b73cbaffa9
Merge pull request #19376 from cedeel/lemonbar-xft
...
lemonbar-xft-unstable: 2015-07-23 -> 2016-02-17
2016-10-09 10:01:16 +02:00
Chris Darnell
e1766240aa
lemonbar-xft-unstable: 2015-07-23 -> 2016-02-17
...
Changed name from bar-xft-git to conform to guidelines.
2016-10-08 21:20:34 -04:00
Chris Darnell
9e577f4742
lemonbar: 1.2pre -> 1.2
2016-10-08 20:52:07 -04:00
Chris Darnell
fd7134d9d0
sxhkd-unstable: init at 2016-08-29
2016-10-08 20:19:15 -04:00
Joachim F
76b0efd42e
Merge pull request #18810 from groxxda/wayland
...
wayland, weston: 1.11.0 -> 1.12.0
2016-10-01 09:19:08 +02:00
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
Alexander Ried
9f3550e2ee
weston: 1.11.0 -> 1.12.0
2016-09-21 11:16:32 +02:00
Yorick van Pelt
dccb882e45
i3lock-color: 2.7_rev63a4c23 -> 2.7-2016-09-17
2016-09-19 19:42:40 +02:00
Kirill Boltaev
bccd75094f
treewide: explicitly specify gtk and related package versions
2016-09-12 18:26:06 +03:00
Ignat Loskutov
b577f2997e
sway: 0.8 -> 0.9
2016-09-04 16:02:57 -04:00
Alexander Ried
ee1b7f9879
orbment: git-2016-01-31 -> git-2016-08-13
2016-09-04 16:25:00 +02:00
Miguel Madrid
8a96c52f63
i3pystatus: 3.34 -> 3.35 ( #18268 )
2016-09-04 00:23:21 +02: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
282277dbc8
treewide: Use more makeBinPath
2016-08-23 01:18:10 +03: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
Ertugrul Söylemez
00dc8c3033
Update compton-git to rev f1cd308.
...
Also update maintainer's e-mail address.
2016-08-21 07:19:00 +02:00
J Phani Mahesh
3b79ab30a5
wmsystemtray: switch sf downloads to mirror://
...
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 19:14:31 +05:30
Joachim Fasting
ba0f9cfa49
Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors"
...
This reverts commit 217594fd1d
, reversing
changes made to 8e8a89d8a8
.
Turns out it wasn't ready afterall ...
2016-08-20 15:14:23 +02:00
J Phani Mahesh
61bce9208f
wmsystemtray: switch sf downloads to mirror://
2016-08-20 17:32:47 +05:30
Joachim F
a942764221
Merge pull request #17821 from romildo/upd.jwm
...
jwm: 1535 -> 1548
2016-08-18 16:41:06 +02:00
José Romildo Malaquias
f7da8c9919
jwm: 1535 -> 1548
2016-08-18 10:49:56 -03: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
ae75531b3c
i3-block-gaps: disable darwin
2016-08-16 19:25:42 +00:00
Robin Gloster
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
Michael Raskin
b839d0cd75
compiz: 0.9.12.2 -> 0.9.13.0
2016-08-11 17:57:35 +02:00
Rail Aliiev
d6d4cf185e
i3lock-fancy: use absolute paths ( #17569 )
...
When it's used from command line or as a i3 shortcut, i3lock-fancy works
without any issues. If you try to pass it as an argument to xss-lock or
xautolock running as a systemd user service, getopt and fc-match are not in
PATH and locking doesn't work as expected. This patch replaces non absolute
paths with stable ones and should fix the issue.
2016-08-07 03:42:43 +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
b9152cf5a0
yabar: disable format hardening
2016-08-02 15:40:37 +00:00
Robin Gloster
f222d98746
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-25 12:47:13 +00:00
Joachim F
c4c378b613
Merge pull request #17156 from KoviRobi/wmii-hg-update
...
wmii-hg: refactor to fetchurl as fetchhg broke
2016-07-23 00:16:23 +02:00
Joachim F
46c924c4a2
Merge pull request #17178 from amiloradovsky/add-evilwm
...
evilwm: init at 1.1.1 (#17104 )
2016-07-22 23:28:11 +02:00
Andrew Miloradovsky
17b127205d
evilwm: init at 1.1.1 ( #17104 )
...
Minimalist window manager for the X Window System
2016-07-22 19:15:57 +00:00
Carl Sverre
51d9312e44
i3blocks-gaps: init at 1.4
...
Fork of i3blocks which supports adding borders to work with i3-gaps
2016-07-21 23:39:48 -07:00
Kovacsics Robert (NixOS)
a6df5b9f1d
wmii-hg: refactor to fetchurl as fetchhg broke
2016-07-21 19:28:15 +01:00
Robin Gloster
203846b9de
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-19 10:37:02 +00:00
Andrew Jamison
c6ba4cbde9
compton: add xwininfo dependency for compton-trans; clean up ( #16877 )
2016-07-19 09:31:09 +02:00
Langston Barrett
6aa50f169b
sway: 0.7 -> 0.8 ( #17026 )
2016-07-17 09:31:41 +02:00
Joachim F
86ba20b3d8
Merge pull request #16686 from AndersonTorres/pekwm
...
pekwm: init at 0.1.17
2016-07-16 13:19:00 +02:00
Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
mimadrid
bab3d4c3e0
i3lock: 2.7 -> 2.8
2016-07-12 11:15:51 +02:00
AndersonTorres
0f6c79d561
pekwm: init at 0.1.17
2016-07-09 22:26:24 -03:00
Rahul Gopinath
2c44e0410c
tabbed: add patch support
...
Suckless tools encourage patching, along with config.h modification. Allow
users to provide their own patches.
2016-06-29 12:46:48 -07:00
Rahul Gopinath
37b5928a81
tabbed: 20150509 -> 20160425
...
Xft is now bundled. Hence removing that option
2016-06-29 12:37:45 -07:00
Rahul Gopinath
473f864a1f
tabbed: Add configuration through config.h
2016-06-29 12:36:58 -07:00
Francis St-Amour
48f912771d
stumpwm: Fixed v0.9.9's sha256
2016-06-22 11:48:37 +02:00
Francis St-Amour
6bdab66032
stumpwm-git: Fixed wrong sha256.
2016-06-22 11:48:37 +02:00
Francis St-Amour
c5aebc693a
stumpwm: Added newer version of stumpwm from its git repository (alongside the latest release).
2016-06-22 11:48:37 +02:00
Marius Bakke
4a7d31a392
treewide: remove double quotes from wrappers
...
Close #14753 ; see that for context.
2016-06-22 11:12:27 +02:00
Juri Grabowski
22744fd551
new fvwm version 2.6.6, ftp is not available
2016-06-19 11:10:00 +02:00
Benno Fünfstück
03e3ef6234
xmonad-wrapper: link man pages instead of copying
2016-06-17 13:18:26 +02:00
Benno Fünfstück
2efdaa948d
xmonad-wrapper: link man pages of xmonadEnv
...
This fixes #16282 .
2016-06-17 13:13:05 +02:00
Franz Thoma
b60b7eeaab
i3-gaps: init at 4.12
2016-06-16 14:25:46 +01:00
José Romildo Malaquias
5532630543
jwm: 1532 -> 1535
2016-06-12 08:06:27 -03:00
Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
Christian Lask
093c42161f
yabar: init at 0.4.0
...
Closes #15945
2016-06-08 16:59:29 +01:00
Joachim Fasting
bb70dd05b2
Merge pull request #15887 from groxxda/bump/weston
...
wayland & weston: 1.10.0 -> 1.11.0
2016-06-07 14:44:21 +02:00
Tuomas Tynkkynen
bac26e08db
Fix lots of fetchgit hashes (fallout from #15469 )
2016-06-03 17:17:08 +03:00
Matthias Beyer
6d00d72aef
icewm: 1.3.10 -> 1.3.12
2016-06-03 16:04:41 +02:00
José Romildo Malaquias
8bb29f45e8
jwm: 1495 -> 1532
2016-06-02 10:11:05 -03:00
Domen Kožar
8a63f7e067
sway: 2016-02-08 -> 0.7
2016-06-01 19:35:49 +01:00
Alexander Ried
eda20005ae
weston: 1.10.0 -> 1.11.0
2016-06-01 10:27:24 +02:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
Vladimír Čunát
81039713fa
Merge branch 'master' into staging
...
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Joachim Fasting
2cbee3b4f9
Merge pull request #15640 from romildo/fix.fluxbox
...
fluxbox: fix @PREFIX@ in fluxbox-generate_menu script
2016-05-25 21:16:56 +02:00
Rok Garbas
b614d72f40
i3lock-fancy: fix patching of the script
2016-05-24 12:38:23 +02:00
Rok Garbas
9c20849da4
i3lock-color: renaming bin/i3lock binary to bin/i3lock-color
...
... that it doesn't conflict with i3lock
2016-05-24 12:37:04 +02:00
José Romildo Malaquias
16fc742bcf
fluxbox: fix @PREFIX@ in fluxbox-generate_menu script
2016-05-23 08:28:19 -03:00
Vladimír Čunát
73f1f5eb39
imagemagick: split dev output to fix #9604
...
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02: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
Rok Garbas
e4e7ba281d
i3lock-fancy: init at b7196aaff
2016-05-15 05:47:35 +02:00
Rok Garbas
3290b66e0e
i3lock-color: init at 2.7 revision 63a4c23ec6f
2016-05-15 05:47:35 +02:00
Igor Sharonov
7237ccfabc
i3pystatus: fix libpulseaudio
2016-05-14 14:28:20 +03:00
Herwig Hochleitner
008ba8f712
stumpwm-contrib: e13988 -> 9bebe3
...
this contains a fix for controlling volume with hardware keys
2016-05-11 16:29:15 +02:00
Joachim Fasting
11df7acf3e
Merge pull request #15298 from jaym/wmii-which
...
wmii needs which
2016-05-08 02:38:46 +02:00
Jay Mundrawala
bc6f922eb9
wmii needs which
...
While wmii will sort of work without it, it breaks before it
runs any user configuration which requires me to using the windows
key as my modifier.
2016-05-08 00:06:45 +00:00
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Kamil Chmielewski
43e617b487
matchbox: update source urls + libmatchbox: 1.9 -> 1.11 ( #15160 )
2016-05-02 12:26:32 +02:00
José Romildo Malaquias
9ea3a37767
compton-git: 2015-04-20 -> 2015-09-21
2016-04-29 10:14:36 -03:00
Moritz Ulrich
f503831956
herbstluftwm: 0.6.2 -> 0.7.0.
2016-04-28 18:10:17 +02:00
Frederik Rietdijk
d5e6a4494a
Python: use PyPI mirror ( #15001 )
...
* mirrors: add pypi
* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Christian Lask
8c21d5a454
bar-xft: 020a3e1 -> 3020df1
2016-04-15 22:57:57 +02:00
joachifm
7beb007a59
Merge pull request #14723 from hiberno/bspwm-update
...
bspwm: 0.9 -> 0.9.1
2016-04-15 18:04:32 +02:00
Christian Lask
767fdbfe4c
sxhkd: 0.5.5 -> 0.5.6
2016-04-15 17:37:07 +02:00
Christian Lask
425258054c
bspwm: 0.9 -> 0.9.1
...
This is more than just a bugfix release. Make sure to read
https://github.com/baskerville/bspwm/wiki/Upcoming-Changes-in-0.9.1 .
2016-04-15 17:28:06 +02:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
José Romildo Malaquias
9d0e57b84e
jwm: 1406 -> 1495 ( #14629 )
2016-04-12 17:18:40 +02: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
Alexander Ried
c6a4bc4ae5
weston: 1.9.0 -> 1.10.0
2016-04-08 23:22:58 +02: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
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00:00
José Romildo Malaquias
e39f9a2c11
awesome: include manual pages
2016-03-27 12:14:46 -03:00
Sheena Artrip
7fb57383fc
i3: 4.11 -> 4.12
2016-03-23 01:17:16 -04:00
Michael Raskin
74f04dc83c
stumpwm: Pass through the sbcl and lispPackages used
2016-03-21 19:55:25 +01:00
Joachim Fasting
9ae0e6633e
clfswm: mark as broken
...
This package has been broken for quite a long time. I attempted
to fix it, to no avail.
See also: https://hydra.nixos.org/build/33498133/nixlog/2/raw
2016-03-19 15:52:12 +01:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
Joachim Fasting
868082f616
sway: fix build
...
Building the manual requires docbook_xsl; in sandboxed environments,
the build would fail due to being unable to download missing docbook
resources.
Also include some minor improvements to the build recipe:
- use fetchFromGitHub
- move build-time dependencies to nativeBuildInputs
xref: https://github.com/NixOS/nixpkgs/pull/13900
2016-03-14 13:02:01 +01:00
Nikolay Amiantov
db090ce659
openbox: add platforms, split version
2016-03-12 03:19:37 +03:00
José Romildo Malaquias
83d814f600
awesome: 3.5.8 -> 3.5.9
2016-03-09 17:50:28 -03: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
José Romildo Malaquias
5856e89b2c
jwm: 2.2.2 -> 1406
2016-03-07 16:11:13 -03: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
joachifm
02327d3a44
Merge pull request #13431 from igsha/i3pystatus
...
i3pystatus: 3.33 -> 3.34
2016-03-05 13:12:10 +00:00
Robin Gloster
3b4765c9e5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-28 16:32:57 +00:00