From 4310eb5b9dee9ab120328f924236b61424bb1bc6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 01:00:11 +0100 Subject: [PATCH 01/20] python310Packages.pysnmp-pyasn1: 1.1.2 -> 1.1.3 Diff: https://github.com/pysnmp/pyasn1/compare/v1.1.2...v1.1.3 --- pkgs/development/python-modules/pysnmp-pyasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix index 5da547e5ebfa..639b14307753 100644 --- a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix +++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pysnmp-pyasn1"; - version = "1.1.2"; + version = "1.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pysnmp"; repo = "pyasn1"; rev = "v${version}"; - hash = "sha256-R4reMwVcJBTfTEHUk6sSUugsEPuKIziH1WbjMakP/dA="; + hash = "sha256-W74aWMqGlat+aZfhbP1cTKRz7SomHdGwfK5yJwxgyqI="; }; nativeBuildInputs = [ From 6581ed578a89a60e306c51a87f967e05e7bcf249 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Feb 2023 01:02:59 +0100 Subject: [PATCH 02/20] python310Packages.pysnmp-pyasn1: add changelog to meta --- pkgs/development/python-modules/pysnmp-pyasn1/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix index 639b14307753..d962615e7adb 100644 --- a/pkgs/development/python-modules/pysnmp-pyasn1/default.nix +++ b/pkgs/development/python-modules/pysnmp-pyasn1/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pysnmp"; repo = "pyasn1"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-W74aWMqGlat+aZfhbP1cTKRz7SomHdGwfK5yJwxgyqI="; }; @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python ASN.1 encoder and decoder"; homepage = "https://github.com/pysnmp/pyasn1"; + changelog = "https://github.com/pysnmp/pyasn1/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; From 621c9b038cddf00cbc581ecd205614e0c8b14127 Mon Sep 17 00:00:00 2001 From: Korny666 Date: Thu, 23 Feb 2023 07:56:27 +0100 Subject: [PATCH 03/20] smartgithg: 22.1.3 -> 22.1.4 --- pkgs/applications/version-management/smartgithg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index a9aabd7a87da..32dc11d4527d 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.3"; + version = "22.1.4"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4="; + sha256 = "sha256-e5bgIA7dblRDWvwC2dqRFR+Sp6uMAWQbhlMqG8a4vZk="; }; nativeBuildInputs = [ wrapGAppsHook ]; From f165ce37c0dde1c89b09bcf09406bbb975889aad Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Wed, 22 Feb 2023 21:46:23 +0100 Subject: [PATCH 04/20] molly-guard: Reduce closure size by stripping unneeded dependeicies --- pkgs/os-specific/linux/molly-guard/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index de396e4f5c76..1100751f451e 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -11,10 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg ]; - sourceRoot = "."; - unpackCmd = '' - dpkg-deb -x "$src" . + dpkg-deb -x "$src" source ''; installPhase = '' From 2275649fd6a18f1e326c821e04b774e1b07a11e4 Mon Sep 17 00:00:00 2001 From: lasers Date: Thu, 23 Feb 2023 06:33:32 -0600 Subject: [PATCH 05/20] desmume: add wrapGAppsHook --- pkgs/applications/emulators/desmume/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 2b3deaba653b..63ebe0720287 100644 --- a/pkgs/applications/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix @@ -6,6 +6,7 @@ , agg , alsa-lib , desktop-file-utils +, wrapGAppsHook , gtk3 , intltool , libGLU @@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + wrapGAppsHook desktop-file-utils intltool libtool From ca8a28515ecc752501ff435e297652cf9ee99b2d Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 23 Feb 2023 17:13:44 -0500 Subject: [PATCH 06/20] brave: 1.48.158 -> 1.48.171 https://community.brave.com/t/release-channel-1-48-171/472389/1 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 77c626156427..b5528c31b430 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.48.158"; + version = "1.48.171"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-hgV8+Mjth43KItly98lTh3Ur+h9vA9BfJxOqMGl1ndY="; + sha256 = "sha256-3dFOBl+Iomn8NnCYZ2owrTPQlqqj4LFdtnN4IXhbRps="; }; dontConfigure = true; From 33645f8482f2ac31b4bb076cf6369c27de6b4221 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Feb 2023 23:46:13 +0100 Subject: [PATCH 07/20] python310Packages.reolink-aio: 0.5.0 -> 0.5.1 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.5.0...0.5.1 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.5.1 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 61392cdbf497..aa1ebb430d9a 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-6fG7wKanw/ECsO7tqT69iTRjhhUpS2lKXMvW9FiqSi8="; + hash = "sha256-twfFPtTR2LIAbd5YuOgTG/j/xktLkTD3/9fjo514eXI="; }; postPatch = '' From f9afd57302f342f7e72048ea77ed57aef61ffe48 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 23 Feb 2023 20:52:35 +0000 Subject: [PATCH 08/20] Revert "llvmPackages_15: update licenses" This reverts commit 386aba3115176b11eb49a0606e9dd17506273776. As I understand it from reading , the structure of LLVM licensing is as follows: - They're in the process of relicensing to Apache-2.0 WITH LLVM-exception, but they haven't got permission to relicense all the code yet. This means that some of the code can be used under the new license, but not all of it, and it's difficult to know which is which. This license is therefore probably not useful yet, until the relicensing effort is commit. - While the relicensing effort is ongoing, code being contributed to LLVM has to have permission to be used under the old and new licensing schemes. Since the new licensing scheme can't be used for all code yet, it only makes sense to use LLVM's code under the old licensing scheme at the moment. - The old licensing scheme is that code for the LLVM components we care about is all available under the NCSA license, and some components are optionally available under a different license, usually the MIT license, instead. So I think we should go back to just listing NCSA, or NCSA/MIT, and forget about the new license until it actually becomes useful, i.e. LLVM's relicensing effort is complete. --- pkgs/development/compilers/llvm/15/compiler-rt/default.nix | 3 +++ pkgs/development/compilers/llvm/15/default.nix | 2 +- pkgs/development/compilers/llvm/15/libcxx/default.nix | 3 +++ pkgs/development/compilers/llvm/15/libcxxabi/default.nix | 3 +++ pkgs/development/compilers/llvm/15/openmp/default.nix | 3 +++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index 3c335345f623..6f20d23b32bc 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -151,5 +151,8 @@ stdenv.mkDerivation { implementations of run-time libraries for dynamic testing tools such as AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. ''; + # "All of the code in the compiler-rt project is dual licensed under the MIT + # license and the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; }; } diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 526e79992b88..0cef33ea61cc 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -84,7 +84,7 @@ in let inherit (releaseInfo) release_version version; llvm_meta = { - license = with lib.licenses; [ ncsa asl20-llvm ]; + license = lib.licenses.ncsa; maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/15/libcxx/default.nix b/pkgs/development/compilers/llvm/15/libcxx/default.nix index 7762df29386e..94374c8a312d 100644 --- a/pkgs/development/compilers/llvm/15/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -103,5 +103,8 @@ stdenv.mkDerivation rec { libc++ is an implementation of the C++ standard library, targeting C++11, C++14 and above. ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; }; } diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix index fd99f4553c0c..cb5fa44f0700 100644 --- a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -100,6 +100,9 @@ stdenv.mkDerivation rec { longDescription = '' libc++abi is a new implementation of low level support for a standard C++ library. ''; + # "All of the code in libc++abi is dual licensed under the MIT license and + # the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; }; } diff --git a/pkgs/development/compilers/llvm/15/openmp/default.nix b/pkgs/development/compilers/llvm/15/openmp/default.nix index 8047cb1122de..d51335436ad2 100644 --- a/pkgs/development/compilers/llvm/15/openmp/default.nix +++ b/pkgs/development/compilers/llvm/15/openmp/default.nix @@ -67,5 +67,8 @@ stdenv.mkDerivation rec { "clang -fopenmp" must be linked before it can run and the library that supports offload to target devices. ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; }; } From bb46e6d646c6d776e5648e30a2d53884aa5feefd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 01:53:53 +0100 Subject: [PATCH 09/20] python310Packages.vt-py: 0.17.4 -> 0.17.5 Diff: https://github.com/VirusTotal/vt-py/compare/refs/tags/0.17.4...0.17.5 Changelog: https://github.com/VirusTotal/vt-py/releases/tag//0.17.5 --- pkgs/development/python-modules/vt-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index e0f37922c00d..ea44c4b5a165 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.17.4"; + version = "0.17.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4CmSsSZqFhH3rwctCJUqU4JdDxBgIxFnUZ5FQCBZXqg="; + hash = "sha256-O95W/J5y7qcR6PSzNQwOl0W19CyXifbq8okquESFSqM="; }; propagatedBuildInputs = [ From 5af2160bc4f04e06027dd3f85fff2a325a0255c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Feb 2023 01:56:08 +0100 Subject: [PATCH 10/20] python310Packages.twilio: 7.16.3 -> 7.16.4 Diff: https://github.com/twilio/twilio-python/compare/refs/tags/7.16.3...7.16.4 Changelog: https://github.com/twilio/twilio-python/blob/7.16.4/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index f67448c62632..e3a8b36ec44c 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.16.3"; + version = "7.16.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-qgsJ/i8gcuirLp8O6XShgdfxdmFyK2H+oWkiP2795rA="; + hash = "sha256-OB7jW+I5oAE2TGPWmuIcXcABY1v1FMjo8UT83Xn4DB8="; }; propagatedBuildInputs = [ From 6152eed6a5277d1e6b4c68592b8a9796615db438 Mon Sep 17 00:00:00 2001 From: Artturi Date: Fri, 24 Feb 2023 05:21:20 +0200 Subject: [PATCH 11/20] Revert "python310Packages.kiwisolver: fix NIX_CFLAGS_COMPILE definition" --- pkgs/development/python-modules/kiwisolver/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 0a985bc3dee0..ba35537a866b 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -20,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ + "-I${lib.getDev libcxx}/include/c++/v1" + ]; nativeBuildInputs = [ setuptools-scm From e1fe0fe490bf39bb12f7d84125a968eabfdfcbf8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 24 Feb 2023 05:39:54 +0200 Subject: [PATCH 12/20] python310Packages.kiwisolver: move NIX_CFLAGS_COMPILE out of env this will be reapplied to staging because it causes rebuilds --- pkgs/development/python-modules/kiwisolver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index ba35537a866b..1481bc8699c0 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-I${lib.getDev libcxx}/include/c++/v1" ]; From 594a8df11a4f8b0b690468cb68c2656795128bfe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Feb 2023 01:21:51 +0000 Subject: [PATCH 13/20] python310Packages.pydrive2: 1.15.0 -> 1.15.1 --- pkgs/development/python-modules/pydrive2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index 159679b0515f..75d25a885bfe 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.15.0"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyDrive2"; inherit version; - hash = "sha256-OuBrZr+WP0NSSYnIf01ngDlEH+BZmTxnA/szzDxtiuw="; + hash = "sha256-Hx8xuMned3vUDrDRhqYirLPmsbjjxWPlCNRoxZp50/o="; }; propagatedBuildInputs = [ From d424064658a487f0ce4f29d33f1fb67e5bbbb916 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:10:11 +0000 Subject: [PATCH 14/20] =?UTF-8?q?terraform-providers.exoscale:=200.45.0=20?= =?UTF-8?q?=E2=86=92=200.46.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 74d4e6b96728..c05dd21efded 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -364,11 +364,11 @@ "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo=" }, "exoscale": { - "hash": "sha256-nkCpgreQ8mOLfGAlCDQYYA14Df1Lr6RzDCBWgQNVi6k=", + "hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.45.0", + "rev": "v0.46.0", "spdx": "MPL-2.0", "vendorHash": null }, From 87ef2832997f827225ed541366e8d160641df79e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:11:42 +0000 Subject: [PATCH 15/20] =?UTF-8?q?terraform-providers.acme:=202.13.0=20?= =?UTF-8?q?=E2=86=92=202.13.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 c05dd21efded..b9983fd7ba23 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,14 +9,14 @@ "vendorHash": null }, "acme": { - "hash": "sha256-iAUbGLxeN2Ntsq0mOWEKuvorIy7u+0kffzIqg+wF9gM=", + "hash": "sha256-uyycmae+OAZ/dC4GReEF5xrClQvophLX1/EZv+kpFU4=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.13.0", + "rev": "v2.13.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-5gh3e5wPCBA87fHPXTT+hnrXIPVW5meKmT4pFP1ryOc=" + "vendorHash": "sha256-C78RPGpENvn6mBm8xsnl3DXKUQ0xtdN8k25t8USigWE=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", From 1e517bb98e00de24225013a1a5fe806d7a2aecaa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:13:18 +0000 Subject: [PATCH 16/20] =?UTF-8?q?terraform-providers.nutanix:=201.7.1=20?= =?UTF-8?q?=E2=86=92=201.8.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 b9983fd7ba23..2e1e0f21d30f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -802,11 +802,11 @@ }, "nutanix": { "deleteVendor": true, - "hash": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=", + "hash": "sha256-PQwP2xIh635pc8nL0qhiUUqaf5Dm8uERFk61LUk6Xmc=", "homepage": "https://registry.terraform.io/providers/nutanix/nutanix", "owner": "nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.7.1", + "rev": "v1.8.0", "spdx": "MPL-2.0", "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, From bd2f3e614645b7dd050a7cdf2f4bc02c3ff99d8b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:14:14 +0000 Subject: [PATCH 17/20] =?UTF-8?q?terraform-providers.opentelekomcloud:=201?= =?UTF-8?q?.33.0=20=E2=86=92=201.33.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 2e1e0f21d30f..a360996a8c41 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -856,13 +856,13 @@ "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-/e/cfesAKYiAvhiXm7SYmpM5O8Rm/qHE8XnCS0m4lNQ=", + "hash": "sha256-UIpzv5Tas5jxpaqg1n0KRoJhYj6vRE6DBQ2u701xgzU=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.33.0", + "rev": "v1.33.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-GFpDNFn14aAqpBesICGS9AuKpxAe/UwRzTeWP4MReTU=" + "vendorHash": "sha256-EbUHKM6fKEZk1ey4qTgAd/20OKJu0DoBF0MAOxB7y64=" }, "opsgenie": { "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", From 6cdb034b3a43a213ae012f4778b2a1ce227fac0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:15:44 +0000 Subject: [PATCH 18/20] =?UTF-8?q?terraform-providers.thunder:=201.0.0=20?= =?UTF-8?q?=E2=86=92=201.1.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 a360996a8c41..7444f78d503d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1117,11 +1117,11 @@ "vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU=" }, "thunder": { - "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", + "hash": "sha256-GLyGm9Q+ajuQFIni/OCYvYhpj2fiVYHzkPwbofq/DEs=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.0.0", + "rev": "v1.1.0", "spdx": "BSD-2-Clause", "vendorHash": null }, From c992e25a7d5d59675584a197af5a38e582a70b4b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 03:17:51 +0000 Subject: [PATCH 19/20] =?UTF-8?q?terraform-providers.tencentcloud:=201.79.?= =?UTF-8?q?10=20=E2=86=92=201.79.11?= 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 7444f78d503d..9e23db3aadd3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1099,11 +1099,11 @@ "vendorHash": "sha256-tltQNtTsPoT5CTrKM7vLDVkmmW2FTd6MBubfXZveGxI=" }, "tencentcloud": { - "hash": "sha256-9SuXHKdOmmcYFWgf/WNL5CEYoxCdfOWa1afJ7frJJ20=", + "hash": "sha256-f6GdDTezh1lDNppCLmjx/7jiKsq2yZoR92kYpGAAldQ=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.10", + "rev": "v1.79.11", "spdx": "MPL-2.0", "vendorHash": null }, From d06382a73b2c8d51e76348da90e045cb3198e11d Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 24 Feb 2023 05:44:18 +0200 Subject: [PATCH 20/20] treewide: more manual fixups for treewide: move NIX_CFLAGS_COMPILE to the env attrset `nix-eval-jobs --flake ".#legacyPackages.x86_64-linux" --workers 3 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("attribute set can only contain derivation") )'` and `nix-eval-jobs --flake ".#legacyPackages.aarch64-darwin" --workers 3 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("attribute set can only contain derivation") )'` no longer has output so this could be all of the remaining issues --- pkgs/applications/misc/keepassxc/default.nix | 4 ++-- pkgs/development/interpreters/kerf/default.nix | 4 ++-- pkgs/development/libraries/liblastfm/default.nix | 5 +---- pkgs/development/ocaml-modules/lablgtk/default.nix | 2 +- pkgs/development/python-modules/py3exiv2/default.nix | 4 +--- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index 1870c21bed13..3c74b6e91751 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" - ]; + ]); NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix index e4fbc2bc6558..0987205f59d9 100644 --- a/pkgs/development/interpreters/kerf/default.nix +++ b/pkgs/development/interpreters/kerf/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { makeFlags = [ "kerf" "kerf_test" ]; # avoid a huge amount of warnings to make failures clearer - env.NIX_CFLAGS_COMPILE = map (x: "-Wno-${x}") [ + env.NIX_CFLAGS_COMPILE = toString (map (x: "-Wno-${x}") [ "void-pointer-to-int-cast" "format" "implicit-function-declaration" "gnu-variable-sized-type-not-at-end" "unused-result" - ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]; + ] ++ lib.optionals stdenv.isDarwin [ "-fcommon" ]); patchPhase = '' substituteInPlace ./Makefile \ diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index cfd56b5091ee..7dcc3b0d0cc0 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -23,10 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - env.NIX_CFLAGS_COMPILE = - lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ - "-std=c++11" - ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11"; dontWrapQtApps = true; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 6b35bb423e3b..17e64cafb077 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -12,7 +12,7 @@ let param = rev = version; sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po="; }; - env.NIX_CFLAGS_COMPILE = null; + env = { }; buildInputs = [ camlp-streams ]; } else if check "3.12" then { version = "2.18.5"; diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index a1951b5e1e71..de8cc23c8fb8 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -26,9 +26,7 @@ buildPythonPackage rec { ]; # Work around Python distutils compiling C++ with $CC (see issue #26709) - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ - "-I${lib.getDev libcxx}/include/c++/v1" - ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; pythonImportsCheck = [ "pyexiv2"