Unverified Commit 0a07ae8d authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

libx{p,present,res,scrnsaver}: refactor, move to pkgs/by-name and rename from... 

libx{p,present,res,scrnsaver}: refactor, move to pkgs/by-name and rename from xorg namespace (#436270)
parents 2f5e64c2 ab945fb3

pkgs/by-name/li/libxp/package.nix

0 → 100644
+69 −0
Original line number Diff line number Diff line 
# TODO: remove this deprecated package

# X.Org removed support for the Xprt server from the xorg-server releases in the 1.6.0 release in

# 2009, and the standalone git repo it was moved to has been unmaintained since 2009, making it

# difficult to actually use this library.

# Some packages in nixpkgs still somehow depend on it tho.

{

  lib,

  stdenv,

  fetchurl,

  pkg-config,

  xorgproto,

  libx11,

  libxau,

  libxext,

  writeScript,

  testers,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "libxp";

  version = "1.0.4";



  outputs = [

    "out"

    "dev"

  ];



  src = fetchurl {

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

    hash = "sha256-HxnjuOgqNKj9mImn2a8KvoWIywP7V8N8VpY0zzud8aQ=";

  };



  strictDeps = true;



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [

    xorgproto

    libx11

    libxau

    libxext

  ];



  propagatedBuildInputs = [ xorgproto ];



  passthru = {

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

      #!/usr/bin/env nix-shell

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

      version="$(list-directory-versions --pname libXp \

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

        | sort -V | tail -n1)"

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

    '';

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

  };



  meta = {

    description = "X Print Client Library";

    longDescription = ''

      This library provides support for X11 clients to print via the X Print Extension, as

      previously implemented in the Xprt server.

    '';

    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxp";

    license = lib.licenses.x11;

    maintainers = [ ];

    pkgConfigModules = [ "xp" ];

    platforms = lib.platforms.unix;

  };

})

pkgs/by-name/li/libxpresent/package.nix

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

  lib,

  stdenv,

  fetchurl,

  pkg-config,

  xorgproto,

  libx11,

  libxext,

  libxfixes,

  libxrandr,

  writeScript,

  testers,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "libxpresent";

  version = "1.0.2";



  outputs = [

    "out"

    "dev"

  ];



  src = fetchurl {

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

    hash = "sha256-TlshtIEiBqSyIwE2Bq4xFwUCwQQwOHd6Hvj3DAnTdgI=";

  };



  strictDeps = true;



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [

    xorgproto

    libx11

    libxext

    libxfixes

    libxrandr

  ];



  propagatedBuildInputs = [

    xorgproto

    # header includes dependencies

    libxfixes

  ];



  passthru = {

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

      #!/usr/bin/env nix-shell

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

      version="$(list-directory-versions --pname libXpresent \

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

        | sort -V | tail -n1)"

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

    '';

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

  };



  meta = {

    description = "library for the X Present Extension";

    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxpresent";

    license = with lib.licenses; [

      hpndSellVariant

      mit

    ];

    maintainers = [ ];

    pkgConfigModules = [ "xpresent" ];

    platforms = lib.platforms.unix;

  };

})

pkgs/by-name/li/libxres/package.nix

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

  lib,

  stdenv,

  fetchurl,

  pkg-config,

  xorgproto,

  libx11,

  libxext,

  writeScript,

  testers,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "libxres";

  version = "1.2.3";

  outputs = [

    "out"

    "dev"

    "devdoc"

  ];



  src = fetchurl {

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

    hash = "sha256-0t6PVAHWyGqJknkWVFR+uN71hd/cDAjMFuJO9q7radw=";

  };



  strictDeps = true;



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [

    xorgproto

    libx11

    libxext

  ];



  propagatedBuildInputs = [ xorgproto ];



  configureFlags = lib.optional (

    stdenv.hostPlatform != stdenv.buildPlatform

  ) "--enable-malloc0returnsnull";



  passthru = {

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

      #!/usr/bin/env nix-shell

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

      version="$(list-directory-versions --pname libXres \

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

        | sort -V | tail -n1)"

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

    '';

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

  };



  meta = {

    description = "X-Resource extension client library";

    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxres";

    license = lib.licenses.x11;

    maintainers = [ ];

    pkgConfigModules = [ "xres" ];

    platforms = lib.platforms.unix;

  };

})

pkgs/by-name/li/libxscrnsaver/package.nix

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

  lib,

  stdenv,

  fetchurl,

  pkg-config,

  xorgproto,

  libx11,

  libxext,

  writeScript,

  testers,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "libxscrnsaver";

  version = "1.2.5";



  src = fetchurl {

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

    hash = "sha256-UFc2X4RyU+DidYcUQeEP94RsgyKl2I4eGH0ybeHNjQA=";

  };



  strictDeps = true;



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [

    xorgproto

    libx11

    libxext

  ];



  propagatedBuildInputs = [ xorgproto ];



  configureFlags = lib.optional (

    stdenv.hostPlatform != stdenv.buildPlatform

  ) "--enable-malloc0returnsnull";



  passthru = {

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

      #!/usr/bin/env nix-shell

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

      version="$(list-directory-versions --pname libXScrnSaver \

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

        | sort -V | tail -n1)"

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

    '';

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

  };



  meta = {

    description = "X11 Screen Saver extension client library";

    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver";

    license = lib.licenses.x11;

    maintainers = [ ];

    pkgConfigModules = [ "xscrnsaver" ];

    platforms = lib.platforms.unix;

  };

})

pkgs/servers/x11/xorg/default.nix

+8 −158
Original line number Diff line number Diff line
@@ -63,9 +63,13 @@ 
  libxft,

  libxi,

  libxmu,

  libxp,

  libxpm,

  libxpresent,

  libxrandr,

  libxrender,

  libxres,

  libxscrnsaver,

  libxt,

  libxv,

  libxvmc,
@@ -229,9 +233,13 @@ self: with self; { 
  libXft = libxft;

  libXi = libxi;

  libXmu = libxmu;

  libXp = libxp;

  libXpm = libxpm;

  libXpresent = libxpresent;

  libXrandr = libxrandr;

  libXrender = libxrender;

  libXres = libxres;

  libXScrnSaver = libxscrnsaver;

  libXt = libxt;

  libXv = libxv;

  libXvMC = libxvmc;
@@ -935,44 +943,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  libXScrnSaver = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      libX11,

      libXext,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "libXScrnSaver";

      version = "1.2.5";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz";

        sha256 = "004drphnsckx30g8xn554a1nr17p1zhl2547fpif0lvjhigkcmsh";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        xorgproto

        libX11

        libXext

      ];

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

      meta = {

        pkgConfigModules = [ "xscrnsaver" ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  libXTrap = callPackage (

    {
@@ -1051,126 +1021,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  libXp = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      libX11,

      libXau,

      libXext,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "libXp";

      version = "1.0.4";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/lib/libXp-1.0.4.tar.xz";

        sha256 = "197iklxwyd4naryc6mzv0g5qi1dy1apxk9w9k3yshd1ax2wf668z";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        xorgproto

        libX11

        libXau

        libXext

      ];

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

      meta = {

        pkgConfigModules = [ "xp" ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  libXpresent = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      libX11,

      libXext,

      libXfixes,

      libXrandr,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "libXpresent";

      version = "1.0.2";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/lib/libXpresent-1.0.2.tar.xz";

        sha256 = "00knsc4hrxzq3rx7ff1h0k0h418p66p0cdh14fra81i2h6s22nsf";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        xorgproto

        libX11

        libXext

        libXfixes

        libXrandr

      ];

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

      meta = {

        pkgConfigModules = [ "xpresent" ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  libXres = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      libX11,

      libXext,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "libXres";

      version = "1.2.3";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/lib/libXres-1.2.3.tar.xz";

        sha256 = "1p39xfpgckp22v60h36wvy2zbpmqgra585krja4nmj6n05a8zpnj";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        xorgproto

        libX11

        libXext

      ];

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

      meta = {

        pkgConfigModules = [ "xres" ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  libXtst = callPackage (

    {