Commit 58f501de authored by Valentin Reis's avatar Valentin Reis
Browse files

refactor in progress.

parent 6e21d863
Pipeline #5248 failed with stage
in 0 seconds
......@@ -2,8 +2,8 @@
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "0f2248b499eee4cf7bedf6422f94883f9dd46ed7",
"sha256": "00p79mfxi8m9yfnsvk4f6vhvw38ci81fijxxqgvf335gm4z4f0gf",
"rev": "5ccab1c6d965529b7400302d1ede6d7f522342e1",
"sha256": "0664x8fm8k025gwfjky41ai9mbyj4cvws6b1g35l18f9bbn0m0w7",
"url": "https://xgitlab.cels.anl.gov/argo/argonix.git"
},
"fn": "fetchgit"
......
......@@ -2,8 +2,8 @@
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "ed4c7a0a410bca5492b8d079fe5d96b55209f458",
"sha256": "1czr73bc78h2j9g277jv2rgy3sa19qh30il8fm4fc0q0llb99mn2",
"rev": "56c4e53c7c0a193cb44e20b50ab228d90fdb8240",
"sha256": "16wlw49985ai7v1i609hy0kj4n8ah12h4w7n6kf0w9jllmz50yw3",
"url": "https://xgitlab.cels.anl.gov/argo/argotk.git"
},
"fn": "fetchgit"
......
......@@ -28,7 +28,7 @@
let
callPackage = pkgs.lib.callPackageWith (pkgs // argopkgs);
argopkgs = rec {
argoLib = import ../lib/utils.nix;
argolib = import ../lib/utils.nix;
# Argo components (source overridabel via argument):
aml = callPackage ./aml {src = aml-src;};
nrm = callPackage ./nrm {src = nrm-src;};
......@@ -53,9 +53,7 @@ let
#Tools:
haskellPackages = pkgs.haskellPackages.override {
overrides = self: super: with pkgs.haskell.lib;
let
loader = argoLib.cabalDevLoader pkgs self;
in rec {
rec {
panpipe = (pkgs.haskell.lib.doJailbreak super.panpipe);
generic-pretty = doJailbreak super.generic-pretty;
......@@ -64,17 +62,16 @@ let
inherit (panhandle-src) url rev; })) {};
#argo tools
argotk = (self.callCabal2nix "argotk" (builtins.fetchGit {
inherit (argotk-src) url rev; })) {};
argonix = (self.callCabal2nix "argonix" (builtins.fetchGit {
inherit (argonix-src) url rev; })) {};
repoquality = (self.callCabal2nix "repoquality" (builtins.fetchGit {
inherit (repoquality-src) url rev; })) {};
argotk = (self.callCabal2nix "argotk" (builtins.fetchGit {inherit (argotk-src) url rev;})) {};
argonix = (self.callCabal2nix "argonix" (builtins.fetchGit {inherit (argonix-src) url rev;})) {};
repoquality = (self.callCabal2nix "repoquality" (builtins.fetchGit {inherit (repoquality-src) url rev;})) {};
};
};
# re-export from hpkgs and add non-haskell build outputs.
inherit (haskellPackages) argonix repoquality;
argotk = argoLib.addHackEnv pkgs haskellPackages (haskellPackages.argotk.overrideAttrs (old:{
# re-export from hpkgs and add non-haskell build rule specializations..
inherit (haskellPackages) repoquality;
argotk = haskellPackages.argotk.overrideAttrs (old:{
buildInputs=old.buildInputs ++ [pkgs.hwloc];
installPhase = old.installPhase + ''
mkdir $out/share/
......@@ -87,7 +84,14 @@ let
substituteInPlace $out/share/simple-H2O.xml --replace \
H.BFD.xml $out/share/H.BFD.xml
'';
}));
});
argonix = haskellPackages.argonix.overrideAttrs (old:{
installPhase = old.installPhase + ''
mkdir $out/share/
$out/bin/argonix --bash-completion-script argonix > $out/share/argonix.sh
'';
});
# Fixing the pyzmq package in this attribute set.
pyzmq = pkgs.pythonPackages.pyzmq.override { zeromq3 = pkgs.zeromq; };
......
......@@ -2,8 +2,8 @@
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "4407733b96a2db83f9193130f6b6349c0463cf55",
"sha256": "0458hfkf1lwrxvnkrsk0f3zjk915zq5g7xqiz4n3pisl2vxz0ad3",
"rev": "db1f441672c016e3c3384f223c449a3e9037152d",
"sha256": "08236jkxinjc4yic0a4k3i2732hhrinwscbzdkf00a3yd1wb25rm",
"url": "https://xgitlab.cels.anl.gov/argo/repoquality.git"
},
"fn": "fetchgit"
......
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