Merge master into staging-next

pkgs/applications/misc/variety/default.nix

@@ -10,6 +10,7 @@
 , hicolor-icon-theme
 , librsvg
 , wrapGAppsHook
+, makeWrapper
 }:
 
 with python37Packages;
@@ -27,10 +28,14 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [ intltool wrapGAppsHook ];
 
-  buildInputs = [ distutils_extra ];
+  buildInputs = [ makeWrapper distutils_extra ];
 
   doCheck = false;
 
+  postInstall = ''
+    wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
+  '';
+
   prePatch = ''
     substituteInPlace variety_lib/varietyconfig.py \
       --replace "__variety_data_directory__ = \"../data\"" "__variety_data_directory__ = \"$out/share/variety\""
@@ -76,7 +81,7 @@ buildPythonApplication rec {
       blur, as well as options to layer quotes and a clock onto the background.
     '';
     license = licenses.gpl3;
-    maintainers = with maintainers; [ AndersonTorres zfnmxt ];
+    maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ];
     platforms = with platforms; linux;
   };
 }

pkgs/development/interpreters/micropython/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "micropython";
-  version = "1.13";
+  version = "1.15";
 
   src = fetchFromGitHub {
     owner  = "micropython";
     repo   = "micropython";
     rev    = "v${version}";
-    sha256 = "0m9g6isys4pnlnkdmrw7lxaxdrjn02j481wz5x5cdrmrbi4zi17z";
+    sha256 = "11bf1lq4kgfs1nzg5cnshh2dqxyk5w2k816i04innri6fj0g7y6p";
     fetchSubmodules = true;
   };
 
@@ -25,13 +25,15 @@ stdenv.mkDerivation rec {
 
   checkPhase = ''
     pushd tests
-    MICROPY_MICROPYTHON=../ports/unix/micropython ${python3.interpreter} ./run-tests
+    MICROPY_MICROPYTHON=../ports/unix/micropython ${python3.interpreter} ./run-tests.py
     popd
   '';
 
   installPhase = ''
+    runHook preInstall
     mkdir -p $out/bin
-    install -Dm755 ports/unix/micropython $out/bin/micropython
+    install -Dm755 ports/unix/micropython -t $out/bin
+    runHook postInstall
   '';
 
   meta = with lib; {

pkgs/development/libraries/ncurses/default.nix

@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optional unicode "--enable-widec"
     ++ lib.optional (!withCxx) "--without-cxx"
     ++ lib.optional (abiVersion == "5") "--with-abi-version=5"
+    ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath"
     ++ lib.optionals stdenv.hostPlatform.isWindows [
       "--enable-sp-funcs"
       "--enable-term-driver"

pkgs/development/ocaml-modules/fileutils/default.nix

@@ -1,28 +1,30 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
+{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }:
 
-stdenv.mkDerivation {
+buildDunePackage rec {
-  name = "ocaml${ocaml.version}-fileutils-0.5.3";
+  pname = "fileutils";
+  version = "0.6.3";
 
   src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/1728/ocaml-fileutils-0.5.3.tar.gz";
+    url = "https://github.com/gildor478/ocaml-fileutils/releases/download/v${version}/fileutils-v${version}.tbz";
-    sha256 = "1rc4cqlvdhbs55i85zfbfhz938fsy4fj6kwlkfm3ra7bpwn8bmpd";
+    sha256 = "0qhlhc7fzcq0yfg1wyszsi0gyc4w9hyzmfv84aq9wc79i3283xgg";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ounit ];
+  minimumOCamlVersion = "4.03";
+  useDune2 = true;
 
-  configureFlags = [ "--enable-tests" ];
+  propagatedBuildInputs = [
+    stdlib-shims
+  ];
+
+  checkInputs = [
+    ounit
+  ];
   doCheck = true;
-  checkTarget = "test";
 
-  createFindlibDestdir = true;
+  meta = with lib; {
-
+    description = "OCaml API to manipulate real files (POSIX like) and filenames";
-  preInstall = "make doc";
+    homepage = "https://github.com/gildor478/ocaml-fileutils";
-
+    license = licenses.lgpl21Plus;
-  meta = {
+    maintainers = with maintainers; [ vbgl ];
-    homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/";
-    platforms = ocaml.meta.platforms or [];
-    description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename";
-    license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ vbgl ];
   };
 }

pkgs/development/ocaml-modules/sha/default.nix

@@ -1,28 +1,29 @@
-{ lib
+{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }:
-, fetchurl
-, buildDunePackage
-, ounit
-}:
 
 buildDunePackage rec {
   pname = "sha";
-  version = "1.13";
+  version = "1.14";
-
-  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/djs55/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
-    sha256 = "00z2s4fsv9i1h09rj5dy3nd9hhcn79b75sn2ljj5wihlf4y4g304";
+    sha256 = "114vydrfdp7fayigvgk3ckiby0kh4n49c1j53v8k40gk6nzm3l19";
   };
 
+  useDune2 = true;
+
+  propagatedBuildInputs = [
+    stdlib-shims
+  ];
+
   doCheck = true;
-  checkInputs = [ ounit ];
+  checkInputs = [
+    ounit
+  ];
 
   meta = with lib; {
     description = "Binding for SHA interface code in OCaml";
-    maintainers = [ maintainers.arthurteisseire ];
+    homepage = "https://github.com/djs55/ocaml-sha/";
-    homepage = "https://github.com/djs55/ocaml-${pname}";
     license = licenses.isc;
+    maintainers = with maintainers; [ arthurteisseire ];
   };
-
 }

pkgs/development/tools/clang-tools/wrapper

@@ -19,9 +19,9 @@ buildcpath() {
 }
 
 export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
-                                               $(<@clang@/nix-support/libc-cflags))
+                                               $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include
 export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \
                                                                                       $(<@clang@/nix-support/libcxx-cxxflags) \
-                                                                                      $(<@clang@/nix-support/libc-cflags))
+                                                                                      $(<@clang@/nix-support/libc-cflags)):@clang@/resource-root/include
 
 exec -a "$0" @unwrapped@/bin/$(basename $0) "$@"

pkgs/servers/dns/pdns-recursor/default.nix

@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pdns-recursor";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "0yaf25jg3gfsi9c9rnxz1ywy3b563plv33aibxrq79iqwk8a289p";
+    sha256 = "1101izvyknxqhzz987j3acsa221ymgrnmyciaz8v7jziai9ksa5i";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     badPlatforms = [
       "i686-linux"  # a 64-bit time_t is needed
     ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
     maintainers = with maintainers; [ rnhmjoj ];
   };
 }