Unverified Commit 5d15a3d7 authored by quantenzitrone's avatar quantenzitrone
Browse files

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

parent f868cc3a

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -452,6 +452,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "Common Public License 1.0";

    };



    cronyx = {

      spdxId = "Cronyx";

      fullName = "Cronyx License";

    };



    curl = {

      spdxId = "curl";

      fullName = "curl License";

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

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

  lib,

  stdenv,

  fetchurl,

  writeScript,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "font-alias";

  version = "1.0.5";



  src = fetchurl {

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

    hash = "sha256-n4niF7tz4ONjagpJP7+LfJlRVuDFPZoEdtIBtnwta24=";

  };



  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"

    '';

  };



  meta = {

    description = "Common aliases for Xorg fonts";

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

    license = with lib.licenses; [

      cronyx

      mit

    ];

    maintainers = [ ];

    platforms = lib.platforms.all;

  };

})

pkgs/servers/x11/xorg/default.nix

+3 −32
Original line number Diff line number Diff line 
# THIS IS A GENERATED FILE.  DO NOT EDIT!

{

  lib,

  pixman,

  font-alias,

  luit,

  pixman,

}:



self: with self; {



  inherit pixman;

  inherit luit;

  fontalias = font-alias;



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

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

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  fontalias = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "font-alias";

      version = "1.0.5";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/font/font-alias-1.0.5.tar.xz";

        sha256 = "0vkb5mybc0fjfq29lgf5w1b536bwifzkyj8ad9iy7q3kpcby52cz";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [ ];

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

      meta = {

        pkgConfigModules = [ ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  fontarabicmisc = callPackage (

    {

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

+3 −1
Original line number Diff line number Diff line
@@ -260,14 +260,16 @@ print OUT <<EOF; 
# THIS IS A GENERATED FILE.  DO NOT EDIT!

{

  lib,

  pixman,

  font-alias,

  luit,

  pixman,

}:



self: with self; {



  inherit pixman;

  inherit luit;

  fontalias = font-alias;



EOF

pkgs/servers/x11/xorg/tarballs.list

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ mirror://xorg/individual/font/font-adobe-100dpi-1.0.4.tar.xz 
mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz

mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz

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

mirror://xorg/individual/font/font-alias-1.0.5.tar.xz

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

mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz

mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz