Commit d0ff9e41 authored by Guy Chronister's avatar Guy Chronister
Browse files

tclPackages.*: refactor to modern conventions 

  - Remove 'with lib;' from meta blocks and use qualified lib attributes
  - Replace deprecated 'sha256' with 'hash' for fetchurl and fetchFromGitHub
  - Replace 'rev' with 'tag' when using version tags in fetchFromGitHub
  - Update substituteInPlace to use --replace-fail for better error detection
parent 9077cf6d

pkgs/development/tcl-modules/by-name/ex/expect/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ tcl.mkTclDerivation rec { 
    "dev"

  ];



  meta = with lib; {

  meta = {

    description = "Tool for automating interactive applications";

    homepage = "https://expect.sourceforge.net/";

    license = licenses.publicDomain;

    platforms = platforms.unix;

    license = lib.licenses.publicDomain;

    platforms = lib.platforms.unix;

    mainProgram = "expect";

    maintainers = with maintainers; [ SuperSandro2000 ];

    maintainers = with lib.maintainers; [ SuperSandro2000 ];

  };

}

pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix

+6 −6
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ mkTclDerivation rec { 


  src = fetchurl {

    url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl${version}.tar.gz";

    sha256 = "sha256-idOs2GXP3ZY7ECtF+K9hg5REyK6sQ0qk+666gUQPjCY=";

    hash = "sha256-idOs2GXP3ZY7ECtF+K9hg5REyK6sQ0qk+666gUQPjCY=";

  };



  enableParallelBuilding = true;



  patchPhase = ''

    substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include"

    substituteInPlace configure --replace-fail "\''${TCL_SRC_DIR}/generic" "${tcl}/include"

  '';



  postInstall = ''
@@ -40,11 +40,11 @@ mkTclDerivation rec { 
    "man"

  ];



  meta = with lib; {

  meta = {

    homepage = "https://incrtcl.sourceforge.net/";

    description = "Object Oriented Enhancements for Tcl/Tk";

    license = licenses.tcltk;

    platforms = platforms.unix;

    maintainers = with maintainers; [ thoughtpolice ];

    license = lib.licenses.tcltk;

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [ thoughtpolice ];

  };

}

pkgs/development/tcl-modules/by-name/it/itktcl/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ mkTclDerivation rec { 


  src = fetchurl {

    url = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itk${version}.tar.gz";

    sha256 = "1iy964jfgsfnc1agk1w6bbm44x18ily8d4wmr7cc9z9f4acn2r6s";

    hash = "sha256-2mRhmSIu/cTYyZWThjyNKHRC6lqGh/lUYNbp5yQxycc=";

  };



  buildInputs = [
@@ -42,11 +42,11 @@ mkTclDerivation rec { 
    "man"

  ];



  meta = with lib; {

  meta = {

    homepage = "https://incrtcl.sourceforge.net/";

    description = "Mega-widget toolkit for incr Tk";

    license = licenses.tcltk;

    platforms = platforms.unix;

    maintainers = with maintainers; [ thoughtpolice ];

    license = lib.licenses.tcltk;

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [ thoughtpolice ];

  };

}

pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix

+6 −6
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ mkTclDerivation rec { 
  src = fetchFromGitHub {

    owner = "ianka";

    repo = "mustache.tcl";

    rev = "v${version}";

    sha256 = "sha256-apM57LEZ0Y9hXcEPWrKYOoTVtP5QSqiaQrjTHQc3pc4=";

    tag = "v${version}";

    hash = "sha256-apM57LEZ0Y9hXcEPWrKYOoTVtP5QSqiaQrjTHQc3pc4=";

  };



  buildInputs = [
@@ -26,11 +26,11 @@ mkTclDerivation rec { 
    cp $src/pkgIndex.tcl $out/lib/mustache-tcl/pkgIndex.tcl

  '';



  meta = with lib; {

  meta = {

    homepage = "https://github.com/ianka/mustache.tcl";

    description = "Tcl implementation of the mustache templating language";

    license = licenses.bsd2;

    platforms = platforms.all;

    maintainers = with maintainers; [ nat-418 ];

    license = lib.licenses.bsd2;

    platforms = lib.platforms.all;

    maintainers = with lib.maintainers; [ nat-418 ];

  };

}

pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ mkTclDerivation { 
    owner = "mpcjanssen";

    repo = "tcl-fcgi";

    rev = "62452dbf3177ba9458fbb42457834ca77bdf5a82";

    sha256 = "sha256-RLuV4ARmGWCJTmhs7DbMWENQGj3d5ZXWb821WrgG0qA=";

    hash = "sha256-RLuV4ARmGWCJTmhs7DbMWENQGj3d5ZXWb821WrgG0qA=";

  };



  buildInputs = [
@@ -25,11 +25,11 @@ mkTclDerivation { 
    cp -r $src/tcl-src/* $out/lib/tcl-fcgi/

  '';



  meta = with lib; {

  meta = {

    homepage = "https://github.com/mpcjanssen/tcl-fcgi";

    description = "Tcl interface for the FastCGI protocol";

    license = licenses.bsd2;

    license = lib.licenses.bsd2;

    platforms = tclx.meta.platforms;

    maintainers = with maintainers; [ nat-418 ];

    maintainers = with lib.maintainers; [ nat-418 ];

  };

}