Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates

This merge mostly take the changes made to the master branch.

Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.

3 files changed, 56 insertions, 0 deletions

diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix
new file mode 100644
index 000000000000..9907ae24f2c9
--- /dev/null
+++ b/pkgs/development/libraries/givaro/3.7.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "givaro";
+  version = "3.7.2";
+  src = fetchurl {
+    url = "https://forge.imag.fr/frs/download.php/370/givaro-${version}.tar.gz";
+    sha256 = "0lf5cnbyr27fw7klc3zabkb1979dn67jmrjz6pa3jzw2ng74x9b3";
+  };
+  buildInputs = [autoconf automake libtool autoreconfHook gmpxx];
+  meta = {
+    inherit version;
+    description = ''A C++ library for arithmetic and algebraic computations'';
+    license = stdenv.lib.licenses.cecill-b;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix
new file mode 100644
index 000000000000..bb0fd0e08982
--- /dev/null
+++ b/pkgs/development/libraries/givaro/3.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "givaro";
+  version = "3.8.0";
+  src = fetchurl {
+    url = "https://forge.imag.fr/frs/download.php/592/givaro-${version}.tar.gz";
+    sha256 = "1822ksv8653a84hvcz0vxl3nk8dqz7d41ys8rplq0zjjmvb2i5yq";
+  };
+  buildInputs = [autoconf automake libtool autoreconfHook gmpxx];
+  meta = {
+    inherit version;
+    description = ''A C++ library for arithmetic and algebraic computations'';
+    license = stdenv.lib.licenses.cecill-b;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix
new file mode 100644
index 000000000000..d9a8624b2ea2
--- /dev/null
+++ b/pkgs/development/libraries/givaro/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "givaro";
+  version = "4.0.2";
+  src = fetchFromGitHub {
+    owner = "linbox-team";
+    repo = "${pname}";
+    rev = "v${version}";
+    sha256 = "04n1lyc823z3l1d7mnmqpc9z1pkn646szjchasbfkn74m7cb0qz7";
+  };
+  buildInputs = [autoconf automake libtool autoreconfHook gmpxx];
+  meta = {
+    inherit version;
+    description = ''A C++ library for arithmetic and algebraic computations'';
+    license = stdenv.lib.licenses.cecill-b;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}