diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
commit | 3d8e43691731037672c36129cbecb2fe43ffad7e (patch) | |
tree | c7f5fe5732dd22a66330d041ee7b0139f75b412d /pkgs/data | |
parent | a04625379a9e842cb987197c4f273de1bea807b7 (diff) | |
parent | 342eaba9ebbc68923c1028a56be1c94e74862832 (diff) |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/fira-code/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/line-awesome/default.nix | 36 | ||||
-rw-r--r-- | pkgs/data/icons/humanity-icon-theme/default.nix | 44 | ||||
-rw-r--r-- | pkgs/data/icons/zafiro-icons/default.nix | 4 |
4 files changed, 84 insertions, 4 deletions
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 71057639f9785..37169d1548e46 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "3"; + version = "3.1"; in fetchzip { name = "fira-code-${version}"; @@ -13,7 +13,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "19kcqqd6c61v137q88zsvf2ra154n009sbqh6zs7l8f7r5bbipj2"; + sha256 = "1rk5hiix282b1gsxq9kqma2q9fnydj0xl9vbrd88rf7ywvn75817"; meta = with stdenv.lib; { homepage = "https://github.com/tonsky/FiraCode"; diff --git a/pkgs/data/fonts/line-awesome/default.nix b/pkgs/data/fonts/line-awesome/default.nix new file mode 100644 index 0000000000000..f100f81b3d790 --- /dev/null +++ b/pkgs/data/fonts/line-awesome/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + pname = "line-awesome"; + version = "1.3.0"; + + src = fetchurl { + url = + "https://maxst.icons8.com/vue-static/landings/line-awesome/line-awesome/${version}/line-awesome-${version}.zip"; + hash = "sha256:07qkz8s1wjh5xwqlq1b4lpihr1zah3kh6bnqvfwvncld8l9wjqfk"; + }; + + nativeBuildInputs = [ unzip ]; + + sourceRoot = "${version}/fonts"; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/fonts/woff + mkdir -p $out/share/fonts/woff2 + cp *.ttf $out/share/fonts/truetype + cp *.woff $out/share/fonts/woff + cp *.woff2 $out/share/fonts/woff2 + ''; + + meta = with lib; { + description = "Replace Font Awesome with modern line icons"; + longDescription = '' + This package includes only the TTF, WOFF and WOFF2 fonts. For full CSS etc. see the project website. + ''; + homepage = "https://icons8.com/line-awesome"; + license = licenses.mit; + maintainers = with maintainers; [ puzzlewolf ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix new file mode 100644 index 0000000000000..62085110f5134 --- /dev/null +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "humanity-icon-theme"; + version = "0.6.15"; + + src = fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}.tar.xz"; + sha256 = "19ja47468s3jfabvakq9wknyfclfr31a9vd11p3mhapfq8jv9g4x"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -a Humanity* $out/share/icons + rm $out/share/icons/*/{AUTHORS,CONTRIBUTORS,COPYING} + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Humanity icons from Ubuntu"; + homepage = "https://launchpad.net/humanity/"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 9014819fba5f2..5bd61b0866a43 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zafiro-icons"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "zayronxio"; repo = pname; rev = "${version}"; - sha256 = "0gy3c0jkj1icnwcs23b6km9cj9cccv8y5z1w11nfdv91cq3mdhmb"; + sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; nativeBuildInputs = [ gtk3 ]; |