fix bap-asli-plugin path and add tests.

.github/workflows/nix.yml

@@ -19,7 +19,12 @@ jobs:
       with:
         name: pac-nix
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix-build ./pkgs.nix -A ${{matrix.pkg}} -o result-${{matrix.pkg}} 
+    - run: nix-build -A ${{matrix.pkg}}
+    - name: nix-build -A ${{matrix.pkg}}.tests
+      run: |
+        if nix-instantiate --eval -A ${{matrix.pkg}}.tests; then
+          nix-build -A ${{matrix.pkg}}.tests
+        fi
     - run: ls -l
   update-check:
     runs-on: ubuntu-latest

asli.nix

@@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec {
   checkInputs = [ ocamlPackages.alcotest ];
   buildInputs = [ pkgs.z3 ];
   nativeBuildInputs = (with pkgs; [ ott ]) ++ (with ocamlPackages; [ menhir ]);
-  propagatedBuildInputs = with ocamlPackages; [ linenoise pprint zarith z3 ocaml_pcre ];
+  propagatedBuildInputs = [ pkgs.pcre ] ++ (with ocamlPackages; [ linenoise pprint zarith z3 ocaml_pcre ]);
   doCheck = lib.versionAtLeast ocaml.version "4.09";
 
   configurePhase = ''

bap-asli-plugin.nix

@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
     runHook preBuild
 
     bapbuild -package asli.libASL asli.plugin
-    mkdir -p $out/share/bap-asli-plugin
-    cp asli.plugin $out/share/bap-asli-plugin/asli.plugin
+    mkdir -p $out/lib/bap
+    cp asli.plugin $out/lib/bap
 
     runHook postBuild
   '';

bap-aslp.nix

@@ -1,4 +1,4 @@
-{ stdenv, makeBinaryWrapper, bap-plugins, asli, bap-asli-plugin }:
+{ stdenv, makeBinaryWrapper, bap-plugins, asli, bap-asli-plugin, testers, bap-aslp }:
   let _bap = (bap-plugins.override { plugins = [ bap-asli-plugin ]; });
   in stdenv.mkDerivation {
     pname = "bap-aslp";
@@ -31,4 +31,10 @@
           --append-flags --asli-specs=$ASLI_PATH/tests/override.asl
       done
     '';
+
+    passthru.tests.asli = testers.testVersion {
+      package = bap-aslp;
+      command = "bap-aslp --help";
+      version = "asli-specs";
+    };
   }

bap-plugins.nix

@@ -6,9 +6,16 @@
     paths = [ ocamlPackages.bap ];
     buildInputs = [ makeWrapper ];
     postBuild = ''
+      for x in ${toString plugins}; do
+        if ! [[ -d "$x/lib/bap" ]]; then
+          echo "$x/lib/bap" plugin path does not exist >&2
+          false
+        fi
+      done
+
       for b in $out/bin/*; do 
         wrapProgram $b \
-          --append-flags "${toString (map (x: "-L ${x}") plugins)}"
+          --append-flags "${toString (map (x: "-L ${x + "/lib/bap"}") plugins)}"
       done
     '';
   }

bap-uq-pac.nix

@@ -1,10 +1,11 @@
 { fetchFromGitHub, ocamlPackages }:
-  ocamlPackages.bap.overrideAttrs rec {
+  ocamlPackages.bap.overrideAttrs (final: prev: {
     version = "unstable-2022-11-22";
+    # buildInputs = (prev.buildInputs or []) ++ [ asli ];
     src = fetchFromGitHub {
       owner = "UQ-PAC";
       repo = "bap";
       rev = "acfdc1067afa847fa1eadac9700eae349434dc3b";
       sha256 = "sha256-FkfwMTbA9QS3vy4rs5Ua4egZg6/gQy3YzUG8xEyFo4A=";
     };
-  }
+  })

default.nix

@@ -0,0 +1 @@
+./pkgs.nix

update.sh

@@ -28,7 +28,7 @@ do-upgrade() {
   [[ $MODE == upgrade ]]
 }
 
-PKGS=./pkgs.nix
+PKGS=. # uses default.nix in current directory
 TMP=$(mktemp)
 
 PID=$$
@@ -66,7 +66,7 @@ update-github() {
   if do-upgrade; then
     nix-update -f "$PKGS" $attr --version branch=$branch --commit "${ARGS[@]}"
   else
-    current=$(nix-instantiate --eval -E "(import ./$PKGS {}).$attr.src.rev" | jq -r)
+    current=$(nix-instantiate --eval $PKGS -A $attr.src.rev | jq -r)
     COMPARE="https://api.github.com/repos/$repo/compare/$current...$branch"
     compare=$(curl "$COMPARE")