Unverified Commit 0ee834e6 authored by Aliaksandr's avatar Aliaksandr
Browse files

cvc5: move override into package.nix, modernize

parent a05303e9

pkgs/by-name/cv/cvc5/package.nix

+11 −7
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
  cmake,

  flex,

  cadical,

  cadical' ? cadical.override { version = "2.1.3"; },

  symfpu,

  gmp,

  python3,
@@ -26,25 +27,28 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";

  };



  __structuredAttrs = true;

  strictDeps = true;



  nativeBuildInputs = [

    pkg-config

    cmake

    flex

    (python3.withPackages (

      ps: with ps; [

        pyparsing

        tomli

      ]

    ))

  ];

  buildInputs = [

    cadical.dev

    cadical'.dev

    symfpu

    gmp

    gtest

    boost

    jdk

    libpoly

    (python3.withPackages (

      ps: with ps; [

        pyparsing

        tomli

      ]

    ))

  ];



  preConfigure = ''

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -12611,10 +12611,6 @@ with pkgs; 
    stdenv = gccStdenv;

  };



  cvc5 = callPackage ../by-name/cv/cvc5/package.nix {

    cadical = cadical.override { version = "2.1.3"; };

  };



  ekrhyper = callPackage ../applications/science/logic/ekrhyper {

    ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;

  };