From 0738edc1fd8c0ed48ca67c5a69f545b5570d1206 Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 00:49:31 +0300 Subject: [PATCH 1/6] added ddccontrol package --- .../tools/misc/automake/automake-1.10.x.nix | 46 +++++++++++++++++++ pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 17 +++++++ pkgs/tools/misc/ddccontrol/default.nix | 31 +++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 4 files changed, 100 insertions(+) create mode 100644 pkgs/development/tools/misc/automake/automake-1.10.x.nix create mode 100644 pkgs/tools/misc/ddccontrol/ddccontrol-db.nix create mode 100644 pkgs/tools/misc/ddccontrol/default.nix diff --git a/pkgs/development/tools/misc/automake/automake-1.10.x.nix b/pkgs/development/tools/misc/automake/automake-1.10.x.nix new file mode 100644 index 00000000000..a06426e9cf4 --- /dev/null +++ b/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 + # . + 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 = [ ]; + }; +} diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix new file mode 100644 index 00000000000..0835e97c5a7 --- /dev/null +++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix @@ -0,0 +1,17 @@ +{ 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"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix new file mode 100644 index 00000000000..417a118a47a --- /dev/null +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, intltool, libtool, autoconf, automake110x, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk, ddccontrol-db }: +let version = "0.4.2"; in +let verName = "${version}"; in +stdenv.mkDerivation { + name = "ddccontrol-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; + sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + }; + buildInputs = + [ stdenv intltool libtool autoconf automake110x perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ddccontrol-db]; + + prePatch = '' + npath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") + mv configure.ac configure.ac.old + opath="\$" + opath+="{datadir}\/ddccontrol-db" + sed "s/$opath/$npath/" configure.ac + rm configure.ac.old + ''; + preConfigure = '' + autoreconf --install + ''; + + meta = with stdenv.lib; { + description = "A program used to control monitor parameters by software"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} + \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08a6ba9e5f8..ba83f98ca0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1007,6 +1007,10 @@ let detox = callPackage ../tools/misc/detox { }; + ddccontrol = callPackage ../tools/misc/ddccontrol { }; + + ddccontrol-db = callPackage ../tools/misc/ddccontrol/ddccontrol-db.nix { }; + ddclient = callPackage ../tools/networking/ddclient { }; dd_rescue = callPackage ../tools/system/dd_rescue { }; @@ -4528,6 +4532,8 @@ let automake = automake112x; + 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 { }; From 4e926e50da81c990ef4635b6ef5ee9b0ba5df88c Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 16:26:29 +0300 Subject: [PATCH 2/6] Stylistical changes for ddccontrol --- pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 44 +++++++++---- pkgs/tools/misc/ddccontrol/default.nix | 68 ++++++++++++++------ 2 files changed, 78 insertions(+), 34 deletions(-) diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix index 0835e97c5a7..66a9a5024c0 100644 --- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix +++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix @@ -1,17 +1,35 @@ -{ stdenv, fetchurl, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk }: +{ 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"; - license = licenses.gpl2; - platforms = platforms.linux; - }; + 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"; + license = licenses.gpl2; + platforms = platforms.linux; + }; } \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 417a118a47a..80d925cf0f9 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,31 +1,57 @@ -{ stdenv, fetchurl, intltool, libtool, autoconf, automake110x, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk, ddccontrol-db }: +{ stdenv +, fetchurl +, intltool +, libtool +, autoconf +, automake110x +, perl +, perlPackages +, libxml2 +, pciutils +, pkgconfig +, gtk +, ddccontrol-db +}: + let version = "0.4.2"; in let verName = "${version}"; in stdenv.mkDerivation { - name = "ddccontrol-${verName}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; - sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; - }; - buildInputs = - [ stdenv intltool libtool autoconf automake110x perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ddccontrol-db]; + name = "ddccontrol-${verName}"; + src = fetchurl { + url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; + sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + }; + buildInputs = + [ stdenv + intltool + libtool + autoconf + automake110x + perl + perlPackages.libxml_perl + libxml2 + pciutils + pkgconfig + gtk + ddccontrol-db + ]; - prePatch = '' - npath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") + prePatch = '' + newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") mv configure.ac configure.ac.old - opath="\$" - opath+="{datadir}\/ddccontrol-db" - sed "s/$opath/$npath/" configure.ac + oldPath="\$" + oldPath+="{datadir}\/ddccontrol-db" + sed "s/$oldPath/$newPath/" configure.ac rm configure.ac.old - ''; - preConfigure = '' + ''; + preConfigure = '' autoreconf --install - ''; + ''; - meta = with stdenv.lib; { - description = "A program used to control monitor parameters by software"; - license = licenses.gpl2; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "A program used to control monitor parameters by software"; + license = licenses.gpl2; + platforms = platforms.linux; + }; } \ No newline at end of file From 0baa4eba330a12172eab602d3d20c2ffc367d693 Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 16:53:16 +0300 Subject: [PATCH 3/6] Changes in meta for ddccontrol --- pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 2 ++ pkgs/tools/misc/ddccontrol/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix index 66a9a5024c0..199ed5b7eb0 100644 --- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix +++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix @@ -29,7 +29,9 @@ stdenv.mkDerivation { 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 80d925cf0f9..3da2a14f4c7 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -50,8 +50,10 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; + homepage = "http://http://ddccontrol.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } \ No newline at end of file From b85beb6984618c6c04099cc0fe32a4196422645c Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Fri, 20 Feb 2015 16:57:10 +0300 Subject: [PATCH 4/6] Added a maintainer --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4621e719cfd..591349a6118 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -130,6 +130,7 @@ orbitz = "Malcolm Matalka "; page = "Carles Pagès "; paholg = "Paho Lurie-Gregg "; + pakhfn = "Fedor Pakhomov "; pashev = "Igor Pashev "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; From eb8105ad019670be5ae05f3872d3ce1bbdf9c722 Mon Sep 17 00:00:00 2001 From: Fedor Pakhomov Date: Sat, 7 Mar 2015 01:10:46 +0300 Subject: [PATCH 5/6] Separated DDCcontrol-DB declaration from DDCcontrol declaration --- pkgs/data/misc/ddccontrol-db/default.nix | 37 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/data/misc/ddccontrol-db/default.nix diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix new file mode 100644 index 00000000000..199ed5b7eb0 --- /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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba83f98ca0b..cfbef1ac006 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1009,7 +1009,7 @@ let ddccontrol = callPackage ../tools/misc/ddccontrol { }; - ddccontrol-db = callPackage ../tools/misc/ddccontrol/ddccontrol-db.nix { }; + ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; ddclient = callPackage ../tools/networking/ddclient { }; From f41f7a0bb9a0ce5f728302f72e3438b7f373d26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 Mar 2015 21:27:37 +0100 Subject: [PATCH 6/6] 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 diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 199ed5b7eb0..3757b10754b 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 199ed5b7eb0..00000000000 --- 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 3da2a14f4c7..2d5d10054b5 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 - 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 cfbef1ac006..8df7d40e0c8 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 { };