From a87c9af0806aa68974d35cf007d9c1e03a61ed7e Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sun, 5 Jul 2015 12:00:08 -0700 Subject: [PATCH] fix some double applications of callPackage --- pkgs/top-level/all-packages.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac89fafa619..0126504a330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1172,19 +1172,23 @@ let cron = callPackage ../tools/system/cron { }; - cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix { + cudatoolkit5 = import ../development/compilers/cudatoolkit/5.5.nix { + inherit callPackage; python = python26; }; - cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix { + cudatoolkit6 = import ../development/compilers/cudatoolkit/6.0.nix { + inherit callPackage; python = python26; }; - cudatoolkit65 = callPackage ../development/compilers/cudatoolkit/6.5.nix { + cudatoolkit65 = import ../development/compilers/cudatoolkit/6.5.nix { + inherit callPackage; python = python26; }; - cudatoolkit7 = callPackage ../development/compilers/cudatoolkit/7.0.nix { + cudatoolkit7 = import ../development/compilers/cudatoolkit/7.0.nix { + inherit callPackage; python = python26; }; @@ -6091,10 +6095,10 @@ let fcgi = callPackage ../development/libraries/fcgi { }; - ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { }; - ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { }; - ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { }; - ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { }; + ffmpeg_0_10 = import ../development/libraries/ffmpeg/0.10.nix { inherit callPackage; }; + ffmpeg_1_2 = import ../development/libraries/ffmpeg/1.2.nix { inherit callPackage; }; + ffmpeg_2_2 = import ../development/libraries/ffmpeg/2.2.nix { inherit callPackage; }; + ffmpeg_2_6 = import ../development/libraries/ffmpeg/2.6.nix { inherit callPackage; }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2;