Merge branch 'master' into staging-next

pkgs/data/fonts/cascadia-code/default.nix

@@ -2,7 +2,7 @@
 
 let
   pname = "cascadia-code";
-  version = "1909.16";
+  version = "1910.04";
 in
 fetchurl {
   name = "${pname}-${version}";
@@ -15,7 +15,7 @@ fetchurl {
     install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
   '';
 
-  sha256 = "0nckczvak3pd1h3fiz0j827pm87px9swx60q07lc2jnjlxcghgl2";
+  sha256 = "124zbv7xwirwwxrm988h3plwd2vynqxyx7p2gijqrnw69q9pf67q";
 
   meta = with lib; {
     description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";

pkgs/data/misc/mailcap/default.nix

@@ -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
   '';

pkgs/data/themes/amber/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "amber-theme";
+  version = "3.34-1";
+
+  src = fetchFromGitHub {
+    owner = "lassekongo83";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1fmsjhaxlw2znlbjys3ggmsr7zlfk1wlng7bh54g6b0vjgdbik3r";
+  };
+
+  nativeBuildInputs = [ meson ninja sassc ];
+
+  buildInputs = [ gdk-pixbuf librsvg gtk_engines ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  meta = with stdenv.lib; {
+    description = "GTK, gnome-shell and Xfce theme based on Ubuntu Ambiance";
+    homepage = https://github.com/lassekongo83/amber-theme;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}

pkgs/data/themes/plano/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "plano-theme";
-  version = "3.32-1";
+  version = "3.34-1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0p9j4p32489jb6d67jhf9x26my0mddcc6a174x713drch8zvb96l";
+    sha256 = "0fdg4jyc3xv98yg2r6c8rccvbpf8y2l3x79qbpiq6ck9k6d34ycq";
   };
 
   buildInputs = [ gdk-pixbuf gtk_engines ];
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -dm 755 $out/share/themes/Plano
     cp -a * $out/share/themes/Plano/
-    rm $out/share/themes/Plano/LICENSE
+    rm $out/share/themes/Plano/{COPYING.LGPL-2.1,LICENSE,README.md}
   '';
 
   meta = with stdenv.lib; {
-    description = "Flat theme for GNOME & Xfce4";
+    description = "Flat theme for GNOME and Xfce";
     homepage = https://github.com/lassekongo83/plano-theme;
     license = licenses.gpl3;
     platforms = platforms.unix;

pkgs/data/themes/shades-of-gray/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "shades-of-gray-theme";
-  version = "1.1.9";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "WernerFP";
     repo = pname;
     rev = version;
-    sha256 = "1hg4g242cjncrx9cn7gbzl9gj7zz2fwrkzkkbfazzrdaylbwgm4i";
+    sha256 = "17hlc224mvm9aa5msbq380vv187bw709a4ys27dw4kas6gm04g2s";
   };
 
   buildInputs = [ gtk_engines ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A flat dark GTK-theme with ergonomic contrasts";
+    description = "Flat dark GTK theme with ergonomic contrasts";
     homepage = https://github.com/WernerFP/Shades-of-gray-theme;
     license = licenses.gpl3Plus;
     platforms = platforms.unix;

pkgs/data/themes/stilo/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "stilo-themes";
-  version = "3.32-3";
+  version = "3.34-1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0xcndr5mfa91f0ln0az3m79pidjy882v65w5fi5w05kykrmvv81z";
+    sha256 = "1qwz7i32jk7wm7m9ah6g1pxldz0rnviancndsr2lqmg55x36rs01";
   };
 
   nativeBuildInputs = [ meson ninja sassc ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   meta = with stdenv.lib; {
-    description = "Minimalistic GTK themes";
+    description = "Minimalistic GTK, gnome shell and Xfce themes";
     homepage = https://github.com/lassekongo83/stilo-themes;
     license = licenses.gpl3;
     platforms = platforms.linux;

pkgs/data/themes/zuki/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zuki-themes";
-  version = "3.32-4";
+  version = "3.34-1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0kqhk9qy5hwsd6g0bmq2dg6yj9gbv7l514ripsfiqyllmf4h818h";
+    sha256 = "19qg60rw5b0caqc542j2nrpkv8d37pai1cr1h0x2nvx0fkc3rmi2";
   };
 
   nativeBuildInputs = [ meson ninja sassc ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   meta = with stdenv.lib; {
-    description = "Themes for GTK3, gnome-shell and more";
+    description = "Themes for GTK, gnome-shell and Xfce";
     homepage = https://github.com/lassekongo83/zuki-themes;
     license = licenses.gpl3;
     platforms = platforms.linux;