Commit 1e7e6381 authored by Valentin Reis's avatar Valentin Reis
Browse files

Merge branch 'master' of xgitlab.cels.anl.gov:argo/argopkgs

parents ce77cc4f d8e7bf38
Pipeline #6356 passed with stages
in 2 minutes and 38 seconds
...@@ -12,6 +12,8 @@ let ...@@ -12,6 +12,8 @@ let
, brittany , brittany
, panpipe , panpipe
, ghcid , ghcid
, typed-process
, unix
}: }:
mkDerivation { mkDerivation {
pname = "dummy"; pname = "dummy";
...@@ -30,6 +32,8 @@ let ...@@ -30,6 +32,8 @@ let
brittany brittany
panpipe panpipe
ghcid ghcid
typed-process
unix
]; ];
description = ""; description = "";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "16300a834f2871546118bd84f2f609018c039a74", "rev": "832d1e599d59764161322a7da07d67351a36e64c",
"sha256": "09bkb3dwv4a24wvv65yw822l1pvkpspxn5i4c9n5hml4cx40inqz", "sha256": "1iawwazzzfd04d6a3i9jckmcp9jlw5s2ai5f41jah9m7lalkjakq",
"url": "https://xgitlab.cels.anl.gov/argo/argotk.git" "url": "https://xgitlab.cels.anl.gov/argo/argotk.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
{ stdenv, src, perl }:
stdenv.mkDerivation {
inherit src;
name = "checkpatch";
buildPhase = "true";
installPhase = ''
mkdir -p $out/bin $out/share
substituteInPlace scripts/checkpatch.pl --replace 'dirname(abs_path($P))' \"$out/share\";
cp scripts/checkpatch.pl $out/bin
cp scripts/spelling.txt scripts/const_structs.checkpatch $out/share
'';
buildInputs = [perl];
}
This diff is collapsed.
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
, #source overrides: tooling , #source overrides: tooling
argotk-src ? builtins.fetchGit {inherit (fetched argotk/pin.json) url rev;} argotk-src ? builtins.fetchGit {inherit (fetched argotk/pin.json) url rev;}
, repoquality-src ? builtins.fetchGit {inherit (fetched repoquality/pin.json) url rev;} , repoquality-src ? builtins.fetchGit {inherit (fetched repoquality/pin.json) url rev;}
, dhrun-src ? builtins.fetchGit {inherit (fetched dhrun/pin.json) url rev;}
, powerplots-src ? builtins.fetchGit {inherit (fetched powerplots/pin.json) url rev;} , powerplots-src ? builtins.fetchGit {inherit (fetched powerplots/pin.json) url rev;}
, argonix-src ? builtins.fetchGit {inherit (fetched argonix/pin.json) url rev;} , argonix-src ? builtins.fetchGit {inherit (fetched argonix/pin.json) url rev;}
, experiments-src ? fetched experiments/pin.json , experiments-src ? fetched experiments/pin.json
...@@ -95,6 +96,7 @@ let ...@@ -95,6 +96,7 @@ let
openmc-data = fetched openmc/data.json; openmc-data = fetched openmc/data.json;
# tools # tools
checkpatch = callPackage ./checkpatch {src=pkgs.linux_testing.src;};
zymake = callPackage ./zymake { zymake = callPackage ./zymake {
inherit (pkgs.ocamlPackages) findlib ocamlbuild topkg batteries; inherit (pkgs.ocamlPackages) findlib ocamlbuild topkg batteries;
}; };
...@@ -114,13 +116,14 @@ let ...@@ -114,13 +116,14 @@ let
argotk = (self.callCabal2nix "argotk" argotk-src ) {}; argotk = (self.callCabal2nix "argotk" argotk-src ) {};
argonix = (self.callCabal2nix "argonix" argonix-src ) {}; argonix = (self.callCabal2nix "argonix" argonix-src ) {};
repoquality = (self.callCabal2nix "repoquality" repoquality-src ) {}; repoquality = (self.callCabal2nix "repoquality" repoquality-src ) {};
dhrun = (self.callCabal2nix "dhrun" dhrun-src ) {};
powerplots = (self.callCabal2nix "powerplots" powerplots-src ) {}; powerplots = (self.callCabal2nix "powerplots" powerplots-src ) {};
}; };
}; };
# re-export from hpkgs and add non-haskell build rule specialization # re-export from hpkgs and add non-haskell build rule specialization
inherit (haskellPackages) repoquality; inherit (haskellPackages) repoquality dhrun;
argotk = haskellPackages.argotk.overrideAttrs (old:{ argotk = haskellPackages.argotk.overrideAttrs (old:{
buildInputs=old.buildInputs ++ [pkgs.hwloc]; buildInputs=old.buildInputs ++ [pkgs.hwloc];
...@@ -237,7 +240,6 @@ let ...@@ -237,7 +240,6 @@ let
buildInputs = old.buildInputs ++ [ buildInputs = old.buildInputs ++ [
#debug tools #debug tools
pkgs.which pkgs.which
#pkgs.sudo
zmcat zmcat
#experiment tools #experiment tools
zymake zymake
......
{
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "4e8056d7289554d2dfed1c6d145cc830a0b2ed02",
"sha256": "1jfsry7j7v0almrc548g5cb00n618n7p177x5899kz07l5qjh18k",
"url": "https://xgitlab.cels.anl.gov/vreis/dhall-executor.git"
},
"fn": "fetchgit"
},
"rev": "refs/heads/master",
"type": "fetchgit",
"url": "https://xgitlab.cels.anl.gov/vreis/dhall-executor.git"
}
\ No newline at end of file
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