commit 151a2eced20fc3ced498e2314cce33487478bf75 · pyrox.dev/nixpkgs

+3 -3

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

···

       19
       19
        
         ocamlPackages_4_10,

     

       20
       20
        
         ocamlPackages_4_12,

     

       21
       21
        
         ocamlPackages_4_14,

     

       22
       22
       +
         rocqPackages, # for versions >= 9.0 that are transition shims on top of Rocq

     

       22
       23
        
         ncurses,

     

       23
       24
        
         buildIde ? null, # default is true for Coq < 8.14 and false for Coq >= 8.14

     

       24
       25
        
         glib,

     
···

       27
       28
        
         makeDesktopItem,

     

       28
       29
        
         copyDesktopItems,

     

       29
       30
        
         csdp ? null,

     

       30
       30
       -
         rocq-core, # for versions >= 9.0 that are transition shims on top of Rocq

     

       31
       31
        
         version,

     

       32
       32
        
         coq-version ? null,

     

       33
       33
        
       }@args:

     
···

       148
       148
        
         self = stdenv.mkDerivation {

     

       149
       149
        
           pname = "coq";

     

       150
       150
        
           inherit (fetched) version src;

     

       151
       151
       -
           exact-version = args.version;

     

       152
       151
        
       

     

       153
       152
        
           passthru = {

     

       154
       153
        
             inherit coq-version;

     
···

       161
       160
        
               findlib

     

       162
       161
        
               num

     

       163
       162
        
               ;

     

       163
       163
       +
             rocqPackages = lib.optionalAttrs (coqAtLeast "8.21") rocqPackages;

     

       164
       164
        
             emacsBufferSetup = pkgs: ''

     

       165
       165
        
               ; Propagate coq paths to children

     

       166
       166
        
               (inherit-local-permanent coq-prog-name "${self}/bin/coqtop")

     
···

       334
       334
        
         self.overrideAttrs (o: {

     

       335
       335
        
           # coq-core is now a shim for rocq

     

       336
       336
        
           propagatedBuildInputs = o.propagatedBuildInputs ++ [

     

       337
       337
       -
             (rocq-core.override { version = o.exact-version; })

     

       337
       337
       +
             rocqPackages.rocq-core

     

       338
       338
        
           ];

     

       339
       339
        
           buildPhase = ''

     

       340
       340
        
             runHook preBuild

+50 -73

pkgs/development/coq-modules/bignums/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         mkCoqDerivation,

     

       4
       4
        
         coq,

     

       5
       5
       -
         rocqPackages_9_0,

     

       6
       6
       -
         rocqPackages_9_1,

     

       7
       7
       -
         rocqPackages,

     

       8
       5
        
         stdlib,

     

       9
       6
        
         version ? null,

     

       10
       7
        
       }:

     

       11
       8
        
       

     

       12
       12
       -
       (mkCoqDerivation {

     

       13
       13
       -
         pname = "bignums";

     

       14
       14
       -
         owner = "rocq-community";

     

       15
       15
       -
         inherit version;

     

       16
       16
       -
         defaultVersion =

     

       17
       17
       -
           let

     

       18
       18
       -
             case = case: out: { inherit case out; };

     

       19
       19
       -
           in

     

       20
       20
       -
           with lib.versions;

     

       21
       21
       -
           lib.switch coq.coq-version [

     

       22
       22
       -
             (case (range "9.0" "9.1") "9.0.0+rocq${coq.coq-version}")

     

       23
       23
       -
             (case (range "8.13" "8.20") "9.0.0+coq${coq.coq-version}")

     

       24
       24
       -
             (case (range "8.6" "8.17") "${coq.coq-version}.0")

     

       25
       25
       -
           ] null;

     

       9
       9
       +
       let

     

       10
       10
       +
         derivation = mkCoqDerivation {

     

       11
       11
       +
           pname = "bignums";

     

       12
       12
       +
           owner = "rocq-community";

     

       13
       13
       +
           inherit version;

     

       14
       14
       +
           defaultVersion =

     

       15
       15
       +
             let

     

       16
       16
       +
               case = case: out: { inherit case out; };

     

       17
       17
       +
             in

     

       18
       18
       +
             with lib.versions;

     

       19
       19
       +
             lib.switch coq.coq-version [

     

       20
       20
       +
               (case (range "8.13" "8.20") "9.0.0+coq${coq.coq-version}")

     

       21
       21
       +
               (case (range "8.6" "8.17") "${coq.coq-version}.0")

     

       22
       22
       +
             ] null;

     

       26
       23
        
       

     

       27
       27
       -
         release."9.0.0+rocq9.1".sha256 = "sha256-MSjlfJs3JOakuShOj+isNlus0bKlZ+rkvzRoKZQK5RQ=";

     

       28
       28
       -
         release."9.0.0+rocq9.0".sha256 = "sha256-ctnwpyNVhryEUA5YEsAImrcJsNMhtBgDSOz+z5Z4R78=";

     

       29
       29
       -
         release."9.0.0+coq8.20".sha256 = "sha256-pkvyDaMXRalc6Uu1eBTuiqTpRauRrzu946c6TavyTKY=";

     

       30
       30
       -
         release."9.0.0+coq8.19".sha256 = "sha256-02uL+qWbUveHe67zKfc8w3U0iN3X2DKBsvP3pKpW8KQ=";

     

       31
       31
       -
         release."9.0.0+coq8.18".sha256 = "sha256-vLeJ0GNKl4M84Uj2tAwlrxJOSR6VZoJQvdlDhxJRge8=";

     

       32
       32
       -
         release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY=";

     

       33
       33
       -
         release."9.0.0+coq8.16".sha256 = "sha256-pwFTl4Unr2ZIirAB3HTtfhL2YN7G/Pg88RX9AhKWXbE=";

     

       34
       34
       -
         release."9.0.0+coq8.15".sha256 = "sha256-2oGOANn3XULHNIlyqjZ5ppQTQa2QF1zzf3YjHAd/pjo=";

     

       35
       35
       -
         release."9.0.0+coq8.14".sha256 = "sha256-qTU152Dz34W6nFZ0pPbja9ouUm/714ZrLQ/Z4N/HIC4=";

     

       36
       36
       -
         release."9.0.0+coq8.13".sha256 = "sha256-zvAqV3VAB7cN+nlMhjSXzxuDkdd387ju2VSb2EUthI0=";

     

       37
       37
       -
         release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw=";

     

       38
       38
       -
         release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4=";

     

       39
       39
       -
         release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns";

     

       40
       40
       -
         release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06";

     

       41
       41
       -
         release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y";

     

       42
       42
       -
         release."8.12.0".sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8";

     

       43
       43
       -
         release."8.11.0".sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp";

     

       44
       44
       -
         release."8.10.0".sha256 = "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5";

     

       45
       45
       -
         release."8.9.0".sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01";

     

       46
       46
       -
         release."8.8.0".sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";

     

       47
       47
       -
         release."8.7.0".sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";

     

       48
       48
       -
         release."8.6.0".rev = "v8.6.0";

     

       49
       49
       -
         release."8.6.0".sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj";

     

       50
       50
       -
         releaseRev = v: "${if lib.versions.isGe "9.0" v then "v" else "V"}${v}";

     

       24
       24
       +
           release."9.0.0+coq8.20".sha256 = "sha256-pkvyDaMXRalc6Uu1eBTuiqTpRauRrzu946c6TavyTKY=";

     

       25
       25
       +
           release."9.0.0+coq8.19".sha256 = "sha256-02uL+qWbUveHe67zKfc8w3U0iN3X2DKBsvP3pKpW8KQ=";

     

       26
       26
       +
           release."9.0.0+coq8.18".sha256 = "sha256-vLeJ0GNKl4M84Uj2tAwlrxJOSR6VZoJQvdlDhxJRge8=";

     

       27
       27
       +
           release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY=";

     

       28
       28
       +
           release."9.0.0+coq8.16".sha256 = "sha256-pwFTl4Unr2ZIirAB3HTtfhL2YN7G/Pg88RX9AhKWXbE=";

     

       29
       29
       +
           release."9.0.0+coq8.15".sha256 = "sha256-2oGOANn3XULHNIlyqjZ5ppQTQa2QF1zzf3YjHAd/pjo=";

     

       30
       30
       +
           release."9.0.0+coq8.14".sha256 = "sha256-qTU152Dz34W6nFZ0pPbja9ouUm/714ZrLQ/Z4N/HIC4=";

     

       31
       31
       +
           release."9.0.0+coq8.13".sha256 = "sha256-zvAqV3VAB7cN+nlMhjSXzxuDkdd387ju2VSb2EUthI0=";

     

       32
       32
       +
           release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw=";

     

       33
       33
       +
           release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4=";

     

       34
       34
       +
           release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns";

     

       35
       35
       +
           release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06";

     

       36
       36
       +
           release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y";

     

       37
       37
       +
           release."8.12.0".sha256 = "14ijb3qy2hin3g4djx437jmnswxxq7lkfh3dwh9qvrds9a015yg8";

     

       38
       38
       +
           release."8.11.0".sha256 = "1xcd7c7qlvs0narfba6px34zq0mz8rffnhxw0kzhhg6i4iw115dp";

     

       39
       39
       +
           release."8.10.0".sha256 = "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5";

     

       40
       40
       +
           release."8.9.0".sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01";

     

       41
       41
       +
           release."8.8.0".sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";

     

       42
       42
       +
           release."8.7.0".sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";

     

       43
       43
       +
           release."8.6.0".rev = "v8.6.0";

     

       44
       44
       +
           release."8.6.0".sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj";

     

       45
       45
       +
           releaseRev = v: "${if lib.versions.isGe "9.0" v then "v" else "V"}${v}";

     

       51
       46
        
       

     

       52
       52
       -
         mlPlugin = true;

     

       47
       47
       +
           mlPlugin = true;

     

       53
       48
        
       

     

       54
       54
       -
         propagatedBuildInputs = [ stdlib ];

     

       49
       49
       +
           propagatedBuildInputs = [ stdlib ];

     

       55
       50
        
       

     

       56
       56
       -
         meta = {

     

       57
       57
       -
           license = lib.licenses.lgpl2;

     

       51
       51
       +
           meta = {

     

       52
       52
       +
             license = lib.licenses.lgpl2;

     

       53
       53
       +
           };

     

       58
       54
        
         };

     

       59
       59
       -
       }).overrideAttrs

     

       60
       60
       -
         (

     

       61
       61
       -
           o:

     

       62
       62
       -
           # this is just a wrapper for rocPackages.bignums for Rocq >= 9.0

     

       63
       63
       -
           lib.optionalAttrs

     

       64
       64
       -
             (coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version))

     

       65
       65
       -
             (

     

       66
       66
       -
               let

     

       67
       67
       -
                 case = case: out: { inherit case out; };

     

       68
       68
       -
                 rp = lib.switch coq.coq-version [

     

       69
       69
       -
                   (case (lib.versions.isEq "9.0") rocqPackages_9_0)

     

       70
       70
       -
                   (case (lib.versions.isEq "9.1") rocqPackages_9_1)

     

       71
       71
       -
                 ] rocqPackages;

     

       72
       72
       -
               in

     

       73
       73
       -
               {

     

       74
       74
       -
                 configurePhase = ''

     

       75
       75
       -
                   echo no configuration

     

       76
       76
       -
                 '';

     

       77
       77
       -
                 buildPhase = ''

     

       78
       78
       -
                   echo building nothing

     

       79
       79
       -
                 '';

     

       80
       80
       -
                 installPhase = ''

     

       81
       81
       -
                   echo installing nothing

     

       82
       82
       -
                 '';

     

       83
       83
       -
                 propagatedBuildInputs = o.propagatedBuildInputs ++ [ rp.bignums ];

     

       84
       84
       -
               }

     

       85
       85
       -
             )

     

       86
       86
       -
         )

     

       55
       55
       +
       in

     

       56
       56
       +
       # this is just a wrapper for rocqPackages.bignums for Rocq >= 9.0

     

       57
       57
       +
       if coq.rocqPackages ? bignums then

     

       58
       58
       +
         coq.rocqPackages.bignums.override {

     

       59
       59
       +
           inherit version stdlib;

     

       60
       60
       +
           inherit (coq.rocqPackages) rocq-core;

     

       61
       61
       +
         }

     

       62
       62
       +
       else

     

       63
       63
       +
         derivation

+17 -35

pkgs/development/coq-modules/coq-elpi/default.nix

···

       3
       3
        
         mkCoqDerivation,

     

       4
       4
        
         which,

     

       5
       5
        
         coq,

     

       6
       6
       -
         rocqPackages_9_0,

     

       7
       7
       -
         rocqPackages_9_1,

     

       8
       8
       -
         rocqPackages,

     

       9
       6
        
         stdlib,

     

       10
       7
        
         version ? null,

     

       11
       8
        
         elpi-version ? null,

     
···

       23
       20
        
               in

     

       24
       21
        
               with lib.versions;

     

       25
       22
        
               lib.switch coq.coq-version [

     

       26
       26
       -
                 (case (range "8.20" "9.1") "2.0.7")

     

       23
       23
       +
                 (case (range "8.20" "8.20") "2.0.7")

     

       27
       24
        
                 (case (range "8.18" "8.19") "1.18.1")

     

       28
       25
        
                 (case (range "8.16" "8.17") "1.17.0")

     

       29
       26
        
                 (case "8.15" "1.15.0")

     
···

       47
       44
        
             in

     

       48
       45
        
             with lib.versions;

     

       49
       46
        
             lib.switch coq.coq-version [

     

       50
       50
       -
               (case (range "8.20" "9.1") "2.6.0")

     

       51
       51
       -
               (case (range "8.20" "9.0") "2.5.2")

     

       47
       47
       +
               (case (range "8.20" "8.20") "2.6.0")

     

       48
       48
       +
               (case (range "8.20" "8.20") "2.5.2")

     

       52
       49
        
               (case "8.19" "2.0.1")

     

       53
       50
        
               (case "8.18" "2.0.0")

     

       54
       51
        
               (case "8.17" "1.18.0")

     
···

       141
       138
        
         );

     

       142
       139
        
         patched-derivation4 = patched-derivation3.overrideAttrs (

     

       143
       140
        
           o:

     

       144
       144
       -
           # this is just a wrapper for rocPackages.rocq-elpi for Rocq >= 9.0

     

       145
       145
       -
           if coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version) then

     

       146
       146
       -
             let

     

       147
       147
       -
               case = case: out: { inherit case out; };

     

       148
       148
       -
               rp = lib.switch coq.coq-version [

     

       149
       149
       -
                 (case "9.0" rocqPackages_9_0)

     

       150
       150
       -
                 (case "9.1" rocqPackages_9_1)

     

       151
       151
       -
               ] rocqPackages;

     

       152
       152
       -
             in

     

       141
       141
       +
           lib.optionalAttrs (o.version != null && (o.version == "dev" || lib.versions.isGe "2.5.0" o.version))

     

       153
       142
        
             {

     

       154
       143
        
               configurePhase = ''

     

       155
       155
       -
                 echo no configuration

     

       144
       144
       +
                 make dune-files || true

     

       156
       145
        
               '';

     

       157
       146
        
               buildPhase = ''

     

       158
       158
       -
                 echo building nothing

     

       147
       147
       +
                 dune build -p rocq-elpi @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}

     

       159
       148
        
               '';

     

       160
       149
        
               installPhase = ''

     

       161
       161
       -
                 echo installing nothing

     

       150
       150
       +
                 dune install --root . rocq-elpi --prefix=$out --libdir $OCAMLFIND_DESTDIR

     

       151
       151
       +
                 mkdir $out/lib/coq/

     

       152
       152
       +
                 mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version}

     

       162
       153
        
               '';

     

       163
       163
       -
               propagatedBuildInputs = o.propagatedBuildInputs ++ [ rp.rocq-elpi ];

     

       164
       154
        
             }

     

       165
       165
       -
           else

     

       166
       166
       -
             lib.optionalAttrs (o.version != null && (o.version == "dev" || lib.versions.isGe "2.5.0" o.version))

     

       167
       167
       -
               {

     

       168
       168
       -
                 configurePhase = ''

     

       169
       169
       -
                   make dune-files || true

     

       170
       170
       -
                 '';

     

       171
       171
       -
                 buildPhase = ''

     

       172
       172
       -
                   dune build -p rocq-elpi @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}

     

       173
       173
       -
                 '';

     

       174
       174
       -
                 installPhase = ''

     

       175
       175
       -
                   dune install --root . rocq-elpi --prefix=$out --libdir $OCAMLFIND_DESTDIR

     

       176
       176
       -
                   mkdir $out/lib/coq/

     

       177
       177
       -
                   mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version}

     

       178
       178
       -
                 '';

     

       179
       179
       -
               }

     

       180
       155
        
         );

     

       181
       156
        
       in

     

       182
       182
       -
       patched-derivation4

     

       157
       157
       +
       # this is just a wrapper for rocqPackages.stdlib for Rocq >= 9.0

     

       158
       158
       +
       if coq.rocqPackages ? rocq-elpi then

     

       159
       159
       +
         coq.rocqPackages.rocq-elpi.override {

     

       160
       160
       +
           inherit version elpi-version;

     

       161
       161
       +
           inherit (coq.rocqPackages) rocq-core;

     

       162
       162
       +
         }

     

       163
       163
       +
       else

     

       164
       164
       +
         patched-derivation4

+24 -43

pkgs/development/coq-modules/hierarchy-builder/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         mkCoqDerivation,

     

       4
       4
        
         coq,

     

       5
       5
       -
         rocqPackages_9_0,

     

       6
       6
       -
         rocqPackages_9_1,

     

       7
       7
       -
         rocqPackages,

     

       8
       5
        
         stdlib,

     

       9
       6
        
         coq-elpi,

     

       10
       7
        
         version ? null,

     
···

       21
       18
        
             in

     

       22
       19
        
             with lib.versions;

     

       23
       20
        
             lib.switch coq.coq-version [

     

       24
       24
       -
               (case (range "8.20" "9.1") "1.9.1")

     

       21
       21
       +
               (case (range "8.20" "8.20") "1.9.1")

     

       25
       22
        
               (case (range "8.19" "8.20") "1.8.0")

     

       26
       23
        
               (case (range "8.18" "8.20") "1.7.1")

     

       27
       24
        
               (case (range "8.16" "8.18") "1.6.0")

     
···

       60
       57
        
             license = licenses.mit;

     

       61
       58
        
           };

     

       62
       59
        
         };

     

       60
       60
       +
         hb2 = hb.overrideAttrs (

     

       61
       61
       +
           o:

     

       62
       62
       +
           lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev") {

     

       63
       63
       +
             buildPhase = "make build";

     

       64
       64
       +
           }

     

       65
       65
       +
           // (

     

       66
       66
       +
             if lib.versions.isGe "1.1.0" o.version || o.version == "dev" then

     

       67
       67
       +
               { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; }

     

       68
       68
       +
             else

     

       69
       69
       +
               { installFlags = [ "VFILES=structures.v" ] ++ o.installFlags; }

     

       70
       70
       +
           )

     

       71
       71
       +
           // lib.optionalAttrs (o.version != null && o.version == "1.8.1") {

     

       72
       72
       +
             propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ];

     

       73
       73
       +
           }

     

       74
       74
       +
         );

     

       63
       75
        
       in

     

       64
       64
       -
       hb.overrideAttrs (

     

       65
       65
       -
         o:

     

       66
       66
       -
         lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev") {

     

       67
       67
       -
           buildPhase = "make build";

     

       76
       76
       +
       # this is just a wrapper for rocqPackages.hierarchy-builder for Rocq >= 9.0

     

       77
       77
       +
       if coq.rocqPackages ? hierarchy-builder then

     

       78
       78
       +
         coq.rocqPackages.hierarchy-builder.override {

     

       79
       79
       +
           inherit version;

     

       80
       80
       +
           inherit (coq.rocqPackages) rocq-core;

     

       81
       81
       +
           rocq-elpi = coq-elpi;

     

       68
       82
        
         }

     

       69
       69
       -
         // (

     

       70
       70
       -
           if lib.versions.isGe "1.1.0" o.version || o.version == "dev" then

     

       71
       71
       -
             { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; }

     

       72
       72
       -
           else

     

       73
       73
       -
             { installFlags = [ "VFILES=structures.v" ] ++ o.installFlags; }

     

       74
       74
       -
         )

     

       75
       75
       -
         // lib.optionalAttrs (o.version != null && o.version == "1.8.1") {

     

       76
       76
       -
           propagatedBuildInputs = o.propagatedBuildInputs ++ [ stdlib ];

     

       77
       77
       -
         }

     

       78
       78
       -
         # this is just a wrapper for rocqPackages.hierarchy-builder for Rocq >= 9.0

     

       79
       79
       -
         //

     

       80
       80
       -
           lib.optionalAttrs

     

       81
       81
       -
             (coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version))

     

       82
       82
       -
             (

     

       83
       83
       -
               let

     

       84
       84
       -
                 case = case: out: { inherit case out; };

     

       85
       85
       -
                 rp = lib.switch coq.coq-version [

     

       86
       86
       -
                   (case "9.0" rocqPackages_9_0)

     

       87
       87
       -
                   (case "9.1" rocqPackages_9_1)

     

       88
       88
       -
                 ] rocqPackages;

     

       89
       89
       -
               in

     

       90
       90
       -
               {

     

       91
       91
       -
                 configurePhase = ''

     

       92
       92
       -
                   echo no configuration

     

       93
       93
       -
                 '';

     

       94
       94
       -
                 buildPhase = ''

     

       95
       95
       -
                   echo building nothing

     

       96
       96
       -
                 '';

     

       97
       97
       -
                 installPhase = ''

     

       98
       98
       -
                   echo installing nothing

     

       99
       99
       -
                 '';

     

       100
       100
       -
                 propagatedBuildInputs = o.propagatedBuildInputs ++ [ rp.hierarchy-builder ];

     

       101
       101
       -
               }

     

       102
       102
       -
             )

     

       103
       103
       -
       )

     

       83
       83
       +
       else

     

       84
       84
       +
         hb2

+30 -54

pkgs/development/coq-modules/parseque/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         mkCoqDerivation,

     

       4
       4
       -
         rocqPackages_9_0,

     

       5
       5
       -
         rocqPackages_9_1,

     

       6
       6
       -
         rocqPackages,

     

       7
       7
       -
         which,

     

       8
       4
        
         coq,

     

       9
       5
        
         version ? null,

     

       10
       6
        
       }:

     

       11
       7
        
       

     

       12
       8
        
       with lib;

     

       13
       13
       -
       (mkCoqDerivation {

     

       14
       14
       -
         pname = "parseque";

     

       15
       15
       -
         repo = "parseque";

     

       16
       16
       -
         owner = "rocq-community";

     

       9
       9
       +
       let

     

       10
       10
       +
         derivation = mkCoqDerivation {

     

       11
       11
       +
           pname = "parseque";

     

       12
       12
       +
           repo = "parseque";

     

       13
       13
       +
           owner = "rocq-community";

     

       17
       14
        
       

     

       18
       18
       -
         inherit version;

     

       19
       19
       -
         defaultVersion =

     

       20
       20
       -
           with versions;

     

       21
       21
       -
           switch

     

       22
       22
       -
             [ coq.coq-version ]

     

       23
       23
       -
             [

     

       24
       24
       -
               {

     

       25
       25
       -
                 cases = [ (range "8.16" "9.0") ];

     

       26
       26
       -
                 out = "0.2.2";

     

       27
       27
       -
               }

     

       28
       28
       -
             ]

     

       29
       29
       -
             null;

     

       15
       15
       +
           inherit version;

     

       16
       16
       +
           defaultVersion =

     

       17
       17
       +
             let

     

       18
       18
       +
               case = case: out: { inherit case out; };

     

       19
       19
       +
             in

     

       20
       20
       +
             with versions;

     

       21
       21
       +
             switch coq.coq-version [

     

       22
       22
       +
               (case (range "8.16" "8.20") "0.2.2")

     

       23
       23
       +
             ] null;

     

       30
       24
        
       

     

       31
       31
       -
         release."0.2.2".sha256 = "sha256-O50Rs7Yf1H4wgwb7ltRxW+7IF0b04zpfs+mR83rxT+E=";

     

       25
       25
       +
           release."0.2.2".sha256 = "sha256-O50Rs7Yf1H4wgwb7ltRxW+7IF0b04zpfs+mR83rxT+E=";

     

       32
       26
        
       

     

       33
       33
       -
         releaseRev = v: "v${v}";

     

       27
       27
       +
           releaseRev = v: "v${v}";

     

       34
       28
        
       

     

       35
       35
       -
         meta = {

     

       36
       36
       -
           description = "Total parser combinators in Coq/Rocq";

     

       37
       37
       -
           maintainers = with maintainers; [ womeier ];

     

       38
       38
       -
           license = licenses.mit;

     

       29
       29
       +
           meta = {

     

       30
       30
       +
             description = "Total parser combinators in Coq/Rocq";

     

       31
       31
       +
             maintainers = with maintainers; [ womeier ];

     

       32
       32
       +
             license = licenses.mit;

     

       33
       33
       +
           };

     

       39
       34
        
         };

     

       40
       40
       -
       }).overrideAttrs

     

       41
       41
       -
         (

     

       42
       42
       -
           o:

     

       43
       43
       -
           # this is just a wrapper for rocPackages.parseque for Rocq >= 9.0

     

       44
       44
       -
           lib.optionalAttrs

     

       45
       45
       -
             (coq.version != null && (coq.version == "dev" || lib.versions.isGe "9.0" coq.version))

     

       46
       46
       -
             (

     

       47
       47
       -
               let

     

       48
       48
       -
                 case = case: out: { inherit case out; };

     

       49
       49
       -
                 rp = lib.switch coq.coq-version [

     

       50
       50
       -
                   (case "9.0" rocqPackages_9_0)

     

       51
       51
       -
                   (case "9.1" rocqPackages_9_1)

     

       52
       52
       -
                 ] rocqPackages;

     

       53
       53
       -
               in

     

       54
       54
       -
               {

     

       55
       55
       -
                 configurePhase = ''

     

       56
       56
       -
                   echo no configuration

     

       57
       57
       -
                 '';

     

       58
       58
       -
                 buildPhase = ''

     

       59
       59
       -
                   echo building nothing

     

       60
       60
       -
                 '';

     

       61
       61
       -
                 installPhase = ''

     

       62
       62
       -
                   echo installing nothing

     

       63
       63
       -
                 '';

     

       64
       64
       -
                 propagatedBuildInputs = [ rp.parseque ];

     

       65
       65
       -
               }

     

       66
       66
       -
             )

     

       67
       67
       -
         )

     

       35
       35
       +
       in

     

       36
       36
       +
       # this is just a wrapper for rocqPackages.parseque for Rocq >= 9.0

     

       37
       37
       +
       if coq.rocqPackages ? parseque then

     

       38
       38
       +
         coq.rocqPackages.parseque.override {

     

       39
       39
       +
           inherit version;

     

       40
       40
       +
           inherit (coq.rocqPackages) rocq-core;

     

       41
       41
       +
         }

     

       42
       42
       +
       else

     

       43
       43
       +
         derivation

+43 -56

pkgs/development/coq-modules/stdlib/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         coq,

     

       3
       3
       -
         rocqPackages_9_0,

     

       4
       4
       -
         rocqPackages_9_1,

     

       5
       5
       -
         rocqPackages,

     

       6
       3
        
         mkCoqDerivation,

     

       7
       4
        
         lib,

     

       8
       5
        
         version ? null,

     

       9
       9
       -
       }@args:

     

       10
       10
       -
       (mkCoqDerivation {

     

       6
       6
       +
       }:

     

       11
       7
        
       

     

       12
       12
       -
         pname = "stdlib";

     

       13
       13
       -
         repo = "stdlib";

     

       14
       14
       -
         owner = "coq";

     

       15
       15
       -
         opam-name = "coq-stdlib";

     

       8
       8
       +
       let

     

       9
       9
       +
         derivation = mkCoqDerivation {

     

       16
       10
        
       

     

       17
       17
       -
         inherit version;

     

       18
       18
       -
         defaultVersion =

     

       19
       19
       -
           let

     

       20
       20
       -
             case = case: out: { inherit case out; };

     

       21
       21
       -
           in

     

       22
       22
       -
           with lib.versions;

     

       23
       23
       -
           lib.switch coq.coq-version [

     

       24
       24
       -
             (case (isLe "9.1") "9.0.0")

     

       25
       25
       -
             # the < 9.0 above is artificial as stdlib was included in Coq before

     

       26
       26
       -
           ] null;

     

       27
       27
       -
         releaseRev = v: "V${v}";

     

       11
       11
       +
           pname = "stdlib";

     

       12
       12
       +
           repo = "stdlib";

     

       13
       13
       +
           owner = "coq";

     

       14
       14
       +
           opam-name = "coq-stdlib";

     

       28
       15
        
       

     

       29
       29
       -
         release."9.0.0".sha256 = "sha256-2l7ak5Q/NbiNvUzIVXOniEneDXouBMNSSVFbD1Pf8cQ=";

     

       16
       16
       +
           inherit version;

     

       17
       17
       +
           defaultVersion =

     

       18
       18
       +
             let

     

       19
       19
       +
               case = case: out: { inherit case out; };

     

       20
       20
       +
             in

     

       21
       21
       +
             with lib.versions;

     

       22
       22
       +
             lib.switch coq.coq-version [

     

       23
       23
       +
               (case (isLe "9.1") "9.0.0")

     

       24
       24
       +
               # the < 9.0 above is artificial as stdlib was included in Coq before

     

       25
       25
       +
             ] null;

     

       26
       26
       +
           releaseRev = v: "V${v}";

     

       27
       27
       +
       

     

       28
       28
       +
           release."9.0.0".sha256 = "sha256-2l7ak5Q/NbiNvUzIVXOniEneDXouBMNSSVFbD1Pf8cQ=";

     

       30
       29
        
       

     

       31
       31
       -
         configurePhase = ''

     

       32
       32
       -
           echo no configuration

     

       33
       33
       -
         '';

     

       34
       34
       -
         buildPhase = ''

     

       35
       35
       -
           echo building nothing

     

       36
       36
       -
         '';

     

       37
       37
       -
         installPhase = ''

     

       38
       38
       -
           echo installing nothing

     

       39
       39
       -
         '';

     

       30
       30
       +
           configurePhase = ''

     

       31
       31
       +
             echo no configuration

     

       32
       32
       +
           '';

     

       33
       33
       +
           buildPhase = ''

     

       34
       34
       +
             echo building nothing

     

       35
       35
       +
           '';

     

       36
       36
       +
           installPhase = ''

     

       37
       37
       +
             echo installing nothing

     

       38
       38
       +
             touch $out

     

       39
       39
       +
           '';

     

       40
       40
        
       

     

       41
       41
       -
         meta = {

     

       42
       42
       -
           description = "Compatibility metapackage for Coq Stdlib library after the Rocq renaming";

     

       43
       43
       -
           license = lib.licenses.lgpl21Only;

     

       41
       41
       +
           meta = {

     

       42
       42
       +
             description = "Compatibility metapackage for Coq Stdlib library after the Rocq renaming";

     

       43
       43
       +
             license = lib.licenses.lgpl21Only;

     

       44
       44
       +
           };

     

       44
       45
        
         };

     

       45
       45
       -
       

     

       46
       46
       -
       }).overrideAttrs

     

       47
       47
       -
         (

     

       48
       48
       -
           o:

     

       49
       49
       -
           # stdlib is already included in Coq <= 8.20

     

       50
       50
       -
           if coq.version != null && coq.version != "dev" && lib.versions.isLt "8.21" coq.version then

     

       51
       51
       -
             {

     

       52
       52
       -
               installPhase = ''

     

       53
       53
       -
                 touch $out

     

       54
       54
       -
               '';

     

       55
       55
       -
             }

     

       56
       56
       -
           else

     

       57
       57
       -
             let

     

       58
       58
       -
               case = case: out: { inherit case out; };

     

       59
       59
       -
               rp = lib.switch coq.coq-version [

     

       60
       60
       -
                 (case "9.0" rocqPackages_9_0)

     

       61
       61
       -
                 (case "9.1" rocqPackages_9_1)

     

       62
       62
       -
               ] rocqPackages;

     

       63
       63
       -
             in

     

       64
       64
       -
             {

     

       65
       65
       -
               propagatedBuildInputs = [ rp.stdlib ];

     

       66
       66
       -
             }

     

       67
       67
       -
         )

     

       46
       46
       +
       in

     

       47
       47
       +
       # this is just a wrapper for rocqPackages.stdlib for Rocq >= 9.0

     

       48
       48
       +
       if coq.rocqPackages ? stdlib then

     

       49
       49
       +
         coq.rocqPackages.stdlib.override {

     

       50
       50
       +
           inherit version;

     

       51
       51
       +
           inherit (coq.rocqPackages) rocq-core;

     

       52
       52
       +
         }

     

       53
       53
       +
       else

     

       54
       54
       +
         derivation

-1

pkgs/development/rocq-modules/parseque/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         mkRocqDerivation,

     

       4
       4
       -
         which,

     

       5
       4
        
         stdlib,

     

       6
       5
        
         rocq-core,

     

       7
       6
        
         version ? null,

+20 -15

pkgs/top-level/all-packages.nix

···

       15463
       15463
        
         };

     

       15464
       15464
        
       

     

       15465
       15465
        
         inherit

     

       15466
       15466
       +
           (callPackage ./rocq-packages.nix {

     

       15467
       15467
       +
             inherit (ocaml-ng)

     

       15468
       15468
       +
               ocamlPackages_4_14

     

       15469
       15469
       +
               ;

     

       15470
       15470
       +
           })

     

       15471
       15471
       +
           mkRocqPackages

     

       15472
       15472
       +
           rocqPackages_9_0

     

       15473
       15473
       +
           rocq-core_9_0

     

       15474
       15474
       +
           rocqPackages_9_1

     

       15475
       15475
       +
           rocq-core_9_1

     

       15476
       15476
       +
           rocqPackages

     

       15477
       15477
       +
           rocq-core

     

       15478
       15478
       +
           ;

     

       15479
       15479
       +
       

     

       15480
       15480
       +
         inherit

     

       15466
       15481
        
           (callPackage ./coq-packages.nix {

     

       15467
       15482
        
             inherit (ocaml-ng)

     

       15468
       15483
        
               ocamlPackages_4_05

     
···

       15470
       15485
        
               ocamlPackages_4_10

     

       15471
       15486
        
               ocamlPackages_4_12

     

       15472
       15487
        
               ocamlPackages_4_14

     

       15488
       15488
       +
               ;

     

       15489
       15489
       +
             inherit

     

       15490
       15490
       +
               rocqPackages_9_0

     

       15491
       15491
       +
               rocqPackages_9_1

     

       15492
       15492
       +
               rocqPackages

     

       15473
       15493
        
               ;

     

       15474
       15494
        
           })

     

       15475
       15495
        
           mkCoqPackages

     
···

       15511
       15531
        
           coq_9_1

     

       15512
       15532
        
           coqPackages

     

       15513
       15533
        
           coq

     

       15514
       15514
       -
           ;

     

       15515
       15515
       -
       

     

       15516
       15516
       -
         inherit

     

       15517
       15517
       -
           (callPackage ./rocq-packages.nix {

     

       15518
       15518
       -
             inherit (ocaml-ng)

     

       15519
       15519
       -
               ocamlPackages_4_14

     

       15520
       15520
       -
               ;

     

       15521
       15521
       -
           })

     

       15522
       15522
       -
           mkRocqPackages

     

       15523
       15523
       -
           rocqPackages_9_0

     

       15524
       15524
       -
           rocq-core_9_0

     

       15525
       15525
       -
           rocqPackages_9_1

     

       15526
       15526
       -
           rocq-core_9_1

     

       15527
       15527
       -
           rocqPackages

     

       15528
       15528
       -
           rocq-core

     

       15529
       15534
        
           ;

     

       15530
       15535
        
       

     

       15531
       15536
        
         coq-kernel = callPackage ../applications/editors/jupyter-kernels/coq { };

+23 -19

pkgs/top-level/coq-packages.nix

···

       11
       11
        
         ocamlPackages_4_10,

     

       12
       12
        
         ocamlPackages_4_12,

     

       13
       13
        
         ocamlPackages_4_14,

     

       14
       14
       +
         rocqPackages_9_0,

     

       15
       15
       +
         rocqPackages_9_1,

     

       16
       16
       +
         rocqPackages,

     

       14
       17
        
         fetchpatch,

     

       15
       18
        
         makeWrapper,

     

       16
       19
        
         coq2html,

     
···

       265
       268
        
             ) (lib.attrNames set)

     

       266
       269
        
           );

     

       267
       270
        
         mkCoq =

     

       268
       268
       -
           version:

     

       271
       271
       +
           version: rp:

     

       269
       272
        
           callPackage ../applications/science/logic/coq {

     

       270
       273
        
             inherit

     

       271
       274
        
               version

     
···

       275
       278
        
               ocamlPackages_4_12

     

       276
       279
        
               ocamlPackages_4_14

     

       277
       280
        
               ;

     

       281
       281
       +
             rocqPackages = rp;

     

       278
       282
        
           };

     

       279
       283
        
       in

     

       280
       284
        
       rec {

     
···

       295
       299
        
           in

     

       296
       300
        
           self.filterPackages (!coq.dontFilter or false);

     

       297
       301
        
       

     

       298
       298
       -
         coq_8_5 = mkCoq "8.5";

     

       299
       299
       -
         coq_8_6 = mkCoq "8.6";

     

       300
       300
       -
         coq_8_7 = mkCoq "8.7";

     

       301
       301
       -
         coq_8_8 = mkCoq "8.8";

     

       302
       302
       -
         coq_8_9 = mkCoq "8.9";

     

       303
       303
       -
         coq_8_10 = mkCoq "8.10";

     

       304
       304
       -
         coq_8_11 = mkCoq "8.11";

     

       305
       305
       -
         coq_8_12 = mkCoq "8.12";

     

       306
       306
       -
         coq_8_13 = mkCoq "8.13";

     

       307
       307
       -
         coq_8_14 = mkCoq "8.14";

     

       308
       308
       -
         coq_8_15 = mkCoq "8.15";

     

       309
       309
       -
         coq_8_16 = mkCoq "8.16";

     

       310
       310
       -
         coq_8_17 = mkCoq "8.17";

     

       311
       311
       -
         coq_8_18 = mkCoq "8.18";

     

       312
       312
       -
         coq_8_19 = mkCoq "8.19";

     

       313
       313
       -
         coq_8_20 = mkCoq "8.20";

     

       314
       314
       -
         coq_9_0 = mkCoq "9.0";

     

       315
       315
       -
         coq_9_1 = mkCoq "9.1";

     

       302
       302
       +
         coq_8_5 = mkCoq "8.5" { };

     

       303
       303
       +
         coq_8_6 = mkCoq "8.6" { };

     

       304
       304
       +
         coq_8_7 = mkCoq "8.7" { };

     

       305
       305
       +
         coq_8_8 = mkCoq "8.8" { };

     

       306
       306
       +
         coq_8_9 = mkCoq "8.9" { };

     

       307
       307
       +
         coq_8_10 = mkCoq "8.10" { };

     

       308
       308
       +
         coq_8_11 = mkCoq "8.11" { };

     

       309
       309
       +
         coq_8_12 = mkCoq "8.12" { };

     

       310
       310
       +
         coq_8_13 = mkCoq "8.13" { };

     

       311
       311
       +
         coq_8_14 = mkCoq "8.14" { };

     

       312
       312
       +
         coq_8_15 = mkCoq "8.15" { };

     

       313
       313
       +
         coq_8_16 = mkCoq "8.16" { };

     

       314
       314
       +
         coq_8_17 = mkCoq "8.17" { };

     

       315
       315
       +
         coq_8_18 = mkCoq "8.18" { };

     

       316
       316
       +
         coq_8_19 = mkCoq "8.19" { };

     

       317
       317
       +
         coq_8_20 = mkCoq "8.20" { };

     

       318
       318
       +
         coq_9_0 = mkCoq "9.0" rocqPackages_9_0;

     

       319
       319
       +
         coq_9_1 = mkCoq "9.1" rocqPackages_9_1;

     

       316
       320
        
       

     

       317
       321
        
         coqPackages_8_5 = mkCoqPackages coq_8_5;

     

       318
       322
        
         coqPackages_8_6 = mkCoqPackages coq_8_6;