Sandro
5047c27e2a
Merge pull request #124031 from fortuneteller2k/lemonbar-xft
2021-05-23 17:55:34 +02:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
fortuneteller2k
0331c3ecf4
lemonbar: use fetchFromGithub, cleanup
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-05-22 23:01:00 +08:00
fortuneteller2k
dc50511ad1
i3-gaps: use pname and version, fetchFromGitHub, cleanup
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-05-22 22:51:11 +08:00
fortuneteller2k
f7d9b2016c
lemonbar-xft: 2016-02-17 -> 2020-09-10, cleanup
2021-05-22 22:05:03 +08:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/graphics/emulsion/default.nix
pkgs/development/tools/misc/texlab/default.nix
pkgs/development/tools/rust/bindgen/default.nix
pkgs/development/tools/rust/cargo-udeps/default.nix
pkgs/misc/emulators/ruffle/default.nix
pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Sandro
5f5652f816
Merge pull request #123313 from fortuneteller2k/fix-river
...
river: build for baseline arch, cleanup
2021-05-18 01:51:48 +02:00
Michael Weiss
0730dc62a4
Merge pull request #123013 from primeos/waybox-wlroots-0.13
...
waybox: 2020-05-01 -> 2021-04-07
2021-05-17 16:44:30 +02:00
Michael Weiss
b4fc303dd1
Update pkgs/applications/window-managers/waybox/default.nix
...
Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
2021-05-17 12:10:40 +02:00
fortuneteller2k
23469e4c26
river: build for baseline arch, cleanup
2021-05-17 11:02:06 +08:00
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
