Commit graph

946 commits

Author SHA1 Message Date
Frederik Rietdijk
d843e16cb8 Merge master into staging-next 2019-06-26 13:22:30 +02:00
Michael Weiss
8c5147af79
weston: 6.0.0 -> 6.0.1
Announcement:
https://lists.freedesktop.org/archives/wayland-devel/2019-June/040661.html
2019-06-25 17:14:46 +02:00
Frederik Rietdijk
f120248daf Merge staging-next into staging 2019-06-18 11:07:56 +02:00
Matthew Bauer
4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl
Add libGL* aliases
2019-06-17 15:18:29 -04:00
Matthew Bauer
263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Matthew Bauer
123d61c5e6
Merge pull request #58037 from Twey/neocomp-2019-03-12
neocomp: init at 2019-03-12
2019-06-10 21:33:55 -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
Elis Hirwing
c8d4e45602
Merge pull request #62434 from r-ryantm/auto-update/herbstluftwm
herbstluftwm: 0.7.1 -> 0.7.2
2019-06-02 08:44:20 +02:00
R. RyanTM
9712f12684 herbstluftwm: 0.7.1 -> 0.7.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/herbstluftwm/versions
2019-06-01 14:07:48 -07:00
Alyssa Ross
062210bdff treewide: update cargoSha256 hashes for cargo-vendor upgrade
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.

Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.

The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
2019-06-01 15:17:52 +00:00
Will Dietz
3a26a1fe94 weston: 5.0.0 -> 6.0.0 (#58522)
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040356.html
https://lists.freedesktop.org/archives/wayland-devel/2019-March/040334.html

* weston: use freerdp2 not legacy
* freerdp_legacy: drop as no longer needed (weston was last user)

Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
2019-05-31 22:59:50 +02:00
Daniel Schaefer
eccb90a2d9 compton: 0.1_beta2.5 -> 6.2 (#61681)
* compton-git: 5.1-rc2 -> 6.2

vsync is now a boolean option, see:
https://github.com/yshui/compton/pull/130

menu-opacity is deprecated and there's a warning that says:
Please use the wintype option `opacity` of `popup_menu` and
`dropdown_menu` instead.

* nixos/compton: Keep vSync option backwards compatible

The new upstream option tries to make the best choice for the user.
Therefore the behaviour should stay the same with this backwards
compatibility patch.

* compton-git: Remove DRM option

It's deprecated and shouldn't be used.
https://github.com/yshui/compton/pull/130/files#r285505456

* compton-git: Remove new_backends option

Was removed in "Let old/new backends co-exist"
b0c5db9f5aa500dc3568cc6fe68493df98794d4d

* compton: 0.1_beta2.5 -> 6.2

Drop the legacy, unmaintained version and use the fork for real.
2019-05-28 13:37:13 +02:00
Markus Schneider
0ae372dcde leftwm: init at 0.1.9 2019-05-26 01:27:04 +09:00
Renaud
c34ba30888
Merge pull request #61246 from Synthetica9/i3-wk-switch-2019-05-10
i3-wk-switch: 2017-08-21 -> 2019-05-10
2019-05-13 18:22:58 +02:00
Stefano Mazzucco
75886e3b47 awesome: add optional gtk3 support
Add optional gtk3 support to Awesome so that the `beautiful.gtk` module can be
used.

The `beautiful.gtk` uses `lgi` to obtain Gtk via gobject-introspect:

    return require('lgi').Gtk

Since the current build does not include the typelib files needed, the above
call fails.

It turns out that both `gtk3` and `atk` (Accessibility toolkit) are needed, so
this commit adds them as optional build inputs.

Setting `gtk3Support` to `true` e.g. in an overlay will make `beautiful.gtk`
work at the cost of an increased closure size (currently 99.6M vs 223.4M).

Fixes https://github.com/NixOS/nixpkgs/issues/60538
2019-05-11 17:36:54 +01:00
Patrick Hilhorst
9bc4c1c311
i3-wk-switch: 2017-08-21 -> 2019-05-10 2019-05-11 17:41:08 +02:00
Will Dietz
d7ff576529
Merge pull request #60343 from dtzWill/fix/luarocks-nix-formatting-and-awesome-doc-goodness
luarocks-nix,luaPackages: formatting and additions; awesome: docs!
2019-05-10 16:56:58 -05:00
Renaud
60c120e922
matchbox: fix build 2019-05-08 22:53:27 +02:00
Renaud
2fb1b3156f
Merge pull request #60932 from c0bw3b/patches-cleanup
[treewide] delete (some) unused patches
2019-05-07 23:34:04 +02:00
Jörg Thalheim
dd2052ce36
awesome: use makeWrapper rather than wrapProgram (#61060)
awesome: use makeWrapper rather than wrapProgram
2019-05-07 07:07:36 +01:00
Stefano Mazzucco
88f84c08d7 awesome: use makeWrapper rather than wrapProgram
Using wrapProgram makes so that the generated "awesome" wrapper duplicates its
command line options at every restart.

As @psychon puts it:

> AwesomeWM restarts via execvp(argv[0], argv). In NixOS, wrapProgram is used
> to generate a wrapper around the real binary. wrapProgram calls makeWrapper
> with --argv0 '$0'. I guess this is what makes awesomeWM run the wrapper again
> on restart. Without this --argv0 awesomeWM would directly restart itself
> instead of the wrapper, I think.
2019-05-06 21:08:55 +01:00
Vladyslav M
12e6d28389
i3status-rust: 0.9.0.2019-03-21 -> 0.9.0.2019-04-27 2019-05-06 22:32:03 +03:00
Daniel Schaefer
71fd2482b4
xmonad-with-packages: Remove ghc manpage
This package should only install the xmonad manpage but not GHC's (it
doesn't even install GHC in the path). Installing both manpages makes
this package conflict with the GHC derivation.

Fixes #60914
2019-05-04 23:49:27 +02:00
c0bw3b
9cb260d091 [treewide] delete unused patches 2019-05-04 19:52:24 +02:00
Michael Weiss
65f07c097d
swaybg: init at 1.0 2019-05-03 22:30:41 +02:00
Michael Weiss
1f1e075fb1
swayidle: 1.2 -> 1.3 2019-05-03 22:16:21 +02:00
Michael Weiss
d43ea14abb
swaylock: 1.3 -> 1.4 2019-05-03 22:16:21 +02:00
Will Dietz
725585cfca awesome: generate docs, put in separate output
Especially useful when using non-release versions,
but good to have locally regardless.
2019-04-28 10:14:05 -05:00
Will Dietz
5f7f4e39d1
Merge pull request #60329 from stefano-m/awesome-fix-60232
awesome: refactor LUA_PATH env var and don't expose it at runtime
2019-04-27 19:37:09 -05: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
Stefano Mazzucco
c973e15fb6 awesome: refactor LUA_PATH env var and don't expose it at runtime
This commit partly reinstates changes from 5465d6f that had been somehow
reverted in 17d3eb2.  Also, a comment has been added in the hope that future
changes won't do the same.

Additionally, refactor the LUA_PATH env var to ensure that the internal lgi lua
files can't be required explicitly and to avoid possible name clashes (this
fixes issue #60232).

Finally, rather than using prepending `?.lua` append `;;` to LUA_PATH. Quoting
@psychon:

> This is interpreted by Lua as "add the default search path here" (which does
> indeed contain ?.lua, but also contains more).

Testing done:

- Build with `nix-build -I /path/to/repo -A awesome`
- Start an X session with xterm only
- Start xephyr, e.g. `Xephyr :1 -name xephyr -screen 512x384 -ac -br -noreset &`
- Run awesome like `DISPLAY=:1.0 ./result/bin/awesome`. Additionally, add
  `--search` options to expose lua modules that have a name clash with lgi's
  internal ones (see #60232 for more details) and `require` them in `rc.lua` to
  prove that they are loaded correctly
2019-04-27 15:49:43 +01:00
Matthieu Coudron
a364fcde13 i3easyfocus: 20180622 -> 20190411 (#59472)
introduced a new scheme to annotate windows.
2019-04-20 00:26:49 +02:00
ilikeavocadoes
c034fb3c99 i3blocks: 1.4 -> unstable-2019-05-07 (#59099) 2019-04-07 16:56:33 +02:00
Bart Brouns
9afeb90e16 i3status-rust: 0.9.0.2019-02-15 -> 0.9.0.2019-03-21 (#58590) 2019-03-30 23:49:54 +01:00
James Kay
a86f06240d
neocomp: init at 2019-03-12 2019-03-22 16:08:25 +00:00
Joachim F
91943f7ee3
Merge pull request #56132 from balsoft/master
wmfs: init at 201902
2019-03-22 11:01:30 +00:00
Александр Бантьев
cd8a8bab4b wmfs: init at 201902 2019-03-22 13:46:36 +03:00
dywedir
bca34cfd6e
wmfocus: 1.0.2 -> 1.1.2 2019-03-17 00:53:10 +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
Michael Weiss
1240834176
sway-beta: Use the upstream patch to fix the build failure 2019-03-11 18:51:26 +01:00
Michael Weiss
eb2a26f5c6
sway-beta: 1.0-rc5 -> 1.0 2019-03-11 17:02:25 +01:00
Michael Weiss
7bf4323082
sway-beta: 1.0-rc4 -> 1.0-rc5 2019-03-04 20:31:06 +01:00
R. RyanTM
e0c354f18b bspwm: 0.9.6 -> 0.9.7
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bspwm/versions
2019-03-03 09:16:19 +01:00
Michael Weiss
0c89c444a2
sway-beta: 1.0-rc3 -> 1.0-rc4 2019-02-26 19:03:15 +01:00
Jörg Thalheim
6d09921b91
Merge pull request #55965 from Mic92/i3pystatus
i3pystatus: 2018-04-11 -> 2019-02-10
2019-02-26 14:12:35 +00:00
Michael Raskin
446520bb9b
Merge pull request #56026 from oxij/tree/move-defaults-to-package-files-half-cuda
all-packages.nix: move defaults to package files continues^2
2019-02-19 21:54:02 +00:00
Michael Weiss
b790a74816
sway-beta: 1.0-rc2 -> 1.0-rc3 2019-02-18 22:26:16 +01:00