Merge staging-next into staging
This commit is contained in:
commit
d584935293
|
@ -132,7 +132,7 @@
|
|||
<para>
|
||||
<link xlink:href="https://frrouting.org/">FRRouting</link>, a
|
||||
popular suite of Internet routing protocol daemons (BGP, BFD,
|
||||
OSPF, IS-IS, VVRP and others). Available as
|
||||
OSPF, IS-IS, VRRP and others). Available as
|
||||
<link linkend="opt-services.frr.babel.enable">services.frr</link>
|
||||
</para>
|
||||
</listitem>
|
||||
|
|
|
@ -39,7 +39,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS).
|
||||
|
||||
- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.frr.babel.enable)
|
||||
- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VRRP and others). Available as [services.frr](#opt-services.frr.babel.enable)
|
||||
|
||||
- [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable).
|
||||
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
|
||||
let
|
||||
# Keep these separate so the update script can regex them
|
||||
rpcs3GitVersion = "13327-6c096b72b";
|
||||
rpcs3Version = "0.0.21-13327-6c096b72b";
|
||||
rpcs3Revision = "6c096b72b5294758067a002f981563bbd618d30d";
|
||||
rpcs3Sha256 = "0xmdhjskqbv02jvl43bvw0clsgh9gnahl50fr3q8lmpwpy13ldr4";
|
||||
rpcs3GitVersion = "13352-e58906cb4";
|
||||
rpcs3Version = "0.0.21-13352-e58906cb4";
|
||||
rpcs3Revision = "e58906cb4df26c14fcade07d7c15ab432dae6882";
|
||||
rpcs3Sha256 = "1bzx6af77z5l6jdgazw8x59pi2xhwkz0knynmf5kzww39m6npx0a";
|
||||
|
||||
ittapi = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
|
|
|
@ -1,33 +0,0 @@
|
|||
{ lib, buildDunePackage, fetchurl, alcotest, asn1-combinators, benchmark
|
||||
, bigarray-compat, cstruct, eqaf, hex, ppx_deriving_yojson, rresult
|
||||
, stdlib-shims, yojson, dune-configurator }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "fiat-p256";
|
||||
version = "0.2.1";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/fiat/releases/download/v${version}/${pname}-v${version}.tbz";
|
||||
sha256 = "0086h9qkvnqfm8acrxqbki54z619nj73x7f0d01v5vg2naznx7w9";
|
||||
};
|
||||
|
||||
# Make tests compatible with alcotest 1.4.0
|
||||
postPatch = ''
|
||||
substituteInPlace test/wycheproof/test.ml --replace \
|
||||
'Printf.ksprintf Alcotest.fail' 'Printf.ksprintf (fun s -> Alcotest.fail s)'
|
||||
'';
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
propagatedBuildInputs = [ bigarray-compat cstruct eqaf hex ];
|
||||
checkInputs = [ alcotest asn1-combinators benchmark
|
||||
ppx_deriving_yojson rresult stdlib-shims yojson ];
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Primitives for Elliptic Curve Cryptography taken from Fiat";
|
||||
homepage = "https://github.com/mirage/fiat";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sternenseemann ];
|
||||
};
|
||||
}
|
|
@ -209,6 +209,8 @@ stdenv.mkDerivation {
|
|||
(musl-patches + "/0025-Handle-__cpu_mask-usage.patch")
|
||||
(musl-patches + "/0026-Handle-missing-gshadow.patch")
|
||||
(musl-patches + "/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
|
||||
(musl-patches + "/0001-pass-correct-parameters-to-getdents64.patch")
|
||||
(musl-patches + "/0002-Add-sys-stat.h-for-S_IFDIR.patch")
|
||||
(musl-patches + "/0001-Adjust-for-musl-headers.patch")
|
||||
]
|
||||
);
|
||||
|
|
|
@ -413,8 +413,6 @@ let
|
|||
inherit (pkgs) ffmpeg;
|
||||
};
|
||||
|
||||
fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { };
|
||||
|
||||
fileutils = callPackage ../development/ocaml-modules/fileutils { };
|
||||
|
||||
findlib = callPackage ../development/tools/ocaml/findlib { };
|
||||
|
|
Loading…
Reference in a new issue