lol

pythonInterpreters: don't use with pkgs

authored by

Artturin and committed by
Frederik Rietdijk
19d04b5f 9259c4b8

+31 -22
+31 -22
pkgs/development/interpreters/python/default.nix
··· 1 - { pkgs }: 2 - 3 - with pkgs; 4 5 (let 6 ··· 79 extra = _: {}; 80 optionalExtensions = cond: as: if cond then as else []; 81 python2Extension = import ../../../top-level/python2-packages.nix; 82 - extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pkgs.pythonPackagesExtensions ++ [ overrides ]); 83 aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super); 84 in lib.makeScopeWithSplicing 85 - pkgs.splicePackages 86 - pkgs.newScope 87 otherSplices 88 keep 89 extra ··· 150 in { 151 152 python27 = callPackage ./cpython/2.7 { 153 - self = python27; 154 sourceVersion = { 155 major = "2"; 156 minor = "7"; ··· 163 }; 164 165 python37 = callPackage ./cpython { 166 - self = python37; 167 sourceVersion = { 168 major = "3"; 169 minor = "7"; ··· 176 }; 177 178 python38 = callPackage ./cpython { 179 - self = python38; 180 sourceVersion = { 181 major = "3"; 182 minor = "8"; ··· 189 }; 190 191 python39 = callPackage ./cpython ({ 192 - self = python39; 193 inherit (darwin) configd; 194 inherit passthruFun; 195 } // sources.python39); 196 197 python310 = callPackage ./cpython ({ 198 - self = python310; 199 inherit (darwin) configd; 200 inherit passthruFun; 201 } // sources.python310); 202 203 python311 = callPackage ./cpython { 204 - self = python311; 205 sourceVersion = { 206 major = "3"; 207 minor = "11"; ··· 215 216 # Minimal versions of Python (built without optional dependencies) 217 python3Minimal = (callPackage ./cpython ({ 218 - self = python3Minimal; 219 inherit passthruFun; 220 pythonAttr = "python3Minimal"; 221 # strip down that python version as much as possible ··· 226 sqlite = null; 227 configd = null; 228 tzdata = null; 229 - libffi = pkgs.libffiBoot; # without test suite 230 stripConfig = true; 231 stripIdlelib = true; 232 stripTests = true; ··· 244 }); 245 246 pypy27 = callPackage ./pypy { 247 - self = pypy27; 248 sourceVersion = { 249 major = "7"; 250 minor = "3"; ··· 253 sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0="; 254 pythonVersion = "2.7"; 255 db = db.override { dbmSupport = !stdenv.isDarwin; }; 256 - python = python27; 257 inherit passthruFun; 258 inherit (darwin) libunwind; 259 inherit (darwin.apple_sdk.frameworks) Security; 260 }; 261 262 pypy38 = callPackage ./pypy { 263 - self = pypy38; 264 sourceVersion = { 265 major = "7"; 266 minor = "3"; ··· 269 sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY="; 270 pythonVersion = "3.8"; 271 db = db.override { dbmSupport = !stdenv.isDarwin; }; 272 - python = python27; 273 inherit passthruFun; 274 inherit (darwin) libunwind; 275 inherit (darwin.apple_sdk.frameworks) Security; 276 }; 277 - pypy37 = pypy38.override { 278 - self = pythonInterpreters.pypy37; 279 pythonVersion = "3.7"; 280 sha256 = "sha256-LtAqyecQhZxBvILer7CGGXkruaJ+6qFnbHQe3t0hTdc="; 281 }; 282 283 pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { 284 # Not included at top-level 285 - self = pythonInterpreters.pypy27_prebuilt; 286 sourceVersion = { 287 major = "7"; 288 minor = "3"; ··· 295 296 pypy38_prebuilt = callPackage ./pypy/prebuilt.nix { 297 # Not included at top-level 298 - self = pythonInterpreters.pypy38_prebuilt; 299 sourceVersion = { 300 major = "7"; 301 minor = "3";
··· 1 + { pkgs 2 + , callPackage 3 + , config 4 + , darwin 5 + , db 6 + , lib 7 + , libffiBoot 8 + , newScope 9 + , pythonPackagesExtensions 10 + , splicePackages 11 + , stdenv 12 + }: 13 14 (let 15 ··· 88 extra = _: {}; 89 optionalExtensions = cond: as: if cond then as else []; 90 python2Extension = import ../../../top-level/python2-packages.nix; 91 + extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pythonPackagesExtensions ++ [ overrides ]); 92 aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super); 93 in lib.makeScopeWithSplicing 94 + splicePackages 95 + newScope 96 otherSplices 97 keep 98 extra ··· 159 in { 160 161 python27 = callPackage ./cpython/2.7 { 162 + self = pkgs.python27; 163 sourceVersion = { 164 major = "2"; 165 minor = "7"; ··· 172 }; 173 174 python37 = callPackage ./cpython { 175 + self = pkgs.python37; 176 sourceVersion = { 177 major = "3"; 178 minor = "7"; ··· 185 }; 186 187 python38 = callPackage ./cpython { 188 + self = pkgs.python38; 189 sourceVersion = { 190 major = "3"; 191 minor = "8"; ··· 198 }; 199 200 python39 = callPackage ./cpython ({ 201 + self = pkgs.python39; 202 inherit (darwin) configd; 203 inherit passthruFun; 204 } // sources.python39); 205 206 python310 = callPackage ./cpython ({ 207 + self = pkgs.python310; 208 inherit (darwin) configd; 209 inherit passthruFun; 210 } // sources.python310); 211 212 python311 = callPackage ./cpython { 213 + self = pkgs.python311; 214 sourceVersion = { 215 major = "3"; 216 minor = "11"; ··· 224 225 # Minimal versions of Python (built without optional dependencies) 226 python3Minimal = (callPackage ./cpython ({ 227 + self = pkgs.python3Minimal; 228 inherit passthruFun; 229 pythonAttr = "python3Minimal"; 230 # strip down that python version as much as possible ··· 235 sqlite = null; 236 configd = null; 237 tzdata = null; 238 + libffi = libffiBoot; # without test suite 239 stripConfig = true; 240 stripIdlelib = true; 241 stripTests = true; ··· 253 }); 254 255 pypy27 = callPackage ./pypy { 256 + self = pkgs.pypy27; 257 sourceVersion = { 258 major = "7"; 259 minor = "3"; ··· 262 sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0="; 263 pythonVersion = "2.7"; 264 db = db.override { dbmSupport = !stdenv.isDarwin; }; 265 + python = pkgs.python27; 266 inherit passthruFun; 267 inherit (darwin) libunwind; 268 inherit (darwin.apple_sdk.frameworks) Security; 269 }; 270 271 pypy38 = callPackage ./pypy { 272 + self = pkgs.pypy38; 273 sourceVersion = { 274 major = "7"; 275 minor = "3"; ··· 278 sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY="; 279 pythonVersion = "3.8"; 280 db = db.override { dbmSupport = !stdenv.isDarwin; }; 281 + python = pkgs.python27; 282 inherit passthruFun; 283 inherit (darwin) libunwind; 284 inherit (darwin.apple_sdk.frameworks) Security; 285 }; 286 + pypy37 = pkgs.pypy38.override { 287 + self = pkgs.pythonInterpreters.pypy37; 288 pythonVersion = "3.7"; 289 sha256 = "sha256-LtAqyecQhZxBvILer7CGGXkruaJ+6qFnbHQe3t0hTdc="; 290 }; 291 292 pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix { 293 # Not included at top-level 294 + self = pkgs.pythonInterpreters.pypy27_prebuilt; 295 sourceVersion = { 296 major = "7"; 297 minor = "3"; ··· 304 305 pypy38_prebuilt = callPackage ./pypy/prebuilt.nix { 306 # Not included at top-level 307 + self = pkgs.pythonInterpreters.pypy38_prebuilt; 308 sourceVersion = { 309 major = "7"; 310 minor = "3";