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
  ...
This commit is contained in:
Orivej Desh
2019-09-22 21:33:00 +00:00
37 changed files with 2208 additions and 1508 deletions
@@ -4,11 +4,11 @@
stdenv.mkDerivation {
pname = "cnijfilter2";
version = "5.30";
version = "5.70";
src = fetchzip {
url = "http://gdlp01.c-wss.com/gds/9/0100007129/01/cnijfilter2-source-5.30-1.tar.gz";
sha256 = "0gnl9arwmkblljsczspcgggx85a19vcmhmbjfyv1bq236yqixv5c";
url = "http://gdlp01.c-wss.com/gds/0/0100009930/01/cnijfilter2-source-5.70-1.tar.gz";
sha256 = "045zjsmaidn1m44ki6m1018gjzbj77gm234n5i2lshxpbzpyh0is";
};
buildInputs = [