commit 43cf16299d45e1a93bde363232c888ce46a0c22e · pyrox.dev/nixpkgs

pkgs/development/compilers/heptagon/default.nix pkgs/by-name/he/heptagon/package.nix

···

       4
       4
        
         fetchFromGitLab,

     

       5
       5
        
         makeWrapper,

     

       6
       6
        
         ocamlPackages,

     

       7
       7
       +
         fetchpatch,

     

       7
       8
        
       }:

     

       8
       9
        
       

     

       9
       10
        
       stdenv.mkDerivation (finalAttrs: {

     
···

       17
       18
        
           rev = "v${finalAttrs.version}";

     

       18
       19
        
           hash = "sha256-b4O48MQT3Neh8a1Z5wRgS701w6XrwpsbSMprlqTT+CE=";

     

       19
       20
        
         };

     

       21
       21
       +
       

     

       22
       22
       +
         patches = [

     

       23
       23
       +
           (fetchpatch {

     

       24
       24
       +
             url = "https://gitlab.inria.fr/synchrone/heptagon/-/commit/f10405e385ca25dc737727e0c210a44986929bf0.patch";

     

       25
       25
       +
             hash = "sha256-Sn55jEoRDYnEUg4SjuBDCNN4TNl2Dwn1fTjb9O8O1bo=";

     

       26
       26
       +
           })

     

       27
       27
       +
         ];

     

       20
       28
        
       

     

       21
       29
        
         strictDeps = true;

     

       22
       30

+26 -22

pkgs/development/ocaml-modules/config-file/default.nix

···

       7
       7
        
         camlp4,

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
       -
       stdenv.mkDerivation rec {

     

       11
       11
       -
         pname = "ocaml-config-file";

     

       12
       12
       -
         version = "1.2";

     

       10
       10
       +
       lib.throwIf (lib.versionAtLeast ocaml.version "5.0")

     

       11
       11
       +
         "config-file is not available for OCaml ${ocaml.version}"

     

       13
       12
        
       

     

       14
       14
       -
         src = fetchurl {

     

       15
       15
       -
           url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-${version}.tar.gz";

     

       16
       16
       -
           sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q";

     

       17
       17
       -
         };

     

       13
       13
       +
         stdenv.mkDerivation

     

       14
       14
       +
         rec {

     

       15
       15
       +
           pname = "ocaml-config-file";

     

       16
       16
       +
           version = "1.2";

     

       18
       17
        
       

     

       19
       19
       -
         nativeBuildInputs = [

     

       20
       20
       -
           ocaml

     

       21
       21
       -
           findlib

     

       22
       22
       -
           camlp4

     

       23
       23
       -
         ];

     

       18
       18
       +
           src = fetchurl {

     

       19
       19
       +
             url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-${version}.tar.gz";

     

       20
       20
       +
             sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q";

     

       21
       21
       +
           };

     

       24
       22
        
       

     

       25
       25
       -
         strictDeps = true;

     

       23
       23
       +
           nativeBuildInputs = [

     

       24
       24
       +
             ocaml

     

       25
       25
       +
             findlib

     

       26
       26
       +
             camlp4

     

       27
       27
       +
           ];

     

       26
       28
        
       

     

       27
       27
       -
         createFindlibDestdir = true;

     

       29
       29
       +
           strictDeps = true;

     

       28
       30
        
       

     

       29
       29
       -
         meta = {

     

       30
       30
       -
           homepage = "http://config-file.forge.ocamlcore.org/";

     

       31
       31
       -
           platforms = ocaml.meta.platforms or [ ];

     

       32
       32
       -
           description = "OCaml library used to manage the configuration file(s) of an application";

     

       33
       33
       -
           license = lib.licenses.lgpl2Plus;

     

       34
       34
       -
           maintainers = with lib.maintainers; [ vbgl ];

     

       35
       35
       -
         };

     

       36
       36
       -
       }

     

       31
       31
       +
           createFindlibDestdir = true;

     

       32
       32
       +
       

     

       33
       33
       +
           meta = {

     

       34
       34
       +
             homepage = "http://config-file.forge.ocamlcore.org/";

     

       35
       35
       +
             platforms = ocaml.meta.platforms or [ ];

     

       36
       36
       +
             description = "OCaml library used to manage the configuration file(s) of an application";

     

       37
       37
       +
             license = lib.licenses.lgpl2Plus;

     

       38
       38
       +
             maintainers = with lib.maintainers; [ vbgl ];

     

       39
       39
       +
           };

     

       40
       40
       +
         }

+34 -30

pkgs/development/ocaml-modules/ulex/default.nix

···

       23
       23
        
             };

     

       24
       24
        
       in

     

       25
       25
        
       

     

       26
       26
       -
       stdenv.mkDerivation rec {

     

       27
       27
       -
         name = "ocaml${ocaml.version}-${pname}-${version}";

     

       28
       28
       -
         inherit (param) version;

     

       26
       26
       +
       lib.throwIf (lib.versionAtLeast ocaml.version "5.0")

     

       27
       27
       +
         "ulex is not available for OCaml ${ocaml.version}"

     

       29
       28
        
       

     

       30
       30
       -
         src = fetchFromGitHub {

     

       31
       31
       -
           owner = "whitequark";

     

       32
       32
       -
           repo = pname;

     

       33
       33
       -
           rev = "v${version}";

     

       34
       34
       -
           inherit (param) sha256;

     

       35
       35
       -
         };

     

       29
       29
       +
         stdenv.mkDerivation

     

       30
       30
       +
         rec {

     

       31
       31
       +
           name = "ocaml${ocaml.version}-${pname}-${version}";

     

       32
       32
       +
           inherit (param) version;

     

       36
       33
        
       

     

       37
       37
       -
         createFindlibDestdir = true;

     

       34
       34
       +
           src = fetchFromGitHub {

     

       35
       35
       +
             owner = "whitequark";

     

       36
       36
       +
             repo = pname;

     

       37
       37
       +
             rev = "v${version}";

     

       38
       38
       +
             inherit (param) sha256;

     

       39
       39
       +
           };

     

       38
       40
        
       

     

       39
       39
       -
         nativeBuildInputs = [

     

       40
       40
       -
           ocaml

     

       41
       41
       -
           findlib

     

       42
       42
       -
           ocamlbuild

     

       43
       43
       -
           camlp4

     

       44
       44
       -
         ];

     

       45
       45
       -
         propagatedBuildInputs = [ camlp4 ];

     

       41
       41
       +
           createFindlibDestdir = true;

     

       46
       42
        
       

     

       47
       47
       -
         strictDeps = true;

     

       43
       43
       +
           nativeBuildInputs = [

     

       44
       44
       +
             ocaml

     

       45
       45
       +
             findlib

     

       46
       46
       +
             ocamlbuild

     

       47
       47
       +
             camlp4

     

       48
       48
       +
           ];

     

       49
       49
       +
           propagatedBuildInputs = [ camlp4 ];

     

       48
       50
        
       

     

       49
       49
       -
         buildFlags = [

     

       50
       50
       -
           "all"

     

       51
       51
       -
           "all.opt"

     

       52
       52
       -
         ];

     

       51
       51
       +
           strictDeps = true;

     

       53
       52
        
       

     

       54
       54
       -
         meta = {

     

       55
       55
       -
           inherit (src.meta) homepage;

     

       56
       56
       -
           description = "Lexer generator for Unicode and OCaml";

     

       57
       57
       -
           license = lib.licenses.mit;

     

       58
       58
       -
           inherit (ocaml.meta) platforms;

     

       59
       59
       -
           maintainers = [ lib.maintainers.roconnor ];

     

       60
       60
       -
         };

     

       61
       61
       -
       }

     

       53
       53
       +
           buildFlags = [

     

       54
       54
       +
             "all"

     

       55
       55
       +
             "all.opt"

     

       56
       56
       +
           ];

     

       57
       57
       +
       

     

       58
       58
       +
           meta = {

     

       59
       59
       +
             inherit (src.meta) homepage;

     

       60
       60
       +
             description = "Lexer generator for Unicode and OCaml";

     

       61
       61
       +
             license = lib.licenses.mit;

     

       62
       62
       +
             inherit (ocaml.meta) platforms;

     

       63
       63
       +
             maintainers = [ lib.maintainers.roconnor ];

     

       64
       64
       +
           };

     

       65
       65
       +
         }

+31 -4

pkgs/development/tools/ocaml/camlp4/default.nix

···

       4
       4
        
         fetchzip,

     

       5
       5
        
         which,

     

       6
       6
        
         ocaml,

     

       7
       7
       +
         camlp-streams,

     

       7
       8
        
         ocamlbuild,

     

       9
       9
       +
         findlib,

     

       8
       10
        
       }:

     

       9
       11
        
       

     

       10
       10
       -
       if lib.versionAtLeast ocaml.version "4.15" then

     

       12
       12
       +
       if lib.versionAtLeast ocaml.version "5.4" then

     

       11
       13
        
         throw "camlp4 is not available for OCaml ${ocaml.version}"

     

       12
       14
        
       else

     

       13
       15
        
       

     
···

       66
       68
        
                 version = "4.14+1";

     

       67
       69
        
                 sha256 = "sha256-cPN3GioZT/Zt6uzbjGUPEGVJcPQdsAnCkU/AQoPfvuo=";

     

       68
       70
        
               };

     

       71
       71
       +
               "5.0" = {

     

       72
       72
       +
                 version = "5.0";

     

       73
       73
       +
                 sha256 = "sha256-oZptFNPUEAq5YlcqAoDWfLghGMF9AN7E7hUN55SAX+4=";

     

       74
       74
       +
               };

     

       75
       75
       +
               "5.1" = {

     

       76
       76
       +
                 version = "5.1";

     

       77
       77
       +
                 sha256 = "sha256-Ubedjg3BeHA0bJbEalQN9eEk5+LRAI/er+8mWfVYchg=";

     

       78
       78
       +
               };

     

       79
       79
       +
               "5.2" = {

     

       80
       80
       +
                 version = "5.2";

     

       81
       81
       +
                 sha256 = "sha256-lzbc9xsgeYlbVf71O+PWYS14QivAH1aPdnvWhe0HHME=";

     

       82
       82
       +
               };

     

       83
       83
       +
               "5.3" = {

     

       84
       84
       +
                 version = "5.3";

     

       85
       85
       +
                 sha256 = "sha256-V/kKhTP9U4jWDFuQKuB7BS3XICg1lq/2Avj7UJR55+k=";

     

       86
       86
       +
               };

     

       69
       87
        
             }

     

       70
       88
        
             .${ocaml.meta.branch};

     

       71
       89
        
         in

     
···

       81
       99
        
       

     

       82
       100
        
           strictDeps = true;

     

       83
       101
        
       

     

       84
       84
       -
           nativeBuildInputs = [

     

       85
       85
       -
             which

     

       86
       86
       -
             ocaml

     

       102
       102
       +
           nativeBuildInputs =

     

       103
       103
       +
             [

     

       104
       104
       +
               which

     

       105
       105
       +
               ocaml

     

       106
       106
       +
               ocamlbuild

     

       107
       107
       +
             ]

     

       108
       108
       +
             ++ lib.optionals (lib.versionAtLeast ocaml.version "5.0") [

     

       109
       109
       +
               findlib

     

       110
       110
       +
             ];

     

       111
       111
       +
       

     

       112
       112
       +
           buildInputs = lib.optionals (lib.versionAtLeast ocaml.version "5.0") [

     

       113
       113
       +
             camlp-streams

     

       87
       114
        
             ocamlbuild

     

       88
       115
        
           ];

     

       89
       116

-4

pkgs/top-level/all-packages.nix

···

       6331
       6331
        
           inherit (emacs.pkgs.melpaStablePackages) irony;

     

       6332
       6332
        
         };

     

       6333
       6333
        
       

     

       6334
       6334
       -
         heptagon = callPackage ../development/compilers/heptagon {

     

       6335
       6335
       -
           ocamlPackages = ocaml-ng.ocamlPackages_4_14;

     

       6336
       6336
       -
         };

     

       6337
       6337
       -
       

     

       6338
       6334
        
         openjfx17 = openjfx;

     

       6339
       6335
        
         openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };

     

       6340
       6336
        
         openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; };