ddccontrol*: cleanup

- remove doubled file for ddccontrol-db
- adding stdenv to buildInputs is pointless
- fix doubled http://
- whitespace, etc.

+10 -49
+2 -3
pkgs/data/misc/ddccontrol-db/default.nix
··· 18 }; 19 buildInputs = 20 [ 21 - stdenv 22 perl 23 perlPackages.libxml_perl 24 libxml2 ··· 29 30 meta = with stdenv.lib; { 31 description = "Monitor database for DDCcontrol"; 32 - homepage = "http://http://ddccontrol.sourceforge.net/"; 33 license = licenses.gpl2; 34 platforms = platforms.linux; 35 maintainers = [ stdenv.lib.maintainers.pakhfn ]; 36 }; 37 - }
··· 18 }; 19 buildInputs = 20 [ 21 perl 22 perlPackages.libxml_perl 23 libxml2 ··· 28 29 meta = with stdenv.lib; { 30 description = "Monitor database for DDCcontrol"; 31 + homepage = "http://ddccontrol.sourceforge.net/"; 32 license = licenses.gpl2; 33 platforms = platforms.linux; 34 maintainers = [ stdenv.lib.maintainers.pakhfn ]; 35 }; 36 + }
-37
pkgs/tools/misc/ddccontrol/ddccontrol-db.nix
··· 1 - { stdenv 2 - , fetchurl 3 - , perl 4 - , perlPackages 5 - , libxml2 6 - , pciutils 7 - , pkgconfig 8 - , gtk 9 - }: 10 - 11 - let version = "20061014"; in 12 - let verName = "${version}"; in 13 - stdenv.mkDerivation { 14 - name = "ddccontrol-db-${verName}"; 15 - src = fetchurl { 16 - url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; 17 - sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; 18 - }; 19 - buildInputs = 20 - [ 21 - stdenv 22 - perl 23 - perlPackages.libxml_perl 24 - libxml2 25 - pciutils 26 - pkgconfig 27 - gtk 28 - ]; 29 - 30 - meta = with stdenv.lib; { 31 - description = "Monitor database for DDCcontrol"; 32 - homepage = "http://http://ddccontrol.sourceforge.net/"; 33 - license = licenses.gpl2; 34 - platforms = platforms.linux; 35 - maintainers = [ stdenv.lib.maintainers.pakhfn ]; 36 - }; 37 - }
···
+7 -8
pkgs/tools/misc/ddccontrol/default.nix
··· 14 }: 15 16 let version = "0.4.2"; in 17 - let verName = "${version}"; in 18 stdenv.mkDerivation { 19 - name = "ddccontrol-${verName}"; 20 src = fetchurl { 21 url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; 22 sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; 23 }; 24 buildInputs = 25 - [ stdenv 26 intltool 27 libtool 28 autoconf ··· 35 gtk 36 ddccontrol-db 37 ]; 38 - 39 prePatch = '' 40 newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") 41 mv configure.ac configure.ac.old 42 oldPath="\$" 43 oldPath+="{datadir}\/ddccontrol-db" 44 sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac 45 - rm configure.ac.old 46 ''; 47 preConfigure = '' 48 autoreconf --install 49 ''; 50 - 51 meta = with stdenv.lib; { 52 description = "A program used to control monitor parameters by software"; 53 - homepage = "http://http://ddccontrol.sourceforge.net/"; 54 license = licenses.gpl2; 55 platforms = platforms.linux; 56 maintainers = [ stdenv.lib.maintainers.pakhfn ]; 57 }; 58 } 59 -
··· 14 }: 15 16 let version = "0.4.2"; in 17 stdenv.mkDerivation { 18 + name = "ddccontrol-${version}"; 19 src = fetchurl { 20 url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; 21 sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; 22 }; 23 buildInputs = 24 + [ 25 intltool 26 libtool 27 autoconf ··· 34 gtk 35 ddccontrol-db 36 ]; 37 + 38 prePatch = '' 39 newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") 40 mv configure.ac configure.ac.old 41 oldPath="\$" 42 oldPath+="{datadir}\/ddccontrol-db" 43 sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac 44 + rm configure.ac.old 45 ''; 46 preConfigure = '' 47 autoreconf --install 48 ''; 49 + 50 meta = with stdenv.lib; { 51 description = "A program used to control monitor parameters by software"; 52 + homepage = "http://ddccontrol.sourceforge.net/"; 53 license = licenses.gpl2; 54 platforms = platforms.linux; 55 maintainers = [ stdenv.lib.maintainers.pakhfn ]; 56 }; 57 } 58 +
+1 -1
pkgs/top-level/all-packages.nix
··· 1010 ddccontrol = callPackage ../tools/misc/ddccontrol { }; 1011 1012 ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; 1013 - 1014 ddclient = callPackage ../tools/networking/ddclient { }; 1015 1016 dd_rescue = callPackage ../tools/system/dd_rescue { };
··· 1010 ddccontrol = callPackage ../tools/misc/ddccontrol { }; 1011 1012 ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; 1013 + 1014 ddclient = callPackage ../tools/networking/ddclient { }; 1015 1016 dd_rescue = callPackage ../tools/system/dd_rescue { };