Commit f8827aa9 authored by Valentin Reis's avatar Valentin Reis

fix nrm-schema

parent 04067d05
Pipeline #8568 failed with stages
in 39 minutes and 46 seconds
No preview for this file type
......@@ -85,7 +85,7 @@ in
gitlab-runner-physical =
{ ... }:
let ip = "140.221.10.9"; in
let ip = "140.221.10.88"; in
{
deployment.targetEnv = "none";
deployment.targetHost = ip;
......
......@@ -99,11 +99,8 @@ let
containers = callPackage ./containers {src=containers-src;};
libnrm = callPackage ./libnrm {src=libnrm-src;};
libnrm-pmpi = callPackage ./libnrm/mpi.nix {src=libnrm-src;};
libnrm-pinned = callPackage ./libnrm {src=fetched libnrm/pin.json;};
libnrm-pmpi = libnrm.overrideAttrs (oldAttrs: rec {
configureFlags = "--enable-pmpi";
buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ];
});
#jsonschema3 = pkgs.pythonPackages.jsonschema.overrideAttrs(o:{
#src=pkgs.fetchurl{
......@@ -228,7 +225,6 @@ let
powerplots = (self.callCabal2nix "powerplots" powerplots-src ) {};
generic-aeson = doJailbreak super.generic-aeson;
nrm-schema = (self.callCabal2nix "nrm-schema" nrm-schema-src ) {};
zmcat = self.callPackage ./zmcat {};
};
......@@ -250,15 +246,6 @@ let
inherit (haskellPackages) repoquality;
#inherit (bleedingHaskellPackages) dhall dhall-lsp-server dhall-json;
nrm-schema = haskellPackages.nrm-schema.overrideAttrs (old:{
buildInputs = old.buildInputs ++ [
(pkgs.python.withPackages (ps: [
ps.warlock
ps.jsonschema
]))
];
});
dhrun = bleedingHaskellPackages.dhrun.overrideAttrs (old:{
installPhase = old.installPhase + ''
mkdir -p $out/share/
......
{ stdenv, src, autoreconfHook, fetchgit, zeromq, gfortran, pkgconfig, mpich2 }:
stdenv.mkDerivation {
inherit src;
name = "libnrm";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ zeromq gfortran mpich2 ];
configureFlags = "--enable-pmpi";
}
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