From 821c72743ceae44bdd09718d47cab98fd5fd90af Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Jul 2023 23:33:27 -0300 Subject: [PATCH] cereal: "revert" update Some softwares still need version 1.3.0. Links: - https://github.com/NixOS/nixpkgs/commit/fa9859507ba72b72f157b42da4ef0cc89a082074#commitcomment-122454897 --- pkgs/development/libraries/cereal/1.3.0.nix | 39 +++++++++++++++++++ .../cereal/{default.nix => 1.3.2.nix} | 0 pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/cereal/1.3.0.nix rename pkgs/development/libraries/cereal/{default.nix => 1.3.2.nix} (100%) diff --git a/pkgs/development/libraries/cereal/1.3.0.nix b/pkgs/development/libraries/cereal/1.3.0.nix new file mode 100644 index 000000000000..ab438eb6a8bf --- /dev/null +++ b/pkgs/development/libraries/cereal/1.3.0.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cereal"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "USCiLab"; + repo = "cereal"; + rev = "v${finalAttrs.version}"; + hash = "sha256-NwyUVeqXxfdyuDevjum6r8LyNtHa0eJ+4IFd3hLkiEE="; + }; + + patches = [ + (fetchpatch { + name = "CVE-2020-11105.patch"; + url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch"; + hash = "sha256-CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ]; + + meta = { + homepage = "https://uscilab.github.io/cereal/"; + description = "A header-only C++11 serialization library"; + changelog = "https://github.com/USCiLab/cereal/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/development/libraries/cereal/1.3.2.nix similarity index 100% rename from pkgs/development/libraries/cereal/default.nix rename to pkgs/development/libraries/cereal/1.3.2.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39964cafabbe..b56b102989a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -425,7 +425,9 @@ with pkgs; ccal = callPackage ../tools/misc/ccal { }; - cereal = callPackage ../development/libraries/cereal { }; + cereal = cereal_1_3_0; + cereal_1_3_0 = callPackage ../development/libraries/cereal/1.3.0.nix { }; + cereal_1_3_2 = callPackage ../development/libraries/cereal/1.3.2.nix { }; cdecrypt = callPackage ../development/tools/cdecrypt { };