From 9f6a72c8fbfd9a49b963cc81d73ed7d218e10140 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 24 Dec 2021 13:45:45 +0100 Subject: [PATCH] elpa: 2021.05.002_bugfix -> 2021.11.001 --- pkgs/development/libraries/elpa/default.nix | 4 ++-- pkgs/development/libraries/elpa/pkg-config.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 53fcf12c3b05..3bb59ce9ca6a 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -18,11 +18,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.05.002_bugfix"; + version = "2021.11.001"; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "0jr2j1ncslbr7fi47dj58b7afm7kr0sx6jfpfgqb5r5rwn6w9ayy"; + sha256 = "0bw0nwzwvjfmijfwznmrghypd3q237a3h5g5fcdncilrqnk1sdpv"; }; patches = [ diff --git a/pkgs/development/libraries/elpa/pkg-config.patch b/pkgs/development/libraries/elpa/pkg-config.patch index 7a996849207b..2fc1399483c6 100644 --- a/pkgs/development/libraries/elpa/pkg-config.patch +++ b/pkgs/development/libraries/elpa/pkg-config.patch @@ -1,12 +1,12 @@ diff --git a/configure.ac b/configure.ac -index a14dd8a..3519a64 100644 +index 0aa533a..da5d1f7 100644 --- a/configure.ac +++ b/configure.ac -@@ -2229,7 +2229,7 @@ if test x"$have_loop_blocking" = x"yes"; then +@@ -2336,7 +2336,7 @@ if test x"$have_loop_blocking" = x"yes"; then fi AC_SUBST([SUFFIX]) --AC_SUBST([PKG_CONFIG_FILE],[elpa${SUFFIX}-${PACKAGE_VERSION}.pc]) +-AC_SUBST([PKG_CONFIG_FILE],[elpa${SUFFIX}.pc]) +AC_SUBST([PKG_CONFIG_FILE],[elpa.pc]) AC_CONFIG_FILES([