diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-02 21:08:27 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-02 21:08:27 +0100 |
commit | 092e3b50a8ff501a6ad1caf20165d2284d1ad5cb (patch) | |
tree | 6de2bf3a88d2fcf4d947312ccfabebcf5651dbed /pkgs/tools/system | |
parent | 070290bda7972072a531c7e79a29bd005ebb84df (diff) | |
parent | 82f679c269e504d00b02ef79a88934de7165dc8c (diff) | |
download | nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.gz nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.bz2 nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.lz nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.xz nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.tar.zst nixlib-092e3b50a8ff501a6ad1caf20165d2284d1ad5cb.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/smartmontools/default.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index e8fbe90acde7..6c26855b9561 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -2,13 +2,13 @@ , IOKit ? null , ApplicationServices ? null }: let - version = "6.6"; + version = "7.0"; - dbrev = "4852"; + dbrev = "4883"; drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; driverdb = fetchurl { url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "15gbwiw38yzl3cdvys6r7wknv5zdycm7zbswa2p9vzxlc8s63rlr"; + sha256 = "07x3haz65jyhj579h4z17v6jkw6bbyid34442gl4qddmgv2qzvwx"; name = "smartmontools-drivedb.h"; }; @@ -17,17 +17,10 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "0m1hllbb78rr6cxkbalmz1gqkl0psgq8rrmv4gwcmz34n07kvx2i"; + sha256 = "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5"; }; - patches = [ ./smartmontools.patch ] - # https://www.smartmontools.org/changeset/4603 - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "musl-canonicalize_file_name.patch"; - url = "https://www.smartmontools.org/changeset/4603?format=diff&new=4603"; - sha256 = "06s9pcd95snjkrbfrsjby2lln3lnwjd21bgabmvr4p7fx19b75zp"; - stripLen = 2; - }); + patches = [ ./smartmontools.patch ]; postPatch = "cp -v ${driverdb} drivedb.h"; nativeBuildInputs = [ autoreconfHook ]; |