cryptominisat, octopus, libxc: Upstream now
This commit is contained in:
@@ -11,8 +11,6 @@ self: super: pkgs: with pkgs; {
|
||||
|
||||
cloudcompare = libsForQt5.callPackage ./cloudcompare.nix { boost = boost15x; };
|
||||
|
||||
cryptominisat = callPackage ./cryptominisat.nix { python = python27; };
|
||||
|
||||
fastqc = callPackage ./fastqc.nix { };
|
||||
|
||||
#firedrake = callPackage ./firedrake { };
|
||||
@@ -21,11 +19,6 @@ self: super: pkgs: with pkgs; {
|
||||
|
||||
gsort = callPackage ./gsort { };
|
||||
|
||||
inherit (callPackages ./octopus/libxc.nix { }) libxc301 libxc404;
|
||||
libxc3 = libxc301;
|
||||
libxc4 = libxc404;
|
||||
libxc = libxc4;
|
||||
|
||||
lumpy = callPackage ./lumpy.nix { };
|
||||
|
||||
#meraculous = callPackage ./meraculous.nix { let stdenv49 = overrideCC stdenv gcc49; in stdenv = stdenv49; boost = boost159.override { stdenv = stdenv49 }; };
|
||||
@@ -37,10 +30,6 @@ self: super: pkgs: with pkgs; {
|
||||
|
||||
inherit (callPackage ./opengl/default.nix { inherit super; }) libGL mesa_glxgallium;
|
||||
|
||||
inherit (callPackages ./octopus/octopus.nix { stdenv = overrideCC stdenv gcc5; gfortran = gfortran5; }) octopus72;
|
||||
octopus7 = octopus72;
|
||||
octopus = octopus7;
|
||||
|
||||
openfoam = callPackage ./openfoam { };
|
||||
|
||||
openslide = callPackage ./openslide { };
|
||||
|
||||
Reference in New Issue
Block a user