From a54c58d545da2963cbb66a4e57e8c0890198af21 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 10 Jan 2026 05:42:42 +0100 Subject: [PATCH] xf86-video-suncg6: refactor, move to pkgs/by-name & rename from xorg.xf86videosuncg6 relevant changes: - switch to GitLab source instead of release tarball --- pkgs/by-name/xf/xf86-video-suncg6/package.nix | 55 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +------------ .../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, 59 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/xf/xf86-video-suncg6/package.nix diff --git a/pkgs/by-name/xf/xf86-video-suncg6/package.nix b/pkgs/by-name/xf/xf86-video-suncg6/package.nix new file mode 100644 index 000000000000..22569598238e --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-suncg6/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorg-server, + xorgproto, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xf86-video-suncg6"; + version = "1.1.3"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-video-suncg6"; + tag = "xf86-video-suncg6-${finalAttrs.version}"; + hash = "sha256-M9O0BNrKAFdiEgpZstH8KHRVIMEy5dI3y8rP+MSzLCY="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + xorg-server # for some autoconf macros + ]; + + buildInputs = [ + xorg-server + xorgproto + ]; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version-regex=xf86-video-suncg6-(.*)" ]; }; + }; + + meta = { + description = "Sun GX/Turbo GX video driver for the Xorg X server"; + longDescription = '' + This driver supports the Sun GX, GXplus, TurboGX, and TurboGXplus Color Frame Buffers. These + Sbus cards were supported in the sun4c, sun4m, sun4d, and sun4u platforms. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6"; + license = lib.licenses.hpndSellVariant; + maintainers = [ ]; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0ec4cc841de0..4b98f4d3b2c9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -138,6 +138,7 @@ xf86-video-s3virge, xf86-video-sis, xf86-video-sisusb, + xf86-video-suncg6, xf86-video-v4l, xfd, xfontsel, @@ -355,6 +356,7 @@ self: with self; { xf86videos3virge = xf86-video-s3virge; xf86videosis = xf86-video-sis; xf86videosisusb = xf86-video-sisusb; + xf86videosuncg6 = xf86-video-suncg6; xf86videov4l = xf86-video-v4l; xkeyboardconfig = xkeyboard-config; xorgcffiles = xorg-cf-files; @@ -1378,42 +1380,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xf86videosuncg6 = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - xorgserver, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xf86-video-suncg6"; - version = "1.1.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz"; - sha256 = "16c3g5m0f5y9nx2x6w9jdzbs9yr6xhq31j37dcffxbsskmfxq57w"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - xorgserver - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86videosunffb = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 74e4e88dc616..a52c7d3eb42c 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -470,6 +470,7 @@ print OUT <