From dcb997cfa7ab86a27ad6ce402a4308613ff486e4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 21 Jun 2023 14:56:58 +0200 Subject: [PATCH 001/143] svt-av1: 1.5.0 -> 1.6.0 --- pkgs/tools/video/svt-av1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 2d722d7037a8..c8620ffee82a 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "svt-av1"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EBWtvHOcFa6co0NeYns7Wkhz3LhqWJIRjBWfCrWJyss="; + sha256 = "sha256-rGe4h3d2Ql8tB/5vKFJGPkhmjMHnqgMUpnGzeh+PasA="; }; nativeBuildInputs = [ From 5526aca9e5c807e11da68adc708ea3cc55e7804a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 29 Jun 2023 15:44:34 +0200 Subject: [PATCH 002/143] synology-drive-client: 3.2.1 -> 3.3.0 --- .../networking/synology-drive-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 850692f18547..34d33e326ab4 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - version = "3.2.1-13272"; + version = "3.3.0-15082"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -29,7 +29,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-olORBipyAv3jYQ7Gv8i4dHoCAdMcTcJR72/UYCPAVt0="; + sha256 = "sha256-ha3KRpEIT7w6pUVUwZV011W1F/v/hNq9f3ArfzU0ZGc="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -59,7 +59,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "sha256-oNo/2Fim63xiWiVuY99Q18dHOPHydQJr7C9tib8LLOE="; + sha256 = "sha256-dxmpB31ZjO1uAnAbY13OjVR81CCDLf9vJC20iZaPZJ4="; }; nativeBuildInputs = [ cpio xar undmg ]; From ccb194910e938ef131b3b23d94cbb48061b03488 Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Thu, 29 Jun 2023 19:35:23 +0530 Subject: [PATCH 003/143] ktlint: 0.49.1 -> 0.50.0 --- pkgs/development/tools/ktlint/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 8eefc895864b..1718821d2102 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.49.1"; + version = "0.50.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "1k2byxqvgr2xll4jj0ck8w3qdgkvjhwkag18inxjakcl99knygrb"; + sha256 = "01qh85kclksgv484cwma7jyaxlz8rgk14l4mxcvzp2flprdnzgd2"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { platforms = jre_headless.meta.platforms; changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } From e7efe3c4d89dd64f45b1e88c139028a14942d38a Mon Sep 17 00:00:00 2001 From: Marek Generowicz Date: Thu, 29 Jun 2023 16:29:06 +0200 Subject: [PATCH 004/143] ledger-live-desktop: 2.60.0->2.62.2 ledger-live-desktop: 2.60.0->2.62.2 --- .../applications/blockchains/ledger-live-desktop/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 8531456a73d3..858931058fce 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,13 +2,14 @@ let pname = "ledger-live-desktop"; - version = "2.60.0"; + version = "2.62.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-dR6F6elUxZW3EuH71d5P9SOSDq5f5lAsYnrfWrsj2KA="; + hash = "sha256-Rb611v2QirGmJ01lZj6F3iHLTPI2eJp5acZDEQ4Ude0=="; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 739ebed245173738ff3429e678f809e1f9eac55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Thu, 29 Jun 2023 19:39:59 +0200 Subject: [PATCH 005/143] pulsarctl: init at 2.10.3.3 --- pkgs/tools/admin/pulsarctl/default.nix | 76 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 78 insertions(+) create mode 100644 pkgs/tools/admin/pulsarctl/default.nix diff --git a/pkgs/tools/admin/pulsarctl/default.nix b/pkgs/tools/admin/pulsarctl/default.nix new file mode 100644 index 000000000000..400e6dc7ae04 --- /dev/null +++ b/pkgs/tools/admin/pulsarctl/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, nix-update-script +, testers +, pulsarctl +}: + +buildGoModule rec { + pname = "pulsarctl"; + version = "2.10.3.3"; + + src = fetchFromGitHub { + owner = "streamnative"; + repo = "pulsarctl"; + rev = "v${version}"; + hash = "sha256-BOVFBIG+XKBOmLOx/IzseEArcPeriJWzn30FOERBy9s="; + }; + + vendorHash = "sha256-ao8Bxaq9LHvC6Zdd1isyMKxoTJ0MGelSPPxwgqVJcK8="; + + nativeBuildInputs = [ installShellFiles ]; + + preBuild = let + buildVars = { + ReleaseVersion = version; + BuildTS = "None"; + GitHash = src.rev; + GitBranch = "None"; + GoVersion = "$(go version | egrep -o 'go[0-9]+[.][^ ]*')"; + }; + buildVarsFlags = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-X github.com/streamnative/pulsarctl/pkg/cmdutils.${k}=${v}") buildVars); + in + '' + buildFlagsArray+=("-ldflags=${buildVarsFlags}") + ''; + + excludedPackages = [ + "./pkg/test" + "./pkg/test/bookkeeper" + "./pkg/test/bookkeeper/containers" + "./pkg/test/pulsar" + "./pkg/test/pulsar/containers" + "./site/gen-pulsarctldocs" + "./site/gen-pulsarctldocs/generators" + ]; + + doCheck = false; + + postInstall = '' + installShellCompletion --cmd pulsarctl \ + --bash <($out/bin/pulsarctl completion bash) \ + --fish <($out/bin/pulsarctl completion fish) \ + --zsh <($out/bin/pulsarctl completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = pulsarctl; + command = "pulsarctl --version"; + version = "v${version}"; + }; + }; + + meta = with lib; { + description = " a CLI for Apache Pulsar written in Go"; + homepage = "https://github.com/streamnative/pulsarctl"; + license = with licenses; [ asl20 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "pulsarctl"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ca99c980872..8bbc08b72a3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5869,6 +5869,8 @@ with pkgs; pscale = callPackage ../development/tools/pscale { }; + pulsarctl = callPackage ../tools/admin/pulsarctl { }; + psstop = callPackage ../tools/system/psstop { }; precice = callPackage ../development/libraries/precice { }; From 071e45ea88e97eb4ef23bb361f91788a3ca1eb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Tue, 18 Apr 2023 00:29:08 +0200 Subject: [PATCH 006/143] azure-mgmt-appcontainers: init at 2.0.0 --- .../azure-mgmt-appcontainers/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix new file mode 100644 index 000000000000..f7dcaaab7e89 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, azure-common +, azure-mgmt-core +, msrest +, msrestazure +}: + +buildPythonPackage rec { + version = "2.0.0"; + pname = "azure-mgmt-appcontainers"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU="; + extension = "zip"; + }; + + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; + + # no tests included + doCheck = false; + + pythonImportsCheck = [ "azure.common" "azure.mgmt.appcontainers" ]; + + meta = with lib; { + description = "Microsoft Azure Appcontainers Management Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad48d07ba5d8..fe14f237f763 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -959,6 +959,8 @@ self: super: with self; { azure-mgmt-appconfiguration = callPackage ../development/python-modules/azure-mgmt-appconfiguration { }; + azure-mgmt-appcontainers = callPackage ../development/python-modules/azure-mgmt-appcontainers { }; + azure-mgmt-applicationinsights = callPackage ../development/python-modules/azure-mgmt-applicationinsights { }; azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { }; From 07f1e43b3daac8d8597c3b06e38d97bfe54aa524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Tue, 18 Apr 2023 00:29:20 +0200 Subject: [PATCH 007/143] azure-cli: 2.44.1 -> 2.49.0 --- .../azure-mgmt-appcontainers/default.nix | 10 +- pkgs/tools/admin/azure-cli/default.nix | 8 +- .../tools/admin/azure-cli/python-packages.nix | 117 ++++++++++-------- 3 files changed, 75 insertions(+), 60 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index f7dcaaab7e89..b9e3a2e4a053 100644 --- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder , azure-common , azure-mgmt-core , msrest @@ -11,7 +11,7 @@ buildPythonPackage rec { version = "2.0.0"; pname = "azure-mgmt-appcontainers"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -29,12 +29,12 @@ buildPythonPackage rec { # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.appcontainers" ]; + pythonImportsCheck = [ "azure.mgmt.appcontainers" ]; meta = with lib; { description = "Microsoft Azure Appcontainers Management Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/appcontainers/azure-mgmt-appcontainers"; license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; + maintainers = with maintainers; [ jfroche ]; }; } diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index f469c04044b4..dc08436a2bfa 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchPypi, fetchFromGitHub, installShellFiles }: let - version = "2.44.1"; + version = "2.49.0"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-QcY08YxwGywFCXy3PslEzc5qZd62y4XAcuIC9Udp6Cc="; + hash = "sha256-4R89RD4mDdhLdpgHQ8QT48cX+GzTLrSYPCwg0xWM8Ss="; }; # put packages that needs to be overridden in the py package scope @@ -55,11 +55,14 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-keyvault azure-keyvault-administration azure-keyvault-keys + azure-keyvault-certificates + azure-keyvault-secrets azure-loganalytics azure-mgmt-advisor azure-mgmt-apimanagement azure-mgmt-applicationinsights azure-mgmt-appconfiguration + azure-mgmt-appcontainers azure-mgmt-authorization azure-mgmt-batch azure-mgmt-batchai @@ -201,6 +204,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { "azure.mgmt.apimanagement" "azure.mgmt.applicationinsights" "azure.mgmt.appconfiguration" + "azure.mgmt.appcontainers" "azure.mgmt.authorization" "azure.mgmt.batch" "azure.mgmt.batchai" diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index fae5a33fea41..f7440e2e1c9d 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -32,10 +32,12 @@ let azure-common azure-cli-telemetry azure-data-tables + azure-mgmt-appcontainers azure-mgmt-core azure-mgmt-resource colorama cryptography + distro humanfriendly jmespath knack @@ -105,7 +107,7 @@ let ''; }; - antlr4-python3-runtime = super.antlr4-python3-runtime.override(_: { + antlr4-python3-runtime = super.antlr4-python3-runtime.override (_: { antlr4 = super.pkgs.antlr4_9; }); @@ -136,38 +138,35 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.1.0b2" "zip" "sha256-e+I5MdbbX7WhxHCj1Ery3z2WUrJtpWGD1bhLbqReb58="; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b5" "zip" - "sha256-YaokPCleAiwM893QFU+tbhL+8UngvGGshdeEBDCVTu4="; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b8" "zip" + "sha256-OyA0O10UMx8BKUvxTQU6/eZupuKoxFQk2kvd/qINjFU="; - azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.1.0" "zip" - "sha256-2DeOemVpkjeI/hUdG04IuHU2h3cmk3oG4kr1wIDvdbM="; + azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.2.0" "zip" + "sha256-2rU5Mc5tcSHEaej4LeiJ/WwWjk3fZFdd7MIwqmHgRss="; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "5.1.0b1" "zip" - "sha256-4djPfDzj9ql5WFn5fafLZWRKbofvb1Y7j05S77ly75s="; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "6.0.0" "zip" + "sha256-lIEYi/jvF9pYbnH+clUzfU0fExlY+dZojIyZRtTLQh8="; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "21.1.0b1" "zip" - "sha256-oiC5k+Mg9KJn940jMxG4AB9Pom+t/DWRA5KRv8HO0HI="; - - azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.2.0" "zip" - "sha256-R2COS22pCtFp3oV98LLn/X2LkPOVUCasEONhFIhEdBQ="; + azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "3.0.0" "zip" + "sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw="; azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.3.0" "zip" "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI="; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "29.0.0" "zip" - "sha256-wkRmH/3MMxeTZr7KQMZQbjPHs2GSxAjJFZlSp75pUPI="; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "29.1.0" "zip" + "sha256-LVobrn9dMHyh6FDX6D/tnIOdT2NbEKS40/i8YJisKIg="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "sha256-moWonzDyJNJhdJviC0YWoOuJSFhvfw8gVzuOoy8mUYk="; - azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip" - "sha256-IhZLDFkTize8SLptR2v2NRUrxCjctCC1IaFLjCXHl60="; + azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip" + "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "21.1.0" "zip" - "sha256-5EOythXO7spLzzlqDWrwcdkkJAMH9W8OBv96rYaWxAY="; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "23.0.0" "zip" + "sha256-V8IUTQvbUSOpsqkGfBqLo4DVIB7fryYMVx6WpfWzOnc="; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "8.0.0" "zip" - "sha256-/6ySVfCjr1YiiZIZJElrd1EfirV+TJvE/FvKs7UhoKo="; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.2.0" "zip" + "sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k="; azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" "sha256-BAkAYrwejwDC9FMVo7zrD7OzR57BR01xuINC4TSZsIc="; @@ -178,8 +177,8 @@ let azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip" "sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA="; - azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.1.0" "zip" - "sha256-2EWfTsl5y3Sw4P8d5X7TKxYmO4PagUTNv/SFKdjY2Ss="; + azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.2.0" "zip" + "sha256-XmGIzw+yGYgdaNGZJClFRl531BGsQUH+HESUXGVK6TI="; azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip" "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A="; @@ -196,8 +195,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "9.0.1" "zip" - "sha256-PYRMOWaJUXrRgqW3+pLBY+L6HvU1WlPvaatFe4O7RY8="; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.0.0" "zip" + "sha256-9+cXsY8Qr5ds9lYw39duWdcqm6QUTedQbjn8x6zJoyE="; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg="; @@ -223,11 +222,11 @@ let azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip" "sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM="; - azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs (old: rec { - version = "6.1.0"; + azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs(old: rec { + version = "7.0.0"; src = old.src.override { inherit version; - hash = "sha256-lS8da3Al1z1pMLDBf6ZtWc1UFUVgkN1qpKTxt4VXdlQ="; + hash = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI="; }; }); @@ -237,8 +236,8 @@ let azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "7.0.0" "zip" "sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA="; - azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.1.0" "zip" - "sha256-Tq8h3fvajxIG2QjtCyHCQDE2deBDioxLLaQQek/O24U="; + azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.2.0" "zip" + "sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec="; azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "14.1.0" "zip" "sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig="; @@ -246,8 +245,8 @@ let azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "2.0.0" "zip" "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E="; - azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "8.0.0" "zip" - "sha256-qW1QyIUHIzopPnVyAt7q2YDGeAj0Mrjol8TfHKCI2n4="; + azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "9.0.0" "zip" + "sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0="; azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "3.0.0" "zip" "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; @@ -255,11 +254,11 @@ let azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.1.0" "zip" "sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE="; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b6" "zip" - "sha256-1/0VGMW9yZsilJ0yNjhFzVO7WbJlB4yJmDL/RxpQLKc="; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b10" "zip" + "sha256-QHvbO6Toh5QflMIaNYmxXBy0Dmw++RVdim3HEDtLBrQ="; - azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b4" "zip" - "sha256-IB/ihVFm8WrJ2ZZfALp167Sq4u0cvIq1hllNriJxaz0="; + azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b5" "zip" + "sha256-ZFgJflgynRSxo+B+Vso4eX1JheWlDQjfJ9QmupXypMc="; azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip" "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k="; @@ -273,32 +272,32 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "10.1.0" "zip" "sha256-MZqhSBkwypvEefhoEWEPsBUFidWYD7qAX6edcBDDSSA="; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.1.0" "zip" - "sha256-DpO+6FvsNwjjcz2ImhHpColHVNpPUMgCtEMrfUzfAaA="; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.0" "zip" + "sha256-QZbbdvgCbPleZnPpYTZI/Cgmeus8Kb5uyXuobnf6Ox4="; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.0.0" "zip" - "sha256-HjejK28Em5AeoQ20o4fucnXTlAwADF/SEpVfHn9anZk="; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip" + "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "5.0.0" "zip" "sha256-eL9KJowxTF7hZJQQQCNJZ7l+rKPFM8wP5vEigt3ZFGE="; - azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" + azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" "sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs="; azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip" "sha256-woeix9703hn5LAwxugKGf6xvW433G129qxkoi7RV/Fs="; - azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" - "sha256-9czuo63QTpRF6ohJLxXuz2wSbwQG2WfJX25It5vo23U="; + azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "3.0.0" "zip" + "sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0="; azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "21.0.0" "zip" "sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c="; - azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "8.1.0" "zip" - "sha256-R8Narn7eC7j59tDjsgbk9lF0PcOgOwSnzoMp3Qu0rmg="; + azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "8.2.0" "zip" + "sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI="; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" "sha256-3jXhF5EoMsGp6TEJqNJMq5T1VwOpCHsuscWwZVs7GRM="; @@ -309,8 +308,8 @@ let azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip" "sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o="; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.0.0" "tar.gz" - "sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg="; + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.1.0" "tar.gz" + "sha256-VvNI+mhi2nCFBAXUEL5ph3xj/cBRMf2Mo2uXIgKC+oc="; azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec { version = "1.1.1"; @@ -353,11 +352,11 @@ let }); azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit (oldAttrs) pname; inherit version; - hash = "sha256-Q1gGq7EZ/JvYjD7y0mp3kEy15QKZI84UQTdlIBoQLMs="; + hash = "sha256-XxryuN5HVuY9h6ioSEv9nwzkK6wYLupvFOCJqX82eWE="; extension = "zip"; }; propagatedBuildInputs = with super; oldAttrs.propagatedBuildInputs ++ [ @@ -376,11 +375,11 @@ let }); azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs(oldAttrs: rec { - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit (oldAttrs) pname; inherit version; - hash = "sha256-fN1IuZ9fjxgRZv6qh9gg6v6KYpnKlXfnoLqfZCDXoRY="; + hash = "sha256-kA6urM/9zQEBKySKfQSQCMkoB7dJ7dHJB0ypJIVUwX4="; extension = "zip"; }; }); @@ -405,19 +404,23 @@ let }; propagatedBuildInputs = with self; [ - azure-common azure-nspkg msrest msrestazure cryptography + azure-common + azure-nspkg + msrest + msrestazure + cryptography ]; pythonNamespaces = [ "azure" ]; pythonImportsCheck = [ ]; }); azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs(oldAttrs: rec { - version = "4.0.0b3"; + version = "4.3.0"; src = fetchPypi { inherit (oldAttrs) pname; inherit version; extension = "zip"; - hash = "sha256-d3tJWObM3plRurzfqWmHkn5CqVL9ekQfn9AeDc/KxLQ="; + hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY="; }; }); @@ -549,6 +552,14 @@ let }; }); + azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs(oldAttrs: rec { + version = "22.0.0"; + + src = oldAttrs.src.override { + inherit version; + hash = "sha256-/rXZeeGLUvLP0CO0oKM+VKb3bMaiUtyM117OLGMpjpQ="; + }; + }); }; }; in From b016259f93ce8abf6c278f1981dd5eb231f34b25 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 30 Jun 2023 02:33:17 +0000 Subject: [PATCH 008/143] func: 1.7.0 -> 1.10.0 --- pkgs/applications/networking/cluster/func/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/func/default.nix b/pkgs/applications/networking/cluster/func/default.nix index 306ce8ba25e4..7145d1277c9b 100644 --- a/pkgs/applications/networking/cluster/func/default.nix +++ b/pkgs/applications/networking/cluster/func/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "func"; - version = "1.7.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "knative"; repo = "func"; rev = "knative-v${version}"; - sha256 = "sha256-LrWRY22deh+YL/cLb+ZwK93okVPgysBoMCmo2MrbqIs="; + hash = "sha256-x/SrRkgeLvjcd9LNgMGOf5TLU1GXpjY2Z2MyxrBZckc="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/func" ]; From a8e7b9684f1ad62fc200eb0ce3ad11308cb91802 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 30 Jun 2023 02:37:26 +0000 Subject: [PATCH 009/143] kbst: 0.1.5 -> 0.2.1 --- pkgs/applications/networking/cluster/kbst/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/kbst/default.nix b/pkgs/applications/networking/cluster/kbst/default.nix index 9a949bc8c800..30207b07457f 100644 --- a/pkgs/applications/networking/cluster/kbst/default.nix +++ b/pkgs/applications/networking/cluster/kbst/default.nix @@ -2,15 +2,17 @@ buildGoModule rec { pname = "kbst"; - version = "0.1.5"; + version = "0.2.1"; src = fetchFromGitHub{ owner = "kbst"; repo = "kbst"; rev = "v${version}"; - sha256 = "0cz327fl6cqj9rdi8zw6xrazzigjymhn1hsbjr9xxvfvfnn67xz2"; + hash = "sha256-tbSYNJp/gzEz+wEAe3bvIiZL5axZvW+bxqTOBkYSpMY="; }; + vendorHash = "sha256-+FY6KGX606CfTVKM1HeHxCm9PkaqfnT5XeOEXUX3Q5I="; + ldflags = let package_url = "github.com/kbst/kbst"; in [ @@ -22,8 +24,6 @@ buildGoModule rec { "-X ${package_url}.gitTreeState=clean" ]; - vendorSha256 = "sha256-DZ47Bj8aFfBnxU9+e1jZiTMF75rCJtcj4yUfZRJWCic="; - doCheck = false; doPostInstallCheck = true; From 10cf856dc1dcbb9b7f38042dd8d0fcf9175a136b Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 30 Jun 2023 08:30:45 +0200 Subject: [PATCH 010/143] netbox: 3.5.3 -> 3.5.4 --- pkgs/servers/web-apps/netbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 5903c5183335..0e2c4c999cf0 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -23,8 +23,8 @@ in }; netbox = callPackage generic { - version = "3.5.3"; - hash = "sha256-F8rsTOOxARI3ll545AF0+HFaG4wNO+RWwsl5y9kAyE4="; + version = "3.5.4"; + hash = "sha256-CJ7NgKDDEmOFFULaG6wjP5pvGieyU4YRsvmIvqve5qg="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch From 19302e5e28cdf6a1ebf0035d398dbc0d24b3aaf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Thu, 29 Jun 2023 18:38:58 +0200 Subject: [PATCH 011/143] biscuit-cli: 0.2.0 -> 0.4.0 --- pkgs/tools/security/biscuit-cli/Cargo.lock | 1080 ----------------- pkgs/tools/security/biscuit-cli/default.nix | 37 +- .../security/biscuit-cli/version-0.4.0.patch | 13 + 3 files changed, 40 insertions(+), 1090 deletions(-) delete mode 100644 pkgs/tools/security/biscuit-cli/Cargo.lock create mode 100644 pkgs/tools/security/biscuit-cli/version-0.4.0.patch diff --git a/pkgs/tools/security/biscuit-cli/Cargo.lock b/pkgs/tools/security/biscuit-cli/Cargo.lock deleted file mode 100644 index 5081080cabf0..000000000000 --- a/pkgs/tools/security/biscuit-cli/Cargo.lock +++ /dev/null @@ -1,1080 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "0.7.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -dependencies = [ - "memchr", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "biscuit-auth" -version = "3.0.0-alpha4" -source = "git+https://github.com/biscuit-auth/biscuit-rust?branch=main#676e32fd4071dd2f0ee0f76807f3ca53dd877c89" -dependencies = [ - "base64", - "biscuit-parser", - "biscuit-quote", - "ed25519-dalek", - "getrandom", - "hex", - "nom", - "prost", - "prost-types", - "rand", - "rand_core", - "regex", - "sha2", - "thiserror", - "time 0.3.17", - "zeroize", -] - -[[package]] -name = "biscuit-cli" -version = "0.2.0" -dependencies = [ - "anyhow", - "atty", - "biscuit-auth", - "chrono", - "clap", - "hex", - "parse_duration", - "shell-words", - "tempfile", - "thiserror", - "time 0.3.17", -] - -[[package]] -name = "biscuit-parser" -version = "0.1.0-alpha4" -source = "git+https://github.com/biscuit-auth/biscuit-rust?branch=main#676e32fd4071dd2f0ee0f76807f3ca53dd877c89" -dependencies = [ - "hex", - "nom", - "proc-macro2", - "quote", - "thiserror", - "time 0.3.17", -] - -[[package]] -name = "biscuit-quote" -version = "0.2.0-alpha5" -source = "git+https://github.com/biscuit-auth/biscuit-rust?branch=main#676e32fd4071dd2f0ee0f76807f3ca53dd877c89" -dependencies = [ - "biscuit-parser", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "cc" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time 0.1.44", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "curve25519-dalek" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" -dependencies = [ - "byteorder", - "digest", - "rand_core", - "subtle", - "zeroize", -] - -[[package]] -name = "cxx" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "ed25519" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" -dependencies = [ - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand", - "serde", - "sha2", - "zeroize", -] - -[[package]] -name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] - -[[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.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" - -[[package]] -name = "link-cplusplus" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "os_str_bytes" -version = "6.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" - -[[package]] -name = "parse_duration" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7037e5e93e0172a5a96874380bf73bc6ecef022e26fa25f2be26864d6b3ba95d" -dependencies = [ - "lazy_static", - "num", - "regex", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prost" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "prost-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" -dependencies = [ - "bytes", - "prost", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" -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 = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "scratch" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" - -[[package]] -name = "serde" -version = "1.0.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer", - "cfg-if", - "cpufeatures", - "digest", - "opaque-debug", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasm-bindgen" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[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-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "zeroize" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] diff --git a/pkgs/tools/security/biscuit-cli/default.nix b/pkgs/tools/security/biscuit-cli/default.nix index c4d21980bd49..d7150ff353fa 100644 --- a/pkgs/tools/security/biscuit-cli/default.nix +++ b/pkgs/tools/security/biscuit-cli/default.nix @@ -1,25 +1,42 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib +, fetchFromGitHub +, rustPlatform +, testers +, nix-update-script +, biscuit-cli +}: rustPlatform.buildRustPackage rec { pname = "biscuit-cli"; - version = "0.2.0-next-pre20230103"; + version = "0.4.0"; src = fetchFromGitHub { owner = "biscuit-auth"; repo = "biscuit-cli"; - rev = "0ecf1ec4c98a90b1bf3614558a029b47c57288df"; - sha256 = "sha256-ADJWqx70IwuvCBeK9rb9WBIsD+oQROQSduSQ8Bu8mfk="; + rev = version; + sha256 = "sha256-Fd5wBvQe7S/UZ42FMlU+f9qTwcLIMnQrCWVRoHxOx64="; }; - cargoLock = { - outputHashes."biscuit-auth-3.0.0-alpha4" = "sha256-4SzOupoD33D0KHZyVLriGzUHy9XXnWK1pbgqOjJH4PI="; - lockFile = ./Cargo.lock; + cargoHash = "sha256-SHRqdKRAHkWK/pEVFYo3d+r761K4j9BkTg2angQOubk="; + + # Version option does not report the correct version + # https://github.com/biscuit-auth/biscuit-cli/issues/44 + patches = [ ./version-0.4.0.patch ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + inherit version; + package = biscuit-cli; + command = "biscuit --version"; + }; }; - meta = { + meta = with lib; { description = "CLI to generate and inspect biscuit tokens"; homepage = "https://www.biscuitsec.org/"; - maintainers = [ lib.maintainers.shlevy ]; - license = lib.licenses.bsd3; + maintainers = with maintainers; [ shlevy gaelreyrol ]; + license = licenses.bsd3; + mainProgram = "biscuit"; }; } diff --git a/pkgs/tools/security/biscuit-cli/version-0.4.0.patch b/pkgs/tools/security/biscuit-cli/version-0.4.0.patch new file mode 100644 index 000000000000..d2ed06f211ca --- /dev/null +++ b/pkgs/tools/security/biscuit-cli/version-0.4.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/cli.rs b/src/cli.rs +index f40cfc7..d587eeb 100644 +--- a/src/cli.rs ++++ b/src/cli.rs +@@ -89,7 +89,7 @@ fn parse_param(kv: &str) -> Result { + + /// biscuit creation and inspection CLI. Run `biscuit --help` to see what's available. + #[derive(Parser)] +-#[clap(version = "0.2.0", author = "Clément D. ")] ++#[clap(version = "0.4.0", author = "Clément D. ")] + pub struct Opts { + #[clap(subcommand)] + pub subcmd: SubCommand, From c85b190a7a89068a491afa6b885355690d71a816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Fri, 30 Jun 2023 09:19:43 +0200 Subject: [PATCH 012/143] calibre: 6.21.0 -> 6.22.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index f24c4432dd5b..1e90b17eced4 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.21.0"; + version = "6.22.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-gGgXnJbGbp6uK9tFK6wqHBKf+zWidF5u5wI2lclrJGk="; + hash = "sha256-TBXdEf6MBP64heY6uAaVJtZc+SnhF4BNJghcCuTopUc="; }; # https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1 From fa93045a5b843395f510e7739197badf9a42004e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Jun 2023 12:27:09 +0200 Subject: [PATCH 013/143] nss_latest: 3.90 -> 3.91 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/i-wiqdBIjMI --- pkgs/development/libraries/nss/generic.nix | 2 +- pkgs/development/libraries/nss/latest.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nss/generic.nix b/pkgs/development/libraries/nss/generic.nix index 9d9c21cc690d..e1710813db80 100644 --- a/pkgs/development/libraries/nss/generic.nix +++ b/pkgs/development/libraries/nss/generic.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # https://bugzilla.mozilla.org/show_bug.cgi?id=1771273 # https://hg.mozilla.org/projects/nss/raw-rev/21e7aaa1f7d94bca15d997e5b4c2329b32fad21a ./gcc-13-esr.patch - ] ++ lib.optionals (lib.versionAtLeast version "3.90") [ + ] ++ lib.optionals (lib.versionAtLeast version "3.90" && lib.versionOlder version "3.91") [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1836925 # https://phabricator.services.mozilla.com/D180068 ./remove-c25519-support.patch diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 9434ccf1b3e9..4be20ad1ff77 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.90"; - hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; + version = "3.91"; + hash = "sha256-hL1GN23xcRjFX21z0w/ZOgryEpbGbnaQRxVH5YmPxLM="; } From 761ffd78d0305b4c65a3aed3417f719070f82145 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Jun 2023 13:16:22 +0200 Subject: [PATCH 014/143] evcc: 0.118.1 -> 0.118.2 https://github.com/evcc-io/evcc/releases/tag/0.118.2 --- pkgs/servers/home-automation/evcc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 77e9d73d078c..d2d25006fa88 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.118.1"; + version = "0.118.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-EAvY+JNk1V4oWW5mbbEIRjaUqTOib6zY8hab0Mw2hUk="; + hash = "sha256-4zbXNXNWrnsghbL2cvatCShuio7uIXbLtLmG0o4PGq0="; }; - vendorHash = "sha256-CkJpTXbjHRXcZp+FWGal91kkFkIMoKZ6/zmY+8Udmos="; + vendorHash = "sha256-SFs7Bua3/bgTcdzvSisTn3Xx+7jD84LrMdaUhDXp9VI="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-w2xMG0vHx4g9AAvNWRwR3u9w6PrHtQV7TETnDRkmkBk="; + hash = "sha256-Kwt6YzaqJhEF90+r4+BjYwgmD5xXQBSEzwp6dg3X9GQ="; }; nativeBuildInputs = [ From 744ddf36185d85719c5f50f7d1d9e4a46908e82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Thu, 29 Jun 2023 23:16:14 +0200 Subject: [PATCH 015/143] owntracks-recorder: init at 0.9.3 --- pkgs/servers/owntracks-recorder/default.nix | 82 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/servers/owntracks-recorder/default.nix diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/servers/owntracks-recorder/default.nix new file mode 100644 index 000000000000..47b3b696fd4c --- /dev/null +++ b/pkgs/servers/owntracks-recorder/default.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, mosquitto +, curl +, openssl +, lmdb +, lua +, libsodium +, libuuid +, libconfig +, testers +, owntracks-recorder +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "owntracks-recorder"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "owntracks"; + repo = "recorder"; + rev = finalAttrs.version; + hash = "sha256-w0wk69hERGz6fs6uXBYiomcVlQeeTGCfTICu2q7ryNg="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + (lib.getDev curl) + (lib.getLib libconfig) + (lib.getDev openssl) + (lib.getDev lmdb) + (lib.getDev mosquitto) + (lib.getDev libuuid) + (lib.getDev lua) + (lib.getDev libsodium) + ]; + + configurePhase = '' + runHook preConfigure + + cp config.mk.in config.mk + + substituteInPlace config.mk \ + --replace "INSTALLDIR = /usr/local" "INSTALLDIR = $out" \ + --replace "WITH_LUA ?= no" "WITH_LUA ?= yes" \ + --replace "WITH_ENCRYPT ?= no" "WITH_ENCRYPT ?= yes" + + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + install -m 0755 ot-recorder $out/bin + install -m 0755 ocat $out/bin + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = owntracks-recorder; + command = "ocat --version"; + version = finalAttrs.version; + }; + + meta = with lib; { + description = "Store and access data published by OwnTracks apps"; + homepage = "https://github.com/owntracks/recorder"; + changelog = "https://github.com/owntracks/recorder/blob/master/Changelog"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "ot-recorder"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21b83d86d6d1..c44703a6a899 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11119,6 +11119,8 @@ with pkgs; owncast = callPackage ../servers/owncast { }; + owntracks-recorder = callPackage ../servers/owntracks-recorder { }; + update-dotdee = with python3Packages; toPythonApplication update-dotdee; update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit; From c09a0a837a75b91a580587d15c6f9e8fcfada834 Mon Sep 17 00:00:00 2001 From: Erik Skytthe Date: Fri, 30 Jun 2023 15:08:03 +0200 Subject: [PATCH 016/143] apacheKafka: 3.5.0, 3.4.1, 3.3.1 -> 3.3.2 --- nixos/tests/kafka.nix | 2 ++ pkgs/servers/apache-kafka/default.nix | 18 +++++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 79af02710c32..864253fd8c73 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -72,5 +72,7 @@ in with pkgs; { kafka_3_1 = makeKafkaTest "kafka_3_1" apacheKafka_3_1; kafka_3_2 = makeKafkaTest "kafka_3_2" apacheKafka_3_2; kafka_3_3 = makeKafkaTest "kafka_3_3" apacheKafka_3_3; + kafka_3_4 = makeKafkaTest "kafka_3_4" apacheKafka_3_4; + kafka_3_5 = makeKafkaTest "kafka_3_5" apacheKafka_3_5; kafka = makeKafkaTest "kafka" apacheKafka; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index cb3691460bd7..114a0ce96f0e 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,10 +3,22 @@ let versionMap = { - "3.3" = { - kafkaVersion = "3.3.1"; + "3.5" = { + kafkaVersion = "3.5.0"; scalaVersion = "2.13"; - sha256 = "sha256-GK2KNl+xEd4knTu4vzyWzRrwYOyPs+PR/Ep64Q2QQt4="; + sha256 = "sha256-KjpGjgab5XDxbWEqgZbC96kge36shlvpNNIM4SUusvg="; + jre = jdk17_headless; + }; + "3.4" = { + kafkaVersion = "3.4.1"; + scalaVersion = "2.13"; + sha256 = "sha256-p28XpSuPLNMd4RVx/zZqcUggtuTgKJOwFZ0J2w7a+Zg="; + jre = jdk17_headless; + }; + "3.3" = { + kafkaVersion = "3.3.2"; + scalaVersion = "2.13"; + sha256 = "sha256-Gv5XrpXnEajH8fSbcfIfURz+QPcqTrJ1oe3SGXYLNRc="; jre = jdk17_headless; }; "3.2" = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41438b17e46f..ded8cdc81a18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18014,12 +18014,14 @@ with pkgs; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_3_3; + apacheKafka = apacheKafka_3_5; apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; apacheKafka_3_0 = callPackage ../servers/apache-kafka { majorVersion = "3.0"; }; apacheKafka_3_1 = callPackage ../servers/apache-kafka { majorVersion = "3.1"; }; apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; }; apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; + apacheKafka_3_4 = callPackage ../servers/apache-kafka { majorVersion = "3.4"; }; + apacheKafka_3_5 = callPackage ../servers/apache-kafka { majorVersion = "3.5"; }; kt = callPackage ../tools/misc/kt { }; From fb8fdc33e87f8a1fdcc354ba35775c3f606bfff4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 30 Jun 2023 19:37:17 +0300 Subject: [PATCH 017/143] makeSetupHook: unbreak structuredAttrsByDefault --- pkgs/build-support/trivial-builders/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 2af36008c7a5..871f9722a4a2 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -624,6 +624,10 @@ rec { script: runCommand name (substitutions // { + # TODO(@Artturin:) substitutions should be inside the env attrset + # but users are likely passing non-substitution arguments through substitutions + # turn off __structuredAttrs to unbreak substituteAll + __structuredAttrs = false; inherit meta; inherit depsTargetTargetPropagated; propagatedBuildInputs = From 59a54a4fa6066fe28dfbdf9b2ef3585e3531263b Mon Sep 17 00:00:00 2001 From: meppu Date: Fri, 30 Jun 2023 20:01:45 +0300 Subject: [PATCH 018/143] elixir_1_15: 1.15.0 -> 1.15.1 --- pkgs/development/interpreters/elixir/1.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.15.nix b/pkgs/development/interpreters/elixir/1.15.nix index 6dada168cc37..578db897fce5 100644 --- a/pkgs/development/interpreters/elixir/1.15.nix +++ b/pkgs/development/interpreters/elixir/1.15.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.15.0"; - sha256 = "sha256-o5MfA0UG8vpnPCH1EYspzcN62yKZQcz5uVUY47hOL9w="; + version = "1.15.1"; + sha256 = "sha256-TP97vnhX+ZZGmOzAfqKf0dSqObPMh+34xcVpFnSb11w="; # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; escriptPath = "lib/elixir/scripts/generate_app.escript"; From febd3fa64f07d2ebf39a7f623684760355017273 Mon Sep 17 00:00:00 2001 From: StepBroBD Date: Fri, 30 Jun 2023 11:14:08 -0600 Subject: [PATCH 019/143] raycast: 1.53.4 -> 1.54.1 --- pkgs/os-specific/darwin/raycast/default.nix | 14 +++++++------- pkgs/os-specific/darwin/raycast/update.sh | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index d37cdff0ca86..df6c5c36d7a3 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -4,14 +4,14 @@ , undmg }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.53.4"; + version = "1.54.1"; src = fetchurl { name = "Raycast.dmg"; - url = "https://releases.raycast.com/releases/${version}/download?build=universal"; - sha256 = "sha256-bkNlGHCpYnHlKdzDyKGPF5jnoq2cSe1sdg9W2DwVrWc="; + url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; + hash = "sha256-lnP0wSTC7oCji24RSk1fY+QSwoYioMPtvOb4Ey1MzVY="; }; dontPatch = true; @@ -35,9 +35,9 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Control your tools with a few keystrokes"; homepage = "https://raycast.app/"; - license = licenses.unfree; + license = with licenses; [ unfree ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ lovesegfault stepbrobd ]; - platforms = platforms.darwin; + platforms = [ "aarch64-darwin" "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/os-specific/darwin/raycast/update.sh b/pkgs/os-specific/darwin/raycast/update.sh index f338f5f278fc..6c81c02b8f97 100755 --- a/pkgs/os-specific/darwin/raycast/update.sh +++ b/pkgs/os-specific/darwin/raycast/update.sh @@ -3,7 +3,7 @@ set -eo pipefail -new_version=$(curl --silent https://releases.raycast.com/releases/latest | jq -r '.version') +new_version=$(curl --silent https://releases.raycast.com/releases/latest?build=universal | jq -r '.version') old_version=$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix) if [[ $new_version == $old_version ]]; then @@ -16,5 +16,5 @@ else fi hash=$(nix --extra-experimental-features nix-command store prefetch-file --json --hash-type sha256 "https://releases.raycast.com/releases/$new_version/download?build=universal" | jq -r '.hash') -sed -Ei.bak '/ *sha256 = /{N;N; s@("sha256-)[^;"]+@"'"$hash"'@}' ./default.nix +sed -Ei.bak '/ *hash = /{N;N; s@("sha256-)[^;"]+@"'"$hash"'@}' ./default.nix rm ./default.nix.bak From 62dddab336c352959f03050775b138e7b3166864 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 30 Jun 2023 20:44:27 +0300 Subject: [PATCH 020/143] enblend-enfuse: use fetchhg instead of sourceforge snapshots See also discussion at: https://github.com/NixOS/nixpkgs/pull/239140#discussion_r1248079360 --- pkgs/tools/graphics/enblend-enfuse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 4cf5970c5a69..2fffa3bfa9c7 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip +{ lib, stdenv, fetchhg , autoreconfHook , boost , freeglut @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { pname = "enblend-enfuse"; version = "unstable-2022-03-06"; - src = fetchzip { - url = "https://sourceforge.net/code-snapshots/hg/e/en/enblend/code/enblend-code-0f423c72e51872698fe2985ca3bd453961ffe4e0.zip"; + src = fetchhg { + url = "http://hg.code.sf.net/p/enblend/code"; + rev = "0f423c72e51872698fe2985ca3bd453961ffe4e0"; sha256 = "sha256-0gCUSdg3HR3YeIbOByEBCZh2zGlYur6DeCOzUM53fdc="; - stripRoot = true; }; buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ]; From c8c9b781221e365816cf6dd2509df63dfbe57d55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jun 2023 20:12:50 +0200 Subject: [PATCH 021/143] python311Packages.mss: 7.0.1 -> 9.0.1 Changelog: https://github.com/BoboTiG/python-mss/blob/v9.0.1/CHANGELOG.md --- pkgs/development/python-modules/mss/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index a707ccefda1a..6a82bffaa6c0 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -6,22 +6,24 @@ buildPythonPackage rec { pname = "mss"; - version = "7.0.1"; + version = "9.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI="; + hash = "sha256-bre5AIzydCiBH6M66zXzM024Hj98wt1J7HxuWpSznxI="; }; - # By default it attempts to build Windows-only functionality prePatch = '' - rm mss/windows.py + # By default it attempts to build Windows-only functionality + rm src/mss/windows.py ''; # Skipping tests due to most relying on DISPLAY being set + doCheck = false; + pythonImportsCheck = [ "mss" ]; @@ -29,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cross-platform multiple screenshots module"; homepage = "https://github.com/BoboTiG/python-mss"; + changelog = "https://github.com/BoboTiG/python-mss/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ austinbutler ]; }; From a7e4673e15103ded6a90c5331bbf7cdd4942b5a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jun 2023 09:17:16 +0200 Subject: [PATCH 022/143] python311Packages.pycookiecheat: init at 0.5.0 --- .../python-modules/pycookiecheat/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/pycookiecheat/default.nix diff --git a/pkgs/development/python-modules/pycookiecheat/default.nix b/pkgs/development/python-modules/pycookiecheat/default.nix new file mode 100644 index 000000000000..a8898e4b627e --- /dev/null +++ b/pkgs/development/python-modules/pycookiecheat/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, keyring +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, playwright +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pycookiecheat"; + version = "0.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "n8henrie"; + repo = "pycookiecheat"; + rev = "refs/tags/v${version}"; + hash = "sha256-3I7iw/dwF4lRqmVM3OR402InZCFoV9gzKpRQrx4F9KA="; + }; + + pythonRelaxDeps = [ + "cryptography" + "keyring" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + cryptography + keyring + ]; + + nativeCheckInputs = [ + playwright + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pycookiecheat" + ]; + + disabledTests = [ + # Tests want to use playwright executable + "test_no_cookies" + "test_fake_cookie" + ]; + + meta = with lib; { + description = "Borrow cookies from your browser's authenticated session for use in Python scripts"; + homepage = "https://github.com/n8henrie/pycookiecheat"; + changelog = "https://github.com/n8henrie/pycookiecheat/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ea87c051748..ae473ed1315a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7797,6 +7797,8 @@ self: super: with self; { pycontrol4 = callPackage ../development/python-modules/pycontrol4 { }; + pycookiecheat = callPackage ../development/python-modules/pycookiecheat { }; + pycoolmasternet-async = callPackage ../development/python-modules/pycoolmasternet-async { }; pyfibaro = callPackage ../development/python-modules/pyfibaro { }; From 059e9e432c7e6f9e105afb29d0a5a15c265f3698 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jun 2023 20:20:51 +0200 Subject: [PATCH 023/143] pentestgpt: init at unstable-2023-06-27 --- pkgs/tools/security/pentestgpt/default.nix | 57 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/tools/security/pentestgpt/default.nix diff --git a/pkgs/tools/security/pentestgpt/default.nix b/pkgs/tools/security/pentestgpt/default.nix new file mode 100644 index 000000000000..328ba0ca9a8f --- /dev/null +++ b/pkgs/tools/security/pentestgpt/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pentestgpt"; + version = "unstable-2023-06-27"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "GreyDGL"; + repo = "PentestGPT"; + rev = "e63a91f466a035e036827e8f492bc47c5c1135af"; + hash = "sha256-m0R/kMmbr5Ixuqvw6ZRoaAGCnI3j86Iwk4+TYqv0WbU="; + }; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "playwright==1.28.0" "playwright" \ + --replace "beautifulsoup4~=4.11.2" "" \ + --replace "black" "" \ + --replace "pytest" "" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + colorama + google + langchain + loguru + openai + playwright + prompt-toolkit + pycookiecheat + pyyaml + requests + rich + sqlmap + tiktoken + ]; + + # Tests require network access + doCheck = false; + + pythonImportsCheck = [ + "pentestgpt" + ]; + + meta = with lib; { + description = "GPT-empowered penetration testing tool"; + homepage = "https://github.com/GreyDGL/PentestGPT"; + changelog = "https://github.com/GreyDGL/PentestGPT/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20b2417f9a41..4144d74c0091 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33855,6 +33855,8 @@ with pkgs; pencil = callPackage ../applications/graphics/pencil { }; + pentestgpt = callPackage ../tools/security/pentestgpt { }; + perseus = callPackage ../applications/science/math/perseus { }; petrifoo = callPackage ../applications/audio/petrifoo { From 21db11de342e05d1313fbfc568a4c78c5a1ef31b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jun 2023 09:18:11 +0200 Subject: [PATCH 024/143] python311Packages.google: init at 3.0.0 --- .../python-modules/google/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/google/default.nix diff --git a/pkgs/development/python-modules/google/default.nix b/pkgs/development/python-modules/google/default.nix new file mode 100644 index 000000000000..7dc34933d452 --- /dev/null +++ b/pkgs/development/python-modules/google/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "google"; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FDUwEi7lEwUJrV6YnwUS98shiy1O3br7rUD9EOjYzL4="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "googlesearch" + ]; + + meta = with lib; { + description = "Python bindings to the Google search engine"; + homepage = "https://pypi.org/project/google/"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae473ed1315a..7ffd4237e1cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4189,6 +4189,8 @@ self: super: with self; { goodwe = callPackage ../development/python-modules/goodwe { }; + google = callPackage ../development/python-modules/google { }; + google-ai-generativelanguage = callPackage ../development/python-modules/google-ai-generativelanguage { }; google-api-core = callPackage ../development/python-modules/google-api-core { }; From ebfcf3d9bdda5e98f32e4cad47c6c3e21b9417b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jun 2023 20:38:36 +0200 Subject: [PATCH 025/143] python311Packages.heatshrink2: 0.11.0 -> 0.12.0 Diff: https://github.com/eerimoq/pyheatshrink/compare/0.11.0...0.12.0 --- pkgs/development/python-modules/heatshrink2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/heatshrink2/default.nix b/pkgs/development/python-modules/heatshrink2/default.nix index 4edc94167c9e..db469ff784f5 100644 --- a/pkgs/development/python-modules/heatshrink2/default.nix +++ b/pkgs/development/python-modules/heatshrink2/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "heatshrink2"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "eerimoq"; repo = "pyheatshrink"; rev = version; fetchSubmodules = true; - hash = "sha256-P3IofGbW4x+erGCyxIPvD9aNHIJ/GjjWgno4n95SQoQ="; + hash = "sha256-JthHYq78SYr49+sTNtLZ8GjtrHcr1dzXcPskTrb4M3o="; }; pythonImportsCheck = [ "heatshrink2" ]; From cfebc30bb0f2bb200263b4e852991a25cce38789 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Jun 2023 18:41:16 +0000 Subject: [PATCH 026/143] ckbcomp: 1.221 -> 1.222 --- pkgs/tools/X11/ckbcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index c418d2f8ad0c..c5f44792c3b1 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.221"; + version = "1.222"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-4/g2RR3jDeEjntEC9IySn3hHofK23zKb8+kvTcbnpTI="; + sha256 = "sha256-2HviEt/PJS3QFgGPa8WsUeDhotGaHRLs51LlSimfTYQ="; }; buildInputs = [ perl ]; From b5eac33a5990d6f91c3686dff561a85b258d98f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jun 2023 20:43:30 +0200 Subject: [PATCH 027/143] python311Packages.heatshrink2: add format - disable on unsupported Python releases --- .../python-modules/heatshrink2/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/heatshrink2/default.nix b/pkgs/development/python-modules/heatshrink2/default.nix index db469ff784f5..dd37c7c0c0ad 100644 --- a/pkgs/development/python-modules/heatshrink2/default.nix +++ b/pkgs/development/python-modules/heatshrink2/default.nix @@ -1,24 +1,30 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib +, pythonOlder }: buildPythonPackage rec { pname = "heatshrink2"; version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eerimoq"; repo = "pyheatshrink"; - rev = version; + rev = "refs/tags/${version}"; fetchSubmodules = true; hash = "sha256-JthHYq78SYr49+sTNtLZ8GjtrHcr1dzXcPskTrb4M3o="; }; - pythonImportsCheck = [ "heatshrink2" ]; + pythonImportsCheck = [ + "heatshrink2" + ]; meta = with lib; { - description = "Compression using the Heatshrink algorithm in Python 3."; + description = "Compression using the Heatshrink algorithm"; homepage = "https://github.com/eerimoq/pyheatshrink"; license = licenses.isc; maintainers = with maintainers; [ prusnak ]; From 3d16ae44d4cdd87eb7ea16d54c5396c523a537d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jun 2023 20:55:51 +0200 Subject: [PATCH 028/143] python311Packages.decli: 0.5.2 -> 0.6.1 Changelog: https://github.com/woile/decli/blob/v0.6.1/CHANGELOG.md --- .../python-modules/decli/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/decli/default.nix b/pkgs/development/python-modules/decli/default.nix index 2926d2d10287..376b011f0f46 100644 --- a/pkgs/development/python-modules/decli/default.nix +++ b/pkgs/development/python-modules/decli/default.nix @@ -1,22 +1,34 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "decli"; - version = "0.5.2"; + version = "0.6.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8s3lUDSnXIGcYwx2VahExhLyWYxCwhKZFgRl32rUY60="; + hash = "sha256-7YjMuUdwHo5VCbeUX9pW4VDirHSmnyXUeshe8wqwwPA="; }; - pythonImportsCheck = [ "decli" ]; + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "decli" + ]; meta = with lib; { description = "Minimal, easy to use, declarative command line interface tool"; homepage = "https://github.com/Woile/decli"; + changelog = "https://github.com/woile/decli/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; From b7d65a106b80c27805fd10b3cfdb9f34f61ce0da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 30 Jun 2023 21:00:07 +0200 Subject: [PATCH 029/143] python311Packages.decli: enable tests --- .../python-modules/decli/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/decli/default.nix b/pkgs/development/python-modules/decli/default.nix index 376b011f0f46..a1d6e0db2ead 100644 --- a/pkgs/development/python-modules/decli/default.nix +++ b/pkgs/development/python-modules/decli/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub +, pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -12,15 +13,21 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-7YjMuUdwHo5VCbeUX9pW4VDirHSmnyXUeshe8wqwwPA="; + src = fetchFromGitHub { + owner = "woile"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-FZYKNKkQExx/YBn5y/W0+0aMlenuwEctYTL7LAXMZGE="; }; nativeBuildInputs = [ setuptools ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "decli" ]; From 77d98ded4f5c083dfdc2fe93c6ec7c266a511763 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Jun 2023 19:34:53 +0000 Subject: [PATCH 030/143] vitess: 16.0.2 -> 17.0.0 --- pkgs/development/tools/database/vitess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index e5743e8e2e4b..192b29c15227 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "16.0.2"; + version = "17.0.0"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-8nFvNO+zb7Z0g2BMnlk+obDolCQrlfClOIg0mPW8gAU="; + hash = "sha256-J/lvOP8MsHOWnq7kKRqIktME0ewtilkyOv8pD1wSnPc="; }; - vendorHash = "sha256-hC0skrEDXn6SXjH75ur77I0pHnGSURErAy97lmVvqro="; + vendorHash = "sha256-QcCgDOqKSI+NPCdQJY4v6qU31nLQPIF8fs2qkLOk+DU="; buildInputs = [ sqlite ]; From 0fdae315315686d180d924a7c33066fbc5b4c14d Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jun 2023 17:30:32 +0300 Subject: [PATCH 031/143] stdenv: let overrideAttrs accept attrset OR function Makes overrideAttrs usable in the same way that `override` can be used. It allows the first argument of `overrideAttrs` to be either a function or an attrset, instead of only a function: hello.overrideAttrs (old: { postBuild = "echo hello"; }) hello.overrideAttrs { postBuild = "echo hello"; } Previously only the first example was possible. Co-authored-by: adisbladis Co-authored-by: matthewcroughan --- doc/using/overrides.chapter.md | 16 ++++++++++++---- pkgs/stdenv/generic/make-derivation.nix | 2 +- pkgs/test/overriding.nix | 5 +++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md index 198b4504197d..b251cce4f4d4 100644 --- a/doc/using/overrides.chapter.md +++ b/doc/using/overrides.chapter.md @@ -36,15 +36,15 @@ In the first example, `pkgs.foo` is the result of a function call with some defa The function `overrideAttrs` allows overriding the attribute set passed to a `stdenv.mkDerivation` call, producing a new derivation based on the original one. This function is available on all derivations produced by the `stdenv.mkDerivation` function, which is most packages in the nixpkgs expression `pkgs`. -Example usage: +Example usages: ```nix -helloWithDebug = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: { - separateDebugInfo = true; +helloBar = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: { + pname = previousAttrs.pname + "-bar"; }); ``` -In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`, while all other attributes will be retained from the original `hello` package. +In the above example, "-bar" is appended to the pname attribute, while all other attributes will be retained from the original `hello` package. The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`. @@ -52,6 +52,14 @@ The argument `finalAttrs` refers to the final attributes passed to `mkDerivation If only a one-argument function is written, the argument has the meaning of `previousAttrs`. +```nix +helloWithDebug = pkgs.hello.overrideAttrs { + separateDebugInfo = true; +}; +``` + +In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`. Function arguments can be omitted if there is no need to access previousAttrs or finalAttrs. + ::: {.note} Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing). ::: diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 40ad357739b7..d3593b6e8092 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -41,7 +41,7 @@ let else x; in makeDerivationExtensible - (self: let super = rattrs self; in super // f self super); + (self: let super = rattrs self; in super // (if builtins.isFunction f0 || f0?__functor then f self super else f0)); finalPackage = mkDerivationSimple overrideAttrs args; diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix index edc1b27cf4f1..7838f637f313 100644 --- a/pkgs/test/overriding.nix +++ b/pkgs/test/overriding.nix @@ -21,6 +21,11 @@ let expr = repeatedOverrides.entangled.pname == "a-better-figlet-with-blackjack"; expected = true; }) + ({ + name = "overriding-using-only-attrset"; + expr = (pkgs.hello.overrideAttrs { pname = "hello-overriden"; }).pname == "hello-overriden"; + expected = true; + }) ]; addEntangled = origOverrideAttrs: f: From fb643f3260823fa715cee14c2741dbdbfc522dc0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jun 2023 17:45:18 +0300 Subject: [PATCH 032/143] doc/using/overrides: it is possible to use previous arguments in .override --- doc/using/overrides.chapter.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md index b251cce4f4d4..060bf051b929 100644 --- a/doc/using/overrides.chapter.md +++ b/doc/using/overrides.chapter.md @@ -16,6 +16,12 @@ Example usages: pkgs.foo.override { arg1 = val1; arg2 = val2; ... } ``` +It's also possible to access the previous arguments. + +```nix +pkgs.foo.override (previous: { arg1 = previous.arg1; ... }) +``` + ```nix From d448321ac0d980aaa3a83682d15fc19c4c417a17 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 30 Jun 2023 16:38:14 -0400 Subject: [PATCH 033/143] projectable: 1.2.0 -> 1.3.0 Diff: https://github.com/dzfrias/projectable/compare/1.2.0...1.3.0 Changelog: https://github.com/dzfrias/projectable/releases/tag/1.3.0 --- pkgs/applications/file-managers/projectable/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/projectable/default.nix b/pkgs/applications/file-managers/projectable/default.nix index 7ef32c5c48af..8f2a131ce7c9 100644 --- a/pkgs/applications/file-managers/projectable/default.nix +++ b/pkgs/applications/file-managers/projectable/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "projectable"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "dzfrias"; repo = "projectable"; rev = version; - hash = "sha256-mN8kqh17qGJWOwrdH9fCPApFQBbgCs6FaVg38SNJGP0="; + hash = "sha256-yN4OA3glRCzjk87tTadwlhytMoh6FM/ke37BsX4rStQ="; }; - cargoHash = "sha256-SQ117gFkqex3GFl7RnorSfPo7e0Eefg1l3L0Vyi/tpU="; + cargoHash = "sha256-GGoL681Lv3sXnao2WfhLy4VMgtJFFttzn68lArQO1Uc="; nativeBuildInputs = [ pkg-config From b9b078309ae4d0d4b7b30c3c7553a5739ef9666a Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 30 Jun 2023 23:45:00 +0200 Subject: [PATCH 034/143] global: 6.6.7 -> 6.6.10 ChangeLog: https://cvs.savannah.gnu.org/viewvc/global/global/NEWS?view=markup&pathrev=VERSION-6_6_10 --- pkgs/development/tools/misc/global/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 70ec9278ae13..ed0596fef8a0 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,24 +6,24 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.7"; + version = "6.6.10"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "sha256-aaD3f1OCfFVoF2wdOCFm3zYedCY6BH8LMFiqLyrVijw="; + hash = "sha256-LdHmqUXpPAE5D7lBpOaU9McbvXVp1kFJwE6Se79NzOg="; }; nativeBuildInputs = [ libtool makeWrapper ]; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses sqlite ]; propagatedBuildInputs = [ pygments ]; configureFlags = [ "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" - "--with-ncurses=${ncurses.dev}" - "--with-sqlite3=${sqlite.dev}" + "--with-ncurses=${ncurses}" + "--with-sqlite3" "--with-exuberant-ctags=${ctags}/bin/ctags" "--with-universal-ctags=${universal-ctags}/bin/ctags" "--with-posix-sort=${coreutils}/bin/sort" @@ -57,5 +57,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub peterhoeg ]; platforms = platforms.unix; + changelog = "https://cvs.savannah.gnu.org/viewvc/global/global/NEWS?view=markup&pathrev=VERSION-${lib.replaceStrings [ "." ] [ "_" ] version}"; }; } From 56963d1234c2355312dde54b78fdedf85bdadc1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 00:03:16 +0200 Subject: [PATCH 035/143] commitizen: 2.42.1 -> 3.5.2 Diff: commitizen-tools/commitizen@refs/tags/v2.42.1...3.5.2 Changelog: https://github.com/commitizen-tools/commitizen/blob/v3.5.2/CHANGELOG.md --- .../version-management/commitizen/default.nix | 86 +++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 34 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index ab15b09a4d18..7cdcc5bf812b 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -1,79 +1,60 @@ -{ buildPythonApplication -, charset-normalizer -, colorama +{ lib , commitizen -, decli , fetchFromGitHub , git -, jinja2 -, lib -, packaging -, poetry-core -, py -, pytest-freezer -, pytest-mock -, pytest-regressions -, pytestCheckHook -, pyyaml -, questionary -, termcolor +, python3 , testers -, tomlkit -, typing-extensions -, argcomplete -, nix-update-script -, pre-commit }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "2.42.1"; + version = "3.5.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; - rev = "v${version}"; - hash = "sha256-lrZfMqmslwx3B2WkvFosm3EmCHgpZEA/fOzR6UYf6f8="; + rev = "refs/tags/v${version}"; + hash = "sha256-4m3NCnGUX9lHCk6czwzxXLqf8GLi2u2A/crBZYTyplA="; }; - format = "pyproject"; + pythonRelaxDeps = [ + "decli" + ]; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'charset-normalizer = "^2.1.0"' 'charset-normalizer = "*"' \ - --replace 'argcomplete = ">=1.12.1,<2.1"' 'argcomplete = ">=1.12.1"' - ''; - - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ + argcomplete charset-normalizer - termcolor - questionary colorama decli - tomlkit + importlib-metadata jinja2 - pyyaml - argcomplete - typing-extensions packaging + pyyaml + questionary + termcolor + tomlkit + ]; + + nativeCheckInputs = with python3.pkgs; [ + argcomplete + deprecated + git + py + pytest-freezer + pytest-mock + pytest-regressions + pytestCheckHook ]; doCheck = true; - nativeCheckInputs = [ - pre-commit - py - pytestCheckHook - pytest-freezer - pytest-mock - pytest-regressions - argcomplete - git - ]; - - # the tests require a functional git installation + # The tests require a functional git installation # which requires a valid HOME directory. preCheck = '' export HOME="$(mktemp -d)" @@ -101,7 +82,6 @@ buildPythonApplication rec { package = commitizen; command = "cz version"; }; - updateScript = nix-update-script { }; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd9f78d1f96c..0de1d219bedf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4408,7 +4408,7 @@ with pkgs; comma = callPackage ../tools/package-management/comma { }; - commitizen = python3Packages.callPackage ../applications/version-management/commitizen { }; + commitizen = callPackage ../applications/version-management/commitizen { }; common-licenses = callPackage ../data/misc/common-licenses { }; From ae75dfca126c8d1fce6ae6e5831f9c1830c96101 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Jun 2023 23:10:13 +0000 Subject: [PATCH 036/143] fulcio: 1.3.1 -> 1.3.2 --- pkgs/tools/security/fulcio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index d1c1da21058d..945524f9fdde 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d9PTio6BYJ+WmHH53NRFBI1BG/aOM+BauV398FKaQg0="; + sha256 = "sha256-MkvHztIpPVUPeJbPOgeKbYCqXJHkOzmu4u5WdMaFL50="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-RnCQ0KKT1azPZGPwbtRBLxNMng2mnYVT7xBI3Cxm9Q0="; + vendorHash = "sha256-v027osOhD83tNjGfsJ6LDU4BVDBZVKRsc1ceF49G02c="; nativeBuildInputs = [ installShellFiles ]; From 8e8cd4ef411b22d9f1efaffea9fddab20622861b Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sat, 1 Jul 2023 09:55:11 +1000 Subject: [PATCH 037/143] maintainers.openstack: remove emilytrau --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 249d39ef2fde..ceb7989ed14e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -632,7 +632,6 @@ with lib.maintainers; { openstack = { members = [ - emilytrau SuperSandro2000 ]; scope = "Maintain the ecosystem around OpenStack"; From 0000092757f3b1a262e9910a0bdfb92df644a293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 1 Jul 2023 03:39:22 +0200 Subject: [PATCH 038/143] parquet-tools: disable sensitive test --- pkgs/tools/misc/parquet-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index 38a71dd02a13..10247064cd97 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -56,6 +56,8 @@ buildPythonApplication rec { # These tests try to read Python code as parquet and fail "test_local_wildcard" "test_local_and_s3_wildcard_files" + # test file is 2 bytes bigger than expected + "test_excute_simple" ]; pythonImportsCheck = [ From b2c352f6b5d4598e019f11e96af59643f3df179f Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 30 Jun 2023 22:09:53 -0400 Subject: [PATCH 039/143] protox: init at 0.4.1 https://github.com/andrewhickman/protox --- .../development/tools/misc/protox/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/misc/protox/default.nix diff --git a/pkgs/development/tools/misc/protox/default.nix b/pkgs/development/tools/misc/protox/default.nix new file mode 100644 index 000000000000..6875292d241b --- /dev/null +++ b/pkgs/development/tools/misc/protox/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "protox"; + version = "0.4.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-n72Fvdo6LLk8pzYS2/5zk+dbsLRPAm6NZ5DsMRyHCTY="; + }; + + cargoHash = "sha256-wW4UcC3QAtriLEiXPndP+tZATftWP7ySavpIV6cGVCA="; + + buildFeatures = [ "bin" ]; + + # tests are not included in the crate source + doCheck = false; + + meta = with lib; { + description = "A rust implementation of the protobuf compiler"; + homepage = "https://github.com/andrewhickman/protox"; + changelog = "https://github.com/andrewhickman/protox/blob/${version}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b42eeb42cdb..7d3617d0bb64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19367,6 +19367,8 @@ with pkgs; procodile = callPackage ../tools/system/procodile { }; + protox = callPackage ../development/tools/misc/protox { }; + proxmove = callPackage ../tools/admin/proxmove { }; pry = callPackage ../development/tools/pry { }; From 15c6a9fffd3237b79f01d45c1322b36b67803401 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 02:27:46 +0000 Subject: [PATCH 040/143] python311Packages.dparse: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/dparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index 72c372e5aa78..6c0240d3b0b9 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dparse"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-1FJVvaIfmYvH3fKv1eYlBbphNHVrotQqhMVrCCZhTf4="; + hash = "sha256-J7uLS8rv7DmXaXuj9uBrJEcgC6JzwLCFw9ASoEVxtSg="; }; propagatedBuildInputs = [ From 7eec1ead92df7a5b1e084a655bf4f3c21d29aa8c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Jul 2023 04:20:00 +0000 Subject: [PATCH 041/143] twspace-crawler: 1.11.13 -> 1.12.1 Diff: https://github.com/HitomaruKonpaku/twspace-crawler/compare/v1.11.13...21d305a63e7d70c5fd441ae80e4908383655508a --- pkgs/tools/misc/twspace-crawler/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/twspace-crawler/default.nix b/pkgs/tools/misc/twspace-crawler/default.nix index eead04e0138c..1d7444fb875f 100644 --- a/pkgs/tools/misc/twspace-crawler/default.nix +++ b/pkgs/tools/misc/twspace-crawler/default.nix @@ -2,21 +2,21 @@ buildNpmPackage rec { pname = "twspace-crawler"; - version = "1.11.13"; + version = "1.12.1"; src = fetchFromGitHub { owner = "HitomaruKonpaku"; repo = "twspace-crawler"; - rev = "v${version}"; - hash = "sha256-MGFVIQDb++oVbTQubl7CNYwT/ofTNFQfFiveXcNgQpA="; + rev = "21d305a63e7d70c5fd441ae80e4908383655508a"; # version not tagged + hash = "sha256-VVA3Yer+2TdDlevOfYVi3plXiZd7TA1/ijPp2WfjNPo="; }; - npmDepsHash = "sha256-zKy/DngBwnfUqG6JfCULoDIrg1V16hX0Q4zNz45z888="; + npmDepsHash = "sha256-6AsHmEoKSZBjTA2JUeu9A/ZDl914yDw7ePes/GKclw8="; meta = with lib; { description = "Script to monitor & download Twitter Spaces 24/7"; homepage = "https://github.com/HitomaruKonpaku/twspace-crawler"; - changelog = "https://github.com/HitomaruKonpaku/twspace-crawler/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/HitomaruKonpaku/twspace-crawler/blob/${src.rev}/CHANGELOG.md"; license = licenses.isc; maintainers = [ maintainers.marsam ]; }; From 58e8f741483814ded31383b86bc8b3ebde889388 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Jul 2023 04:20:00 +0000 Subject: [PATCH 042/143] esbuild: 0.18.10 -> 0.18.11 Diff: https://github.com/evanw/esbuild/compare/v0.18.10...v0.18.11 Changelog: https://github.com/evanw/esbuild/blob/v0.18.11/CHANGELOG.md --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 4e95b02bfb7b..228439bdee63 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.18.10"; + version = "0.18.11"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-mJ6q/Ccg7Lm6OXncLnA7QAyiDS/tZJJqobPG+shGPJQ="; + hash = "sha256-j1hOzSqnEmbatfIxOnS551gXTjJp09Qw1A1R6k1cWN8="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 4fe02d87656cee30f15d062b8bf491d57dde813f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Jul 2023 04:20:00 +0000 Subject: [PATCH 043/143] millet: 0.12.0 -> 0.12.2 Diff: https://github.com/azdavis/millet/compare/v0.12.0...v0.12.2 Changelog: https://github.com/azdavis/millet/raw/v0.12.2/docs/CHANGELOG.md --- .../tools/language-servers/millet/Cargo.lock | 72 +++++++++---------- .../tools/language-servers/millet/default.nix | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index d77d8c39878e..bffb17a54656 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.12.0" +version = "0.12.2" dependencies = [ "config", "diagnostic", @@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.0" +version = "0.12.2" dependencies = [ "fast-hash", "str-util", @@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "cm-syntax" -version = "0.12.0" +version = "0.12.2" dependencies = [ "lex-util", "paths", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.0" +version = "0.12.2" dependencies = [ "fast-hash", "serde", @@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.0" +version = "0.12.2" dependencies = [ "fast-hash", "once_cell", @@ -415,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.0" +version = "0.12.2" dependencies = [ "cm-syntax", "config", @@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.0" +version = "0.12.2" dependencies = [ "analysis", "anyhow", @@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.0" +version = "0.12.2" [[package]] name = "libc" @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.0" +version = "0.12.2" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.0" +version = "0.12.2" dependencies = [ "anyhow", "env_logger", @@ -622,7 +622,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.0" +version = "0.12.2" dependencies = [ "fast-hash", "paths", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.0" +version = "0.12.2" dependencies = [ "config", "diagnostic", @@ -657,7 +657,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.0" +version = "0.12.2" dependencies = [ "lex-util", "paths", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.12.0" +version = "0.12.2" dependencies = [ "better-panic", ] @@ -923,7 +923,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.0" +version = "0.12.2" dependencies = [ "fast-hash", "str-util", @@ -931,14 +931,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.0" +version = "0.12.2" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.0" +version = "0.12.2" dependencies = [ "fast-hash", "fmt-util", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.0" +version = "0.12.2" dependencies = [ "config", "pretty_assertions", @@ -965,7 +965,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.0" +version = "0.12.2" dependencies = [ "config", "elapsed", @@ -979,7 +979,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.0" +version = "0.12.2" dependencies = [ "fast-hash", "once_cell", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.0" +version = "0.12.2" dependencies = [ "la-arena", "sml-lab", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.0" +version = "0.12.2" dependencies = [ "config", "cov-mark", @@ -1014,14 +1014,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.0" +version = "0.12.2" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.0" +version = "0.12.2" dependencies = [ "cov-mark", "diagnostic", @@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.12.0" +version = "0.12.2" dependencies = [ "fast-hash", "sml-comment", @@ -1045,11 +1045,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.0" +version = "0.12.2" [[package]] name = "sml-parse" -version = "0.12.0" +version = "0.12.2" dependencies = [ "diagnostic", "event-parse", @@ -1061,14 +1061,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.0" +version = "0.12.2" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.0" +version = "0.12.2" dependencies = [ "num-bigint", "num-traits", @@ -1077,7 +1077,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.0" +version = "0.12.2" dependencies = [ "chain-map", "config", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.0" +version = "0.12.2" dependencies = [ "chain-map", "code-h2-md-map", @@ -1119,7 +1119,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.0" +version = "0.12.2" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1127,7 +1127,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.0" +version = "0.12.2" dependencies = [ "char-name", "code-h2-md-map", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.0" +version = "0.12.2" dependencies = [ "fast-hash", "sml-hir", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.0" +version = "0.12.2" dependencies = [ "analysis", "cm-syntax", @@ -1552,7 +1552,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.12.0" +version = "0.12.2" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 11aad10e0f91..e35e8c69defb 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-WoawuH0fuhVrTEtcdfkKpJUQBcbMnbybDST4DDkJEqM="; + hash = "sha256-qfBDwbAbj4XoZeH0hyS09iUfg0G1X1RjpVOSd+2twT0="; }; cargoLock = { From 53fcee79c85287cb6f2c4ae77df8367d2f727596 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Jul 2023 04:20:00 +0000 Subject: [PATCH 044/143] arti: 1.1.5 -> 1.1.6 Diff: https://gitlab.torproject.org/tpo/core/arti/-/compare/arti-v1.1.5...arti-v1.1.6 Changelog: https://gitlab.torproject.org/tpo/core/arti/-/raw/arti-v1.1.6/CHANGELOG.md --- pkgs/tools/security/arti/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index f7945cdedd3d..e0b553a8e441 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-FrawcoE+cUhRq9NPpSspUuk0ZPjnJcmDHD25syV/18E="; + sha256 = "sha256-6VmpBt1KxWRdZJLVPNeqETQnZITGoX+rz29eIiOnHnU="; }; - cargoHash = "sha256-34qNdizJ89fo/6AQXuB8FqvYSv/Zy5N+gXX9Yl5sywM="; + cargoHash = "sha256-Q/1zgfF1v3D5Mg+JhS0K9mF4BN9xHV2tf7AtsBHZGh0="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 0202c5347256d869ee39ff5d97bdbcb1043f49a6 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Jul 2023 05:14:18 +0000 Subject: [PATCH 045/143] buf: 1.21.0 -> 1.23.1 --- 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 7342697ca32c..02feb124c519 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.21.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-7aS48tfONrDdE+NoTpoz+5TOBDQfEgCwKKkoBnrUTW8="; + hash = "sha256-6Zp4QuH0wJQCt8w2230Ugrds8tFmnCcICxgWJiqTBWc="; }; - vendorHash = "sha256-zk7cj3DwfaZg7PRS50qw0tS8lguX4yWcCiPk+2HYah8="; + vendorHash = "sha256-e4frrLrG6OxOUcr5iqY+QEokdy95glmc3Rw2HPWUPEI="; patches = [ # Skip a test that requires networking to be available to work. From fed733188dccff7ff2748f385982cf4f41f98158 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 1 Jul 2023 14:31:30 +0900 Subject: [PATCH 046/143] python310Packages.rabbitpy: remove rabbitpy is unmaintained and broken --- .../python-modules/rabbitpy/default.nix | 47 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/development/python-modules/rabbitpy/default.nix diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix deleted file mode 100644 index 9287c72441cc..000000000000 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, mock -, nose -, pamqp -}: - -buildPythonPackage rec { - version = "2.0.1"; - pname = "rabbitpy"; - - # No tests in the pypi tarball, so we directly fetch from git - src = fetchFromGitHub { - owner = "gmr"; - repo = pname; - rev = version; - sha256 = "0m5z3i3d5adrz1wh6y35xjlls3cq6p4y9p1mzghw3k7hdvg26cck"; - }; - - propagatedBuildInputs = [ pamqp ]; - nativeCheckInputs = [ mock nose ]; - - checkPhase = '' - runHook preCheck - rm tests/integration_tests.py # Impure tests requiring network - nosetests tests - runHook postCheck - ''; - - postPatch = '' - # See: https://github.com/gmr/rabbitpy/issues/118 - substituteInPlace setup.py \ - --replace 'pamqp>=2,<3' 'pamqp' - ''; - - meta = with lib; { - description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; - homepage = "https://pypi.python.org/pypi/rabbitpy"; - license = licenses.bsd3; - - # broken by pamqp==3, tracked in - # https://github.com/gmr/rabbitpy/issues/125 - broken = true; - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5d4a015ff530..91e78eae47f2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -283,6 +283,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 Quandl = quandl; # added 2023-02-19 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; + rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 retworkx = rustworkx; # added 2023-05-14 repeated_test = repeated-test; # added 2022-11-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d36f88d764a..977984700fa4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10498,8 +10498,6 @@ self: super: with self; { r2pipe = callPackage ../development/python-modules/r2pipe { }; - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; - rachiopy = callPackage ../development/python-modules/rachiopy { }; radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { From 8d88b37bdb37a7a1ea2029708978c869c959b1b3 Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Sat, 1 Jul 2023 01:31:45 -0400 Subject: [PATCH 047/143] fpattern: init at v1.9 --- .../libraries/fpattern/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/fpattern/default.nix diff --git a/pkgs/development/libraries/fpattern/default.nix b/pkgs/development/libraries/fpattern/default.nix new file mode 100644 index 000000000000..b0ab2c3d2cea --- /dev/null +++ b/pkgs/development/libraries/fpattern/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation (finalAttrs: { + version = "1.9"; + pname = "fpattern"; + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "Loadmaster"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-/QvMQCmoocaXfDm3/c3IAPyfZqR6d7IiJ9UoFKZTpVI="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out $dev/include + cp *.c *.h $dev/include + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/Loadmaster/fpattern"; + description = "Filename pattern matching library functions for DOS, Windows, and Unix"; + license = licenses.mit; + maintainers = with maintainers; [ hughobrien ]; + platforms = with platforms; linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85950f1e450..c628635d9b35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7846,6 +7846,8 @@ with pkgs; fpart = callPackage ../tools/misc/fpart { }; + fpattern = callPackage ../development/libraries/fpattern { }; + fping = callPackage ../tools/networking/fping { }; fpm = callPackage ../tools/package-management/fpm { }; From 61925cc7737f1805c1fa3d6ae83bb630881e7a2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 05:40:54 +0000 Subject: [PATCH 048/143] vgmtools: unstable-2023-05-04 -> unstable-2023-06-29 --- pkgs/tools/audio/vgmtools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix index 2300609beea1..857bf7c503f3 100644 --- a/pkgs/tools/audio/vgmtools/default.nix +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2023-05-04"; + version = "unstable-2023-06-29"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "0a7814304b9664ff1cf167e209ff354d222773a4"; - hash = "sha256-YEOuT5RN0zFT7rU4KfxYS0Ec+rUL3Flsgx9IrELnhGg="; + rev = "e1f3e053e390bde6bd53b81bd853a0298ccb0ab4"; + hash = "sha256-evIvW9Nk9g7R+EmaQXLmr0ecpAS5Ashditk3komBwyw="; }; nativeBuildInputs = [ From 2fcb62cd72cad8cfbd2f35152be067127c46a886 Mon Sep 17 00:00:00 2001 From: Earth Engine Date: Sat, 1 Jul 2023 05:54:22 +0000 Subject: [PATCH 049/143] flowgger: init at 0.3.1 --- pkgs/tools/misc/flowgger/default.nix | 42 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/misc/flowgger/default.nix diff --git a/pkgs/tools/misc/flowgger/default.nix b/pkgs/tools/misc/flowgger/default.nix new file mode 100644 index 000000000000..a57398ae660b --- /dev/null +++ b/pkgs/tools/misc/flowgger/default.nix @@ -0,0 +1,42 @@ +{ lib +, rustPlatform +, stdenv +, fetchCrate +, pkg-config +, openssl +, capnproto +, CoreServices +}: + +rustPlatform.buildRustPackage rec { + pname = "flowgger"; + version = "0.3.1"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-PRlcfSVfQWt+rQEJjblY7/AMrjhGYO2/G7EX60aGApA="; + }; + + cargoHash = "sha256-hp2LrEVWo0gk95dPROqVcHEEG5N9fWms0mZkY9QILg0="; + + nativeBuildInputs = [ + pkg-config + capnproto + ]; + + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin CoreServices; + + checkFlags = [ + # test failed + "--skip=flowgger::encoder::ltsv_encoder::test_ltsv_full_encode_multiple_sd" + "--skip=flowgger::encoder::ltsv_encoder::test_ltsv_full_encode_no_sd" + ]; + + meta = with lib; { + homepage = "https://github.com/awslabs/flowgger"; + description = "A fast, simple and lightweight data collector written in Rust"; + license = licenses.bsd2; + maintainers = with maintainers; [ earthengine ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 840aa77ae1b1..72b4b16b3e1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5033,6 +5033,10 @@ with pkgs; flitter = callPackage ../tools/misc/flitter { }; + flowgger = callPackage ../tools/misc/flowgger { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + frangipanni = callPackage ../tools/text/frangipanni { }; frawk = callPackage ../tools/text/frawk { }; From 1af3bc22aed6856492dcfa4b6528565b3c22f3dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 06:18:20 +0000 Subject: [PATCH 050/143] python310Packages.qutip: 4.7.1 -> 4.7.2 --- pkgs/development/python-modules/qutip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 0357cfec22cd..00884692c421 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qutip"; - version = "4.7.1"; + version = "4.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-W5iqRWAB6D1Dnxz0Iyl7ZmP3yrXvLyV7BdBdIgFCiQY="; + hash = "sha256-qItj+MSiFKBgRiz/1+AWsmMzdaQs6rFT1FWWHbReudY="; }; nativeBuildInputs = [ From 91b5ea6ac60ccd6fafc83e9e731f1f21b984a78a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 1 Jul 2023 08:38:52 +0200 Subject: [PATCH 051/143] vimPlugins.quickmath-nvim: init at 2023-03-12 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 967ae5793c6f..e2fdb18b72f8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -674,6 +674,7 @@ https://github.com/AlphaTechnolog/pywal.nvim/,, https://github.com/unblevable/quick-scope/,, https://github.com/stefandtw/quickfix-reflector.vim/,, https://github.com/dannyob/quickfixstatus/,, +https://github.com/jbyuki/quickmath.nvim/,HEAD, https://github.com/luochen1990/rainbow/,, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, From 46e817f799fb57c8a7af05bac94309b07877f415 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 1 Jul 2023 08:41:01 +0200 Subject: [PATCH 052/143] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 252 +++++++++--------- 1 file changed, 132 insertions(+), 120 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index cedbd2bee7c7..735c515f6257 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-06-29"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "0e33010937d9f759d5f6de04c2ef6f2340ff1483"; - sha256 = "034853449qa8shg4i98hazv7azz6q0vam6vgv2mvsh7fm1xi011x"; + rev = "4ba5086b3d9f9690e8fd7d93102db66173b02638"; + sha256 = "0phfi9chdwzcp3i6fk7zd4vpyn2cjrnmf5hlskdcdb9bin9fpwq3"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-06-23"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "7322390c9abff6f137774d9e04bddb3cd725afd1"; - sha256 = "1r9kqnhr3b14fs929xbh6qfrxmki961svlj2208vmlfmbsp7sx13"; + rev = "0ba3914a03a4689441170d6b6796500a09b5c189"; + sha256 = "1bh5idm700li7757il9k2wk6i84n7ghxz9753gz9d1bdw9rxkg7b"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -1975,12 +1975,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-06-29"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "f053fad7826a77860b5bc33a6076c86408f3b255"; - sha256 = "0a43zx7pxy6z3pnl7w31b9g73brpffqwigwz20bc9pasnw3x5zaw"; + rev = "a14c7501beda5d3814d498875565c754ad006693"; + sha256 = "0y6yyv5v6jx01n63q3y7phv8llw1vjn9x6qs1plagkmfwd0ldzqr"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2251,24 +2251,24 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-06-29"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "686670843e6f555b8a42fb0a269c1bbaee745421"; - sha256 = "00nrc6ywmc51gh6pphdhxlanw03vn9r6xxlm2lx7f8yf1gpg3ajn"; + rev = "e48bd7020a98be217d85c006a298656294fd6210"; + sha256 = "1fx8pm1jk6hvbf2r0bhd4sls3pdj2jfsl7rj0rzsfrwan9slagwl"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2023-06-23"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "98c293994f1bbebd5bade5d5840ead3b2feb5074"; - sha256 = "1wm36wba1pcmr0slmdvgjixm587sm13zcsdrc2cykra54p87ky2m"; + rev = "a4a6d6b3f9e284e7f5c849619e06cd228cad8abd"; + sha256 = "1ychdiz76xrhras9fynzf5sb5cragv8lxyv3gpmjy8grb8znwyzq"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2287,12 +2287,12 @@ final: prev: coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-06-28"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "f4b97c68bcd217e6aebc301c69deb125ea6f390f"; - sha256 = "1fjigaark1lkdavdrxgm4szywif10lsvalrcgah4rf6vaz48lndb"; + rev = "4b252a3eea17b2c69f3fbd1f675c0b4bf55f1961"; + sha256 = "18r90dx7zlznjkgiqmafppa93jh6ag4bnfq2q88dawrkjya35y2r"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2311,12 +2311,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-06-29"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "5f51b80d08321fb0854f71b663aeca1828895835"; - sha256 = "1q3d1gq6cj51a7va10mv8ljsrn6yy8xs9k2fwp7p4g8sgfacdv8n"; + rev = "8f8fa1a00360eedc9c57c3dec605907a5b075439"; + sha256 = "1hr85665fgnhjmkn73xgcyj7h2x45bj8mi228qbsyhzl24ldrh2s"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2937,12 +2937,12 @@ final: prev: dropbar-nvim = buildVimPluginFrom2Nix { pname = "dropbar.nvim"; - version = "2023-06-25"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "2cc0381cd7ef1d69d289a36715a3ea817bee2691"; - sha256 = "137hn2v4yzsapq35ad3vx1xnq1i3vf867wnq5j94c8kp7bivjff7"; + rev = "02ec281110859185c3c09203245c3e42b359dfcb"; + sha256 = "0dhag2z5ghhifdjr4d2ixbxig2fnhh8x18psjyd35rf2c9ifrafj"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -2985,12 +2985,12 @@ final: prev: edgy-nvim = buildVimPluginFrom2Nix { pname = "edgy.nvim"; - version = "2023-06-21"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "c2a056a72e59d239218dd5d50848851fba33a378"; - sha256 = "14ibg69jbwz67fflhlvay15csy6l3py0j8mhjd6nc7xghp4pnpcp"; + rev = "422dbda0f3a074475947b2338f06889da6606e32"; + sha256 = "106cr80l4y0m2ljw11dpgv0di7pkq0yinmhmhbn5pg6bivn025wv"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3022,12 +3022,12 @@ final: prev: elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-06-26"; + version = "2023-06-29"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "2ede39073ce5f2a1c861c5b213122d99e655a493"; - sha256 = "086qxhax858ibdg9f8p656vbyy2c81f2g0cswhmvqvi6mmrip3y3"; + rev = "bb9f59b2b51612bc99c2f1efbc6c5241b3213286"; + sha256 = "1q1hivrvbcf48ryldpr6g5b839fyyqz7fs750bsny2mq5v11bq2y"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3119,12 +3119,12 @@ final: prev: eyeliner-nvim = buildVimPluginFrom2Nix { pname = "eyeliner.nvim"; - version = "2023-06-27"; + version = "2023-06-29"; src = fetchFromGitHub { owner = "jinh0"; repo = "eyeliner.nvim"; - rev = "0b21a862fa0782090350c13c8b32ccd58adc4d82"; - sha256 = "16qx8nlwrbgpdypp4s052gk166k5bq2258i8728ri7ikqbj6vm1a"; + rev = "a6c05ed7f2a59640bd18ff0702694deda483a08e"; + sha256 = "1clla449ab1r71hwi9f96vf7l7ixqizvmh9vapcl7605p6iy6mny"; }; meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; @@ -3276,12 +3276,12 @@ final: prev: flash-nvim = buildVimPluginFrom2Nix { pname = "flash.nvim"; - version = "2023-06-29"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "cdf8f0e07527657b7cf6143f77181cac1e04419b"; - sha256 = "03izlyq8p9y80dbxd3gja667sm7rb2lm3jmzsgvqp8nf68qa7vg9"; + rev = "2950466a4f815e3e3297d8e8f03dc6fbf4dbd7c1"; + sha256 = "0mfd41mf6zjd1a6lid5vhd827rckz31a6qxiz9yvzidg6ndcyb34"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3504,12 +3504,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-06-28"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "26cc8e35ecdd02e03aeab39149187c3af3641add"; - sha256 = "1i7wps57sd87yx5zkqlck9nj5hr8ganr37dcb1cjkylx960kzij8"; + rev = "1b809d167e1b82ac1e9b2c7af2e1abc81d143708"; + sha256 = "0r278arw3airl1s58xbq2in5yz2fyiiq556ppqi8prcmgpi6cdq1"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4571,12 +4571,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-06-26"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "4c8b625bc873ca76b76eee0c28c98f1f7148f17f"; - sha256 = "0i4f49cspx78cp0bnry3h3im032fxihabgcfqagjfmgzx62psklm"; + rev = "d65d5441d997c98be8c261ca8537694c5f4642be"; + sha256 = "1pd1qxvgxx8l99g3ylnkq139aks2zs87drlbgadb978mfasz28pd"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4643,12 +4643,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-06-27"; + version = "2023-06-29"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "fa8f72c13874146953c4d07c3b24b5c00d7d7d7a"; - sha256 = "0w7cdqb5hvsrps91lvdbiyg7jqbq6q6gr97gbzsnh9ynhrgcd7vn"; + rev = "09beae8257a821a0ad4cc3f9178c3ba80067258c"; + sha256 = "0j0zd825bvyh1gm1hl65phd31g8s6k5hc5bz3v8nbyxr45pgm9kx"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5098,12 +5098,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-06-24"; + version = "2023-06-29"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "c7984d1cca3d8615e4daefc196597872a0b8d590"; - sha256 = "09bcxi7ss1j9g5f09xqqarlii77fx82sl7pnx94mfs4vcmrq4k76"; + rev = "105b5f7f72c13e682a3aa5d29eac2408ae513b22"; + sha256 = "1vb4crvs7dcasac7kdjqa58l2wjibm85r7hg47ia7pw258d575gc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5303,12 +5303,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-06-27"; + version = "2023-06-29"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "a4241b6f51393d5e4d91a12d94e386bae287dae5"; - sha256 = "03mhcvlw7nx0l9dsflj3kkg829kl5icjxdynmc3wna0cxmajp1na"; + rev = "4fd0f9c72fb54696442c81a64c71514c95239148"; + sha256 = "1x97jrh3pr1gsl2rlzl9x8lcgbj4lkq11v873mk2dh81rvw0a4d0"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5711,12 +5711,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-06-13"; + version = "2023-06-29"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "1412d2016a772aef6aea818c840eb7803ade0312"; - sha256 = "172wyky154gwwnwhlr64l29l99ssb9m2gw15jkcpkrn0pg9zyz10"; + rev = "1dd282cd64f03418ef9cc345a12ca82b8dcf6e73"; + sha256 = "0sly3hspfia8hpgdqq2dc6lylc5qbil3cxmlph27j3yy01yl1f52"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -6011,12 +6011,12 @@ final: prev: neotest-rspec = buildVimPluginFrom2Nix { pname = "neotest-rspec"; - version = "2023-05-31"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "5fe7d860def0539f7f5d375fbf9c481c097062c8"; - sha256 = "1za4ikrkd7qy2wiik6i9bxk4f1l1wffdh02sj79fh4kr294r106c"; + rev = "f5569be7d462585576eb19282aab83887ba84a6c"; + sha256 = "174gj5kxvippr52qz4glij09dand627fy3q6l02fvfdir371q3sj"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6287,12 +6287,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-06-26"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "4f4a1702a3b2677878e68111af95cc4e775322e1"; - sha256 = "0pi6hnx92d8p2bc5vrbhxqigs5qlkiiz79wpb7k5z8n0hckyvcgi"; + rev = "2cb37edea88b7baa45324ac7b791f1f1b4e48316"; + sha256 = "0xi78d2px2fx4ihnhbaqwpd8awicy6m5dfrcfdg77wra88xl65r9"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6359,12 +6359,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-06-28"; + version = "2023-06-29"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "b919452c84e461c21a79185bef90c96e1cfecff9"; - sha256 = "1liw8w2hfgk99ix4rfg1la9yb1yr36nf77ymz2042rjr0zc8qjfk"; + rev = "aac27a1fa550de3d0b2c651168167cc0d5366a9a"; + sha256 = "17ik96d969wbq460h4z834kw2kahn6a3ikqs0qbavqs7wx1p8bg3"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -6503,12 +6503,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-06-23"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0"; - sha256 = "1gz02cy11r5bdrr0bz0xl0cmph6kpb3fv4xdnsbnxzq5jwia24m9"; + rev = "2743dd989e9b932e1b4813a4927d7b84272a14e2"; + sha256 = "13k2y9ggfvpzm463dhivy70j8vpzbv8j2nmscqs1l5y0rad93bww"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6527,12 +6527,12 @@ final: prev: nvim-cokeline = buildVimPluginFrom2Nix { pname = "nvim-cokeline"; - version = "2023-06-29"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "469800429c6e71cd46ee226c40035c31bc6a6ba1"; - sha256 = "1z13lfghyb9a24myb4k1jkf75ipcxs5hnhci9bcwgz2l3smz31ww"; + rev = "02284b9987af8bc48f45d5090ca593c09773e74d"; + sha256 = "1qmi593ffa9szcv2sff4kbldijndz466m3pas38pzasrazw03cmi"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -6623,12 +6623,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-06-14"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "a6d48d23407fbad7a4c1451803b8f34cab31c441"; - sha256 = "0g1j69wja33cmin5lvrc5qwnvc37q4xnqzbl5qsyjgcjcbq08bbr"; + rev = "bb1ddce6cd951ef3c1319e4fd8596131113163c3"; + sha256 = "0jqbc4fgg7agzzfpgm80vvlfrsmpvy38mkxkpnf1kk31ig11mlms"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -6887,12 +6887,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-06-29"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "a2c8ad6c7b4e35ed33d648795dcb1e08dbd4ec01"; - sha256 = "1zqhxk33513ncc0d9ljlvfcdd0p358awdhb1n99y80l9w1qmf3n1"; + rev = "0011c435282f043a018e23393cae06ed926c3f4a"; + sha256 = "12b1gbzj84jj8k4q5d5lb30yh923711fi0b5fqlya73y39bzmffp"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7139,12 +7139,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-06-23"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "f4dc98ec45ecded2344aa3aac2d7cc43ad236858"; - sha256 = "1p2s7a18d13irrf5yg1c4hq3ffqd8a7vqr4iw70rzvllr2mwzlbm"; + rev = "6e9dfd6f0ad24074ba03fe420b2b5c59075bc205"; + sha256 = "1nm707d9gixqd739jqr201jk7qdw7kshkvvkgldrrwg4wv0gfig4"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -7211,36 +7211,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-06-25"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "3cc698b35b0a67792c61e1726830bb9ecfc4c9f4"; - sha256 = "17d329x2264qv30pnqrank0lzxx1xl49jz6fsdbcw3z050h0w03x"; + rev = "1fe32286db79719dd6e52236f82c5b52df3ccaa9"; + sha256 = "130zccj9ydfgcjcljhcpm6cpf5yn7qadb6qril3070i5kzh0gp9i"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-06-29"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4c3912dfa865e3ee97c8164322847b8b487779b2"; - sha256 = "1ma9yai44j2224migk1zjdq5dqgdj397b1ikllmhzmccwas3sdk5"; + rev = "393bc5bec591caeedb0a4c696d15946c5d6c2de8"; + sha256 = "0nl5vn7i5qaxnsdf1vycfn6f761kgbplin0pgdxf0fg75w3pnm0v"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-06-19"; + version = "2023-06-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "6eccc445394df5ab9b1c1e2c445c033949a6a784"; - sha256 = "11s97cz3xdfyw4rvwjw1ncnbvac34z5il2q5nqi68xf5hspfzs6g"; + rev = "63f3ffc50b0afc59be1015153d00922498085be8"; + sha256 = "1jvsf80q8dxhdxbphrms755aj4ak58xacpzgs91v5jb5zjcvmsx9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7450,24 +7450,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-06-15"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "f498fd88bc0d9983a7fb566fa5535f8e38b874c0"; - sha256 = "094sh9m1rzc0srh1ffabpwyw720bcyk992kniff90xhfs2i89jbv"; + rev = "22328c578bc013fa4b0cef3d00af35efe0c0f256"; + sha256 = "08ik7v5gfpy52z09wbx1rbdhcz1v1c41i5l9kx4p25rxw8g9cl8v"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-06-27"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "0138a2e0f9baacd98d5531ebb5078fafc5114fae"; - sha256 = "06kskpjhb5n59ls4wpv9a6mxyyv24zyfs7rahfb7p0jd96mnwylp"; + rev = "a5ff72a8da0df1042ee4c7705c301901062fa6d5"; + sha256 = "105ldc37iywalh82snfr3rk750hz7vszi01ipzbfzd8hqvwr930g"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7799,12 +7799,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-06-10"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "36aaceb6e93addd20b1b18f94d86aecc552f30c4"; - sha256 = "0r0z27kwpgd8ladjj86h9gmyq2mxcwbiaj3a6mi1bz2dwxqiddxb"; + rev = "102c02903c74b93c705406bf362049383abc87c8"; + sha256 = "1h0d4qz14s63h0c6g2lf89bvaj6ksn75f2wsk2z326bpnlyz255k"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8015,6 +8015,18 @@ final: prev: meta.homepage = "https://github.com/dannyob/quickfixstatus/"; }; + quickmath-nvim = buildVimPluginFrom2Nix { + pname = "quickmath.nvim"; + version = "2023-03-12"; + src = fetchFromGitHub { + owner = "jbyuki"; + repo = "quickmath.nvim"; + rev = "dcfc5450fa686714817a0d4767299f37f94bdb43"; + sha256 = "1rmbrdxz26f4b12yvb4yjb6b3rn89nky6an4wclh4c68li70h54l"; + }; + meta.homepage = "https://github.com/jbyuki/quickmath.nvim/"; + }; + rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; version = "2022-10-08"; @@ -8281,12 +8293,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2023-06-26"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "022c884978b888d5b5812052c64d0d243092155e"; - sha256 = "0i3d6di7hfgy665j7v99q2ghm62bhny9yz4w3jyd7as4wwnlqbzi"; + rev = "18c3b4d581cb0eb1a81c00a7f0d268aab842d404"; + sha256 = "1cxazg2sb9vhssih4mrmrnj7piszb2sjd2kndvr22w9pf1j6q076"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -8907,12 +8919,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2023-02-25"; + version = "2023-04-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "a3fd7bf4d61fdbe00356a646744b2fe6f97524b6"; - sha256 = "03crzap4czx1am4jsxq6c58nf6f5kg9wrmvcf9l5cic2vj5gwh6a"; + rev = "6b6cfda7ba751617599fcf3a96c1694e7924255d"; + sha256 = "1filijmx87g6yiv9bfgf89yiffqwq2qmvw5f73zfq0sh3pyxk6ja"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -9149,12 +9161,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-06-25"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "acf2eade45563803afdd4e9873a8481bc98bd726"; - sha256 = "05rrkmyk6ma08h3xqhzy2wxsj6qmdnf4ypi3dqzycklavb44r10k"; + rev = "721f716f7392284ded78b4867fa67cf4b0605945"; + sha256 = "05b383yl68mzjk149y3s5ncclml4rn9xxqsqy1by1f8x1f215x1n"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9379,12 +9391,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-06-25"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "6074847b6ee4b725747c8fc540d9b6b128ac8a12"; - sha256 = "1glqmvk5q6k3qa55lq2a39qkqbsh7hkfqx7kssl143z76g7f1w04"; + rev = "c5b11f4fe780f4acd6ed0d58575d3cb7af3e893a"; + sha256 = "11ccs7vvaa20i1lnqswqmch5sxgswwg6w4s1x5syzy9yzknxfbrk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9848,12 +9860,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-06-28"; + version = "2023-07-01"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "f30648e1a56f4c528a01e83fafbb93b05a11d4e9"; - sha256 = "0nnlwl8wm20m266b6a039h6ld254xgwqczphm8hqvqmdkr8vnfgw"; + rev = "943149be2094f2396f9575e932a74156f228602a"; + sha256 = "1w29dpc9kj1g0ryhqikagmvbip0dxvfwkh160y33a3q9v0d7zg3n"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12635,12 +12647,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2023-06-17"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "3a17944bfa3942da805a381750a1be4b314c64d2"; - sha256 = "00kc4zkr1hd8qcls3midmdb2lr205lw0r6r6gb7xc8yqvv1bcv9h"; + rev = "61cef7921ecbb412f341a6d1a7f9ad1ca55243de"; + sha256 = "0jrrvx7a6v7gxkyvyrh9wkhaaqlvww90v2lijvxwgys9iy79c4nz"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -12863,12 +12875,12 @@ final: prev: vim-nickel = buildVimPluginFrom2Nix { pname = "vim-nickel"; - version = "2023-06-19"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "vim-nickel"; - rev = "490e81372ad1e8fbd0e2d040a3300eeac0537658"; - sha256 = "1vl2gs1164q05rkj79hz4iqq8nbqfl9aa4flyyphppr6lz1392vh"; + rev = "6e91be2605b6b83d04fbdb402f205defc748d998"; + sha256 = "0n1b6l29fffsbm1hn7fj34ky4l01a9izyshsgg7wda8wq7lk2xgr"; }; meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; }; @@ -15386,12 +15398,12 @@ final: prev: catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2023-01-21"; + version = "2023-06-29"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "cf186cffa9b3b896b03e94247ac4b56994a09e34"; - sha256 = "17di30zm743sj707z8hg95z2g7687nd1wsxyyn20xy5s3f8lnx0v"; + rev = "5280d241fe6a4f4ddef17078a215b81a113388e8"; + sha256 = "1l8a7gn5wd7ry04lvm94x5s2fwf9dcl281200f5yq9ic6aw18p99"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; From f069dc92af0a13350fb3b57ab9cf746e5870c251 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 1 Jul 2023 08:41:35 +0200 Subject: [PATCH 053/143] vimPlugins: resolve github repository redirects --- pkgs/applications/editors/vim/plugins/generated.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 735c515f6257..72104fcbe8f6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6531,8 +6531,8 @@ final: prev: src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "02284b9987af8bc48f45d5090ca593c09773e74d"; - sha256 = "1qmi593ffa9szcv2sff4kbldijndz466m3pas38pzasrazw03cmi"; + rev = "bd34d316a3b4787802cb2a524d9b9d33008726b9"; + sha256 = "08kvr5891x87vhpqr2r1mn3nn0k5pyxj7g52ldzdlzdfzhdx2wwl"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; From ae9f5e2acdeee298e1bb275477ea555975feac15 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 1 Jul 2023 08:43:07 +0200 Subject: [PATCH 054/143] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 83 +++++++++++-------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 65f988e80184..1bf767888232 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -49,23 +49,23 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=8eaa762"; + version = "0.0.0+rev=16e6fd8"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "8eaa762d05cc67c0e2cc53a0a71750b3c16733c2"; - hash = "sha256-H10WU81pDlIvERF5h999B1bho1ycKO6kdEyUZFddlp4="; + rev = "16e6fd822a5efa654d0a1ad7122aa1cc5e489cff"; + hash = "sha256-TbDVyXBcg/0jzs3cFMZCRw7v2iqTfPXmRVBZM4kp0m8="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=ee2a8f9"; + version = "0.0.0+rev=4936467"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "ee2a8f9906b53a785b784ee816c0016c2b6866d2"; - hash = "sha256-dpzEuNa0371ikYmFxViYM18M/BclVoAuPWWKTgmvV8A="; + rev = "493646764e7ad61ce63ce3b8c59ebeb37f71b841"; + hash = "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -491,12 +491,12 @@ }; foam = buildGrammar { language = "foam"; - version = "0.0.0+rev=ec73f2e"; + version = "0.0.0+rev=0244495"; src = fetchFromGitHub { owner = "FoamScience"; repo = "tree-sitter-foam"; - rev = "ec73f2e317f9c09356e7be452d85671b9923a428"; - hash = "sha256-S/j4evMQiSmtA9V8GCedCHCZe8nqpE1R5zJFmzHHEQI="; + rev = "024449594c2841c944463481b741b141d1ab5727"; + hash = "sha256-GUXet7WkH4yVoLBtPmmXR4VLwQ0MjwabH2dRS963ZsY="; }; meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; @@ -819,14 +819,25 @@ }; meta.homepage = "https://github.com/antosha417/tree-sitter-hocon"; }; + hoon = buildGrammar { + language = "hoon"; + version = "0.0.0+rev=5b61ea6"; + src = fetchFromGitHub { + owner = "urbit-pilled"; + repo = "tree-sitter-hoon"; + rev = "5b61ea6129dd6841140fa0d16172ca5d105526fd"; + hash = "sha256-MY+nm0bKZXkgNCRF1/eBezll/uSfg2SnUTh7icQXuOg="; + }; + meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon"; + }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=ab91d87"; + version = "0.0.0+rev=d2592b0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "ab91d87963c47ffd08a7967b9aa73eb53293d120"; - hash = "sha256-OJ1RcYRU2A8y3taXe+sO+HnUt2o2G8tznwDzwPL0H7Y="; + rev = "d2592b006e5270a281c6bafdbcb3768cd97fa47a"; + hash = "sha256-COWv6rCcA2Km2N+D6kperFlmPr31AnWaPR6uMCWwFr4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1142,12 +1153,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=b09c27e"; + version = "0.0.0+rev=d7b24aa"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "b09c27e42732c59321604a15163480ebb4f82f1c"; - hash = "sha256-gIaHyExmgFSEe6Nm7G5NPNafWWhl50Fn1UQm35MrAuE="; + rev = "d7b24aaaf3e4814d073517d072727319d2b5ffc3"; + hash = "sha256-oODBui19Ihyy9MJ0Nj1C4Ru1MN2ooMKu+njGFjUq1ao="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1198,12 +1209,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=b1a4718"; + version = "0.0.0+rev=e1d9337"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "b1a4718601ebd29a62bf3a7fd1069a99ccf48093"; - hash = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; + rev = "e1d9337864d209898a08c26b8cd4c2dd14c15148"; + hash = "sha256-RcVBptlJ4lYwdDo64pwzxx5z90yqS96Dhyuj4VZWOiM="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1476,12 +1487,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=6ecc2b5"; + version = "0.0.0+rev=36f9e33"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "6ecc2b54b39ac390848d81dfcf5ee961f33a2f03"; - hash = "sha256-gfFD1E6hXaNU0z81VHvo0oMU9iLcyRWP6sIRj6uagYU="; + rev = "36f9e33d52b7572536ac1a8af8d7e78363ad52c3"; + hash = "sha256-pUxVuG1xjjXxVWfh6UPZ2WZ5jo3GXmWKrCHSiMnCM+M="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1641,12 +1652,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=cda0de8"; + version = "0.0.0+rev=8062487"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "cda0de8a038b0e4ad79a97f7aa281250fcf88560"; - hash = "sha256-739c8THPQchATVQqaE5sAAg2aW5x8NXyn7OUT5yDRQs="; + rev = "8062487fb3b7f3ce1bb7ce1fd1c84bed60c75203"; + hash = "sha256-nCmQjLqunccXVgmNUMbMbm6SYuwCRtf1v2CFXrgKXqo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1729,12 +1740,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=bd53a6c"; + version = "0.0.0+rev=e35a16e"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "bd53a6c482d865365cbfb034168ca78364d1d136"; - hash = "sha256-JpEi+bX2e7fo1Cgp3VZNZlsK850nBnBGBsMnt6UrQTA="; + rev = "e35a16e4b7b342de6a0fbeee108d536bb6633562"; + hash = "sha256-BNLZxpJTmAIAFqmktejHYsWJnGXx4sGFA0p3V8Ym6sc="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1920,12 +1931,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=286e90c"; + version = "0.0.0+rev=3429d8c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "286e90c32060032225f636a573d0e999f7766c97"; - hash = "sha256-lg/FxjosZkhosllT0PyCKggV1Z2V4rPdKFD4agRLeBo="; + rev = "3429d8c77d7a83e80032667f0642e6cb19d0c772"; + hash = "sha256-qMzxxCx7u8fp+LhlSg6rvK0vMa0SXnJqSc4hgLcpZ7U="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1954,12 +1965,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=286e90c"; + version = "0.0.0+rev=3429d8c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "286e90c32060032225f636a573d0e999f7766c97"; - hash = "sha256-lg/FxjosZkhosllT0PyCKggV1Z2V4rPdKFD4agRLeBo="; + rev = "3429d8c77d7a83e80032667f0642e6cb19d0c772"; + hash = "sha256-qMzxxCx7u8fp+LhlSg6rvK0vMa0SXnJqSc4hgLcpZ7U="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2099,12 +2110,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=bb54f98"; + version = "0.0.0+rev=e532784"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "bb54f98e55db82d67711abadefdbd3b933c9efc3"; - hash = "sha256-z4n4VneiCfCoEg7GHa8GAyUYAbJkoe973aPMUEheU+Y="; + rev = "e5327844f545d4b6d78d23afc97439fae2aa5944"; + hash = "sha256-8MIWnLTHVNZRrSSbibr/wb0Fd8Mu5K3Ip+5htpvGS8w="; }; location = "libs/tree-sitter-wing"; generate = true; From bdc849902634099083bf40c35b63a97f0bcb5c1c Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 30 Jun 2023 23:51:43 -0700 Subject: [PATCH 055/143] python310Packages.jaraco_collections: 3.8.0 -> 4.3.0 --- .../python-modules/jaraco_collections/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index e60da3771297..07cc11ec92e6 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , setuptools-scm , jaraco_classes , jaraco_text @@ -8,12 +9,12 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.8.0"; + version = "4.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-VjBP1L1OuNWFzgys4KyAQYeRsUCFHjdIElQbCqJ8kdA="; + hash = "sha256-dP/CP8z+5N4KLr9VajNnW2o8AD1jNZR9MSKgvIgiyOQ="; }; postPatch = '' @@ -22,9 +23,12 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + setuptools setuptools-scm ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ jaraco_classes jaraco_text @@ -39,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Models and classes to supplement the stdlib 'collections' module"; homepage = "https://github.com/jaraco/jaraco.collections"; + changelog = "https://github.com/jaraco/jaraco.collections/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 1dfe3538084d22c01af0e8c7f13df38fc0006a86 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 30 Jun 2023 23:52:11 -0700 Subject: [PATCH 056/143] python310Packages.jaraco-email: patch to work with jaraco.collections 4+ --- .../python-modules/jaraco-email/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix index b99eff746f47..6e036379b5ce 100644 --- a/pkgs/development/python-modules/jaraco-email/default.nix +++ b/pkgs/development/python-modules/jaraco-email/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , setuptools , setuptools-scm , jaraco_text @@ -26,6 +27,19 @@ buildPythonPackage rec { hash = "sha256-MR/SX5jmZvEMULgvQbh0JBZjIosNCPWl1wvEoJbdw4Y="; }; + patches = [ + (fetchpatch { + name = "dos2unix-line-endings.patch"; + url = "https://github.com/jaraco/jaraco.email/commit/ab9643598e26cca9c9cdbd34b00c972f547b9236.patch"; + hash = "sha256-Z2WOnR+ELzQciVyUiUq4jaP+Vnc4aseLP7+LWJZoOU8="; + }) + (fetchpatch { + name = "jaraco-collections-4-compatibility.patch"; + url = "https://github.com/jaraco/jaraco.email/commit/e65e5fed0178ddcd009d16883b381c5582f1a9df.patch"; + hash = "sha256-mKxa0ZU1JFeQPemrjQl94buLNY5gXnMCCRKBxdO870M="; + }) + ]; + nativeBuildInputs = [ setuptools setuptools-scm From 3b02da698bcab3f5568346bae8335f3a69356510 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 09:37:37 +0200 Subject: [PATCH 057/143] metasploit: 6.3.22 -> 6.3.23 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 79 +++++++++++---------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 78 ++++++++++---------- 4 files changed, 82 insertions(+), 81 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 06b3bc9d7755..06cb1c146f09 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.22" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.23" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d7dc2c9d28eb..844ded67dc9f 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: b32d454d51c2a114658ee8b8f8ce571869e0b91e - ref: refs/tags/6.3.22 + revision: 35d2581f8aacfa08c444a037f5a81f354d1667cc + ref: refs/tags/6.3.23 specs: - metasploit-framework (6.3.22) + metasploit-framework (6.3.23) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -34,7 +34,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.143) + metasploit-payloads (= 2.0.147) metasploit_data_models metasploit_payloads-mettle (= 1.0.20) mqtt @@ -102,25 +102,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.5.1) - actionview (= 7.0.5.1) - activesupport (= 7.0.5.1) + actionpack (7.0.6) + actionview (= 7.0.6) + activesupport (= 7.0.6) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.5.1) - activesupport (= 7.0.5.1) + actionview (7.0.6) + activesupport (= 7.0.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.5.1) - activesupport (= 7.0.5.1) - activerecord (7.0.5.1) - activemodel (= 7.0.5.1) - activesupport (= 7.0.5.1) - activesupport (7.0.5.1) + activemodel (7.0.6) + activesupport (= 7.0.6) + activerecord (7.0.6) + activemodel (= 7.0.6) + activesupport (= 7.0.6) + activesupport (7.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -131,29 +131,29 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.781.0) - aws-sdk-core (3.175.0) + aws-partitions (1.782.0) + aws-sdk-core (3.176.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.386.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-ec2 (1.387.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.82.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-iam (1.83.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.67.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-kms (1.68.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.126.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-s3 (1.127.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sdk-ssm (1.152.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sigv4 (~> 1.6) + aws-sdk-ssm (1.154.0) + aws-sdk-core (~> 3, >= 3.176.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.2) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.19) bcrypt_pbkdf (1.1.0) @@ -184,7 +184,7 @@ GEM eventmachine (1.2.7) faker (3.2.0) i18n (>= 1.8.11, < 2) - faraday (2.7.7) + faraday (2.7.9) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -245,7 +245,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.143) + metasploit-payloads (2.0.147) metasploit_data_models (6.0.2) activerecord (~> 7.0) activesupport (~> 7.0) @@ -285,8 +285,8 @@ GEM openssl-ccm (1.2.3) openssl-cmac (2.0.2) openvas-omp (0.0.4) - packetfu (1.1.13) - pcaprub + packetfu (2.0.0) + pcaprub (~> 0.13.1) patch_finder (1.0.2) pcaprub (0.13.1) pdf-reader (2.11.0) @@ -305,15 +305,16 @@ GEM rack rack-test (2.1.0) rack (>= 1.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.5.1) - actionpack (= 7.0.5.1) - activesupport (= 7.0.5.1) + railties (7.0.6) + actionpack (= 7.0.6) + activesupport (= 7.0.6) method_source rake (>= 12.2) thor (~> 1.0) @@ -450,4 +451,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.4.13 + 2.4.14 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 6977e2a67b6d..7af532cfbb1c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.22"; + version = "6.3.23"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-9G6SXmQrQMvq56JBfCV3OH7X9cLXgEmQWtTehAybU8k="; + sha256 = "sha256-371D1PyU4q2RHBcmz44tZAvFPcctUU3uL1ANCrm+x9o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index b5c0f8657dad..f120b1ef26af 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003y7cdxwzdqx8hgw02kf1b5mp8qr8syx07f35sk3ghhqxp39ksy"; + sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ihpqcvz3f38ka85zdjkdcvgdbcan81dbr0y9bi784jn1v5ggwa"; + sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y"; + sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796"; + sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c"; + sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; addressable = { groups = ["default"]; @@ -104,80 +104,80 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y9ghr029lf5kbci9xylhqqjfphfx5ds8g1n72x90r9qdzn1wr1z"; + sha256 = "02idgi5pm6f2g36y68k44570drgc5w00n22g8pwak89r5yrjknmb"; type = "gem"; }; - version = "1.781.0"; + version = "1.782.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbbzcszpdjy2yzxfvl5fzgn0jgznkwxvqpb46nxv69gqhv3dpsg"; + sha256 = "12my2gnp04i5zfv5xpd6mipfwmk3k7p08cb5arj8k49rxigjlcdw"; type = "gem"; }; - version = "3.175.0"; + version = "3.176.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fn9b7asb7rrvcjj9iid3q8q4gd27k2hkiyiiijbjzf76lkm74rs"; + sha256 = "0drsgpa4ba08hcgbksdf9pjs4np0wjix7nsc2c09nfkq20i5slrh"; type = "gem"; }; - version = "1.386.0"; + version = "1.387.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v13fcm4214js2gy2iwws4zri2dbj1ipkmql8iwy8sa093g59bh8"; + sha256 = "0xn6fjm2wg5gwy9x8pzgiwv8c3ip1ar0xam6x1z42zb9dy3fm2ga"; type = "gem"; }; - version = "1.82.0"; + version = "1.83.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dkgcgvif4hjlq5jhixd2hf17pm2pib7p3jxg9g92pybsff9rk7c"; + sha256 = "0db8gjanj4hv7wg0aidjpd3i1220b7pzh81m49xdyvrpb1a3ya5i"; type = "gem"; }; - version = "1.67.0"; + version = "1.68.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ya49rwjzimqhzsj6vlc4xfvj2sixy04kr4b6ddg3r6y0jrsixi"; + sha256 = "1h4dnqhsn269i4d1gg7w1q6l9mc2wnw942fz913fw7sxa0ng5q6k"; type = "gem"; }; - version = "1.126.0"; + version = "1.127.0"; }; aws-sdk-ssm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08n63a4grhrylg5k055ksklp7dsh1rww59d3rshyphkjr5wyg3nv"; + sha256 = "0drga2wr7az4gcmps5q5x4dzlfwcnf646zq2hxa7dq9jrrdj6q81"; type = "gem"; }; - version = "1.152.0"; + version = "1.154.0"; }; aws-sigv4 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; + sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; bcrypt = { groups = ["default"]; @@ -374,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ai4cxnymjp7c2xqbfksks82aah0pbyjsl3r2cgc4iimrw2wg8qy"; + sha256 = "1lv5c8bmphkhy2cxkcvswfkd2qga7gb2qgl4fynn1mfmf7ymai7i"; type = "gem"; }; - version = "2.7.7"; + version = "2.7.9"; }; faraday-net_http = { groups = ["default"]; @@ -634,12 +634,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "b32d454d51c2a114658ee8b8f8ce571869e0b91e"; - sha256 = "1jakkc689pnlba84k06pqbsxfziqfwjpqhd2wzmcnh1bcig94vpl"; + rev = "35d2581f8aacfa08c444a037f5a81f354d1667cc"; + sha256 = "1nn7pswhl3ah5zp4sl9dqwywa2v45n7cy9hp3j8svqllzka47gfz"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.22"; + version = "6.3.23"; }; metasploit-model = { groups = ["default"]; @@ -656,10 +656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y72am25xqa8fip3i1ann6xyap3aik745fl1qfcjix7faakmka8c"; + sha256 = "00xazpl7fhk5nmvnqy0md4k5ybsw79mr8jwkafs0zw1lbvx28scb"; type = "gem"; }; - version = "2.0.143"; + version = "2.0.147"; }; metasploit_data_models = { groups = ["default"]; @@ -897,10 +897,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16ppq9wfxq4x2hss61l5brs3s6fmi8gb50mnp1nnnzb1asq4g8ll"; + sha256 = "0crsc4mcikpc01d19ppryzwgvhk9hg9r73g5bwac32x979zwyks8"; type = "gem"; }; - version = "1.1.13"; + version = "2.0.0"; }; patch_finder = { groups = ["default"]; @@ -1007,10 +1007,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; rails-html-sanitizer = { groups = ["default"]; @@ -1027,10 +1027,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z4lqqbd4i5izsg97mx5yf3gj7y5d07wgvad0jzjghjg12pf142i"; + sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; type = "gem"; }; - version = "7.0.5.1"; + version = "7.0.6"; }; rake = { groups = ["default"]; From c6fcddbaa19b6110478a6b13d379cdee63f3c6a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 08:02:19 +0000 Subject: [PATCH 058/143] gtkcord4: 0.0.11 -> 0.0.11-1 --- pkgs/applications/audio/gtkcord4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix index fde6a0632691..ce9d26229c6c 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "gtkcord4"; - version = "0.0.11"; + version = "0.0.11-1"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-0d656gjfFlgNdKbPJK+6KIU7zvp88j3bGIlGPwJNRdM="; + hash = "sha256-GkjUURmPS1KOwgYn7kO9/oGIUX9fnSgYjyU7PHXtE5w="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ buildGoModule rec { install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png ''; - vendorHash = "sha256-+zbaRaGOF6w8C7lmtd3k5Rh/0a+OnqTL9Qhg1ErTHBo="; + vendorHash = "sha256-RJ6dLa5EzfLMPR3LMIplFhmph+tcdsieiB5Uv95lqIs="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4."; From d34df5d874e845af6990dd70c4ffd1f178c7a7f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 08:23:41 +0000 Subject: [PATCH 059/143] protoc-gen-validate: 1.0.1 -> 1.0.2 --- pkgs/development/tools/protoc-gen-validate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index b690408b3cdb..005b6eac1f8b 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-VXGsSlqVScqyScOsYoXcVfXFvH73GFc+4qPRETqbre0="; + sha256 = "sha256-sztpUzrVvYT3GFVbfd91rOudj/PEHHizTOzTrH1fQts="; }; - vendorHash = "sha256-OOjVlRHaOLIJVg3r97qZ3lPv8ANYY2HSn7hUJhg3Cfs="; + vendorHash = "sha256-UPmeb36kF+z37+RcyXaOsJvAto1xrJUyJqcPyODAQrY="; excludedPackages = [ "tests" ]; From 7c083c0df195cd894aaa1b7e9d20c9db8b0474ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 10:26:31 +0200 Subject: [PATCH 060/143] python310Packages.qutip: add changelog to meta --- pkgs/development/python-modules/qutip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 00884692c421..43f3b9d8cfa6 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -87,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-source software for simulating the dynamics of closed and open quantum systems"; homepage = "https://qutip.org/"; + changelog = "https://github.com/qutip/qutip/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ fabiangd ]; }; From 662e208e696d2fa549a3208980e50ef3e33a62fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 10:32:10 +0200 Subject: [PATCH 061/143] python311Packages.dparse: add changelog to meta --- pkgs/development/python-modules/dparse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index 6c0240d3b0b9..8124e38c2d1e 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A parser for Python dependency files"; homepage = "https://github.com/pyupio/dparse"; + changelog = "https://github.com/pyupio/dparse/blob/${version}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ thomasdesr ]; }; From 2e3fe5a346d4576e9e37201f0703f49566a8a621 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 10:32:55 +0200 Subject: [PATCH 062/143] python311Packages.dparse: update disabled --- pkgs/development/python-modules/dparse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index 8124e38c2d1e..3c8b56a2c406 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "0.6.3"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From 324036b3d7cac775374843df9e26edd627509892 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 08:37:29 +0000 Subject: [PATCH 063/143] rtx: 1.32.0 -> 1.32.1 --- pkgs/tools/misc/rtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index 040c76a1f991..f8ffbf398da8 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "1.32.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "jdxcode"; repo = "rtx"; rev = "v${version}"; - sha256 = "sha256-1TaBxVu/aNZ3iZWlo1Gn9pFK5j/vKsx6yT+eAPkmYSw="; + sha256 = "sha256-de3d3tW1VWx91fFXhfMKcWlAraUltfkT9p4i9AciSB0="; }; - cargoSha256 = "sha256-wgTckF1IqnTa6gYVYHDNLdyx2w2urYG5Qqkq1iyuA3M="; + cargoHash = "sha256-dz6q7sfmtSzk5UwoAx969oImGDPifr2Nhh/vrXV5fxc="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From ebdd860cd4fdbe6711b9441b4bb719e5a4ba6ef1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 10:39:28 +0200 Subject: [PATCH 064/143] python311Packages.publicsuffixlist: 0.10.0.20230617 -> 0.10.0.20230701 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 23b4a6000bef..a451a8f3b8f5 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230617"; + version = "0.10.0.20230701"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ncq/VuUCNR8TZvYSiXBG93xanQcw0FQGrHOBtIc1y2k="; + hash = "sha256-vlmo1pQpMRlMF9Wmd9bw0cocmcpcxj4MC1YHqNUyriU="; }; passthru.optional-dependencies = { From 58a6c2d3554d4cb90cd851a0d0019362511f6370 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 10:41:38 +0200 Subject: [PATCH 065/143] grype: 0.63.0 -> 0.63.1 Diff: https://github.com/anchore/grype/compare/refs/tags/v0.63.0...v0.63.1 Changelog: https://github.com/anchore/grype/releases/tag/v0.63.1 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 3cd0fe488862..64190fff1315 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.63.0"; + version = "0.63.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MccjZ7EDpyiu/Bv7KItwG5JtGKOSSwMevd21hXBi3+o="; + hash = "sha256-mygfK8UMvjpqnbo+Zz1x+G9zDZa7QTotvWaERVkYaSo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-RbQvWIy8yebohKNaT3ixJqvz+8vewpxMoBALO5kJpWw="; + vendorHash = "sha256-T1dfdXlYCOdeZT1rgWgIrh9Jpl70csRI9xX/7QZGNag="; nativeBuildInputs = [ installShellFiles From dd556d1eb620e4bb35d0b63d38eb4d0229f2502f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 10:43:36 +0200 Subject: [PATCH 066/143] python311Packages.pymazda: 0.3.8 -> 0.3.9 Changelog: https://github.com/bdr99/pymazda/releases/tag/0.3.9 --- .../development/python-modules/pymazda/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index 4e00ecc83654..37c5bb86e136 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -3,21 +3,26 @@ , buildPythonPackage , cryptography , fetchPypi +, poetry-core , pythonOlder }: buildPythonPackage rec { pname = "pymazda"; - version = "0.3.8"; - format = "setuptools"; + version = "0.3.9"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CBPBmzghuc+kvBt50qmU+jHyUdGgLgNX3jcVm9CC7/Q="; + hash = "sha256-S5mM15DcEBwczsLk6VJDzgMo80NjsCeehz66SALYeV4="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp cryptography @@ -33,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for interacting with the MyMazda API"; homepage = "https://github.com/bdr99/pymazda"; + changelog = "https://github.com/bdr99/pymazda/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From e1b8adeab3002e1f0f75e658dcd8b33efd3dce79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 10:48:50 +0200 Subject: [PATCH 067/143] python311Packages.cloudsplaining: 0.5.1 -> 0.6.0 Diff: https://github.com/salesforce/cloudsplaining/compare/refs/tags/0.5.1...0.6.0 --- pkgs/development/python-modules/cloudsplaining/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index f134b488cc32..042091634481 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.5.1"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-L7sEv0xe8+riJb7DW2N6+MsoXBXJNzK96oGkpAkAyLU="; + hash = "sha256-1p0Lrx4uirgyhE8cdhrSOJLBSN11f6X5WqdWtVutDzQ="; }; propagatedBuildInputs = [ From 0abba24dccba20c6232307e92e4c21789cdd598c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 08:49:37 +0000 Subject: [PATCH 068/143] svlint: 0.7.2 -> 0.8.0 --- pkgs/development/tools/analysis/svlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index c023791d7be1..b0c94ef8c647 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.7.2"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-yo0SgNnwy0LnbIOCLwHUpzjgTZzOoO5GHzKmNVFQOtE="; + sha256 = "sha256-ykAuypWBbZ+53ImzNJGsztLHG8OQLIGBHC6Z3Amu+L0="; }; - cargoHash = "sha256-3ELBEalMQE+Ozgud+RECl5ClBLy3TqGaEry2OwZ2pGk="; + cargoHash = "sha256-517AXkFqYaHC/FejtxolAQxJVpvcFhmf3Nptzcy9idY="; cargoBuildFlags = [ "--bin" "svlint" ]; From 1104614287bc58398844e9fddfcdb1fda446d08c Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Jul 2023 09:16:29 +0000 Subject: [PATCH 069/143] systemd-journal2gelf: unstable-2022-02-15 -> unstable-2023-03-10 --- pkgs/tools/system/systemd-journal2gelf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix index 21db5f5c72ff..ef7f5b039cfb 100644 --- a/pkgs/tools/system/systemd-journal2gelf/default.nix +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "SystemdJournal2Gelf"; - version = "unstable-2022-02-15"; + version = "unstable-2023-03-10"; src = fetchFromGitHub { owner = "parse-nl"; repo = "SystemdJournal2Gelf"; - rev = "86f9f41b26b6848345c2424fbf1ff907b876bb5b"; - sha256 = "sha256-xsrKuZVN6Eb0vG98LbQnFqNxHthv+uL/h2HCDiFY0Oo="; + rev = "863a15df5ed2d50365bb9c27424e3b118ce404c0"; + hash = "sha256-AwJq0xZAoIpBz9kGERfmZZTn28LbAKIl3gUsFKL3yvs="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; From c94163aa233314d6f38c76ffba13f3b953681d10 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Jul 2023 09:24:15 +0000 Subject: [PATCH 070/143] zdns: 2022-03-14-unstable -> 2023-04-09-unstable --- pkgs/tools/security/zdns/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/zdns/default.nix b/pkgs/tools/security/zdns/default.nix index 354dd5b64475..9b0c33f2802e 100644 --- a/pkgs/tools/security/zdns/default.nix +++ b/pkgs/tools/security/zdns/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zdns"; - version = "2022-03-14-unstable"; + version = "2023-04-09-unstable"; src = fetchFromGitHub { owner = "zmap"; repo = pname; - rev = "d659a361f6d5165462c10e1c1243f420175e066b"; - hash = "sha256-856O6H03me3IM39/+6n56KJIetL+v4on6+lJx5D2Pcw="; + rev = "ac6c7f30a7f5e11f87779f5275adeed117227cd6"; + hash = "sha256-que2uzIH8GybU6Ekumg/MjgBHSmFCF+T7PWye+25kaY="; }; - vendorSha256 = "sha256-5kZ0voyicnqK/0yrMYW+gR1vVDyptW6I1HgyG4zleX8="; + vendorHash = "sha256-daMPk1TKrUXXqCb4WVkrUIJsBL7uzXLJnxWNbHQ/Im4="; meta = with lib; { description = "CLI DNS lookup tool"; From cac6d289dbd61c0bc6ad2f6c83a0449222abda1f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Jul 2023 09:34:23 +0000 Subject: [PATCH 071/143] spyre: 1.2.4 -> 1.2.5 --- pkgs/tools/security/spyre/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/spyre/default.nix b/pkgs/tools/security/spyre/default.nix index e74d8bc9a6ec..6b86c910f9ae 100644 --- a/pkgs/tools/security/spyre/default.nix +++ b/pkgs/tools/security/spyre/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "spyre"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "spyre-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-408UOY7kvukMYOVqQfpugk6Z+LNQV9XyfJirKyBRWd4="; + hash = "sha256-wlGZTMCJE6Ki5/6R6J9EJP06/S125BNNd/jNPYGwKNw="; }; - vendorSha256 = "sha256-qZkt5WwicDXrExwMT0tCO+FZgClIHhrVtMR8xNsdAaQ="; + vendorHash = "sha256-qZkt5WwicDXrExwMT0tCO+FZgClIHhrVtMR8xNsdAaQ="; nativeBuildInputs = [ pkg-config From 8bb3326a906a6730fd51aff3a8e9d5f7be12e371 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Jul 2023 09:37:58 +0000 Subject: [PATCH 072/143] snowcrash: unstable-2021-04-29 -> unstable-2022-08-15 --- pkgs/tools/security/snowcrash/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/snowcrash/default.nix b/pkgs/tools/security/snowcrash/default.nix index be4380cb9188..69d310afb9f9 100644 --- a/pkgs/tools/security/snowcrash/default.nix +++ b/pkgs/tools/security/snowcrash/default.nix @@ -2,29 +2,20 @@ , stdenv , buildGoModule , fetchFromGitHub -, fetchpatch }: buildGoModule rec { pname = "snowcrash"; - version = "unstable-2021-04-29"; + version = "unstable-2022-08-15"; src = fetchFromGitHub { owner = "redcode-labs"; repo = "SNOWCRASH"; - rev = "514cceea1ca82f44e0c8a8744280f3a16abb6745"; - sha256 = "sha256-jQrd7sluDd9eC4VdNtxvGct7Y4Y3zOylc4y2n6Kz4Zo="; + rev = "32e62f9ff7d3dda9fac8acfc56176f1f2a70d066"; + hash = "sha256-mURF/VUqygd5bLJdmbwnZq003IXJKn+k8HtS+CxoQJQ="; }; - patches = [ - (fetchpatch { - name = "update-x-sys-for-go-1.18-on-aarch64-darwin.patch"; - url = "https://github.com/redcode-labs/SNOWCRASH/commit/24eefdcc944ade0cf435f7f35dee59ef3f0497fd.patch"; - sha256 = "sha256-UXk7cMyEVAVcOkELcC9TlQNppZOXIvn6DBYu1j2iVNg="; - }) - ]; - - vendorSha256 = "sha256-WTDE+MYL8CjeNvGHRNiMgBFrydDJWIcG8TYvbQTH/6o="; + vendorHash = "sha256-WTDE+MYL8CjeNvGHRNiMgBFrydDJWIcG8TYvbQTH/6o="; subPackages = [ "." ]; From 242c67349b079c337ed3a056600d3303774b4170 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 1 Jul 2023 09:54:12 +0000 Subject: [PATCH 073/143] secretscanner: 20210214-42a38f9 -> 1.2.0 --- pkgs/tools/security/secretscanner/default.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/secretscanner/default.nix b/pkgs/tools/security/secretscanner/default.nix index 93d440009f3f..859e6edc6fa0 100644 --- a/pkgs/tools/security/secretscanner/default.nix +++ b/pkgs/tools/security/secretscanner/default.nix @@ -3,26 +3,43 @@ , fetchFromGitHub , hyperscan , pkg-config +, protobuf +, protoc-gen-go +, protoc-gen-go-grpc }: buildGoModule rec { pname = "secretscanner"; - version = "20210214-${lib.strings.substring 0 7 rev}"; - rev = "42a38f9351352bf6240016b5b93d971be35cad46"; + version = "1.2.0"; src = fetchFromGitHub { owner = "deepfence"; repo = "SecretScanner"; - inherit rev; - sha256 = "0yga71f7bx5a3hj5agr88pd7j8jnxbwqm241fhrvv8ic4sx0mawg"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-lTUZLuEiC9xpHYWn3uv4ZtbvHX6ETsjxacjd/O0kU8I="; }; - vendorSha256 = "0b7qa83iqnigihgwlqsxi28n7d9h0dk3wx1bqvhn4k01483cipsd"; + vendorHash = "sha256-lB+fiSdflIYGw0hMN0a9IOtRcJwYEUPQqaeU7mAfSQs="; - nativeBuildInputs = [ pkg-config ]; + excludedPackages = [ + "./agent-plugins-grpc/proto" # No need to build submodules + ]; + + nativeBuildInputs = [ + pkg-config + protobuf + protoc-gen-go + protoc-gen-go-grpc + ]; buildInputs = [ hyperscan ]; + preBuild = '' + # Compile proto files + make -C agent-plugins-grpc go + ''; + postInstall = '' mv $out/bin/SecretScanner $out/bin/$pname ''; From 7bba50f51452bf41cba233114bac4f5812695eb1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 12:15:16 +0200 Subject: [PATCH 074/143] secretscanner: add changelog to meta --- pkgs/tools/security/secretscanner/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/secretscanner/default.nix b/pkgs/tools/security/secretscanner/default.nix index 859e6edc6fa0..cff77db6b849 100644 --- a/pkgs/tools/security/secretscanner/default.nix +++ b/pkgs/tools/security/secretscanner/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "deepfence"; repo = "SecretScanner"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; hash = "sha256-lTUZLuEiC9xpHYWn3uv4ZtbvHX6ETsjxacjd/O0kU8I="; }; @@ -33,7 +33,9 @@ buildGoModule rec { protoc-gen-go-grpc ]; - buildInputs = [ hyperscan ]; + buildInputs = [ + hyperscan + ]; preBuild = '' # Compile proto files @@ -47,6 +49,7 @@ buildGoModule rec { meta = with lib; { description = "Tool to find secrets and passwords in container images and file systems"; homepage = "https://github.com/deepfence/SecretScanner"; + changelog = "https://github.com/deepfence/SecretScanner/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 7db362f221f8c8ab8edc75d64d47fe9048c4a08b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 Jul 2023 20:16:08 +1000 Subject: [PATCH 075/143] fastgron: init at 0.6.2 --- pkgs/development/tools/fastgron/default.nix | 30 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/fastgron/default.nix diff --git a/pkgs/development/tools/fastgron/default.nix b/pkgs/development/tools/fastgron/default.nix new file mode 100644 index 000000000000..17996d697e63 --- /dev/null +++ b/pkgs/development/tools/fastgron/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl, testers }: + +stdenv.mkDerivation (finalAttrs: { + pname = "fastgron"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "adamritter"; + repo = "fastgron"; + rev = "v${finalAttrs.version}"; + hash = "sha256-SqJdJnepfX/qHiACjpaTNM+/lApcADCCbcX+BNgXswg="; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ curl ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + + meta = with lib; { + changelog = "https://github.com/adamritter/fastgron/releases/tag/${finalAttrs.src.rev}"; + description = "High-performance JSON to GRON (greppable, flattened JSON) converter"; + homepage = "https://github.com/adamritter/fastgron"; + license = licenses.mit; + maintainers = with maintainers; [ zowoq ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b42eeb42cdb..9357c0743388 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18722,6 +18722,8 @@ with pkgs; fastddsgen = callPackage ../development/tools/fastddsgen { }; + fastgron = callPackage ../development/tools/fastgron { }; + findbugs = callPackage ../development/tools/analysis/findbugs { }; findnewest = callPackage ../development/tools/misc/findnewest { }; From 7bb9292bcbafc89a7bd95c23b2a2c64faa75b5b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 10:17:14 +0000 Subject: [PATCH 076/143] discord-canary: 0.0.161 -> 0.0.162 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index db408e10b0f9..e6d237ee5817 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.27"; ptb = "0.0.43"; - canary = "0.0.161"; + canary = "0.0.162"; development = "0.0.217"; } else { stable = "0.0.273"; @@ -24,7 +24,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-jX7+tDACTzDqDIzL2VuQPHcdMBth6wbHJ4zfVJJmJ68="; + sha256 = "sha256-eSWcwSw46hKJmDLxHtolBZgKrIS2QnTbVoYe0EI4Njs="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 620d57c63a4c0158000190009ca0520e8c2c7e73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 09:11:29 +0000 Subject: [PATCH 077/143] clusterctl: 1.4.3 -> 1.4.4 --- pkgs/applications/networking/cluster/clusterctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 5f587e64e8cf..a87bbbb700c1 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-OtA7mhypPNDD7IH5XKOoE2ytcjR0uhed8B3MoMrPd0Y="; + hash = "sha256-ohk3CKcB6LD1gRKDDNYK+MbFxWa7QEiqmRYYpSkwj8E="; }; vendorHash = "sha256-QzD0Stbr8QuQ8n9l9qv16KFqSFBsRbxETmQ8LHdk3nI="; From ca65297f311472b31b3ce9fef401c8e8d76cdc64 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 1 Jul 2023 12:21:37 +0200 Subject: [PATCH 078/143] gnome.evince: Change meta.platforms to unix Builds fine on x86_64-darwin --- pkgs/desktops/gnome/core/evince/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index fa61dbe4766d..ed0f40de485a 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members ++ teams.pantheon.members; }; } From 1453f87209654fc128fc48d970f2a556c607537d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 12:19:48 +0200 Subject: [PATCH 079/143] python311Packages.appthreat-vulnerability-db: 5.1.4 -> 5.2.0 Diff: https://github.com/AppThreat/vulnerability-db/compare/refs/tags/v5.1.4...v5.2.0 Changelog: https://github.com/AppThreat/vulnerability-db/releases/tag/v5.2.0 --- .../appthreat-vulnerability-db/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index eb1a5bdf50aa..0a2dd009f6a4 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -11,13 +11,14 @@ , pythonOlder , pythonRelaxDepsHook , semver +, setuptools , tabulate }: buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.1.4"; - format = "setuptools"; + version = "5.2.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,15 +26,12 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-IOQyQ78u9Pr27UKchjSqzCl47UajknI8MYZZy2DheSk="; + hash = "sha256-OtaoyqYRsZVoWezrTAy3zROyNeRLbZmCT+z7YCwf9Ow="; }; postPatch = '' substituteInPlace pytest.ini \ --replace " --cov-append --cov-report term --cov vdb" "" - # https://github.com/AppThreat/vulnerability-db/pull/48 - substituteInPlace vdb/lib/utils.py \ - --replace "isvalid(" "is_valid(" ''; pythonRelaxDeps = [ @@ -42,6 +40,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ From 64e3b6239b658a7ce1ce316330fe3c7d018da089 Mon Sep 17 00:00:00 2001 From: TQ Hirsch Date: Sat, 25 Feb 2023 16:11:53 +0100 Subject: [PATCH 080/143] pdns, pdns-recurser: Look for configuration in /etc This allows the respective management tools to find the config file without manually specifying it on each invocation. --- pkgs/servers/dns/pdns-recursor/default.nix | 3 +++ pkgs/servers/dns/pdns/default.nix | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index aec253d26ed1..c8da5d9de60c 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -21,8 +21,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-reproducible" "--enable-systemd" + "sysconfdir=/etc/powerdns-recursor" ]; + installFlags = [ "sysconfdir=$(out)/etc/powerdns-recursor" ]; + enableParallelBuilding = true; passthru.tests = { diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index b41e4df5242a..e998a1e5cf98 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-libsodium" "--with-sqlite3" "--with-libcrypto=${openssl.dev}" + "sysconfdir=/etc/powerdns" ]; # nix destroy with-modules arguments, when using configureFlags @@ -79,6 +80,11 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + # We want the various utilities to look for the powerdns config in + # /etc/powerdns, but to actually install the sample config file in + # $out + installFlags = [ "sysconfdir=$(out)/etc/powerdns" ]; + enableParallelBuilding = true; doCheck = true; From d25e5e21070cbacaa33361254a6a0b1e2e7c0e04 Mon Sep 17 00:00:00 2001 From: TQ Hirsch Date: Sat, 25 Feb 2023 16:33:36 +0100 Subject: [PATCH 081/143] nixos/powerdns, nixos/pdns-recurser: Symlink configuration into /etc This places a symlink to the running configuration where the admin tools expect it, allowing users to control the powerdns server or recursor without manually specifying a config file. --- nixos/modules/services/networking/pdns-recursor.nix | 2 ++ nixos/modules/services/networking/powerdns.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index 2f07cefc736e..af5ea08a3609 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -159,6 +159,8 @@ in { config = mkIf cfg.enable { + environment.etc."powerdns-recursor".source = configDir; + services.pdns-recursor.settings = mkDefaultAttrs { local-address = cfg.dns.address; local-port = cfg.dns.port; diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix index 850a128cf1a4..fd82791f21c1 100644 --- a/nixos/modules/services/networking/powerdns.nix +++ b/nixos/modules/services/networking/powerdns.nix @@ -38,6 +38,8 @@ in { config = mkIf cfg.enable { + environment.etc.powerdns.source = finalConfigDir; + systemd.packages = [ pkgs.pdns ]; systemd.services.pdns = { From 8ab22ad2ad166a75e517bc3d0a6625d3e3f4517a Mon Sep 17 00:00:00 2001 From: TQ Hirsch Date: Sat, 25 Feb 2023 17:02:36 +0100 Subject: [PATCH 082/143] nixos/tests/powerdns: Stop manually configuring config path --- nixos/tests/powerdns.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix index d3708d25f0fb..599d5ea67efe 100644 --- a/nixos/tests/powerdns.nix +++ b/nixos/tests/powerdns.nix @@ -28,8 +28,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; testScript = '' - import re - with subtest("PowerDNS database exists"): server.wait_for_unit("mysql") server.succeed("echo 'SHOW DATABASES;' | sudo -u pdns mysql -u pdns >&2") @@ -46,11 +44,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("Adding an example zone works"): # Extract configuration file needed by pdnsutil - unit = server.succeed("systemctl cat pdns") - match = re.search("(--config-dir=[^ ]+)", unit) - assert(match is not None) - conf = match.group(1) - pdnsutil = "sudo -u pdns pdnsutil " + conf + pdnsutil = "sudo -u pdns pdnsutil " server.succeed(f"{pdnsutil} create-zone example.com ns1.example.com") server.succeed(f"{pdnsutil} add-record example.com ns1 A 192.168.1.2") From dd481f2ee3bcf8e0555968dbdaa03a45bd5ae56e Mon Sep 17 00:00:00 2001 From: TQ Hirsch Date: Thu, 29 Jun 2023 12:42:01 +0200 Subject: [PATCH 083/143] pdns: Changed paths in /etc to use pdns instead of powerdns --- nixos/modules/services/networking/pdns-recursor.nix | 2 +- nixos/modules/services/networking/powerdns.nix | 2 +- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- pkgs/servers/dns/pdns/default.nix | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix index af5ea08a3609..f929532ba09f 100644 --- a/nixos/modules/services/networking/pdns-recursor.nix +++ b/nixos/modules/services/networking/pdns-recursor.nix @@ -159,7 +159,7 @@ in { config = mkIf cfg.enable { - environment.etc."powerdns-recursor".source = configDir; + environment.etc."pdns-recursor".source = configDir; services.pdns-recursor.settings = mkDefaultAttrs { local-address = cfg.dns.address; diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix index fd82791f21c1..03bf93301d85 100644 --- a/nixos/modules/services/networking/powerdns.nix +++ b/nixos/modules/services/networking/powerdns.nix @@ -38,7 +38,7 @@ in { config = mkIf cfg.enable { - environment.etc.powerdns.source = finalConfigDir; + environment.etc.pdns.source = finalConfigDir; systemd.packages = [ pkgs.pdns ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index c8da5d9de60c..da0890e8e4d0 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-reproducible" "--enable-systemd" - "sysconfdir=/etc/powerdns-recursor" + "sysconfdir=/etc/pdns-recursor" ]; - installFlags = [ "sysconfdir=$(out)/etc/powerdns-recursor" ]; + installFlags = [ "sysconfdir=$(out)/etc/pdns-recursor" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index e998a1e5cf98..fcd218a1f3cc 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-libsodium" "--with-sqlite3" "--with-libcrypto=${openssl.dev}" - "sysconfdir=/etc/powerdns" + "sysconfdir=/etc/pdns" ]; # nix destroy with-modules arguments, when using configureFlags @@ -81,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: { ''; # We want the various utilities to look for the powerdns config in - # /etc/powerdns, but to actually install the sample config file in + # /etc/pdns, but to actually install the sample config file in # $out - installFlags = [ "sysconfdir=$(out)/etc/powerdns" ]; + installFlags = [ "sysconfdir=$(out)/etc/pdns" ]; enableParallelBuilding = true; doCheck = true; From 878d86471a87dae78d4dd85c4cbe7fa6db4d7fc5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Jul 2023 13:14:28 +0200 Subject: [PATCH 084/143] zigbee2mqtt: 1.31.2 -> 1.32.0 https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.32.0 --- pkgs/servers/zigbee2mqtt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index fd10e141a332..73786765039f 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.31.2"; + version = "1.32.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-Pl/v1Uj+6VpuAXBVpCmcuioRGtYYNektXI96HBXn+Ck="; + hash = "sha256-OUd6Q9/JtllTSAzR879MrgWz5MZnRsEolGsuQbxURh8="; }; - npmDepsHash = "sha256-ZbfR/dcIdiy/0FlPPodAgRvEW/muXSP5qfmQR7ym3lM="; + npmDepsHash = "sha256-GoowjWCBfMcN5qWG2rV6wSPx01TozIb5KDh77D49F/M="; nativeBuildInputs = [ python3 From 6e95ba2260cee9c76a533aac0a9c452227834f6d Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Sat, 1 Jul 2023 13:48:51 +0200 Subject: [PATCH 085/143] docs: clarify videoDrivers breakage in release notes --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 32a133b20e8c..a31f3511a4b2 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -316,7 +316,7 @@ In addition to numerous new and updated packages, this release has the following - The ppp plugin `rp-pppoe.so` has been renamed to `pppoe.so` in ppp 2.4.9. Starting from ppp 2.5.0, there is no longer an alias for backwards compatibility. Configurations that use this plugin must be updated accordingly from `plugin rp-pppoe.so` to `plugin pppoe.so`. See [upstream change](https://github.com/ppp-project/ppp/commit/610a7bd76eb1f99f22317541b35001b1e24877ed). -- [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use. +- [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use. Note that this __does not__ affect your regular graphics drivers; this only concerns the DDX component of the driver, which most people are not relying on. - [services.xserver.libinput.enable](options.html#opt-services.xserver.libinput.enable) is now set by default, enabling the more actively maintained and consistently behaved input device driver. From 7fdd8a19b53e03bb0a09ff345ceff8f5ed51ee1a Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sat, 1 Jul 2023 20:29:14 +0800 Subject: [PATCH 086/143] halftone: 0.3.0 -> 0.3.1 --- pkgs/applications/graphics/halftone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/halftone/default.nix b/pkgs/applications/graphics/halftone/default.nix index b2d3c5ccec14..2d9058314240 100644 --- a/pkgs/applications/graphics/halftone/default.nix +++ b/pkgs/applications/graphics/halftone/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "halftone"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tfuxu"; repo = pname; rev = version; - hash = "sha256-C/AzaKXZx/0mbrG5v2I5kKcw3N0gh/m/9zshbZfzECw="; + hash = "sha256-hUaI5omYUa5Fq95N0FqJJe+WVoRWkANy0/mmaURWIzg="; }; format = "other"; From ad719a802b77fb23fec0bf167654911c35576dc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 12:30:24 +0000 Subject: [PATCH 087/143] tilt: 0.32.4 -> 0.33.1 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 3bf0aa916bf9..12105f0b5963 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.32.4"; + version = "0.33.1"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GZ9FgseJmaWiMSscLSqMutv5yQ/e8qCjoJEPPTH2Ix0="; + sha256 = "sha256-3CRE+gpifV3MHyKdiiHmGwGre0ne3IjheYH0r6NMKY8="; }; vendorHash = null; From f86dfc576c8fd01a1c99878edb69802b61149000 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 08:58:44 -0400 Subject: [PATCH 088/143] jql: 6.0.9 -> 7.0.0 Diff: https://github.com/yamafaktory/jql/compare/jql-v6.0.9...jql-v7.0.0 Changelog: https://github.com/yamafaktory/jql/releases/tag/jql-v7.0.0 --- pkgs/development/tools/jql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index df8a50bc91d8..2c69423dded5 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "6.0.9"; + version = "7.0.0"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-2CCbDhZQpefsiHS+b9ZYY1oFcBMZqxSkNKbvhkBdL64="; + hash = "sha256-D1L7C7oKvKtsphqOTEuJ7i6/xTg2nN6VwcUjSFb3hz0="; }; - cargoHash = "sha256-Vu0QFyz+kyI28pGAArwu4bBTPieB5GjGXFCPiW/sbi4="; + cargoHash = "sha256-CHltLd7uj6ZFJ3uq+NRxOTLyMtkP9a+dAyhfBlqjoAY="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; From 73adeb81adec04ffbf8a0fbd2306132c9b7debeb Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 09:01:40 -0400 Subject: [PATCH 089/143] rustypaste-cli: 0.4.0 -> 0.5.0 Diff: https://github.com/orhun/rustypaste-cli/compare/v0.4.0...v0.5.0 Changelog: https://github.com/orhun/rustypaste-cli/blob/v0.5.0/CHANGELOG.md --- pkgs/tools/misc/rustypaste-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rustypaste-cli/default.nix b/pkgs/tools/misc/rustypaste-cli/default.nix index e82465afcd47..dc0c03fdc819 100644 --- a/pkgs/tools/misc/rustypaste-cli/default.nix +++ b/pkgs/tools/misc/rustypaste-cli/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste-cli"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "orhun"; repo = "rustypaste-cli"; rev = "v${version}"; - hash = "sha256-Jl7fytDIW6MLY6VX7rDuX9PcZaIqENQbUTMUJKCa8Mg="; + hash = "sha256-lMXd/wllk/67W3dJr/ps36s/p+tMCyu2HU9gWYubejw="; }; - cargoHash = "sha256-hICwrgzNpyYmNW1gEKgTsSjWyqCaOHc4X37O0R2oSzY="; + cargoHash = "sha256-6ddjSP072+jYjPVcTZcQndM1pElUE30hU3M/sf5Lnsk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From 0c9fb905cbaf4bbc64ebe098aa42a1dbbc4149fd Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 1 Jul 2023 15:25:17 +0200 Subject: [PATCH 090/143] doc/using/overrides: Relate addition to preceding text --- doc/using/overrides.chapter.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/using/overrides.chapter.md b/doc/using/overrides.chapter.md index 060bf051b929..a1ef9afb0b69 100644 --- a/doc/using/overrides.chapter.md +++ b/doc/using/overrides.chapter.md @@ -58,13 +58,15 @@ The argument `finalAttrs` refers to the final attributes passed to `mkDerivation If only a one-argument function is written, the argument has the meaning of `previousAttrs`. +Function arguments can be omitted entirely if there is no need to access `previousAttrs` or `finalAttrs`. + ```nix helloWithDebug = pkgs.hello.overrideAttrs { separateDebugInfo = true; }; ``` -In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`. Function arguments can be omitted if there is no need to access previousAttrs or finalAttrs. +In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`. ::: {.note} Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing). From ab4c76ab9e484f4e00cfd95df0b315e472f3d218 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 09:28:26 -0400 Subject: [PATCH 091/143] erdtree: 3.0.2 -> 3.1.1 Diff: https://github.com/solidiquis/erdtree/compare/v3.0.2...v3.1.1 Changelog: https://github.com/solidiquis/erdtree/releases/tag/v3.1.1 --- pkgs/tools/system/erdtree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/erdtree/default.nix b/pkgs/tools/system/erdtree/default.nix index be04991641ae..442c12792230 100644 --- a/pkgs/tools/system/erdtree/default.nix +++ b/pkgs/tools/system/erdtree/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "erdtree"; - version = "3.0.2"; + version = "3.1.1"; src = fetchFromGitHub { owner = "solidiquis"; repo = pname; rev = "v${version}"; - hash = "sha256-fxGAvWECTQZXHIZRiMY9NGBwzsKdjbIGrzYQfj+vzww="; + hash = "sha256-iiGtpzoyA4PpS5redrwYeAQb/sJ149e1/ZJ0R1ctYFk="; }; - cargoHash = "sha256-zdSLiTmuOnomJe9hkV9qeud7SSjJZAI7SfW9acQaH+Q="; + cargoHash = "sha256-TfGA6AMG9zBrossM0vsRt6OY0etfWNR1FnpgiP/mfi4="; meta = with lib; { description = "File-tree visualizer and disk usage analyzer"; From b7cc8c3d6289518d6563994c8363437faa3cc50b Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 09:30:49 -0400 Subject: [PATCH 092/143] gtree: 1.8.3 -> 1.8.4 Diff: https://github.com/ddddddO/gtree/compare/v1.8.3...v1.8.4 Changelog: https://github.com/ddddddO/gtree/releases/tag/v1.8.4 --- pkgs/tools/text/gtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index a79656f18ba6..5e67358bbe3a 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-7ABfmSKHdCDR1vLsyQd5bysHk0lNsjgpDINibSpVyOc="; + hash = "sha256-FbJc12hr4lmz1jEsfWdLZpd9Z17HDFgLBUMw9noakqM="; }; vendorHash = "sha256-BMfJFR4sqJNNlJ7Y3q2GlXWjMDH+DXhuFQVX5I9Czkc="; From 080757c6c53d748717e86ab5faf15f62fc1e42a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sun, 28 Aug 2022 16:47:23 +0200 Subject: [PATCH 093/143] nixos/vaultwarden: Bind to localhost by default. See #100192 --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ nixos/modules/services/security/vaultwarden/default.nix | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 50847f663f50..3bcf98f242ee 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -54,6 +54,8 @@ - `fileSystems..autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be. +- The `services.vaultwarden.config` option default value was changed to make Vaultwarden only listen on localhost, following the [secure defaults for most NixOS services](https://github.com/NixOS/nixpkgs/issues/100192). + - `services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect. To enable federation, the hostname must be set in the configuration file and then federation must be enabled in the admin web UI. See the [release notes](https://github.com/LemmyNet/lemmy/blob/c32585b03429f0f76d1e4ff738786321a0a9df98/RELEASES.md#upgrade-instructions) for more details. - The following packages in `haskellPackages` have now a separate bin output: `cabal-fmt`, `calligraphy`, `eventlog2html`, `ghc-debug-brick`, `hindent`, `nixfmt`, `releaser`. This means you need to replace e.g. `"${pkgs.haskellPackages.nixfmt}/bin/nixfmt"` with `"${lib.getBin pkgs.haskellPackages.nixfmt}/bin/nixfmt"` or `"${lib.getExe pkgs.haskellPackages.nixfmt}"`. The binaries also won’t be in scope if you rely on them being installed e.g. via `ghcWithPackages`. `environment.packages` picks the `bin` output automatically, so for normal installation no intervention is required. Also, toplevel attributes like `pkgs.nixfmt` are not impacted negatively by this change. diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index aaa3f5507f77..98ab8595bddf 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -59,7 +59,12 @@ in { config = mkOption { type = attrsOf (nullOr (oneOf [ bool int str ])); - default = {}; + default = { + config = { + ROCKET_ADDRESS = "::1"; # default to localhost + ROCKET_PORT = 8222; + }; + }; example = literalExpression '' { DOMAIN = "https://bitwarden.example.com"; From ab10439c511348d01c305f4f28256a845cd7cb9e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 1 Jul 2023 15:39:58 +0200 Subject: [PATCH 094/143] gping: 1.3.2 -> 1.12.0 --- pkgs/tools/networking/gping/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 4d320779b600..2994112a2910 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -4,23 +4,26 @@ , fetchFromGitHub , libiconv , Security +, iputils }: rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.3.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - sha256 = "sha256-hAUmRUMhP3rD1k6UhIN94/Kt+OjaytUTM3XIcrvasco="; + hash = "sha256-0+qSBnWewWg+PE5y9tTLLaB/uxUy+9uQkR1dnsk7MIY="; }; - cargoSha256 = "sha256-SqQsKTS3psF/xfwyBRQB9c3/KIZU1fpyqVy9fh4Rqkk="; + cargoHash = "sha256-N2V6Wwb2YB2YlBjyHZrh73RujTAmgsFOBLiN/SILP1k="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeCheckInputs = [ iputils ]; + doInstallCheck = true; installCheckPhase = '' $out/bin/gping --version | grep "${version}" @@ -29,6 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Ping, but with a graph"; homepage = "https://github.com/orf/gping"; + changelog = "https://github.com/orf/gping/releases/tag/gping-v${version}"; license = licenses.mit; maintainers = with maintainers; [ andrew-d ]; }; From 8716d4d8d42899cbeaa95299def93b1670d6c793 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 14:08:42 +0000 Subject: [PATCH 095/143] python310Packages.pyopencl: 2023.1 -> 2023.1.1 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 03549ea2977d..c5336d788560 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -24,13 +24,13 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2023.1"; + version = "2023.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-2d5gcnKRmlB6nCTD3+7q/nLAX3zWyeN7IRno7jxTqJE="; + hash = "sha256-CtkleKlKC+De3Vyk/Lbie1p13k5frHV/BMkES9nUJEQ="; }; nativeBuildInputs = [ setuptools ]; From b89ac122a7d63edab3f9ca0af5f6c8371cea84c5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:09:53 +0000 Subject: [PATCH 096/143] =?UTF-8?q?epiphany:=2044.3=20=E2=86=92=2044.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/44.3...44.5 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 52711726ec5e..ee31ca4fa565 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "44.3"; + version = "44.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9ekEsuUQIQTYt/46YVA0rdeN4DEWSStUy968ooC92Jk="; + sha256 = "PEdeBO0qD0EMtEuWk3VjaXB5GTrJt6UMkUhfubCDFas="; }; nativeBuildInputs = [ From 02edd3494b1da79dae4b29574be93836ef6c357c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:00:19 +0000 Subject: [PATCH 097/143] =?UTF-8?q?evolution:=203.48.3=20=E2=86=92=203.48.?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution/-/compare/3.48.3...3.48.4 --- .../networking/mailreaders/evolution/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index d2bfc24662fc..fd0e436ec45c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.48.3"; + version = "3.48.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ZhJexH/XcBcRdNDAhYZu/7aoNEQBW34sdkEpUtbLDiM="; + sha256 = "oC+Z66BQp3HyxH1D/FLgCyJg/IbQYyD79S68fozni7c="; }; nativeBuildInputs = [ From 128b83fc3af7f6ed2a6d956d869773acb25d941d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:05:40 +0000 Subject: [PATCH 098/143] =?UTF-8?q?evolution-data-server:=203.48.3=20?= =?UTF-8?q?=E2=86=92=203.48.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.48.3...3.48.4 --- pkgs/desktops/gnome/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 950be481eced..a604efb9cc59 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.48.3"; + version = "3.48.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "tx5BLlL1Z8gzlLWSbfkrT09tLN3rrThKUXxyBnH62ZY="; + sha256 = "mX4/k7F++wr/zAF77oeAul+iwAnjZVG7yRoIrlUtbWA="; }; patches = [ From c67fc8664304f310841f36df469db2bab6b238b5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:07:53 +0000 Subject: [PATCH 099/143] =?UTF-8?q?gnome.gnome-control-center:=2044.2=20?= =?UTF-8?q?=E2=86=92=2044.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/44.2...44.3 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 2eee6813a0a2..e9fd74c9222d 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -65,11 +65,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "44.2"; + version = "44.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BiPX0hz+lw0u80QgYjVFpZRbmJLmQfmgEc7Owhr9oQw="; + sha256 = "sha256-BmplBS/D7ProYAJehfeX5qsrh6WMT4q5xm7CBxioDHo="; }; patches = [ From ab9edafb637251cc55ee8c4f380b17e3114df2a3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 1 Jul 2023 14:08:38 +0000 Subject: [PATCH 100/143] =?UTF-8?q?gnome.gnome-software:=2044.2=20?= =?UTF-8?q?=E2=86=92=2044.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/44.2...44.3 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 9bfac3ca793d..bee1f9e86db5 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "44.2"; + version = "44.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wC3OcOUrN80pwDdlCzcq2xmyfSD+RLwJIdgalZ01YWw="; + sha256 = "Mlq7ciyrILaqZ/FY6i/y6omYMMoKiD4kWU2d74X9FiI="; }; patches = [ From 223e8ed5b5cfed020da404f5a2d6a69c5a2ade9e Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 1 Jul 2023 16:20:09 +0200 Subject: [PATCH 101/143] python3Packages.django-compressor: 4.3.1 -> 4.4 --- .../python-modules/django-compressor/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 0df2ebc96239..795d9c89e5ad 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -11,21 +11,15 @@ buildPythonPackage rec { pname = "django-compressor"; - version = "4.3.1"; + version = "4.4"; format = "setuptools"; src = fetchPypi { pname = "django_compressor"; inherit version; - hash = "sha256-aIWMDabMCZzCmgIthsO6iu0RTanXCe7OsNe4GBtfiUI="; + hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "rcssmin == 1.1.0" "rcssmin>=1.1.0" \ - --replace "rjsmin == 1.2.0" "rjsmin>=1.2.0" - ''; - propagatedBuildInputs = [ rcssmin rjsmin From be19c4c3700bc20e4a98ffe1f7a012854a40a322 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 14:38:14 +0000 Subject: [PATCH 102/143] bun: 0.6.9 -> 0.6.12 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 4fcc891f6c27..f7fe5bdc3284 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.6.9"; + version = "0.6.12"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "19NWXqC6HNBP45IYeZYQQE8/cp0M5VTEspmg/Sf0GMU="; + sha256 = "CCfBRrvG1OFThIQ/udmXK/civUFPow7aXlrJO1o00Cg="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "qmjYq+UhYO4uYvygVtetTrGfbsRDuZDrViui+Dg4TU4="; + sha256 = "V5csrlGcxwUsKu078vIMgbWkxBa8OvFUeCvPFhcTOPE="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "TBpqRY+ZLdS33S/tYdyZCflZMRjLwMQknE+H22AsPJg="; + sha256 = "GSzjmoBhCXj6LOUoviRhbJtftWXIYXcc6HWx9N4npMY="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "rOoeiinBgzTuoVb+Bhdo+gHvT2RXCF1fROau6A4CzJk="; + sha256 = "M/YDVAOXK7TUbrcey+J7plrTzTXPBOps7JPBioGew7E="; }; }; updateScript = writeShellScript "update-bun" '' From c252f82800904690d21735b53396a50f51e9b2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 13 May 2023 07:57:00 +0200 Subject: [PATCH 103/143] bcachefs-tools: unstable-2023-01-31 -> unstable-2023-06-28 --- .../filesystems/bcachefs-tools/Cargo.lock | 998 ++++++++++++++++++ .../filesystems/bcachefs-tools/default.nix | 80 +- 2 files changed, 1048 insertions(+), 30 deletions(-) create mode 100644 pkgs/tools/filesystems/bcachefs-tools/Cargo.lock diff --git a/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock b/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock new file mode 100644 index 000000000000..c4dd7f58c704 --- /dev/null +++ b/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock @@ -0,0 +1,998 @@ +# 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 = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bcachefs-rust" +version = "0.3.1" +dependencies = [ + "anyhow", + "atty", + "bch_bindgen", + "byteorder", + "chrono", + "clap", + "colored", + "either", + "errno", + "gag", + "getset", + "itertools", + "libc", + "log", + "parse-display", + "rpassword", + "udev", + "uuid", +] + +[[package]] +name = "bch_bindgen" +version = "0.1.0" +dependencies = [ + "anyhow", + "bindgen", + "bitfield", + "bitflags", + "byteorder", + "chrono", + "colored", + "gag", + "libc", + "memoffset", + "paste", + "pkg-config", + "udev", + "uuid", +] + +[[package]] +name = "bindgen" +version = "0.64.0" +source = "git+https://evilpiepirate.org/git/rust-bindgen.git#f773267b090bf16b9e8375fcbdcd8ba5e88806a8" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", +] + +[[package]] +name = "bitfield" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "clang-sys" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a" +dependencies = [ + "glob", + "libc", +] + +[[package]] +name = "clap" +version = "4.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cxx" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "filedescriptor" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e" +dependencies = [ + "libc", + "thiserror", + "winapi", +] + +[[package]] +name = "gag" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a713bee13966e9fbffdf7193af71d54a6b35a0bb34997cd6c9519ebeb5005972" +dependencies = [ + "filedescriptor", + "tempfile", +] + +[[package]] +name = "getset" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + +[[package]] +name = "js-sys" +version = "0.3.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "parse-display" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd87725635cbae7fe960f91f55a114ed104e637790317cc8d9197ea16b058010" +dependencies = [ + "lazy_static", + "parse-display-derive", + "regex", +] + +[[package]] +name = "parse-display-derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc52b391380aa8550348736a356bf028f5469391d580533a566e97543f55e813" +dependencies = [ + "lazy_static", + "proc-macro2", + "quote", + "regex", + "regex-syntax", + "syn", +] + +[[package]] +name = "paste" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +dependencies = [ + "unicode-ident", +] + +[[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 = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "rpassword" +version = "4.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "scratch" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +dependencies = [ + "rustix", + "windows-sys", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi", + "winapi", +] + +[[package]] +name = "udev" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebdbbd670373442a12fe9ef7aeb53aec4147a5a27a00bbc3ab639f08f48191a" +dependencies = [ + "libc", + "libudev-sys", + "pkg-config", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "uuid" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasm-bindgen" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[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-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index f96ee77d9339..81152d144aa9 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -2,9 +2,7 @@ , stdenv , fetchFromGitHub , pkg-config -, docutils , libuuid -, libscrypt , libsodium , keyutils , liburcu @@ -12,67 +10,89 @@ , libaio , zstd , lz4 -, python3Packages -, util-linux +, attr , udev , valgrind , nixosTests -, makeWrapper -, getopt , fuse3 +, cargo +, rustc +, coreutils +, rustPlatform +, makeWrapper , fuseSupport ? false }: - -stdenv.mkDerivation { +let + rev = "cfa816bf3f823a3bedfedd8e214ea929c5c755fe"; +in stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "unstable-2023-01-31"; + version = "unstable-2023-06-28"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "3c39b422acd3346321185be0ce263809e2a9a23f"; - hash = "sha256-2ci/m4JfodLiPoWfP+QCEqlk0k48zq3mKb8Pdrtln0o="; + inherit rev; + hash = "sha256-XgXUwyZV5N8buYTuiu1Y1ZU3uHXjZ/OZ1kbZ9d6Rt5I="; }; - postPatch = '' - patchShebangs . - substituteInPlace Makefile \ - --replace "pytest-3" "pytest --verbose" \ - --replace "INITRAMFS_DIR=/etc/initramfs-tools" \ - "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" - ''; + # errors on fsck_err function. Maybe miss-detection? + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; nativeBuildInputs = [ - pkg-config docutils python3Packages.python makeWrapper + pkg-config + cargo + rustc + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + makeWrapper ]; + cargoRoot = "rust-src"; + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "bindgen-0.64.0" = "sha256-GNG8as33HLRYJGYe0nw6qBzq86aHiGonyynEM7gaEE4="; + }; + }; + buildInputs = [ - libuuid libscrypt libsodium keyutils liburcu zlib libaio - zstd lz4 python3Packages.pytest udev valgrind + libaio + keyutils + lz4 + + libsodium + liburcu + libuuid + zstd + zlib + attr + udev ] ++ lib.optional fuseSupport fuse3; doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; nativeCheckInputs = [ valgrind ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "VERSION=${lib.strings.substring 0 7 rev}" + "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" + ]; + preCheck = lib.optionalString fuseSupport '' rm tests/test_fuse.py ''; - # this symlink is needed for mount -t bcachefs to work - postFixup = '' - ln -s $out/bin/mount.bcachefs.sh $out/bin/mount.bcachefs - wrapProgram $out/bin/mount.bcachefs.sh \ - --prefix PATH : ${lib.makeBinPath [ getopt util-linux ]} - ''; - - installFlags = [ "PREFIX=${placeholder "out"}" ]; - passthru.tests = { smoke-test = nixosTests.bcachefs; inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; }; + postFixup = '' + wrapProgram $out/bin/mount.bcachefs \ + --prefix PATH : ${lib.makeBinPath [ coreutils ]} + ''; + enableParallelBuilding = true; meta = with lib; { From 871e00591399d420154373f2a72cb681d996b570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Fri, 3 Mar 2023 22:27:21 -0300 Subject: [PATCH 104/143] linuxKernel.kernels.linux_testing_bcachefs: 6.1.3-unstable-2023-02-01 -> 6.4.0-unstable-2023-06-28 --- .../linux/kernel/linux-testing-bcachefs.nix | 10 ++++++---- pkgs/top-level/linux-kernels.nix | 12 ++---------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index b6f897b024e0..dfe5beb55f6a 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -2,10 +2,12 @@ , stdenv , fetchpatch , kernel -, commitDate ? "2023-02-01" -, currentCommit ? "65960c284ad149cc4bfbd64f21e6889c1e3d1c5f" -, diffHash ? "sha256-4wpY3aYZ93OXSU4wmQs9K62nPyIzjKu4RBQTwksmyyk=" - +, commitDate ? "2023-06-28" +# bcachefs-tools stores the expected-revision in: +# https://evilpiepirate.org/git/bcachefs-tools.git/tree/.bcachefs_revision +# but this does not means that it'll be the latest-compatible revision +, currentCommit ? "84f132d5696138bb038d2dc8f1162d2fab5ac832" +, diffHash ? "sha256-RaBWBU7rXjJFb1euFAFBHWCBQAG7npaCodjp/vMYpyw=" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3f448f4cdeb0..9beff0671279 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -205,16 +205,8 @@ in { linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { # Pinned on the last version which Kent's commits can be cleany rebased up. - kernel = buildLinux rec { - version = "6.1.3"; - modDirVersion = lib.versions.pad 3 version; - extraMeta.branch = lib.versions.majorMinor version; - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - hash = "sha256-bcia56dRPkM8WXxzRu1/9L/RFepDo7XiemvbOMVYAxc="; - }; - }; - kernelPatches = linux_6_1.kernelPatches; + kernel = linux_6_4; + kernelPatches = linux_6_4.kernelPatches; }; linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { From 4d719f101c28bede334298c026a7fcb3e19553a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 13 May 2023 13:23:19 +0200 Subject: [PATCH 105/143] nixos/bcachefs: add new mount.bcachefs util --- nixos/modules/tasks/filesystems/bcachefs.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 851c09781339..19ef188ce783 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -6,6 +6,15 @@ let bootFs = filterAttrs (n: fs: (fs.fsType == "bcachefs") && (utils.fsNeededForBoot fs)) config.fileSystems; + mountCommand = pkgs.runCommand "mount.bcachefs" {} '' + mkdir -p $out/bin + cat > $out/bin/mount.bcachefs < Date: Thu, 15 Jun 2023 19:25:37 +0200 Subject: [PATCH 106/143] nixos/test/bcachefs: fix password input --- nixos/tests/bcachefs.nix | 2 +- nixos/tests/installer.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 68ac49d0a6a6..0385e098997f 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "keyctl link @u @s", "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", "echo password | bcachefs unlock /dev/vdb1", - "mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", + "echo password | mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", "udevadm settle", "bcachefs fs usage /tmp/mnt", "umount /tmp/mnt", diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 1f575f63bee8..4f4b91518845 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -834,7 +834,7 @@ in { "keyctl link @u @s", "echo password | mkfs.bcachefs -L root --encrypted /dev/vda3", "echo password | bcachefs unlock /dev/vda3", - "mount -t bcachefs /dev/vda3 /mnt", + "echo password | mount -t bcachefs /dev/vda3 /mnt", "mkfs.ext3 -L boot /dev/vda1", "mkdir -p /mnt/boot", "mount /dev/vda1 /mnt/boot", From 005fa5b3c4b9a478361e4bd009c06dabd1169f23 Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Sat, 1 Jul 2023 17:11:35 +0200 Subject: [PATCH 107/143] homebank: 5,5,6 -> 5.6.5 --- pkgs/applications/office/homebank/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 17a9cbb59244..e82aa82edd1d 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.5.6"; + version = "5.6.5"; src = fetchurl { - url = "http://homebank.free.fr/public/homebank-${version}.tar.gz"; - sha256 = "sha256-Rg6OjHLkwVIDnXqzqPXA8DxqSdrh2T6V/gLBND8vx9o="; + url = "http://homebank.free.fr/public/sources/homebank-${version}.tar.gz"; + hash = "sha256-tUlN/Ph9eoVyaWoq+ioESWunnjhXzT47GKwDvRttLKg="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; From e62eb7cbbe5da9d022d07d09b049ee61ce5b91a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 15:32:23 +0000 Subject: [PATCH 108/143] python311Packages.crc: 4.2.0 -> 4.3.0 --- pkgs/development/python-modules/crc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index 6117ad4c5aea..16f04f180e45 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "crc"; - version = "4.2.0"; + version = "4.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Nicoretti"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-h/RVMIJX+Lyted0FHNBcKY54EiirSclkBXCpAQSATq8="; + hash = "sha256-rH/jc6/gxww3NSCYrhu+InZX1HTTdJFfa52ioU8AclY="; }; nativeBuildInputs = [ poetry-core ]; From e824b1bd18d8c548e313555104ab9273d2a86432 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sat, 1 Jul 2023 17:43:52 +0200 Subject: [PATCH 109/143] gimoji: 0.5.0 -> 0.5.1 --- pkgs/applications/misc/gimoji/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gimoji/default.nix b/pkgs/applications/misc/gimoji/default.nix index 7c544e57068d..726965afec1a 100644 --- a/pkgs/applications/misc/gimoji/default.nix +++ b/pkgs/applications/misc/gimoji/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "gimoji"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "zeenix"; repo = "gimoji"; rev = version; - hash = "sha256-fRAi+ac/NzG6FQZq6ohpan5ZNtiwJXLV6k1BsMwaJsg="; + hash = "sha256-8aMm6OHDYBGvLYrQmQh33SI3jap6fS7lgOYDn9lWS18="; }; - cargoHash = "sha256-57A/D6XgedQEaTn+lx5Ce/O8wR2xO3ozemLQOOF8/84="; + cargoHash = "sha256-IENW19FlqWLk7K0+r9IUhXkS7C/wmik2bGDZdRk0jzA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit From bb1ebc139d6932274fb972054d913e4d1d32642c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 15:46:22 +0000 Subject: [PATCH 110/143] system76-keyboard-configurator: 1.3.6 -> 1.3.7 --- .../misc/system76-keyboard-configurator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 89074db7e059..1002fb13ae89 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-xM1A9hREy/l3KPZAKt/UDCGTXquLG0imAs9/BwO0YeA="; + sha256 = "sha256-73D24g3jvPPregR/bLSpWzSGQRlhjp2/0kHuDDSqSBY="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-Bf2hf1l5KNdSlOZn6++sgmdGrH356BHP77k0bNhjFDg="; + cargoHash = "sha256-AGWrMMJ5FihIVc7HvzpsL1Vmi/fvuFowX+ijgwGRJCo="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; From 1eb7b7ff8e220f8b5ac58e67bb5f2f269806ce66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 15:49:55 +0000 Subject: [PATCH 111/143] ghz: 0.115.0 -> 0.117.0 --- pkgs/tools/networking/ghz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ghz/default.nix b/pkgs/tools/networking/ghz/default.nix index bebc2626652a..495d9dd3a1f3 100644 --- a/pkgs/tools/networking/ghz/default.nix +++ b/pkgs/tools/networking/ghz/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghz"; - version = "0.115.0"; + version = "0.117.0"; src = fetchFromGitHub { owner = "bojand"; repo = "ghz"; rev = "v${version}"; - sha256 = "sha256-Y/RvXBE2+ztAPJrSBek1APkN7F3LIWAz13TGQUgFzR0="; + sha256 = "sha256-aAqbSPcz7qQID4H0Vu3VTnbECvlj+We9K5F656k9jTw="; }; - vendorHash = "sha256-BTfdKH2FBfIeHOG4dhOopoPQWHjhlJstQWWOkMwEOGs="; + vendorHash = "sha256-jtzCOF5TAHv3PiGxBx65IR/3x6JpqMzsWW8amab8hqQ="; subPackages = [ "cmd/ghz" "cmd/ghz-web" ]; From a0e1da0b60a4a416556035d8cb9b6546fae99ce0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 15:59:12 +0000 Subject: [PATCH 112/143] libamqpcpp: 4.3.24 -> 4.3.25 --- pkgs/development/libraries/libamqpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 180a8874e50e..98fc4ae1774d 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.24"; + version = "4.3.25"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-65/LsH1ZDkeBrtQUmKc5/5C2ce4nw4nSHXnJqZMKenI="; + sha256 = "sha256-9nqp7VM5korICwzZF0XTlC4uKwjSY5MoILVJBzKulPk="; }; buildInputs = [ openssl ]; From 7f83fd6f0e69d41b373df6c4d9b3dddb836a9680 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 09:04:59 -0400 Subject: [PATCH 113/143] rustypaste: 0.10.1 -> 0.11.1 Diff: https://github.com/orhun/rustypaste/compare/v0.10.1...v0.11.1 Changelog: https://github.com/orhun/rustypaste/blob/v0.11.1/CHANGELOG.md --- pkgs/servers/rustypaste/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 725cf317980e..b7b4e3c4ee6e 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WLuMG9gC2kSdyrYa0CNnInjetXph0OL/Jmjskih4tuw="; + sha256 = "sha256-5yttOaDsWcRCFBzziOW4H1Nrs7/X/pGFlnPNUQRf+w8="; }; - cargoHash = "sha256-A651PTooQjITjxCLKPhnFSCxa27uesTOP8ZbAlRbOUk="; + cargoHash = "sha256-8lv0AGcV4LW6r+K0rIZNV0NPhX4j3+wbMw4JeJkNuXw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices @@ -20,11 +20,14 @@ rustPlatform.buildRustPackage rec { # Some tests need network checkFlags = [ "--skip=paste::tests::test_paste_data" + "--skip=server::tests::test_index_with_landing_page_file_not_found" "--skip=server::tests::test_upload_file" "--skip=server::tests::test_upload_remote_file" "--skip=util::tests::test_get_expired_files" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A minimal file upload/pastebin service"; homepage = "https://github.com/orhun/rustypaste"; From b520edce0259644afbf6cddbaf9651e0498efc17 Mon Sep 17 00:00:00 2001 From: Mac Chaffee Date: Sat, 1 Jul 2023 12:16:57 -0400 Subject: [PATCH 114/143] maintainers: add mac-chaffee --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23e585871ace..149ea5179439 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9841,6 +9841,11 @@ fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; }]; }; + mac-chaffee = { + name = "Mac Chaffee"; + github = "mac-chaffee"; + githubId = 7581860; + }; maddiethecafebabe = { email = "maddie@cafebabe.date"; github = "maddiethecafebabe"; From e470bc2b48321381838625d9782efa651fd5c0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 1 Jul 2023 18:11:24 +0200 Subject: [PATCH 115/143] turbovnc: 3.0.1 -> 3.0.3 * The DRI related variables were changed in 3.0.2: https://github.com/TurboVNC/turbovnc/commit/c58cdb2b7fe72685f97dee5872336f32a40fa04a Co-Authored-By: Alexander Koval --- pkgs/tools/admin/turbovnc/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index 9204d54ab129..801fe1ba4a14 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -17,6 +17,7 @@ , openssl , pam , perl +, pkg-config , python3 , which , xkbcomp @@ -26,15 +27,15 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "turbovnc"; - version = "3.0.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "TurboVNC"; repo = "turbovnc"; - rev = version; - sha256 = "sha256-GRY6aW6Kvy5sDQRiOVz2cUgKEG0IMveh80S26/rGWdM="; + rev = finalAttrs.version; + hash = "sha256-akkkbDb5ZHTG5GEEeDm1ns60GedQ+DnFXgVMZumRQHc="; }; # TODO: @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { # * `-- FONT_ENCODINGS_DIRECTORY = /var/empty/share/X11/fonts/encodings` # Maybe relevant what the tigervnc and tightvnc derivations # do with their `fontDirectories`? - # * `SERVER_MISC_CONFIG_PATH = /var/empty/lib64/xorg` + # * `XORG_REGISTRY_PATH = /var/empty/lib64/xorg` # * The thing about xorg `protocol.txt` # * Does SSH support require `openssh` on PATH? # * Add `enableClient ? true` flag that disables the client GUI @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { cmake makeWrapper openjdk_headless + pkg-config python3 ]; @@ -92,7 +94,7 @@ stdenv.mkDerivation rec { # to the swrast dri driver in Mesa. # Can also be given at runtime to its `Xvnc` as: # -dridir /nix/store/...-mesa-20.1.10-drivers/lib/dri/ - "-DDRI_DRIVER_PATH=${mesa.drivers}/lib/dri" + "-DXORG_DRI_DRIVER_PATH=${mesa.drivers}/lib/dri" # The build system doesn't find these files automatically. "-DTJPEG_JAR=${libjpeg_turbo.out}/share/java/turbojpeg.jar" "-DTJPEG_JNILIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" @@ -137,6 +139,6 @@ stdenv.mkDerivation rec { description = "High-speed version of VNC derived from TightVNC"; maintainers = with lib.maintainers; [ nh2 ]; platforms = with lib.platforms; linux; - changelog = "https://github.com/TurboVNC/turbovnc/blob/${version}/ChangeLog.md"; + changelog = "https://github.com/TurboVNC/turbovnc/blob/${finalAttrs.version}/ChangeLog.md"; }; -} +}) From e109ab32b5f0fe4a5770baff1b56c50c31daea08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 16:28:27 +0000 Subject: [PATCH 116/143] bearer: 1.14.0 -> 1.15.0 --- pkgs/development/tools/bearer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 718015ace1a9..aece15601314 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-7h+7lP4K4Dbf5V2HDrb2lJKWqINtOpqybBAyae0S6EE="; + hash = "sha256-fmEvXSiWtQuFCsaUxiruEi+pU8FnHg23Z1YXtpKyCy8="; }; - vendorHash = "sha256-D8LdufbOx3ogLbeSwBTsDnQ4NpZF+Ro2QiUg4hPGGYI="; + vendorHash = "sha256-NkqMmMwm6CvJn8rPyG1gFmBiayws28kgobTVPJh2l5o="; subPackages = [ "cmd/bearer" From abd715655377091ecfd7f63e47d1c0ca94d240a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 1 Jul 2023 18:32:36 +0200 Subject: [PATCH 117/143] consul: 1.15.3 -> 1.16.0 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 171724598d44..1f9b68060321 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.15.3"; + version = "1.16.0"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-Xe+baALN8Ow6vjneWAvC65cBSsrMAsdxjEQRBcvWxCw="; + hash = "sha256-7F0kutAWyi22OxI242P8m1Aoj+l/7F91wmxDSt4ttyA="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-tbwX/uF9+yIhd+KSGF2v7HjxGtfaZYSm+1GIspQmC9A="; + vendorHash = "sha256-aZRW+z9oW7if+yMOrETNXFC521Wo0feq1FDv8/Q4ejY="; doCheck = false; From 64ded123c60230f4669e00e81f3a52adfa750ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 1 Jul 2023 18:36:07 +0200 Subject: [PATCH 118/143] release-notes: Mention Consul 1.16 upgrade --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 50847f663f50..b8c1d2938a99 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -38,6 +38,8 @@ - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides +- `consul` has been updated to `1.16.0`. See the [release note](https://github.com/hashicorp/consul/releases/tag/v1.16.0) for more details. Once a new Consul version has started and upgraded its data directory, it generally cannot be downgraded to the previous version. + - `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details. - The [services.caddy.acmeCA](#opt-services.caddy.acmeCA) option now defaults to `null` instead of `"https://acme-v02.api.letsencrypt.org/directory"`, to use all of Caddy's default ACME CAs and enable Caddy's automatic issuer fallback feature by default, as recommended by upstream. From a61134c74c0d6a27ad61e93b04d5eec6088eb2bf Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 12 Aug 2022 15:54:06 +0200 Subject: [PATCH 119/143] python310Packages.django-compressor: Enable more tests --- .../django-compressor/default.nix | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 0df2ebc96239..4d4c2d7b0fbe 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -7,43 +7,52 @@ , beautifulsoup4 , brotli , pytestCheckHook +, django-sekizai +, pytest-django +, csscompressor +, calmjs +, jinja2 +, python }: buildPythonPackage rec { pname = "django-compressor"; - version = "4.3.1"; + version = "4.4"; format = "setuptools"; src = fetchPypi { pname = "django_compressor"; inherit version; - hash = "sha256-aIWMDabMCZzCmgIthsO6iu0RTanXCe7OsNe4GBtfiUI="; + hash = "sha256-GwrMnPup9pvDjnxB2psNcKILyVWHtkP/75YJz0YGT2c="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "rcssmin == 1.1.0" "rcssmin>=1.1.0" \ - --replace "rjsmin == 1.2.0" "rjsmin>=1.2.0" - ''; - propagatedBuildInputs = [ + beautifulsoup4 + calmjs + django-appconf + jinja2 rcssmin rjsmin - django-appconf ]; - pythonImportsCheck = [ - "compressor" - ]; - - doCheck = false; # missing package django-sekizai - - nativeCheckInputs = [ + checkInputs = [ beautifulsoup4 brotli + csscompressor + django-sekizai pytestCheckHook + pytest-django ]; + # Getting error: compressor.exceptions.OfflineGenerationError: You have + # offline compression enabled but key "..." is missing from offline manifest. + # You may need to run "python manage.py compress" + disabledTestPaths = [ + "compressor/tests/test_offline.py" + ]; + + pythonImportsCheck = [ "compressor" ]; + DJANGO_SETTINGS_MODULE = "compressor.test_settings"; meta = with lib; { From 43b5e1479bf00fa229c4dd4fde7d8c281a98da0e Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 12 Aug 2022 16:04:56 +0200 Subject: [PATCH 120/143] python310Packages.django-sekizai: init at 4.1.0 --- .../python-modules/django-sekizai/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/django-sekizai/default.nix diff --git a/pkgs/development/python-modules/django-sekizai/default.nix b/pkgs/development/python-modules/django-sekizai/default.nix new file mode 100644 index 000000000000..3c4e351f25b4 --- /dev/null +++ b/pkgs/development/python-modules/django-sekizai/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchPypi +, buildPythonPackage +, django_classytags +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "django-sekizai"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; + }; + + propagatedBuildInputs = [ + django_classytags + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + pythonImportsCheck = [ "sekizai" ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + meta = with lib; { + description = "Define placeholders where your blocks get rendered and append to those blocks"; + homepage = "https://github.com/django-cms/django-sekizai"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c96209231f2..09dc8082131e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2875,6 +2875,8 @@ self: super: with self; { django-reversion = callPackage ../development/python-modules/django-reversion { }; + django-sekizai = callPackage ../development/python-modules/django-sekizai { }; + django-sesame = callPackage ../development/python-modules/django-sesame { }; django_silk = callPackage ../development/python-modules/django_silk { }; From 6a2abb1ea6ed6faa270e0e48edf58bed514d1017 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 12 Aug 2022 16:15:39 +0200 Subject: [PATCH 121/143] python310Packages.calmjs: init at 3.4.4 --- .../python-modules/calmjs/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/calmjs/default.nix diff --git a/pkgs/development/python-modules/calmjs/default.nix b/pkgs/development/python-modules/calmjs/default.nix new file mode 100644 index 000000000000..2f27dbc98523 --- /dev/null +++ b/pkgs/development/python-modules/calmjs/default.nix @@ -0,0 +1,54 @@ +{ lib +, fetchPypi +, buildPythonPackage +, calmjs-types +, calmjs-parse +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "calmjs"; + version = "3.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-73NQiY1RMdBrMIlm/VTvHY4dCHL1pQoj6a48CWRos3o="; + extension = "zip"; + }; + + propagatedBuildInputs = [ + calmjs-parse + calmjs-types + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # ModuleNotFoundError: No module named 'calmjs.types' + # Not yet clear how to run these tests correctly + # https://github.com/calmjs/calmjs/issues/63 + # https://github.com/NixOS/nixpkgs/pull/186298 + disabledTestPaths = [ + "src/calmjs/tests/test_dist.py" + "src/calmjs/tests/test_testing.py" + "src/calmjs/tests/test_artifact.py" + "src/calmjs/tests/test_interrogate.py" + "src/calmjs/tests/test_loaderplugin.py" + "src/calmjs/tests/test_npm.py" + "src/calmjs/tests/test_runtime.py" + "src/calmjs/tests/test_toolchain.py" + "src/calmjs/tests/test_vlqsm.py" + "src/calmjs/tests/test_yarn.py" + "src/calmjs/tests/test_command.py" + ]; + + pythonImportsCheck = [ "calmjs" ]; + + meta = with lib; { + description = "Framework for building toolchains and utilities for working with the Node.js ecosystem"; + homepage = "https://github.com/calmjs/calmjs"; + license = licenses.gpl2; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09dc8082131e..98c030ffa3cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1637,6 +1637,8 @@ self: super: with self; { callee = callPackage ../development/python-modules/callee { }; + calmjs = callPackage ../development/python-modules/calmjs { }; + calmjs-parse = callPackage ../development/python-modules/calmjs-parse { }; calysto = callPackage ../development/python-modules/calysto { }; From 19c7a65eefbbd11473da5030e5ad2352eabf14df Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 12 Aug 2022 16:20:31 +0200 Subject: [PATCH 122/143] python310Packages.calmjs-types: init at 1.0.1 --- .../python-modules/calmjs-types/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/calmjs-types/default.nix diff --git a/pkgs/development/python-modules/calmjs-types/default.nix b/pkgs/development/python-modules/calmjs-types/default.nix new file mode 100644 index 000000000000..9f940e92c502 --- /dev/null +++ b/pkgs/development/python-modules/calmjs-types/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "calmjs-types"; + version = "1.0.1"; + + src = fetchPypi { + pname = "calmjs.types"; + inherit version; + sha256 = "sha256-EGWYv9mx3RPqs9dnB5t3Bu3hiujL2y/XxyMP7JkjjAQ="; + extension = "zip"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "calmjs.types" ]; + + meta = with lib; { + description = "Types for the calmjs framework"; + homepage = "https://github.com/calmjs/calmjs.types"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 98c030ffa3cd..8c0581b83f03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1641,6 +1641,8 @@ self: super: with self; { calmjs-parse = callPackage ../development/python-modules/calmjs-parse { }; + calmjs-types = callPackage ../development/python-modules/calmjs-types { }; + calysto = callPackage ../development/python-modules/calysto { }; calysto-scheme = callPackage ../development/python-modules/calysto-scheme { }; From 61cb4170fdd0c0f1002fc96cb905c0e7a7b94930 Mon Sep 17 00:00:00 2001 From: Mac Chaffee Date: Sat, 1 Jul 2023 12:17:39 -0400 Subject: [PATCH 123/143] nixos/static-web-server: create module which uses upstream systemd units This commit creates a nixos module for static-web-server. The module uses upstream systemd units to start static-web-server. It also includes options for configuring static-web-server. --- nixos/modules/module-list.nix | 1 + .../web-servers/static-web-server.nix | 68 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/web-servers/static-web-server.nix | 32 +++++++++ pkgs/servers/static-web-server/default.nix | 9 ++- 5 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/web-servers/static-web-server.nix create mode 100644 nixos/tests/web-servers/static-web-server.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e728dcb3f192..12c854335efe 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1282,6 +1282,7 @@ ./services/web-servers/pomerium.nix ./services/web-servers/rustus.nix ./services/web-servers/stargazer.nix + ./services/web-servers/static-web-server.nix ./services/web-servers/tomcat.nix ./services/web-servers/traefik.nix ./services/web-servers/trafficserver/default.nix diff --git a/nixos/modules/services/web-servers/static-web-server.nix b/nixos/modules/services/web-servers/static-web-server.nix new file mode 100644 index 000000000000..07187f00fecc --- /dev/null +++ b/nixos/modules/services/web-servers/static-web-server.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.static-web-server; + toml = pkgs.formats.toml {}; + configFilePath = toml.generate "config.toml" cfg.configuration; +in { + options = { + services.static-web-server = { + enable = lib.mkEnableOption (lib.mdDoc ''Static Web Server''); + listen = lib.mkOption { + default = "[::]:8787"; + type = lib.types.str; + description = lib.mdDoc '' + The "ListenStream" used in static-web-server.socket. + This is equivalent to SWS's "host" and "port" options. + See here for specific syntax: + ''; + }; + root = lib.mkOption { + type = lib.types.path; + description = lib.mdDoc '' + The location of files for SWS to serve. Equivalent to SWS's "root" config value. + NOTE: This folder must exist before starting SWS. + ''; + }; + configuration = lib.mkOption { + default = { }; + type = toml.type; + example = { + general = { log-level = "error"; directory-listing = true; }; + }; + description = lib.mdDoc '' + Configuration for Static Web Server. See + . + NOTE: Don't set "host", "port", or "root" here. They will be ignored. + Use the top-level "listen" and "root" options instead. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.static-web-server ]; + systemd.packages = [ pkgs.static-web-server ]; + # Have to set wantedBy since systemd.packages ignores the "Install" section + systemd.sockets.static-web-server = { + wantedBy = [ "sockets.target" ]; + # Start with empty string to reset upstream option + listenStreams = [ "" cfg.listen ]; + }; + systemd.services.static-web-server = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + # Remove upstream sample environment file; use config.toml exclusively + EnvironmentFile = [ "" ]; + ExecStart = [ "" "${pkgs.static-web-server}/bin/static-web-server --fd 0 --config-file ${configFilePath} --root ${cfg.root}" ]; + # Supplementary groups doesn't work unless we create the group ourselves + SupplementaryGroups = [ "" ]; + # If the user is serving files from their home dir, override ProtectHome to allow that + ProtectHome = if lib.hasPrefix "/home" cfg.root then "tmpfs" else "true"; + BindReadOnlyPaths = cfg.root; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ mac-chaffee ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 02bef2039075..d62a4dd49fbf 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -709,6 +709,7 @@ in { sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; stargazer = runTest ./web-servers/stargazer.nix; starship = handleTest ./starship.nix {}; + static-web-server = handleTest ./web-servers/static-web-server.nix {}; step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {}; stratis = handleTest ./stratis {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; diff --git a/nixos/tests/web-servers/static-web-server.nix b/nixos/tests/web-servers/static-web-server.nix new file mode 100644 index 000000000000..da1a9bdec5d2 --- /dev/null +++ b/nixos/tests/web-servers/static-web-server.nix @@ -0,0 +1,32 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : { + name = "static-web-server"; + meta = { + maintainers = with lib.maintainers; [ mac-chaffee ]; + }; + + nodes.machine = { pkgs, ... }: { + services.static-web-server = { + enable = true; + listen = "[::]:8080"; + root = toString (pkgs.writeTextDir "nixos-test.html" '' +

Hello NixOS!

+ ''); + configuration = { + general = { directory-listing = true; }; + }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("static-web-server.socket") + machine.wait_for_open_port(8080) + # We don't use wait_until_succeeds() because we're testing socket + # activation which better work on the first request + response = machine.succeed("curl -fsS localhost:8080") + assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file" + response = machine.succeed("curl -fsS localhost:8080/nixos-test.html") + assert "Hello NixOS!" in response + machine.wait_for_unit("static-web-server.service") + ''; +}) diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 0cedcd50768d..24024d235ff0 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, nixosTests }: rustPlatform.buildRustPackage rec { pname = "static-web-server"; @@ -24,6 +24,13 @@ rustPlatform.buildRustPackage rec { "--skip=handle_precondition" ]; + # Need to copy in the systemd units for systemd.packages to discover them + postInstall = '' + install -Dm444 -t $out/lib/systemd/system/ systemd/static-web-server.{service,socket} + ''; + + passthru.tests = { inherit (nixosTests) static-web-server; }; + meta = with lib; { description = "An asynchronus web server for static files-serving"; homepage = "https://static-web-server.net/"; From b1afa702b9adf6846f59c6793fd5dd7acc696a12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 16:52:37 +0000 Subject: [PATCH 124/143] ncpamixer: 1.3.3.3 -> 1.3.3.4 --- pkgs/applications/audio/ncpamixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index d557a7d2da7c..db5aa416b0ce 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ncpamixer"; - version = "1.3.3.3"; + version = "1.3.3.4"; src = fetchFromGitHub { owner = "fulhax"; repo = "ncpamixer"; rev = version; - sha256 = "sha256-TxSfiBSsCAImzCXv6o64Jy7tSefpYCkU0xtuHx26Ss4="; + sha256 = "sha256-JvIxq9CYFR/4p03e2LeJbLn3NUNwhRNF0GlqN6aPfMo="; }; nativeBuildInputs = [ cmake pkg-config ]; From abaecff35863db2b103d1cddb30a92cfe9a91455 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 17:01:35 +0000 Subject: [PATCH 125/143] python310Packages.wagtail-localize: 1.5 -> 1.5.1 --- pkgs/development/python-modules/wagtail-localize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index fdd2e0e39a0e..085eca293d11 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.5"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-aNz4OoUUXWMCahMxuYBxvNWnw7Inxd5svBgwLgoirW8="; + hash = "sha256-RjJyx3sr69voJxa3lH8Nq/liZ3eMoTfZ4phykj7neZA="; }; nativeBuildInputs = [ From 5803226cfef2489111a65b37569b8497d455f3b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 17:06:08 +0000 Subject: [PATCH 126/143] python310Packages.openaiauth: 1.0.2 -> 2.0.0 --- pkgs/development/python-modules/openaiauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index 7cc6e6d99e9a..c8f7b29b6f59 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "openaiauth"; - version = "1.0.2"; + version = "2.0.0"; src = fetchPypi { inherit version; pname = "OpenAIAuth"; - hash = "sha256-0Vd8gvE2guHNlrPBahu23NpUFrJHvm6Q6NSNawX9gbY="; + hash = "sha256-wmVR+cN/uJ75l62uzmHqpvEcnjzi6CU0kQ2e/5LxkBw="; }; propagatedBuildInputs = [ requests ]; From 5cd399600639bc2724a8ab9152cf4fc8b86d4e3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 1 Jul 2023 19:38:43 +0200 Subject: [PATCH 127/143] python310Packages.lightning-utilities: 0.8.0 -> 0.9.0 Diff: https://github.com/Lightning-AI/utilities/compare/refs/tags/v0.8.0...v0.9.0 Changelog: https://github.com/Lightning-AI/utilities/releases/tag/v0.9.0 --- .../python-modules/lightning-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lightning-utilities/default.nix b/pkgs/development/python-modules/lightning-utilities/default.nix index 22a312d26630..e03e005ad7b2 100644 --- a/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/pkgs/development/python-modules/lightning-utilities/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-uwmX+/SK2zBkZQbN/t/DZ3i+XbdAJ/RM+Q649QwMUz0="; + hash = "sha256-vSeHtvsIt4L4qJCVlTPVjIjd62+08JWBnr9+9+ujOfw="; }; nativeBuildInputs = [ From bfb398b80bf196b7177f3bac0ff0490d1eec4e15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 17:45:25 +0000 Subject: [PATCH 128/143] morgen: 2.7.3 -> 2.7.4 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 1bdc378b11c0..30cc891d0999 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.7.3"; + version = "2.7.4"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-8cGL2xQI4NYDPGqnvlnVVvha3wXFT8IcjRWTTGO7OJQ="; + sha256 = "sha256-jrDu4tXuYl2ttTRHpKHZDucqWO4mYc6zwAdRd0rQht4="; }; nativeBuildInputs = [ From c370fa7514e1dca0ceed6740ab76cc9dc196e248 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 20:27:04 +0200 Subject: [PATCH 129/143] python310Packages.openaiauth: add format - disable on unsupported Python releases - Update ordering --- .../python-modules/openaiauth/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index c8f7b29b6f59..68eead616b47 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -1,12 +1,16 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , requests }: buildPythonPackage rec { pname = "openaiauth"; version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit version; @@ -14,8 +18,11 @@ buildPythonPackage rec { hash = "sha256-wmVR+cN/uJ75l62uzmHqpvEcnjzi6CU0kQ2e/5LxkBw="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -23,10 +30,10 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A Python library for authenticating with the OpenAI API"; - license = licenses.mit; - maintainers = with maintainers; [ realsnick ]; + description = "Library for authenticating with the OpenAI API"; homepage = "https://github.com/acheong08/OpenAIAuth"; changelog = "https://github.com/acheong08/OpenAIAuth/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ realsnick ]; }; } From 96ac17cf98a3b150f4c2ce58faad250241615731 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 20:30:03 +0200 Subject: [PATCH 130/143] python311Packages.crc: disable on unsupported Python releases - update ordering --- .../python-modules/crc/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/crc/default.nix b/pkgs/development/python-modules/crc/default.nix index 16f04f180e45..eee1f058366f 100644 --- a/pkgs/development/python-modules/crc/default.nix +++ b/pkgs/development/python-modules/crc/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , poetry-core , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -10,6 +11,8 @@ buildPythonPackage rec { version = "4.3.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "Nicoretti"; repo = pname; @@ -17,13 +20,21 @@ buildPythonPackage rec { hash = "sha256-rH/jc6/gxww3NSCYrhu+InZX1HTTdJFfa52ioU8AclY="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; - pythonImportsCheck = [ "crc" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "crc" + ]; - disabledTestPaths = [ "test/bench" ]; + disabledTestPaths = [ + "test/bench" + ]; meta = with lib; { changelog = "https://github.com/Nicoretti/crc/releases/tag/${version}"; From 464e1a42e076fb9a289f8d51a9cadb53c53f0577 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 20:43:06 +0200 Subject: [PATCH 131/143] python3Packages.django-compressor: add changelog to meta --- pkgs/development/python-modules/django-compressor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-compressor/default.nix b/pkgs/development/python-modules/django-compressor/default.nix index 795d9c89e5ad..788eab0ae326 100644 --- a/pkgs/development/python-modules/django-compressor/default.nix +++ b/pkgs/development/python-modules/django-compressor/default.nix @@ -42,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; - homepage = "https://django-compressor.readthedocs.org/en/latest/"; + homepage = "https://django-compressor.readthedocs.org/"; + changelog = "https://github.com/django-compressor/django-compressor/blob/${version}/docs/changelog.txt"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; }; From 26b4a919207a2ce8520b8947d44cdcbd48701d4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 20:51:45 +0200 Subject: [PATCH 132/143] python311Packages.natsort: 8.3.1 -> 8.4.0 Changelog: https://github.com/SethMMorton/natsort/blob/8.4.0/CHANGELOG.md --- pkgs/development/python-modules/natsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 975e4a8d2eca..fc5d5ab4d590 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "natsort"; - version = "8.3.1"; + version = "8.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UXWVSS3eVwpP1ranb2REQMG6UeIzjIpnHX8Edf2o+f0="; + hash = "sha256-RTEsSg5VB1k9oZPe3QSrsUaSU7YB7K9jRFrYDwoepYE="; }; propagatedBuildInputs = [ From 755b664031761e9fc7c82556a4a4791785ce7966 Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Sat, 1 Jul 2023 21:31:28 +0200 Subject: [PATCH 133/143] nim: 1.6.12 -> 1.6.14 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 43274b3d9d16..692f5331d0b8 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -86,12 +86,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.12"; + version = "1.6.14"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-rO8LCrdzYE1Nc5S2hRntt0+zD0aRIpSyi8J+DHtLTcI="; + hash = "sha256-0HDS8oriQA33/kpJ7OufRc1TmQaxB0gYVqCveo+oLck="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ] From e8daa26290cb6ca0ed926073e7bb0ada76559746 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sat, 1 Jul 2023 21:31:51 +0200 Subject: [PATCH 134/143] alacritty: 0.12.1 -> 0.12.2 (#240962) --- pkgs/applications/terminal-emulators/alacritty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 2a6f958b1a27..be1ccdc354ea 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jw66pBKIhvvaQ+Q6tDV6i7ALa7Z0Pw7dp6gAVPqy5bs="; + hash = "sha256-X3Z+f5r8surBW9FSsmWKZ/fr82ThXBUkS8fr/sTYR50="; }; - cargoHash = "sha256-rDcNliuUDGsd4VA2H9k+AiJTf1ylmFyqCUzxwCtM3T8="; + cargoHash = "sha256-JOmDmJl/y4WNsBnCixJykl4PgYgb5cSyo6MCdYmQAzQ="; nativeBuildInputs = [ cmake From 47192222e8c7ff130c3ba23201a9d00f84450f9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 19:38:10 +0000 Subject: [PATCH 135/143] python310Packages.auth0-python: 4.2.0 -> 4.3.0 --- pkgs/development/python-modules/auth0-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index f1294133dc5a..19066c748d04 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DyFRCQGjyv75YVBPN+1xWjKQtPUv29xblYu2TehkkVo="; + hash = "sha256-enSG8rO0gMpSaf6otdx94xncyxc6Uv570VKVVQkit1g="; }; propagatedBuildInputs = [ From b03ec6c15f5886ebf8ed69228266bd750f48faa9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 2 Jul 2023 04:26:36 +0800 Subject: [PATCH 136/143] verifpal: 0.26.1 -> 0.27.0 (#240880) --- pkgs/tools/security/verifpal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index 821118f598c5..2c02e1249d14 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "verifpal"; - version = "0.26.1"; + version = "0.27.0"; src = fetchgit { url = "https://source.symbolic.software/verifpal/verifpal.git"; rev = "v${version}"; - sha256 = "sha256-y07RXv2QSyUJpGuFsLJ2sGNo4YzhoCYQr3PkUj4eIOY="; + hash = "sha256-rihY5p6nJ1PKjI+gn3NNXy+uzeBG2UNyRYy3UjScf2Q="; }; - vendorSha256 = "sha256-gUpgnd/xiLqRNl1bPzVp+0GM/J5GEx0VhUfo6JsX8N8="; + vendorHash = "sha256-XOCRwh2nEIC+GjGwqd7nhGWQD7vBMLEZZ2FNxs0NX+E="; nativeBuildInputs = [ pigeon ]; From 93c48e3b0db6d6aa0fc1a00f01d0620e7e0d7b7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 22:51:12 +0000 Subject: [PATCH 137/143] python310Packages.reolink-aio: 0.7.0 -> 0.7.2 --- 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 d74cdce95379..c808a891a9e0 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.7.0"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-4+gJcW5wi1MH3OskcfWyDNaT4FKJO5boHaxdORZUwPs="; + hash = "sha256-JW7dv/MwOOZqN2Vrg6FVhsFyZ3BWN2oVGmRn9cSNWs0="; }; postPatch = '' From d186c2cff96a714feb3ae3f8a173dbd7286feb67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jul 2023 23:09:28 +0000 Subject: [PATCH 138/143] intel-compute-runtime: 23.17.26241.15 -> 23.17.26241.24 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index fe1bb139a10b..3dba3de332c2 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "23.17.26241.15"; + version = "23.17.26241.24"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-A0gtSM6e+VcfcGG/6zReV2LIXq6tGbWIwDQFlQ2TW28="; + sha256 = "sha256-FcI9bBJc23UlPP7qSBUc+t4e1X3UEJTYiy86N3KVWrs="; }; nativeBuildInputs = [ cmake pkg-config ]; From 20bb934115dc1dd8074f5dc1f5992aafde355898 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 17:51:55 -0400 Subject: [PATCH 139/143] tailer: unstable-2023-06-26 -> 0.1.1 Diff: https://github.com/hionay/tailer/compare/2f32e2640a220c990ae419d1562889971c9ed535...v0.1.1 --- pkgs/tools/misc/tailer/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/tailer/default.nix b/pkgs/tools/misc/tailer/default.nix index 7f39dfd5815f..19b7d8423919 100644 --- a/pkgs/tools/misc/tailer/default.nix +++ b/pkgs/tools/misc/tailer/default.nix @@ -3,20 +3,24 @@ , fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "tailer"; - version = "unstable-2023-06-26"; + version = "0.1.1"; src = fetchFromGitHub { owner = "hionay"; repo = "tailer"; - rev = "2f32e2640a220c990ae419d1562889971c9ed535"; - hash = "sha256-L+5HlUv6g2o6ghqp8URfR7k5NlWqFhVBmEIsEjGy7aU="; + rev = "v${version}"; + hash = "sha256-gPezz2ksqdCffgdAHwU2NMTar2glp5YGfA5C+tMYPtE="; }; vendorHash = "sha256-nQqSvfN+ed/g5VkbD6XhZNA1G3CGGfwFDdadJ5+WoD0="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; meta = with lib; { description = "A CLI tool to insert lines when command output stops"; From 885617e288a03500abc46a6762214ae006db7430 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 1 Jul 2023 17:53:09 -0400 Subject: [PATCH 140/143] tailer: add version test --- pkgs/tools/misc/tailer/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/misc/tailer/default.nix b/pkgs/tools/misc/tailer/default.nix index 19b7d8423919..f3c4d3545252 100644 --- a/pkgs/tools/misc/tailer/default.nix +++ b/pkgs/tools/misc/tailer/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, tailer }: buildGoModule rec { @@ -22,6 +24,12 @@ buildGoModule rec { "-X=main.version=${version}" ]; + passthru.tests = { + version = testers.testVersion { + package = tailer; + }; + }; + meta = with lib; { description = "A CLI tool to insert lines when command output stops"; homepage = "https://github.com/hionay/tailer"; From 1057042ccc0780c157ac756135e903865eeabe75 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 Jul 2023 08:56:25 +1000 Subject: [PATCH 141/143] aardvark-dns: 1.6.0 -> 1.7.0 Diff: https://github.com/containers/aardvark-dns/compare/v1.6.0...v1.7.0 Changelog: https://github.com/containers/aardvark-dns/releases/tag/v1.7.0 --- pkgs/tools/networking/aardvark-dns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index 3689a4fb127f..106fac53d682 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-l240kejJjv3rVb4S9ngXo88kmByuS/Co3AB/SSv+iIA="; + hash = "sha256-bScL8hFV/Kot7P9nJRMDDhB8pllPUsejtJpbjmQ8skI="; }; - cargoHash = "sha256-d3u/He8+Ei+tX37EgYTGW5gjcalawlTdPekV9iLK7XI="; + cargoHash = "sha256-rrn+ZTAsFs7UTP4xQL3Cy8G6RG7vwT0wMKnXHHIkB90="; passthru.tests = { inherit (nixosTests) podman; }; From 6efe434d39b10a159d6d0cfbce5e90e29ee78c13 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 Jul 2023 08:57:22 +1000 Subject: [PATCH 142/143] netavark: 1.6.0 -> 1.7.0 Diff: https://github.com/containers/netavark/compare/v1.6.0...v1.7.0 Changelog: https://github.com/containers/netavark/releases/tag/v1.7.0 --- pkgs/tools/networking/netavark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/tools/networking/netavark/default.nix index c205f4d35eb2..f1a0aafe0f2c 100644 --- a/pkgs/tools/networking/netavark/default.nix +++ b/pkgs/tools/networking/netavark/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-USGmYLBv2ynnLx5jg+WkRle0AMtO7dDgf41VIepoHN0="; + hash = "sha256-amvy8sR2gpTYU7wcfkFeYyaTvrhZC558zidNdHwxqaI="; }; - cargoHash = "sha256-zj1eE7f4/wSVe+78abMePqsIrCPl6Uhtavn8hq7+ZRY="; + cargoHash = "sha256-v8djyU+MvBmg929oFVPZlRPtj7zK8eZg3/KmCsFNWpw="; nativeBuildInputs = [ installShellFiles mandown protobuf ]; From f5c560df566f09f212370b830551b70b0e425ee1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 1 Jul 2023 08:58:25 +1000 Subject: [PATCH 143/143] gvproxy: 0.6.1 -> 0.6.2 Diff: https://github.com/containers/gvisor-tap-vsock/compare/v0.6.1...v0.6.2 Changelog: https://github.com/containers/gvisor-tap-vsock/releases/tag/v0.6.2 --- pkgs/tools/networking/gvproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix index 0a8ec3d44bc0..4c6e69c600b4 100644 --- a/pkgs/tools/networking/gvproxy/default.nix +++ b/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - hash = "sha256-LkSKJVnWwqWSId/qdb7hTIiryxdazjW4oluZZN47orQ="; + hash = "sha256-3WBL+ByYSiYKXzFkeoUnCxTdhvy3XxLKUHgJ2hO6oIo="; }; vendorHash = null;