From 7331a6e2f5b55790833cdafd108336b9bf696452 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Mar 2022 17:39:14 +0000 Subject: [PATCH 1/3] rpcs3: 0.0.21-13327-6c096b72b -> 0.0.21-13352-e58906cb4 --- pkgs/applications/emulators/rpcs3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 6f58990e4735..74c5b8ee6b35 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -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"; From 3221d6d4188ac63fbb77f9d11aabf6c890a76eeb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 28 Mar 2022 16:57:47 +0200 Subject: [PATCH 2/3] rl-2205: fix typo in frrrouting announcement --- nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2205.section.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index de94b40cdb26..579ef65680d7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -127,7 +127,7 @@ FRRouting, 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 services.frr diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 5a2f9a0fbf74..ba4d4c78049f 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -37,7 +37,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). From 80d8655c15055472f0118a877351085cc22c1e92 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 28 Mar 2022 14:20:07 +0200 Subject: [PATCH 3/3] ocamlPackages.fiat-p256: remove at 0.2.1 Upstream has deprecated the package and we no longer depend on it for anything: > Archived, now integrated into mirage-crypto-ec (please use that and report issues there) --- .../ocaml-modules/fiat-p256/default.nix | 33 ------------------- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/fiat-p256/default.nix diff --git a/pkgs/development/ocaml-modules/fiat-p256/default.nix b/pkgs/development/ocaml-modules/fiat-p256/default.nix deleted file mode 100644 index c979fe682d3e..000000000000 --- a/pkgs/development/ocaml-modules/fiat-p256/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 08641cc5caa1..880048ebc58e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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 { };