add isabelle 2022

1 files changed, 30 insertions, 14 deletions

diff --git a/isabelle-nix-fhsenv/default.nix b/isabelle-nix-fhsenv/default.nix
index 85b04f3..dd4c7f8 100644
--- a/isabelle-nix-fhsenv/default.nix
+++ b/isabelle-nix-fhsenv/default.nix
@@ -2,7 +2,7 @@
 
 with pkgs;
 let
-  isabelle = stdenv.mkDerivation {
+  isabelle2021_1 = stdenv.mkDerivation {
     pname = "isabelle-unpatched";
     version = "2021";
 
@@ -12,23 +12,39 @@ let
     };
 
     phases = [ "buildPhase" ];
+    buildPhase = ''
+      mkdir -p $out
+      cp -r $src/* $out
+    '';
+  };
+  isabelle2022 = stdenv.mkDerivation {
+    pname = "isabelle-unpatched";
+    version = "2021";
+
+    src = fetchzip {
+      url = "https://isabelle.in.tum.de/dist/Isabelle2022_linux.tar.gz";
+      sha256 = "sha256-qwcCRAa8fuGMXbI8og+kbZ0HCel1YKb34EJsc7GUz3s=";
+    };
 
+    phases = [ "buildPhase" ];
     buildPhase = ''
       mkdir -p $out
-      echo $src
       cp -r $src/* $out
     '';
   };
-in
-buildFHSUserEnv {
-  name = "isabelle";
-  targetPkgs = pkgs: with pkgs; [
-    dbus expat file fontconfig freetype gdb glib 
-    gmp
-    nspr nss udev xorg.libX11
-    xorg.libXScrnSaver xorg.libXcomposite xorg.libXcursor xorg.libXdamage
-    xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrandr xorg.libXrender
-    xorg.libXtst xorg.libxcb xorg.xcbutilkeysyms zlib
-  ];
-  runScript = "${isabelle.outPath}/bin/isabelle";
+  mkEnv = isabelle: buildFHSUserEnv {
+    name = "isabelle";
+    targetPkgs = pkgs: with pkgs; [
+      dbus expat file fontconfig freetype gdb glib 
+      gmp
+      nspr nss udev xorg.libX11
+      xorg.libXScrnSaver xorg.libXcomposite xorg.libXcursor xorg.libXdamage
+      xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrandr xorg.libXrender
+      xorg.libXtst xorg.libxcb xorg.xcbutilkeysyms zlib
+    ];
+    runScript = "${isabelle.outPath}/bin/isabelle";
+  };
+in {
+  isabelle2021_1 = mkEnv isabelle2021_1;
+  isabelle2022 = mkEnv isabelle2022;
 }