isabelle-linter: 2021-1 -> 2022-09-05

pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix

@@ -2,16 +2,28 @@
 
 stdenv.mkDerivation rec {
   pname = "isabelle-linter";
-  version = "Isabelle2021-1-v1.0.0";
+  version = "unstable-2022-09-05";
 
   src = fetchFromGitHub {
     owner = "isabelle-prover";
     repo = "isabelle-linter";
-    rev = version;
-    sha256 = "0v6scc2rhj6bjv530gzz6i57czzcgpkw7a9iqnfdnm5gvs5qjk7a";
+    rev = "0424fc05426d5f7a23adf19ad08c690c17184e86";
+    sha256 = "02afbgmi195ibichjkpni2wjgjkszv7i6qkmmprwrmb4jd2wdvd5";
   };
 
-  installPhase = import ./mkBuild.nix { inherit isabelle; path = "${pname}-${version}"; };
+  nativeBuildInputs = [ isabelle ];
+
+  buildPhase = ''
+    export HOME=$TMP
+    isabelle components -u $(pwd)
+    isabelle scala_build
+  '';
+
+  installPhase = ''
+    dir=$out/Isabelle${isabelle.version}/contrib/${pname}-${version}
+    mkdir -p $dir
+    cp -r * $dir/
+  '';
 
   meta = with lib; {
     description = "Linter component for Isabelle.";

pkgs/applications/science/logic/isabelle/components/mkBuild.nix

@@ -1,36 +0,0 @@
-{ isabelle, path }:
-
-let
-  dir = "$out/isabelle/${isabelle.dirname}";
-  iDir = "${isabelle}/${isabelle.dirname}";
-in ''
-  shopt -s extglob
-  mkdir -p ${dir}/lib/classes
-
-  cDir=$out/${isabelle.dirname}/contrib/${path}
-  mkdir -p $cDir
-  cp -r !(isabelle) $cDir
-
-  cd ${dir}
-  ln -s ${iDir}/!(lib|bin) ./
-  ln -s ${iDir}/lib/!(classes) lib/
-  ln -s ${iDir}/lib/classes/* lib/classes/
-
-  mkdir bin/
-  cp ${iDir}/bin/* bin/
-
-  export HOME=$TMP
-  bin/isabelle components -u $cDir
-  bin/isabelle scala_build
-
-  cd lib/classes
-  for f in ${iDir}/lib/classes/*; do
-    rm $(basename $f)
-  done
-
-  lDir=$out/${isabelle.dirname}/lib/classes/
-  mkdir -p $lDir
-  cp -r * $lDir
-  cd $out
-  rm -rf isabelle
-''