From 9dcb0c5ddae42f90eaff1381b9131f71a462332c Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 23 Sep 2024 20:37:07 +0200 Subject: [PATCH 1/2] drm_info: move to by-name, adopt, format --- pkgs/by-name/dr/drm_info/package.nix | 29 +++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/dr/drm_info/package.nix b/pkgs/by-name/dr/drm_info/package.nix index e14437b08b24..907a408b808b 100644 --- a/pkgs/by-name/dr/drm_info/package.nix +++ b/pkgs/by-name/dr/drm_info/package.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchFromGitHub -, libdrm, json_c, pciutils -, meson, ninja, pkg-config +{ + lib, + stdenv, + fetchFromGitHub, + libdrm, + json_c, + pciutils, + meson, + ninja, + pkg-config, }: stdenv.mkDerivation rec { @@ -14,15 +21,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-UTDYLe3QezPCyG9CIp+O+KX716JDTL9mn+OEjjyTwlg="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ libdrm json_c pciutils ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + buildInputs = [ + libdrm + json_c + pciutils + ]; meta = with lib; { description = "Small utility to dump info about DRM devices"; mainProgram = "drm_info"; homepage = "https://github.com/ascent12/drm_info"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kiskae ]; platforms = platforms.linux; }; } From 54dcafdd31156931b09e37765444410bc7e46a20 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 23 Sep 2024 20:44:22 +0200 Subject: [PATCH 2/2] drm_info: 2.3.0 -> 2.7.0 --- pkgs/by-name/dr/drm_info/package.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/dr/drm_info/package.nix b/pkgs/by-name/dr/drm_info/package.nix index 907a408b808b..b1b68fff4cf0 100644 --- a/pkgs/by-name/dr/drm_info/package.nix +++ b/pkgs/by-name/dr/drm_info/package.nix @@ -1,43 +1,52 @@ { lib, stdenv, - fetchFromGitHub, + fetchFromGitLab, libdrm, json_c, pciutils, meson, ninja, pkg-config, + scdoc, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "drm_info"; - version = "2.3.0"; + version = "2.7.0"; - src = fetchFromGitHub { - owner = "ascent12"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; repo = "drm_info"; - rev = "v${version}"; - sha256 = "sha256-UTDYLe3QezPCyG9CIp+O+KX716JDTL9mn+OEjjyTwlg="; + rev = "v${finalAttrs.version}"; + hash = "sha256-pgYhZtmyhuhxBiiTRdrEp/YsuwrD6KK/ahfO2L3mfM8="; }; nativeBuildInputs = [ meson ninja pkg-config + scdoc ]; + buildInputs = [ libdrm json_c pciutils ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Small utility to dump info about DRM devices"; mainProgram = "drm_info"; - homepage = "https://github.com/ascent12/drm_info"; + homepage = "https://gitlab.freedesktop.org/emersion/drm_info"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kiskae ]; platforms = platforms.linux; }; -} +})