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
..
applications	Merge branch 'master' into staging	2019-09-22 21:33:00 +00:00
build-support	Re-Revert "Merge branch 'staging-next'"	2019-09-22 09:38:09 +02:00
common-updater
data	gtk3.setupHook: clear icon-theme.cache in preFixup (#68552)	2019-09-22 16:30:42 +02:00
desktops	gtk3.setupHook: clear icon-theme.cache in preFixup (#68552)	2019-09-22 16:30:42 +02:00
development	Merge branch 'master' into staging	2019-09-22 21:33:00 +00:00
games	gtk3.setupHook: clear icon-theme.cache in preFixup (#68552)	2019-09-22 16:30:42 +02:00
misc	Merge branch 'master' into staging	2019-09-22 21:33:00 +00:00
os-specific	Enable work variant firewall with iptables-compat (#66953)	2019-09-22 09:28:16 +01:00
servers	Merge branch 'master' into staging	2019-09-22 21:33:00 +00:00
shells	zsh-completions: 0.30.0 -> 0.31.0	2019-09-21 02:54:36 -05:00
stdenv	Merge pull request #69028 from matthewbauer/remove-iselfexec-iselfdyn	2019-09-20 23:26:48 -04:00
test
tools	Merge branch 'master' into staging	2019-09-22 21:33:00 +00:00
top-level	Merge branch 'master' into staging	2019-09-22 21:33:00 +00:00