ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-04 01:42:53 +03:00
Code Issues Projects Releases Wiki Activity

tcl/tk: 8.6.6 -> 8.6.9

Browse Source 
Changelog for Tcl: https://github.com/tcltk/tcl/blob/core-8-6-9/changes#L8797
Changelog for Tk: https://github.com/tcltk/tk/blob/master/changes#L7417

Tk release is actually v8.6.9.1 while Tcl is v8.6.9
This commit is contained in:
c0bw3b 2019-04-22 23:47:48 +02:00 committed by Frederik Rietdijk
parent 959b199991
commit 3ee1b52371
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/tcl/8.6.nix
View File

@ -2,10 +2,10 @@
callPackage ./generic.nix (args // rec {
release = "8.6";
version = "${release}.6";
version = "${release}.9";
src = fetchurl {
url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
sha256 = "01zypqhy57wvh1ikk28bg733sk5kf4q568pq9v6fvcz4h6bl0rd2";
sha256 = "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d";
};
})

5
pkgs/development/interpreters/tcl/generic.nix
View File

@ -33,11 +33,12 @@ stdenv.mkDerivation rec {
postInstall = ''
make install-private-headers
ln -s $out/bin/tclsh${release} $out/bin/tclsh
ln -s $out/lib/libtcl${release}.so $out/lib/libtcl.so
'';
meta = with stdenv.lib; {
description = "The Tcl scription language";
homepage = http://www.tcl.tk/;
description = "The Tcl scripting language";
homepage = https://www.tcl.tk/;
license = licenses.tcltk;
platforms = platforms.all;
maintainers = with maintainers; [ vrthra ];

4
pkgs/development/libraries/tk/8.6.nix
View File

@ -3,8 +3,8 @@
callPackage ./generic.nix (args // rec {
src = fetchurl {
url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
sha256 = "17diivcfcwdhp4v5zi6j9nkxncccjqkivhp363c4wx5lf4d3fb6n";
url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x
sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg";
};
patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];

7
pkgs/development/libraries/tk/generic.nix
View File

@ -19,11 +19,14 @@ stdenv.mkDerivation {
postInstall = ''
ln -s $out/bin/wish* $out/bin/wish
cp ../{unix,generic}/*.h $out/include
ln -s $out/lib/libtk${tcl.release}.so $out/lib/libtk.so
'';
configureFlags = [
"--enable-threads"
"--with-tcl=${tcl}/lib"
] ++ stdenv.lib.optional enableAqua "--enable-aqua";
] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"
++ stdenv.lib.optional enableAqua "--enable-aqua";
nativeBuildInputs = [ pkgconfig ];
@ -44,7 +47,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
homepage = http://www.tcl.tk/;
homepage = https://www.tcl.tk/;
license = licenses.tcltk;
platforms = platforms.all;
maintainers = with maintainers; [ lovek323 vrthra ];