Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4a2475c924bf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5d1910c83c27
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 25, 2019

  1. lm_sensors: 3.5.0 -> 3.6.0 (#71668)

    * lm_sensors: 3.5.0 -> 3.6.0
    
    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/lm-sensors/versions
    
    * lm-sensors: proper makeFlags array
    r-ryantm authored and c0bw3b committed Oct 25, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    gregberge Greg Bergé
    Copy the full SHA
    5d1910c View commit details
Showing with 9 additions and 9 deletions.
  1. +9 −9 pkgs/os-specific/linux/lm-sensors/default.nix
18 changes: 9 additions & 9 deletions pkgs/os-specific/linux/lm-sensors/default.nix
Original file line number Diff line number Diff line change
@@ -6,26 +6,26 @@ assert sensord -> rrdtool != null;

stdenv.mkDerivation rec {
pname = "lm-sensors";
version = "3.5.0";
version = "3.6.0";
dashedVersion = stdenv.lib.replaceStrings ["."] ["-"] version;

src = fetchzip {
url = "https://github.com/lm-sensors/lm-sensors/archive/V${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz";
sha256 = "1mdrnb9r01z1xfdm6dpkywvf9yy9a4yzb59paih9sijwmigv19fj";
url = "https://github.com/lm-sensors/lm-sensors/archive/V${dashedVersion}.tar.gz";
sha256 = "1ipf6wjx037sqyhy0r5jh4983h216anq9l68ckn2x5c3qc4wfmzn";
};

nativeBuildInputs = [ bison flex which ];
buildInputs = [ perl ]
++ stdenv.lib.optional sensord rrdtool;

preBuild = ''
makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc
${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"})
'';
makeFlags = [ "PREFIX=${placeholder "out"}" "ETCDIR=${placeholder "out"}/etc" ]
++ stdenv.lib.optional sensord "PROG_EXTRA=sensord";

meta = with stdenv.lib; {
homepage = https://hwmon.wiki.kernel.org/lm_sensors;
homepage = "https://hwmon.wiki.kernel.org/lm_sensors";
changelog = "https://raw.githubusercontent.com/lm-sensors/lm-sensors/V${dashedVersion}/CHANGES";
description = "Tools for reading hardware sensors";
license = with licenses; [ gpl2Plus lgpl21Plus ];
license = with licenses; [ lgpl21Plus gpl2Plus ];
platforms = platforms.linux;
};
}