diff options
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/font-awesome-5/default.nix | 59 | ||||
-rw-r--r-- | pkgs/data/themes/plata/default.nix | 4 |
2 files changed, 39 insertions, 24 deletions
diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index ee1365d2611..39472122317 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.10.0"; + sha256 = "11nga1drlpkrmw307ga6plbj5z1b70cnckr465z8z6vkbcd6jkv3"; }; } diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index 52d843a5986..2351c493572 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; |