public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #17354: tcl/tk: 8.6.4 -> 8.6.6

Browse Source
This commit is contained in:
Vladimír Čunát 2016-07-30 08:31:23 +02:00
commit dfa2f8040e
4 changed files with 5 additions and 5 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 { callPackage ./generic.nix (args // rec {
release = "8.6"; release = "8.6";
version = "${release}.4"; version = "${release}.6";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly"; sha256 = "01zypqhy57wvh1ikk28bg733sk5kf4q568pq9v6fvcz4h6bl0rd2";
}; };
}) })

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

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = http://www.tcl.tk/; homepage = http://www.tcl.tk/;
license = licenses.tcltk; license = licenses.tcltk;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ wkennington vrthra ];
}; };
passthru = rec { passthru = rec {

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

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

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

@ -37,6 +37,6 @@ stdenv.mkDerivation {
homepage = http://www.tcl.tk/; homepage = http://www.tcl.tk/;
license = licenses.tcltk; license = licenses.tcltk;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ lovek323 wkennington ]; maintainers = with maintainers; [ lovek323 vrthra wkennington ];
}; };
} }