Merge pull request #175775 from willcohen/tclptk (f46e56db) · Commits · nix / nixpkgs

pkgs/development/libraries/bwidget/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,6 @@ tcl.mkTclDerivation rec {
		description = "High-level widget set for Tcl/Tk";
		maintainers = with lib.maintainers; [ agbrooks ];
		license = lib.licenses.tcltk;
		platforms = lib.platforms.linux;
		platforms = lib.platforms.unix;
		};
		}

pkgs/top-level/perl-packages.nix

+67 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		be almost as much code as the function itself. */

		{ config
		, stdenv, lib, buildPackages, pkgs
		, stdenv, lib, buildPackages, pkgs, darwin
		, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, fetchFromGitLab
		, perl, overrides, buildPerl, shortenPerlShebang
		, nixosTests
		@@ -21045,6 +21045,57 @@ let
		};
		};

		Tcl = buildPerlPackage {
		pname = "Tcl";
		version = "1.27";
		src = fetchurl {
		url = "mirror://cpan/authors/id/V/VK/VKON/Tcl-1.27.tar.gz";
		sha256 = "sha256-+DhYd6Sp7Z89OQPS0PfNcPrDzmgyxg9gCmghzuP7WHI=";
		};
		propagatedBuildInputs = [
		pkgs.bwidget
		pkgs.tcl
		pkgs.tix
		pkgs.tk
		] ++ lib.optionals stdenv.isDarwin [
		darwin.apple_sdk.frameworks.CoreServices ];
		makeMakerFlags = lib.optionalString stdenv.isLinux
		"--tclsh=${pkgs.tcl}/bin/tclsh --nousestubs";
		meta = {
		description = "Tcl extension module for perl";
		license = with lib.licenses; [ artistic1 gpl1Plus ];
		};
		};

		TclpTk = buildPerlPackage {
		pname = "Tcl-pTk";
		version = "1.09";
		src = fetchurl {
		url = "mirror://cpan/authors/id/C/CA/CAC/Tcl-pTk-1.09.tar.gz";
		sha256 = "sha256-LR+YBlKS9+W7mBBy9/EkAOjxGVVe4MC5zToPr/pXl24=";
		};
		propagatedBuildInputs = [
		ClassISA
		SubName
		Tcl
		TestDeep
		];
		buildPhase = ''
		perl Makefile.PL --tclsh "${pkgs.tk.tcl}/bin/tclsh" INSTALL_BASE=$out --no-test-for-tk
		'';
		postInstall = ''
		mkdir -p $out/lib/perl5/site_perl
		mv $out/lib/perl5/Tcl $out/lib/perl5/site_perl/
		mv $out/lib/perl5/auto $out/lib/perl5/site_perl/
		'' + lib.optionalString stdenv.isDarwin ''
		mv $out/lib/perl5/darwin-thread-multi-2level $out/lib/perl5/site_perl/
		'';
		meta = {
		description = "Interface to Tcl/Tk with Perl/Tk compatible syntax";
		license = with lib.licenses; [ artistic1 gpl1Plus ];
		};
		};

		TemplatePluginAutoformat = buildPerlPackage {
		pname = "Template-Plugin-Autoformat";
		version = "2.77";
		@@ -24167,6 +24218,21 @@ let
		};
		};

		TkToolBar = buildPerlPackage {
		pname = "Tk-ToolBar";
		version = "0.12";
		src = fetchurl {
		url = "mirror://cpan/authors/id/A/AS/ASB/Tk-ToolBar-0.12.tar.gz";
		sha256 = "sha256-Rj4oTsRxN+fEJclpGwKo3sXOJytY6h9jWa6AQaI53Q8=";
		};
		makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib";
		buildInputs = [ Tk ];
		doCheck = false; # Expects working X11.
		meta = {
		license = with lib.licenses; [ artistic1 gpl1Plus ];
		};
		};

		TreeDAGNode = buildPerlPackage {
		pname = "Tree-DAG_Node";
		version = "1.31";

Admin message