gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xf86-video-{i128,i740,mga,neomagic}: refactor, move to pkgs/by-name & rename from xorg namespace (#478240)

Browse Source
This commit is contained in:
Jo
2026-01-10 10:49:44 +00:00
committed by GitHub
parent 9684f746e3 2a0fbb3472
commit def83a5bf2
8 changed files with 243 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/xf/xf86-video-i128/package.nix
+56
View File
@@ -0,0 +1,56 @@
{
lib,
stdenv,
fetchFromGitLab,
autoreconfHook,
pkg-config,
util-macros,
xorg-server,
xorgproto,
libpciaccess,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-i128";
version = "1.4.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
group = "xorg";
owner = "driver";
repo = "xf86-video-i128";
tag = "xf86-video-i128-${finalAttrs.version}";
hash = "sha256-2yjzaJV5DIATEmByIZJXZyZ781lTUNzfafCmIlBSBRg=";
};
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
util-macros
xorg-server # for some autoconf macros
];
buildInputs = [
xorg-server
xorgproto
libpciaccess
];
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-i128-(.*)" ]; };
};
meta = {
description = "Number Nine I128 video driver for the Xorg X server";
homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-i128";
license = with lib.licenses; [
hpndSellVariant
mit
];
maintainers = [ ];
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isAarch64;
};
})
pkgs/by-name/xf/xf86-video-i740/package.nix
+56
View File
@@ -0,0 +1,56 @@
{
lib,
stdenv,
fetchFromGitLab,
autoreconfHook,
pkg-config,
util-macros,
xorg-server,
xorgproto,
libpciaccess,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-i740";
version = "1.4.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
group = "xorg";
owner = "driver";
repo = "xf86-video-i740";
tag = "xf86-video-i740-${finalAttrs.version}";
hash = "sha256-wEpTkmzMjEebkPf6/69gjmDdJ0OQ3MrnosIXFIQor8A=";
};
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
util-macros
xorg-server # for some autoconf macros
];
buildInputs = [
xorg-server
xorgproto
libpciaccess
];
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-i740-(.*)" ]; };
};
meta = {
description = "Intel i740 video driver for the Xorg X server";
homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-i740";
license = with lib.licenses; [
mit
hpndSellVariant
];
maintainers = [ ];
platforms = lib.platforms.unix;
broken = stdenv.hostPlatform.isAarch64;
};
})
pkgs/by-name/xf/xf86-video-mga/package.nix
+59
View File
@@ -0,0 +1,59 @@
{
lib,
stdenv,
fetchFromGitLab,
autoreconfHook,
pkg-config,
util-macros,
xorg-server,
xorgproto,
libdrm,
libpciaccess,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-mga";
version = "2.1.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
group = "xorg";
owner = "driver";
repo = "xf86-video-mga";
tag = "xf86-video-mga-${finalAttrs.version}";
hash = "sha256-9DpqSyGTu4jOttZlF95/rpi2oEu+JPU3sniuHTatoRo=";
};
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
util-macros
xorg-server # for some autoconf macros
];
buildInputs = [
xorgproto
libdrm
libpciaccess
xorg-server
];
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-mga-(.*)" ]; };
};
meta = {
description = "Matrox video driver for the Xorg X server";
homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga";
license = with lib.licenses; [
x11
mitOpenGroup
hpndSellVariant
mit
];
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/by-name/xf/xf86-video-neomagic/package.nix
+56
View File
@@ -0,0 +1,56 @@
{
lib,
stdenv,
fetchFromGitLab,
autoreconfHook,
pkg-config,
util-macros,
xorg-server,
xorgproto,
libpciaccess,
nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-neomagic";
version = "1.3.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
group = "xorg";
owner = "driver";
repo = "xf86-video-neomagic";
tag = "xf86-video-neomagic-${finalAttrs.version}";
hash = "sha256-j1zhKGYmKADZ/6WuCQTca7l+rTgqlLhGoQvYhWxWAAE=";
};
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
util-macros
xorg-server # for some autoconf macros
];
buildInputs = [
xorg-server
xorgproto
libpciaccess
];
passthru = {
updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-neomagic-(.*)" ]; };
};
meta = {
description = "NeoMagic video driver for the Xorg X server";
homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-neomagic";
license = with lib.licenses; [
hpndSellVariant
mit
# the repo contains several copyright notices without a license
unfree
];
maintainers = [ ];
platforms = lib.platforms.unix;
};
})
pkgs/servers/x11/xorg/default.nix
+8 -154
View File
@@ -139,6 +139,10 @@
xf86-video-chips,
xf86-video-cirrus,
xf86-video-geode,
xf86-video-i128,
xf86-video-i740,
xf86-video-mga,
xf86-video-neomagic,
xf86-video-nouveau,
xf86-video-s3virge,
xf86-video-v4l,
@@ -359,6 +363,10 @@ self: with self; {
xf86videochips = xf86-video-chips;
xf86videocirrus = xf86-video-cirrus;
xf86videogeode = xf86-video-geode;
xf86videoi128 = xf86-video-i128;
xf86videoi740 = xf86-video-i740;
xf86videomga = xf86-video-mga;
xf86videoneomagic = xf86-video-neomagic;
xf86videonouveau = xf86-video-nouveau;
xf86videos3virge = xf86-video-s3virge;
xf86videov4l = xf86-video-v4l;
@@ -678,82 +686,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videoi128 = callPackage (
{
stdenv,
pkg-config,
fetchurl,
xorgproto,
libpciaccess,
xorgserver,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-i128";
version = "1.4.1";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz";
sha256 = "0imwmkam09wpp3z3iaw9i4hysxicrrax7i3p0l2glgp3zw9var3h";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libpciaccess
xorgserver
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videoi740 = callPackage (
{
stdenv,
pkg-config,
fetchurl,
xorgproto,
libpciaccess,
xorgserver,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-i740";
version = "1.4.0";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2";
sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libpciaccess
xorgserver
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videointel = callPackage (
{
@@ -824,84 +756,6 @@ self: with self; {
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videomga = callPackage (
{
stdenv,
pkg-config,
fetchurl,
xorgproto,
libdrm,
libpciaccess,
xorgserver,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-mga";
version = "2.1.0";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz";
sha256 = "0wxbcgg5i4yq22pbc50567877z8irxhqzgl3sk6vf5zs9szmvy3v";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libdrm
libpciaccess
xorgserver
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videoneomagic = callPackage (
{
stdenv,
pkg-config,
fetchurl,
xorgproto,
libpciaccess,
xorgserver,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-neomagic";
version = "1.3.1";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz";
sha256 = "153lzhq0vahg3875wi8hl9rf4sgizs41zmfg6hpfjw99qdzaq7xn";
};
hardeningDisable = [
"bindnow"
"relro"
];
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xorgproto
libpciaccess
xorgserver
];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
platforms = lib.platforms.unix;
};
})
) { };
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videonv = callPackage (
{
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+8
View File
@@ -471,6 +471,10 @@ print OUT <<EOF;
xf86-video-chips,
xf86-video-cirrus,
xf86-video-geode,
xf86-video-i128,
xf86-video-i740,
xf86-video-mga,
xf86-video-neomagic,
xf86-video-nouveau,
xf86-video-s3virge,
xf86-video-v4l,
@@ -691,6 +695,10 @@ self: with self; {
xf86videochips = xf86-video-chips;
xf86videocirrus = xf86-video-cirrus;
xf86videogeode = xf86-video-geode;
xf86videoi128 = xf86-video-i128;
xf86videoi740 = xf86-video-i740;
xf86videomga = xf86-video-mga;
xf86videoneomagic = xf86-video-neomagic;
xf86videonouveau = xf86-video-nouveau;
xf86videos3virge = xf86-video-s3virge;
xf86videov4l = xf86-video-v4l;
pkgs/servers/x11/xorg/overrides.nix
-6
View File
@@ -120,12 +120,6 @@ self: super:
xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin
xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: {
meta = attrs.meta // {
badPlatforms = lib.platforms.aarch64;
};
});
xf86videoomap = super.xf86videoomap.overrideAttrs (attrs: {
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-overflow" ];
});
pkgs/servers/x11/xorg/tarballs.list
-4
View File
@@ -10,11 +10,7 @@ mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
mirror://xorg/individual/driver/xf86-video-amdgpu-23.0.0.tar.xz
mirror://xorg/individual/driver/xf86-video-dummy-0.4.1.tar.xz
mirror://xorg/individual/driver/xf86-video-fbdev-0.5.1.tar.xz
mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz
mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz
mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz
mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz
mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2