about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/lm-sensors/default.nix
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2018-12-01 10:02:49 -0600
committerRenaud <c0bw3b@users.noreply.github.com>2018-12-01 17:02:49 +0100
commit60b743853ba8abe4ad775f4b042961241eaf5761 (patch)
treec0470a85842be595f233ef3b0626a8bc58f8fade /pkgs/os-specific/linux/lm-sensors/default.nix
parent947be9e99238b959361e0bd49648a8d386408e9d (diff)
downloadnixlib-60b743853ba8abe4ad775f4b042961241eaf5761.tar
nixlib-60b743853ba8abe4ad775f4b042961241eaf5761.tar.gz
nixlib-60b743853ba8abe4ad775f4b042961241eaf5761.tar.bz2
nixlib-60b743853ba8abe4ad775f4b042961241eaf5761.tar.lz
nixlib-60b743853ba8abe4ad775f4b042961241eaf5761.tar.xz
nixlib-60b743853ba8abe4ad775f4b042961241eaf5761.tar.zst
nixlib-60b743853ba8abe4ad775f4b042961241eaf5761.zip
lm_sensors: 3.4.0 -> 3.5.0
* lm_sensors: 3.4.0 -> 3.5.0 (#51117)

Using releases posted on github,
they work and I'm not sure how those fedora URL's are found anyway.

* lm_sensors: cleanup
Diffstat (limited to 'pkgs/os-specific/linux/lm-sensors/default.nix')
-rw-r--r--pkgs/os-specific/linux/lm-sensors/default.nix24
1 files changed, 9 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix
index 04ce60c87b04..0536ba064a3d 100644
--- a/pkgs/os-specific/linux/lm-sensors/default.nix
+++ b/pkgs/os-specific/linux/lm-sensors/default.nix
@@ -1,28 +1,22 @@
-{ sensord ? false,
-  stdenv, fetchurl, bison, flex, which, perl,
-  rrdtool ? null
+{ stdenv, fetchzip, bison, flex, which, perl
+, sensord ? false, rrdtool ? null
 }:
 
 assert sensord -> rrdtool != null;
 
 stdenv.mkDerivation rec {
   name = "lm-sensors-${version}";
-  version = "3.4.0"; # don't forget to tweak fedoraproject mirror URL hash
+  version = "3.5.0";
 
-  src = fetchurl {
-    urls = [
-      # "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" # dead
-      # https://github.com/lm-sensors/lm-sensors/releases/... # only generated tarballs
-      "https://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2"
-    ];
-    sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0";
+  src = fetchzip {
+    url = "https://github.com/lm-sensors/lm-sensors/archive/V${stdenv.lib.replaceStrings ["."] ["-"] version}.tar.gz";
+    sha256 = "1mdrnb9r01z1xfdm6dpkywvf9yy9a4yzb59paih9sijwmigv19fj";
   };
 
-  buildInputs = [ bison flex which perl ]
+  nativeBuildInputs = [ bison flex which ];
+  buildInputs = [ perl ]
    ++ stdenv.lib.optional sensord rrdtool;
 
-  patches = [ ./musl-fix-includes.patch ];
-
   preBuild = ''
     makeFlagsArray=(PREFIX=$out ETCDIR=$out/etc
     ${stdenv.lib.optionalString sensord "PROG_EXTRA=sensord"})
@@ -31,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://hwmon.wiki.kernel.org/lm_sensors;
     description = "Tools for reading hardware sensors";
-    license = with licenses; [ gpl2 lgpl21 ];
+    license = with licenses; [ gpl2Plus lgpl21Plus ];
     platforms = platforms.linux;
   };
 }