From 9c63aae1d2efb20f67516d608f03f0bdc2bbfcb3 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Thu, 8 Jan 2026 23:01:29 +0100 Subject: [PATCH 1/4] xf86-video-i128: refactor, move to pkgs/by-name & rename from xorg.xf86videoi128 relevant changes: - switch to GitLab source instead of release tarball --- pkgs/by-name/xf/xf86-video-i128/package.nix | 56 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 6 -- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 60 insertions(+), 45 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-i128/package.nix diff --git a/pkgs/by-name/xf/xf86-video-i128/package.nix b/pkgs/by-name/xf/xf86-video-i128/package.nix new file mode 100644 index 000000000000..9210b92e9fb3 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-i128/package.nix @@ -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; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9923fae3d974..b2327f2e8ae6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -134,6 +134,7 @@ xf86-input-void, xf86-video-ark, xf86-video-geode, + xf86-video-i128, xf86-video-nouveau, xf86-video-s3virge, xf86-video-v4l, @@ -349,6 +350,7 @@ self: with self; { xf86inputvoid = xf86-input-void; xf86videoark = xf86-video-ark; xf86videogeode = xf86-video-geode; + xf86videoi128 = xf86-video-i128; xf86videonouveau = xf86-video-nouveau; xf86videos3virge = xf86-video-s3virge; xf86videov4l = xf86-video-v4l; @@ -866,44 +868,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 ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index aeb72a556c36..fa4223f7208c 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -466,6 +466,7 @@ print OUT < Date: Thu, 8 Jan 2026 23:07:46 +0100 Subject: [PATCH 2/4] xf86-video-i740: refactor, move to pkgs/by-name & rename from xorg.xf86videoi740 relevant changes: - switch to GitLab source instead of release tarball - mark broken on aarch64 (missing I/O port functions https://stackoverflow.com/a/70538833) --- pkgs/by-name/xf/xf86-video-i740/package.nix | 56 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 60 insertions(+), 39 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-i740/package.nix diff --git a/pkgs/by-name/xf/xf86-video-i740/package.nix b/pkgs/by-name/xf/xf86-video-i740/package.nix new file mode 100644 index 000000000000..1163bdf60e59 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-i740/package.nix @@ -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; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b2327f2e8ae6..86f141987efb 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -135,6 +135,7 @@ xf86-video-ark, xf86-video-geode, xf86-video-i128, + xf86-video-i740, xf86-video-nouveau, xf86-video-s3virge, xf86-video-v4l, @@ -351,6 +352,7 @@ self: with self; { xf86videoark = xf86-video-ark; xf86videogeode = xf86-video-geode; xf86videoi128 = xf86-video-i128; + xf86videoi740 = xf86-video-i740; xf86videonouveau = xf86-video-nouveau; xf86videos3virge = xf86-video-s3virge; xf86videov4l = xf86-video-v4l; @@ -868,44 +870,6 @@ self: with self; { }) ) { }; - # 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 ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index fa4223f7208c..0874325ec8e6 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -467,6 +467,7 @@ print OUT < Date: Fri, 9 Jan 2026 01:07:29 +0100 Subject: [PATCH 3/4] xf86-video-mga: refactor, move to pkgs/by-name & rename from xorg.xf86videomga relevant changes: - switch to GitLab source instead of release tarball --- pkgs/by-name/xf/xf86-video-mga/package.nix | 59 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 42 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 63 insertions(+), 41 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-mga/package.nix diff --git a/pkgs/by-name/xf/xf86-video-mga/package.nix b/pkgs/by-name/xf/xf86-video-mga/package.nix new file mode 100644 index 000000000000..ff0444ecfa53 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-mga/package.nix @@ -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; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 86f141987efb..d4a5bf42d241 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -136,6 +136,7 @@ xf86-video-geode, xf86-video-i128, xf86-video-i740, + xf86-video-mga, xf86-video-nouveau, xf86-video-s3virge, xf86-video-v4l, @@ -353,6 +354,7 @@ self: with self; { xf86videogeode = xf86-video-geode; xf86videoi128 = xf86-video-i128; xf86videoi740 = xf86-video-i740; + xf86videomga = xf86-video-mga; xf86videonouveau = xf86-video-nouveau; xf86videos3virge = xf86-video-s3virge; xf86videov4l = xf86-video-v4l; @@ -940,46 +942,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 ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0874325ec8e6..ef83da64c851 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -468,6 +468,7 @@ print OUT < Date: Fri, 9 Jan 2026 01:20:10 +0100 Subject: [PATCH 4/4] xf86-video-neomagic: refactor, move to pkgs/by-name & rename from xorg.xf86videoneomagic relevant changes: - switch to GitLab source instead of release tarball --- .../xf/xf86-video-neomagic/package.nix | 56 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 60 insertions(+), 39 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-neomagic/package.nix diff --git a/pkgs/by-name/xf/xf86-video-neomagic/package.nix b/pkgs/by-name/xf/xf86-video-neomagic/package.nix new file mode 100644 index 000000000000..b7f6c97dd963 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-neomagic/package.nix @@ -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; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d4a5bf42d241..c792d5b29929 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -137,6 +137,7 @@ xf86-video-i128, xf86-video-i740, xf86-video-mga, + xf86-video-neomagic, xf86-video-nouveau, xf86-video-s3virge, xf86-video-v4l, @@ -355,6 +356,7 @@ self: with self; { 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; @@ -942,44 +944,6 @@ self: with self; { }) ) { }; - # 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 ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index ef83da64c851..a6599d397341 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -469,6 +469,7 @@ print OUT <