Unverified Commit 66386396 authored by quantenzitrone's avatar quantenzitrone
Browse files

font-util: refactored, moved to pkgs/by-name and renamed from xorg.fontutil

parent 5d15a3d7

lib/licenses.nix

+15 −0
Original line number Diff line number Diff line
@@ -257,6 +257,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "BSD Protection License";

    };



    bsdSourceCode = {

      spdxId = "BSD-Source-Code";

      fullName = "BSD Source Code Attribution";

    };



    bsl11 = {

      spdxId = "BUSL-1.1";

      fullName = "Business Source License 1.1";
@@ -942,6 +947,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "MIT No Attribution";

    };



    mitOpenGroup = {

      spdxId = "MIT-open-group";

      fullName = "MIT Open Group variant";

    };



    mpl10 = {

      spdxId = "MPL-1.0";

      fullName = "Mozilla Public License 1.0";
@@ -1326,6 +1336,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "Unicode License Agreement - Data Files and Software (2016)";

    };



    unicodeTOU = {

      spdxId = "Unicode-TOU";

      fullName = "Unicode Terms of Use";

    };



    unlicense = {

      spdxId = "Unlicense";

      fullName = "The Unlicense";

pkgs/by-name/fo/font-util/package.nix

0 → 100644
+49 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  testers,

  writeScript,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "font-util";

  version = "1.4.1";



  src = fetchurl {

    url = "mirror://xorg/individual/font/font-util-${finalAttrs.version}.tar.xz";

    hash = "sha256-XJ9kEjwZSxUP7okEmZFoc4bm/zbvKve4C6U++vNozJU=";

  };



  passthru = {

    updateScript = writeScript "update-${finalAttrs.pname}" ''

      #!/usr/bin/env nix-shell

      #!nix-shell -i bash -p common-updater-scripts



      version="$(list-directory-versions --pname ${finalAttrs.pname} \

        --url https://xorg.freedesktop.org/releases/individual/font/ \

        | sort -V | tail -n1)"



      update-source-version ${finalAttrs.pname} "$version"

    '';

    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

  };



  meta = {

    description = "X.Org font package creation/installation utilities";

    homepage = "https://gitlab.freedesktop.org/xorg/font/util";

    license = with lib.licenses; [

      mit

      bsd2

      bsdSourceCode

      mitOpenGroup

      # there is a bit of a diff, but i think its close enough

      # it was probably just adapted a bit to fit to the repository structure

      # or its an older version that the one on spdx

      unicodeTOU

    ];

    maintainers = [ ];

    pkgConfigModules = [ "fontutil" ];

    platforms = lib.platforms.unix;

  };

})

pkgs/servers/x11/xorg/default.nix

+2 −31
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
{

  lib,

  font-alias,

  font-util,

  luit,

  pixman,

}:
@@ -11,6 +12,7 @@ self: with self; { 
  inherit pixman;

  inherit luit;

  fontalias = font-alias;

  fontutil = font-util;



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  appres = callPackage (
@@ -1565,37 +1567,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  fontutil = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "font-util";

      version = "1.4.1";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/font/font-util-1.4.1.tar.xz";

        sha256 = "15fcd3rzlgm51fwgfapg6vzyd1kkd28rj149xq7iajqr7h9697sw";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [ ];

      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

      meta = {

        pkgConfigModules = [ "fontutil" ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  fontwinitzkicyrillic = callPackage (

    {

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ $pcMap{"gl"} = "libGL"; 
$pcMap{"GL"} = "libGL";

$pcMap{"gbm"} = "libgbm";

$pcMap{"hwdata"} = "hwdata";

$pcMap{"fontutil"} = "fontutil";

$pcMap{"\$PIXMAN"} = "pixman";

$pcMap{"\$RENDERPROTO"} = "xorgproto";

$pcMap{"\$DRI3PROTO"} = "xorgproto";
@@ -261,6 +262,7 @@ print OUT <<EOF; 
{

  lib,

  font-alias,

  font-util,

  luit,

  pixman,

}:
@@ -270,6 +272,7 @@ self: with self; { 
  inherit pixman;

  inherit luit;

  fontalias = font-alias;

  fontutil = font-util;



EOF

pkgs/servers/x11/xorg/tarballs.list

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz 
mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz

mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz

mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz

mirror://xorg/individual/font/font-util-1.4.1.tar.xz

mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz

mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz

https://gitlab.freedesktop.org/xorg/lib/libAppleWM/-/archive/be972ebc3a97292e7d2b2350eff55ae12df99a42/libAppleWM-be972ebc3a97292e7d2b2350eff55ae12df99a42.tar.bz2