commit 960122179adec66d41a54f5ddaae8503c0b8dd76 · pyrox.dev/nixpkgs

+12 -15

pkgs/applications/science/logic/isabelle/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, perl, nettools, java, polyml, proofgeneral }:

     

       1
       1
       +
       { stdenv, fetchurl, perl, nettools, java, polyml }:

     

       2
       2
        
       # nettools needed for hostname

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
       -
         dirname = "Isabelle2015";

     

       5
       5
       +
         dirname = "Isabelle2016";

     

       6
       6
        
         theories = ["HOL" "FOL" "ZF"];

     

       7
       7
        
       in

     

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation {

     

       10
       10
       -
         name = "isabelle-2015";

     

       10
       10
       +
         name = "isabelle-2016";

     

       11
       11
        
         inherit dirname theories;

     

       12
       12
        
       

     

       13
       13
        
         src = if stdenv.isDarwin

     

       14
       14
        
           then fetchurl {

     

       15
       15
       -
             url = http://isabelle.in.tum.de/dist/Isabelle2015.dmg;

     

       16
       16
       -
             sha256 = "1vhm10qc1rn3wy9r12clrl33p64h3q1aj41mcnxkbnsyg2bx03im";

     

       15
       15
       +
             url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg";

     

       16
       16
       +
             sha256 = "0wawf0cjc52h8hif1867p33qhlh6qz0fy5i2kr1gbf7psickd6iw";

     

       17
       17
        
           }

     

       18
       18
        
           else fetchurl {

     

       19
       19
       -
             url = http://isabelle.in.tum.de/dist/Isabelle2015_linux.tar.gz;

     

       20
       20
       -
             sha256 = "13kqm458d8mw7il1zg5bdb1nfbb869p331d75xzlm2v9xgjxx862";

     

       19
       19
       +
             url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";

     

       20
       20
       +
             sha256 = "0jh1qrsyib13fycymwvw7dq7xfy4iyplwq0s65ash842cdzkbxb4";

     

       21
       21
        
           };

     

       22
       22
        
       

     

       23
       23
        
         buildInputs = [ perl polyml ]

     
···

       34
       34
        
             --replace /usr/bin/env $ENV

     

       35
       35
        
           sed -i 's|isabelle_java java|${java}/bin/java|g' lib/Tools/java

     

       36
       36
        
           substituteInPlace etc/settings \

     

       37
       37
       -
             --subst-var-by ML_HOME "${polyml}/bin" \

     

       38
       38
       -
             --subst-var-by PROOFGENERAL_HOME "${proofgeneral}/share/emacs/site-lisp/ProofGeneral"

     

       37
       37
       +
             --subst-var-by ML_HOME "${polyml}/bin"

     

       39
       38
        
           substituteInPlace contrib/jdk/etc/settings \

     

       40
       39
        
             --replace ISABELLE_JDK_HOME= '#ISABELLE_JDK_HOME='

     

       41
       40
        
           substituteInPlace contrib/polyml-*/etc/settings \

     

       42
       42
       -
             --replace 'ML_HOME="$POLYML_HOME/$ML_PLATFORM"' \

     

       43
       43
       -
                       "ML_HOME=\"${polyml}/bin\""

     

       44
       44
       -
         '';

     

       45
       45
       -
       

     

       46
       46
       -
         buildPhase = ''

     

       47
       47
       -
           ISABELLE_JDK_HOME=${java} ./bin/isabelle build -s $theories

     

       41
       41
       +
             --replace '$POLYML_HOME/$ML_PLATFORM' ${polyml}/bin \

     

       42
       42
       +
             --replace '$POLYML_HOME/$PLATFORM/polyml' ${polyml}/bin/poly

     

       43
       43
       +
           substituteInPlace lib/scripts/run-polyml* lib/scripts/polyml-version \

     

       44
       44
       +
             --replace '$ML_HOME/poly' ${polyml}/bin/poly

     

       48
       45
        
         '';

     

       49
       46
        
       

     

       50
       47
        
         installPhase = ''

+2 -2

pkgs/development/compilers/polyml/default.nix

···

       1
       1
        
       {stdenv, fetchurl, autoreconfHook}:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "5.5.2";

     

       4
       4
       +
         version = "5.6";

     

       5
       5
        
       in

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation {

     
···

       15
       15
        
       

     

       16
       16
        
         src = fetchurl {

     

       17
       17
        
           url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";

     

       18
       18
       -
           sha256 = "10m680qdad6bd50bav9xjsgmsxw8yxg55vr7grbg0gvykzl2pzbk";

     

       18
       18
       +
           sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         meta = {

-1

pkgs/top-level/all-packages.nix

···

       15384
       15384
        
         tini = callPackage ../applications/virtualization/tini {};

     

       15385
       15385
        
       

     

       15386
       15386
        
         isabelle = callPackage ../applications/science/logic/isabelle {

     

       15387
       15387
       -
           inherit (pkgs.emacs24Packages) proofgeneral;

     

       15388
       15387
        
           java = if stdenv.isLinux then jre else jdk;

     

       15389
       15388
        
         };

     

       15390
       15389