Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
...
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro
8aea69e5ab
Merge pull request #123198 from AndersonTorres/new-cardboard
...
cardboard: 0.0.0-unstable=2021-01-21 -> 0.0.0+unstable=2021-05-10
2021-05-17 01:59:26 +02:00
fortune
74b74b0555
river: add fortuneteller2k as maintainer ( #123271 )
2021-05-16 15:29:15 -04:00
github-actions[bot]
6cdac75d25
Merge staging-next into staging
2021-05-16 18:32:44 +00:00
github-actions[bot]
8c6d819143
Merge master into staging-next
2021-05-16 18:32:41 +00:00
Bran
bc9098d60d
river: remove branwright1 as maintainer ( #123266 )
2021-05-16 14:15:44 -04:00
AndersonTorres
16ccf81982
cardboard: 0.0.0-unstable=2021-01-21 -> 0.0.0+unstable=2021-05-10
2021-05-16 11:39:21 -03:00
Jan Tojnar
684991c696
Merge branch 'master' into staging-next
...
- Thunderbird 68 has been dropped on master.
- gccCrossLibcStdenv has been factored out on staging-next in all-packages.nix, while the file has been re-formatted on master.
2021-05-16 15:34:51 +02:00
Anderson Torres
82f1702669
Merge pull request #123014 from primeos/wio-wlroots-0.13
...
wio: Build with wlroots 0.13
2021-05-16 09:46:18 -03:00
github-actions[bot]
9911b1c75b
Merge staging-next into staging
2021-05-16 01:01:01 +00:00
github-actions[bot]
b484cef365
Merge master into staging-next
2021-05-16 01:00:58 +00:00
Aleksandr Parfenov
830ebf14b2
kbdd: unstable-2017-01-30 -> unstable-2021-04-26 ( #122768 )
2021-05-15 21:40:07 +02:00
github-actions[bot]
c10600230e
Merge staging-next into staging
2021-05-15 18:30:31 +00:00
github-actions[bot]
f1b78f8618
Merge master into staging-next
2021-05-15 18:30:28 +00:00
Thibaut Marty
e50c10aea7
herbstluftwm: 0.9.2 -> 0.9.3
2021-05-15 17:24:19 +02:00
Michael Weiss
fdbf305e3b
wio: Build with wlroots 0.13
2021-05-14 19:47:03 +02:00
Michael Weiss
c5a08f8a62
waybox: 2020-05-01 -> 2021-04-07
2021-05-14 19:44:55 +02:00
zowoq
004f8cd986
Merge staging-next into staging
2021-05-14 16:32:43 +10:00
github-actions[bot]
bf5d8bb531
Merge master into staging-next
2021-05-14 00:58:11 +00:00
Michael Weiss
60f2af5938
Merge pull request #122605 from primeos/nixos-sway-extend-default-configuration
...
nixos/sway: Extend the default configuration for NixOS
2021-05-13 20:48:55 +02:00
github-actions[bot]
60f5ecc76d
Merge staging-next into staging
2021-05-13 12:26:52 +00:00
github-actions[bot]
7465594428
Merge master into staging-next
2021-05-13 12:26:48 +00:00
maralorn
5687a345be
Merge pull request #122705 from rvl/fix-taffybar
2021-05-13 13:54:18 +02:00
Jan Tojnar
0313c77b55
Merge branch 'staging-next' into staging
2021-05-13 11:42:36 +02:00
github-actions[bot]
e59f22faf5
Merge master into staging-next
2021-05-13 06:22:11 +00:00
Anderson Torres
9c0ca46a6d
Merge pull request #122578 from AndersonTorres/quick-patches
...
Quick patches
2021-05-12 23:04:37 -03:00
Rodney Lorrimar
c46059f732
taffybar: restore ability to override ghcWithPackages arg
2021-05-13 10:01:50 +10:00
github-actions[bot]
b057978bb2
Merge staging-next into staging
2021-05-12 18:32:29 +00:00
Martin Weinelt
a18880bf72
Merge remote-tracking branch 'origin/master' into staging-next
2021-05-12 18:28:03 +02:00
Sandro
c662b55edc
Merge pull request #122718 from otavio/i3status-rust-0.21.1
...
i3status-rust: 0.20.0 -> 0.20.1
2021-05-12 15:30:03 +02:00
Otavio Salvador
c49f63cddf
i3status-rust: 0.20.0 -> 0.20.1
...
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2021-05-12 10:02:07 -03:00
Alyssa Ross
91a30973cc
i3: don't manually enableParallelBuilding
...
This is automatic for Meson builds.
2021-05-12 11:57:35 +00:00
AndersonTorres
5d8c8c6c90
icewm: 2.2.0 -> 2.3.4
2021-05-12 00:15:41 -03:00
github-actions[bot]
5c4cda9988
Merge staging-next into staging
2021-05-12 00:50:13 +00:00
github-actions[bot]
5a513ae14b
Merge master into staging-next
2021-05-12 00:50:10 +00:00
Michael Weiss
d4a651f448
Merge pull request #122602 from primeos/sway-set-xdg-env-vars
...
sway: Set XDG_CURRENT_DESKTOP=sway
2021-05-11 21:25:47 +02:00
Michael Weiss
9716bb8944
sway: Set XDG_CURRENT_DESKTOP=sway
...
This seems like a good idea in general and will at least make it easier
to get screen sharing to work (but still requires a proper NixOS
configuration including xdg-desktop-portal-wlr).
Note: It isn't necessary to set XDG_SESSION_TYPE=wayland as wlroots
already takes care of it (currently at least for the logind and libseat
session backends, the next wlroots release will require libseat):
4839664a92/backend/session/session.c (L80)
2021-05-11 21:19:45 +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
Jan Tojnar
7982550ac4
Merge branch 'staging-next' into staging
2021-05-11 09:09:10 +02:00
github-actions[bot]
49b8e6f7d4
Merge master into staging-next
2021-05-11 00:48:15 +00:00
Sandro
c503e32c5c
Merge pull request #122491 from mayflower/i3status-rust-fonts-themes
...
i3status-rust: fix themes and icon handling
2021-05-11 00:40:01 +02:00
Robin Gloster
aacc6f2e1b
i3status-rust: fix themes and icon handling
...
also enables the pulseaudio feature
2021-05-10 16:23:51 -05:00
github-actions[bot]
61fa3fdde8
Merge master into staging-next
2021-05-10 18:28:17 +00:00
Sandro
49c0141887
Merge pull request #122368 from branwright1/river
2021-05-10 18:57:36 +02:00
Michael Raskin
c9fb926b3d
Merge pull request #122356 from 7c6f434c/stumpwm-alias
...
stumpwm: redirect to lispPackages.stumpwm; stumpwm-git: drop
2021-05-10 16:48:25 +00:00
Jan Tojnar
594a885912
Merge branch 'staging-next' into staging
2021-05-10 09:45:47 +02:00
github-actions[bot]
1e3d91bd19
Merge master into staging-next
2021-05-10 00:48:32 +00:00
Anderson Torres
d03fbbf4f4
Merge pull request #121625 from AndersonTorres/new-cardboard
...
cardboard: init at 0.0.0-unstable=2021-01-21
2021-05-09 20:41:28 -03:00
Robin Gloster
f0e9599f93
Merge pull request #122366 from ambroisie/update-i3status-rust
...
i3status-rust: 0.14.7 -> 0.20.0
2021-05-09 13:37:34 -05:00
branwright1
e4f1d9592c
river: unstable-2021-04-27 > unstable-2021-05-07
2021-05-09 17:32:05 +01:00
Bruno BELANYI
2bc0257499
i3status-rust: 0.14.7 -> 0.20.0
...
https://github.com/greshake/i3status-rust/releases/tag/v0.20.0
2021-05-09 18:14:50 +02:00
Michael Raskin
10854c5a4d
stumpwm: redirect to lispPackages.stumpwm; stumpwm-git: drop
2021-05-09 17:14:07 +02:00
Jan Tojnar
dd78ce1c53
Merge branch 'staging-next' into staging
2021-05-08 20:59:05 +02:00
github-actions[bot]
6d46d8a9b9
Merge master into staging-next
2021-05-08 18:22:46 +00:00
Tobias Happ
4d549a4c6c
dwm-status: unstable-2021-05-04 -> 1.7.2 ( #122196 )
2021-05-08 16:55:30 +02:00
Robert Hensing
8e3c5eb501
treewide: xvfb_run -> xvfb-run
2021-05-08 15:48:41 +02:00
Martin Weinelt
9651084620
Merge remote-tracking branch 'origin/master' into staging-next
2021-05-08 14:43:43 +02:00
Jan Tojnar
468cb5980b
gnome: rename from gnome3
...
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Daniël de Kok
85f96822a0
treewide: fix cargoSha256/cargoHash
...
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.
This change updates cargoSha256/cargoHash tree-wide.
Fixes #121994 .
2021-05-08 00:36:37 -07:00
github-actions[bot]
e21fb16f9a
Merge master into staging-next
2021-05-08 06:20:05 +00:00
fortuneteller2k
2af2325cf7
dwm-status: 1.7.1 -> unstable-2021-05-04
2021-05-07 23:11:59 -07:00
github-actions[bot]
b4416b52c5
Merge master into staging-next
2021-05-08 00:46:50 +00:00
maralorn
958855d30c
Merge pull request #121627 from NixOS/haskell-updates
2021-05-07 23:55:19 +02:00
AndersonTorres
c15766774b
cardboard: init at 0.0.0-unstable=2021-01-21
2021-05-07 17:07:47 -03:00
Anderson Torres
87f9307b94
Merge pull request #122059 from AndersonTorres/quick-patches
...
cagebreak: 1.7.0 -> 1.7.1
2021-05-07 16:34:42 -03:00
github-actions[bot]
1ae6d3d02f
Merge master into staging-next
2021-05-07 18:24:29 +00:00
Stefan Frijters
6eef66f4c8
dwl: 0.2 -> 0.2.1
...
The patches that were previously added in nixpkgs are included
in the new version.
2021-05-07 11:23:58 -07:00
Stefan Frijters
71238fe585
dwl: Fix build by adding missing pixman dependency
2021-05-07 11:23:58 -07:00
AndersonTorres
9309f19ea2
cagebreak: merge contrib output with regular output
2021-05-07 14:37:32 -03:00
AndersonTorres
732c698614
cagebreak: 1.7.0 -> 1.7.1
...
Now it uses scdoc as manpage generator.
2021-05-07 14:37:07 -03:00
Malte Brandy
2a11f1f5cc
Merge branch 'master' into haskell-updates
2021-05-07 15:03:54 +02:00
sternenseemann
fc1638c3ba
taffybar: inherit meta set from haskellPackages
2021-05-06 19:54:22 +02:00
github-actions[bot]
af9d9374fa
Merge staging-next into staging
2021-05-05 12:23:47 +00:00
Michael Weiss
ff5fdec093
Merge pull request #121437 from primeos/nixos-tests-sway
...
nixos/tests/sway: init
2021-05-05 13:52:51 +02:00
github-actions[bot]
68e3ba2b1d
Merge staging-next into staging
2021-05-05 00:46:07 +00:00
AndersonTorres
1c516ffb3c
cagebreak: cosmetic rewrite
2021-05-04 16:27:52 -03:00
AndersonTorres
bf8679ba94
cagebreak: 1.6.0 -> 1.7.0
2021-05-04 16:25:44 -03: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
github-actions[bot]
0e4580d4d0
Merge staging-next into staging
2021-05-02 18:24:58 +00:00
Anderson Torres
bebfaab5ba
Merge pull request #121405 from branwright1/revert-121357-new-river
...
Revert "river: refactor"
2021-05-02 14:57:41 -03:00
github-actions[bot]
49721bed32
Merge staging-next into staging
2021-05-01 18:26:21 +00:00
Jan Tojnar
1733bade1a
Merge pull request #121226 from zhaofengli/librem-take2
...
phosh: init at 0.10.2
2021-05-01 18:41:50 +02:00
Brandon Wright
8776e9a6ed
Revert "river: refactor"
2021-05-01 17:18:33 +01:00
github-actions[bot]
5c9b6baa63
Merge staging-next into staging
2021-05-01 06:21:43 +00:00
AndersonTorres
e1a8c80e92
river: refactor
2021-05-01 00:45:20 -03:00
github-actions[bot]
ef6416a6ba
Merge staging-next into staging
2021-05-01 00:54:32 +00:00
Maximilian Bosch
543e84a00f
Merge pull request #121167 from r-ryantm/auto-update/leftwm
...
leftwm: 0.2.6 -> 0.2.7
2021-04-30 22:29:46 +02:00
github-actions[bot]
20ebbe6b59
Merge staging-next into staging
2021-04-30 18:26:34 +00:00
Patrick Hilhorst
4263479d3e
cage: 0.1.2.1 -> 0.1.3
2021-04-30 15:38:12 +02:00
Zhaofeng Li
6704ec5710
phosh: init at 0.10.2
...
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
Co-authored-by: Jordi Masip <jordi@masip.cat>
2021-04-30 04:55:35 +00:00
github-actions[bot]
b4766e97ee
Merge staging-next into staging
2021-04-30 00:52:06 +00:00
Sandro
7c5ca3dcf6
Merge pull request #121200 from branwright1/river
...
river: unstable 2021-04-08 -> unstable 2021-04-27
2021-04-30 02:25:33 +02:00
branwright1
d8b056439e
river: unstable 2021-04-08 -> unstable 2021-04-27
2021-04-29 21:01:54 +01:00
R. RyanTM
cade063ddc
leftwm: 0.2.6 -> 0.2.7
2021-04-29 14:44:15 +00:00
github-actions[bot]
54e69b71cd
Merge staging-next into staging
2021-04-29 12:26:05 +00:00
Alyssa Ross
6fb54f49c5
wayfire: 0.7.0 -> 0.7.1
2021-04-29 10:04:20 +00:00
Alyssa Ross
e337e136dd
wf-config: 0.7.0 -> 0.7.1; enable tests
2021-04-29 10:04:20 +00:00
github-actions[bot]
01105a117a
Merge staging-next into staging
2021-04-29 06:21:55 +00:00
Patrick Hilhorst
1cb3d84c6a
hikari: 2.2.2 -> 2.3.0
2021-04-29 00:49:31 -04:00
github-actions[bot]
70093bbd44
Merge staging-next into staging
2021-04-28 06:05:49 +00:00