Unverified Commit b7e03335 authored by Francesco Gazzetta's avatar Francesco Gazzetta Committed by GitHub
Browse files

tcl9Packages: init (#508586)

parents f1ee66e4 3d394472

pkgs/development/interpreters/tcl/generic.nix

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ let 


    passthru = rec {

      inherit release version;

      isTcl9 = lib.versions.major version == "9";

      libPrefix = "tcl${release}";

      libdir = "lib/${libPrefix}";

      tclPackageHook = callPackage (

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

+1 −0
Original line number Diff line number Diff line
@@ -81,5 +81,6 @@ tcl.mkTclDerivation rec { 
    platforms = lib.platforms.unix;

    mainProgram = "expect";

    maintainers = with lib.maintainers; [ SuperSandro2000 ];

    broken = tcl.isTcl9;

  };

}

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

+1 −0
Original line number Diff line number Diff line
@@ -46,5 +46,6 @@ mkTclDerivation rec { 
    license = lib.licenses.tcltk;

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [ thoughtpolice ];

    broken = tcl.isTcl9;

  };

}

pkgs/development/tcl-modules/by-name/le/lexec/package.nix

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  mkTclDerivation,

  fetchzip,

  autoreconfHook,

  tcl,

}:



mkTclDerivation {
@@ -24,5 +25,6 @@ mkTclDerivation { 
    license = lib.licenses.tcltk;

    maintainers = with lib.maintainers; [ fgaz ];

    platforms = lib.platforms.all;

    broken = tcl.isTcl9;

  };

}

pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix

+6 −18
Original line number Diff line number Diff line
@@ -4,40 +4,30 @@ 
  fetchFromGitHub,

  autoreconfHook,

  tcl,

  pandoc,

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "rl_json";

  version = "0.15.7";

  version = "0.16";



  src = fetchFromGitHub {

    owner = "RubyLane";

    repo = "rl_json";

    tag = finalAttrs.version;

    hash = "sha256-6Y6bq/Lm6KCFFV3RF6v4fVPEN1LO+jE2xZV50a8zyng=";

    hash = "sha256-rXr7x9Cr+gD938+NEPguvYVWH5s9bKccMobuZsb0IQY=";

    fetchSubmodules = true;

  };



  # The vendored libtommath conflicts with tclTomMath.

  # Replacing it with tclTomMath fixes the issue.

  # https://github.com/RubyLane/rl_json/issues/57

  # The switch to a vendored libtommath was done in 0.15.4 in commit

  # https://github.com/RubyLane/rl_json/commit/9294d533f4d81288acf53045666b1587cf7fbf92

  # "for proper bignum handling", but the commit message doesn't explain what's wrong

  # with tclTomMath's bignum handling and all tests pass anyway.

  postPatch = ''

    rm -r deps/libtommath

    substituteInPlace Makefile.in \

      --replace-fail 'deps: local/lib/libtommath.a' 'deps:'

    substituteInPlace configure.ac \

      --replace-fail -ltommath ""

    substituteInPlace generic/rl_jsonInt.h \

      --replace-fail '#include <tommath.h>' '#include <tclTomMath.h>'

    mkdir doc/.build

    cp doc/json.md.in doc/.build/json.md.in

  '';



  nativeBuildInputs = [

    autoreconfHook

    tcl.tclPackageHook

    pandoc

  ];



  configureFlags = [
@@ -47,8 +37,6 @@ stdenv.mkDerivation (finalAttrs: { 
    "--datarootdir=${placeholder "out"}/share"

  ];



  env.NIX_CFLAGS_COMPILE = "-Wno-error";



  doCheck = true;



  meta = {