summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2023-12-06 06:38:08 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-12-13 05:10:29 +0000
commit6c2fc73a448b34d03922cb3144f35276fda0a40e (patch)
treee3a4d5933db503be77a2adfed8ca665de5453a88
parentMerge pull request #273752 from NixOS/backport-273435-to-release-23.11 (diff)
downloadnixpkgs-origin/backport-272407-to-release-23.11.tar.gz
framac: 27.1 (Cobalt) → 28.0 (Nickel)origin/backport-272407-to-release-23.11
(cherry picked from commit 17881197d3f4daa63be602c8c8e0dde7ed178f17)
-rw-r--r--pkgs/development/tools/analysis/frama-c/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index e1a6b8c34162..4b6cadfcfa82 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -28,6 +28,7 @@ let
sexplib0
parsexp
base
+ unionFind
yojson
zarith
];
@@ -36,12 +37,12 @@ in
stdenv.mkDerivation rec {
pname = "frama-c";
- version = "27.1";
- slang = "Cobalt";
+ version = "28.0";
+ slang = "Nickel";
src = fetchurl {
url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz";
- hash = "sha256-WxNXShaliXHCeQm+6Urn83sX2JeFK0DHaKPU4uCeOdI=";
+ hash = "sha256-KWEogjMOy27d0LTKOvwEkrcND+szeaG46JMZTG4XOYM=";
};
postConfigure = "patchShebangs src/plugins/eva/gen-api.sh";
@@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen
ppx_deriving ppx_import ppx_deriving_yaml ppx_deriving_yojson
gdk-pixbuf
+ unionFind
];
buildPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99fa3821e5fe..6495f8fd2e8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19208,9 +19208,7 @@ with pkgs;
fprettify = callPackage ../development/tools/fprettify { };
- framac = callPackage ../development/tools/analysis/frama-c {
- why3 = pkgs.why3.override { version = "1.6.0"; };
- };
+ framac = callPackage ../development/tools/analysis/frama-c { };
frame = callPackage ../development/libraries/frame { };