b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

why3: 1.5.1 → 1.6.0; ocamlPackages.lambdapi: 2.2.1 → 2.3.1 (#220986)

Browse source 
why3: 1.5.1 → 1.6.0
ocamlPackages.lambdapi: 2.2.1 → 2.3.1

Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
This commit is contained in:
Vincent Laporte 2023-03-20 20:45:47 +01:00 committed by GitHub
parent e999433b3a
commit e12230e716
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/science/logic/easycrypt/default.nix
View file

@ -11,11 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7"; sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7";
}; };
# Fix build with Why3 1.5 patches = lib.lists.map fetchpatch [
patches = fetchpatch { # Fix build with Why3 1.5
url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch"; { url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch";
sha256 = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm"; hash = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm"; }
}; # Fix build with Why3 1.6
{ url = "https://github.com/EasyCrypt/easycrypt/commit/876f2ed50a0434afdf2fb20e7c50b8a3e26bb06e.patch";
hash = "sha256-UycfLZWYHNsppb7qHSRaAF4Y0UnwoFueEG0wUcBUPYE="; }
];
nativeBuildInputs = with ocamlPackages; [ nativeBuildInputs = with ocamlPackages; [
dune_3 dune_3

4
pkgs/applications/science/logic/why3/default.nix
View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "why3"; pname = "why3";
version = "1.5.1"; version = "1.6.0";
src = fetchurl { src = fetchurl {
url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz";
sha256 = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; hash = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw=";
}; };
strictDeps = true; strictDeps = true;

13
pkgs/development/ocaml-modules/lambdapi/default.nix
View file

@ -1,5 +1,5 @@
{ lib { lib
, fetchFromGitHub , fetchurl
, buildDunePackage , buildDunePackage
, alcotest , alcotest
, dedukti , dedukti
@ -17,15 +17,14 @@
buildDunePackage rec { buildDunePackage rec {
pname = "lambdapi"; pname = "lambdapi";
version = "2.2.1"; version = "2.3.1";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3";
src = fetchFromGitHub { src = fetchurl {
owner = "Deducteam"; url = "https://github.com/Deducteam/lambdapi/releases/download/${version}/lambdapi-${version}.tbz";
repo = pname; hash = "sha256-7ww2TjVcbEQyfmLnnEhLGAjW4US9a4mdOfDJw6NR1fI=";
rev = version;
hash = "sha256-p2ZjSfiZwkf8X4fSNJx7bAVpTFl4UBHIEANIWF7NGCs=";
}; };
nativeBuildInputs = [ menhir ]; nativeBuildInputs = [ menhir ];

9
pkgs/development/tools/analysis/frama-c/default.nix
View file

@ -4,6 +4,15 @@
, gdk-pixbuf, wrapGAppsHook , gdk-pixbuf, wrapGAppsHook
}: }:
let why3_1_5 = why3.overrideAttrs (o: rec {
version = "1.5.1";
src = fetchurl {
url = "https://why3.gitlabpages.inria.fr/releases/${o.pname}-${version}.tar.gz";
hash = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I=";
};
}); in
let why3 = why3_1_5; in
let let
mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
runtimeDeps = with ocamlPackages; [ runtimeDeps = with ocamlPackages; [