summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--isabelle-nix-fhsenv/default.nix15
1 files changed, 8 insertions, 7 deletions
diff --git a/isabelle-nix-fhsenv/default.nix b/isabelle-nix-fhsenv/default.nix
index dd4c7f8..a6fabc7 100644
--- a/isabelle-nix-fhsenv/default.nix
+++ b/isabelle-nix-fhsenv/default.nix
@@ -4,7 +4,7 @@ with pkgs;
let
isabelle2021_1 = stdenv.mkDerivation {
pname = "isabelle-unpatched";
- version = "2021";
+ version = "2021-1";
src = fetchzip {
url = "https://isabelle.in.tum.de/dist/Isabelle2021-1_linux.tar.gz";
@@ -19,7 +19,7 @@ let
};
isabelle2022 = stdenv.mkDerivation {
pname = "isabelle-unpatched";
- version = "2021";
+ version = "2022";
src = fetchzip {
url = "https://isabelle.in.tum.de/dist/Isabelle2022_linux.tar.gz";
@@ -32,8 +32,8 @@ let
cp -r $src/* $out
'';
};
- mkEnv = isabelle: buildFHSUserEnv {
- name = "isabelle";
+ mkEnv = name: isabelle: buildFHSUserEnv {
+ inherit name;
targetPkgs = pkgs: with pkgs; [
dbus expat file fontconfig freetype gdb glib
gmp
@@ -42,9 +42,10 @@ let
xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrandr xorg.libXrender
xorg.libXtst xorg.libxcb xorg.xcbutilkeysyms zlib
];
- runScript = "${isabelle.outPath}/bin/isabelle";
+ runScript = isabelle;
};
in {
- isabelle2021_1 = mkEnv isabelle2021_1;
- isabelle2022 = mkEnv isabelle2022;
+ isabelle2021_1 = mkEnv "isabelle" "${isabelle2021_1}/bin/isabelle";
+ isabelle2022 = mkEnv "isabelle" "${isabelle2022}/bin/isabelle";
+ inherit mkEnv;
}