Commit 7f0457b8 authored by Valentin Reis's avatar Valentin Reis
Browse files

re-added zymake, modified comments.

parent 023a4a90
Pipeline #5444 passed with stages
in 1 minute and 23 seconds
...@@ -31,8 +31,9 @@ ...@@ -31,8 +31,9 @@
let let
callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs); callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs);
argopkgs = rec { argopkgs = rec {
# library of nix expressions
argolib = import ../lib/utils.nix; argolib = import ../lib/utils.nix;
# Argo components (source overridabel via argument): # Argo components (source overridabel via argument)
aml = callPackage ./aml {src = aml-src;}; aml = callPackage ./aml {src = aml-src;};
nrm = callPackage ./nrm {src = nrm-src;}; nrm = callPackage ./nrm {src = nrm-src;};
containers = callPackage ./containers {src = containers-src;}; containers = callPackage ./containers {src = containers-src;};
...@@ -42,7 +43,7 @@ let ...@@ -42,7 +43,7 @@ let
buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ];
}); });
# Applications (source overridable via argument): # applications (source overridable via argument)
amg = callPackage ./amg { nrmSupport=true; src = amg-src; }; amg = callPackage ./amg { nrmSupport=true; src = amg-src; };
qmcpack = callPackage ./qmcpack { nrmSupport=true; src = qmcpack-src; }; qmcpack = callPackage ./qmcpack { nrmSupport=true; src = qmcpack-src; };
...@@ -50,10 +51,13 @@ let ...@@ -50,10 +51,13 @@ let
stream = callPackage ./stream { nrmSupport=true; src = stream-src; }; stream = callPackage ./stream { nrmSupport=true; src = stream-src; };
lammps = callPackage ./lammps { nrmSupport=true; src = lammps-src; }; lammps = callPackage ./lammps { nrmSupport=true; src = lammps-src; };
# Data (static, non source overridable via arguments): # data (static, non source overridable via arguments)
openmc-data = fetched openmc/data.json; openmc-data = fetched openmc/data.json;
#Tools: # tools
zymake = callPackage ./zymake {
inherit (pkgs.ocamlPackages) findlib ocamlbuild topkg batteries;
};
haskellPackages = pkgs.haskellPackages.override { haskellPackages = pkgs.haskellPackages.override {
overrides = self: super: with pkgs.haskell.lib; overrides = self: super: with pkgs.haskell.lib;
rec { rec {
...@@ -72,7 +76,7 @@ let ...@@ -72,7 +76,7 @@ let
}; };
}; };
# re-export from hpkgs and add non-haskell build rule specializations.. # re-export from hpkgs and add non-haskell build rule specialization
inherit (haskellPackages) repoquality; inherit (haskellPackages) repoquality;
argotk = haskellPackages.argotk.overrideAttrs (old:{ argotk = haskellPackages.argotk.overrideAttrs (old:{
...@@ -97,13 +101,13 @@ let ...@@ -97,13 +101,13 @@ let
''; '';
}); });
# Fixing the pyzmq package in this attribute set. # fix for nrm
pyzmq = pkgs.pythonPackages.pyzmq.override { zeromq3 = pkgs.zeromq; }; pyzmq = pkgs.pythonPackages.pyzmq.override { zeromq3 = pkgs.zeromq; };
# archived for sake of the simplicity of this file: # archived for sake of the simplicity of this file
#zmcat = pkgs-stable.haskellPackages.callPackage ./tools/zmcat {}; #zmcat = pkgs-stable.haskellPackages.callPackage ./tools/zmcat {};
# nix-shell environments, can not be built. # ci/experimental environments
test = pkgs.stdenv.mkDerivation rec { test = pkgs.stdenv.mkDerivation rec {
name = "testEnv"; name = "testEnv";
...@@ -165,5 +169,5 @@ let ...@@ -165,5 +169,5 @@ let
testAll = doArgotk "tests"; testAll = doArgotk "tests";
}; };
# This file re-exports a full nixpkgs-like package set. # re-exporting a full nixpkgs-like package set
in pkgs // argopkgs in pkgs // argopkgs
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg, batteries }:
stdenv.mkDerivation rec {
name = "zymake";
src = fetchFromGitHub {
owner = "freuk";
repo = "zymake";
rev = "e2ee37ed8d729bf31b2cbe00bcb977c451c656e2";
sha256 = "1djndij7d2lary1m20wz6kwxz272mg21h8bn2mm238ijyz38g57j";
};
#unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild topkg opam batteries ];
inherit (topkg) buildPhase installPhase;
meta = {
license = stdenv.lib.licenses.isc;
homepage = http://www-personal.umich.edu/~ebreck/code/zymake/;
description = "Zymake workflow system.";
inherit (ocaml.meta) platforms;
};
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment