From 1a6396711a260ac0b0b03757daf4b98a7ce6512f Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Fri, 21 Feb 2025 22:40:35 -0800 Subject: [PATCH 1/3] vegur: fix URLs The source URL for the vegur font has changed since 0.701 was released. The derivation is available in the cache but without access to the cache, the build will fail. Additionally, the homepage URL has changed. --- pkgs/by-name/ve/vegur/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ve/vegur/package.nix b/pkgs/by-name/ve/vegur/package.nix index 316a7c4ee01c..16d2ce61d537 100644 --- a/pkgs/by-name/ve/vegur/package.nix +++ b/pkgs/by-name/ve/vegur/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/vegur_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/files/fonts/vegur_${majorVersion}${minorVersion}.zip"; hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA="; stripRoot = false; }; @@ -27,10 +27,10 @@ stdenvNoCC.mkDerivation { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/vegur/"; + homepage = "http://dotcolon.net/fonts/vegur/"; description = "Humanist sans serif font"; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; license = licenses.cc0; }; -} +}) From 65de404a377102e727d3b6274814da247bb721d0 Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Fri, 21 Feb 2025 22:42:02 -0800 Subject: [PATCH 2/3] vegur: use finalAttrs Use `finalAttrs` with `mkDerivation` so that overriding `version` propagates to `src.url`. --- pkgs/by-name/ve/vegur/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ve/vegur/package.nix b/pkgs/by-name/ve/vegur/package.nix index 16d2ce61d537..726d58fe96f9 100644 --- a/pkgs/by-name/ve/vegur/package.nix +++ b/pkgs/by-name/ve/vegur/package.nix @@ -4,16 +4,14 @@ fetchzip, }: -let +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "vegur"; + version = "${finalAttrs.majorVersion}.${finalAttrs.minorVersion}"; majorVersion = "0"; minorVersion = "701"; -in -stdenvNoCC.mkDerivation { - pname = "vegur"; - version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/files/fonts/vegur_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/files/fonts/vegur_${finalAttrs.majorVersion}${finalAttrs.minorVersion}.zip"; hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA="; stripRoot = false; }; From d71063675a7e0c3521e34bdc541f2683e6057115 Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Sat, 12 Apr 2025 20:58:02 -0700 Subject: [PATCH 3/3] vegur: add djacu as a maintainer --- pkgs/by-name/ve/vegur/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ve/vegur/package.nix b/pkgs/by-name/ve/vegur/package.nix index 726d58fe96f9..850d274f707d 100644 --- a/pkgs/by-name/ve/vegur/package.nix +++ b/pkgs/by-name/ve/vegur/package.nix @@ -28,7 +28,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "http://dotcolon.net/fonts/vegur/"; description = "Humanist sans serif font"; platforms = platforms.all; - maintainers = with maintainers; [ minijackson ]; + maintainers = with maintainers; [ + djacu + minijackson + ]; license = licenses.cc0; }; })