6 files changed, 12 insertions, 51 deletions
diff --git a/nixpkgs/pkgs/data/fonts/agave/default.nix b/nixpkgs/pkgs/data/fonts/agave/default.nix
index 6aabf4f485da..eb18f620a2ad 100644
--- a/nixpkgs/pkgs/data/fonts/agave/default.nix
+++ b/nixpkgs/pkgs/data/fonts/agave/default.nix
@@ -1,20 +1,21 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "agave-${version}";
-  version = "008";
+  pname = "agave";
+  version = "009";
 
   src = fetchurl {
-    url = "https://github.com/agarick/agave/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0g50mqpffn4dq761vibaf8dwfkbcl5da1cc89qz6pq35ircipbns";
+    url = "https://github.com/agarick/agave/releases/download/v${version}/agave-r.ttf";
+    sha256 = "05766gp2glm1p2vknk1nncxigq28hg8s58kjwsbn8zpwy8ivywpk";
   };
 
   sourceRoot = ".";
 
+  unpackPhase = ":";
   dontBuild = true;
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
+    cp $src $out/share/fonts/truetype/
   '';
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index 529a727d6c0f..4adb0928d4fa 100644
--- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "2.0.2";
+  version = "2.1.0";
 in fetchzip rec {
   name = "iosevka-bin-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
-  sha256 = "0jr9d02dk4zbq3kyhpfs6gyynwss60210pc1dfxn0qbw3j9ch2l4";
+  sha256 = "0hx91pdkiw0qvkkl7qnl78p5afldcmn18l5m1iclldnvrghrxizz";
 
   meta = with stdenv.lib; {
     homepage = https://be5invis.github.io/Iosevka/;
diff --git a/nixpkgs/pkgs/data/icons/elementary-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/elementary-icon-theme/default.nix
deleted file mode 100644
index 68ece44116e1..000000000000
--- a/nixpkgs/pkgs/data/icons/elementary-icon-theme/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "elementary-icon-theme-${version}";
-  version = "5.0.2";
-
-  src = fetchFromGitHub {
-    owner = "elementary";
-    repo = "icons";
-    rev = version;
-    sha256 = "12j582f0kggv2lp935r75xg7q26zpl0f05s11xcs4qxazhj1ly2r";
-  };
-
-  nativeBuildInputs = [ meson ninja python3 gtk3 ];
-
-  # Disable installing gimp and inkscape palette files
-  mesonFlags = [
-    "-Dpalettes=false"
-  ];
-
-  postPatch = ''
-    chmod +x meson/symlink.py
-    patchShebangs .
-    sed -i volumeicon/meson.build -e "s,'/','$out',"
-  '';
-
-  postFixup = ''
-    gtk-update-icon-cache $out/share/icons/elementary
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Icons from the Elementary Project";
-    homepage = https://github.com/elementary/icons;
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ simonvandel ];
-  };
-}
diff --git a/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix
index 07d2b5ecf02c..c15e0f4e5510 100644
--- a/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix
+++ b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, elementary-icon-theme }:
+{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon }:
 
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n";
   };
 
-  nativeBuildInputs = [ meson ninja python3 gtk3 elementary-icon-theme ];
+  nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ];
 
   postPatch = ''
     patchShebangs meson/post_install.py
diff --git a/nixpkgs/pkgs/data/misc/geolite-legacy/builder.sh b/nixpkgs/pkgs/data/misc/geolite-legacy/builder.sh
index c3e09e8543c5..683b2e8606b8 100644
--- a/nixpkgs/pkgs/data/misc/geolite-legacy/builder.sh
+++ b/nixpkgs/pkgs/data/misc/geolite-legacy/builder.sh
@@ -1,5 +1,3 @@
-#!/bin/sh -e
-
 source "$stdenv/setup"
 
 mkdir -p $out/share/GeoIP
diff --git a/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix b/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix
index 391c99c0ab92..af73ec322d00 100644
--- a/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix
+++ b/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "shades-of-gray-theme-${version}";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "WernerFP";
     repo = "Shades-of-gray-theme";
     rev = version;
-    sha256 = "1i5mra1ib3c8xqnhwjh8yzjcdnhvqdmccw5x52sfh9xq797px39l";
+    sha256 = "1ql8rkbm5l94b842hg53cwf02vbw2785rlrs4cr60d4kn2c0lj2y";
   };
 
   buildInputs = [ gtk_engines ];