commit 892ebc48e5da74fb8d0e2c12ec696b3a8660377e · pyrox.dev/nixpkgs

-63

pkgs/development/compilers/obliv-c/default.nix

···

       1
       -
       {

     

       2
       -
         lib,

     

       3
       -
         stdenv,

     

       4
       -
         libgcrypt,

     

       5
       -
         fetchFromGitHub,

     

       6
       -
         ocamlPackages,

     

       7
       -
         perl,

     

       8
       -
       }:

     

       9
       -
       stdenv.mkDerivation {

     

       10
       -
         pname = "obliv-c";

     

       11
       -
       

     

       12
       -
         version = "0.0pre20210621";

     

       13
       -
       

     

       14
       -
         strictDeps = true;

     

       15
       -
         nativeBuildInputs = [

     

       16
       -
           perl

     

       17
       -
         ]

     

       18
       -
         ++ (with ocamlPackages; [

     

       19
       -
           ocaml

     

       20
       -
           findlib

     

       21
       -
           ocamlbuild

     

       22
       -
         ]);

     

       23
       -
         buildInputs = [ ocamlPackages.num ];

     

       24
       -
         propagatedBuildInputs = [ libgcrypt ];

     

       25
       -
         src = fetchFromGitHub {

     

       26
       -
           owner = "samee";

     

       27
       -
           repo = "obliv-c";

     

       28
       -
           rev = "e02e5c590523ef4dae06e167a7fa00037bb3fdaf";

     

       29
       -
           sha256 = "sha256:02vyr4689f4dmwqqs0q1mrack9h3g8jz3pj8zqiz987dk0r5mz7a";

     

       30
       -
         };

     

       31
       -
       

     

       32
       -
         hardeningDisable = [ "fortify" ];

     

       33
       -
       

     

       34
       -
         patches = [ ./ignore-complex-float128.patch ];

     

       35
       -
       

     

       36
       -
         # https://github.com/samee/obliv-c/issues/76#issuecomment-438958209

     

       37
       -
         env.OCAMLBUILD = "ocamlbuild -package num -ocamlopt 'ocamlopt -dontlink num' -ocamlc 'ocamlc -dontlink num'";

     

       38
       -
       

     

       39
       -
         preBuild = ''

     

       40
       -
           patchShebangs .

     

       41
       -
         '';

     

       42
       -
       

     

       43
       -
         preInstall = ''

     

       44
       -
           mkdir -p "$out/bin"

     

       45
       -
           cp bin/* "$out/bin"

     

       46
       -
           mkdir -p "$out/share/doc/obliv-c"

     

       47
       -
           cp -r doc/* README* CHANGE* Change* LICEN* TODO* "$out/share/doc/obliv-c"

     

       48
       -
           mkdir -p "$out/share/obliv-c"

     

       49
       -
           cp -r test "$out/share/obliv-c"

     

       50
       -
           mkdir -p "$out/include"

     

       51
       -
           cp src/ext/oblivc/*.h "$out/include"

     

       52
       -
           mkdir -p "$out/lib"

     

       53
       -
           gcc $(ar t _build/libobliv.a | sed -e 's@^@_build/@') --shared -o _build/libobliv.so

     

       54
       -
           cp _build/lib*.a _build/lib*.so* "$out/lib"

     

       55
       -
         '';

     

       56
       -
       

     

       57
       -
         meta = {

     

       58
       -
           description = "GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs";

     

       59
       -
           license = lib.licenses.bsd3;

     

       60
       -
           maintainers = [ lib.maintainers.raskin ];

     

       61
       -
           platforms = lib.platforms.linux;

     

       62
       -
         };

     

       63
       -
       }

-37

pkgs/development/compilers/obliv-c/ignore-complex-float128.patch

···

       1
       -
       --- a/src/frontc/clexer.mll

     

       2
       -
       +++ b/src/frontc/clexer.mll

     

       3
       -
       @@ -134,9 +134,11 @@ let init_lexicon _ =

     

       4
       -
              (* WW: see /usr/include/sys/cdefs.h for why __signed and __volatile

     

       5
       -
               * are accepted GCC-isms *)

     

       6
       -
              ("_Bool", fun loc -> BOOL loc);

     

       7
       -
       +      ("_Complex", fun loc -> COMPLEX loc);

     

       8
       -
              ("char", fun loc -> CHAR loc);

     

       9
       -
              ("int", fun loc -> INT loc);

     

       10
       -
              ("float", fun loc -> FLOAT loc);

     

       11
       -
       +      ("__float128", fun loc -> FLOAT128 loc);

     

       12
       -
              ("double", fun loc -> DOUBLE loc);

     

       13
       -
              ("void", fun loc -> VOID loc);

     

       14
       -
              ("enum", fun loc -> ENUM loc);

     

       15
       -
       --- a/src/frontc/cparser.mly

     

       16
       -
       +++ b/src/frontc/cparser.mly

     

       17
       -
       @@ -269,6 +269,8 @@ let oblivState (s:statement): statement =

     

       18
       -
        %token<Cabs.cabsloc> VOLATILE EXTERN STATIC CONST RESTRICT AUTO REGISTER FROZEN

     

       19
       -
        %token<Cabs.cabsloc> THREAD

     

       20
       -
        

     

       21
       -
       +%token<Cabs.cabsloc> COMPLEX FLOAT128

     

       22
       -
       +

     

       23
       -
        %token<Cabs.cabsloc> SIZEOF ALIGNOF

     

       24
       -
        

     

       25
       -
        %token EQ PLUS_EQ MINUS_EQ STAR_EQ SLASH_EQ PERCENT_EQ

     

       26
       -
       @@ -1002,7 +1004,11 @@ type_spec:   /* ISO 6.7.2 */

     

       27
       -
        |   LONG            { Tlong, $1 }

     

       28
       -
        |   INT64           { Tint64, $1 }

     

       29
       -
        |   FLOAT           { Tfloat, $1 }

     

       30
       -
       +|   FLOAT128        { Tfloat, $1 }

     

       31
       -
        |   DOUBLE          { Tdouble, $1 }

     

       32
       -
       +|   COMPLEX FLOAT   { Tfloat, $2 }

     

       33
       -
       +|   COMPLEX FLOAT128{ Tfloat, $2 }

     

       34
       -
       +|   COMPLEX DOUBLE  { Tdouble, $2 }

     

       35
       -
        |   SIGNED          { Tsigned, $1 }

     

       36
       -
        |   UNSIGNED        { Tunsigned, $1 }

     

       37
       -
        |   STRUCT                 id_or_typename

pkgs/top-level/aliases.nix

···

       1672
        
         o = orbiton; # Added 2023-04-09

     

       1673
        
         oathToolkit = oath-toolkit; # Added 2022-04-04

     

       1674
        
         oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17

     

       0
        
       
     

       1675
        
         ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30

     

       1676
        
         odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06

     

       1677
        
         offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01

···

       1672
        
         o = orbiton; # Added 2023-04-09

     

       1673
        
         oathToolkit = oath-toolkit; # Added 2022-04-04

     

       1674
        
         oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17

     

       1675
       +
         obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18

     

       1676
        
         ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30

     

       1677
        
         odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06

     

       1678
        
         offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01

-5

pkgs/top-level/all-packages.nix

···

       5706
        
           enableGui = true;

     

       5707
        
         };

     

       5708
        
       

     

       5709
       -
         obliv-c = callPackage ../development/compilers/obliv-c {

     

       5710
       -
           stdenv = gcc10Stdenv;

     

       5711
       -
           ocamlPackages = ocaml-ng.ocamlPackages_4_14;

     

       5712
       -
         };

     

       5713
       -
       

     

       5714
        
         ocaml-ng = callPackage ./ocaml-packages.nix { };

     

       5715
        
         ocaml = ocamlPackages.ocaml;

     

       5716

···

       5706
        
           enableGui = true;

     

       5707
        
         };

     

       5708
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5709
        
         ocaml-ng = callPackage ./ocaml-packages.nix { };

     

       5710
        
         ocaml = ocamlPackages.ocaml;

     

       5711