commit 33a287eb135fa5af141f6f889771917b17465296 · pyrox.dev/nixpkgs

+4 -9

pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildDunePackage,

     

       4
       4
       -
         ocaml,

     

       5
       4
        
         ocaml_gettext,

     

       6
       5
        
         camomile,

     

       7
       7
       -
         ounit,

     

       8
       8
       -
         fileutils,

     

       6
       6
       +
         ounit2,

     

       9
       7
        
       }:

     

       10
       8
        
       

     

       11
       9
        
       buildDunePackage {

     
···

       13
       11
        
         inherit (ocaml_gettext) src version;

     

       14
       12
        
       

     

       15
       13
        
         propagatedBuildInputs = [

     

       16
       16
       -
           (camomile.override { version = "1.0.2"; })

     

       14
       14
       +
           camomile

     

       17
       15
        
           ocaml_gettext

     

       18
       16
        
         ];

     

       19
       17
        
       

     

       20
       20
       -
         doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       21
       21
       -
         checkInputs = [

     

       22
       22
       -
           ounit

     

       23
       23
       -
           fileutils

     

       24
       24
       -
         ];

     

       18
       18
       +
         doCheck = true;

     

       19
       19
       +
         checkInputs = [ ounit2 ];

     

       25
       20
        
       

     

       26
       21
        
         meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // {

     

       27
       22
        
           description = "Internationalization library using camomile (i18n)";

+17 -11

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

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         fetchurl,

     

       4
       4
       +
         fetchpatch,

     

       5
       5
       +
         applyPatches,

     

       4
       6
        
         buildDunePackage,

     

       5
       7
        
         cppo,

     

       6
       8
        
         gettext,

     

       7
       9
        
         fileutils,

     

       8
       8
       -
         ounit,

     

       10
       10
       +
         ounit2,

     

       9
       11
        
       }:

     

       10
       12
        
       

     

       11
       13
        
       buildDunePackage rec {

     

       12
       14
        
         pname = "gettext";

     

       13
       13
       -
         version = "0.4.2";

     

       14
       14
       -
       

     

       15
       15
       -
         minimalOCamlVersion = "4.03";

     

       15
       15
       +
         version = "0.5.0";

     

       16
       16
        
       

     

       17
       17
       -
         src = fetchurl {

     

       18
       18
       -
           url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz";

     

       19
       19
       -
           sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb";

     

       17
       17
       +
         src = applyPatches {

     

       18
       18
       +
           src = fetchurl {

     

       19
       19
       +
             url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-${version}.tbz";

     

       20
       20
       +
             hash = "sha256-CN2d9Vsq8YOOIxK+S+lCtDddvBjCrtDKGSRIh1DjT10=";

     

       21
       21
       +
           };

     

       22
       22
       +
           # Disable dune sites

     

       23
       23
       +
           # See https://github.com/gildor478/ocaml-gettext/pull/37

     

       24
       24
       +
           patches = fetchpatch {

     

       25
       25
       +
             url = "https://github.com/gildor478/ocaml-gettext/commit/5462396bee53cb13d8d6fde4c6d430412a17b64d.patch";

     

       26
       26
       +
             hash = "sha256-tOR+xgZTadvNeQpZnFTJEvZglK8P+ySvYnE3c1VWvKQ=";

     

       27
       27
       +
           };

     

       20
       28
        
         };

     

       21
       29
        
       

     

       22
       30
        
         nativeBuildInputs = [ cppo ];

     
···

       26
       34
        
           fileutils

     

       27
       35
        
         ];

     

       28
       36
        
       

     

       29
       29
       -
         # Tests for version 0.4.2 are not compatible with OUnit 2.2.6

     

       37
       37
       +
         # Tests of version 0.5.0 fail

     

       30
       38
        
         doCheck = false;

     

       31
       39
        
       

     

       32
       32
       -
         checkInputs = [ ounit ];

     

       33
       33
       -
       

     

       34
       34
       -
         dontStrip = true;

     

       40
       40
       +
         checkInputs = [ ounit2 ];

     

       35
       41
        
       

     

       36
       42
        
         meta = with lib; {

     

       37
       43
        
           description = "OCaml Bindings to gettext";

+11 -20

pkgs/development/ocaml-modules/ocaml-gettext/stub.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         buildDunePackage,

     

       4
       4
       -
         ocaml,

     

       5
       4
        
         ocaml_gettext,

     

       6
       5
        
         dune-configurator,

     

       7
       7
       -
         ounit,

     

       6
       6
       +
         ounit2,

     

       8
       7
        
       }:

     

       9
       8
        
       

     

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

     

       11
       11
       -
         "gettext-stub is not available for OCaml ${ocaml.version}"

     

       9
       9
       +
       buildDunePackage {

     

       10
       10
       +
         pname = "gettext-stub";

     

       11
       11
       +
         inherit (ocaml_gettext) src version;

     

       12
       12
        
       

     

       13
       13
       -
         buildDunePackage

     

       14
       14
       -
         {

     

       13
       13
       +
         minimalOCamlVersion = "4.14";

     

       15
       14
        
       

     

       16
       16
       -
           pname = "gettext-stub";

     

       15
       15
       +
         buildInputs = [ dune-configurator ];

     

       16
       16
       +
         propagatedBuildInputs = [ ocaml_gettext ];

     

       17
       17
        
       

     

       18
       18
       -
           inherit (ocaml_gettext) src version;

     

       18
       18
       +
         doCheck = true;

     

       19
       19
       +
         checkInputs = [ ounit2 ];

     

       19
       20
        
       

     

       20
       20
       -
           minimalOCamlVersion = "4.06";

     

       21
       21
       -
       

     

       22
       22
       -
           buildInputs = [ dune-configurator ];

     

       23
       23
       -
       

     

       24
       24
       -
           propagatedBuildInputs = [ ocaml_gettext ];

     

       25
       25
       -
       

     

       26
       26
       -
           doCheck = lib.versionAtLeast ocaml.version "4.08";

     

       27
       27
       -
       

     

       28
       28
       -
           checkInputs = [ ounit ];

     

       29
       29
       -
       

     

       30
       30
       -
           meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ];

     

       31
       31
       -
         }

     

       21
       21
       +
         meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ];

     

       22
       22
       +
       }