From 1f9308f005349b861f52b5434d4010730d317afd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 1 Mar 2023 09:58:44 +0800 Subject: [PATCH 01/25] nixos/pantheon: add mutter to services.udev.packages For ./lib/udev/rules.d/61-mutter.rules Same as d1eeb64. This is forgotten in PR 130380. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 7791a98965d1..4d0296c8254c 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -169,6 +169,9 @@ in }; services.udev.packages = [ pkgs.pantheon.gnome-settings-daemon + # Force enable KMS modifiers for devices that require them. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 + pkgs.pantheon.mutter ]; systemd.packages = [ pkgs.pantheon.gnome-settings-daemon From 7c6642d5fbf2ac7694998ad1b6f002a18c5c33a5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 02/25] python310Packages.setuptools-gettext: 0.1.1 -> 0.1.3 --- .../development/python-modules/setuptools-gettext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix index f8b5d45bbc7f..882eb6d4599b 100644 --- a/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "setuptools-gettext"; - version = "0.1.1"; + version = "0.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = "setuptools-gettext"; rev = "refs/tags/v${version}"; - hash = "sha256-MifsEuWNTEDJa9RfIbM/EDMJg0cmHXX6oJxNskKEbY4="; + hash = "sha256-pTjYdezNBFeLCh6cbC+YtHxQB4zrZAFTCjjNQffbHhc="; }; propagatedBuildInputs = [ From 4c1b62fb6c84eee1b286aa275a817a185d0039f8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 03/25] python310Packages.merge3: init at 0.0.13 --- .../python-modules/merge3/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/merge3/default.nix diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix new file mode 100644 index 000000000000..e16a73eee3df --- /dev/null +++ b/pkgs/development/python-modules/merge3/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools +}: + +buildPythonPackage rec { + pname = "merge3"; + version = "0.0.13"; + + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "8abda1d2d49776323d23d09bfdd80d943a57d43d28d6152ffd2c87956a9b6b54"; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "merge3" + ]; + + meta = with lib; { + description = "Python implementation of 3-way merge"; + homepage = "https://github.com/breezy-team/merge3"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cef51d98405e..259f5de93347 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5870,6 +5870,8 @@ self: super: with self; { python3Packages = self; }); + merge3 = callPackage ../development/python-modules/merge3 { }; + mergedb = callPackage ../development/python-modules/mergedb { }; mergedeep = callPackage ../development/python-modules/mergedeep { }; From 37343e1557ae267f58f665dd4d98c7b125639e6f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 04/25] python310Packages.sphinx-book-theme: 1.0.0rc2 -> 1.0.0 --- .../python-modules/sphinx-book-theme/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 12a5878024b8..cb7c3a593b19 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -4,13 +4,12 @@ , fetchPypi , sphinx , pydata-sphinx-theme -, pyyaml , jupyter-book }: buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "1.0.0rc2"; + version = "1.0.0"; format = "wheel"; @@ -21,13 +20,12 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - sha256 = "43977402f55b79706e117c6de6f50e67dac6dad698eb9b75be07dc2e6a689bde"; + sha256 = "sha256-9rq6eIjVpjMoohDplgp6bpUeljLXTttvzkjJ1djCh2g="; }; propagatedBuildInputs = [ - sphinx pydata-sphinx-theme - pyyaml + sphinx ]; pythonImportsCheck = [ From a1f0f485c431434b4126419c28f25f374a95858d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 05/25] python310Packages.breezy: 3.2.2 -> 3.3.2 --- .../python-modules/breezy/Cargo.lock | 311 ++++++++++++++++++ .../python-modules/breezy/default.nix | 93 +++++- 2 files changed, 390 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/breezy/Cargo.lock diff --git a/pkgs/development/python-modules/breezy/Cargo.lock b/pkgs/development/python-modules/breezy/Cargo.lock new file mode 100644 index 000000000000..7333bfe40f31 --- /dev/null +++ b/pkgs/development/python-modules/breezy/Cargo.lock @@ -0,0 +1,311 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "breezy" +version = "3.3.2" +dependencies = [ + "pyo3", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "parking_lot", + "paste", + "pyo3-build-config", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pyo3-macros" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" +dependencies = [ + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rio-py" +version = "3.3.2" +dependencies = [ + "lazy_static", + "pyo3", + "regex", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unindent" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index c8104f1b2376..6d27908dd84f 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -1,57 +1,122 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , configobj -, patiencediff +, cython +, dulwich , fastbencode , fastimport -, dulwich +, libiconv +, merge3 +, patiencediff +, pyyaml +, urllib3 +, breezy , launchpadlib , testtools , pythonOlder , installShellFiles +, rustPlatform +, setuptools-gettext +, setuptools-rust +, testers }: buildPythonPackage rec { pname = "breezy"; - version = "3.2.2"; + version = "3.3.2"; + format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GHpuRSCN0F2BdQc2cgyDcQz0gJT1R+xAgcVxJZVZpNU="; + sha256 = "sha256-TqaUn8uwdrl4VFsJn6xoq6011voYmd7vT2uCo9uiV8E="; }; - nativeBuildInputs = [ installShellFiles ]; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + cargoHash = "sha256-xYZh/evNp036/wRlNWWUYeD2EkleM+OeY4qbYMCE00I="; + + nativeBuildInputs = [ + cython + installShellFiles + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + setuptools-gettext + setuptools-rust + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; propagatedBuildInputs = [ configobj - fastbencode - patiencediff - fastimport dulwich - launchpadlib + fastbencode + merge3 + patiencediff + pyyaml + urllib3 + ] ++ passthru.optional-dependencies.launchpad + ++ passthru.optional-dependencies.fastimport; + + nativeCheckInputs = [ + testtools ]; - nativeCheckInputs = [ testtools ]; - - # There is a conflict with their `lazy_import` and plugin tests + # multiple failures on sandbox doCheck = false; - # symlink for bazaar compatibility + checkPhase = '' + runHook preCheck + + HOME=$TMPDIR $out/bin/brz --no-plugins selftest + + runHook postCheck + ''; + postInstall = '' + wrapProgram $out/bin/brz --prefix PYTHONPATH : "$PYTHONPATH" + + # symlink for bazaar compatibility ln -s "$out/bin/brz" "$out/bin/bzr" installShellCompletion --cmd brz --bash contrib/bash/brz ''; - pythonImportsCheck = [ "breezy" ]; + pythonImportsCheck = [ + "breezy" + "breezy.bzr.rio" + ]; + + passthru = { + tests.version = testers.testVersion { + package = breezy; + command = "HOME=$TMPDIR brz --version"; + }; + optional-dependencies = { + launchpad = [ + launchpadlib + ]; + fastimport = [ + fastimport + ]; + }; + }; meta = with lib; { description = "Friendly distributed version control system"; homepage = "https://www.breezy-vcs.org/"; license = licenses.gpl2Only; maintainers = [ maintainers.marsam ]; + mainProgram = "brz"; }; } From f65afdc0b16f9fd06f402c39641fb2a4afc9ad19 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 06/25] python310Packages.jupyter-book: 0.13.2 -> 0.14.0 https://github.com/executablebooks/jupyter-book/releases/tag/v0.14.0 --- pkgs/development/python-modules/jupyter-book/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index ac2a6c8125df..12c4e08c9ae1 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "jupyter-book"; - version = "0.13.2"; + version = "0.14.0"; format = "flit"; @@ -34,7 +34,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wJWY0tBrlCkOFDfGZS4xWvv87sOlyrNl3fiGqgayqTs="; + sha256 = "sha256-BxrVrOsCqFRmx16l6YdkJplwdnU2XhRFMHd5DGy+dqE="; }; nativeBuildInputs = [ @@ -65,8 +65,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "docutils" - "myst-nb" - "sphinx" + "sphinx-book-theme" ]; pythonImportsCheck = [ From 8b15e401dc962528b50e6fc0cb58f17295c937a2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 07/25] yq-go: 4.30.8 -> 4.31.2 https://github.com/mikefarah/yq/raw/v4.31.2/release_notes.txt --- pkgs/development/tools/yq-go/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 98deb602199f..f4d643e5aada 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.30.8"; + version = "4.31.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-x0vdPi8/Iciy+22SPBpktgkQCMxd5PT674OsWaLi+Q0="; + hash = "sha256-Cf9Y7sdvpflQhhnOuRZUTyYQ3fpFTLo28dZtePsayfE="; }; - vendorHash = "sha256-VEVy8iVnUUpjTmCj7uIMcz0jaG9XGuxA3U02QfIwsYs="; + vendorHash = "sha256-nv1sJ5GGB2IbGF1ebGZmeKF6qHLXgFebdibcsB36juY="; nativeBuildInputs = [ installShellFiles ]; @@ -32,6 +32,7 @@ buildGoModule rec { meta = with lib; { description = "Portable command-line YAML processor"; homepage = "https://mikefarah.gitbook.io/yq/"; + changelog = "https://github.com/mikefarah/yq/raw/v${version}/release_notes.txt"; mainProgram = "yq"; license = [ licenses.mit ]; maintainers = with maintainers; [ lewo SuperSandro2000 ]; From b82b2b5303a25bb45432c4fe2f00961bba5e8c56 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 08/25] fetchbzr: set cache directory to tmpdir Breezy >3.3 writes the connections information to a cache directory, which fails on sandbox. --- pkgs/build-support/fetchbzr/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index 380642a5e681..991864719a07 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -5,4 +5,4 @@ echo "exporting \`$url' (revision $rev) into \`$out'" # Perform a lightweight checkout so that we don't end up importing # all the repository's history. -BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" +XDG_CACHE_HOME="$TMPDIR" BRZ_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" From b225bac4176eed7709fe7a3b6f251d52dd6eb6a0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Mar 2023 04:20:00 +0000 Subject: [PATCH 09/25] millet: 0.7.7 -> 0.7.9 --- .../development/tools/language-servers/millet/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 66488a607fd1..e39abae89a2c 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.7.7"; + version = "0.7.9"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-1GoZbeXNG00oxBdPa2yk0aOCVguwIkK6fKrlHU6mZYc="; + hash = "sha256-c4hNrswfYz/Wr59sWQJu8yuOqk594iVm+NzxYpG96Ys="; }; - cargoHash = "sha256-arIFWJX8WQQWcJP1YpMwFy2XHU/0w+oPj1qE/IlYRF4="; + cargoHash = "sha256-Ja5Vjt3z0pkxEMtkyWYY+lZH0AnzVzyGxlQtlmwWbS4="; postPatch = '' rm .cargo/config.toml @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A language server for Standard ML"; homepage = "https://github.com/azdavis/millet"; - changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/changelog.md"; + changelog = "https://github.com/azdavis/millet/raw/v${version}/docs/CHANGELOG.md"; license = [ licenses.mit /* or */ licenses.asl20 ]; maintainers = with maintainers; [ marsam ]; mainProgram = "millet-ls"; From 581804a146079a6c71514130c4efe414ffcf5e83 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 1 Mar 2023 09:08:05 +0100 Subject: [PATCH 10/25] slstatus: fix overriden build --- pkgs/applications/misc/slstatus/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index ac8170ed551c..4f022d81f62c 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { }; configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h" + '' + preBuild = '' + ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC) ''; From 00a025978c282422906c5f3c3fdcaad2ae2dedcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 10:11:54 +0000 Subject: [PATCH 11/25] python310Packages.rpyc: 5.3.0 -> 5.3.1 --- pkgs/development/python-modules/rpyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 5ad8494634fe..15d418826fe2 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rpyc"; - version = "5.3.0"; + version = "5.3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tomerfiliba"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gqYjCvyiLhgosmzYITrthMkjLA6WJcBbmjkTNXZKUxc="; + hash = "sha256-2b6ryqDqZPs5VniLhCwA1/c9+3CT+JJrr3VwP3G6tpY="; }; nativeBuildInputs = [ From cb41bc853ce10cb14adfe4de5af7684abf1c974f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 1 Mar 2023 11:37:41 -0800 Subject: [PATCH 12/25] python310Packages.hatch-jupyter-builder: don't depend on hatch --- .../python-modules/hatch-jupyter-builder/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index d49c2aedb46f..8ce6f73c547b 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , hatchling -, hatch , pytest-mock , pytestCheckHook , tomli @@ -26,7 +25,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - hatch pytest-mock pytestCheckHook tomli From f8178cfd0c0ecd16ed33783ab1bfa0dc1a444990 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 19:49:26 +0000 Subject: [PATCH 13/25] eksctl: 0.130.0 -> 0.131.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 6c090a11b346..32c71f2d1ceb 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.130.0"; + version = "0.131.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-SJI9EB0k45SJmWQ/pivlZMQdiE237vpLwNB2Y33ntrw="; + sha256 = "sha256-xH7GUR42eMhF2SXCprFEE6ESiFBYnpGP3lLZ4sKIu5s="; }; - vendorHash = "sha256-wrt8Mtek74ljCgp1Sxi/jKxCv61H7HqCLHXKrwS7ex4="; + vendorHash = "sha256-hF1J+HDpnWM55ga5ZOaApFmfx1/vF2SNl+JsDrMphtM="; doCheck = false; From c23a15e6674f9a4d43e4ad683d423de88b650960 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Mar 2023 21:57:03 +0000 Subject: [PATCH 14/25] go-toml: 2.0.6 -> 2.0.7 --- pkgs/development/tools/go-toml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 2c1a78fec0fd..96de13ace3e1 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RXKJJseRrwSTReMAkFjShKvCWGMowruYwsCovHwq4ZQ="; + sha256 = "sha256-bGLJSzSwcoKRMRwLSmGEWoQaC9NVwcKyFKpcEw+/Nag="; }; - vendorSha256 = "sha256-MMCyFKqsL9aSQqK9VtPzUbgfLTFpzD5g8QYx8qIwktg="; + vendorHash = "sha256-MMCyFKqsL9aSQqK9VtPzUbgfLTFpzD5g8QYx8qIwktg="; excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ]; From 3e2cd1b9e6c5e4372c16d78b38755e7b456ad8a2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 1 Mar 2023 17:52:24 -0500 Subject: [PATCH 15/25] nil: 2023-02-03 -> 2023-03-01 Diff: https://github.com/oxalica/nil/compare/2023-02-03...2023-03-01 Changelog: https://github.com/oxalica/nil/releases/tag/2023-03-01 --- pkgs/development/tools/language-servers/nil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix index ee26e81e8891..866293aba8b3 100644 --- a/pkgs/development/tools/language-servers/nil/default.nix +++ b/pkgs/development/tools/language-servers/nil/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2023-02-03"; + version = "2023-03-01"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-d53add4Cuh0ik8YYncdoqqR6irQbnh/X4vg12TQ/FEQ="; + hash = "sha256-HGd/TV8ZHVAVBx+ndrxAfS/Nz+VHOQjNWjtKkkgYkqA="; }; - cargoHash = "sha256-k4hw+kH447uqsCASuaZxRx2xmMkmn9LM5sHYL2AJN9k="; + cargoHash = "sha256-A6Go1OYAaoDvQtAcK5BL5Tz00iLPOft0VLH6usWtb9g="; CFG_RELEASE = version; From debb75dbb5f0325aa1c7c1050609def7ab9aaeaf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Mar 2023 00:10:15 +0100 Subject: [PATCH 16/25] python310Packages.rpyc: add changelog to meta --- pkgs/development/python-modules/rpyc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 15d418826fe2..0d02b9b3d93a 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; homepage = "https://rpyc.readthedocs.org"; + changelog = "https://github.com/tomerfiliba-org/rpyc/blob/${version}/CHANGELOG.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 21eaf070b2d4c7331a6f5f48f71143c0239bc3d3 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Wed, 1 Mar 2023 15:02:47 -0800 Subject: [PATCH 17/25] nix-doc: 0.5.7 -> 0.5.8 Fixes Nix 2.14 build support. Checked to build against both Nix 2.13 and Nix 2.14 on x86_64-linux. Related: #218889 --- pkgs/tools/package-management/nix-doc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index 7b041df665ed..7d3f3a21f1b7 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.5.7"; + version = "0.5.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "sha256-VSogUulfBTmZMmBbw9Ya/kfoHZlvJMujCPdjhRsjnPo="; + sha256 = "sha256-murez5uHLv1YXIaDDaFXCDPPggK1GAXjaSmZJhlqN80="; }; doCheck = true; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config nix ]; - cargoSha256 = "sha256-DZQ1Q+4I6Qm2WFvBoPNILp0wwP+01msx6zP12EHaPQc="; + cargoSha256 = "sha256-+6I6+LZs84OcyebAIg/9KeAxV1UdK9IgaT7UsPJ5rWQ="; meta = with lib; { description = "An interactive Nix documentation tool"; From de408167ede9c2cab0a7831f4079ff9ba8c644d8 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 2 Mar 2023 07:29:28 +0800 Subject: [PATCH 18/25] buildRustPackage: don't passthru `cargoDeps` `cargoDeps` is already passed as `mkDerivation` arguments, and should not be `passthru`ed again. This fixes the mismatch of `drv.cargoDeps` and the actual dependency when the original derivation is overriden. --- pkgs/build-support/rust/build-rust-package/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index b057d1681b03..5ba166bae1a3 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -154,8 +154,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg strictDeps = true; - passthru = { inherit cargoDeps; } // (args.passthru or {}); - meta = { # default to Rust's platforms platforms = rustc.meta.platforms; From e469962c5867faf0ffaa188a8878708e1dc7a4d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Mar 2023 01:21:25 +0000 Subject: [PATCH 19/25] buf: 1.14.0 -> 1.15.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 7508e77da965..c5561b9b666f 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-fosvr8l/xql4j2/mGjbvbJQMUqBqBUturQJq+OQT/wM="; + hash = "sha256-63JWRyB586klWSQskBY/fDRTdXrQa15IygdZfmHpEqM="; }; - vendorHash = "sha256-ZYmYLZXEzWrTt6JJOWyTmbVq8p7D8lhz07bmQ2Z7gKc="; + vendorHash = "sha256-XRv8AnktIPR1emRdRMmDwOh7r3kNByy0REwZbg3NYPc="; patches = [ # Skip a test that requires networking to be available to work. From 1602585db3ee45595ab1afe0300f6522d98a3190 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Mar 2023 01:45:38 +0000 Subject: [PATCH 20/25] lagrange-tui: 1.15.2 -> 1.15.3 --- pkgs/applications/networking/browsers/lagrange/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index b91e5b05b625..4a3d98d6474c 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-NUgDaBRcgYGLKJhSJLT17VZj/mU0w6ySahIYnud5M6Y="; + hash = "sha256-BKDN2DtLoG+E+R+yBSBpF4PWv+pRLNYZvX/3BqEIxVQ="; }; nativeBuildInputs = [ cmake pkg-config zip ]; From be441fafecf3faec472625e934a3f809b39e348e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 03:14:42 +0000 Subject: [PATCH 21/25] =?UTF-8?q?terraform-providers.baiducloud:=201.19.4?= =?UTF-8?q?=20=E2=86=92=201.19.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6e858269bd77..e88efa8f69b7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -146,11 +146,11 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=", + "hash": "sha256-htNkDa60XHpH0aoJhMvsMiqUl8Ldqa/ZMl5dp7OKwGA=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.4", + "rev": "v1.19.5", "spdx": "MPL-2.0", "vendorHash": null }, From 842f99cd8df97424d599964c53513522b2e2c6a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 03:15:03 +0000 Subject: [PATCH 22/25] =?UTF-8?q?terraform-providers.dnsimple:=200.16.0=20?= =?UTF-8?q?=E2=86=92=200.16.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e88efa8f69b7..7aabfe94becf 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -328,13 +328,13 @@ "vendorHash": "sha256-Ba4J6LUchqhdZTxcJxTgP20aZVioybIzKvF4j5TDQIk=" }, "dnsimple": { - "hash": "sha256-AbNOqxZOrXUxkuScOgrZ3OyEHWpZ8+tsqqXW6lofaMc=", + "hash": "sha256-du0i4z7Eg/TjA/keIOXq9w+z8Oh6tNOZigV8hpbaGn4=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.16.0", + "rev": "v0.16.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-rGcCbESdzKGy3I1FcDA3dUbblyG/uk74rizj7INRGPw=" + "vendorHash": "sha256-Id1rL/Mu/aES7OFQ/rQRMmm3D/GSbGofZludqbWffKo=" }, "docker": { "hash": "sha256-M2K4N39vtVDA/vMp/s2KYiS/uoE+STf2e6yh6q0CS28=", From 5ee0743ef590fd308461506ef128499d7d7436a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 03:18:57 +0000 Subject: [PATCH 23/25] =?UTF-8?q?terraform-providers.openstack:=201.49.0?= =?UTF-8?q?=20=E2=86=92=201.50.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7aabfe94becf..34613fc785f6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -847,13 +847,13 @@ "vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk=" }, "openstack": { - "hash": "sha256-k5UyK9jmjZzHw8AwmDRtyCyJgILAcCK+nN+hklJ9VFw=", + "hash": "sha256-KUv921SV88aUAsEkJY8TUgmO1h2xC5aUcapcRN1FEys=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.49.0", + "rev": "v1.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" + "vendorHash": "sha256-aoJDRzackPjWxkrsQclweUFH3Bqdcj1aTJuTHZ7Dh7g=" }, "opentelekomcloud": { "hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=", From 89fea552b10242a4eb979ead1f497b66a8024c47 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 03:23:25 +0000 Subject: [PATCH 24/25] =?UTF-8?q?terraform-providers.spotinst:=201.101.0?= =?UTF-8?q?=20=E2=86=92=201.102.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 34613fc785f6..4243b06dd9b6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1045,13 +1045,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-mbO0APaGWLHowhs5tDvloUBYKt4+pvx3qqN2gtrAzGY=", + "hash": "sha256-pm6KFPIMPq9jFUf9wYYA3mWMl7+pJLv53wegFmPyBZY=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.101.0", + "rev": "v1.102.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sVNtY2wDGE2ZOB4YNytx0n4V4cbNKoXAv7JCA+Ym3JU=" + "vendorHash": "sha256-IlztpEAI/Z7DUQ5pMaGSQnXWPedAIJlS773nxsRMCYg=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", From 34c8b461676f0d110a31f4101cca6f05fa0c47ec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 03:25:52 +0000 Subject: [PATCH 25/25] =?UTF-8?q?terraform-providers.oci:=204.109.0=20?= =?UTF-8?q?=E2=86=92=204.110.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4243b06dd9b6..9c56b8f67b1c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -811,11 +811,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-6UVsSOAh/JigJkiK+RbHsv7t/IuejouaRL+o8F0ndAo=", + "hash": "sha256-PsTlJY9Y4o7qmA2h+jbIARB9N7+Qku8CaOAYkQ2CKBU=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.109.0", + "rev": "v4.110.0", "spdx": "MPL-2.0", "vendorHash": null },