Unverified Commit 6d88a228 authored by quantenzitrone's avatar quantenzitrone
Browse files

xf86-video-geode: refactor, move to pkgs/by-name & rename from xorg.xf86videogeode 

relevant changes:
- switch to GitLab source instead of release tarball

New license just dropped: Just put the third clause of BSD-3-Clause
into the X11 license. I'm not gonna add this to spdx because geode
is fucking old and probably deprecated in a few years anyway, maybe
before Xorg. The package is not even listed on repology, despite being
packaged in most distros.
parent d8c88a59

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -1542,6 +1542,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "X11 License";

    };



    x11BsdClause = {

      fullName = "X11 License with third BSD clause";

      url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode/-/blob/d147c3f1b6907ae9db6f12853cedd450537d99d2/COPYING";

    };



    x11NoPermitPersons = {

      spdxId = "X11-no-permit-persons";

      fullName = "X11 no permit persons clause";

pkgs/by-name/xf/xf86-video-geode/package.nix

0 → 100644
+56 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitLab,

  autoreconfHook,

  pkg-config,

  util-macros,

  xorg-server,

  xorgproto,

  libpciaccess,

  nix-update-script,

}:

stdenv.mkDerivation (finalAttrs: {

  pname = "xf86-video-geode";

  version = "2.18.1";



  src = fetchFromGitLab {

    domain = "gitlab.freedesktop.org";

    group = "xorg";

    owner = "driver";

    repo = "xf86-video-geode";

    tag = "xf86-video-geode-${finalAttrs.version}";

    hash = "sha256-y9fQpMg6qKjaQvDfqYbWscFomtzmHQ1cvzMaa4anhOE=";

  };



  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-geode-(.*)" ]; };

  };



  meta = {

    description = "AMD Geode GX and LX graphics driver for the Xorg X server";

    homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode";

    license = with lib.licenses; [

      x11

      x11BsdClause

    ];

    maintainers = [ ];

    platforms = lib.platforms.unix;

    badPlatforms = lib.platforms.aarch64;

  };

})

pkgs/servers/x11/xorg/default.nix

+2 −38
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ 
  xf86-input-vmmouse,

  xf86-input-void,

  xf86-video-ark,

  xf86-video-geode,

  xfd,

  xfontsel,

  xfs,
@@ -344,6 +345,7 @@ self: with self; { 
  xf86inputvmmouse = xf86-input-vmmouse;

  xf86inputvoid = xf86-input-void;

  xf86videoark = xf86-video-ark;

  xf86videogeode = xf86-video-geode;

  xkeyboardconfig = xkeyboard-config;

  xorgcffiles = xorg-cf-files;

  xorgdocs = xorg-docs;
@@ -858,44 +860,6 @@ self: with self; { 
    })

  ) { };



  # THIS IS A GENERATED FILE.  DO NOT EDIT!

  xf86videogeode = callPackage (

    {

      stdenv,

      pkg-config,

      fetchurl,

      xorgproto,

      libpciaccess,

      xorgserver,

      testers,

    }:

    stdenv.mkDerivation (finalAttrs: {

      pname = "xf86-video-geode";

      version = "2.18.1";

      builder = ./builder.sh;

      src = fetchurl {

        url = "mirror://xorg/individual/driver/xf86-video-geode-2.18.1.tar.xz";

        sha256 = "0a8c6g3ndzf76rrrm3dwzmndcdy4y2qfai4324sdkmi8k9szicjr";

      };

      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!

  xf86videoi128 = callPackage (

    {

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl

+2 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ print OUT <<EOF; 
  xf86-input-vmmouse,

  xf86-input-void,

  xf86-video-ark,

  xf86-video-geode,

  xfd,

  xfontsel,

  xfs,
@@ -676,6 +677,7 @@ self: with self; { 
  xf86inputvmmouse = xf86-input-vmmouse;

  xf86inputvoid = xf86-input-void;

  xf86videoark = xf86-video-ark;

  xf86videogeode = xf86-video-geode;

  xkeyboardconfig = xkeyboard-config;

  xorgcffiles = xorg-cf-files;

  xorgdocs = xorg-docs;

pkgs/servers/x11/xorg/overrides.nix

+0 −6
Original line number Diff line number Diff line
@@ -120,12 +120,6 @@ self: super: 


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



  xf86videogeode = super.xf86videogeode.overrideAttrs (attrs: {

    meta = attrs.meta // {

      badPlatforms = lib.platforms.aarch64;

    };

  });



  xf86videoi128 = super.xf86videoi128.overrideAttrs (attrs: {

    meta = attrs.meta // {

      badPlatforms = lib.platforms.aarch64;