Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 62193ec416a7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bca9437d1eae
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Oct 26, 2019

  1. iosevka: 2.3.0 -> 2.3.2 

    This commit include:
- update iosevka version
- fix extraParameters, was not able to inject all needed settings
- format file
- update package.json
    @babariviere
    babariviere committed Oct 26, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a9e88bb View commit details

Commits on Oct 31, 2019

  1. Merge pull request #72049 from babariviere/iosevka-v2.3.2 

    iosevka: 2.3.0 -> 2.3.2
    @c0bw3b
    c0bw3b authored Oct 31, 2019
    Copy the full SHA
    bca9437 View commit details
Showing with 4,121 additions and 4,478 deletions.
  1. +25 −19 pkgs/data/fonts/iosevka/default.nix
  2. +1 −1 pkgs/data/fonts/iosevka/package.json
  3. +4,055 −4,418 pkgs/development/node-packages/node-packages-v10.nix
  4. +40 −40 pkgs/development/node-packages/node-packages-v12.nix
44 changes: 25 additions & 19 deletions pkgs/data/fonts/iosevka/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, pkgs, fetchFromGitHub
, nodejs, nodePackages, remarshal, ttfautohint-nox, otfcc
{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal
, ttfautohint-nox, otfcc

# Custom font set options.
# See https://github.com/be5invis/Iosevka#build-your-own-style
@@ -13,27 +13,30 @@
# ];
# };
, privateBuildPlan ? null
# Extra parameters. Can be used for ligature mapping.
# Extra parameters. Can be used for ligature mapping.
# It must be a raw toml string.
#
# Ex:
# [[iosevka.compLig]]
# unicode = 57808 # 0xe1d0
# featureTag = 'XHS0'
# sequence = "+>"
, extraParameters ? null
# Custom font set name. Required if any custom settings above.
, set ? 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";
pname = if set != null then "iosevka-${set}" else "iosevka";

version = "2.3.0";
version = "2.3.2";

src = fetchFromGitHub {
owner = "be5invis";
repo = "Iosevka";
rev = "v${version}";
sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv";
sha256 = "0s0vdvp1sn8p2pi2xm9n05pabk30ki7wjlmr0zz0nkhidb8apw6k";
};

nativeBuildInputs = [
@@ -44,9 +47,10 @@ stdenv.mkDerivation rec {
ttfautohint-nox
];

privateBuildPlanJSON = builtins.toJSON { buildPlans.${pname} = privateBuildPlan; };
extraParametersJSON = builtins.toJSON { ${pname} = extraParameters; };
passAsFile = [ "privateBuildPlanJSON" "extraParametersJSON" ];
privateBuildPlanJSON =
builtins.toJSON { buildPlans.${pname} = privateBuildPlan; };
inherit extraParameters;
passAsFile = [ "privateBuildPlanJSON" "extraParameters" ];

configurePhase = ''
runHook preConfigure
@@ -55,9 +59,11 @@ stdenv.mkDerivation rec {
''}
${lib.optionalString (extraParameters != null) ''
echo -e "\n" >> parameters.toml
remarshal -i "$extraParametersJSONPath" -if json -of toml >> parameters.toml
cat "$extraParametersPath" >> parameters.toml
''}
ln -s ${nodePackages."iosevka-build-deps-../../data/fonts/iosevka"}/lib/node_modules/iosevka-build-deps/node_modules .
ln -s ${
nodePackages."iosevka-build-deps-../../data/fonts/iosevka"
}/lib/node_modules/iosevka-build-deps/node_modules .
runHook postConfigure
'';

@@ -76,8 +82,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = https://be5invis.github.io/Iosevka;
downloadPage = https://github.com/be5invis/Iosevka/releases;
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.
2 changes: 1 addition & 1 deletion pkgs/data/fonts/iosevka/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iosevka-build-deps",
"version": "2.3.0",
"version": "2.3.2",
"scripts": {
"build": "verda -f verdafile.js"
},
Loading