Merge branch 'master' into staging-next

2019-10-12 00:50:21 +02:00
parent a0c34f54cc 8b57a7573c
commit 6c8aed6391
440 changed files with 19793 additions and 9783 deletions
@@ -7,13 +7,15 @@ in fetchzip {
  name = "mailcap-${version}";

  url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz";
-  sha256 = "0m1rls4z85aby9fggwx2x70b4y6l0jjyiqdv30p8g91nv8hrq9fw";
+  sha256 = "08d0avz8971hkggd60dk9yyd14izz24yag3prpfafbvm670jlmqg";

  postFetch = ''
    tar -xavf $downloadedFile --strip-components=1
    substituteInPlace mailcap --replace "/usr/bin/" ""
    gzip mailcap.4
+    sh generate-nginx-mimetypes.sh < mime.types > nginx-mime.types

+    install -D -m0644 nginx-mime.types $out/etc/nginx/mime.types
    install -D -m0644 -t $out/etc mailcap mime.types
    install -D -m0644 -t $out/share/man/man4 mailcap.4.gz
  '';