From b7a50d3f5348688f00c4040ef1e2b5e5d26b8cd4 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Mon, 18 Aug 2025 22:23:43 +0200 Subject: [PATCH 1/4] libxvmc: refactor, move to pkgs/by-name and rename from xorg.libXvMC --- pkgs/by-name/li/libxvmc/package.nix | 68 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 45 +----------- .../x11/xorg/generate-expr-from-tarballs.pl | 4 ++ pkgs/servers/x11/xorg/overrides.nix | 10 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 74 insertions(+), 54 deletions(-) create mode 100644 pkgs/by-name/li/libxvmc/package.nix diff --git a/pkgs/by-name/li/libxvmc/package.nix b/pkgs/by-name/li/libxvmc/package.nix new file mode 100644 index 000000000000..59ab561a47df --- /dev/null +++ b/pkgs/by-name/li/libxvmc/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libX11, + libXext, + libXv, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxvmc"; + version = "1.0.14"; + + outputs = [ + "out" + "dev" + "doc" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXvMC-${finalAttrs.version}.tar.xz"; + hash = "sha256-5L6etra6/bv4H0f3FjBHIVN25F4tx4bQ6mGByTByXtk="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libX11 + libXext + libXv + ]; + + 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 libXvMC \ + --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-Video Motion Compensation API"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxvmc"; + license = lib.licenses.mit; + maintainers = [ ]; + pkgConfigModules = [ + "xvmc" + "xvmc-wrapper" + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ab48f6f94e2c..45e3db83bb21 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -24,6 +24,7 @@ libxrandr, libxrender, libxv, + libxvmc, lndir, luit, makedepend, @@ -99,6 +100,7 @@ self: with self; { libXrandr = libxrandr; libXrender = libxrender; libXv = libxv; + libXvMC = libxvmc; utilmacros = util-macros; xcbproto = xcb-proto; xkeyboardconfig = xkeyboard-config; @@ -2545,49 +2547,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXvMC = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXext, - libXv, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXvMC"; - version = "1.0.14"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz"; - sha256 = "1nayf8qck0b1xb88dirdbvj7clr18wq1dxs73zwbpzdsnsv9xgp4"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXext - libXv - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ - "xvmc" - "xvmc-wrapper" - ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXxf86dga = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9ea02810f2e6..cd81b807e8d3 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -55,6 +55,8 @@ $pcMap{"xrandr"} = "libXrandr"; $pcMap{"xrender"} = "libXrender"; $pcMap{"xtrans"} = "xtrans"; $pcMap{"xv"} = "libXv"; +$pcMap{"xvmc"} = "libXvMC"; +$pcMap{"xvmc-wrapper"} = "libXvMC"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; @@ -317,6 +319,7 @@ print OUT < Date: Mon, 18 Aug 2025 22:45:54 +0200 Subject: [PATCH 2/4] libxxf86dga: refactor, move to pkgs/by-name and rename from xorg.libXxf86dga --- pkgs/by-name/li/libxxf86dga/package.nix | 57 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 3 + pkgs/servers/x11/xorg/overrides.nix | 3 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 62 insertions(+), 42 deletions(-) create mode 100644 pkgs/by-name/li/libxxf86dga/package.nix diff --git a/pkgs/by-name/li/libxxf86dga/package.nix b/pkgs/by-name/li/libxxf86dga/package.nix new file mode 100644 index 000000000000..4dc5b64c16a4 --- /dev/null +++ b/pkgs/by-name/li/libxxf86dga/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libX11, + libXext, + xorgproto, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxxf86dga"; + version = "1.1.6"; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXxf86dga-${finalAttrs.version}.tar.xz"; + hash = "sha256-vkRCdXmAj+OiF9WfUcrnVqJpE+tuTIc4zKtl/1bXmA8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libX11 + libXext + xorgproto + ]; + + 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 libXxf86dga \ + --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 = "Client library for the XFree86-DGA extension"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86dga"; + license = lib.licenses.x11; + maintainers = [ ]; + pkgConfigModules = [ "xxf86dga" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 45e3db83bb21..ba9ff1a2fe85 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -25,6 +25,7 @@ libxrender, libxv, libxvmc, + libxxf86dga, lndir, luit, makedepend, @@ -101,6 +102,7 @@ self: with self; { libXrender = libxrender; libXv = libxv; libXvMC = libxvmc; + libXxf86dga = libxxf86dga; utilmacros = util-macros; xcbproto = xcb-proto; xkeyboardconfig = xkeyboard-config; @@ -2547,44 +2549,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXxf86dga = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXext, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXxf86dga"; - version = "1.1.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz"; - sha256 = "03wqsxbgyrdbrhw8fk3fxc9nk8jnwz5537ym2yif73w0g5sl4i5y"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libXext - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xxf86dga" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXxf86misc = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index cd81b807e8d3..2abdeed8941c 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -57,6 +57,7 @@ $pcMap{"xtrans"} = "xtrans"; $pcMap{"xv"} = "libXv"; $pcMap{"xvmc"} = "libXvMC"; $pcMap{"xvmc-wrapper"} = "libXvMC"; +$pcMap{"xxf86dga"} = "libXxf86dga"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; @@ -320,6 +321,7 @@ print OUT < Date: Mon, 18 Aug 2025 22:55:12 +0200 Subject: [PATCH 3/4] libxxf86misc: refactor, move to pkgs/by-name and rename from xorg.libXxf86misc --- pkgs/by-name/li/libxxf86misc/package.nix | 57 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 3 + pkgs/servers/x11/xorg/overrides.nix | 3 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 62 insertions(+), 42 deletions(-) create mode 100644 pkgs/by-name/li/libxxf86misc/package.nix diff --git a/pkgs/by-name/li/libxxf86misc/package.nix b/pkgs/by-name/li/libxxf86misc/package.nix new file mode 100644 index 000000000000..e3ca3584195e --- /dev/null +++ b/pkgs/by-name/li/libxxf86misc/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxext, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxxf86misc"; + version = "1.0.4"; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXxf86misc-${finalAttrs.version}.tar.bz2"; + hash = "sha256-qJwD4rDxYjnWeiAxuQA/MbWmhhBrvbPHl/uIrkcq84A="; + }; + + 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 libXxf86misc \ + --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 = "Extension library for the XFree86-Misc X extension"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86misc"; + license = lib.licenses.x11; + maintainers = [ ]; + pkgConfigModules = [ "xxf86misc" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ba9ff1a2fe85..d181d5478747 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -26,6 +26,7 @@ libxv, libxvmc, libxxf86dga, + libxxf86misc, lndir, luit, makedepend, @@ -103,6 +104,7 @@ self: with self; { libXv = libxv; libXvMC = libxvmc; libXxf86dga = libxxf86dga; + libXxf86misc = libxxf86misc; utilmacros = util-macros; xcbproto = xcb-proto; xkeyboardconfig = xkeyboard-config; @@ -2549,44 +2551,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXxf86misc = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXext, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXxf86misc"; - version = "1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2"; - sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libXext - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xxf86misc" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXxf86vm = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 2abdeed8941c..ed23189983a9 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -58,6 +58,7 @@ $pcMap{"xv"} = "libXv"; $pcMap{"xvmc"} = "libXvMC"; $pcMap{"xvmc-wrapper"} = "libXvMC"; $pcMap{"xxf86dga"} = "libXxf86dga"; +$pcMap{"xxf86misc"} = "libXxf86misc"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; @@ -322,6 +323,7 @@ print OUT < Date: Mon, 18 Aug 2025 23:01:59 +0200 Subject: [PATCH 4/4] libxxf86vm: refactor, move to pkgs/by-name and rename from xorg.libXxf86vm --- pkgs/by-name/li/libxxf86vm/package.nix | 60 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 3 + pkgs/servers/x11/xorg/overrides.nix | 7 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 65 insertions(+), 46 deletions(-) create mode 100644 pkgs/by-name/li/libxxf86vm/package.nix diff --git a/pkgs/by-name/li/libxxf86vm/package.nix b/pkgs/by-name/li/libxxf86vm/package.nix new file mode 100644 index 000000000000..7f605d782e09 --- /dev/null +++ b/pkgs/by-name/li/libxxf86vm/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libX11, + libXext, + xorgproto, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxxf86vm"; + version = "1.1.6"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXxf86vm-${finalAttrs.version}.tar.xz"; + hash = "sha256-lq9BTHPOHVRJrQS+f58n+oMw+ES23ahD7yLj4b77PuM="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libX11 + libXext + 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 libXxf86vm \ + --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 = "Extension library for the XFree86-VidMode X extension"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86vm"; + license = lib.licenses.x11; + maintainers = [ ]; + pkgConfigModules = [ "xxf86vm" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d181d5478747..a66e38f1364e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -27,6 +27,7 @@ libxvmc, libxxf86dga, libxxf86misc, + libxxf86vm, lndir, luit, makedepend, @@ -105,6 +106,7 @@ self: with self; { libXvMC = libxvmc; libXxf86dga = libxxf86dga; libXxf86misc = libxxf86misc; + libXxf86vm = libxxf86vm; utilmacros = util-macros; xcbproto = xcb-proto; xkeyboardconfig = xkeyboard-config; @@ -2551,44 +2553,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXxf86vm = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXext, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXxf86vm"; - version = "1.1.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz"; - sha256 = "1qryzfzf3qr2xx1sipdn8kw310zs4ygpzgh4mm4m87fffd643bwn"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libXext - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xxf86vm" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libxkbfile = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index ed23189983a9..e2c984d3ec09 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -59,6 +59,7 @@ $pcMap{"xvmc"} = "libXvMC"; $pcMap{"xvmc-wrapper"} = "libXvMC"; $pcMap{"xxf86dga"} = "libXxf86dga"; $pcMap{"xxf86misc"} = "libXxf86misc"; +$pcMap{"xxf86vm"} = "libXxf86vm"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; @@ -324,6 +325,7 @@ print OUT <