From 61d49c476c32fccc87f9a206c525a43e11e2537b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 21 Apr 2023 12:52:05 -0300 Subject: [PATCH] fonts (treewide): change self to finalAttrs --- pkgs/data/fonts/aileron/default.nix | 6 +++--- pkgs/data/fonts/blackout/default.nix | 4 ++-- pkgs/data/fonts/chunk/default.nix | 4 ++-- pkgs/data/fonts/eunomia/default.nix | 4 ++-- pkgs/data/fonts/f1_8/default.nix | 4 ++-- pkgs/data/fonts/f5_6/default.nix | 6 +++--- pkgs/data/fonts/fa_1/default.nix | 6 +++--- pkgs/data/fonts/fanwood/default.nix | 4 ++-- pkgs/data/fonts/ferrum/default.nix | 6 +++--- pkgs/data/fonts/goudy-bookletter-1911/default.nix | 4 ++-- pkgs/data/fonts/junction/default.nix | 4 ++-- pkgs/data/fonts/knewave/default.nix | 4 ++-- pkgs/data/fonts/league-gothic/default.nix | 4 ++-- pkgs/data/fonts/league-script-number-one/default.nix | 4 ++-- pkgs/data/fonts/league-spartan/default.nix | 4 ++-- pkgs/data/fonts/linden-hill/default.nix | 4 ++-- pkgs/data/fonts/medio/default.nix | 6 +++--- pkgs/data/fonts/melete/default.nix | 6 +++--- pkgs/data/fonts/nacelle/default.nix | 6 +++--- pkgs/data/fonts/orbitron/default.nix | 4 ++-- pkgs/data/fonts/ostrich-sans/default.nix | 4 ++-- pkgs/data/fonts/penna/default.nix | 6 +++--- pkgs/data/fonts/prociono/default.nix | 4 ++-- pkgs/data/fonts/raleway/default.nix | 4 ++-- pkgs/data/fonts/route159/default.nix | 6 +++--- pkgs/data/fonts/seshat/default.nix | 6 +++--- pkgs/data/fonts/sniglet/default.nix | 4 ++-- pkgs/data/fonts/sorts-mill-goudy/default.nix | 4 ++-- pkgs/data/fonts/tenderness/default.nix | 6 +++--- pkgs/data/fonts/the-neue-black/default.nix | 4 ++-- pkgs/data/fonts/vegur/default.nix | 4 ++-- 31 files changed, 73 insertions(+), 73 deletions(-) diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix index 5ae83519278..c52824dbe12 100644 --- a/pkgs/data/fonts/aileron/default.nix +++ b/pkgs/data/fonts/aileron/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "102"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "aileron"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-Ht48gwJZrn0djo1yl6jHZ4+0b710FVwStiC1Zk5YXME="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A helvetica font in nine weights"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/blackout/default.nix b/pkgs/data/fonts/blackout/default.nix index b615aa66c59..44cb10b408e 100644 --- a/pkgs/data/fonts/blackout/default.nix +++ b/pkgs/data/fonts/blackout/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "blackout"; version = "2014-07-29"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "4864cfc1749590e9f78549c6e57116fe98480c0f"; hash = "sha256-UmJVmtuPQYW/w+mdnJw9Ql4R1xf/07l+/Ky1wX9WKqw="; }; diff --git a/pkgs/data/fonts/chunk/default.nix b/pkgs/data/fonts/chunk/default.nix index 708393185e9..fec1c043bfa 100644 --- a/pkgs/data/fonts/chunk/default.nix +++ b/pkgs/data/fonts/chunk/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "chunk"; version = "2021-03-03"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "12a243f3fb7c7a68844901023f7d95d6eaf14104"; hash = "sha256-NMkRvrUgy9yzOT3a1rN6Ch/p8Cr902CwL4G0w7jVm1E="; }; diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix index a09a0ad0d78..ea3613b5f81 100644 --- a/pkgs/data/fonts/eunomia/default.nix +++ b/pkgs/data/fonts/eunomia/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "200"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "eunomia"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-Rd2EakaTWjzoEV00tHTgg/bXgJUFfPjCyQUWi7QhFG4="; stripRoot = false; }; diff --git a/pkgs/data/fonts/f1_8/default.nix b/pkgs/data/fonts/f1_8/default.nix index 5898fe1eaba..93e44be17cd 100644 --- a/pkgs/data/fonts/f1_8/default.nix +++ b/pkgs/data/fonts/f1_8/default.nix @@ -4,7 +4,7 @@ let majorVersion = "1"; minorVersion = "101"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "f1_8"; version = "${majorVersion}.${minorVersion}"; @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A weighted decorative font"; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix index a37ee591ef4..f1e8e7698f2 100644 --- a/pkgs/data/fonts/f5_6/default.nix +++ b/pkgs/data/fonts/f5_6/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "110"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "f5_6"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-FeCU+mzR0iO5tixI72XUnhvpGj+WRfKyT3mhBtud3uE="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A weighted decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/fa_1/default.nix b/pkgs/data/fonts/fa_1/default.nix index 4e8ab3cbaa8..1c21bb279be 100644 --- a/pkgs/data/fonts/fa_1/default.nix +++ b/pkgs/data/fonts/fa_1/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "100"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fa_1"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A weighted decorative font"; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/data/fonts/fanwood/default.nix b/pkgs/data/fonts/fanwood/default.nix index ef8be0a6522..669ee6ac206 100644 --- a/pkgs/data/fonts/fanwood/default.nix +++ b/pkgs/data/fonts/fanwood/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fanwood"; version = "2011-05-11"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "cbaaed9704e7d37d3dcdbdf0b472e9efd0e39432"; hash = "sha256-OroFhhb4RxPHkx+/8PtFnxs1GQVXMPiYTd+2vnRbIjg="; }; diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix index 33b3813cca3..5f6459a1f6b 100644 --- a/pkgs/data/fonts/ferrum/default.nix +++ b/pkgs/data/fonts/ferrum/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "200"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "ferrum"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-NDJwgFWZgyhMkGRWlY55l2omEw6ju3e3dHCEsWNzQIc="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/pkgs/data/fonts/goudy-bookletter-1911/default.nix index 3fd0352b555..14997cd62b6 100644 --- a/pkgs/data/fonts/goudy-bookletter-1911/default.nix +++ b/pkgs/data/fonts/goudy-bookletter-1911/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "goudy-bookletter-1911"; version = "2011-05-11"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "85ff5b834b4f63feb36fd2053949c19660580e48"; hash = "sha256-11axs1+SRQj+1lYTq2LYf1I65WrrvB/UnAgZkHPP1N8="; }; diff --git a/pkgs/data/fonts/junction/default.nix b/pkgs/data/fonts/junction/default.nix index 7f5ba5c4a20..b629477f614 100644 --- a/pkgs/data/fonts/junction/default.nix +++ b/pkgs/data/fonts/junction/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "junction"; version = "2014-05-29"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "fb73260e86dd301b383cf6cc9ca8e726ef806535"; hash = "sha256-Zqh23HPWGed+JkADYjYdsVNRxqJDvC9xhnqAqWZ3Eu8="; }; diff --git a/pkgs/data/fonts/knewave/default.nix b/pkgs/data/fonts/knewave/default.nix index eaadb7afc0d..27def227180 100644 --- a/pkgs/data/fonts/knewave/default.nix +++ b/pkgs/data/fonts/knewave/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "knewave"; version = "2012-07-30"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "f335d5ff1f12e4acf97d4208e1c37b4d386e57fb"; hash = "sha256-SaJU2GlxU7V3iJNQzFKg1YugaPsiJuSZpC8NCqtWyz0="; }; diff --git a/pkgs/data/fonts/league-gothic/default.nix b/pkgs/data/fonts/league-gothic/default.nix index 4186eb70f6d..fd12e0a8659 100644 --- a/pkgs/data/fonts/league-gothic/default.nix +++ b/pkgs/data/fonts/league-gothic/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "league-gothic"; version = "1.601"; src = fetchzip { - url = "https://github.com/theleagueof/league-gothic/releases/download/${self.version}/LeagueGothic-${self.version}.tar.xz"; + url = "https://github.com/theleagueof/league-gothic/releases/download/${finalAttrs.version}/LeagueGothic-${finalAttrs.version}.tar.xz"; hash = "sha256-emkXKyQw4R0Zgg02oJsvBkqV0jmczP0tF0K2IKqJHMA="; }; diff --git a/pkgs/data/fonts/league-script-number-one/default.nix b/pkgs/data/fonts/league-script-number-one/default.nix index 11d7dc6173c..bc847f4f81c 100644 --- a/pkgs/data/fonts/league-script-number-one/default.nix +++ b/pkgs/data/fonts/league-script-number-one/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "league-script-number-one"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "225add0b37cf8268759ba4572e02630d9fb54ecf"; hash = "sha256-Z3Zrp0Os3On0tESVical1Qh6wY1H2Hc0OPTlkbtsrCI="; }; diff --git a/pkgs/data/fonts/league-spartan/default.nix b/pkgs/data/fonts/league-spartan/default.nix index 599aeca8ca6..d0e36e59149 100644 --- a/pkgs/data/fonts/league-spartan/default.nix +++ b/pkgs/data/fonts/league-spartan/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "league-spartan"; version = "2.220"; src = fetchzip { - url = "https://github.com/theleagueof/league-spartan/releases/download/${self.version}/LeagueSpartan-${self.version}.tar.xz"; + url = "https://github.com/theleagueof/league-spartan/releases/download/${finalAttrs.version}/LeagueSpartan-${finalAttrs.version}.tar.xz"; hash = "sha256-dkvWRYli8vk+E0DkZ2NWCJKfSfdo4jEcGo0puQpFVVc="; }; diff --git a/pkgs/data/fonts/linden-hill/default.nix b/pkgs/data/fonts/linden-hill/default.nix index f48313fd4ac..9e452d34b99 100644 --- a/pkgs/data/fonts/linden-hill/default.nix +++ b/pkgs/data/fonts/linden-hill/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "linden-hill"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "a3f7ae6c4cac1b7e5ce5269e1fcc6a2fbb9e31ee"; hash = "sha256-EjXcLjzVQeOJgLxGua8t0oMc+APOsONGGpG6VJVCgFw="; }; diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix index 240b6fbeead..5adcad00866 100644 --- a/pkgs/data/fonts/medio/default.nix +++ b/pkgs/data/fonts/medio/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "200"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "medio"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-S+CcwD4zGVk7cIFD6K4NnpE/0mrJq4RnDJC576rhcLQ="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "Serif font designed by Sora Sagano"; longDescription = '' Medio is a serif font designed by Sora Sagano, based roughly diff --git a/pkgs/data/fonts/melete/default.nix b/pkgs/data/fonts/melete/default.nix index cae6bcaf4ea..3d3e24ac81d 100644 --- a/pkgs/data/fonts/melete/default.nix +++ b/pkgs/data/fonts/melete/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "200"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "melete"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-y1xtNM1Oy92gOvbr9J71XNxb1JeTzOgxKms3G2YHK00="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A headline typeface that could be used as a movie title"; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/data/fonts/nacelle/default.nix b/pkgs/data/fonts/nacelle/default.nix index 007de90b75a..2d670cdc229 100644 --- a/pkgs/data/fonts/nacelle/default.nix +++ b/pkgs/data/fonts/nacelle/default.nix @@ -4,12 +4,12 @@ let majorVersion = "1"; minorVersion = "00"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "nacelle"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-e4QsPiyfWEAYHWdwR3CkGc2UzuA3hZPYYlWtIubY0Oo="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A improved version of the Aileron font"; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index dcbf0085141..7e689755206 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchFromGitHub }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "orbitron"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "13e6a5222aa6818d81c9acd27edd701a2d744152"; hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA="; }; diff --git a/pkgs/data/fonts/ostrich-sans/default.nix b/pkgs/data/fonts/ostrich-sans/default.nix index b86727312ec..67ca4b72823 100644 --- a/pkgs/data/fonts/ostrich-sans/default.nix +++ b/pkgs/data/fonts/ostrich-sans/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "ostrich-sans"; version = "2014-04-18"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "a949d40d0576d12ba26e2a45e19c91fd0228c964"; hash = "sha256-vvTNtl+fO2zWooH1EvCmO/dPYYgCkj8Ckg5xfg1gtnw="; }; diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix index 893262f66e5..e1a7fc181dd 100644 --- a/pkgs/data/fonts/penna/default.nix +++ b/pkgs/data/fonts/penna/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "100"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "penna"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-fmCJnEaoUGdW9JK3J7JSm5D4qOMRW7qVKPgVE7uCH5w="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "Geometric sans serif designed by Sora Sagano"; longDescription = '' Penna is a geometric sans serif designed by Sora Sagano, diff --git a/pkgs/data/fonts/prociono/default.nix b/pkgs/data/fonts/prociono/default.nix index b5bdf4d2292..8749c9d0736 100644 --- a/pkgs/data/fonts/prociono/default.nix +++ b/pkgs/data/fonts/prociono/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "prociono"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "f9d9680de6d6f0c13939f23c9dd14cd7853cf844"; hash = "sha256-gC5E0Z0O2cnthoBEu+UOQLsr3/a/3/JPIx3WCPsXXtk="; }; diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index c1d766f7d36..ffaca35c6b9 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "raleway"; version = "4.101"; src = fetchzip { - url = "https://github.com/theleagueof/raleway/releases/download/${self.version}/Raleway-${self.version}.tar.xz"; + url = "https://github.com/theleagueof/raleway/releases/download/${finalAttrs.version}/Raleway-${finalAttrs.version}.tar.xz"; hash = "sha256-itNHIMoRjiaqYAJoDNetkCquv47VAfel8MAzwsd//Ww="; }; diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix index 4d0bf9941b4..e19d25d61d0 100644 --- a/pkgs/data/fonts/route159/default.nix +++ b/pkgs/data/fonts/route159/default.nix @@ -4,12 +4,12 @@ let majorVersion = "1"; minorVersion = "10"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "route159"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-1InyBW1LGbp/IU/ql9mvT14W3MTxJdWThFwRH6VHpTU="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A weighted sans serif font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix index 7ed7abd5fb1..e86b0539c92 100644 --- a/pkgs/data/fonts/seshat/default.nix +++ b/pkgs/data/fonts/seshat/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "100"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "seshat"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-XgprDhzAbcTzZw2QOwpCnzusYheYmSlM+ApU+Y0wO2Q="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.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 diff --git a/pkgs/data/fonts/sniglet/default.nix b/pkgs/data/fonts/sniglet/default.nix index a109637a9a1..ab60e9c56f7 100644 --- a/pkgs/data/fonts/sniglet/default.nix +++ b/pkgs/data/fonts/sniglet/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sniglet"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "5c6b0860bdd0d8c4f16222e4de3918c384db17c4"; hash = "sha256-fLT2hZT9o1Ka30EB/6oWwmalhVJ+swXLRFG99yRWd2c="; }; diff --git a/pkgs/data/fonts/sorts-mill-goudy/default.nix b/pkgs/data/fonts/sorts-mill-goudy/default.nix index 432740a9267..1edbbd9787e 100644 --- a/pkgs/data/fonts/sorts-mill-goudy/default.nix +++ b/pkgs/data/fonts/sorts-mill-goudy/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sorts-mill-goudy"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "06072890c7b05f274215a24f17449655ccb2c8af"; hash = "sha256-NEfLBJatUmdUL5gJEimJHZfOd1OtI7pxTN97eWMODyM="; }; diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix index 40b284c2549..9149c081d49 100644 --- a/pkgs/data/fonts/tenderness/default.nix +++ b/pkgs/data/fonts/tenderness/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "601"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "tenderness"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-bwJKW+rY7/r2pBCSA6HYlaRMsI/U8UdW2vV4tmYuJww="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "Serif font designed by Sora Sagano with old-style figures"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/the-neue-black/default.nix b/pkgs/data/fonts/the-neue-black/default.nix index af3cd639c6e..3288925464f 100644 --- a/pkgs/data/fonts/the-neue-black/default.nix +++ b/pkgs/data/fonts/the-neue-black/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "the-neue-black"; version = "1.007"; src = fetchzip { - url = "https://github.com/theleagueof/the-neue-black/releases/download/${self.version}/TheNeueBlack-${self.version}.tar.xz"; + url = "https://github.com/theleagueof/the-neue-black/releases/download/${finalAttrs.version}/TheNeueBlack-${finalAttrs.version}.tar.xz"; hash = "sha256-AsB6w1000xdl+pOPDXqqzQhru1T/VD0hIJ4gFec7mU4="; }; diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix index effaf74be7d..e03f25951b5 100644 --- a/pkgs/data/fonts/vegur/default.nix +++ b/pkgs/data/fonts/vegur/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "701"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "vegur"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA="; stripRoot = false; };