From 78afc16b0dc2043a60e742b3e30b802443677a42 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Thu, 25 May 2023 09:46:38 -0400 Subject: [PATCH] update build-super-ttc script --- flake.lock | 12 +++++----- flake.nix | 65 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 40 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 6970a9b..7c26300 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1683288106, - "narHash": "sha256-8/yuP6gWLhK8tRCtyqY5QnTq9GF7pCWpZyyZ08lXFwM=", + "lastModified": 1685013540, + "narHash": "sha256-UM9tPy9fyfXs+knxwk/rCIaNfVC7ggwzbLcY8lkOr+E=", "owner": "cachix", "repo": "devenv", - "rev": "c4006ccba1b3e4533de462cee5933e0ccf5f1d6a", + "rev": "5ff14a8f2828a2e607a65e2b16650a8cf950515b", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1683207485, - "narHash": "sha256-gs+PHt/y/XQB7S8+YyBLAM8LjgYpPZUVFQBwpFSmJro=", + "lastModified": 1684936879, + "narHash": "sha256-BOSq/QiX7MDs8tUnAt4+nYTJctgYkzVSNL95qlfMYeM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc45a3f8c98e1c33ca996e3504adefbf660a72d1", + "rev": "99fe1b870522d6ee3e692c2b6e663d6868a3fde4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b12adce..52b0e92 100644 --- a/flake.nix +++ b/flake.nix @@ -5,38 +5,41 @@ devenv.url = "github:cachix/devenv"; }; - outputs = { self, nixpkgs, devenv, systems, ... } @ inputs: - let - forEachSystem = nixpkgs.lib.genAttrs (import systems); - in - { - devShells = forEachSystem - (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - in - { - default = devenv.lib.mkShell { - inherit inputs pkgs; - modules = [ - { - # https://devenv.sh/reference/options/ - packages = [ pkgs.git pkgs.ttfautohint-nox ]; - languages.javascript.enable = true; + outputs = { + self, + nixpkgs, + devenv, + systems, + ... + } @ inputs: let + forEachSystem = nixpkgs.lib.genAttrs (import systems); + in { + devShells = + forEachSystem + (system: let + pkgs = nixpkgs.legacyPackages.${system}; + in { + default = devenv.lib.mkShell { + inherit inputs pkgs; + modules = [ + { + # https://devenv.sh/reference/options/ + packages = [pkgs.git pkgs.ttfautohint-nox]; + languages.javascript.enable = true; - scripts."build-super-ttc".exec = '' - git clone --single-branch --depth=1 https://github.com/be5invis/Iosevka - cp private-build-plans.toml ./Iosevka + scripts."build-super-ttc".exec = '' + git clone --single-branch --depth=1 https://github.com/be5invis/Iosevka || pushd Iosevka && git pull && popd + cp private-build-plans.toml ./Iosevka - cd ./Iosevka - npm install - npm run build -- super-ttc::iosevka-acicchetti + cd ./Iosevka + npm install + npm run build -- super-ttc::iosevka-acicchetti - mv dist/.super-ttc/iosevka-acicchetti.ttc ../iosevka-acicchetti-$(date -I).ttc - ''; - } - ]; - }; - }); - }; + mv dist/.super-ttc/iosevka-acicchetti.ttc ../iosevka-acicchetti-$(date -I).ttc + ''; + } + ]; + }; + }); + }; }