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: af5b528c9577
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2df53dee435b
Choose a head ref
  • 10 commits
  • 10 files changed
  • 2 contributors

Commits on Aug 19, 2018

  1. eunomia-font: init at 0.200

    leenaars committed Aug 19, 2018
    Copy the full SHA
    ea51558 View commit details
  2. f5_6-font: init at 0.110

    leenaars committed Aug 19, 2018
    Copy the full SHA
    5557026 View commit details
  3. ferrum-font: init at 0.200

    leenaars committed Aug 19, 2018
    Copy the full SHA
    88eb81e View commit details
  4. aileron-font: init at 0.102

    leenaars committed Aug 19, 2018
    Copy the full SHA
    c1c4325 View commit details

Commits on Aug 20, 2018

  1. route159-font: init at 1.10

    leenaars committed Aug 20, 2018
    Copy the full SHA
    f3ba6e2 View commit details
  2. penna-font: init at 0.10

    leenaars committed Aug 20, 2018
    Copy the full SHA
    44d07ed View commit details
  3. seshat-font: init at 0.100

    leenaars committed Aug 20, 2018
    Copy the full SHA
    675bf00 View commit details
  4. medio-font: init at 0.200

    leenaars committed Aug 20, 2018
    Copy the full SHA
    7474f67 View commit details
  5. Copy the full SHA
    f3139dd View commit details

Commits on Aug 23, 2018

  1. Merge pull request #45358 from leenaars/eunomia

    eunomia-font: init at 0.200
    xeji authored Aug 23, 2018
    Copy the full SHA
    2df53de View commit details
27 changes: 27 additions & 0 deletions pkgs/data/fonts/aileron/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchzip }:

let
majorVersion = "0";
minorVersion = "102";
pname = "aileron";
in

fetchzip rec {
name = "${pname}-font-${majorVersion}.${minorVersion}";

url = "http://dotcolon.net/DL/font/${pname}.zip";
sha256 = "04xnzdy9plzd2p02yq367h37m5ygx0w8cpkdv39cc3754ljlsxim";

postFetch = ''
mkdir -p $out/share/fonts/opentype/${pname}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';

meta = with stdenv.lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "A helvetica font in nine weights";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
license = licenses.cc0;
};
}
27 changes: 27 additions & 0 deletions pkgs/data/fonts/eunomia/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchzip }:

let
majorVersion = "0";
minorVersion = "200";
pname = "eunomia";
in

fetchzip rec {
name = "${pname}-font-${majorVersion}.${minorVersion}";

url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
sha256 = "0lpmczs1d4p9dy4s0dnvv7bl5cd0f6yzyasfrkxij5s86glps38b";

postFetch = ''
mkdir -p $out/share/fonts/opentype/${pname}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';

meta = with stdenv.lib; {
homepage = http://dotcolon.net/font/eunomia/;
description = "A futuristic decorative font.";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
license = licenses.ofl;
};
}
27 changes: 27 additions & 0 deletions pkgs/data/fonts/f5_6/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchzip }:

let
majorVersion = "0";
minorVersion = "110";
pname = "f5_6";
in

fetchzip rec {
name = "${pname}-font-${majorVersion}.${minorVersion}";

url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
sha256 = "04p6lccd26rhjbpq3ddxi5vkk3lk8lqbpnk8lakjzixp3fgdqpp4";

postFetch = ''
mkdir -p $out/share/fonts/opentype/${pname}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';

meta = with stdenv.lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "A weighted decorative font.";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
license = licenses.ofl;
};
}
27 changes: 27 additions & 0 deletions pkgs/data/fonts/ferrum/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchzip }:

let
majorVersion = "0";
minorVersion = "200";
pname = "ferrum";
in

fetchzip rec {
name = "${pname}-font-${majorVersion}.${minorVersion}";

url = "http://dotcolon.net/DL/font/${pname}.zip";
sha256 = "1w1b3ch7ik4264f05lxms01ls0aargvlx770a9szm682dfmizn8w";

postFetch = ''
mkdir -p $out/share/fonts/opentype/${pname}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';

meta = with stdenv.lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "A decorative font.";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
license = licenses.cc0;
};
}
32 changes: 32 additions & 0 deletions pkgs/data/fonts/medio/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ stdenv, fetchzip }:

let
majorVersion = "0";
minorVersion = "200";
pname = "medio";
in

fetchzip rec {
name = "${pname}-font-${majorVersion}.${minorVersion}";

url = "http://dotcolon.net/DL/font/${pname}.zip";
sha256 = "0gxcmhjlsh2pzsmj78vw4v935ax7hfk533ddlhfhfma52zyxyh7x";

postFetch = ''
mkdir -p $out/share/fonts/opentype/${pname}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';

meta = with stdenv.lib; {
homepage = "http://dotcolon.net/font/{pname}/";
description = "Serif font designed by Sora Sagano";
longDescription = ''
Medio is a serif font designed by Sora Sagano, based roughly
on the proportions of the font Tenderness (from the same designer),
but with hairline serifs in the style of a Didone.
'';
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
license = licenses.cc0;
};
}
32 changes: 32 additions & 0 deletions pkgs/data/fonts/penna/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ stdenv, fetchzip }:

let
majorVersion = "0";
minorVersion = "10";
pname = "penna";
in

fetchzip rec {
name = "${pname}-font-${majorVersion}.${minorVersion}";

url = "http://dotcolon.net/DL/font/${pname}.zip";
sha256 = "0hk15yndm56l6rbdykpkry2flffx0567mgjcqcnsx1iyzwwla5km";

postFetch = ''
mkdir -p $out/share/fonts/opentype/${pname}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';

meta = with stdenv.lib; {
homepage = "http://dotcolon.net/font/{pname}/";
description = "Geometric sans serif designed by Sora Sagano";
longDescription = ''
Penna is a geometric sans serif designed by Sora Sagano,
with outsized counters in the uppercase and a lowercase
with a small x-height.
'';
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
license = licenses.cc0;
};
}
27 changes: 27 additions & 0 deletions pkgs/data/fonts/route159/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchzip }:

let
majorVersion = "1";
minorVersion = "10";
pname = "route159";
in

fetchzip rec {
name = "${pname}-font-${majorVersion}.${minorVersion}";

url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
sha256 = "1nv5csg73arvvwpac7ylh4j9n0s3qp79rbv2s4jvs2bf6gqhsq7h";

postFetch = ''
mkdir -p $out/share/fonts/opentype/${pname}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';

meta = with stdenv.lib; {
homepage = "http://dotcolon.net/font/{pname}/";
description = "A weighted sans serif font";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
license = licenses.ofl;
};
}
37 changes: 37 additions & 0 deletions pkgs/data/fonts/seshat/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ stdenv, fetchzip }:

let
majorVersion = "0";
minorVersion = "100";
pname = "seshat";
in

fetchzip rec {
name = "${pname}-font-${majorVersion}.${minorVersion}";

url = "http://dotcolon.net/DL/font/${pname}.zip";
sha256 = "1zzgc2d0jrris92p3irmxjhdq8aj99alz0z7dlz25qf37lcilrir";

postFetch = ''
mkdir -p $out/share/fonts/opentype/${pname}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';

meta = with stdenv.lib; {
homepage = "http://dotcolon.net/font/{pname}/";
description = "Roman body font designed for main text by Sora Sagano";
longDescription = ''
Seshat is a Roman body font designed for the main text. By
referring to the classical balance, we changed some lines by
omitting part of the lines such as "A" and "n".
Also, by attaching the strength of the thickness like Optima
to the main drawing, it makes it more sharp design.
It incorporates symbols and ligatures used in the European region.
'';
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
license = licenses.cc0;
};
}
27 changes: 27 additions & 0 deletions pkgs/data/fonts/tenderness/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, fetchzip }:

let
majorVersion = "0";
minorVersion = "601";
pname = "tenderness";
in

fetchzip rec {
name = "${pname}-font-${majorVersion}.${minorVersion}";

url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
sha256 = "0d88l5mzq0k63zsmb8d5w3hfqxy04vpv4j0j8nmj1xv6kikhhybh";

postFetch = ''
mkdir -p $out/share/fonts/opentype/${pname}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname}
'';

meta = with stdenv.lib; {
homepage = "http://dotcolon.net/font/${pname}/";
description = "Serif font designed by Sora Sagano with old-style figures";
platforms = platforms.all;
maintainers = with maintainers; [ leenaars ];
license = licenses.ofl;
};
}
18 changes: 18 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -14702,6 +14702,8 @@ with pkgs;

adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { };

aileron = callPackage ../data/fonts/aileron { };

andagii = callPackage ../data/fonts/andagii { };

android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { };
@@ -14810,10 +14812,16 @@ with pkgs;

elliptic_curves = callPackage ../data/misc/elliptic_curves { };

eunomia = callPackage ../data/fonts/eunomia { };

f5_6 = callPackage ../data/fonts/f5_6 { };

faba-icon-theme = callPackage ../data/icons/faba-icon-theme { };

faba-mono-icons = callPackage ../data/icons/faba-mono-icons { };

ferrum = callPackage ../data/fonts/ferrum { };

fixedsys-excelsior = callPackage ../data/fonts/fixedsys-excelsior { };

graphs = callPackage ../data/misc/graphs { };
@@ -14964,6 +14972,8 @@ with pkgs;

media-player-info = callPackage ../data/misc/media-player-info {};

medio = callPackage ../data/fonts/medio { };

mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };

monoid = callPackage ../data/fonts/monoid { };
@@ -15035,6 +15045,8 @@ with pkgs;

pari-seadata-small = callPackage ../data/misc/pari-seadata-small {};

penna = callPackage ../data/fonts/penna { };

poly = callPackage ../data/fonts/poly { };

polytopes_db = callPackage ../data/misc/polytopes_db { };
@@ -15053,12 +15065,16 @@ with pkgs;

proggyfonts = callPackage ../data/fonts/proggyfonts { };

route159 = callPackage ../data/fonts/route159 { };

sampradaya = callPackage ../data/fonts/sampradaya { };

sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { };

scowl = callPackage ../data/misc/scowl { };

seshat = callPackage ../data/fonts/seshat { };

shaderc = callPackage ../development/compilers/shaderc { };

mime-types = callPackage ../data/misc/mime-types { };
@@ -15151,6 +15167,8 @@ with pkgs;

tempora_lgc = callPackage ../data/fonts/tempora-lgc { };

tenderness = callPackage ../data/fonts/tenderness { };

terminus_font = callPackage ../data/fonts/terminus-font { };

terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };