Commit Graph

54 Commits

Author SHA1 Message Date
Maximilian Bosch
cdbc6e64e4
treewide: reduce maintenance workload for ma27
Note: I DO NOT resign from nixpkgs, not at all!

However, I like a clean notification inbox and I get a lot of stuff for
packages where I'm only an end-user or don't use them anymore and thus
can't help out that much.

So please consider it a measure to reduce the mental load for me when
going through my notifications ;-)
2022-06-19 12:07:43 +02:00
Artturin
da4707d636 window-managers/sway: enable strictDeps
verified with https://github.com/Artturin/diffing/
2022-05-08 23:56:15 +03:00
Adam Joseph
72473ff070 sway: use a more-accurate default for trayEnabled
This commit implements @primeos's suggestion here:

  https://github.com/NixOS/nixpkgs/pull/160972#pullrequestreview-901069355
2022-03-08 18:42:01 -08:00
Adam Joseph
c7a7acb034
sway: respect systemdSupport and dbusSupport (#160972)
Sway can be compiled with or without systemd(-logind) and dbus.  This
commit exposes that support via the global systemdSupport and
dbusSupport arguments, which are understood by many other nixpkgs
expressions and can be set globally in ~/.config/nixpkgs/config.nix.

This commit also adds a third argument, trayEnabled, which allows to
disable sway's tray.  The tray requires dbusSupport and
systemdSupport.

Reviewers of this commit asked for potential use cases.  There are
many of them; a very non-exhaustive list includes:

* Use of nixpkgs on operating systems which systemd does not support,
  such as MacOS/Darwin, FreeBSD, OpenBSD, or Alpine Linux.

* Use of nixpkgs on *-musl platforms, which systemd does not
  officially support (out-of-tree patches to support musl exist for a
  few systemd versions).

* Use of sway in situations where dbus is inappropriate, such as
  sway's "kiosk mode".

* High-security environments, where the additional attack surface
  exposed by dbus outweighs any features it may offer.

This is a very non-exhaustive list.
2022-03-06 13:39:31 +01:00
Martin Weinelt
1ab8a4f45b
sway: fix eval
The meson_0_60 attribute was removed because meson was migrated to 0.60.
2022-01-24 02:18:06 +01:00
Michael Weiss
2e719d1cda
sway: 1.6.1 -> 1.7
Release notes: https://github.com/swaywm/sway/releases/tag/1.7

Notable (backward incompatible) changes:
- The default terminal changed from Alacritty to foot

Known issues:
- `swaynag` will crash when Sway 1.6.1 is still running while the Nix
  package (and thus `swaynag`) is already updated to version 1.7.
- The experimental Ozone/Wayland support of Electron apps will be broken
  for a while. Electron version 17 should work but the Chromium fixes
  haven't yet been backported to Electron version 16.

NixOS module: programs.sway.extraPackages: The "alacritty" package was
replaced with "foot".

VM test: We switched from the OpenGL ES 2.0 renderer to Pixman. The
terminal was also changed to foot but Alacritty is still used for the
XWayland test (since foot doesn't support X11).

Co-authored-by: Patrick Hilhorst <git@hilhorst.be>
2022-01-23 19:21:37 +01:00
Rick van Schijndel
a7b0ed4c10 sway: support cross-compilation 2021-12-22 20:01:44 +01:00
Patrick Hilhorst
5a14b59cd7
Merge pull request #122995 from primeos/sway-install-default-wallpaper 2021-11-21 21:57:49 +01:00
Yureka
7141eb9c57 sway: make xwayland optional 2021-10-20 11:37:04 +02:00
Michael Weiss
f7997354b7
wayland-scanner: use for nativeBuildInputs
This makes things more explicit (and less confusing) but only touches
the packages that I maintain.
2021-07-03 17:56:23 +02:00
Michael Weiss
73d7f08b4d
sway: 1.6 -> 1.6.1
Since wlroots 0.14 setting WLR_RENDERER_ALLOW_SOFTWARE=1 to allow
software rendering is now enforced [0].

[0]: https://github.com/swaywm/wlroots/pull/2810
2021-06-24 22:59:06 +02:00
Michael Weiss
83265a850d
sway: Install the wallpapers by default and use them on NixOS
Size impact:
$ du -sh $(nix-build -A sway-unwrapped)
5.9M    /nix/store/d07zcpybgpdj8xhn9n4qb04lgm453ia1-sway-unwrapped-1.6
nix@sessel:/var/tmp/michael/nixpkgs$ du -sh $(nix-build -A sway-unwrapped)/share/backgrounds
4.9M    /nix/store/d07zcpybgpdj8xhn9n4qb04lgm453ia1-sway-unwrapped-1.6/share/backgrounds
2021-05-14 16:37:11 +02:00
Michael Weiss
00e8e5b123
nixos/sway: Extend the default configuration for NixOS
The default config.in template contains
"include @sysconfdir@/sway/config.d/*" but we've dropped it to better
support non-NixOS (which seems like a mistake in retrospect).
This restores that behaviour and extends the default configuration via
nixos.conf to fix #119445.

Note: The security configurations (security.d) where dropped entirely
(but maybe they'll return).
2021-05-11 18:53:49 +02:00
Michael Weiss
957b7a476e
nixos/tests/sway: init
This adds a basic test for Sway. Because Sway is an important part of
the Wayland ecosystem, is stable, and has few dependencies this test
should also be suitable for testing core packages it depends on (e.g.
wayland, wayland-protocols, wlroots, xwayland, mesa, libglvnd, libdrm,
and soon libseat).

The test is modeled after the suggested way of using Sway, i.e. logging
in via a virtual console (tty1) and copying the configuration from
/etc/sway/config (we replace Mod4 (the GNU/Tux key - you've replaced
that evil logo, right? :D) with Mod1 (Alt key) because QEMU monitor's
sendkey command doesn't support the former).

The shell aliases are used to make the sendkey log output shorter.

Co-authored-by: Patrick Hilhorst <git@hilhorst.be>
2021-05-04 16:52:36 +02:00
Patrick Hilhorst
91fad635f0
sway: 1.5.1 -> 1.6
Co-authored-by: Michael Weiss <dev.primeos@gmail.com>
2021-04-08 17:24:24 +02:00
V
29b14dfd9b sway: remove swaybg from path
Avoids polluting the environment for sway's children.
2021-01-18 17:56:31 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Michael Weiss
4c0972e8d7
sway: 1.5 -> 1.5.1
This is basically a no-op, apart from the version bump.
2020-11-10 21:08:58 +01:00
Michael Weiss
db6b85391f
sway: Fix the build with wlroots 0.12.0
Sway 1.5 isn't affected by the breaking changes of wlroots 0.12.0 so we
can simply relax the version requirement.
2020-11-08 16:52:40 +01:00
Michael Weiss
f1dd43404a
sway: 1.4 -> 1.5 2020-07-16 22:46:53 +02:00
Ely
cdfad5ad84
sway: Fix the GTK wrapper (#86960)
Fixes #67704.
2020-05-08 11:45:27 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Michael Weiss
beca0911f4
sway: 1.2 -> 1.4
Changelog: https://github.com/swaywm/sway/releases/tag/1.4
2020-01-22 21:36:32 +01:00
Maximilian Bosch
9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
Elyhaka
d467c59825
sway: refactor with a wrapper 2019-12-21 21:17:21 +01:00
Michael Weiss
d861196c61
sway: 1.1.1 -> 1.2 2019-08-27 11:32:15 +02:00
worldofpeace
b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Patrick Hilhorst
e7be5691ba
sway: manually update version in meson.build
This wasn't done upstream. Adapted from:

5956e993dd/default.nix (L32-L34)

Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
2019-06-04 19:32:14 +02:00
Patrick Hilhorst
9ab064b8d9
sway: 1.0 -> 1.1.1 2019-06-04 16:12:42 +02:00
Michael Weiss
15010f0436
sway: Read the configuration from /etc before /nix/store (#60319)
This change will load all configuration files from /etc, to make it easy
to override them, but fallback to /nix/store/.../etc/sway/config to make
Sway work out-of-the-box with the default configuration on non NixOS
systems.
2019-04-27 22:38:18 +02:00
Michael Weiss
578fe3f5a0
nixos/sway: Improve the module and adapt it to NixOS
This commit contains the following changes:
- nixos/sway: Remove the beta references
- sway: Drop buildDocs
- nixos/sway: Improve the documentation
- sway,nixos/sway: Adapt Sway to NixOS
  - Copy the default configuration file to /etc/sway/config (Sway will
    still load the identical file from the Nix store but this makes it
    easier to copy the default configuration file).
  - This will also remove all references to the Nix store from the
    default configuration file as they will eventually be garbage
    collected which is a problem if the user copies it.
  - I've also decided to drop the default wallpaper (alternatively we
    could copy it to a fixed location).
- nixos/sway: Drop the package option
2019-03-13 11:37:11 +01:00
Michael Weiss
45004c6f63
sway: Switch to 1.0
This is the result of executing:
git mv -f pkgs/applications/window-managers/sway/beta.nix pkgs/applications/window-managers/sway/default.nix
git mv -f nixos/modules/programs/sway-beta.nix nixos/modules/programs/sway.nix

And removing sway-beta from the following files:
pkgs/top-level/all-packages.nix
nixos/modules/module-list.nix
2019-03-12 22:29:39 +01:00
Patrick Hilhorst
d8d8a0ba14 sway-beta: init at 1.0-beta1 (#48829)
* sway-beta: init at 1.0-beta1

* sway, sway-beta: use https url
2018-10-23 20:34:59 +02:00
Matthew Bauer
76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Vladyslav Mykhailichenko
8cd25c50c0 sway: 0.15.1 -> 0.15.2 2018-04-13 22:56:57 +03:00
dywedir
f3949a2e8e sway: 0.15.0 -> 0.15.1 2017-12-28 14:25:34 +01:00
gnidorah
b9851a975e Make less known wayland compositors usable (#32285)
* bemenu: init at 2017-02-14

* velox: 2015-11-03 -> 2017-07-04

* orbment, velox: don't expose subprojects

the development of orbment and velox got stuck
their subprojects (bemenu, dmenu-wayland, st-wayland) don't work correctly outside of parent projects
so hide them to not confuse people
swc and wld libraries are unpopular and unlike wlc are not used by anything except velox

* pythonPackages.pydbus: init at 0.6.0

* way-cooler: 0.5.2 -> 0.6.2

* nixos/way-cooler: add module

* dconf module: use for wayland

non-invasive approach for #31293
see discussion at #32210

* sway: embed LD_LIBRARY_PATH for #32755

* way-cooler: switch from buildRustPackage to buildRustCrate #31150
2017-12-21 16:16:19 +00:00
dywedir
fe4907c9d0 sway: 0.14.0 -> 0.15.0 2017-11-07 23:16:50 +02:00
gnidorah
8cfbf2be5b sway: cleanup 2017-10-25 21:51:52 +03:00
Samuel Leathers
1dc92fe688 sway: 0.13.0 -> 0.14.0 2017-10-16 21:50:16 -04:00
Michael Weiss
2d640b9d6e wlc: Downgrade back to 0.0.9
Unfortunately wlc 0.0.10 seems to be the cause for segfaults on sway,
way-cooler and orbment.

This will also build wlc with all optional packages (i.e. zlib,
valgrind and doxygen).
2017-09-27 20:21:50 +02:00
Michael Weiss
676f5cb02c sway: Fix the build
While the last wlc upgrade (05d79c03ec)
makes it possible to build sway 0.14.0 it also breaks the current build
of sway 0.13.0.

Unfortunately sway 0.14.0 segfaults on launch and I couldn't fix it yet
(there are multiple upstream issues as well). I'll overwrite the wlc
version for sway in order to have a usable version in nixpkgs for the
meantime.
2017-09-26 18:48:21 +02:00
Chris Duncan
cca84bc6c9 sway: 0.12.2 -> 0.13.0 2017-07-10 22:00:22 +01:00
Chris Duncan
c27ebd41c5 sway: Add cmake version number flag 2017-07-10 21:56:36 +01:00
Chris Duncan
82ddeaba88 sway: Add pam, gdk_pixbuf build inputs 2017-07-10 21:54:03 +01:00
Tim Steinbach
f911770acf
sway: Add xwayland build input 2017-04-05 08:17:49 -04:00
Tim Steinbach
7acd1e7f68
sway: 0.11 -> 0.12.2 2017-04-04 20:56:27 -04:00
Jaanus Torp
8978a9ee48 sway: 0.9 -> 0.11 (#22835) 2017-02-15 16:28:01 +01:00
Ignat Loskutov
b577f2997e sway: 0.8 -> 0.9 2016-09-04 16:02:57 -04:00
Langston Barrett
6aa50f169b sway: 0.7 -> 0.8 (#17026) 2016-07-17 09:31:41 +02:00