Unverified Commit 17c265a6 authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

xorg.xf86video{glide,glint,newport,tga,wsfb}: remove broken xorg video drivers... 

xorg.xf86video{glide,glint,newport,tga,wsfb}: remove broken xorg video drivers packages && xorg.xf86video{ark,geode,i128,s3virge,v4l,vodoo}: don't mark as broken anymore (#470311)
parents 2fcfffe1 41d71fe6

pkgs/servers/x11/xorg/default.nix

+0 −184
Original line number Diff line number Diff line
@@ -1222,80 +1222,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videoglide = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      xorgserver,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xf86-video-glide";

      version = "1.2.2";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2";

        sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";

      };

      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!

  xf86videoglint = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      libpciaccess,

      xorgproto,

      xorgserver,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xf86-video-glint";

      version = "1.2.9";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2";

        sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        libpciaccess

        xorgproto

        xorgserver

      ];

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

      meta = {

        pkgConfigModules = [ ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videoi128 = callPackage (

    {
@@ -1520,42 +1446,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videonewport = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      xorgserver,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xf86-video-newport";

      version = "0.2.4";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2";

        sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";

      };

      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!

  xf86videonouveau = callPackage (

    {
@@ -2146,44 +2036,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videotga = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      libpciaccess,

      xorgserver,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xf86-video-tga";

      version = "1.2.2";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2";

        sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";

      };

      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!

  xf86videotrident = callPackage (

    {
@@ -2418,42 +2270,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videowsfb = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgserver,

      xorgproto,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xf86-video-wsfb";

      version = "0.4.0";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2";

        sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";

      };

      hardeningDisable = [

        "bindnow"

        "relro"

      ];

      strictDeps = true;

      nativeBuildInputs = [ pkg-config ];

      buildInputs = [

        xorgserver

        xorgproto

      ];

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

      meta = {

        pkgConfigModules = [ ];

        platforms = lib.platforms.unix;

      };

    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xfd = callPackage (

    {

pkgs/servers/x11/xorg/overrides.nix

+17 −40
Original line number Diff line number Diff line
@@ -221,55 +221,33 @@ self: super: 
  xf86inputvoid = brokenOnDarwin super.xf86inputvoid; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin

  xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin



  # Obsolete drivers that don't compile anymore.

  xf86videoark = super.xf86videoark.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

      badPlatforms = lib.platforms.aarch64;

    };

  });



  xf86videogeode = super.xf86videogeode.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

    };

  });

  xf86videoglide = super.xf86videoglide.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

      badPlatforms = lib.platforms.aarch64;

    };

  });



  xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

    };

  });

  xf86videonewport = super.xf86videonewport.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

      badPlatforms = lib.platforms.aarch64;

    };

  });



  xf86videos3virge = super.xf86videos3virge.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

    };

  });

  xf86videotga = super.xf86videotga.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

      badPlatforms = lib.platforms.aarch64;

    };

  });



  xf86videov4l = super.xf86videov4l.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

    };

  });

  xf86videovoodoo = super.xf86videovoodoo.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

    };

  });

  xf86videowsfb = super.xf86videowsfb.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = true;

      platforms = lib.platforms.linux;

    };

  });
@@ -291,15 +269,6 @@ self: super: 
    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";

  });



  xf86videoglint = super.xf86videoglint.overrideAttrs (attrs: {

    nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];

    buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];

    # https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1

    meta = attrs.meta // {

      broken = true;

    };

  });



  xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: {

    meta = attrs.meta // {

      broken = isDarwin;
@@ -754,4 +723,12 @@ self: super: 
# deprecate some packages

// lib.optionalAttrs config.allowAliases {

  fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24

  xf86videoglide = throw "The Xorg Glide video driver has been archived upstream due to being obsolete"; # added 2025-12-13

  xf86videoglint = throw ''

    The Xorg GLINT/Permedia video driver has been broken since xorg 21.

    see https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1

  ''; # added 2025-12-13

  xf86videonewport = throw "The Xorg Newport video driver is broken and hasn't had a release since 2012"; # added 2025-12-13

  xf86videotga = throw "The Xorg TGA (aka DEC 21030) video driver is broken and hasn't had a release since 2012"; # added 2025-12-13

  xf86videowsfb = throw "The Xorg BSD wsdisplay framebuffer video driver is broken and hasn't had a release since 2012"; # added 2025-12-13

}

pkgs/servers/x11/xorg/tarballs.list

+0 −5
Original line number Diff line number Diff line
@@ -31,14 +31,11 @@ mirror://xorg/individual/driver/xf86-video-cirrus-1.6.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-geode-2.18.1.tar.xz

mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2

mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2

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-newport-0.2.4.tar.bz2

https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2

mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz

mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
@@ -54,13 +51,11 @@ mirror://xorg/individual/driver/xf86-video-suncg6-1.1.3.tar.xz 
mirror://xorg/individual/driver/xf86-video-sunffb-1.2.3.tar.xz

mirror://xorg/individual/driver/xf86-video-sunleo-1.2.3.tar.xz

mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2

mirror://xorg/individual/driver/xf86-video-trident-1.4.0.tar.xz

mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2

mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz

mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz

mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz

mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz

mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2

mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2

mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz