diff options
| author | Lassulus <github@lassul.us> | 2020-08-23 11:28:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-23 11:28:53 +0200 |
| commit | 15d98507ee48dd016b2740462edb7ecf49c5c846 (patch) | |
| tree | 72e5182925367901323fa4b5859a6679d35a0e3b /pkgs/top-level/all-packages.nix | |
| parent | cbe44821c3eec533593569b15b4b40d7828a2e68 (diff) | |
| parent | 877af721616e5989b0826e01fdda37b02309679d (diff) | |
| download | nixpkgs-15d98507ee48dd016b2740462edb7ecf49c5c846.tar nixpkgs-15d98507ee48dd016b2740462edb7ecf49c5c846.tar.gz nixpkgs-15d98507ee48dd016b2740462edb7ecf49c5c846.tar.bz2 nixpkgs-15d98507ee48dd016b2740462edb7ecf49c5c846.tar.lz nixpkgs-15d98507ee48dd016b2740462edb7ecf49c5c846.tar.xz nixpkgs-15d98507ee48dd016b2740462edb7ecf49c5c846.tar.zst nixpkgs-15d98507ee48dd016b2740462edb7ecf49c5c846.zip | |
Merge pull request #87224 from Sohalt/isabelle
isabelle: 2018 -> 2020
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffbe244d89b..56792c2e612 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25827,11 +25827,11 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = stdenv.lib.overrideDerivation polyml57 (attrs: { + polyml = stdenv.lib.overrideDerivation polyml (attrs: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); - java = if stdenv.isLinux then jre else jdk; + java = openjdk11; }; iprover = callPackage ../applications/science/logic/iprover { }; |