dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #279592 from thiagokokada/bump-lshw

Browse Source 
lshw: unstable-2023-03-20 -> 02.20
This commit is contained in:
Thiago Kenji Okada 2024-01-08 19:17:36 +00:00 committed by GitHub
commit f0fea03d0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/system/lshw/default.nix → pkgs/by-name/ls/lshw/package.nix
View File

@ -2,7 +2,7 @@
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, hwdata , hwdata
, gtk2 , gtk3
, pkg-config , pkg-config
, gettext , gettext
, sqlite # compile GUI , sqlite # compile GUI
@ -11,24 +11,22 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lshw"; pname = "lshw";
# FIXME: when switching to a stable release:
# Fix repology.org by not including the prefixed B, otherwise the `pname` attr # Fix repology.org by not including the prefixed B, otherwise the `pname` attr
# gets filled as `lshw-B.XX.XX` in `nix-env --query --available --attr nixpkgs.lshw --meta` # gets filled as `lshw-B.XX.XX` in `nix-env --query --available --attr nixpkgs.lshw --meta`
# See https://github.com/NixOS/nix/pull/4463 for a definitive fix # See https://github.com/NixOS/nix/pull/4463 for a definitive fix
version = "unstable-2023-03-20"; version = "02.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lyonel"; owner = "lyonel";
repo = pname; repo = pname;
rev = "b4e067307906ec6f277cce5c8a882f5edd03cbbc"; rev = "B.${version}";
#rev = "B.${version}"; hash = "sha256-4etC7ymMgn1Q4f98DNASv8vn0AT55dYPdacZo6GRDw0=";
sha256 = "sha256-ahdaQeYZEFCVxwAMJPMB9bfo3ndIiqFyM6OghXwtm1A=";
}; };
nativeBuildInputs = [ pkg-config gettext ]; nativeBuildInputs = [ pkg-config gettext ];
buildInputs = [ hwdata ] buildInputs = [ hwdata ]
++ lib.optionals withGUI [ gtk2 sqlite ]; ++ lib.optionals withGUI [ gtk3 sqlite ];
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
@ -44,11 +42,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
homepage = "https://ezix.org/project/wiki/HardwareLiSter";
description = "Provide detailed information on the hardware configuration of the machine"; description = "Provide detailed information on the hardware configuration of the machine";
homepage = "https://ezix.org/project/wiki/HardwareLiSter";
license = licenses.gpl2; license = licenses.gpl2;
mainProgram = "lshw";
maintainers = with maintainers; [ thiagokokada ]; maintainers = with maintainers; [ thiagokokada ];
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "lshw";
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -10680,8 +10680,6 @@ with pkgs;
# former a lower priority than Nettle. # former a lower priority than Nettle.
lsh = lowPrio (callPackage ../tools/networking/lsh { }); lsh = lowPrio (callPackage ../tools/networking/lsh { });
lshw = callPackage ../tools/system/lshw { };
lunatic = callPackage ../development/interpreters/lunatic { }; lunatic = callPackage ../development/interpreters/lunatic { };
lux = callPackage ../tools/video/lux { }; lux = callPackage ../tools/video/lux { };