liberation_ttf_v2: 2.00.4 -> 2.1.0

3 files changed, 68 insertions, 71 deletions

diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix
new file mode 100644
index 00000000000..838a8d4c769
--- /dev/null
+++ b/pkgs/data/fonts/liberation-fonts/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchFromGitHub, fontforge, python3 }:
+let
+  inherit (python3.pkgs) fonttools;
+
+  common =
+    { version, repo, sha256, nativeBuildInputs, postPatch ? null }:
+      stdenv.mkDerivation rec {
+        pname = "liberation-fonts";
+        inherit version;
+
+        src = fetchFromGitHub {
+          owner = "liberationfonts";
+          rev = version;
+          inherit repo sha256;
+        };
+
+        inherit nativeBuildInputs postPatch;
+
+        installPhase = ''
+          find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
+
+          install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS     || true
+          install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog   || true
+          install -m444 -Dt $out/share/doc/${pname}-${version} COPYING     || true
+          install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true
+          install -m444 -Dt $out/share/doc/${pname}-${version} README      || true
+        '';
+
+        meta = with stdenv.lib; {
+          description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
+          longDescription = ''
+            The Liberation Fonts are intended to be replacements for the three most
+            commonly used fonts on Microsoft systems: Times New Roman, Arial, and
+            Courier New. Since 2012 they are based on croscore fonts.
+
+            There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
+            Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
+            New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
+            (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
+            Bitstream Vera Sans Mono).
+          '';
+
+          license = licenses.ofl;
+          homepage = "https://github.com/liberationfonts";
+          maintainers = with maintainers; [ raskin ];
+        };
+      };
+in
+{
+  liberation_ttf_v1 = common {
+    repo = "liberation-1.7-fonts";
+    version = "1.07.5";
+    nativeBuildInputs = [ fontforge ];
+    sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
+  };
+  liberation_ttf_v2 = common {
+    repo = "liberation-fonts";
+    version = "2.1.0";
+    nativeBuildInputs = [ fontforge fonttools ];
+    postPatch = ''
+      substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
+        'font = ttLib.TTFont(fontfile)' \
+        'font = ttLib.TTFont(fontfile, recalcTimestamp=False)'
+    '';
+    sha256 = "03xpzaas264x5n6qisxkhc68pkpn32m7y78qdm3rdkxdwi8mv8mz";
+  };
+}
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
deleted file mode 100644
index 1cb0eb349e4..00000000000
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ stdenv, fetchFromGitHub, fontforge, python3 }:
-
-let
-  inherit (python3.pkgs) fonttools;
-
-  common =
-    { version, repo, sha256, nativeBuildInputs, postPatch ? null }:
-    stdenv.mkDerivation rec {
-      pname = "liberation-fonts";
-      inherit version;
-
-      src = fetchFromGitHub {
-        owner = "liberationfonts";
-        rev = version;
-        inherit repo sha256;
-      };
-
-      inherit nativeBuildInputs postPatch;
-
-      installPhase = ''
-        find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
-
-        install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS     || true
-        install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog   || true
-        install -m444 -Dt $out/share/doc/${pname}-${version} COPYING     || true
-        install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true
-        install -m444 -Dt $out/share/doc/${pname}-${version} README      || true
-      '';
-
-      meta = with stdenv.lib; {
-        description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
-        longDescription = ''
-          The Liberation Fonts are intended to be replacements for the three most
-          commonly used fonts on Microsoft systems: Times New Roman, Arial, and
-          Courier New. Since 2012 they are based on croscore fonts.
-
-          There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
-          Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
-          New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
-          (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
-          Bitstream Vera Sans Mono).
-        '';
-
-        license = licenses.ofl;
-        homepage = "https://github.com/liberationfonts";
-        maintainers = [
-          maintainers.raskin
-        ];
-      };
-    };
-
-in {
-  liberation_ttf_v1 = common {
-    repo = "liberation-1.7-fonts";
-    version = "1.07.5";
-    nativeBuildInputs = [ fontforge ];
-    sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
-  };
-  liberation_ttf_v2 = common {
-    repo = "liberation-fonts";
-    version = "2.00.4";
-    nativeBuildInputs = [ fontforge fonttools ];
-    postPatch = ''
-      substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \
-        'font = ttLib.TTFont(fontfile)' \
-        'font = ttLib.TTFont(fontfile, recalcTimestamp=False)'
-    '';
-    sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e87f3e2ca0..160626492df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17867,7 +17867,7 @@ in
 
   ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {};
 
-  inherit (callPackages ../data/fonts/redhat-liberation-fonts { })
+  inherit (callPackages ../data/fonts/liberation-fonts { })
     liberation_ttf_v1
     liberation_ttf_v2
     ;