From 73e00c9ea1d02fc038d32a15c8d4cbd76865d54f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 May 2023 00:17:21 +0000 Subject: [PATCH 01/15] opera: 98.0.4759.15 -> 98.0.4759.39 --- pkgs/applications/networking/browsers/opera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 095790eae806..aff843adb77c 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -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 ."; From 9cc5cd8fed0db6f586b0c7d589d9656d5d902881 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 12 May 2023 22:02:03 +0200 Subject: [PATCH 02/15] =?UTF-8?q?ocamlPackages.dtoa:=200.3.2=20=E2=86=92?= =?UTF-8?q?=200.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/dtoa/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index ffcfb38c6bf1..866375cc5bae 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -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"; From 83c97a6097cc6d0b2cb737b584e90c51186e5641 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 13 May 2023 13:03:10 +0800 Subject: [PATCH 03/15] stubby: fix sourceRoot for cross compilation --- pkgs/development/libraries/getdns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 777e4ba4eff9..509a9bbbba54 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -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 ]; From 4784bbfbd1fa6418706ed9cd75eda158d0acf9f7 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 13 May 2023 13:49:13 +0800 Subject: [PATCH 04/15] wpsoffice: add pango as runtime dependencies --- pkgs/applications/office/wpsoffice/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 0e0a622de4a9..53cd8d05ea69 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -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 = '' From 1ef11f7fae0c33ff20e1a6a6af38a0f107d94128 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 18:03:48 +0200 Subject: [PATCH 05/15] python310Packages.azure-mgmt-keyvault: 10.1.0 -> 10.2.1 --- .../python-modules/azure-mgmt-keyvault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index c0efa141785f..fcbe335c670f 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -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 = [ From d2313a5a58544f2809d08944aeff6e517de82232 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 13 May 2023 21:52:29 +0300 Subject: [PATCH 06/15] pplatex: unstable-2015-09-14 -> unstable-2023-04-18 --- pkgs/tools/typesetting/tex/pplatex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/tools/typesetting/tex/pplatex/default.nix index 1a0293255d8e..355546d751cc 100644 --- a/pkgs/tools/typesetting/tex/pplatex/default.nix +++ b/pkgs/tools/typesetting/tex/pplatex/default.nix @@ -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 ]; From 70e88eb75df2d9120a6a0d6c68c49065a0cfea0b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 13 May 2023 22:04:33 +0300 Subject: [PATCH 07/15] pplatex: Add doronbehar as maintainer --- pkgs/tools/typesetting/tex/pplatex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/tools/typesetting/tex/pplatex/default.nix index 355546d751cc..8e0c65bf346c 100644 --- a/pkgs/tools/typesetting/tex/pplatex/default.nix +++ b/pkgs/tools/typesetting/tex/pplatex/default.nix @@ -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; }; } From 5e829058576702e0cc76dc73899bfe1d22daf083 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 21:32:09 +0200 Subject: [PATCH 08/15] python311Packages.deezer-python: 5.9.0 -> 5.12.0 Diff: https://github.com/browniebroke/deezer-python/compare/refs/tags/v5.9.0...v5.12.0 Changelog: https://github.com/browniebroke/deezer-python/releases/tag/v5.12.0 --- pkgs/development/python-modules/deezer-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 57b02b78699a..d460f7f55826 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -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 = [ From 4c886c8593961530c647d702b93ed965032c955c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 21:41:32 +0200 Subject: [PATCH 09/15] python311Packages.dogpile-cache: 1.1.8 -> 1.2.0 --- pkgs/development/python-modules/dogpile-cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index 7fe0466a2598..4f5337fdb04c 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -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 = '' From 91b8a80d86c6352ad1450ce3d551d6addcf70db7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 21:46:13 +0200 Subject: [PATCH 10/15] python311Packages.fakeredis: 2.12.0 -> 2.12.1 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.12.0...v2.12.1 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.12.1 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 9f2ee8f0d760..11a6ebb85be8 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -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 = [ From 073eb59305dcbd3f12366bd0b324c9f48fa86183 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 22:06:18 +0200 Subject: [PATCH 11/15] python311Packages.gremlinpython: 3.6.1 -> 3.6.3 Diff: https://github.com/apache/tinkerpop/compare/3.6.1...3.6.3 --- pkgs/development/python-modules/gremlinpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index a16cbd3cca82..a75913c540ce 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gremlinpython"; - version = "3.6.1"; + version = "3.6.3"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "apache"; repo = "tinkerpop"; rev = version; - hash = "sha256-FMA9hJdq7gYkDtQO04Bwpjq2Q7nXGuN9wrBD4b9GgwY="; + hash = "sha256-CmVWaRebJaZHJGzhaBdYXPF3BZ8+Cvc5P/KOpsG+dX4="; }; sourceRoot = "source/gremlin-python/src/main/python"; From d76fb6f21f085407bb8598d84575cc037ff5a148 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 22:15:13 +0200 Subject: [PATCH 12/15] python311Packages.gremlinpython: disable on unsupported Python releases - add format --- pkgs/development/python-modules/gremlinpython/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index a75913c540ce..f4835aa47e4f 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -7,6 +7,7 @@ , isodate , nest-asyncio , pytestCheckHook +, pythonOlder , mock , pyhamcrest , radish-bdd @@ -15,12 +16,14 @@ buildPythonPackage rec { pname = "gremlinpython"; version = "3.6.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "apache"; repo = "tinkerpop"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-CmVWaRebJaZHJGzhaBdYXPF3BZ8+Cvc5P/KOpsG+dX4="; }; @@ -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}"' ''; From eee955e3d7ca3ff51f1152c2d7c3320e0cfbecbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 May 2023 22:19:28 +0200 Subject: [PATCH 13/15] python311Packages.glean-sdk: 52.6.0 -> 52.7.0 --- pkgs/development/python-modules/glean-sdk/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 1a3bc1133634..a6137bdc2dd4 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -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 = [ From b29d6f93d74fece284393c324e3eeb7fc5115de5 Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Sun, 14 May 2023 04:21:17 +0800 Subject: [PATCH 14/15] vimPlugins.melange-nvim: init at unstable-2023-04-06 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c6e029fa54be..bb560d036bab 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -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"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c43d419e8207..60dd01d9244d 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -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/,, From c3a2ce47a16096e504e7e5c75afbef3c6200074d Mon Sep 17 00:00:00 2001 From: linsui Date: Fri, 28 Apr 2023 20:39:51 +0800 Subject: [PATCH 15/15] nixos/neovim: fix runtime.text --- nixos/modules/programs/neovim.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index 3f0e9fc173bd..1b53b9b5d919 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -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));