Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs: Do all version requirements as overrides in all-packages

Browse Source
This commit is contained in:
Tyson Whitehead
2018-07-18 13:21:33 -04:00
parent 6118f8b275
commit 444bcbe26f
8 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/all-packages.nix
View File

@@ -9,9 +9,9 @@ self: super: pkgs: with pkgs; {
boost = boost162;
};
cloudcompare = libsForQt5.callPackage ./cloudcompare.nix { };
cloudcompare = libsForQt5.callPackage ./cloudcompare.nix { boost = boost15x; };
cryptominisat = callPackage ./cryptominisat.nix { };
cryptominisat = callPackage ./cryptominisat.nix { python = python27; };
#firedrake = callPackage ./firedrake { };
@@ -20,22 +20,22 @@ self: super: pkgs: with pkgs; {
libxc4 = libxc404;
libxc = libxc4;
#meraculous = callPackage ./meraculous.nix { };
#meraculous = callPackage ./meraculous.nix { let stdenv49 = overrideCC stdenv gcc49; in stdenv = stdenv49; boost = boost159.override { stdenv = stdenv49 }; };
inherit (callPackage ./opengl/default.nix { inherit super; }) mesa_noglu;
inherit (callPackages ./octopus/octopus.nix { }) octopus72;
inherit (callPackages ./octopus/octopus.nix { stdenv = overrideCC stdenv gcc5; gfortran = gfortran5; }) octopus72;
octopus7 = octopus72;
octopus = octopus7;
openfoam = callPackage ./openfoam.nix { };
openslide = callPackage ./openslide { };
openslide-python = callPackage ./openslide/python.nix { };
openslide-python = callPackage ./openslide/python.nix { pythonPackages = python27Packages; };
ovito = libsForQt5.callPackage ./ovito.nix { stdenv = overrideCC stdenv gcc6; };
#sumo = callPackage ./sumo.nix { };
#sumo = callPackage ./sumo.nix { fox = fox_1_6; };
namd = callPackage ./namd.nix { };