Commit 26093580 authored by Bob van der Linden's avatar Bob van der Linden Committed by Jörg Thalheim
Browse files

hwinfo: 23.5 -> 25.0 

This upgrades hwinfo from 23.5 to 25.0. This includes a change to
Makefile which introduces INSTALL_PREFIX, which defaults to /usr.
Instead of replacing /usr we can now use an empty INSTALL_PREFIX.
parent cb82756e

pkgs/by-name/hw/hwinfo/package.nix

+7 −5
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "hwinfo";

  version = "23.5";

  version = "25.0";



  src = fetchFromGitHub {

    owner = "opensuse";

    repo = "hwinfo";

    rev = finalAttrs.version;

    hash = "sha256-OweEFxNxQpD7blHywhmHTA66vsYG+Qvsufm3huyUhi0=";

    hash = "sha256-8C+FM4UAn219ZQzPxk2IfK6ZKmTZNweo4oCoSYeZJ6A=";

  };



  nativeBuildInputs = [
@@ -49,8 +49,7 @@ stdenv.mkDerivation (finalAttrs: { 


    # Replace /usr paths with Nix store paths

    substituteInPlace Makefile \

      --replace-fail "/sbin" "/bin" \

      --replace-fail "/usr/" "/"

      --replace-fail "/sbin" "/bin"

    substituteInPlace src/isdn/cdb/Makefile \

      --replace-fail "lex isdn_cdb.lex" "flex isdn_cdb.lex"

    substituteInPlace hwinfo.pc.in \
@@ -99,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: { 
    "CC=${stdenv.cc.targetPrefix}cc"

    "ARCH=${stdenv.hostPlatform.uname.processor}"

  ];

  installFlags = [ "DESTDIR=$(out)" ];

  installFlags = [

    "INSTALL_PREFIX="

    "DESTDIR=$(out)"

  ];



  enableParallelBuilding = false; # broken parallel dependencies

pkgs/by-name/ni/nixos-facter/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ let 
    src = fetchFromGitHub {

      owner = "numtide";

      repo = "hwinfo";

      rev = "c2259845d10694c099fb306a8cfc5a403e71c708";

      hash = "sha256-RGIoJkYiNMRHwUclzdRMELxCgBU9Pfvaghvt3op0zM0=";

      rev = "bfeab0b4e38b200c7a62a44d4d01601a86fe1091";

      hash = "sha256-GL3fNCSaU45fNihEksgtPtbuLkc+tVGXtPH05wbrHwI=";

    };

  };

in