summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/font-awesome-4/default.nix (renamed from pkgs/data/fonts/font-awesome-ttf/default.nix)0
-rw-r--r--pkgs/data/fonts/font-awesome-5/default.nix30
-rw-r--r--pkgs/data/icons/hicolor-icon-theme/default.nix4
-rw-r--r--pkgs/data/misc/hackage/default.nix4
4 files changed, 34 insertions, 4 deletions
diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-4/default.nix
index 34548b972442..34548b972442 100644
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-4/default.nix
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
new file mode 100644
index 000000000000..6bb175f1ecac
--- /dev/null
+++ b/pkgs/data/fonts/font-awesome-5/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchzip }:
+
+let
+  version = "5.0.6";
+in fetchzip rec {
+  name = "font-awesome-${version}";
+
+  url = "https://github.com/FortAwesome/Font-Awesome/archive/${version}.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Brands-Regular-400.otf" -d $out/share/fonts/opentype
+    unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Regular-400.otf" -d $out/share/fonts/opentype
+    unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype
+  '';
+
+  sha256 = "1p7xb8s371r62rx0akcnlkk4mspjid6y0s9h04gakx83ymgjlfg4";
+
+  meta = with stdenv.lib; {
+    description = "Font Awesome - OTF font";
+    longDescription = ''
+      Font Awesome gives you scalable vector icons that can instantly be customized.
+      This package includes only the OTF font. For full CSS etc. see the project website.
+    '';
+    homepage = http://fortawesome.github.io/Font-Awesome/;
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abaldeau ];
+  };
+}
diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix
index 9cc14c7bc94c..03c5be143ded 100644
--- a/pkgs/data/icons/hicolor-icon-theme/default.nix
+++ b/pkgs/data/icons/hicolor-icon-theme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hicolor-icon-theme-0.15";
+  name = "hicolor-icon-theme-0.17";
 
   src = fetchurl {
     url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1k1kf2c5zbqh31nglc3nxs9j6wr083k9kjyql8p22ccc671mmi4w";
+    sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i";
   };
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 02394471b153..55d975e70d27 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/46704e06debe8b2c7c875d5e910fe168d7e49827.tar.gz";
-  sha256 = "131ga0pz1h7f3zimrd7yn6v8q7j2wh6srjrvl97p9bx1cbg8xqgl";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/acac7d958b43c270c8411fc65895a531e496423f.tar.gz";
+  sha256 = "15crmzdnj7lpbkhb44vhh7g0ghw0xj4cqkyqyg638dslijc5mjzd";
 }