From c8acf85cd867954f181e400ef8b36948c657e18b Mon Sep 17 00:00:00 2001 From: Martin Potier Date: Wed, 25 Sep 2019 12:33:34 +0300 Subject: [PATCH] Pull iosevka from upstream directly --- pkgs/default.nix | 5 ++- pkgs/iosevka/bin.nix | 28 ------------ pkgs/iosevka/default.nix | 95 --------------------------------------- pkgs/iosevka/package.json | 26 ----------- 4 files changed, 4 insertions(+), 150 deletions(-) delete mode 100644 pkgs/iosevka/bin.nix delete mode 100644 pkgs/iosevka/default.nix delete mode 100644 pkgs/iosevka/package.json diff --git a/pkgs/default.nix b/pkgs/default.nix index bba1d88..f1db3e9 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,10 +2,13 @@ self: super: +let + iosevkaTree = import (builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/dd2f026780399cf11c47fcf6085145b25b14307e.tar.gz) {}; +in { qutebrowserWE = super.qutebrowser.override { withWebEngineDefault = true; }; - iosevka-hskl = super.callPackage ./iosevka { + iosevka-hskl = iosevkaTree.iosevka.override { privateBuildPlan = { family = "Iosevka Samae"; design = [ diff --git a/pkgs/iosevka/bin.nix b/pkgs/iosevka/bin.nix deleted file mode 100644 index 962769b..0000000 --- a/pkgs/iosevka/bin.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchzip }: - -let - version = "2.3.0"; -in fetchzip { - name = "iosevka-bin-${version}"; - - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip"; - - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka - ''; - - sha256 = "0nry6zsmvcj44rijhbvrry84rh5hrixzb4n1mx9c27vvpy33a56w"; - - meta = with stdenv.lib; { - homepage = https://be5invis.github.io/Iosevka/; - downloadPage = "https://github.com/be5invis/Iosevka/releases"; - description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; - }; -} diff --git a/pkgs/iosevka/default.nix b/pkgs/iosevka/default.nix deleted file mode 100644 index a146103..0000000 --- a/pkgs/iosevka/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, lib, pkgs, fetchFromGitHub -, nodejs, nodePackages, remarshal, ttfautohint-nox, otfcc - -# Custom font set options. -# See https://github.com/be5invis/Iosevka#build-your-own-style -# Ex: -# privateBuildPlan = { -# family = "Iosevka Expanded"; -# -# design = [ -# "sans" -# "expanded" -# ]; -# }; -, privateBuildPlan ? null -# Extra parameters. Can be used for ligature mapping. -, extraParameters ? null -# Custom font set name. Required if any custom settings above. -, set ? null -}: - -assert (privateBuildPlan != null) -> set != null; - -stdenv.mkDerivation rec { - pname = - if set != null - then "iosevka-${set}" - else "iosevka"; - - version = "2.3.0"; - - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v${version}"; - sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv"; - }; - - nativeBuildInputs = [ - nodejs - nodePackages."iosevka-build-deps-../../data/fonts/iosevka" - remarshal - otfcc - ttfautohint-nox - ]; - - privateBuildPlanJSON = builtins.toJSON { buildPlans.${pname} = privateBuildPlan; }; - extraParametersJSON = builtins.toJSON { ${pname} = extraParameters; }; - passAsFile = [ "privateBuildPlanJSON" "extraParametersJSON" ]; - - configurePhase = '' - runHook preConfigure - ${lib.optionalString (privateBuildPlan != null) '' - remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml - ''} - ${lib.optionalString (extraParameters != null) '' - echo -e "\n" >> parameters.toml - remarshal -i "$extraParametersJSONPath" -if json -of toml >> parameters.toml - ''} - ln -s ${nodePackages."iosevka-build-deps-../../data/fonts/iosevka"}/lib/node_modules/iosevka-build-deps/node_modules . - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - npm run build -- ttf::$pname - runHook postBuild - ''; - - installPhase = '' - fontdir="$out/share/fonts/$pname" - install -d "$fontdir" - install "dist/$pname/ttf"/* "$fontdir" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://be5invis.github.io/Iosevka; - downloadPage = https://github.com/be5invis/Iosevka/releases; - description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ - cstrahan - jfrankenau - ttuegel - babariviere - rileyinman - ]; - }; -} diff --git a/pkgs/iosevka/package.json b/pkgs/iosevka/package.json deleted file mode 100644 index ae162a9..0000000 --- a/pkgs/iosevka/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "iosevka-build-deps", - "version": "2.3.0", - "scripts": { - "build": "verda -f verdafile.js" - }, - "dependencies": { - "caryll-shapeops": "^0.3.1", - "colors": "^1.3.3", - "libspiro-js": "^0.3.1", - "megaminx": "^0.9.0", - "object-assign": "^4.1.1", - "otfcc-ttcize": "^0.8.0", - "patel": "^0.33.1", - "patrisika-scopes": "^0.11.1", - "primitive-quadify-off-curves": "^0.4.0", - "stylus": "^0.54.5", - "toml": "^2.3.2", - "topsort": "0.0.2", - "ttf2woff": "^2.0.1", - "ttf2woff2": "^2.0.3", - "unorm": "^1.4.1", - "verda": "^1.0.0-0", - "yargs": "^12.0.0" - } -}