commit 6e75ca1faa4128a3538ca1639491dd0ce31b0567 · pyrox.dev/nixpkgs

+33

pkgs/development/ada-modules/gnatprove/0003-Adjust-after-category-change-for-N_Formal_Package_De.patch

···

       1
       1
       +
       From 3c06fb993ae628b5069c1f3e23f11c53815e1cbe Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Eric Botcazou <ebotcazou@adacore.com>

     

       3
       3
       +
       Date: Sat, 8 Mar 2025 00:09:57 +0100

     

       4
       4
       +
       Subject: [PATCH] Adjust after category change for N_Formal_Package_Declaration

     

       5
       5
       +
       

     

       6
       6
       +
       Issue: eng/toolchain/gnat#1354

     

       7
       7
       +
       ---

     

       8
       8
       +
        src/why/gnat2why-borrow_checker.adb | 2 +-

     

       9
       9
       +
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       10
       10
       +
       

     

       11
       11
       +
       diff --git a/src/why/gnat2why-borrow_checker.adb b/src/why/gnat2why-borrow_checker.adb

     

       12
       12
       +
       index a97f225b06..f3ab8be3e9 100644

     

       13
       13
       +
       --- a/src/why/gnat2why-borrow_checker.adb

     

       14
       14
       +
       +++ b/src/why/gnat2why-borrow_checker.adb

     

       15
       15
       +
       @@ -1693,6 +1693,7 @@ procedure Check_Declaration (Decl : Node_Id) is

     

       16
       16
       +
                 --  Ignored constructs for pointer checking

     

       17
       17
       +
        

     

       18
       18
       +
                 when N_Formal_Object_Declaration

     

       19
       19
       +
       +            | N_Formal_Package_Declaration

     

       20
       20
       +
                    | N_Formal_Type_Declaration

     

       21
       21
       +
                    | N_Incomplete_Type_Declaration

     

       22
       22
       +
                    | N_Private_Extension_Declaration

     

       23
       23
       +
       @@ -3326,7 +3327,6 @@ procedure Check_Node (N : Node_Id) is

     

       24
       24
       +
                    | N_Empty

     

       25
       25
       +
                    | N_Enumeration_Representation_Clause

     

       26
       26
       +
                    | N_Exception_Renaming_Declaration

     

       27
       27
       +
       -            | N_Formal_Package_Declaration

     

       28
       28
       +
                    | N_Formal_Subprogram_Declaration

     

       29
       29
       +
                    | N_Freeze_Entity

     

       30
       30
       +
                    | N_Freeze_Generic_Entity

     

       31
       31
       +
       -- 

     

       32
       32
       +
       2.48.1

     

       33
       33
       +

+5 -2

pkgs/development/ada-modules/gnatprove/default.nix

···

       64
       64
        
       

     

       65
       65
        
               # Suppress warnings on aarch64: https://github.com/AdaCore/spark2014/issues/54

     

       66
       66
        
               ./0002-mute-aarch64-warnings.patch

     

       67
       67
       +
       

     

       68
       68
       +
               # Changes to the GNAT frontend: https://github.com/AdaCore/spark2014/issues/58

     

       69
       69
       +
               ./0003-Adjust-after-category-change-for-N_Formal_Package_De.patch

     

       67
       70
        
             ];

     

       68
       71
        
             commit_date = "2024-01-11";

     

       69
       72
        
           };

     
···

       121
       124
        
       

     

       122
       125
        
         postPatch = ''

     

       123
       126
        
           # gnat2why/gnat_src points to the GNAT sources

     

       124
       124
       -
           tar xf ${gnat.cc.src} gcc-${gnat.cc.version}/gcc/ada

     

       125
       125
       -
           mv gcc-${gnat.cc.version}/gcc/ada gnat2why/gnat_src

     

       127
       127
       +
           tar xf ${gnat.cc.src} --wildcards 'gcc-*/gcc/ada'

     

       128
       128
       +
           mv gcc-*/gcc/ada gnat2why/gnat_src

     

       126
       129
        
         '';

     

       127
       130
        
       

     

       128
       131
        
         configurePhase = ''