From b160e51cc82059a793cd40b276b7fdfa0336b92c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Sep 2022 09:17:51 +0000 Subject: [PATCH 01/12] linode-cli: 5.22.0 -> 5.23.0 --- pkgs/tools/virtualization/linode-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 7dfe15d67d62..2aa9c8f6e815 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,8 +13,8 @@ let sha256 = "1fv53wikx745kci86xrsq9kfsgv0a65srhywdw32cab1wywwpn2z"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.135.0"; - specSha256 = "082rkpj8yl6s75y5i9zz287059fxf6zh9hdmdwa463lr6ig90kl4"; + specVersion = "4.136.0"; + specSha256 = "17cxg83cav9qnrnv7i45hsn0z4a6a5yyfhzy80x1v0fshnc52dpw"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; @@ -24,7 +24,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.22.0"; + version = "5.23.0"; src = fetchFromGitHub { owner = "linode"; From 14384cf3cae6bbd85224e438ffead3136ae36eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Sep 2022 14:34:46 +0200 Subject: [PATCH 02/12] knot-resolver: 5.5.2 -> 5.5.3 CVE-2022-40188 and also the patches were included in the release. https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.5.3 --- pkgs/servers/dns/knot-resolver/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index dc14049b9dbb..cccc366c9291 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl -, fetchpatch # native deps. , runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. @@ -18,28 +17,15 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.5.2"; + version = "5.5.3"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "3f78aa69c3f28edc42b5900b9788fba39498d8bffda7fb9c772bb470865780cb"; + sha256 = "a38f57c68b7d237d662784d8406e6098aad66a148f44dcf498d1e9664c5fed2d"; }; outputs = [ "out" "dev" ]; - patches = [ - (fetchpatch { - name = "fix-config-tests-on-darwin.patch"; - url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/48ad9d436cf80f58c107774c313a561d852148a0.diff"; - sha256 = "CEX1XkeYLUSe31xUhNdMRMl1VUXtKFCs5noNJaqL5x0="; - }) - (fetchpatch { - name = "fix-config-tests-on-aarch64-darwin.patch"; - url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/adaac913c50a5db2f226a081ddc419b0d56d1757.diff"; - sha256 = "1LrL74luzPTyJ7VBi7fskDga4lYAh7cSUmDcd1BNO78="; - }) - ]; - # Path fixups for the NixOS service. postPatch = '' patch meson.build < Date: Wed, 21 Sep 2022 19:46:08 +0000 Subject: [PATCH 03/12] gokart: 0.4.0 -> 0.5.0 --- pkgs/development/tools/gokart/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gokart/default.nix b/pkgs/development/tools/gokart/default.nix index f7d0857580ef..c2775f7826a1 100644 --- a/pkgs/development/tools/gokart/default.nix +++ b/pkgs/development/tools/gokart/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gokart"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HsjLNY5Z5UidsLDWSP+1bu3jrfn3oAERPrPV/AkTH8I="; + sha256 = "sha256-oxYlwc3FatYyaICQFZJtkH9/7zYfT2gI+R5BU7CQVkg="; }; - vendorSha256 = "sha256-S3RukCKAJnPH1KGVdnkgAJQKEDTZYpcMMdoQ4OnHZVg="; + vendorSha256 = "sha256-lgKYVgJlmUJ/msdIqG7EKAZuISie1lG7+VeCF/rcSlE="; # Would need files to scan which are not shipped by the project doCheck = false; From e325cbdaa284e056b256a7ad113340285901a192 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 22:36:10 +0000 Subject: [PATCH 04/12] metal-cli: 0.9.0 -> 0.9.1 --- pkgs/development/tools/metal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index a01dc7d9d28e..6209b1c4b019 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ivO4YFFDTza20WgTGEaSGUcIEvXVtwKKVGyKWe8d9bA="; + sha256 = "sha256-+G3PBYeez1dcUELc4j6CRgxDCDWCxpOfI52QlvMVkrY="; }; vendorSha256 = "sha256-rf0EWMVvuoPUMTQKi/FnUbE2ZAs0C7XosHAzCgwB5wg="; From 2e6a924b5a37d352f5a816756c958e5a434a1ff0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 22 Sep 2022 09:10:17 +1000 Subject: [PATCH 05/12] metal-cli: install completion --- pkgs/development/tools/metal-cli/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index 6209b1c4b019..06bd51bd31c5 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "metal-cli"; @@ -18,6 +18,15 @@ buildGoModule rec { "-X github.com/equinix/metal-cli/cmd.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd metal \ + --bash <($out/bin/metal completion bash) \ + --fish <($out/bin/metal completion fish) \ + --zsh <($out/bin/metal completion zsh) + ''; + doCheck = false; doInstallCheck = true; From 2b6c72e17306cb57b97ab1e26bb4c7a42ba1e430 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Wed, 7 Sep 2022 10:07:53 -0700 Subject: [PATCH 06/12] python3Packages.shapely: 1.8.2 -> 1.8.4 Fixes https://github.com/NixOS/nixpkgs/issues/185996 (!!) where the tests were segfaulting on macOS/aarch64. Probably fixes the django and other builds for a lot of the ecosystem. --- .../python-modules/shapely/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index a41381fe35bf..fda2645105f6 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch , substituteAll , pythonOlder , geos @@ -13,12 +12,12 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.8.2"; + version = "1.8.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Vyr51QBv1eMhPjfuVIkSsDQfsmck1tyKTjlQwQGX67Y="; + sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; }; nativeBuildInputs = [ @@ -44,20 +43,21 @@ buildPythonPackage rec { libgeos_c = GEOS_LIBRARY_PATH; libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) - (fetchpatch { - name = "fix-tests-geos-3.11.patch"; - url = "https://github.com/shapely/shapely/commit/21c8e8a7909e7fb3cce6daa5c5b8284ac927fcb0.patch"; - includes = [ "tests/test_parallel_offset.py" ]; - sha256 = "sha256-85c8NlmAzzfCgepe/411ug5Sq+665dFMb3ySaUt9Kew="; - }) ]; preCheck = '' rm -r shapely # prevent import of local shapely ''; - disabledTests = [ - "test_collection" + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # FIXME(lf-): these logging tests are broken, which is definitely our + # fault. I've tried figuring out the cause and failed. + # + # It is apparently some sandbox or no-sandbox related thing on macOS only + # though. + "test_error_handler_exception" + "test_error_handler" + "test_info_handler" ]; pythonImportsCheck = [ "shapely" ]; From c8554deb5003c55a197effbad4b515420415e7b4 Mon Sep 17 00:00:00 2001 From: night <903bdd24-af4f-4d5a-8499-d5008a128f26@potato.io> Date: Wed, 21 Sep 2022 08:47:20 -0700 Subject: [PATCH 07/12] gvisor: 20220905.0 -> 20220919.0 --- .../applications/virtualization/gvisor/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 2609c3e7bc73..08e1b97355d3 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -9,19 +9,25 @@ buildGoModule rec { pname = "gvisor"; - version = "20220905.0"; + version = "20220919.0"; + + # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go) + # that can be used to build gvisor without bazel. + # For updates, you should stick to the commits labeled "Merge release-** (automated)" src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "442a3cd44a0858ac2a8e773b6fbba67cf3bd3767"; - sha256 = "sha256-LKY7AKAHX29eGuXRrkCVCFl/bdHAVOC0QNZfzlpXqwc="; + rev = "4e7fd140e8d0056f8f031950fcace8ff4d48a526"; + sha256 = "sha256-II0lnthabkyCgPum7EBdyOYwB0rWjA2Jd9DVGLJQy6Q="; }; - vendorSha256 = "sha256-Fn8A8iwTv0lNI9ZBJkq3SlRelnAGIQY0GInTxaCzSAU="; + vendorSha256 = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU="; nativeBuildInputs = [ makeWrapper ]; + CGO_ENABLED = 0; + ldflags = [ "-s" "-w" ]; subPackages = [ "runsc" "shim" ]; From c79ebd3a9d8105191b3f063f6aad967ca1fbf2a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 02:26:08 +0000 Subject: [PATCH 08/12] regbot: 0.4.4 -> 0.4.5 --- pkgs/development/tools/regclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index ff43dbfebcc3..fc98bff40f98 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,14 +4,14 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.4.4"; + version = "0.4.5"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "sha256-jIdbSDUpSKlb6RES6hx+r+vZyny56aWyjAurCI3mywk="; + sha256 = "sha256-WyjVJp0JVwLitz46YjPGpR/+AjLhjgqTRqabCB9VhHw="; }; vendorSha256 = "sha256-QTeVgvjRw2wBd8QGoVpRVTTh+Wwu2NEZYR1Z9R52/p0="; From 86fcecb236b8afa855b3155a45f8263dffdeae3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 02:25:18 +0000 Subject: [PATCH 09/12] redpanda: 22.2.2 -> 22.2.3 --- pkgs/servers/redpanda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 496e527b6b8f..308b30bee44c 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchzip }: let - version = "22.2.2"; + version = "22.2.3"; platform = if stdenv.isLinux then "linux" else "darwin"; arch = if stdenv.isAarch64 then "arm" else "amd"; sha256s = { darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g="; darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4="; - linux.amd = "sha256-j+apxUiGAPzQfv7qtXzuykN/FOtzZ0Yb82q2bIS2ZC4="; + linux.amd = "sha256-ir7ld7xB42SQzZS+ixMriL/eMEnp1wuBAL4gkvlCnLk="; linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; }; in stdenv.mkDerivation rec { From f586d35a11ec07ced41d9d62c125c6ca0006141f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Sep 2022 22:39:07 +0000 Subject: [PATCH 10/12] mimir: 2.2.0 -> 2.3.0 --- pkgs/servers/monitoring/mimir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 57f99a4388c8..6e161b44b730 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mimir"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - sha256 = "sha256-c2WOE7lm62uZ+oVSWd2Gyo0UZJaf9yFzEQZvcwpvshA="; + sha256 = "sha256-lLrDgt4WYxyMkwjS8TLTy1agPAo/Z0BtqY9hIYSDyGI="; }; vendorSha256 = null; From 2bf91a61574f2ea6353080b4abc824606af52e72 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 22 Sep 2022 00:50:19 -0400 Subject: [PATCH 11/12] stylua: 0.14.3 -> 0.15.0 (#192279) --- .../from_md/release-notes/rl-2211.section.xml | 9 ++++++ .../manual/release-notes/rl-2211.section.md | 2 ++ pkgs/development/tools/stylua/default.nix | 29 ++++++++----------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 7c088ae7b47e..0f1dffc798e7 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -563,6 +563,15 @@ option, and it is enabled by default, for servers. + + + stylua no longer accepts + lua52Support and + luauSupport overrides, use + features instead, which defaults to + [ "lua54" "luau" ]. + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 094f0cd80f26..7214937781d2 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -192,6 +192,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - `k3s` supports `clusterInit` option, and it is enabled by default, for servers. +- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`. + ## Other Notable Changes {#sec-release-22.11-notable-changes} diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 383a6534671b..ffa548ec377e 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -1,34 +1,29 @@ -{ fetchFromGitHub -, lib +{ lib , rustPlatform -, lua52Support ? true -, luauSupport ? false -, fetchpatch +, fetchFromGitHub + # lua54 implies lua52/lua53 +, features ? [ "lua54" "luau" ] }: rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l4q6Qlgdxgm4K5+NkWMZI3Hhtx6m/0DG9PE4gvo/ylo="; + sha256 = "sha256-x4/DmFi/6bIQVn8sfSFEOJIv4Zd/3oHKXbrd6yIsSYU="; }; - cargoSha256 = "sha256-zlk9KdiSKWknyuJTTqpzCeSJUXJGDK2A0g1ss8AHoYs="; + cargoSha256 = "sha256-lY18so+uG3yri18zd29B479nl0l1C0F1mw+sPrccRQs="; - cargoPatches = [ - # fixes broken 0.14.3 lockfile - (fetchpatch { - url = "https://github.com/JohnnyMorganz/StyLua/commit/834f632f67af6425e7773eaade8d23a880946843.patch"; - sha256 = "sha256-oM2gaILwiNMqTGFRQBw6/fxbjljNWxeIb0lcXcAJR3w="; - }) - ]; + # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu + postPatch = '' + rm .cargo/config.toml + ''; - buildFeatures = lib.optional lua52Support "lua52" - ++ lib.optional luauSupport "luau"; + buildFeatures = features; meta = with lib; { description = "An opinionated Lua code formatter"; From e21f62e0998e12fb6dc9c3d18b95b3a3b2bed46a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 22 Sep 2022 07:38:36 +0200 Subject: [PATCH 12/12] nearcore: 1.28.1 -> 1.29.0 --- pkgs/applications/blockchains/nearcore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index 579627d97486..a5c475308b32 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -4,7 +4,7 @@ }: rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.28.1"; + version = "1.29.0"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-lAbVcmr8StAZAII++21xiBd4tRcdprefvcGzPLIjl74="; + sha256 = "sha256-TOZ6j4CaiOXmNn8kgVGP27SjvLDlGvabAA+PAEyFXIk="; }; - cargoSha256 = "sha256-1aoL5fbKZ4XZ1ELVDWNDFHDL2FyNuoX/DVb0h8RWBxI="; + cargoSha256 = "sha256-LjBgsQynHIfrQP4Z7j1J8+PLqRZWGAOQ5dJaGOqabVk="; cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = ''