From 363fb1e2af50d2e21038b223b56ea80faaf21e96 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 29 Jul 2019 14:44:52 -0700 Subject: plata-theme: 0.8.7 -> 0.8.8 --- pkgs/data/themes/plata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 0d87cd848f84..6ec29a02174f 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "plata-theme"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitLab { owner = "tista500"; repo = "plata-theme"; rev = version; - sha256 = "1rn51yj7f7bclvrwwqwid4z9cpap4yd0zw0xs08c36zcjmr28426"; + sha256 = "1xb28s67lnsphj97r15jxlfgydyrxdby1d2z5y3g9wniw6z19i9n"; }; preferLocalBuild = true; -- cgit 1.4.1 From da40bc4449ad61363fc6cfcffe71b41094414e34 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 21 Jul 2019 22:00:58 +0200 Subject: font-awesome_4: Was removed, add again Version 5 is incompatible for some icons, so projects that depend on it need to actively convert the symbols, see: https://github.com/greshake/i3status-rust/issues/130 Reintroducing the old version lets us use those programs that haven't been updated. Was removed in 0a393f53a9702cea04a6afea506c3a91a1a2bf60 --- pkgs/data/fonts/font-awesome-5/default.nix | 59 +++++++++++++++++++----------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 39 insertions(+), 23 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index ee1365d26118..3579afc6da17 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,30 +1,45 @@ { lib, fetchFromGitHub }: - let - version = "5.9.0"; -in fetchFromGitHub rec { - name = "font-awesome-${version}"; - - owner = "FortAwesome"; - repo = "Font-Awesome"; - rev = version; + font-awesome = { version, sha256, rev ? version}: fetchFromGitHub rec { + name = "font-awesome-${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype otfs/*.otf - ''; - sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii"; + owner = "FortAwesome"; + repo = "Font-Awesome"; + inherit rev; - meta = with 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. + postFetch = '' + tar xf $downloadedFile --strip=1 + install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf ''; - homepage = http://fortawesome.github.io/Font-Awesome/; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ abaldeau ]; + + inherit sha256; + + meta = with 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 johnazoidberg ]; + }; + }; +in { + # Keeping version 4 because version 5 is incompatible for some icons. That + # means that projects which depend on it need to actively convert the + # symbols. See: + # https://github.com/greshake/i3status-rust/issues/130 + # https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4 + v4 = font-awesome { + version = "4.7.0"; + rev = "v4.7.0"; + sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9"; + }; + v5 = font-awesome { + version = "5.9.0"; + sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf609b073b32..729f27f6c910 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16393,7 +16393,8 @@ in fira-mono = callPackage ../data/fonts/fira-mono { }; - font-awesome_5 = callPackage ../data/fonts/font-awesome-5 { }; + font-awesome_4 = (callPackage ../data/fonts/font-awesome-5 { }).v4; + font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; font-awesome = font-awesome_5; freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; -- cgit 1.4.1 From 537403769c3cc40ec3c7fd436d32a16951cd666f Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 30 Jul 2019 00:08:23 +0200 Subject: font-awesome: 5.9.0 -> 5.10.0 https://github.com/FortAwesome/Font-Awesome/releases/tag/5.10.0 --- pkgs/data/fonts/font-awesome-5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/data') diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 3579afc6da17..39472122317e 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -39,7 +39,7 @@ in { sha256 = "1j8i32dq6rrlv3kf2hnq81iqks06kczaxjks7nw3zyq1231winm9"; }; v5 = font-awesome { - version = "5.9.0"; - sha256 = "0sz7mn7g968vp5hszs05grpphd7zr3073az8lyy1lj0096zvjjii"; + version = "5.10.0"; + sha256 = "11nga1drlpkrmw307ga6plbj5z1b70cnckr465z8z6vkbcd6jkv3"; }; } -- cgit 1.4.1