cryptominisat, octopus, libxc: Upstream now

pkgs/all-packages.nix

@@ -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 { };

pkgs/cryptominisat.nix

@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, cmake, zlib, sqlite, boost, python, vim }:
-
-stdenv.mkDerivation {
-  name = "cryptominisat-4.5.3";
-
-  src = fetchurl {
-    url = https://github.com/msoos/cryptominisat/archive/4.5.3.tar.gz;
-    sha256 = "0k7blcphchn7pbandbar45zp2i3xrgcayiysv9lc6kbk4l7a4k8i";
-  };
-
-  buildInputs = [
-    cmake
-    zlib
-    sqlite
-    boost
-    python
-    vim
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/msoos/cryptominisat;
-    description = "An advanced SAT Solver";
-    platforms = platforms.all;
-    license = licenses.lgpl3;
-  };
-}

pkgs/octopus/libxc.nix

@@ -1,32 +0,0 @@
-{ stdenv, fetchFromGitLab, autoreconfHook, gfortran, perl }:
-
-let
-  common = scripts: version: sha256: stdenv.mkDerivation rec {
-    inherit version;
-    name = "libxc-${version}";
-
-    src = fetchFromGitLab {
-      owner = "libxc";
-      repo = "libxc";
-      rev = version;
-      inherit sha256;
-    };
-
-    buildInputs = [ autoreconfHook gfortran perl ];
-
-    postPatch = ''
-      patchShebangs ${scripts}
-    '';
-
-    meta = with stdenv.lib; {
-      homepage = http://octopus-code.org/wiki/Libxc;
-      description = "Libxc is a library of exchange-correlation functionals for density-functional theory.";
-      platforms = platforms.all;
-      license = licenses.gpl3;
-    };
-  };
-
-in {
-  libxc404 = common "scripts"       "4.0.4" "0h0rqmcsknr4b8ywadmpgfxzczhgfydn1p1qispmz2s97mcg8ws1";
-  libxc301 = common "src testsuite" "3.0.1" "108y6qnnsw7lhsyg25c42ilxy4klvsagnwdjy10xgnnwq9dh667k";
-}

pkgs/octopus/octopus.nix

@@ -1,65 +0,0 @@
-# The following optional dependencies are not currently available
-#
-# pfft, pnfft, etdf_io, berkeleygw, sparskit, blacs elpa, parpack,
-# feast, libfm (think this is actually scafacos) poke, parmetis
-# (requires metis)
-#
-# The following optional dependencies are not suitable for given reason
-#
-# nlopt (only provides libnlopt_cxx which requires c++ compiler for linking)
-#
-
-{ stdenv, fetchFromGitLab, autoreconfHook, gfortran, perl
-, openmpi, libxc3, blas, liblapack, gsl, fftw, netcdffortran, arpack, libyaml }:
-
-let
-  common = version: sha256: stdenv.mkDerivation rec {
-    inherit version;
-    name = "octopus-${version}";
-
-    src = fetchFromGitLab {
-      owner = "octopus-code";
-      repo = "octopus";
-      rev = version;
-      inherit sha256;
-    };
-
-    buildInputs = [
-      autoreconfHook
-      gfortran
-      perl
-      openmpi
-      libxc3
-      blas
-      liblapack
-      gsl
-      fftw
-      netcdffortran
-      arpack
-      libyaml
-    ];
-
-    # Extend netcdf library combo test to include just -lnetcdff
-    postPatch = ''
-      patchShebangs build
-      sed -i -e 's/in "" -lnetcdf "-lnetcdff -lnetcdf";/in "" -lnetcdf "-lnetcdff -lnetcdf" -lnetcdff;/' m4/netcdf.m4
-    '';
-
-    configureFlags = [
-      "--enable-mpi"
-      "--with-libxc-prefix=${libxc3}"
-      "--with-fftw-prefix=${fftw.dev}"
-      "--with-netcdf-prefix=${netcdffortran}"
-    ];
-
-    meta = with stdenv.lib; {
-      homepage = http://octopus-code.org/wiki/Main_Page;
-      description = "Octopus is a scientific program aimed at the ab initio virtual experimentation.";
-      platforms = platforms.all;
-      license = licenses.gpl2;
-    };
-  };
-
-in {
-  octopus72 = common "7.2" "04r826vj7sps3pnwkn8axh4jkiqwddy96lbr3ly4x6ph9c9xmvrq";
-}

temporary/gl2ps.nix

@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, cmake
-, zlib, libGL, libGLU, libpng, freeglut }:
-
-stdenv.mkDerivation rec {
-  version = "1.4.0";
-  name = "gl2ps-${version}";
-
-  src = fetchurl {
-    url = "http://geuz.org/gl2ps/src/${name}.tgz";
-    sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3";
-  };
-
-  buildInputs = [
-    cmake
-    zlib
-    libGL
-    libGLU
-    libpng
-    freeglut
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = http://geuz.org/gl2ps;
-    description = "An OpenGL to PostScript printing library.";
-    platforms = platforms.all;
-    license = licenses.lgpl2;
-  };
-}