Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299		2019-08-24 08:55:37 +02:00
..
blocks-gaps.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
blocks.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
default.nix	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
easyfocus.nix	i3easyfocus: 20180622 -> 20190411 (#59472)	2019-04-20 00:26:49 +02:00
gaps.nix	i3-gaps: 4.16.1 -> 4.17	2019-08-19 06:18:17 -07:00
i3ipc-glib.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
layout-manager.nix	i3-layout-manager: init at unstable-2019-06-19	2019-06-24 01:01:54 +02:00
lock-color.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
lock-fancy.nix	Remove me (garbas) as maintainer since I don't have much time to maintain anything	2019-07-03 11:27:39 +02:00
lock.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
pystatus.nix	i3pystatus: 2019-02-10 -> 2019-06-10	2019-07-03 12:09:08 +09:00
status-rust.nix	treewide: update globin's maintained drvs	2019-08-20 19:36:05 +02:00
status.nix	Remove me (garbas) as maintainer since I don't have much time to maintain anything	2019-07-03 11:27:39 +02:00
wk-switch.nix	i3-wk-switch: 2017-08-21 -> 2019-05-10	2019-05-11 17:41:08 +02:00
wmfocus.nix	treewide: update cargoSha256 hashes for cargo-vendor upgrade	2019-06-01 15:17:52 +00:00