Merge staging-next into staging

pkgs/data/fonts/agave/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "agave-${version}";
+  version = "008";
+
+  src = fetchurl {
+    url = "https://github.com/agarick/agave/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "0g50mqpffn4dq761vibaf8dwfkbcl5da1cc89qz6pq35ircipbns";
+  };
+
+  sourceRoot = ".";
+
+  dontBuild = true;
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    description = "truetype monospaced typeface designed for X environments";
+    homepage = https://b.agaric.net/page/agave;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
+  };
+}
+

pkgs/data/fonts/ankacoder/condensed.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchzip }:
+
+let version = "1.100"; in
+fetchzip rec {
+  name = "ankacoder-condensed-${version}";
+  url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip";
+
+  postFetch = ''
+    unzip $downloadedFile
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  sha256 = "0i80zpr2y9368rg2i6x8jv0g7d03kdyr5h7w9yz7pjd7i9xd8439";
+
+  meta = with stdenv.lib; {
+    description = "Anka/Coder Condensed font";
+    homepage = https://code.google.com/archive/p/anka-coder-fonts;
+    license = licenses.ofl;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
+  };
+}
+

pkgs/data/fonts/ankacoder/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchzip }:
+
+let version = "1.100"; in
+fetchzip rec {
+  name = "ankacoder-${version}";
+  url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip";
+
+  postFetch = ''
+    unzip $downloadedFile
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  sha256 = "1jqx9micfmiarqh9xp330gl96v3vxbwzz9cmg2vi845n9md4im85";
+
+  meta = with stdenv.lib; {
+    description = "Anka/Coder fonts";
+    homepage = https://code.google.com/archive/p/anka-coder-fonts;
+    license = licenses.ofl;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
+  };
+}
+

pkgs/data/fonts/cherry/default.nix

@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, bdftopcf }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "cherry";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "turquoise-hexagon";
+    repo = pname;
+    rev = version;
+    sha256 = "1sfajzndv78v8hb156876i2rw3zw8xys6qi8zr4yi0isgsqj5yx5";
+  };
+
+  nativeBuildInputs = [ bdftopcf ];
+
+  buildPhase = ''
+    patchShebangs make.sh
+    ./make.sh
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/misc
+    cp *.pcf $out/share/fonts/misc
+  '';
+
+  meta = with stdenv.lib; {
+    description = "cherry font";
+    homepage = https://github.com/turquoise-hexagon/cherry;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
+  };
+}
+

pkgs/data/fonts/hermit/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "hermit";
+  version = "2.0";
+
+  src = fetchurl {
+    url = "https://pcaro.es/d/otf-${pname}-${version}.tar.gz";
+    sha256 = "09rmy3sbf1j1hr8zidighjgqc8kp0wsra115y27vrnlf10ml6jy0";
+  };
+
+  sourceRoot = ".";
+
+  dontBuild = true;
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    cp *.otf $out/share/fonts/opentype/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "monospace font designed to be clear, pragmatic and very readable";
+    homepage = https://pcaro.es/p/hermit;
+    license = licenses.ofl;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
+  };
+}
+

pkgs/data/fonts/luculent/default.nix

@@ -0,0 +1,23 @@
+{ lib, fetchzip }:
+
+let version = "2.0.0"; in
+fetchzip rec {
+  name = "luculent-${version}";
+  url =  http://www.eastfarthing.com/luculent/luculent.tar.xz;
+
+  postFetch = ''
+    tar -xJf $downloadedFile --strip-components=1
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  sha256 = "1m3g64galwna1xjxb1fczmfplm6c1fn3ra1ln7f0vkm0ah5m4lbv";
+
+  meta = with lib; {
+    description = "luculent font";
+    homepage = http://www.eastfarthing.com/luculent/;
+    license = licenses.ofl;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
+  };
+}

pkgs/data/icons/zafiro-icons/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zafiro-icons";
-  version = "0.8.1";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "zayronxio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "121fpg74vra8kfvgxi3i7p09qxhck45kv270x6cv5dq1fp2hdm8k";
+    sha256 = "1hflpnliww5fkk7bsgmi8hlrbqvkijjjmbzjqnnl991nqsqxqxpl";
   };
 
   nativeBuildInputs = [ gtk3 ];