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
..
0.9.8	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
fortisslvpn	networkmanager-fortisslvpn: 1.2.8 → 1.2.10	2019-04-05 12:14:00 +02:00
iodine
l2tp	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
openconnect
openvpn
vpnc
applet.nix	Remove myself as maintainer of some packages.	2019-08-20 15:24:01 +02:00
default.nix	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
dmenu.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
fix-install-paths.patch	networkmanager: port to Meson	2019-04-22 12:10:10 +02:00
fix-paths.patch	networkmanager: sed from gnused, not coreutils! fix bad path	2019-05-03 19:58:00 -05:00
hardcode-gsettings.patch	networkmanagerapplet: hardcode for eap gschema	2019-04-18 11:28:18 -04:00
strongswan.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00