Merge master into haskell-updates

2023-05-14 00:13:13 +00:00
parent 86ae6cd26b a3fe093364
commit a886796add
14 changed files with 56 additions and 39 deletions
@@ -138,7 +138,8 @@ in
            };

            source = mkOption {
-              type = types.path;
+              default = null;
+              type = types.nullOr types.path;
              description = lib.mdDoc "Path of the source file.";
            };

@@ -160,9 +161,11 @@ in
    environment.etc = listToAttrs (attrValues (mapAttrs
      (name: value: {
        name = "xdg/nvim/${name}";
-        value = value // {
-          target = "xdg/nvim/${value.target}";
-        };
+        value = removeAttrs
+          (value // {
+            target = "xdg/nvim/${value.target}";
+          })
+          (optionals (isNull value.source) [ "source" ]);
      })
      cfg.runtime));

@@ -5121,6 +5121,18 @@ final: prev:
    meta.homepage = "https://github.com/chikamichi/mediawiki.vim/";
  };

+  melange-nvim = buildVimPluginFrom2Nix {
+    pname = "melange-nvim";
+    version = "2023-04-06";
+    src = fetchFromGitHub {
+      owner = "savq";
+      repo = "melange-nvim";
+      rev = "f15922543dd70b360335effb61411c05c710b99c";
+      sha256 = "19swmv0xzlxp7bcmgdm2qfam28wi9igqvfn5q7wq8qshb2wqzph1";
+    };
+    meta.homepage = "https://github.com/savq/melange-nvim/";
+  };
+
  mini-nvim = buildVimPluginFrom2Nix {
    pname = "mini.nvim";
    version = "2023-05-07";
@@ -430,6 +430,7 @@ https://github.com/marko-cerovac/material.nvim/,,
 https://github.com/kaicataldo/material.vim/,HEAD,
 https://github.com/vim-scripts/mayansmoke/,,
 https://github.com/chikamichi/mediawiki.vim/,HEAD,
+https://github.com/savq/melange-nvim/,,
 https://github.com/echasnovski/mini.nvim/,,
 https://github.com/wfxr/minimap.vim/,,
 https://github.com/jose-elias-alvarez/minsnip.nvim/,,
@@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "opera";
-  version = "98.0.4759.15";
+  version = "98.0.4759.39";

  src = fetchurl {
    url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-nv6/RXsF8rvYoCfsUC1xR79ssroAkfBqzADi02AfYH8=";
+    hash = "sha256-3HVgEOscds+VBn9ajmkRnPdqNi9lLItJrb3uRH6L96Q=";
  };

  unpackPhase = "dpkg-deb -x $src .";
@@ -13,6 +13,7 @@
 , cups
 , udev
 , xorg
+, pango
 , makeWrapper
 , useChineseVersion ? false
 }:
@@ -56,8 +57,9 @@ stdenv.mkDerivation rec {
    udev
  ];

-  runtimeDependencies = [
-    cups.lib
+  runtimeDependencies = map lib.getLib [
+    cups
+    pango
  ];

  installPhase = ''
@@ -64,7 +64,7 @@ in rec {
    outputs = [ "out" "man" "stubbyExampleJson" ];

    inherit (getdns) src;
-    sourceRoot = "${getdns.name}/stubby";
+    sourceRoot = "${getdns.pname}-${getdns.version}/stubby";

    nativeBuildInputs = [ cmake doxygen yq ];

@@ -1,21 +1,17 @@
-{ stdenv, lib, fetchurl, buildDunePackage, ounit }:
+{ stdenv, lib, fetchurl, buildDunePackage, ocaml, ounit2 }:

 buildDunePackage rec {
  pname = "dtoa";
-  version = "0.3.2";
-
-  useDune2 = true;
-
-  minimumOCamlVersion = "4.02";
+  version = "0.3.3";

  src = fetchurl {
-    url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
-    sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn";
+    url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    hash = "sha256-2PRgjJ6Ssp4l6jHzv1/MqzlomQlJkKLVnRXG6KPJ7j4=";
  };

-  checkInputs = [ ounit ];
+  checkInputs = [ ounit2 ];

-  doCheck = true;
+  doCheck = lib.versionAtLeast ocaml.version "4.08";

  hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";

@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "azure-mgmt-keyvault";
-  version = "10.1.0";
+  version = "10.2.1";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    hash = "sha256-DpO+6FvsNwjjcz2ImhHpColHVNpPUMgCtEMrfUzfAaA=";
+    hash = "sha256-lozs6Jy6V5cJigM7NUn8eyP/EVf/TKk+pZ9vABgAqK0=";
  };

  propagatedBuildInputs = [
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "deezer-python";
-  version = "5.9.0";
+  version = "5.12.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "browniebroke";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-S2OC2OvXoc7LDTX0ZkVtaLHflio+3u1Ic/i9TtQN4Ac=";
+    hash = "sha256-fJRGtes5EdGHiTJ5SDOyZT9NEnghbu+7I9OD2h4JOjw=";
  };

  nativeBuildInputs = [
@@ -11,13 +11,13 @@

 buildPythonPackage rec {
  pname = "dogpile-cache";
-  version = "1.1.8";
+  version = "1.2.0";
  disabled = pythonOlder "3.6";

  src = fetchPypi {
    pname = "dogpile.cache";
    inherit version;
-    hash = "sha256-2ETou2OMxPVEpMiag039Nv6TVAC3GhbL10Tr37cg/U4=";
+    hash = "sha256-R1VMhgzrSE3Vrvn/H4j+yz1K72u5IRlFD1vLqgJrv7E=";
  };

  preCheck = ''
@@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "fakeredis";
-  version = "2.12.0";
+  version = "2.12.1";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "dsoftwareinc";
    repo = "fakeredis-py";
    rev = "refs/tags/v${version}";
-    hash = "sha256-D38EORmhPPN+iTggIF9JIRDR4+zCwE6JP8X+IVfdE7o=";
+    hash = "sha256-WF3dITWCrTQDORfaGWPpJBQFkPrUN6faHohjvBuOW7I=";
  };

  nativeBuildInputs = [
@@ -17,19 +17,19 @@

 buildPythonPackage rec {
  pname = "glean-sdk";
-  version = "52.6.0";
+  version = "52.7.0";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-TTV6oydUP2znEOm7KZElugNDfROnlPmyC19Ig1H8/wM=";
+    hash = "sha256-sLjdGHiS7Co/oA9gQyAFkD14tAYjmwjWcPr4CRrzw/0=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-Np2TfgKP3yfJqA4WZyyedGp9XtKJjDikUov5pvB/opk=";
+    hash = "sha256-5TlgWcLmjklxhtDbB0aRF71iIRTJwetFj1Jii1DGdvU=";
  };

  nativeBuildInputs = [
@@ -54,6 +54,7 @@ buildPythonPackage rec {
  disabledTests = [
    # RuntimeError: No ping received.
    "test_client_activity_api"
+    "test_flipping_upload_enabled_respects_order_of_events"
  ];

  pythonImportsCheck = [
@@ -7,6 +7,7 @@
 , isodate
 , nest-asyncio
 , pytestCheckHook
+, pythonOlder
 , mock
 , pyhamcrest
 , radish-bdd
@@ -14,14 +15,16 @@

 buildPythonPackage rec {
  pname = "gremlinpython";
-  version = "3.6.1";
+  version = "3.6.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

-  # pypi tarball doesn't include tests
  src = fetchFromGitHub {
    owner = "apache";
    repo = "tinkerpop";
-    rev = version;
-    hash = "sha256-FMA9hJdq7gYkDtQO04Bwpjq2Q7nXGuN9wrBD4b9GgwY=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-CmVWaRebJaZHJGzhaBdYXPF3BZ8+Cvc5P/KOpsG+dX4=";
  };

  sourceRoot = "source/gremlin-python/src/main/python";
@@ -30,7 +33,6 @@ buildPythonPackage rec {
    sed -i '/pytest-runner/d' setup.py

    substituteInPlace setup.py \
-      --replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \
      --replace 'importlib-metadata<5.0.0' 'importlib-metadata' \
      --replace "os.getenv('VERSION', '?').replace('-SNAPSHOT', '.dev-%d' % timestamp)" '"${version}"'
  '';
@@ -2,13 +2,13 @@

 stdenv.mkDerivation {
  pname = "pplatex";
-  version = "unstable-2015-09-14";
+  version = "unstable-2023-04-18";

  src = fetchFromGitHub {
    owner = "stefanhepp";
    repo = "pplatex";
-    rev = "5cec891ad6aec0115081cdd114ae1cc4f1ed7c06";
-    sha256 = "0wrkkbz6b6x91650nm8gccz7xghlp7b1i31fxwalz9xw3py9xygb";
+    rev = "8487b00b25127d9a4883e878000f4be6f89d56d5";
+    sha256 = "sha256-wPPJBn/UfmTWsD5JOg6po83Qn4qlpwgsPUV3iJzw5KU=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
      "A tool to reformat the output of latex and friends into readable messages";
    homepage = "https://github.com/stefanhepp/pplatex";
    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.srgom ];
+    maintainers = [ maintainers.srgom maintainers.doronbehar ];
    platforms = platforms.unix;
  };
 }