Orivej Desh dc4224bc54 Merge branch 'master' into staging ... * master: (36 commits) libipt: set platforms to unix licenses: refer to curl using spdx qhull: specify spdx license ocamlPackages.spacetime_lib: 0.1.0 -> 0.3.0 ocamlPackages.owee: 0.2 -> 0.3 nixFlakes: 2.4pre20190913_a25c022 -> 2.4pre20190922_382aa05 daemon: init at 0.6.4 k9s: 0.7.13 -> 0.8.4 cask: Use generated src/version from Melpa python.pkgs.flask_oauthlib: remove radeon-profile: 20170714 -> 20190903 radeon-profile: use Qt mkDerivation afew: propagate setuptools pythonPackages.flask-jwt-extended: 3.17.0 -> 3.23.0 mutt: 1.12.1 -> 1.12.2 unit: 1.10.0 -> 1.11.0 emacsPackages: Update elpa emacsPackages: Update melpa cask: Fix cask usage git-lfs: use buildGoPackage ...		2019-09-22 21:33:00 +00:00
..
drivers	Merge pull request #58399 from aszlig/cnijfilter2-update	2019-09-22 15:44:03 -05:00
cups-pk-helper.nix	cups-pk-helper: Move D-Bus conf file to share/dbus-1/system.d	2019-09-16 13:59:09 -04:00
default.nix	cups: Move D-Bus conf file to share/dbus-1/system.d	2019-09-16 13:59:08 -04:00
filters.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00