Commit d14b4741 authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

Merge pull request #8657 from jb55/fix-double-apply-patch 

Fix some double applications of callPackage
parents beffeedc a87c9af0

pkgs/top-level/all-packages.nix

+12 −8
Original line number Diff line number Diff line
@@ -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;