Merge #6472: add ddccontrol

lib/maintainers.nix

@@ -142,6 +142,7 @@
   orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
   page = "Carles Pagès <page@cubata.homelinux.net>";
   paholg = "Paho Lurie-Gregg <paho@paholg.com>";
+  pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   phausmann = "Philipp Hausmann <nix@314.ch>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";

pkgs/data/misc/ddccontrol-db/default.nix

@@ -0,0 +1,36 @@
+{ 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 =
+    [
+      perl
+      perlPackages.libxml_perl
+      libxml2
+      pciutils
+      pkgconfig
+      gtk
+    ];
+
+  meta = with stdenv.lib; {
+    description = "Monitor database for DDCcontrol";
+    homepage = "http://ddccontrol.sourceforge.net/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.pakhfn ];
+  };
+}

pkgs/development/tools/misc/automake/automake-1.10.x.nix

@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, perl, autoconf, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "automake-1.10.3";
+
+  # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is
+  # available upstream; see
+  # <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9026>.
+  builder = ./builder.sh;
+
+  setupHook = ./setup-hook.sh;
+
+  src = fetchurl {
+    url = "mirror://gnu/automake/${name}.tar.gz";
+    sha256 = "fda9b22ec8705780c8292510b3376bb45977f45a4f7eb3578c5ad126d7758028";
+  };
+
+  buildInputs = [perl autoconf makeWrapper];
+
+  # Disable indented log output from Make, otherwise "make.test" will
+  # fail.
+  preCheck = "unset NIX_INDENT_MAKE";
+
+  # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
+  # "fixed" path in generated files!
+  dontPatchShebangs = true;
+
+  # Run the test suite in parallel.
+  enableParallelBuilding = true;
+
+  meta = {
+    branch = "1.10";
+    homepage = http://www.gnu.org/software/automake/;
+    description = "GNU standard-compliant makefile generator";
+
+    longDescription = ''
+      GNU Automake is a tool for automatically generating
+      `Makefile.in' files compliant with the GNU Coding
+      Standards.  Automake requires the use of Autoconf.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    maintainers = [ ];
+  };
+}

pkgs/tools/misc/ddccontrol/default.nix

@@ -0,0 +1,58 @@
+{ stdenv
+, fetchurl
+, intltool
+, libtool
+, autoconf
+, automake110x
+, perl
+, perlPackages
+, libxml2
+, pciutils
+, pkgconfig
+, gtk
+, ddccontrol-db
+}:
+
+let version = "0.4.2"; in
+stdenv.mkDerivation {
+  name = "ddccontrol-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2";
+    sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
+  };
+  buildInputs =
+    [
+      intltool
+      libtool
+      autoconf
+      automake110x
+      perl
+      perlPackages.libxml_perl
+      libxml2
+      pciutils
+      pkgconfig
+      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
+  '';
+  preConfigure = ''
+      autoreconf --install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A program used to control monitor parameters by software";
+    homepage = "http://ddccontrol.sourceforge.net/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.pakhfn ];
+  };
+}
+

pkgs/top-level/all-packages.nix

@@ -1084,6 +1084,10 @@ let
 
   detox = callPackage ../tools/misc/detox { };
 
+  ddccontrol = callPackage ../tools/misc/ddccontrol { };
+
+  ddccontrol-db = callPackage ../data/misc/ddccontrol-db { };
+
   ddclient = callPackage ../tools/networking/ddclient { };
 
   dd_rescue = callPackage ../tools/system/dd_rescue { };
@@ -4762,6 +4766,8 @@ let
 
   automake = automake114x;
 
+  automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { };
+
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
 
   automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { };