commit 947e2d6098fb2ef0aa6a3f1a4209f1d78d4695fd · pyrox.dev/nixpkgs

-28

pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch

···

       1
       1
       -
       compatibility with newer spdlog/fmt versions

     

       2
       2
       -
       

     

       3
       3
       -
       diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp

     

       4
       4
       -
       index 808875e8a68..3cf3cf1fb8b 100644

     

       5
       5
       -
       --- a/plugins/module_identification/src/api/module_identification.cpp

     

       6
       6
       -
       +++ b/plugins/module_identification/src/api/module_identification.cpp

     

       7
       7
       -
       @@ -406,7 +406,7 @@ namespace hal

     

       8
       8
       -
        

     

       9
       9
       -
                        const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1);

     

       10
       10
       -
        

     

       11
       11
       -
       -                log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority);

     

       12
       12
       -
       +                log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, fmt::underlying(config.m_multithreading_priority));

     

       13
       13
       -
        

     

       14
       14
       -
                        auto stats = Statistics();

     

       15
       15
       -
        

     

       16
       16
       -
       diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp

     

       17
       17
       -
       index d64cab665f2..561fa7f1a23 100644

     

       18
       18
       -
       --- a/plugins/z3_utils/src/simplification.cpp

     

       19
       19
       -
       +++ b/plugins/z3_utils/src/simplification.cpp

     

       20
       20
       -
       @@ -617,7 +617,7 @@ namespace hal

     

       21
       21
       -
                            return false;

     

       22
       22
       -
        

     

       23
       23
       -
                        default: {

     

       24
       24
       -
       -                    log_error("z3_utils", "commutative check not implemeted for type {}!", t);

     

       25
       25
       -
       +                    log_error("z3_utils", "commutative check not implemeted for type {}!", fmt::underlying(t));

     

       26
       26
       -
                            return false;

     

       27
       27
       -
                        }

     

       28
       28
       -
                    }

+12 -29

pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix pkgs/by-name/ha/hal-hardware-analyzer/package.nix

···

       4
       4
        
         boost,

     

       5
       5
        
         cmake,

     

       6
       6
        
         fetchFromGitHub,

     

       7
       7
       -
         fetchpatch,

     

       8
       7
        
         graphviz,

     

       9
       8
        
         igraph,

     

       10
       9
        
         llvmPackages,

     
···

       12
       11
        
         nlohmann_json,

     

       13
       12
        
         pkg-config,

     

       14
       13
        
         python3Packages,

     

       15
       15
       -
         qtbase,

     

       16
       16
       -
         qtsvg,

     

       17
       17
       -
         quazip,

     

       14
       14
       +
         libsForQt5,

     

       18
       15
        
         rapidjson,

     

       19
       16
        
         spdlog,

     

       20
       17
        
         verilator,

     

       21
       21
       -
         wrapQtAppsHook,

     

       22
       18
        
         z3,

     

       19
       19
       +
         nix-update-script,

     

       23
       20
        
       }:

     

       24
       21
        
       

     

       25
       22
        
       stdenv.mkDerivation rec {

     

       26
       26
       -
         version = "4.4.1";

     

       23
       23
       +
         version = "4.5.0";

     

       27
       24
        
         pname = "hal-hardware-analyzer";

     

       28
       25
        
       

     

       29
       26
        
         src = fetchFromGitHub {

     

       30
       27
        
           owner = "emsec";

     

       31
       28
        
           repo = "hal";

     

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

     

       33
       33
       -
           sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A=";

     

       29
       29
       +
           tag = "v${version}";

     

       30
       30
       +
           hash = "sha256-4HLM/7JCDxWRWusGL4lUa8KXCn9pe3Vkr+lOxHOraNU=";

     

       34
       31
        
         };

     

       35
       32
        
       

     

       36
       36
       -
         patches = [

     

       37
       37
       -
           (fetchpatch {

     

       38
       38
       -
             name = "de-vendor-nlohmann-json.patch";

     

       39
       39
       -
             # https://github.com/emsec/hal/pull/596

     

       40
       40
       -
             url = "https://github.com/emsec/hal/commit/f8337d554d80cfa2588512696696fd4c878dd7a3.patch";

     

       41
       41
       -
             hash = "sha256-QjgvcduwbFccC807JFOevlTfO3KiL9T3HSqYmh3sXAQ=";

     

       42
       42
       -
           })

     

       43
       43
       -
           (fetchpatch {

     

       44
       44
       -
             name = "fix-vendored-igraph-regression.patch";

     

       45
       45
       -
             # https://github.com/emsec/hal/pull/596

     

       46
       46
       -
             url = "https://github.com/emsec/hal/commit/fe1fe74719ab4fef873a22e2b28cce0c57d570e0.patch";

     

       47
       47
       -
             hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E=";

     

       48
       48
       -
           })

     

       49
       49
       -
           ./4.4.1-newer-spdlog-fmt-compat.patch

     

       50
       50
       -
           ./resynthesis-fix-narrowing-conversion.patch

     

       51
       51
       -
         ];

     

       52
       52
       -
       

     

       53
       33
        
         # make sure bundled dependencies don't get in the way - install also otherwise

     

       54
       34
        
         # copies them in full to the output, bloating the package

     

       55
       35
        
         postPatch = ''

     
···

       64
       44
        
           cmake

     

       65
       45
        
           ninja

     

       66
       46
        
           pkg-config

     

       67
       67
       -
           wrapQtAppsHook

     

       47
       47
       +
           libsForQt5.wrapQtAppsHook

     

       68
       48
        
         ];

     

       69
       49
        
         buildInputs = [

     

       70
       70
       -
           qtbase

     

       71
       71
       -
           qtsvg

     

       50
       50
       +
           libsForQt5.qtbase

     

       51
       51
       +
           libsForQt5.qtsvg

     

       72
       52
        
           boost

     

       73
       53
        
           rapidjson

     

       74
       54
        
           igraph

     
···

       77
       57
        
           graphviz

     

       78
       58
        
           verilator

     

       79
       59
        
           z3

     

       80
       80
       -
           quazip

     

       60
       60
       +
           libsForQt5.quazip

     

       81
       61
        
         ]

     

       82
       62
        
         ++ (with python3Packages; [

     

       83
       63
        
           python

     
···

       116
       96
        
           done

     

       117
       97
        
         '';

     

       118
       98
        
       

     

       99
       99
       +
         passthru.updateScript = nix-update-script { };

     

       100
       100
       +
       

     

       119
       101
        
         meta = with lib; {

     

       102
       102
       +
           changelog = "https://github.com/emsec/hal/blob/${src.tag}/CHANGELOG.md";

     

       120
       103
        
           description = "Comprehensive reverse engineering and manipulation framework for gate-level netlists";

     

       121
       104
        
           mainProgram = "hal";

     

       122
       105
        
           homepage = "https://github.com/emsec/hal";

-13

pkgs/applications/science/electronics/hal-hardware-analyzer/resynthesis-fix-narrowing-conversion.patch

···

       1
       1
       -
       diff --git a/plugins/resynthesis/src/resynthesis.cpp b/plugins/resynthesis/src/resynthesis.cpp

     

       2
       2
       -
       index 7a7e404114f..f2889667af8 100644

     

       3
       3
       -
       --- a/plugins/resynthesis/src/resynthesis.cpp

     

       4
       4
       -
       +++ b/plugins/resynthesis/src/resynthesis.cpp

     

       5
       5
       -
       @@ -1058,7 +1058,7 @@ namespace hal

     

       6
       6
       -
                    // delete the created directory and the contained files

     

       7
       7
       -
                    std::filesystem::remove_all(base_path);

     

       8
       8
       -
        

     

       9
       9
       -
       -            return OK(subgraph.size());

     

       10
       10
       -
       +            return OK(static_cast<unsigned int>(subgraph.size()));

     

       11
       11
       -
                }

     

       12
       12
       -
        

     

       13
       13
       -
                Result<u32> resynthesize_subgraph_of_type(Netlist* nl, const std::vector<const GateType*>& gate_types, GateLibrary* target_gl)

+9

pkgs/by-name/ve/verilator/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         fetchpatch,

     

       5
       6
        
         perl,

     

       6
       7
        
         flex,

     

       7
       8
        
         bison,

     
···

       31
       32
        
           tag = "v${version}";

     

       32
       33
        
           hash = "sha256-S+cDnKOTPjLw+sNmWL3+Ay6+UM8poMadkyPSGd3hgnc=";

     

       33
       34
        
         };

     

       35
       35
       +
       

     

       36
       36
       +
         patches = [

     

       37
       37
       +
           (fetchpatch {

     

       38
       38
       +
             name = "clang-V3hash-overload-fix.patch";

     

       39
       39
       +
             url = "https://github.com/verilator/verilator/commit/2aa260a03b67d3fe86bc64b8a59183f8dc21e117.patch";

     

       40
       40
       +
             hash = "sha256-waUsctWiAMG3lCpQi+VUUZ7qMw/kJGu/wNXPHZGuAoU=";

     

       41
       41
       +
           })

     

       42
       42
       +
         ];

     

       34
       43
        
       

     

       35
       44
        
         enableParallelBuilding = true;

     

       36
       45
        
         buildInputs = [

-4

pkgs/top-level/all-packages.nix

···

       3062
       3062
        
       

     

       3063
       3063
        
         haste-client = callPackage ../tools/misc/haste-client { };

     

       3064
       3064
        
       

     

       3065
       3065
       -
         hal-hardware-analyzer =

     

       3066
       3066
       -
           libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer

     

       3067
       3067
       -
             { };

     

       3068
       3068
       -
       

     

       3069
       3065
        
         halide = callPackage ../development/compilers/halide {

     

       3070
       3066
        
           llvmPackages = llvmPackages_19;

     

       3071
       3067
        
         };