···

       
218
       
218
       
 
       
    sourceVersion = {

     

       
219
       
219
       
 
       
      major = "7";

     

       
220
       
220
       
 
       
      minor = "3";

     

       
221
       
221
       
-
       
      patch = "1";

     

       
221
       
221
       
+
       
      patch = "2";

     

       
222
       
222
       
 
       
    };

     

       
223
       
223
       
-
       
    sha256 = "08ckkhd0ix6j9873a7gr507c72d4cmnv5lwvprlljdca9i8p2dzs";

     

       
223
       
223
       
+
       
    sha256 = "1l98b7s9sf16a5w8y0fdn7a489l3gpykjasws1j67bahhc6li2c1";

     

       
224
       
224
       
 
       
    pythonVersion = "2.7";

     

       
225
       
225
       
 
       
    db = db.override { dbmSupport = !stdenv.isDarwin; };

     

       
226
       
226
       
 
       
    python = python27;

     
···

       
234
       
234
       
 
       
    sourceVersion = {

     

       
235
       
235
       
 
       
      major = "7";

     

       
236
       
236
       
 
       
      minor = "3";

     

       
237
       
237
       
-
       
      patch = "1";

     

       
237
       
237
       
+
       
      patch = "2";

     

       
238
       
238
       
 
       
    };

     

       
239
       
239
       
-
       
    sha256 = "10zsk8jby8j6visk5mzikpb1cidvz27qq4pfpa26jv53klic6b0c";

     

       
239
       
239
       
+
       
    sha256 = "03f1fdw6yk2mypa9pbmgk26r8y1hhmw801l6g36zry9zsvz7aqgx";

     

       
240
       
240
       
 
       
    pythonVersion = "3.6";

     

       
241
       
241
       
 
       
    db = db.override { dbmSupport = !stdenv.isDarwin; };

     

       
242
       
242
       
 
       
    python = python27;

     
···

       
251
       
251
       
 
       
    sourceVersion = {

     

       
252
       
252
       
 
       
      major = "7";

     

       
253
       
253
       
 
       
      minor = "3";

     

       
254
       
254
       
-
       
      patch = "1";

     

       
254
       
254
       
+
       
      patch = "2";

     

       
255
       
255
       
 
       
    };

     

       
256
       
256
       
-
       
    sha256 = "18xc5kwidj5hjwbr0w8v1nfpg5l4lk01z8cn804zfyyz8xjqhx5y"; # linux64

     

       
256
       
256
       
+
       
    sha256 = "0fx1kp13cgx3rijd0zf8rdjbai6mfhc9is4xfc7kl5cpd88hhkwd"; # linux64

     

       
257
       
257
       
 
       
    pythonVersion = "2.7";

     

       
258
       
258
       
 
       
    inherit passthruFun;

     

       
259
       
259
       
 
       
  };

     
···

       
264
       
264
       
 
       
    sourceVersion = {

     

       
265
       
265
       
 
       
      major = "7";

     

       
266
       
266
       
 
       
      minor = "3";

     

       
267
       
267
       
-
       
      patch = "1";

     

       
267
       
267
       
+
       
      patch = "2";

     

       
268
       
268
       
 
       
    };

     

       
269
       
269
       
-
       
    sha256 = "04nv0mkalaliphbjw7y0pmb372bxwjzwmcsqkf9kwsik99kg2z7n"; # linux64

     

       
269
       
269
       
+
       
    sha256 = "10xdx7q04fzy4v4rbj9bbdw8g9y68qgaih7z2n0s5aknj0bizafp"; # linux64

     

       
270
       
270
       
 
       
    pythonVersion = "3.6";

     

       
271
       
271
       
 
       
    inherit passthruFun;

     

       
272
       
272
       
 
       
  };

     

···

       
45
       
45
       
 
       
  inherit pname version;

     

       
46
       
46
       
 
       


     

       
47
       
47
       
 
       
  src = fetchurl {

     

       
48
       
48
       
-
       
    url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-src.tar.bz2";

     

       
48
       
48
       
+
       
    url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-src.tar.bz2";

     

       
49
       
49
       
 
       
    inherit sha256;

     

       
50
       
50
       
 
       
  };

     

       
51
       
51
       
 
       


     

···

       
54
       
54
       
 
       
  inherit pname version;

     

       
55
       
55
       
 
       


     

       
56
       
56
       
 
       
  src = fetchurl {

     

       
57
       
57
       
-
       
    url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2";

     

       
57
       
57
       
+
       
    url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";

     

       
58
       
58
       
 
       
    inherit sha256;

     

       
59
       
59
       
 
       
  };

     

       
60
       
60
       
 
       


     

···

       
1
       
1
       
-
       
--- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py	2017-10-03 11:49:20.000000000 +0100

     

       
2
       
2
       
-
       
+++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py	2017-11-21 13:20:51.398607530 +0000

     

       
3
       
3
       
-
       
@@ -17,18 +17,14 @@

     

       
1
       
1
       
+
       
--- a/lib_pypy/_tkinter/tklib_build.py

     

       
2
       
2
       
+
       
+++ b/lib_pypy/_tkinter/tklib_build.py

     

       
3
       
3
       
+
       
@@ -17,19 +17,14 @@ elif sys.platform == 'win32':

     

       
4
       
4
       
 
       
     incdirs = []

     

       
5
       
5
       
 
       
     linklibs = ['tcl85', 'tk85']

     

       
6
       
6
       
 
       
     libdirs = []

     

       
7
       
7
       
 
       
-elif sys.platform == 'darwin':

     

       
8
       
8
       
-
       
-    incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/']

     

       
9
       
9
       
-
       
-    linklibs = ['tcl', 'tk']

     

       
10
       
10
       
-
       
-    libdirs = []

     

       
8
       
8
       
+
       
-    # homebrew

     

       
9
       
9
       
+
       
-    incdirs = ['/usr/local/opt/tcl-tk/include']

     

       
10
       
10
       
+
       
-    linklibs = ['tcl8.6', 'tk8.6']

     

       
11
       
11
       
+
       
-    libdirs = ['/usr/local/opt/tcl-tk/lib']

     

       
11
       
12
       
 
       
 else:

     

       
12
       
13
       
 
       
     # On some Linux distributions, the tcl and tk libraries are

     

       
13
       
14
       
 
       
     # stored in /usr/include, so we must check this case also