From f2d16bccd7ccfc9d5091093b2757db6ec93c29e4 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 06:21:35 +0200 Subject: [PATCH 1/2] linux-libertine-g: rename from libertine-g, use correct version --- pkgs/applications/office/libreoffice/default.nix | 4 ++-- .../li/{libertine-g => linux-libertine-g}/package.nix | 8 ++++---- pkgs/top-level/aliases.nix | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) rename pkgs/by-name/li/{libertine-g => linux-libertine-g}/package.nix (83%) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6d176db0c832..49fc1a56eb19 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -157,7 +157,7 @@ liberation-sans-narrow, liberation_ttf_v2, libertine, - libertine-g, + linux-libertine-g, noto-fonts, noto-fonts-lgc-plus, noto-fonts-cjk-sans, @@ -206,7 +206,7 @@ let liberation-sans-narrow liberation_ttf_v2 libertine - libertine-g + linux-libertine-g # Font priority issues in some tests in Still noto-fonts-lgc-plus (if variant == "fresh" then noto-fonts else (notoSubset [ "Arabic" ])) diff --git a/pkgs/by-name/li/libertine-g/package.nix b/pkgs/by-name/li/linux-libertine-g/package.nix similarity index 83% rename from pkgs/by-name/li/libertine-g/package.nix rename to pkgs/by-name/li/linux-libertine-g/package.nix index 1608db181d9e..fe25b5061414 100644 --- a/pkgs/by-name/li/libertine-g/package.nix +++ b/pkgs/by-name/li/linux-libertine-g/package.nix @@ -4,12 +4,12 @@ fetchzip, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "linux-libertine-g"; - version = "2012-01-16"; + version = "20120116"; src = fetchzip { - url = "http://www.numbertext.org/linux/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + url = "http://www.numbertext.org/linux/e7a384790b13c29113e22e596ade9687-LinLibertineG-${finalAttrs.version}.zip"; hash = "sha256-UGTB7jsI6peivCtEt96RCSi5XHCrnjCSs0Ud5bF7uxk="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation { maintainers = [ ]; license = lib.licenses.ofl; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1c68c23935fc..d700395bb360 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1020,6 +1020,7 @@ mapAliases { libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16 libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16 + libertine-g = warnAlias "'libertine-g' has been renamed to 'linux-libertine-g'" linux-libertine-g; # Added 2026-02-20 libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02 libfakeXinerama = warnAlias "'libfakeXinerama' has been renamed to 'libfakexinerama'" libfakexinerama; # Added 2026-02-08 libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04 From e31a21455388a7db5a177765a7a3f140f3e3ebd7 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 20 Feb 2026 06:22:33 +0200 Subject: [PATCH 2/2] linux-libertine-g: adopt --- pkgs/by-name/li/linux-libertine-g/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/linux-libertine-g/package.nix b/pkgs/by-name/li/linux-libertine-g/package.nix index fe25b5061414..b8f2cb13a868 100644 --- a/pkgs/by-name/li/linux-libertine-g/package.nix +++ b/pkgs/by-name/li/linux-libertine-g/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Graphite versions of Linux Libertine and Linux Biolinum font families for LibreOffice and OpenOffice.org"; homepage = "https://numbertext.org/linux/"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ qweered ]; license = lib.licenses.ofl; }; })