summary refs log tree commit diff
path: root/pkgs/os-specific/linux/hwdata
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-08-09 18:28:15 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-08-09 18:28:15 +0200
commitd9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch)
tree82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/os-specific/linux/hwdata
parent8b834605628fabd43b1b26a1724fb22c83150e2d (diff)
parent8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff)
downloadnixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst
nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip
Merge master into staging
Diffstat (limited to 'pkgs/os-specific/linux/hwdata')
-rw-r--r--pkgs/os-specific/linux/hwdata/default.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 2b296ebabca..f5f73255d29 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "hwdata-${version}";
   version = "0.313";
 
-  src = fetchurl {
-    url = "https://github.com/vcrhonek/hwdata/archive/v0.313.tar.gz";
-    sha256 = "0x0qk2cim1mv8cl8h8rwqn8mbbs43j04rn06m81b531i182zii17";
+  src = fetchFromGitHub {
+    owner = "vcrhonek";
+    repo = "hwdata";
+    rev = "v${version}";
+    sha256 = "1mmqiy4ams14mdiakz60dm07wfan343hisiiz0dwvh685mjxap8h";
   };
 
   preConfigure = "patchShebangs ./configure";
@@ -15,6 +17,10 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
 
+  outputHashMode = "recursive";
+  outputHashAlgo = "sha256";
+  outputHash = "0lz8pykpfw6aqkpdaqdc3jnny1iqgsqnc0wm61784xxml7zqfdvx";
+
   meta = {
     homepage = https://github.com/vcrhonek/hwdata;
     description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards";