Merge master into staging-next

7 files changed, 62 insertions, 43 deletions

diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index cb4cf580a0e..d53d1426a94 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -34,7 +34,7 @@
 }:
 
 let
-  version = "8.3.9";
+  version = "8.3.29";
   packInstall = swiplPath: pack:
     ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/pack\"), silent(true), interactive(false)])." -t "halt."
     '';
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
     owner = "SWI-Prolog";
     repo = "swipl-devel";
     rev = "V${version}";
-    sha256 = "0ixb8pc5s7q8q0njs8is1clpvik6jhhdcwnys7m9rpwdzgi10sjz";
+    sha256 = "sha256-2QYY3VDG3dhbv5gtSid4eMYMxhhpggCedJL+RhtbbaU=";
     fetchSubmodules = true;
   };
 
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
     homepage = "https://www.swi-prolog.org";
     description = "A Prolog compiler and interpreter";
     license = lib.licenses.bsd2;
-
+    mainProgram = "swipl";
     platforms = lib.platforms.linux ++ lib.optionals (!withGui) lib.platforms.darwin;
     maintainers = [ lib.maintainers.meditans ];
   };
diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix
index f93e0ae5d95..194c67eba98 100644
--- a/pkgs/development/interpreters/shen-sbcl/default.nix
+++ b/pkgs/development/interpreters/shen-sbcl/default.nix
@@ -1,30 +1,39 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
 , shen-sources
 , sbcl
 }:
 
 stdenv.mkDerivation rec {
-  name = "shen-sbcl-${version}";
+  pname = "shen-sbcl";
   version = "3.0.3";
+
   src = fetchurl {
     url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz";
     sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz";
   };
-  buildInputs = [
-    sbcl shen-sources
-  ];
-  buildPhase = ''
+
+  nativeBuildInputs = [ sbcl ];
+
+  preBuild = ''
     ln -s ${shen-sources} kernel
-    make sbcl
   '';
+
+  buildFlags = [ "build-sbcl" ];
+
+  checkTarget = "test-sbcl";
+
+  doCheck = true;
+
   installPhase = ''
-    mkdir -p $out
     install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl
   '';
+
   meta = with lib; {
-    homepage = https://shenlanguage.org;
+    homepage = "https://shenlanguage.org";
     description = "Port of Shen running on Steel Bank Common Lisp";
+    changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md";
     platforms = sbcl.meta.platforms;
     maintainers = with maintainers; [ bsima ];
     license = licenses.bsd3;
diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/development/interpreters/shen-sources/default.nix
index 84839cf42de..99e72fbea11 100644
--- a/pkgs/development/interpreters/shen-sources/default.nix
+++ b/pkgs/development/interpreters/shen-sources/default.nix
@@ -1,26 +1,28 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
 }:
 
 stdenv.mkDerivation rec {
-  name = "shen-sources-${version}";
-  version = "22.3";
+  pname = "shen-sources";
+  version = "22.4";
 
   src = fetchurl {
     url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz";
-    sha256 = "16jaliga3bia0f8c8ja1y22wanbnbriv31qfqdc87a4p4dx9c77q";
+    sha256 = "1wlyh4rbzr615iykq1s779jvq28812rb4dascx1kzpakhw8z0260";
   };
 
-  buildInputs = [];
-  buildPhase = "";
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p $out
     cp . $out -R
   '';
 
   meta = with lib; {
-    homepage = https://shenlanguage.org;
+    homepage = "https://shenlanguage.org";
     description = "Source code for the Shen Language";
+    changelog = "https://github.com/Shen-Language/shen-sources/raw/shen-${version}/CHANGELOG.md";
     platforms = platforms.all;
     maintainers = with maintainers; [ bsima ];
     license = licenses.bsd3;
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
index a1d457f8775..a6867aac63a 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
@@ -31,9 +31,17 @@ buildDunePackage rec {
   useDune2 = true;
   minimumOCamlVersion = "4.06";
 
-  buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ];
+  buildInputs =
+    if lib.versionAtLeast version "1.7.0" then
+      [ ]
+    else
+      [ yojson stdlib-shims ocaml-syntax-shims ];
 
-  propagatedBuildInputs = [ ppx_yojson_conv_lib result ];
+  propagatedBuildInputs =
+    if lib.versionAtLeast version "1.7.0" then
+      [ ]
+    else
+      [ ppx_yojson_conv_lib result ];
 
   meta = with lib; {
     description = "Jsonrpc protocol implementation in OCaml";
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
index f81def4a7b4..869e9f63354 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
@@ -9,16 +9,21 @@
 , octavius
 , dune-build-info
 , uutf
+, re
 , pp
 , csexp
 , cmdliner
 }:
 
-buildDunePackage {
+buildDunePackage rec {
   pname = "lsp";
   inherit (jsonrpc) version src;
   useDune2 = true;
-  minimumOCamlVersion = "4.06";
+  minimumOCamlVersion =
+    if lib.versionAtLeast version "1.7.0" then
+      "4.12"
+    else
+      "4.06";
 
   # unvendor some (not all) dependencies.
   # They are vendored by upstream only because it is then easier to install
@@ -28,22 +33,24 @@ buildDunePackage {
     rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner}
   '';
 
-  buildInputs = [
-    cppo
-    ppx_yojson_conv_lib
-    ocaml-syntax-shims
-    octavius
-    dune-build-info
-    omd
-    cmdliner
-  ] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp;
+  buildInputs =
+    if lib.versionAtLeast version "1.7.0" then
+      [ pp re ppx_yojson_conv_lib octavius dune-build-info omd cmdliner ]
+    else
+      [ cppo
+        ppx_yojson_conv_lib
+        ocaml-syntax-shims
+        octavius
+        dune-build-info
+        omd
+        cmdliner
+      ];
 
   propagatedBuildInputs = [
     csexp
     jsonrpc
-    stdlib-shims
     uutf
-  ];
+  ] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims;
 
   meta = jsonrpc.meta // {
     description = "LSP protocol implementation in OCaml";
diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix
index 48ac17f66d6..e5b6b6cc1cd 100644
--- a/pkgs/development/python-modules/certbot/default.nix
+++ b/pkgs/development/python-modules/certbot/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "certbot";
-  version = "1.18.0";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-j+MygstaOt3TMz8rEZE5OBYVZXWtrUyIuSO+qagKrjk=";
+    sha256 = "sha256-tCszN+sy4Z6nOwULj9ra5/TtW4YYi32fkbMKub5i2Xk=";
   };
 
   sourceRoot = "source/${pname}";
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 8111f6e53cd..d06b362e2ce 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -623,13 +623,6 @@ in
     buildInputs = [ taglib ];
   };
 
-  thrift = attrs: {
-    # See: https://stackoverflow.com/questions/36378190/cant-install-thrift-gem-on-os-x-el-capitan/36523125#36523125
-    # Note that thrift-0.8.0 is a dependency of fluent-plugin-scribe which is a dependency of fluentd.
-    buildFlags = lib.optional (stdenv.isDarwin && lib.versionOlder attrs.version "0.9.2.0")
-      "--with-cppflags=\"-D_FORTIFY_SOURCE=0 -Wno-macro-redefined -Wno-shift-negative-value\"";
-  };
-
   timfel-krb5-auth = attrs: {
     buildInputs = [ libkrb5 ];
   };