Merge master into staging-next

2 files changed, 1 insertions, 25 deletions

diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 9953eaa3144c1..bf37d19cd8c4d 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
     which perl hostname
     # Some of the books require one or more of these external tools:
     glucose minisat abc-verifier libipasir
-    z3 (python3.withPackages (ps: [ ps.z3 ]))
+    z3 (python3.withPackages (ps: [ ps.z3-solver ]))
   ];
 
   # NOTE: Parallel building can be memory-intensive depending on the number of
diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
deleted file mode 100644
index 79258d2cc0fa0..0000000000000
--- a/pkgs/development/interpreters/regina/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, ncurses }:
-
-stdenv.mkDerivation rec {
-  pname = "Regina-REXX";
-  version = "3.9.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx";
-  };
-
-  buildInputs = [ ncurses ];
-
-  configureFlags = [
-    "--libdir=$(out)/lib"
-  ];
-
-  meta = with lib; {
-    description = "REXX interpreter";
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux;
-    license = licenses.lgpl2;
-  };
-}