From eb8105ad019670be5ae05f3872d3ce1bbdf9c722 Mon Sep 17 00:00:00 2001
From: Fedor Pakhomov <pakhfn@gmail.com>
Date: Sat, 7 Mar 2015 01:10:46 +0300
Subject: Separated DDCcontrol-DB declaration from DDCcontrol declaration

---
 pkgs/data/misc/ddccontrol-db/default.nix | 37 ++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/data/misc/ddccontrol-db/default.nix

(limited to 'pkgs/data')

diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix
new file mode 100644
index 0000000000000..199ed5b7eb00d
--- /dev/null
+++ b/pkgs/data/misc/ddccontrol-db/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, fetchurl
+, perl
+, perlPackages
+, libxml2
+, pciutils
+, pkgconfig
+, gtk
+}:
+
+let version = "20061014"; in
+let verName = "${version}"; in
+stdenv.mkDerivation {
+  name = "ddccontrol-db-${verName}";
+  src = fetchurl {
+    url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2";
+    sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3";
+  };
+  buildInputs =
+    [
+      stdenv
+      perl
+      perlPackages.libxml_perl
+      libxml2
+      pciutils
+      pkgconfig
+      gtk
+    ];
+
+  meta = with stdenv.lib; {
+    description = "Monitor database for DDCcontrol";
+    homepage = "http://http://ddccontrol.sourceforge.net/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.pakhfn ];
+  };
+}
\ No newline at end of file
-- 
cgit 1.4.1


From f41f7a0bb9a0ce5f728302f72e3438b7f373d26b Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Mon, 16 Mar 2015 21:27:37 +0100
Subject: ddccontrol*: cleanup

- remove doubled file for ddccontrol-db
- adding stdenv to buildInputs is pointless
- fix doubled http://
- whitespace, etc.
---
 pkgs/data/misc/ddccontrol-db/default.nix     |  5 ++--
 pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 37 ----------------------------
 pkgs/tools/misc/ddccontrol/default.nix       | 15 ++++++-----
 pkgs/top-level/all-packages.nix              |  2 +-
 4 files changed, 10 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/tools/misc/ddccontrol/ddccontrol-db.nix

(limited to 'pkgs/data')

diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix
index 199ed5b7eb00d..3757b10754b2d 100644
--- a/pkgs/data/misc/ddccontrol-db/default.nix
+++ b/pkgs/data/misc/ddccontrol-db/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
   };
   buildInputs =
     [
-      stdenv
       perl
       perlPackages.libxml_perl
       libxml2
@@ -29,9 +28,9 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Monitor database for DDCcontrol";
-    homepage = "http://http://ddccontrol.sourceforge.net/";
+    homepage = "http://ddccontrol.sourceforge.net/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ stdenv.lib.maintainers.pakhfn ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix
deleted file mode 100644
index 199ed5b7eb00d..0000000000000
--- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv
-, fetchurl
-, perl
-, perlPackages
-, libxml2
-, pciutils
-, pkgconfig
-, gtk
-}:
-
-let version = "20061014"; in
-let verName = "${version}"; in
-stdenv.mkDerivation {
-  name = "ddccontrol-db-${verName}";
-  src = fetchurl {
-    url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2";
-    sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3";
-  };
-  buildInputs =
-    [
-      stdenv
-      perl
-      perlPackages.libxml_perl
-      libxml2
-      pciutils
-      pkgconfig
-      gtk
-    ];
-
-  meta = with stdenv.lib; {
-    description = "Monitor database for DDCcontrol";
-    homepage = "http://http://ddccontrol.sourceforge.net/";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.pakhfn ];
-  };
-}
\ No newline at end of file
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index 3da2a14f4c7d3..2d5d10054b5b9 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -14,15 +14,14 @@
 }:
 
 let version = "0.4.2"; in
-let verName = "${version}"; in
 stdenv.mkDerivation {
-  name = "ddccontrol-${verName}";
+  name = "ddccontrol-${version}";
   src = fetchurl {
     url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2";
     sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
   };
   buildInputs =
-    [ stdenv
+    [
       intltool
       libtool
       autoconf
@@ -35,25 +34,25 @@ stdenv.mkDerivation {
       gtk
       ddccontrol-db
     ];
-	   
+
   prePatch = ''
       newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g")
       mv configure.ac configure.ac.old
       oldPath="\$"
       oldPath+="{datadir}\/ddccontrol-db"
       sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac
-      rm configure.ac.old 
+      rm configure.ac.old
   '';
   preConfigure = ''
       autoreconf --install
   '';
-   
+
   meta = with stdenv.lib; {
     description = "A program used to control monitor parameters by software";
-    homepage = "http://http://ddccontrol.sourceforge.net/";
+    homepage = "http://ddccontrol.sourceforge.net/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ stdenv.lib.maintainers.pakhfn ];
   };
 }
-	 
\ No newline at end of file
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfbef1ac00676..8df7d40e0c814 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1010,7 +1010,7 @@ let
   ddccontrol = callPackage ../tools/misc/ddccontrol { };
 
   ddccontrol-db = callPackage ../data/misc/ddccontrol-db { };
-  
+
   ddclient = callPackage ../tools/networking/ddclient { };
 
   dd_rescue = callPackage ../tools/system/dd_rescue { };
-- 
cgit 1.4.1