From c7ae9e39d9064a098787e9fa43d4e2bff8da3027 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Nov 2013 01:15:47 -0600 Subject: [PATCH] Upgrade hwdata from 0.172 -> 0.249 --- pkgs/os-specific/linux/hwdata/builder.sh | 5 ----- pkgs/os-specific/linux/hwdata/default.nix | 19 +++++++++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 pkgs/os-specific/linux/hwdata/builder.sh diff --git a/pkgs/os-specific/linux/hwdata/builder.sh b/pkgs/os-specific/linux/hwdata/builder.sh deleted file mode 100644 index 50d11477324..00000000000 --- a/pkgs/os-specific/linux/hwdata/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -export DESTDIR=$out - -genericBuild diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 4c0a46f460c..e701c91019d 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -1,10 +1,21 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "hwdata-0.172"; - builder = ./builder.sh; + name = "hwdata-0.249"; + src = fetchurl { - url = ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/h/hwdata/hwdata_0.172.orig.tar.gz; - md5 = "1c6b7f4dfe489f881702176c5f8e5a2e"; + url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-0.249-1.tar.bz2"; + sha256 = "1ak3h3psg3wk9yk0dqnzdzik3jadzja3ah22vjfmf71p3b5xc8ai"; + }; + + preConfigure = "patchShebangs ./configure"; + + configureFlags = "--datadir=$(prefix)/data"; + + meta = { + homepage = "https://fedorahosted.org/hwdata/"; + description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; }; }