From 5f579034058713114a5a163df1836727ee18a60f Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Fri, 10 Jan 2025 19:23:20 -0800 Subject: [PATCH] lcalc: 2.0.5 -> 2.1.0 https://gitlab.com/sagemath/lcalc/-/releases/2.1.0 https://gitlab.com/sagemath/lcalc/-/compare/2.0.5...2.1.0 --- pkgs/by-name/lc/lcalc/libcxx-compat.patch | 30 ----------------------- pkgs/by-name/lc/lcalc/package.nix | 10 +++----- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 pkgs/by-name/lc/lcalc/libcxx-compat.patch diff --git a/pkgs/by-name/lc/lcalc/libcxx-compat.patch b/pkgs/by-name/lc/lcalc/libcxx-compat.patch deleted file mode 100644 index 882dc2549475..000000000000 --- a/pkgs/by-name/lc/lcalc/libcxx-compat.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/libLfunction/Lcomplex.h b/src/libLfunction/Lcomplex.h -index 363bbf4..ffecd70 100644 ---- a/src/libLfunction/Lcomplex.h -+++ b/src/libLfunction/Lcomplex.h -@@ -56,8 +56,11 @@ - #include - #include - --namespace std --{ -+#ifdef _LIBCPP_VERSION -+_LIBCPP_BEGIN_NAMESPACE_STD -+#else -+namespace std { -+#endif - // Forward declarations - template class complex; - template<> class complex; -@@ -1193,6 +1196,10 @@ namespace std - inline - complex::complex(const complex& __z) - : _M_value(_ComplexT(__z._M_value)) { } --} // namespace std -+#ifdef _LIBCPP_VERSION -+_LIBCPP_END_NAMESPACE_STD -+#else -+} -+#endif - - #endif /* _CPP_COMPLEX */ diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix index f8fbf97b7483..af99cc33e17f 100644 --- a/pkgs/by-name/lc/lcalc/package.nix +++ b/pkgs/by-name/lc/lcalc/package.nix @@ -9,20 +9,16 @@ }: stdenv.mkDerivation rec { - version = "2.0.5"; + version = "2.1.0"; pname = "lcalc"; src = fetchFromGitLab { owner = "sagemath"; repo = pname; - rev = version; - hash = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc="; + tag = version; + hash = "sha256-v+7Uh6tPOfb3E9dqxx//RqD22XM4S/8ejS2v+D5G5pE="; }; - # workaround for vendored GCC on libc++ - # https://gitlab.com/sagemath/lcalc/-/issues/16 - patches = [ ./libcxx-compat.patch ]; - nativeBuildInputs = [ autoreconfHook gengetopt