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

simplify

Browse Source
This commit is contained in:
Domen Kožar 2014-10-12 18:24:16 +02:00
parent a2a7abc67c
commit 68b183e309
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/python/2.6/default.nix
View File

@ -115,7 +115,7 @@ let
, internalName ? "_" + moduleName , internalName ? "_" + moduleName
, deps , deps
}: }:
if (includeModules) then null else stdenv.mkDerivation rec { if includeModules then null else stdenv.mkDerivation rec {
name = "python-${moduleName}-${python.version}"; name = "python-${moduleName}-${python.version}";
inherit src patches preConfigure; inherit src patches preConfigure;

2
pkgs/development/interpreters/python/2.7/default.nix
View File

@ -117,7 +117,7 @@ let
, internalName ? "_" + moduleName , internalName ? "_" + moduleName
, deps , deps
}: }:
if (includeModules) then null else stdenv.mkDerivation rec { if includeModules then null else stdenv.mkDerivation rec {
name = "python-${moduleName}-${python.version}"; name = "python-${moduleName}-${python.version}";
inherit src patches preConfigure; inherit src patches preConfigure;

2
pkgs/development/libraries/thrift/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
patches = [ ./yylex.patch ]; patches = [ ./yylex.patch ];
# Workaround to make the python wrapper not drop this package: # Workaround to make the python wrapper not drop this package:
# pythonFullWithPkgs.override { extraLibs = [ thrift ]; } # pythonFullBuildEnv.override { extraLibs = [ thrift ]; }
pythonPath = []; pythonPath = [];
buildInputs = [ buildInputs = [

10
pkgs/top-level/all-packages.nix
View File

@ -1875,7 +1875,7 @@ let
openobex = callPackage ../tools/bluetooth/openobex { }; openobex = callPackage ../tools/bluetooth/openobex { };
openopc = callPackage ../tools/misc/openopc { openopc = callPackage ../tools/misc/openopc {
pythonFull = python27FullWithPkgs.override { pythonFull = python27FullBuildEnv.override {
extraLibs = [ python27Packages.pyro3 ]; extraLibs = [ python27Packages.pyro3 ];
}; };
}; };
@ -3947,16 +3947,16 @@ let
python27Full = python27.override { python27Full = python27.override {
includeModules = true; includeModules = true;
}; };
python26FullWithPkgs = callPackage ../development/interpreters/python/wrapper.nix { python26FullBuildEnv = callPackage ../development/interpreters/python/wrapper.nix {
python = python26Full; python = python26Full;
inherit (python26Packages) recursivePthLoader; inherit (python26Packages) recursivePthLoader;
}; };
python27FullWithPkgs = callPackage ../development/interpreters/python/wrapper.nix { python27FullBuildEnv = callPackage ../development/interpreters/python/wrapper.nix {
python = python27Full; python = python27Full;
inherit (python27Packages) recursivePthLoader; inherit (python27Packages) recursivePthLoader;
}; };
pythonFullWithPkgs = python2FullWithPkgs; pythonFullBuildEnv = python2FullBuildEnv;
python2FullWithPkgs = python27FullWithPkgs; python2FullBuildEnv = python27FullBuildEnv;
python2nix = callPackage ../tools/package-management/python2nix { }; python2nix = callPackage ../tools/package-management/python2nix { };