Merge branch 'master' into staging-next

pkgs/development/interpreters/metamath/default.nix

@@ -1,12 +1,10 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook }:
 
-let
-  version = "0.196";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "metamath";
-  inherit version;
+  version = "0.196";
 
-  buildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   src = fetchFromGitHub {
     owner = "metamath";
@@ -25,7 +23,7 @@ in stdenv.mkDerivation {
     '';
     homepage = "http://us.metamath.org";
     downloadPage = "http://us.metamath.org/#downloads";
-    license = licenses.gpl2Only;
+    license = licenses.gpl2Plus;
     maintainers = [ maintainers.taneb ];
     platforms = platforms.all;
   };

pkgs/development/interpreters/sollya/default.nix

@@ -0,0 +1,29 @@
+{ lib
+, stdenv
+, fetchurl
+, gmp
+, mpfr
+, mpfi
+, libxml2
+, fplll
+}:
+
+stdenv.mkDerivation rec {
+  pname = "sollya";
+  version = "7.0";
+
+  src = fetchurl {
+    url = "https://www.sollya.org/releases/sollya-${version}/sollya-${version}.tar.gz";
+    sha256 = "0amrxg7567yy5xqpgchxggjpfr11xyl27vy29c7vlh7v8a17nj1h";
+  };
+
+  buildInputs = [ gmp mpfr mpfi libxml2 fplll ];
+
+  meta = with lib; {
+    description = "A tool environment for safe floating-point code development";
+    homepage = "https://www.sollya.org/";
+    license = licenses.cecill-c;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ eduardosm ];
+  };
+}