From 507c3f748cc8b9942d9486ce48138484b896f6f1 Mon Sep 17 00:00:00 2001 From: yuzukicat Date: Tue, 23 May 2023 12:34:10 +0900 Subject: [PATCH 01/54] emacsPackages.mind-wave 2d94f553a394ce73bcb91490b81e0fc042baa8d3 -> 5109162b74872091c5090a28389bef8f7020274c --- .../elisp-packages/manual-packages/mind-wave/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix index 336cd510479f..2bc5a733f6ce 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix @@ -47,14 +47,14 @@ # ]; melpaBuild rec { pname = "mind-wave"; - version = "20230322.1348"; # 13:48 UTC + version = "20230523.0332"; # 03:32 UTC src = pkgs.fetchFromGitHub { owner = "manateelazycat"; repo = "mind-wave"; - rev = "2d94f553a394ce73bcb91490b81e0fc042baa8d3"; - sha256 = "sha256-6tmcPYAEch5bX5hEHMiQGDNYEMUOvnxF1Vq0VVpBsYo="; + rev = "5109162b74872091c5090a28389bef8f7020274c"; + sha256 = "sha256-ZyXrpb0GLWSGnMsVIGL9qALSBCeIWNF0UwkCFgCKnu8="; }; - commit = "2d94f553a394ce73bcb91490b81e0fc042baa8d3"; + commit = "5109162b74872091c5090a28389bef8f7020274c"; # elisp dependencies packageRequires = [ pkgs.emacsPackages.markdown-mode From 6d93518c5f05716bbbdd37e556eed06c076e54ba Mon Sep 17 00:00:00 2001 From: Varun Madiath Date: Thu, 25 May 2023 13:28:08 +0000 Subject: [PATCH 02/54] pyrosimple: 2.7.0 -> 2.8.0 --- .../networking/p2p/pyrosimple/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 15a9ce266e00..f8427b9dad6b 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -6,6 +6,8 @@ , testers , fetchPypi , buildPythonPackage +, pythonRelaxDepsHook +, poetry-core , bencode-py , apscheduler , jinja2 @@ -24,14 +26,27 @@ }: let - pname = "pyrosimple"; - version = "2.7.0"; + pname = "pyrosimple"; + version = "2.8.0"; +in buildPythonPackage { + inherit pname version; src = fetchPypi { inherit pname version; - hash = "sha256-SMqzvTbWFHwnbMQ+6K0m1v+PybceQK5EHEuN8FB6SaU="; + hash = "sha256-K0QjEcGzROlSWuUHWqUbcOdKccrHex2SlwPAmsmIbaQ="; }; + format = "pyproject"; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "python-daemon" + ]; + propagatedBuildInputs = [ bencode-py apscheduler @@ -48,9 +63,6 @@ let tomli-w ] ++ lib.optional withInotify inotify; -in buildPythonPackage { - inherit pname version src propagatedBuildInputs; - passthru = { updateScript = nix-update-script { }; tests = testers.testVersion { From 16fc230080db71e9c39f303e1de42edfc9a19dbf Mon Sep 17 00:00:00 2001 From: Varun Madiath Date: Fri, 26 May 2023 02:03:35 -0400 Subject: [PATCH 03/54] pyrosimple: Add vamega as maintainer --- pkgs/applications/networking/p2p/pyrosimple/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index f8427b9dad6b..c735057e4573 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -71,14 +71,13 @@ in buildPythonPackage { }; }; - meta = let inherit (lib) licenses platforms maintainers; - in { + meta = with lib; { homepage = "https://kannibalox.github.io/pyrosimple/"; description = "A rTorrent client and Python 3 fork of the pyrocore tools"; license = licenses.gpl3Plus; changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md"; platforms = platforms.all; - maintainers = builtins.attrValues { inherit (maintainers) ne9z; }; + maintainers = with maintainers; [ ne9z vamega ]; }; } From de34f90f35f28190ec843bde71027fe8df552a42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 May 2023 13:16:41 +0200 Subject: [PATCH 04/54] python310Packages.home-assistant-chip-core: 2023.5.2 -> 2023.5.3 https://github.com/home-assistant-libs/chip-wheels/releases/tag/2023.5.3 --- .../python-modules/home-assistant-chip-core/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 35caf1e9d8d4..23f48886daa3 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.5.2"; + version = "2023.5.3"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -36,11 +36,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-25TzM5UMkeGJe4NLUWQXeZ8TQvfdd9NAdsRIw870/0s="; + hash = "sha256-rGBlzYUydgFrt40UQTFlXMUOsEYlgGnvKrfT5WEZrAQ="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-KfQ/Ta+BqOHCrB+6ipaPWKkM7fH/ChtkrvtZdVrNpnI="; + hash = "sha256-8F5z1PAlfJidNeaiT0PN5odyTs99WN0rirXcUpH1mP0="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { From 0bebf70bf6f5df055e50d76b4ad6dc82d973e192 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 May 2023 13:17:14 +0200 Subject: [PATCH 05/54] python310Packages.home-assistant-chip-clusters: 2023.5.2 -> 2023.5.3 https://github.com/home-assistant-libs/chip-wheels/releases/tag/2023.5.3 --- .../python-modules/home-assistant-chip-clusters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index b488dcb6b2d8..663d4e4c0b3b 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.5.2"; + version = "2023.5.3"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-uOIrKEBOWDrne/sfso60QIrasH/++bShgN5XE4KHdMo="; + hash = "sha256-g3Hj21UPkHKKRXPewKLivWaUn1kXnVebayJYOmZfLBY="; }; propagatedBuildInputs = [ From 1f3b595bfc2c9448c1f1eca5a45e706449be5f12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 26 May 2023 18:29:02 +0200 Subject: [PATCH 06/54] python311Packages.license-expression: 30.1.0 -> 30.1.1 Diff: https://github.com/nexB/license-expression/compare/refs/tags/v30.1.0...v30.1.1 Changelog: https://github.com/nexB/license-expression/blob/v30.1.1/CHANGELOG.rst --- .../development/python-modules/license-expression/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index cbff5928829a..bd95899398f8 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "license-expression"; - version = "30.1.0"; + version = "30.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "nexB"; repo = "license-expression"; rev = "refs/tags/v${version}"; - hash = "sha256-QPjVSSndgKlAdGY6nZjjOrnyyVfOVu8ggfBwGWi+RyE="; + hash = "sha256-5pRfFRQLxWmhEKoJZiC7gZbmW8BbqBNBWbdwFL0MtpM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b96bee721b019ccfc0f9d504c432b0f5af0020ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 May 2023 08:21:40 +0000 Subject: [PATCH 07/54] avalanchego: 1.10.1 -> 1.10.2 --- pkgs/applications/networking/avalanchego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 45d35f1cccef..e88c94647e79 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-KGHghhHALMoFuO7i4wq9B2HA2WTA80WSOR5Odpo1Ing="; + hash = "sha256-rQ7WGsDCGR2yrMpNTP3yxnRFEGkCpkFIknxuARYd7TM="; }; - vendorHash = "sha256-+YzC7xjrRI0e8/cOcJM3AZS5hI82H1qFxnfUGMgqXhs="; + vendorHash = "sha256-v8+ASwvXhUT9cz78aWDyWpgHOSoecLCLFMGfjTtRlJQ="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; From 5409925d9806d4270b23828d0c1a35eda749db5a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 29 May 2023 14:36:37 +0200 Subject: [PATCH 08/54] botamusique: Backport fix for invalid version handling --- .../botamusique/catch-invalid-versions.patch | 24 +++++++++++++++++++ pkgs/tools/audio/botamusique/default.nix | 6 +++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/audio/botamusique/catch-invalid-versions.patch diff --git a/pkgs/tools/audio/botamusique/catch-invalid-versions.patch b/pkgs/tools/audio/botamusique/catch-invalid-versions.patch new file mode 100644 index 000000000000..39b9aae8514c --- /dev/null +++ b/pkgs/tools/audio/botamusique/catch-invalid-versions.patch @@ -0,0 +1,24 @@ +diff --git a/mumbleBot.py b/mumbleBot.py +index 11bc480..7395f41 100644 +--- a/mumbleBot.py ++++ b/mumbleBot.py +@@ -188,11 +188,14 @@ class MumbleBot: + th.start() + + last_startup_version = var.db.get("bot", "version", fallback=None) +- if not last_startup_version or version.parse(last_startup_version) < version.parse(self.version): +- var.db.set("bot", "version", self.version) +- if var.config.getboolean("bot", "auto_check_update"): +- changelog = util.fetch_changelog() +- self.send_channel_msg(tr("update_successful", version=self.version, changelog=changelog)) ++ try: ++ if not last_startup_version or version.parse(last_startup_version) < version.parse(self.version): ++ var.db.set("bot", "version", self.version) ++ if var.config.getboolean("bot", "auto_check_update"): ++ changelog = util.fetch_changelog() ++ self.send_channel_msg(tr("update_successful", version=self.version, changelog=changelog)) ++ except version.InvalidVersion: ++ pass + + # Set the CTRL+C shortcut + def ctrl_caught(self, signal, frame): diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index 2288066b8229..5eaaa9c873e3 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , python3Packages , ffmpeg , makeWrapper @@ -53,6 +54,11 @@ stdenv.mkDerivation rec { # We can't update the package at runtime with NixOS, so this patch makes # the !update command mention that ./no-runtime-update.patch + + # Fix passing of invalid "git" version into version.parse, which results + # in an InvalidVersion exception. The upstream fix is insufficient, so + # we carry the correct patch downstream for now. + ./catch-invalid-versions.patch ]; postPatch = '' From aa75b3fdf7b017ac3242e03e77ff658beb91162b Mon Sep 17 00:00:00 2001 From: Julius Rickert Date: Mon, 29 May 2023 16:07:59 +0200 Subject: [PATCH 09/54] zgrab2: 20210327-17a5257 -> 20230323-911c86f --- pkgs/tools/security/zgrab2/default.nix | 17 +++++-- .../zgrab2/fix-go-version-error.patch | 46 +++++++++++++++++++ 2 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/security/zgrab2/fix-go-version-error.patch diff --git a/pkgs/tools/security/zgrab2/default.nix b/pkgs/tools/security/zgrab2/default.nix index b8863a6a94e4..03b58949d8ad 100644 --- a/pkgs/tools/security/zgrab2/default.nix +++ b/pkgs/tools/security/zgrab2/default.nix @@ -5,17 +5,24 @@ buildGoModule rec { pname = "zgrab2"; - version = "20210327-${lib.strings.substring 0 7 rev}"; - rev = "17a5257565c758e2b817511d15476d330be0a17a"; + version = "20230323-${lib.strings.substring 0 7 rev}"; + rev = "911c86f13080ceae98f8d63d1ae0e85c4a8f7f61"; src = fetchFromGitHub { owner = "zmap"; repo = pname; inherit rev; - sha256 = "1hxk2jggj8lww97lwmks46i001p5ycnxnck8yya6d0fd3ayxvw2w"; + hash = "sha256-VOWkBM/SziY3jiIaYYWq+LRzG4vKitiscqdIDfRUkYY="; }; - vendorSha256 = "1s0azy5b5hi5h24vs6a9f1n70l980vkid28ihqh10zq6ajmds2z3"; + vendorHash = "sha256-Q3FCqvh4vn64QXqcePhVWTyIHJarI6I4YonH3X/7RhI="; + + patches = [ + # Without this, we get error messages like: + # vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod) + # The patch was generated by changing "go 1.12" to "go 1.17" and executing `go mod tidy -compat=1.17`. + ./fix-go-version-error.patch + ]; subPackages = [ "cmd/zgrab2" ]; @@ -23,6 +30,6 @@ buildGoModule rec { description = "Web application scanner"; homepage = "https://github.com/zmap/zgrab2"; license = with licenses; [ asl20 isc ]; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab juliusrickert ]; }; } diff --git a/pkgs/tools/security/zgrab2/fix-go-version-error.patch b/pkgs/tools/security/zgrab2/fix-go-version-error.patch new file mode 100644 index 000000000000..797bd542be80 --- /dev/null +++ b/pkgs/tools/security/zgrab2/fix-go-version-error.patch @@ -0,0 +1,46 @@ +diff --git a/go.mod b/go.mod +index 888f10e..5463ef5 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,25 +1,33 @@ + module github.com/zmap/zgrab2 + +-go 1.12 ++go 1.17 + + require ( +- github.com/cespare/xxhash/v2 v2.2.0 // indirect +- github.com/go-kit/kit v0.10.0 // indirect +- github.com/golang/protobuf v1.5.3 // indirect + github.com/hdm/jarm-go v0.0.7 + github.com/prometheus/client_golang v1.14.0 +- github.com/prometheus/common v0.42.0 // indirect +- github.com/prometheus/procfs v0.9.0 // indirect + github.com/sirupsen/logrus v1.9.0 +- github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect + github.com/zmap/zcrypto v0.0.0-20230310154051-c8b263fd8300 + github.com/zmap/zflags v1.4.0-beta.1.0.20200204220219-9d95409821b6 + golang.org/x/crypto v0.7.0 + golang.org/x/net v0.8.0 + golang.org/x/sys v0.6.0 + golang.org/x/text v0.8.0 +- google.golang.org/protobuf v1.30.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c + gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 + gopkg.in/yaml.v2 v2.4.0 + ) ++ ++require ( ++ github.com/beorn7/perks v1.0.1 // indirect ++ github.com/cespare/xxhash/v2 v2.2.0 // indirect ++ github.com/golang/protobuf v1.5.3 // indirect ++ github.com/kr/pretty v0.2.1 // indirect ++ github.com/kr/text v0.1.0 // indirect ++ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect ++ github.com/prometheus/client_model v0.3.0 // indirect ++ github.com/prometheus/common v0.42.0 // indirect ++ github.com/prometheus/procfs v0.9.0 // indirect ++ github.com/weppos/publicsuffix-go v0.30.0 // indirect ++ github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect ++ google.golang.org/protobuf v1.30.0 // indirect ++) From cd26954d81c3b44a45800edc4a3ffb4a8f4a94a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 May 2023 11:18:26 +0000 Subject: [PATCH 10/54] benthos: 4.15.0 -> 4.16.0 --- pkgs/development/tools/benthos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 3f5903e173ad..7d99238c1978 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.15.0"; + version = "4.16.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "refs/tags/v${version}"; - hash = "sha256-RqfTDE4dcVUegiaHsJMm9z9WV2dxFpgT/5LlM5105Oc="; + hash = "sha256-3cT+UBbjqCwglcGpAGpyxwD7MW5e/0w/BkSlS8E91vQ="; }; - vendorHash = "sha256-jfRmzCrw0qZJqt9tHkr/FmLWEAc911Z1hmk+nc6Lyb4="; + vendorHash = "sha256-1G1KxD+9aEnkaNsqPAVo+M+jslQcX4zZMQiKpN2PLRY="; doCheck = false; From 100b59a997e5f30b920dab3f7eceea186b4d384f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 30 May 2023 14:40:09 +0200 Subject: [PATCH 11/54] python3.pkgs.configshell: 1.1.29 -> 1.1.30 --- pkgs/development/python-modules/configshell/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index 2cd66636b016..40ea4fd7be75 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "configshell"; - version = "1.1.29"; + version = "1.1.30"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; rev = "v${version}"; - sha256 = "0mjj3c9335sph8rhwww7j4zvhyk896fbmx887vibm89w3jpvjjr9"; + hash = "sha256-7iWmYVCodwncoPdpw85zrNsZSEq+ume412lyiiJqRPc="; }; propagatedBuildInputs = [ @@ -23,11 +23,6 @@ buildPythonPackage rec { urwid ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pyparsing >=2.0.2,<3.0" "pyparsing >=2.0.2" - ''; - # Module has no tests doCheck = false; From efdcb669888dec99423938c28afe0a02a17442d6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 30 May 2023 14:41:46 +0200 Subject: [PATCH 12/54] python3.pkgs.rtslib: 2.1.75 -> 2.1.76 --- pkgs/development/python-modules/rtslib/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index 4814b863c2a8..808dca3d44f9 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -1,24 +1,16 @@ -{ lib, fetchFromGitHub, fetchpatch, buildPythonPackage, six, pyudev, pygobject3 }: +{ lib, fetchFromGitHub, buildPythonPackage, six, pyudev, pygobject3 }: buildPythonPackage rec { pname = "rtslib"; - version = "2.1.75"; + version = "2.1.76"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; rev = "refs/tags/v${version}"; - hash = "sha256-qBlr4K+LeJIC6Hwy6dN9n/VjHIUYCy8pLlRtPvooWyE="; + hash = "sha256-z9fpSVyv96ZoJaP0ch2A3bX/o/K23ooEpxa/OAhY6Z4="; }; - patches = [ - # - (fetchpatch { - url = "https://github.com/zhaofengli/rtslib-fb/commit/1c3c8257940a88e65676f4333363ddf259a06723.patch"; - hash = "sha256-nDzL8pUKwKIej+6rOg7Om5AkwkClKk6qKlImbpoufz4="; - }) - ]; - propagatedBuildInputs = [ six pyudev pygobject3 ]; meta = with lib; { From b9c585ef6aa4b1a1caa840d726b061faaa9256da Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 30 May 2023 14:43:08 +0200 Subject: [PATCH 13/54] targetcli: 2.1.54 -> 2.1.56 --- pkgs/os-specific/linux/targetcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index f08ac284f23c..381a15006627 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "targetcli"; - version = "2.1.54"; + version = "2.1.56"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; rev = "v${version}"; - sha256 = "1kbbvx0lba96ynr5iwws9jpi319m4rzph4bmcj7yfb37k8mi161v"; + hash = "sha256-sWLwjfuy9WPnrGK0BxUGnNrhtGDoQyRFMY1OSlyxqs4="; }; propagatedBuildInputs = with python3.pkgs; [ configshell rtslib ]; From 12cff2d834a4d161b0c29fe03d3b5c565436b50a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 May 2023 19:53:29 +0000 Subject: [PATCH 14/54] altair: 5.0.23 -> 5.0.25 --- pkgs/development/tools/altair-graphql-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index af29e7e590b3..ff611d5a385f 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.0.23"; + version = "5.0.25"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-sjM5KztkFqsZT153b181OLrus5YS09Dp/w4LD6Q6Ros="; + sha256 = "sha256-uDIjNlT93fKV0DtpJua59hUcHF90fDdvNUt1/PA1gIY="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From dd5bc12f6bdf2864a2c300e79bbe855ca59f0db8 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 30 May 2023 13:13:43 -0700 Subject: [PATCH 15/54] =?UTF-8?q?mozillavpn:=202.14.1=20=E2=86=92=202.15.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/tools/networking/mozillavpn/default.nix | 50 +++++++++++++------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index dd8ce048af07..92cb1e553f84 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -2,6 +2,7 @@ , cargo , cmake , fetchFromGitHub +, fetchpatch , go , lib , libsecret @@ -23,43 +24,56 @@ let pname = "mozillavpn"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-xWm21guI+h0bKd/rEyxVMyxypCitLWEbVy7TaVBKh4o="; + hash = "sha256-eyYrA8ysfmXxlHNUBkGU9ioYrnbx3L1wP9byNz9L/MA="; }; + patches = [ + # Force version downgrade for openssl and openssl-sys crates + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/5911071ea37d12401af32dcdf2a542ca5049bf2f.patch"; + hash = "sha256-b3yOgn3Et0sYpqzUUdmlGIbzZSz13Q9HW56hyQqRnHc="; + revert = true; + }) + # [2.15] Restore qtglean/Cargo.lock + (fetchpatch { + url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/7026/commits/13c1b77ee4249883a33b6ac240b3ca143b485ba1.patch"; + hash = "sha256-L4D71zreDMLAIbP4x1as9QdNmMC1snUZSwlkKehg5yM="; + }) + ]; netfilter-go-modules = (buildGoModule { - inherit pname version src; + inherit pname version src patches; modRoot = "linux/netfilter"; vendorHash = "sha256-Cmo0wnl0z5r1paaEf1MhCPbInWeoMhGjnxCxGh0cyO8="; }).go-modules; extensionBridgeDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-XW47EnNHm5JUWCqDU/iHB6ZRGny4v5x7Fs/1dv5TfzM="; + hash = "sha256-R/9ePEhc4qVgg3WC5ng+cD88K/N3PTnx4QWyaZZfRds="; }; signatureDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-CNPL1Orn+ZbX0HL+CHMaoXPI9G8MoC+hY8pJTJlWH1U="; + hash = "sha256-27g2qnnUrxbThM1cHZquQgWQLWDtZaBnlf8PjvQtBJU="; }; - vpngleanDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}-vpnglean"; - preBuild = "cd vpnglean"; - hash = "sha256-5vazbCqzJG6iA0MFaTNha42jb1pgLhr0P9I8rQxSKtw="; + qtgleanDeps = rustPlatform.fetchCargoTarball { + inherit src patches; + name = "${pname}-${version}-qtglean"; + preBuild = "cd qtglean"; + hash = "sha256-cW+nf+Dho+eSzOBo3xhxki7NXpg0wd5ZM9OMA6iOUl4="; }; in stdenv.mkDerivation { - inherit pname version src; + inherit pname version src patches; buildInputs = [ libsecret @@ -95,9 +109,9 @@ stdenv.mkDerivation { signatureDepsCopy="$cargoDepsCopy" popd - pushd source/vpnglean - cargoDeps='${vpngleanDeps}' cargoSetupPostUnpackHook - vpngleanDepsCopy="$cargoDepsCopy" + pushd source/qtglean + cargoDeps='${qtgleanDeps}' cargoSetupPostUnpackHook + qtgleanDepsCopy="$cargoDepsCopy" popd ''; dontCargoSetupPostUnpack = true; @@ -128,8 +142,8 @@ stdenv.mkDerivation { cargoDepsCopy="$signatureDepsCopy" cargoSetupPostPatchHook popd - pushd vpnglean - cargoDepsCopy="$vpngleanDepsCopy" cargoSetupPostPatchHook + pushd qtglean + cargoDepsCopy="$qtgleanDepsCopy" cargoSetupPostPatchHook popd cargoSetupPostPatchHook() { true; } From 7e067fcf0c623a0cfbf7b6d3e0ce3f92982b285f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 May 2023 23:21:52 +0200 Subject: [PATCH 16/54] zgrab2: update version identifier --- pkgs/tools/security/zgrab2/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/zgrab2/default.nix b/pkgs/tools/security/zgrab2/default.nix index 03b58949d8ad..c91c1b876099 100644 --- a/pkgs/tools/security/zgrab2/default.nix +++ b/pkgs/tools/security/zgrab2/default.nix @@ -5,13 +5,12 @@ buildGoModule rec { pname = "zgrab2"; - version = "20230323-${lib.strings.substring 0 7 rev}"; - rev = "911c86f13080ceae98f8d63d1ae0e85c4a8f7f61"; + version = "unstable-2023-03-23"; src = fetchFromGitHub { owner = "zmap"; repo = pname; - inherit rev; + rev = "911c86f13080ceae98f8d63d1ae0e85c4a8f7f61"; hash = "sha256-VOWkBM/SziY3jiIaYYWq+LRzG4vKitiscqdIDfRUkYY="; }; @@ -24,7 +23,9 @@ buildGoModule rec { ./fix-go-version-error.patch ]; - subPackages = [ "cmd/zgrab2" ]; + subPackages = [ + "cmd/zgrab2" + ]; meta = with lib; { description = "Web application scanner"; From 9c6c8a7358696410a73c055a8a46ffb2e75061f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 May 2023 22:13:59 +0000 Subject: [PATCH 17/54] klayout: 0.28.7 -> 0.28.8 --- pkgs/applications/misc/klayout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 3a35a36394e8..76cc302f358a 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.28.7"; + version = "0.28.8"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-CA6PNoQtg59Mo7dKIgSVeC4owVuAirJ3mFds1J9IQtI="; + hash = "sha256-xM9bAy+HurJor6v2eVPN9gvUxDkyjKRO8kv4zzv9u7o="; }; postPatch = '' From 13fa46dc6669769e26451f2813a116683e3d1782 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 02:11:06 +0000 Subject: [PATCH 18/54] spoofer-gui: 1.4.11 -> 1.4.12 --- pkgs/tools/networking/spoofer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 3bc75d831805..905a28b1b3d0 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.4.11"; + version = "1.4.12"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-FCGFOweeL4o31H/JgqeGiLm3uBjYHz6zzor2ockpA/w="; + sha256 = "sha256-3ljCPmazKz0fHer2yN6baFLu425Dsr9ppdjr2Iv5YJ8="; }; nativeBuildInputs = [ pkg-config ]; From e13fdafaeefa161cf40d12d3655692ce011203ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 02:28:18 +0000 Subject: [PATCH 19/54] reaper: 6.79 -> 6.80 --- pkgs/applications/audio/reaper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 68393ad87ad5..ef0c514bce9f 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.79"; + version = "6.80"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-Bpsc09y5R/zyVXiDAqRF6n09qKOrBTLjk84z+noeko0="; - aarch64-linux = "sha256-jbyXXeVtFmt7xoIWd4YKFu4AUM6W9LzeIiGoGyaO2lU="; + x86_64-linux = "sha256-By97OxGC9YO7yEHzSjDAZHCtVaub1wNwWMOn4F+Qzpg="; + aarch64-linux = "sha256-11DiFfqULIi4tespho+yOH+Qy4s+lithCt19kb4RfhI="; }.${stdenv.hostPlatform.system}; }; From fcb14f9bb0f641948a865ad2e9f393398058e792 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 02:50:37 +0000 Subject: [PATCH 20/54] teams-for-linux: 1.0.93 -> 1.1.1 --- .../networking/instant-messengers/teams-for-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index b26700203d73..2df594232976 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "teams-for-linux"; - version = "1.0.93"; + version = "1.1.1"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mWLjGednrKnEIvrL2iHQP3xoCb6SxptzbE40aJ5wH1U="; + sha256 = "sha256-Yeq74thHzFt4+KDf7cwgyVbTIeXF9/zb81bEAINJbEU="; }; offlineCache = fetchYarnDeps { From 4da18afa67771736ad5dfb61d569a77f1049d69f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 31 May 2023 07:42:55 +0200 Subject: [PATCH 21/54] python311Packages.pywerview: 0.4.1 -> 0.5.0 Diff: https://github.com/the-useless-one/pywerview/compare/refs/tags/v0.4.1...v0.5.0 Changelog: https://github.com/the-useless-one/pywerview/releases/tag/v0.5.0 --- pkgs/development/python-modules/pywerview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywerview/default.nix b/pkgs/development/python-modules/pywerview/default.nix index 43543279efc2..2bbb0b235726 100644 --- a/pkgs/development/python-modules/pywerview/default.nix +++ b/pkgs/development/python-modules/pywerview/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywerview"; - version = "0.4.1"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "the-useless-one"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5/Cn70qQaUp38qko1Wq+gZMCcQtcAPtZwt7Zrx8MFc4="; + hash = "sha256-+fSYDaN0nsffL1icx2nAIJydzwT+JB6qF9u+5b3RPK8="; }; propagatedBuildInputs = [ From f9506e92d2412dfc6bad2403240d7c634ef82d5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 31 May 2023 07:51:58 +0200 Subject: [PATCH 22/54] checkov: relax license-expression constraint --- pkgs/development/tools/analysis/checkov/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 4d7a8b721d43..bc2de82872df 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -37,11 +37,12 @@ buildPythonApplication rec { ]; pythonRelaxDeps = [ - "dpath" "bc-detect-secrets" "bc-python-hcl2" - "pycep-parser" + "dpath" + "license-expression" "networkx" + "pycep-parser" ]; nativeBuildInputs = [ From 7d8e24539daa5525e1d6e7104f69652a2b8b42a1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 31 May 2023 12:04:42 +0200 Subject: [PATCH 23/54] chromium: 113.0.5672.126 -> 114.0.5735.90 https://chromereleases.googleblog.com/2023/05/stable-channel-update-for-desktop_30.html This update includes 16 security fixes. CVEs: CVE-2023-2929 CVE-2023-2930 CVE-2023-2931 CVE-2023-2932 CVE-2023-2933 CVE-2023-2934 CVE-2023-2935 CVE-2023-2936 CVE-2023-2937 CVE-2023-2938 CVE-2023-2939 CVE-2023-2940 CVE-2023-2941 --- .../browsers/chromium/upstream-info.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4b4e0a11d06a..541a5af91a11 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,21 +1,21 @@ { "stable": { - "version": "113.0.5672.126", - "sha256": "14rdvidabbh0abp932m747iribvpfcha8hhxh9spck9hjkaprvqd", - "sha256bin64": "1w8b41ij6xl8byh1977skxwwq0nivpfn8wb3gv12xvm7sw24jqka", + "version": "114.0.5735.90", + "sha256": "1n16fp0zf38n7i8zb86ilx8g62xjnahf7q0c3zwj6n8pnqh8c6h7", + "sha256bin64": "1dgz21ycc41nxz8y5fqz73ll96vvlrf8vxfn65vy654jw7dsdpw6", "deps": { "gn": { - "version": "2023-03-18", + "version": "2023-04-19", "url": "https://gn.googlesource.com/gn", - "rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4", - "sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq" + "rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa", + "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" } }, "chromedriver": { - "version": "113.0.5672.63", - "sha256_linux": "09x1p7wk5am3ri7ahsdlg4nas22xcwmxzwa5d6fs6hjygghm2q8j", - "sha256_darwin": "1hbd7mk7lifhk72p0hppj9vz1rnfzklg3pdmfa4ixsbgachvxii6", - "sha256_darwin_aarch64": "1c4gyr86b463fq0k31ajsp2npad871nqpacpxr26imd5zzirmsgf" + "version": "114.0.5735.90", + "sha256_linux": "0i3g79c4vdi5mys295lpzmmh0pgxhh14mjmz9amhq5rrn7w7wy57", + "sha256_darwin": "0l0nzx64vrr2wggwdyrcv0xbv79avr431cppprl4dg62b39wkgba", + "sha256_darwin_aarch64": "0z549y1w855ljia5w8sf9w6398pnn89y28pg26ygqad888b3msql" } }, "beta": { From 7c4e31bb4c5b366106ed338d69bf0ef5bad485c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 13:33:15 +0000 Subject: [PATCH 24/54] igv: 2.16.0 -> 2.16.1 --- pkgs/applications/science/biology/igv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index ec97f0e6aa31..c9af0483da2a 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.16.0"; + version = "2.16.1"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-pfFUtPgHzTWMm3sh4un8SwSYF8HM30HbAQznxlu4Irw="; + sha256 = "sha256-/3ielakIRdm9/iGBKSk+fTyzYRnsMTdCdsKghnziVwA="; }; installPhase = '' From c78bbdb38f750d2b51008a47ce7323ed6ec8a40f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 14:01:38 +0000 Subject: [PATCH 25/54] geoserver: 2.23.0 -> 2.23.1 --- pkgs/servers/geospatial/geoserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix index 368badee0fcc..e4b6494063f9 100644 --- a/pkgs/servers/geospatial/geoserver/default.nix +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geoserver"; - version = "2.23.0"; + version = "2.23.1"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-qoRyU+dZrgYKa6tqe13nHJacOlNiSMuCECtfMFxu1Vg="; + sha256 = "sha256-0ZcHnDVw5atwdeqYeQXfRTio0/plRLTDljSMb81U+f4="; }; sourceRoot = "."; From 97dd3d21257aaa91c50cc681e83a1990cab77c6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 14:22:06 +0000 Subject: [PATCH 26/54] python310Packages.dash: 2.9.3 -> 2.10.1 --- pkgs/development/python-modules/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 593ee26ff859..2602a613ca31 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.9.3"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Q9rp2V8TawT5yT3TBtdUgnMFqFGRNQCDhtgMb2dS6U="; + hash = "sha256-f/+GKbuijSE4LXhC7uPuLwJRk9xmChhanPIe2jagzEg="; }; propagatedBuildInputs = [ From daa321a065ac597bf442ef43e25c6755d7a7abf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 17:01:52 +0000 Subject: [PATCH 27/54] slweb: 0.5.5 -> 0.5.6 --- pkgs/applications/misc/slweb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix index edf0b9b05ffe..445da783b0f8 100644 --- a/pkgs/applications/misc/slweb/default.nix +++ b/pkgs/applications/misc/slweb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "slweb"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromSourcehut { owner = "~strahinja"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hk3L++J8JiCRXitNHi9uWb7aYN8lMG3GjfpmNyIpoKU="; + sha256 = "sha256-2jvHgFPnI/Uoa5s+MF3BLTA2I3WXYrsEi+XyImxx6BA="; }; nativeBuildInputs = [ redo-apenwarr ]; From 301989511858e7789f1809a33910b2b213e84a23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 17:13:38 +0000 Subject: [PATCH 28/54] python310Packages.policyuniverse: 1.5.0.20230523 -> 1.5.1.20230526 --- pkgs/development/python-modules/policyuniverse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/policyuniverse/default.nix b/pkgs/development/python-modules/policyuniverse/default.nix index ad73aab2121e..027e2da7a538 100644 --- a/pkgs/development/python-modules/policyuniverse/default.nix +++ b/pkgs/development/python-modules/policyuniverse/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "policyuniverse"; - version = "1.5.0.20230523"; + version = "1.5.1.20230526"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dnyP9EiGD2zVI5sGcswwC15ti+lrnjEnb08w3WM/xmQ="; + hash = "sha256-80Q1qkCAD3VwNk0pblPWni3qY/8Dc2YrOLDjPrg/2Os="; }; # Tests are not shipped and there are no GitHub tags From 390c5dd03639755677f37aad6a71da84b145a4a0 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 31 May 2023 10:25:09 -0700 Subject: [PATCH 29/54] signalbackup-tools: 20230528-1 -> 20230531 Diff: https://github.com/bepaald/signalbackup-tools/compare/20230528-1...20230531 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 8ea44c2b51b3..8485811f2365 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230528-1"; + version = "20230531"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-kb7Cu/dQ3hpT3dZxE5f/rIAyYVYroLPEAnRc6ci7Yk8="; + hash = "sha256-VK2/LaWO/zXMqSpeEjUM/PBd4MG76HaXY6kENwADN1k="; }; postPatch = '' From e33fc1159365c5dbca1c765f5a6ad1e63aad201e Mon Sep 17 00:00:00 2001 From: Nick Gerace Date: Wed, 31 May 2023 13:51:42 -0400 Subject: [PATCH 30/54] reindeer: unstable-2023-05-18 -> unstable-2023-05-31 Signed-off-by: Nick Gerace --- pkgs/development/tools/reindeer/Cargo.lock | 212 ++++++++++++++------ pkgs/development/tools/reindeer/default.nix | 6 +- 2 files changed, 156 insertions(+), 62 deletions(-) diff --git a/pkgs/development/tools/reindeer/Cargo.lock b/pkgs/development/tools/reindeer/Cargo.lock index 3e59f991547b..12f3e50dc94f 100644 --- a/pkgs/development/tools/reindeer/Cargo.lock +++ b/pkgs/development/tools/reindeer/Cargo.lock @@ -72,9 +72,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bstr" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "serde", @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byteorder" @@ -349,16 +349,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "cvss" version = "2.0.0" @@ -424,6 +414,15 @@ dependencies = [ "url", ] +[[package]] +name = "erased-serde" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +dependencies = [ + "serde", +] + [[package]] name = "errno" version = "0.3.1" @@ -662,9 +661,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -779,17 +778,16 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" dependencies = [ - "cfg-if", "value-bag", ] @@ -842,7 +840,7 @@ checksum = "8795add3e14028f11f8e848bd3294898a8294767b3776b6f733560d33bd2530b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", ] [[package]] @@ -885,15 +883,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "12df40a956736488b7b44fe79fe12d4f245bb5b3f5a1f6095e499760015be392" dependencies = [ "bitflags", "cfg-if", @@ -912,7 +910,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", ] [[package]] @@ -923,18 +921,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.3+1.1.1t" +version = "111.26.0+1.1.1u" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924757a6a226bf60da5f7dd0311a34d2b52283dd82ddeb103208ddc66362f80c" +checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" dependencies = [ "cc", "libc", @@ -1002,18 +1000,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -1071,9 +1069,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick 1.0.1", "memchr", @@ -1082,9 +1080,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "reindeer" @@ -1110,7 +1108,7 @@ dependencies = [ "serde_starlark", "spdx", "structopt", - "syn 2.0.16", + "syn 2.0.18", "tempfile", "termcolor", "toml 0.7.4", @@ -1230,9 +1228,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags", "core-foundation", @@ -1277,7 +1275,16 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", +] + +[[package]] +name = "serde_fmt" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" +dependencies = [ + "serde", ] [[package]] @@ -1400,9 +1407,71 @@ dependencies = [ [[package]] name = "sval" -version = "1.0.0-alpha.5" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" +checksum = "0e6aa16ce8d9e472e21a528a52c875a76a49190f3968f2ec7e9b550ccc28b410" + +[[package]] +name = "sval_buffer" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905c4373621186ee9637464b0aaa026389ea9e7f841f2225f160a32ba5d5bac4" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad6b4988322c5f22859a6a7649fa1249aa3dd01514caf8ed57d83735f997bb8b" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d3ccd10346f925c2fbd97b75e8573b38e34431bfba04cc531cd23aad0fbabb8" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a12e1488defd6344e23243c17ea4a1b185c547968749e8a281373fde0bde2d5" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_ref" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b797fc4b284dd0e45f7ec424479e604ea5be9bb191a1ef4e96c20c7685649938" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "810fa9a837e67a23e0efa7536250fc4d24043306cc1efd076f1943ba2fc2e62d" +dependencies = [ + "serde", + "sval", + "sval_buffer", + "sval_fmt", +] [[package]] name = "syn" @@ -1417,9 +1486,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -1493,7 +1562,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", ] [[package]] @@ -1539,7 +1608,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.9", + "toml_edit 0.19.10", ] [[package]] @@ -1566,9 +1635,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.9" +version = "0.19.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f" +checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" dependencies = [ "indexmap", "serde", @@ -1585,9 +1654,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -1649,13 +1718,38 @@ dependencies = [ [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" +checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4735c95b4cca1447b448e2e2e87e98d7e7498f4da27e355cf7af02204521001d" +dependencies = [ + "erased-serde", + "serde", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859cb4f0ce7da6a118b559ba74b0e63bf569bea867c20ba457a6b1c886a04e97" dependencies = [ - "ctor", "sval", - "version_check", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", ] [[package]] @@ -1713,7 +1807,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", "wasm-bindgen-shared", ] @@ -1735,7 +1829,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index 4e7ec42464f7..5cd7c8eabb84 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "unstable-2023-05-18"; + version = "unstable-2023-05-31"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; - rev = "2d6d37dcddaa840b6cd99951176c972f4c3afddd"; - sha256 = "sha256-31Kf6cVqAVFprTHEJp06E0p0y5YwdowhmPti8JBJw3g="; + rev = "9971d473177b26e7ba8cae2a42501f433e5d62b4"; + sha256 = "sha256-RaPYy6ansK/JXEfz7KWDeVSGr6pZH5T1oQRuZW4ZqzI="; }; cargoLock = { From 538af4f9e3d1df4df697d4a9a697c5405426e83f Mon Sep 17 00:00:00 2001 From: Nick Gerace Date: Wed, 31 May 2023 13:53:33 -0400 Subject: [PATCH 31/54] reindeer: ensure date is based on universal time Signed-off-by: Nick Gerace --- pkgs/development/tools/reindeer/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/reindeer/update.sh b/pkgs/development/tools/reindeer/update.sh index 8047fb2bbdc0..2a34ede61518 100755 --- a/pkgs/development/tools/reindeer/update.sh +++ b/pkgs/development/tools/reindeer/update.sh @@ -2,7 +2,7 @@ #!nix-shell -I nixpkgs=./. -i bash -p curl jq nix-prefetch common-updater-scripts mktemp nix coreutils # First, check that we only update once per day since the version tag is dependent on the date. -NEW_VERSION="unstable-$(date +%F)" +NEW_VERSION="unstable-$(date -u +%F)" CURRENT_VERSION=$(nix-instantiate --eval -E "with import ./. {}; reindeer.version" | tr -d '"') if [[ "$NEW_VERSION" == "$CURRENT_VERSION" ]]; then echo "skipping reindeer update within same day (version: \"$CURRENT_VERSION\")" From 670607c49b951c76c84c309042b8e1009e1d0349 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 31 May 2023 20:36:38 +0200 Subject: [PATCH 32/54] python310Packages.python-matter-server: 3.4.1 -> 3.4.2 https://github.com/home-assistant-libs/python-matter-server/releases/tag/3.4.2 --- .../python-modules/python-matter-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index a20a806a19cf..1f7722ec4207 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "3.4.1"; + version = "3.4.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-lNIWtg4+7sXWhg4V2lwMO6jyE0mMh6Fqtwjzri/Tfh8="; + hash = "sha256-C46GrCoilOYVZvuvYIOwyJM16tpJtm8cknqdAzhew7I="; }; nativeBuildInputs = [ From 2590dc1ec6beacbfed0d45297a6b2c1b1fe7a620 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 31 May 2023 18:34:27 +0100 Subject: [PATCH 33/54] vimPlugins.vim-advanced-sorters: init at 2021-11-21 --- 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 47b235c9b421..ad54f54ce514 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -817,6 +817,7 @@ https://github.com/nordtheme/vim/,,nord-vim https://github.com/dracula/vim/,,dracula-vim https://github.com/embark-theme/vim/,,embark-vim https://github.com/catppuccin/vim/,HEAD,catppuccin-vim +https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters https://github.com/Konfekt/vim-CtrlXA/,, https://github.com/konfekt/vim-DetectSpellLang/,, https://github.com/dpelle/vim-LanguageTool/,, From 67854592f8f6a655730eeed6b781da20d2a0f504 Mon Sep 17 00:00:00 2001 From: "\"Thiago Kenji Okada\"" <"thiagokokada@gmail.com"> Date: Wed, 31 May 2023 18:53:19 +0000 Subject: [PATCH 34/54] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 188 ++++++++++-------- 1 file changed, 100 insertions(+), 88 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 51d165657843..dc5c887648ec 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-05-29"; + version = "2023-05-30"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "3b4c27e6a66fea8a248523f6ba95b51e4f66702f"; - sha256 = "009406kz42w3qy9z8hcqy98zh61jpknwr88fyqx2rijjyff9wi76"; + rev = "01fbeb139b9fceb775fefc91f27835408a4f04a9"; + sha256 = "18isr6l1cb7hjwglv1ybm93z9yqkc9z2g86jj862swq29kdhclg7"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -365,12 +365,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "d0664365c0c14c6ba45196a679e25f04e10a6093"; - sha256 = "11jc83v27xd68adzxspcbh4fswmpcyv6sljifzmfp9magqq7mhh5"; + rev = "1061082e005acdd10e3b1167df37f8005fce5483"; + sha256 = "1lvnq0swjm1207p1qkldzs3jdg8xl5w1shmwf2prlrf9svy6rl8z"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -919,12 +919,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-05-22"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "f0212c318e0f118ccb0e6166198895f78aa87efd"; - sha256 = "0aia797b9nhskkaf4ghw0xysp13xw1dfwk4izh6iby2izw10j58i"; + rev = "af75ef12a5694d1596f26c4a1fe8aae09fb8c086"; + sha256 = "0y0fgwix3frqnz0q41cf42arvv4wdznm3agrdbizxagvdanjw76k"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -3312,12 +3312,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-05-28"; + version = "2023-05-30"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "8875cccf779160303bf2bed7d422717676f214fd"; - sha256 = "0cwcy6ikj0m56wbvq66yzzl50wmvfifrzmh0mggy5x7cwwlgfix9"; + rev = "7006e69b60a559837ff6cdb7fe610af4f6ca823c"; + sha256 = "1l10kspc7p0cxxlgddycnlwb4pkkfwmjari5a8wgjskdikw611gv"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3636,12 +3636,12 @@ final: prev: go-nvim = buildVimPluginFrom2Nix { pname = "go.nvim"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "9fc0312c1ae08c24ca730c6f7f836965be5c1922"; - sha256 = "0xna5ab6f17lwcgj3s4nsyvzc82ibfwjxaff2dnpr708md8acv3v"; + rev = "8a0498ee48a26f928b1dc1c02fb3d84d648a1c63"; + sha256 = "08iig6g3mmpkany1vnkpv0icm4i55542gsyq77dygigwriqlzkkq"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4847,12 +4847,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-05-11"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "6a6be78ffc1bd87cc20b4d4487f5de42ab9660c2"; - sha256 = "0vl76wg15iqqbxrk3gnarzzjfs75fl9v99w24vcprg82bzwadv12"; + rev = "812eed432765d1afb973ffb361ad5acdddc7a9e2"; + sha256 = "1fvfn78ykvgi6pwykr8cdyjsdrvhniswcdkhrqj7pi3pp5s80dg4"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4882,12 +4882,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-05-03"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "7a26ebaa7e36aa2aefa6c1994b2b866c96de32e6"; - sha256 = "0f7fjb947hcr946l93p0bh1n649qn6s4d4lzf0xzgj73dsq0j8z4"; + rev = "c6826d2c3f4bc4a37b41b6a140061ccb0e9cdc4a"; + sha256 = "0774rbzdsl5bqaipq35n26qrx2xawlnxa62x1fksj7ihxzfpl0in"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4966,12 +4966,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-05-26"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "a83e4b1ba7edc6fecdad09e39753a7d5eee1d01c"; - sha256 = "1x6hg6gp0jvkkrspqf3q5db1rkh4wd4rkh3qngcphhckrkjb0f9a"; + rev = "51ebb4b6637290e1b8e0fb0d6f38b605d3c24940"; + sha256 = "1g08v69fcwzrwpbfzfym7pzvwlva8wx7cx3g7smiw9309aj72ysc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5231,12 +5231,12 @@ final: prev: monokai-pro-nvim = buildVimPluginFrom2Nix { pname = "monokai-pro.nvim"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "56e52cda4bb7b45d02d533a2aab00d32ff2de7df"; - sha256 = "080iac140sbddpld9x8lr6vb2qmql24f77k6divizapjka3qxnh9"; + rev = "048026f7a76c0668b9afbf33e74bd8db6007b1c3"; + sha256 = "0vimfjqljikzbk1hwkmd16r67kvnfs6h9wvscad68wg12x4001mq"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5531,12 +5531,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "3ed504868353505fc95577b0981483f8608ebb55"; - sha256 = "0jqf195kfv8vmmqs683pycmq975lz2xxax6qv9wak1jg2xcr1k86"; + rev = "ee205ffd079f96d32c837dcf29af259e0dde8557"; + sha256 = "1q9d8y5nlaj46bx48j17zmcfldc4hn20bhac3c4az8nfcs6xij2c"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5559,8 +5559,8 @@ final: prev: src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "9f894d12d9fd680388acc2fcb4067e4664c1ddc9"; - sha256 = "06s0bg112cbrlc0ysmcdcvbnrdbs7j13m23f1spv4mxz14m56g2q"; + rev = "358f11c585fdccfcb5e8eae720c423fbed6d92de"; + sha256 = "0j04jx6ji2w1krd6a1d7gdbgsr6mmnk2j820b09s6q2xn6hcr5mm"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5579,12 +5579,12 @@ final: prev: neogen = buildVimPluginFrom2Nix { pname = "neogen"; - version = "2023-05-22"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "de603d2f83a8eea7d799cc3e7a61ae02eb192110"; - sha256 = "1zdq0zkcl9yn4xpn9rf4jdn1y24czhpw9b3rbbmf9b1gwp98hzkx"; + rev = "72238bfb7099ed346e3742e815f13c3fe35f51ab"; + sha256 = "1sfxcirkpsgwpbad2al41dwdcjwls5k2vzq1wf3k8sk23kdmq2q2"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; @@ -5651,12 +5651,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "151c0337684a30ab8a9b31683b7a2fa28b0a15b0"; - sha256 = "0i1rmnqzz8ckyvp2nixf1i5p6jbx8sqbk97wnwcs38930xmg0ys7"; + rev = "3f78a7d87d502c854d6cfea9f9932d2488aa02f9"; + sha256 = "0mwzy9bcygszqgh228chpb6cdfhz9j4mqmpd4jnhy3m1rnk5ji24"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5855,12 +5855,12 @@ final: prev: neotest-rspec = buildVimPluginFrom2Nix { pname = "neotest-rspec"; - version = "2023-05-28"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "45c3a0984e4b73a38bf8829c454f9e90d0da3f13"; - sha256 = "1s2hw5z020i3f3wcy6k7lg73fbkli8xlyazrm18z4kq7i3s6lk9j"; + rev = "5fe7d860def0539f7f5d375fbf9c481c097062c8"; + sha256 = "1za4ikrkd7qy2wiik6i9bxk4f1l1wffdh02sj79fh4kr294r106c"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6087,8 +6087,8 @@ final: prev: src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "93dd380e7957d62581d58ec4a9627879b8524b07"; - sha256 = "1w1wxhchw7wzgbas09j7y1iz3l0ylkzpiklsk4h6q7g49x08mv9c"; + rev = "5c63b4c0c5efcf67df10ed7dda14e52ad6f3a0cb"; + sha256 = "12k4f8dfz4r0vimfvf4gm90i3k2y4zx7lydcbjsmq8sa4pm779ca"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6575,12 +6575,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-05-28"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "c23e0d43dab42ed89bf88eaccfffcebff4370450"; - sha256 = "06ahisfnd14yyck44dv1wni8j5zindg85gvdw1y8p6xw73xrcal6"; + rev = "23b0c806f660b321f9b903f0613fc948d4f8ec4c"; + sha256 = "0xbnhbknimlmd1x3cwzq75sj4gifa8mhzrv9wkzak29pl1g5vkys"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6887,12 +6887,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-05-05"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "4a04039b80c270f6bd2075935cd3c7943f6ad140"; - sha256 = "084daagckdx91n3f4z0af3ykkxpgcs3k0f1hw7ihzg66by45mqpg"; + rev = "93fe5a96637a164f5b114b4a4cb45629cccf89ac"; + sha256 = "0klxs8jrgv6k2zcf2cqw3d5cvpll5b493zkx1kvbs89ynjiaqyz3"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -6995,24 +6995,24 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "23dfae4db84f71e2ddb56c024845b322035182ee"; - sha256 = "1pw6hv2rdzd4y6hgm3rim297ar46wvjbbyljx2x77n08gr5c50n8"; + rev = "62146fe415193879290c523b54cb5072e1f5dbbc"; + sha256 = "0zqkhdcc8vr0kp4f1jr8m0zp02f694ba5z7a5s7ypik2jdfqhv3w"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "24535437a9b62b9ec503c545f35e2ac298cd29df"; - sha256 = "00nf9ps4mnmngimy4hrjnyshp7xiyfwa4wj4gnwxa9y1p3ha0q0h"; + rev = "2182556aab4524b4fa8d00031bf1228ea2e4a023"; + sha256 = "0xybwafqdq540nlvcdax48xa04d85blm19gndlg1zyrkhs7hbd7i"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7367,12 +7367,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "3d6acc695184a964741ef00dfe7c45028585215e"; - sha256 = "0p5di0zhlb2jm8d7f0lc7zil0gyy9bji55snahqaxk570yc4z1ss"; + rev = "c5249aabbbe5a67acb24675672cdd7d07ec42611"; + sha256 = "00ifdmaxlrn3wk1lq729nv70w89w60mpk988ixa61rja0wgcbm1l"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7559,12 +7559,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2023-05-24"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "52544825d6b8be677eb395983515ad5e30ae1f2e"; - sha256 = "0l25gvxwzs1kq4v1jrngy52091kc9kb64ny825ns518c5k4g3kd3"; + rev = "499e0743cf5e8075cd32af68baa3946a1c76adf1"; + sha256 = "0r9aw3a53vzq0rdyvq7pi99pqbmnww0dm146pbj2kd33rb34daz6"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -7861,12 +7861,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-05-27"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "6d0315d3a9bf979d564e9cd17004029d57720a46"; - sha256 = "08dhr394wzjr7sm9plvb28gjnk2z04adl0a1jy0wm6w0dm1k5drh"; + rev = "a85dfff2602b739627b9f8a831de8c3e7b2993ae"; + sha256 = "1x6i6bwsk4vvbbvgn25vxvbwqy83w1dfkn5fwpnn2lfw88yflchf"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -7897,12 +7897,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2023-05-11"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "d8dc204e9f6fd930d9d1d709f0d19138f804431a"; - sha256 = "11a2ac86d9jr7wn62ylnr47j44pz9igzmia55cka8f1530nm422s"; + rev = "c21eed6cbbc76e120a31b8eafa8f77c338bcbce7"; + sha256 = "1zyzl2fyaxwn7w037yy01xg4lnqb3x65bnjwd9krwpwdq6bm9gs1"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -7921,12 +7921,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2023-05-27"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "8021cc2ea47a4a3c1cee05a555b3368c8e1d67be"; - sha256 = "0vh3ankfh6g3zzhjbr9q6hgdqsxvll1gcni44dkhg41482sxh14x"; + rev = "0abde05b7b1b1104222e8ccc11b25c1ebe4ee991"; + sha256 = "1sc4qfwkfrs3c8qgfrc9vz72l08r4k54ych8q4xf6c2wabzampk7"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -9572,12 +9572,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-05-30"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "aed4e748fca6a0ab840487afaa02b1f6683a246a"; - sha256 = "0d9v2s362z8sqgz75ypvy2cczknbcimyw9d0krckgs1mbplbkjy9"; + rev = "2a3a54add6b7c2aa5a24a20d6284643d641e985e"; + sha256 = "1bf0ijlq0g7xxijmvcyh8vwwfn0nq02fy4fwy6sagk2vfa2bwi3l"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10472,12 +10472,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2023-05-14"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "5c2c2d65ff908f4763c6af1cf3f100ab9a426e9e"; - sha256 = "1jya6w6saxk65mbnbln7fwmj6d3r11x8x9gd3h5q41idz334bjnc"; + rev = "a97aeb02c97b03926f6e2a44dfa768ecfe03e906"; + sha256 = "1dxlljayjm1dypbbabww1pz9jrhyplg1vvbi9i9lnj9p9lj4whss"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -11360,12 +11360,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-05-29"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "c6cf8b9a67572a5c3bf54b0b4acabb3b9e85e101"; - sha256 = "11k74xyk05sc9ckyxlkkam9j64rj02sk6sqhqsgmx685jkmgyvzx"; + rev = "f8448bf71c0116e70db05e3bd4ac14918777b493"; + sha256 = "09lmx56vg9x6rpyirjnhdg5rg6mr92smqs3nmazij134xz1462xc"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -14268,12 +14268,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2022-12-07"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "c0eb7a63e80ed0dc2c91eb8c879b7396a795f775"; - sha256 = "14v47fjp1klnacbbn2ly9ya0xs4dv2bsf9pg391zfcpp9rzf6mrl"; + rev = "9157338680e96bf986f56d8e1cb0e870bc17f5a6"; + sha256 = "0f628cddpgrqdjf7pqlvck8d86kb19fyr80mzq3yjg7gk7sqdjgj"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -15098,24 +15098,24 @@ final: prev: nvchad-extensions = buildVimPluginFrom2Nix { pname = "nvchad-extensions"; - version = "2023-05-24"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "nvchad"; repo = "extensions"; - rev = "64c408e5d52e4505a52766f7682323b0f85f654e"; - sha256 = "07wbkkh3ddsfjzx25zimw9ir4cb2z4mmzirdjj03zj8ng9hqvg94"; + rev = "6c01bde163f2c73911df046a2a4883f45a04b611"; + sha256 = "11zcl9k2mqg58658x68q5msd3fiyw4zn8karpd20vwkk881s28nx"; }; meta.homepage = "https://github.com/nvchad/extensions/"; }; nvchad-ui = buildVimPluginFrom2Nix { pname = "nvchad-ui"; - version = "2023-05-27"; + version = "2023-05-31"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "78ef6543a09cbbc48e8d6fd45dcc24696eba8ecb"; - sha256 = "0lyghhd8ji2nqmn0mvzgfsbilh24rxs20s0hf75y6h4aws86chvh"; + rev = "4f5cec09455a27ca8e59a8c082991cf40013ea82"; + sha256 = "0i4wp2fr1mgwmna9al2c9spa4g5ri2kn0g2rgjqxjvq7fdcr5754"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -15144,6 +15144,18 @@ final: prev: meta.homepage = "https://github.com/rose-pine/neovim/"; }; + vim-advanced-sorters = buildVimPluginFrom2Nix { + pname = "vim-advanced-sorters"; + version = "2021-11-21"; + src = fetchFromGitHub { + owner = "inkarkat"; + repo = "vim-AdvancedSorters"; + rev = "079856080d42e5ea91fadabc39c2906b2d0a0a67"; + sha256 = "1phzragsq4pflvhjzqlxvdsmiyp7z5b68d2a0frn2rj07av0bn91"; + }; + meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; + }; + vim-docbk-snippets = buildVimPluginFrom2Nix { pname = "vim-docbk-snippets"; version = "2021-07-30"; From f9a13aa3ccedc9c90480a8f2166f1b1288a1ef50 Mon Sep 17 00:00:00 2001 From: "\"Thiago Kenji Okada\"" <"thiagokokada@gmail.com"> Date: Wed, 31 May 2023 18:54:29 +0000 Subject: [PATCH 35/54] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 55837e11f54f..f9798ee4d041 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -126,12 +126,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=a015709"; + version = "0.0.0+rev=0906255"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "a015709e7d1bb4f823a2fc53175e0cbee96c1c3e"; - hash = "sha256-q+jXkhhk46NoKAxVj7fWiUZ2iosW1bRJ0A244Cf4zCA="; + rev = "0906255f8de1d319b8ec682ac8c43e7d2524b4fa"; + hash = "sha256-p6k04hWIWawwd99+5OMohr9G2X1HLYJ0VClVsVADalE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -247,12 +247,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=70aed2e"; + version = "0.0.0+rev=4c917d5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "70aed2e9e83eb7320ab7c454d3084300bf587037"; - hash = "sha256-3gTLqz1H/7A8+2NiZmR/jBPt4Rh/Wvlcxt/aD7w8T8A="; + rev = "4c917d560572dc2b3704b041715b2729fa199963"; + hash = "sha256-pBlhhUV1lN7wIP1E0vfzAcGGlGDnByp7pdKJzvn4/ts="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -269,12 +269,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=9c20a31"; + version = "0.0.0+rev=867c97e"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "9c20a3120c405db9efda9349cd005c29f2aace3c"; - hash = "sha256-LOCC9Si6RFlxK3TQrApYjAquuhYFp2empRnZMwVSO30="; + rev = "867c97ed7769e56bff99f7122cf63effadb812cc"; + hash = "sha256-eSWY1z4kRD07YYeDTxGmiuI8FFClFsOfyaCDRtkEX1M="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -590,12 +590,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=9d8c81e"; + version = "0.0.0+rev=5e3263c"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "9d8c81e8e64b3b4f4c36de1425c5fc841097d7f4"; - hash = "sha256-L3v+dQZhwC+kBOHf3YVbZjuCU+idbUDByEdUBmeGAlo="; + rev = "5e3263c856d2de7ecbcfb646352c8e29dc2b83e6"; + hash = "sha256-Hzck3DfxzWz30ma52CbzC/Wyiqx2BlKoaqtiYgPKl/o="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -634,23 +634,23 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=190c86e"; + version = "0.0.0+rev=29dcda3"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "190c86e633e6a6dfdb8a96f8b8460e347ff93f1c"; - hash = "sha256-cwSidS+gzQKrvnmDihay0OfatTsBpEo/HEUIcRng5yk="; + rev = "29dcda3e8299b91df24cafd24bba43cdd3ca2456"; + hash = "sha256-oBb+Mkyoz74+VrMSCK0z8UtP6O/Cfwo0V/IlF9b9Gk4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=64457ea"; + version = "0.0.0+rev=7cccc30"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "64457ea6b73ef5422ed1687178d4545c3e91334a"; - hash = "sha256-38pkqR9iEIEf9r3IHJPIYgKfWBlb9aQWi1kij04Vo5k="; + rev = "7cccc30535a40da07092626031120ae6b36202d7"; + hash = "sha256-b9735WP4EyU7gGNuKwwt6orIqXWMy4iQDthMKU52pQE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -777,12 +777,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=cd7a53e"; + version = "0.0.0+rev=e7e2670"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "cd7a53e9f82a2612cae0115692f964e9d0c416e2"; - hash = "sha256-fx+9mpZkMxzuLjGOmT5wZZW2oUHfhLYOlTsL7N5QlEk="; + rev = "e7e2670872c2f1a6556eeedd0b80778b5653e187"; + hash = "sha256-i7tloMXu/0PU5eozP1zyZr4lB+jRWTJ/udgENmq+cmY="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -1608,12 +1608,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=dacd7bd"; + version = "0.0.0+rev=e7f7d01"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "dacd7bdbe27ba79fb7f3959d220f97820dc71dcc"; - hash = "sha256-ceJY9EsLqoOh9xrcKMtwrnC3rmMaLfZFK3uCYKRR+qk="; + rev = "e7f7d016308e47bfb387581206b77c8c48947fdc"; + hash = "sha256-oC8txJr5efT48jzRErPTfK9k10jNibogeoiHjT4RDm0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1729,12 +1729,12 @@ }; supercollider = buildGrammar { language = "supercollider"; - version = "0.0.0+rev=90c6d9f"; + version = "0.0.0+rev=3b35bd0"; src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; - rev = "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0"; - hash = "sha256-YF+JFLcRHrWIRky2aI5s294+G6jSyVUgt/1bnZkYGLw="; + rev = "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095"; + hash = "sha256-mWTOZ3u9VGjEhjDeYJGd8aVxjVG9kJgKX/wHMZSsaEU="; }; meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider"; }; From 76fbfa6a795e5aeed0be8e89e72f17544db57db5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 19:28:06 +0000 Subject: [PATCH 36/54] powerline-go: 1.23 -> 1.24 --- pkgs/tools/misc/powerline-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 23cde8ba64e8..970d7a0c3952 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - hash = "sha256-qEVsJsDvqcMVxLz81kNybEO/TwCvhi8E/laci8ry/dw="; + hash = "sha256-3IeyxAc+FRcVsL9AiVr6Jku5f5y3MTT9SXwVQW9MkNo="; }; vendorHash = "sha256-W7Lf9s689oJy4U5sQlkLt3INJwtvzU2pot3EFimp7Jw="; From 91a87cb7c75d48aa5db455cfd96c0811ef6a7b57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 19:48:24 +0000 Subject: [PATCH 37/54] python310Packages.types-pyopenssl: 23.0.0.4 -> 23.1.0.3 --- pkgs/development/python-modules/types-pyopenssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix index 2c6dc21c478d..35530f37993f 100644 --- a/pkgs/development/python-modules/types-pyopenssl/default.nix +++ b/pkgs/development/python-modules/types-pyopenssl/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "types-pyopenssl"; - version = "23.0.0.4"; + version = "23.1.0.3"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-izVQtuGdUc54qr1ySw2OvZYggaX86V5/haWS3828Fr8="; + hash = "sha256-5yEQiO/z4g01mIje3ssJlPcYHVzODyY1TdR8oEhNyKY="; }; propagatedBuildInputs = [ From 12ae1e6b6b7815e53e94349e79694e1c0e461d9c Mon Sep 17 00:00:00 2001 From: Tungsten842 <886724vf@anonaddy.me> Date: Wed, 31 May 2023 21:49:10 +0200 Subject: [PATCH 38/54] clblast: init (#234020) --- .../science/math/clblast/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/libraries/science/math/clblast/default.nix diff --git a/pkgs/development/libraries/science/math/clblast/default.nix b/pkgs/development/libraries/science/math/clblast/default.nix new file mode 100644 index 000000000000..281076caba9f --- /dev/null +++ b/pkgs/development/libraries/science/math/clblast/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, opencl-headers +, ocl-icd +}: + +stdenv.mkDerivation rec { + pname = "clblast"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "CNugteren"; + repo = "CLBlast"; + rev = version; + hash = "sha256-eRwSfP6p0+9yql7TiXZsExRMcnnBLXXW2hh1JliYU2I="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + opencl-headers + ocl-icd + ]; + + cmakeFlags = [ + # https://github.com/NixOS/nixpkgs/issues/144170 + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + + meta = with lib; { + description = "The tuned OpenCL BLAS library"; + homepage = "https://github.com/CNugteren/CLBlast"; + license = licenses.asl20; + maintainers = with maintainers; [ Tungsten842 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb05747b58c5..73ff9f5e1089 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37908,6 +37908,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL; }; + clblast = callPackage ../development/libraries/science/math/clblast { }; + cliquer = callPackage ../development/libraries/science/math/cliquer { }; coin-utils = callPackage ../development/libraries/science/math/coin-utils { }; From a5a7bdb793553a09da018d6a13e09c28db209fcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 19:58:13 +0000 Subject: [PATCH 39/54] sq: 0.35.0 -> 0.36.2 --- pkgs/development/tools/sq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index d5be7ed0a286..d66623c057b3 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sq"; - version = "0.35.0"; + version = "0.36.2"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yCV/vn6c1FeHhPM+YCS6tr8M45SZiytrDjdocKVJ5Mk="; + sha256 = "sha256-EuNB39FcpkFHWgyQkOTqm5WUTEHHgmuqssM2qLycvTM="; }; - vendorHash = "sha256-SOnYK9JtP1V8Y6/GszU26kYM1e2xupBmHsJrVpRT2vc="; + vendorHash = "sha256-nzXYKV3pZToh9UzCTADpzZQNmfEAL4lshJmC/sj0zs0="; proxyVendor = true; From 6fed71cab2f4d74863970377d3289487c9a19ec0 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 23 May 2023 11:34:00 +0000 Subject: [PATCH 40/54] gitaly: Remove ruby dependencies Ruby dependencies in gitaly have been removed in the 16.0.0 release. [1] See GitLab Epic &2862 [2] for more info. [1]: https://gitlab.com/gitlab-org/gitaly/-/commit/689556e70a14e189579e9a0c8daebaa2a25ce5f3 [2]: https://gitlab.com/groups/gitlab-org/-/epics/2862 --- nixos/modules/services/misc/gitlab.nix | 7 - .../version-management/gitlab/gitaly/Gemfile | 43 - .../gitlab/gitaly/Gemfile.lock | 207 ----- .../gitlab/gitaly/default.nix | 35 +- .../gitlab/gitaly/gemset.nix | 827 ------------------ .../version-management/gitlab/update.py | 11 +- 6 files changed, 15 insertions(+), 1115 deletions(-) delete mode 100644 pkgs/applications/version-management/gitlab/gitaly/Gemfile delete mode 100644 pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock delete mode 100644 pkgs/applications/version-management/gitlab/gitaly/gemset.nix diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 12c67c5f5a1e..e8b6ae16c50d 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -9,8 +9,6 @@ let toml = pkgs.formats.toml {}; yaml = pkgs.formats.yaml {}; - ruby = cfg.packages.gitlab.ruby; - postgresqlPackage = if config.services.postgresql.enable then config.services.postgresql.package else @@ -47,9 +45,6 @@ let [git] bin_path = "${pkgs.git}/bin/git" - [gitaly-ruby] - dir = "${cfg.packages.gitaly.ruby}" - [gitlab-shell] dir = "${cfg.packages.gitlab-shell}" @@ -1464,8 +1459,6 @@ in { openssh procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562 git - cfg.packages.gitaly.rubyEnv - cfg.packages.gitaly.rubyEnv.wrappedRuby gzip bzip2 ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile deleted file mode 100644 index f247c46146a3..000000000000 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ /dev/null @@ -1,43 +0,0 @@ -source 'https://rubygems.org' - -gem 'rugged', '~> 1.5.1' -gem 'gitlab-markup', '~> 1.8.0' -gem 'activesupport', '~> 6.1.7.2' -gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem -gem 'sentry-raven', '~> 3.1', require: false -gem 'rbtrace', require: false - -# The Gitaly Gem contains the Protobuf and gRPC definitions required by the -# Ruby sidecar. -gem 'gitaly', '~> 15.5.0' - -# Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1' - -# Detects the open source license the repository includes -# This version needs to be in sync with GitLab CE/EE -gem 'licensee', '~> 9.15' - -gem 'google-protobuf', '~> 3.22.3' -gem 'nokogiri', '~> 1.14' - -# Rails is currently blocked on the upgrade to the new major version for Redis, -# so we don't upgrade either until the issue is resolved. This is an indirect -# dependency and can thus be removed when the version constraint is gone. -gem 'redis', '~> 4.8.0' - -group :development, :test do - gem 'rubocop', '~> 1.38', require: false - gem 'rspec', '~> 3.12.0', require: false - gem 'rspec-parameterized', require: false - gem 'factory_bot', require: false - gem 'pry', '~> 0.13.1', require: false -end - -# Gems required in omnibus-gitlab pipeline -group :development, :test, :omnibus do - # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is - # resolved. For details, check discussion in - # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74881 - gem 'gitlab-license_finder', require: false -end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock deleted file mode 100644 index bd66bc20a83d..000000000000 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ /dev/null @@ -1,207 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionpack (6.1.7.2) - actionview (= 6.1.7.2) - activesupport (= 6.1.7.2) - rack (~> 2.0, >= 2.0.9) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.7.2) - activesupport (= 6.1.7.2) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.7.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - ast (2.4.2) - binding_of_caller (1.0.0) - debug_inspector (>= 0.0.1) - builder (3.2.4) - coderay (1.1.2) - concurrent-ruby (1.2.0) - crass (1.0.6) - debug_inspector (1.1.0) - diff-lcs (1.3) - dotenv (2.7.6) - erubi (1.12.0) - factory_bot (6.2.1) - activesupport (>= 5.0.0) - faraday (1.0.1) - multipart-post (>= 1.2, < 3) - ffi (1.15.5) - gitaly (15.5.0) - grpc (~> 1.0) - gitlab-labkit (0.31.1) - actionpack (>= 5.0.0, < 8.0.0) - activesupport (>= 5.0.0, < 8.0.0) - grpc (>= 1.37) - jaeger-client (~> 1.1.0) - opentracing (~> 0.4) - pg_query (~> 2.1) - redis (> 3.0.0, < 6.0.0) - gitlab-license_finder (6.14.2.1) - bundler - rubyzip (>= 1, < 3) - thor (~> 1.0) - tomlrb (>= 1.3, < 2.1) - with_env (= 1.1.0) - xml-simple (~> 1.1.5) - gitlab-markup (1.8.1) - google-protobuf (3.22.3) - googleapis-common-protos-types (1.4.0) - google-protobuf (~> 3.14) - grpc (1.42.0) - google-protobuf (~> 3.18) - googleapis-common-protos-types (~> 1.0) - i18n (1.12.0) - concurrent-ruby (~> 1.0) - jaeger-client (1.1.0) - opentracing (~> 0.3) - thrift - json (2.6.3) - licensee (9.15.2) - dotenv (~> 2.0) - octokit (~> 4.20) - reverse_markdown (~> 1.0) - rugged (>= 0.24, < 2.0) - thor (>= 0.19, < 2.0) - loofah (2.19.1) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - method_source (1.0.0) - mini_portile2 (2.8.1) - minitest (5.17.0) - msgpack (1.3.3) - multipart-post (2.1.1) - nokogiri (1.14.1) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - octokit (4.20.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - opentracing (0.5.0) - optimist (3.0.1) - parallel (1.22.1) - parser (3.2.0.0) - ast (~> 2.4.1) - pg_query (2.2.1) - google-protobuf (>= 3.19.2) - proc_to_ast (0.1.0) - coderay - parser - unparser - pry (0.13.1) - coderay (~> 1.1) - method_source (~> 1.0) - public_suffix (4.0.7) - racc (1.6.2) - rack (2.2.6.3) - rack-test (2.0.2) - rack (>= 1.3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - rainbow (3.1.1) - rbtrace (0.4.14) - ffi (>= 1.0.6) - msgpack (>= 0.4.3) - optimist (>= 3.0.0) - redis (4.8.0) - regexp_parser (2.6.2) - reverse_markdown (1.4.0) - nokogiri - rexml (3.2.5) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.3) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-parameterized (1.0.0) - rspec-parameterized-core (< 2) - rspec-parameterized-table_syntax (< 2) - rspec-parameterized-core (1.0.0) - parser - proc_to_ast - rspec (>= 2.13, < 4) - unparser - rspec-parameterized-table_syntax (1.0.0) - binding_of_caller - rspec-parameterized-core (< 2) - rspec-support (3.12.0) - rubocop (1.44.0) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.2.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - ruby-progressbar (1.11.0) - rubyzip (2.3.2) - rugged (1.5.1) - sawyer (0.8.2) - addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - sentry-raven (3.1.2) - faraday (>= 1.0) - thor (1.1.0) - thrift (0.18.1) - tomlrb (2.0.1) - tzinfo (2.0.5) - concurrent-ruby (~> 1.0) - unicode-display_width (2.4.2) - unparser (0.6.7) - diff-lcs (~> 1.3) - parser (>= 3.2.0) - with_env (1.1.0) - xml-simple (1.1.9) - rexml - zeitwerk (2.6.6) - -PLATFORMS - ruby - -DEPENDENCIES - activesupport (~> 6.1.7.2) - factory_bot - gitaly (~> 15.5.0) - gitlab-labkit (~> 0.31, >= 0.31.1) - gitlab-license_finder - gitlab-markup (~> 1.8.0) - google-protobuf (~> 3.22.3) - grpc (~> 1.42.0) - licensee (~> 9.15) - nokogiri (~> 1.14) - pry (~> 0.13.1) - rbtrace - redis (~> 4.8.0) - rspec (~> 3.12.0) - rspec-parameterized - rubocop (~> 1.38) - rugged (~> 1.5.1) - sentry-raven (~> 3.1) - -BUNDLED WITH - 2.4.11 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 655604ee72c1..53c88a1f9c89 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby -, bundlerEnv, pkg-config +{ lib +, fetchFromGitLab +, fetchFromGitHub +, buildGoModule +, pkg-config + # libgit2 + dependencies -, libgit2, openssl, zlib, pcre, http-parser }: +, libgit2 +, http-parser +, openssl +, pcre +, zlib +}: let - rubyEnv = bundlerEnv rec { - name = "gitaly-env"; - inherit ruby; - copyGemFiles = true; - gemdir = ./.; - }; - version = "15.11.6"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -32,7 +34,7 @@ let tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; + buildInputs = [ libgit2 openssl zlib pcre http-parser ]; doCheck = false; }; @@ -46,10 +48,6 @@ in buildGoModule ({ pname = "gitaly"; - passthru = { - inherit rubyEnv; - }; - subPackages = [ "cmd/gitaly" "cmd/gitaly-backup" ]; preConfigure = '' @@ -57,12 +55,7 @@ buildGoModule ({ cp -r ${auxBins}/bin/* _build/bin ''; - postInstall = '' - mkdir -p $ruby - cp -rv $src/ruby/{bin,lib} $ruby - ''; - - outputs = [ "out" "ruby" ]; + outputs = [ "out" ]; meta = with lib; { homepage = "https://gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix deleted file mode 100644 index 7d37a3af1faa..000000000000 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ /dev/null @@ -1,827 +0,0 @@ -{ - actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; - type = "gem"; - }; - version = "6.1.7.2"; - }; - actionview = { - dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; - type = "gem"; - }; - version = "6.1.7.2"; - }; - activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; - type = "gem"; - }; - version = "6.1.7.2"; - }; - addressable = { - dependencies = ["public_suffix"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; - type = "gem"; - }; - version = "2.8.0"; - }; - ast = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; - type = "gem"; - }; - version = "2.4.2"; - }; - binding_of_caller = { - dependencies = ["debug_inspector"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; - type = "gem"; - }; - version = "1.0.0"; - }; - builder = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; - type = "gem"; - }; - version = "3.2.4"; - }; - coderay = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; - type = "gem"; - }; - version = "1.1.2"; - }; - concurrent-ruby = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; - type = "gem"; - }; - version = "1.2.0"; - }; - crass = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; - type = "gem"; - }; - version = "1.0.6"; - }; - debug_inspector = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; - type = "gem"; - }; - version = "1.1.0"; - }; - diff-lcs = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; - type = "gem"; - }; - version = "1.3"; - }; - dotenv = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; - type = "gem"; - }; - version = "2.7.6"; - }; - erubi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; - type = "gem"; - }; - version = "1.12.0"; - }; - factory_bot = { - dependencies = ["activesupport"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq"; - type = "gem"; - }; - version = "6.2.1"; - }; - faraday = { - dependencies = ["multipart-post"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; - type = "gem"; - }; - version = "1.0.1"; - }; - ffi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; - type = "gem"; - }; - version = "1.15.5"; - }; - gitaly = { - dependencies = ["grpc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hpgljz05rhik15z081ghxw9pw83vz78p12wjdgxj3qz1a4x8pfq"; - type = "gem"; - }; - version = "15.5.0"; - }; - gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy"; - type = "gem"; - }; - version = "0.31.1"; - }; - gitlab-license_finder = { - dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; - groups = ["development" "omnibus" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fzrv96kbzyqnsdj762x7n0y006rsgsi8k23nad4xsa43d065i71"; - type = "gem"; - }; - version = "6.14.2.1"; - }; - gitlab-markup = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yvh8vv9kgd06hc8c1pl2hq56w56vr0n7dr5mz19fx4p2v89y7xb"; - type = "gem"; - }; - version = "1.8.1"; - }; - google-protobuf = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9"; - type = "gem"; - }; - version = "3.22.3"; - }; - googleapis-common-protos-types = { - dependencies = ["google-protobuf"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04sy3c91nlw2sv53xf2h2yf0cc09bdcvj2qbjsxwzxpbqgfrf255"; - type = "gem"; - }; - version = "1.4.0"; - }; - grpc = { - dependencies = ["google-protobuf" "googleapis-common-protos-types"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jjq2ing7px4zvdrg9xcq5a9qsciq6g3v14n95a3d9n6cyg69lmk"; - type = "gem"; - }; - version = "1.42.0"; - }; - i18n = { - dependencies = ["concurrent-ruby"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; - type = "gem"; - }; - version = "1.12.0"; - }; - jaeger-client = { - dependencies = ["opentracing" "thrift"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb"; - type = "gem"; - }; - version = "1.1.0"; - }; - json = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; - type = "gem"; - }; - version = "2.6.3"; - }; - licensee = { - dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v9x94h19b20wc551vs9a0yvk44w2y3g9ng07fflk26s8jsmjsab"; - type = "gem"; - }; - version = "9.15.2"; - }; - loofah = { - dependencies = ["crass" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; - type = "gem"; - }; - version = "2.19.1"; - }; - method_source = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; - type = "gem"; - }; - version = "1.0.0"; - }; - mini_portile2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; - type = "gem"; - }; - version = "2.8.1"; - }; - minitest = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0"; - type = "gem"; - }; - version = "5.17.0"; - }; - msgpack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; - type = "gem"; - }; - version = "1.3.3"; - }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; - type = "gem"; - }; - version = "2.1.1"; - }; - nokogiri = { - dependencies = ["mini_portile2" "racc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; - type = "gem"; - }; - version = "1.14.1"; - }; - octokit = { - dependencies = ["faraday" "sawyer"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; - type = "gem"; - }; - version = "4.20.0"; - }; - opentracing = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy"; - type = "gem"; - }; - version = "0.5.0"; - }; - optimist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; - type = "gem"; - }; - version = "3.0.1"; - }; - parallel = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; - type = "gem"; - }; - version = "1.22.1"; - }; - parser = { - dependencies = ["ast"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; - type = "gem"; - }; - version = "3.2.0.0"; - }; - pg_query = { - dependencies = ["google-protobuf"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1slcbzzqdv6104l5h8ql6kj43zmnm16g2dav8bc8dasfpwmrg1k0"; - type = "gem"; - }; - version = "2.2.1"; - }; - proc_to_ast = { - dependencies = ["coderay" "parser" "unparser"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; - type = "gem"; - }; - version = "0.1.0"; - }; - pry = { - dependencies = ["coderay" "method_source"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; - type = "gem"; - }; - version = "0.13.1"; - }; - public_suffix = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; - type = "gem"; - }; - version = "4.0.7"; - }; - racc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; - type = "gem"; - }; - version = "1.6.2"; - }; - rack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2"; - type = "gem"; - }; - version = "2.2.6.3"; - }; - rack-test = { - dependencies = ["rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; - type = "gem"; - }; - version = "2.0.2"; - }; - rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; - type = "gem"; - }; - version = "2.0.3"; - }; - rails-html-sanitizer = { - dependencies = ["loofah"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; - type = "gem"; - }; - version = "1.5.0"; - }; - rainbow = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; - type = "gem"; - }; - version = "3.1.1"; - }; - rbtrace = { - dependencies = ["ffi" "msgpack" "optimist"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn"; - type = "gem"; - }; - version = "0.4.14"; - }; - redis = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; - type = "gem"; - }; - version = "4.8.0"; - }; - regexp_parser = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zjg29w5zvar7by1kqck3zilbdzm5iz3jp5d1zn3970krskfazh2"; - type = "gem"; - }; - version = "2.6.2"; - }; - reverse_markdown = { - dependencies = ["nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; - type = "gem"; - }; - version = "1.4.0"; - }; - rexml = { - groups = ["default" "development" "omnibus" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - rspec = { - dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; - type = "gem"; - }; - version = "3.12.0"; - }; - rspec-core = { - dependencies = ["rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; - type = "gem"; - }; - version = "3.12.0"; - }; - rspec-expectations = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; - type = "gem"; - }; - version = "3.12.2"; - }; - rspec-mocks = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc"; - type = "gem"; - }; - version = "3.12.3"; - }; - rspec-parameterized = { - dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11mk52x34j957rqccxfqlsqjzg26dz04ipd1v4yx5yraqx1v01ww"; - type = "gem"; - }; - version = "1.0.0"; - }; - rspec-parameterized-core = { - dependencies = ["parser" "proc_to_ast" "rspec" "unparser"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hfc2q7g8f5s6kdh1chwlalvz3fvj57vlfpn18b23677hm4ljyr8"; - type = "gem"; - }; - version = "1.0.0"; - }; - rspec-parameterized-table_syntax = { - dependencies = ["binding_of_caller" "rspec-parameterized-core"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "134q0hki279np9dv7mgr85wspdrvhpj9lpvxr9kx6pcwzwg9bpyp"; - type = "gem"; - }; - version = "1.0.0"; - }; - rspec-support = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; - type = "gem"; - }; - version = "3.12.0"; - }; - rubocop = { - dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a2j57r6pvngqlzkmww031gs5isax3nsr9n7cbfpqnh34ljh2lk1"; - type = "gem"; - }; - version = "1.44.0"; - }; - rubocop-ast = { - dependencies = ["parser"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; - type = "gem"; - }; - version = "1.24.1"; - }; - ruby-progressbar = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; - type = "gem"; - }; - version = "1.11.0"; - }; - rubyzip = { - groups = ["default" "development" "omnibus" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; - type = "gem"; - }; - version = "2.3.2"; - }; - rugged = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58"; - type = "gem"; - }; - version = "1.5.1"; - }; - sawyer = { - dependencies = ["addressable" "faraday"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; - type = "gem"; - }; - version = "0.8.2"; - }; - sentry-raven = { - dependencies = ["faraday"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h"; - type = "gem"; - }; - version = "3.1.2"; - }; - thor = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; - type = "gem"; - }; - version = "1.1.0"; - }; - thrift = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r3k8x3vfaa6wnz8mhpn10938bzmfj489zc18q73xpsb469v0nv9"; - type = "gem"; - }; - version = "0.18.1"; - }; - tomlrb = { - groups = ["default" "development" "omnibus" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a83cb5xpyzlr651d46rk5xgq37s46hs9nfqy9baawzs31hm9k2g"; - type = "gem"; - }; - version = "2.0.1"; - }; - tzinfo = { - dependencies = ["concurrent-ruby"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; - type = "gem"; - }; - version = "2.0.5"; - }; - unicode-display_width = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; - type = "gem"; - }; - version = "2.4.2"; - }; - unparser = { - dependencies = ["diff-lcs" "parser"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j6ym6cn43ry4lvcal7cv0n9g9awny7kcrn1crp7cwx2vwzffhmf"; - type = "gem"; - }; - version = "0.6.7"; - }; - with_env = { - groups = ["default" "development" "omnibus" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; - type = "gem"; - }; - version = "1.1.0"; - }; - xml-simple = { - dependencies = ["rexml"]; - groups = ["default" "development" "omnibus" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj"; - type = "gem"; - }; - version = "1.1.9"; - }; - zeitwerk = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; - type = "gem"; - }; - version = "2.6.6"; - }; -} diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index b513b71b1bba..acad2da3dc5b 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -225,16 +225,7 @@ def update_gitaly(): """Update gitaly""" logger.info("Updating gitaly") data = _get_data_json() - gitaly_server_version = data["passthru"]["GITALY_SERVER_VERSION"] - repo = GitLabRepo(repo="gitaly") - gitaly_dir = pathlib.Path(__file__).parent / "gitaly" - - for fn in ["Gemfile.lock", "Gemfile"]: - with open(gitaly_dir / fn, "w") as f: - f.write(repo.get_file(f"ruby/{fn}", f"v{gitaly_server_version}")) - - subprocess.check_output(["bundle", "lock"], cwd=gitaly_dir) - subprocess.check_output(["bundix"], cwd=gitaly_dir) + gitaly_server_version = data['passthru']['GITALY_SERVER_VERSION'] _call_nix_update("gitaly", gitaly_server_version) From a69b300bc1b7e4d8cee982d0f8d65d134b6d58e0 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 23 May 2023 11:57:03 +0000 Subject: [PATCH 41/54] gitlab: 15.11.6 -> 16.0.1 https://about.gitlab.com/releases/2023/05/22/gitlab-16-0-released/ https://about.gitlab.com/releases/2023/05/23/critical-security-release-gitlab-16-0-1-released/ --- .../version-management/gitlab/data.json | 16 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab/gitlab-pages/default.nix | 4 +- .../gitlab/gitlab-shell/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 52 ++--- .../gitlab/rubyEnv/Gemfile.lock | 118 ++++++------ .../gitlab/rubyEnv/gemset.nix | 182 ++++++++++-------- 8 files changed, 198 insertions(+), 190 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 038c87c64a34..e1f099bb22f1 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.11.6", - "repo_hash": "sha256-qpYVYzxtMgWLXhMn+0TvDqRJOnerfc9OEU1Gs6Ys/Bc=", - "yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb", + "version": "16.0.1", + "repo_hash": "sha256-TApZSavGA361Pue0u21Der6CUABhp/hwewUe9YExLAs=", + "yarn_hash": "0yy04jnfvn5dgciqd105xiwg7chjwp3w6iqbjpylak9h82ci6wlh", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.11.6-ee", + "rev": "v16.0.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.11.6", - "GITLAB_PAGES_VERSION": "15.11.6", - "GITLAB_SHELL_VERSION": "14.18.0", - "GITLAB_WORKHORSE_VERSION": "15.11.6" + "GITALY_SERVER_VERSION": "16.0.1", + "GITLAB_PAGES_VERSION": "16.0.1", + "GITLAB_SHELL_VERSION": "14.20.0", + "GITLAB_WORKHORSE_VERSION": "16.0.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 53c88a1f9c89..c21d1312a457 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "15.11.6"; + version = "16.0.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,10 +24,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-n56Jqgu64+pN4bcH/Sh8/+4StpTEY529a4yVozqtK5Y="; + sha256 = "sha256-2OlCjwcJ0RydbKI15X4wZ20XVclC44McNig95UndDGg="; }; - vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk="; + vendorSha256 = "sha256-KBhTI70eReZGSd7RxwGXcUGa0wDo7q5tU9fUhrLeFO0="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 2cb0aa2a82b6..e8b90d5d53f5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "15.11.6"; + version = "16.0.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-Dl/NCsZCi5S9BKjtQzRg3mj8lzvIa4FMCqprLKXKlHw="; + sha256 = "sha256-RbsPWc3Dc/rMLnSID0dZmHMg3+uK91kI+DXBYPSy81w="; }; vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index d2d8a372e5c3..5dcb6e88a15c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.18.0"; + version = "14.20.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-dMxWnv+YfoDy9rhuCx+JIxFyjHejttkkqkQ4owdI/4g="; + sha256 = "sha256-5rjrBt0AihSHMYOD6JbXGvvFaUbtYnMHX2Z4K+Svno0="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-zqZMZvYteOWTgDnlX8H1i8e/QTbAoTPD6ZNsHsCcLdM="; + vendorSha256 = "sha256-kKbTbOCuAGIbnFXTOZyoVRM5PIackbmND6PrryVvLTM="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 96362c489590..c4afb9f0a367 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.11.6"; + version = "16.0.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-/snYfip1f0TCVoPk80thanYpbYsGjEd+CAcxIt289As="; + vendorSha256 = "sha256-B9YZkqAMYvTnnWx2tYEF0VZ/+9LZaWS5euQ9ZX2m49E="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index b0826a2482e5..10c4d6dc8d86 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still experimental +if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__)) require 'bundler-checksum' BundlerChecksum.patch! @@ -17,9 +17,7 @@ gem 'rails', '~> 6.1.7.2' gem 'bootsnap', '~> 1.16.0', require: false -# Pin openssl to match the version bundled with our supported Rubies. -# See https://stdgems.org/openssl/#gem-version. -gem 'openssl', '3.0.2' +gem 'openssl', '~> 3.0' gem 'ipaddr', '~> 1.2.5' # Responders respond_to and respond_with @@ -27,10 +25,12 @@ gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' -gem 'view_component', '~> 2.74.1' +gem 'view_component', '~> 2.82.0' # Supported DBs -gem 'pg', '~> 1.4.6' +gem 'pg', '~> 1.5.3' + +gem 'neighbor', '~> 0.2.3' gem 'rugged', '~> 1.5' gem 'grape-path-helpers', '~> 1.7.1' @@ -46,14 +46,13 @@ gem 'devise', '~> 4.8.1' gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' gem 'bcrypt', '~> 3.1', '>= 3.1.14' gem 'doorkeeper', '~> 5.6', '>= 5.6.6' -gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.5' +gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.6' gem 'rexml', '~> 3.2.5' gem 'ruby-saml', '~> 1.13.0' gem 'omniauth', '~> 2.1.0' gem 'omniauth-auth0', '~> 3.1' gem 'omniauth-azure-activedirectory-v2', '~> 2.0' gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md -gem 'omniauth-cas3', '~> 1.1.4', path: 'vendor/gems/omniauth-cas3' # See vendor/gems/omniauth-cas3/README.md gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-alicloud', '~> 2.0.1' gem 'omniauth-facebook', '~> 4.0.0' @@ -61,7 +60,7 @@ gem 'omniauth-github', '2.0.1' gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' -gem 'omniauth-saml', '~> 2.0.0' +gem 'omniauth-saml', '~> 2.1.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md gem 'omniauth_openid_connect', '~> 0.6.1' @@ -86,7 +85,6 @@ gem 'invisible_captcha', '~> 2.0.0' gem 'devise-two-factor', '~> 4.0.2' gem 'rqrcode-rails3', '~> 0.1.7' gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' -gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.11' @@ -174,9 +172,9 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.171.0' +gem 'aws-sdk-core', '~> 3.172.0' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.121.0' +gem 'aws-sdk-s3', '~> 1.122.0' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections @@ -207,7 +205,7 @@ gem 'diffy', '~> 3.4' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.6', '>= 2.2.6.4' +gem 'rack', '~> 2.2.7' # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' @@ -241,9 +239,6 @@ gem 'rainbow', '~> 3.0' # Progress bar gem 'ruby-progressbar', '~> 1.10' -# GitLab settings -gem 'settingslogic', '~> 2.0.9' - # Linear-time regex library for untrusted regular expressions gem 're2', '~> 1.6.0' @@ -289,13 +284,14 @@ gem 'kubeclient', '~> 4.11.0' # AI gem 'ruby-openai', '~> 3.7' +gem 'circuitbox', '2.0.0' # Sanitize user input gem 'sanitize', '~> 6.0' gem 'babosa', '~> 1.0.4' # Sanitizes SVG input -gem 'loofah', '~> 2.20.0' +gem 'loofah', '~> 2.21.0' # Working with license # Detects the open source license the repository includes @@ -344,7 +340,7 @@ gem 'pg_query', '~> 2.2', '>= 2.2.1' gem 'premailer-rails', '~> 1.10.3' -gem 'gitlab-labkit', '~> 0.31.1' +gem 'gitlab-labkit', '~> 0.32.0' gem 'thrift', '>= 0.16.0' # I18n @@ -367,20 +363,20 @@ gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.8.1', require: false -gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.23', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.3.10', require: false + gem 'lefthook', '~> 1.3.13', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 1.5', '>= 1.5.3' + gem 'lookbook', '~> 2.0', '>= 2.0.1' # Better errors handler - gem 'better_errors', '~> 2.9.1' + gem 'better_errors', '~> 2.10.0' gem 'sprite-factory', '~> 1.7' @@ -435,7 +431,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.9.0', require: false + gem 'gitlab-dangerfiles', '~> 3.10.0', require: false end group :development, :test, :coverage do @@ -459,7 +455,8 @@ group :test do gem 'capybara', '~> 3.39' gem 'capybara-screenshot', '~> 1.0.26' - gem 'selenium-webdriver', '~> 3.142', '>= 3.142.7' + # 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support. + gem 'selenium-webdriver', '= 4.9.0' gem 'graphlyte', '~> 1.0.0' @@ -484,7 +481,7 @@ gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'stackprof', '~> 0.2.23', require: false +gem 'stackprof', '~> 0.2.25', require: false gem 'rbtrace', '~> 0.4', require: false gem 'memory_profiler', '~> 1.0', require: false gem 'activerecord-explain-analyze', '~> 0.1', require: false @@ -512,7 +509,7 @@ gem 'spamcheck', '~> 1.3.0' gem 'gitaly', '~> 15.9.0-rc3' # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.0.2' +gem 'kas-grpc', '~> 0.1.0' gem 'grpc', '~> 1.42.0' @@ -589,6 +586,9 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # Work with RPM packages gem 'arr-pm', '~> 0.0.12' +# Remote Development +gem 'devfile', '~> 0.0.17.pre.alpha1' + # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0' gem 'app_store_connect' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 0b14f9032d1f..199c806a854c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -61,14 +61,6 @@ PATH omniauth (~> 2.0) omniauth-oauth2 (~> 1.4) -PATH - remote: vendor/gems/omniauth-cas3 - specs: - omniauth-cas3 (1.1.4) - addressable (~> 2.3) - nokogiri (~> 1.7, >= 1.7.1) - omniauth (~> 2.0) - PATH remote: vendor/gems/omniauth-gitlab specs: @@ -207,19 +199,19 @@ GEM awesome_print (1.9.2) awrence (1.2.1) aws-eventstream (1.2.0) - aws-partitions (1.733.0) + aws-partitions (1.761.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.171.0) + aws-sdk-core (3.172.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.63.0) + aws-sdk-kms (1.64.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.121.0) + aws-sdk-s3 (1.122.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -256,10 +248,10 @@ GEM memory_profiler (~> 1) benchmark-perf (0.6.0) benchmark-trend (0.4.0) - better_errors (2.9.1) - coderay (>= 1.0.0) + better_errors (2.10.0) erubi (>= 1.0.0) rack (>= 0.9.0) + rouge (>= 1.0.0) bindata (2.4.11) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) @@ -303,8 +295,8 @@ GEM mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) chef-utils (16.10.17) - childprocess (3.0.0) chunky_png (1.3.5) + circuitbox (2.0.0) citrus (3.0.2) claide (1.1.0) claide-plugins (0.9.2) @@ -375,6 +367,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) + devfile (0.0.17.pre.alpha1) device_detector (1.0.0) devise (4.8.1) bcrypt (~> 3.0) @@ -400,7 +393,7 @@ GEM unf (>= 0.0.5, < 1.0.0) doorkeeper (5.6.6) railties (>= 5) - doorkeeper-openid_connect (1.8.5) + doorkeeper-openid_connect (1.8.6) doorkeeper (>= 5.5, < 5.7) jwt (>= 2.5) dotenv (2.7.6) @@ -595,7 +588,7 @@ GEM terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.9.0) + gitlab-dangerfiles (3.10.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake @@ -609,7 +602,7 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.31.1) + gitlab-labkit (0.32.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -617,7 +610,7 @@ GEM opentracing (~> 0.4) pg_query (~> 2.1) redis (> 3.0.0, < 6.0.0) - gitlab-license (2.2.1) + gitlab-license (2.2.2) gitlab-mail_room (0.0.23) jwt (>= 2.0) net-imap (>= 0.2.1) @@ -870,7 +863,7 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kas-grpc (0.0.2) + kas-grpc (0.1.0) grpc (~> 1.0) knapsack (1.21.1) rake @@ -885,7 +878,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.3.10) + lefthook (1.3.13) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -920,20 +913,19 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.20.0) + loofah (2.21.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lookbook (1.5.3) - actioncable + lookbook (2.0.1) activemodel css_parser htmlbeautifier (~> 1.3) htmlentities (~> 4.3.4) - listen (~> 3.0) + marcel (~> 1.0) railties (>= 5.0) redcarpet (~> 3.5) rouge (>= 3.26, < 5.0) - view_component (> 2.0, < 4) + view_component (>= 2.0) yard (~> 0.9.25) zeitwerk (~> 2.5) lru_redux (1.1.0) @@ -984,6 +976,8 @@ GEM mustermann-grape (1.0.1) mustermann (>= 1.0.0) nap (1.1.0) + neighbor (0.2.3) + activerecord (>= 5.2) nenv (0.3.0) net-http-persistent (4.0.1) connection_pool (~> 2.2) @@ -1073,9 +1067,9 @@ GEM omniauth-oauth2-generic (0.2.8) omniauth-oauth2 (~> 1.0) rake - omniauth-saml (2.0.0) + omniauth-saml (2.1.0) omniauth (~> 2.0) - ruby-saml (~> 1.9) + ruby-saml (~> 1.12) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack @@ -1093,7 +1087,7 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - openssl (3.0.2) + openssl (3.1.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) opentracing (0.5.0) @@ -1133,7 +1127,7 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.4.6) + pg (1.5.3) pg_query (2.2.1) google-protobuf (>= 3.19.2) plist (3.6.0) @@ -1151,7 +1145,8 @@ GEM coderay parser unparser - prometheus-client-mmap (0.19.1) + prometheus-client-mmap (0.23.1) + rb_sys (~> 0.9) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -1173,7 +1168,7 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.2) - rack (2.2.6.4) + rack (2.2.7) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.6.1) @@ -1231,6 +1226,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rb_sys (0.9.75) rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) @@ -1399,9 +1395,10 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) - rubyzip (>= 1.2.2) + selenium-webdriver (4.9.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) semver_dialects (1.2.1) pastel (~> 0.8.0) thor (~> 1.2.0) @@ -1417,7 +1414,6 @@ GEM sentry-ruby (~> 5.8.0) sidekiq (>= 3.0) set (1.0.1) - settingslogic (2.0.9) sexp_processor (4.16.1) shellany (0.0.1) shoulda-matchers (5.1.0) @@ -1486,7 +1482,7 @@ GEM mini_portile2 (~> 2.8.0) ssh_data (1.3.0) ssrf_filter (1.0.8) - stackprof (0.2.23) + stackprof (0.2.25) state_machines (0.5.0) state_machines-activemodel (0.8.0) activemodel (>= 5.1) @@ -1573,7 +1569,6 @@ GEM ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - u2f (0.2.1) uber (0.1.0) undercover (0.4.5) imagen (>= 0.1.8) @@ -1605,8 +1600,8 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (2.74.1) - activesupport (>= 5.0.0, < 8.0) + view_component (2.82.0) + activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) virtus (2.0.0) @@ -1634,6 +1629,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.1) + websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -1676,8 +1672,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.171.0) - aws-sdk-s3 (~> 1.121.0) + aws-sdk-core (~> 3.172.0) + aws-sdk-s3 (~> 1.122.0) axe-core-rspec babosa (~> 1.0.4) base32 (~> 0.3.0) @@ -1685,7 +1681,7 @@ DEPENDENCIES bcrypt (~> 3.1, >= 3.1.14) benchmark-ips (~> 2.11.0) benchmark-memory (~> 0.1) - better_errors (~> 2.9.1) + better_errors (~> 2.10.0) bootsnap (~> 1.16.0) browser (~> 5.3.1) bullet (~> 7.0.2) @@ -1695,6 +1691,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.26) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) + circuitbox (= 2.0.0) cloud_profiler_agent (~> 0.0.0)! commonmarker (~> 0.23.6) concurrent-ruby (~> 1.1) @@ -1708,6 +1705,7 @@ DEPENDENCIES declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks + devfile (~> 0.0.17.pre.alpha1) device_detector devise (~> 4.8.1) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -1716,7 +1714,7 @@ DEPENDENCIES diffy (~> 3.4) discordrb-webhooks (~> 3.4) doorkeeper (~> 5.6, >= 5.6.6) - doorkeeper-openid_connect (~> 1.8, >= 1.8.5) + doorkeeper-openid_connect (~> 1.8, >= 1.8.6) duo_api (~> 1.3) ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) @@ -1745,10 +1743,10 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly (~> 15.9.0.pre.rc3) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.9.0) + gitlab-dangerfiles (~> 3.10.0) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.7.0) - gitlab-labkit (~> 0.31.1) + gitlab-labkit (~> 0.32.0) gitlab-license (~> 2.2.1) gitlab-mail_room (~> 0.0.23) gitlab-markup (~> 1.9.0) @@ -1804,19 +1802,19 @@ DEPENDENCIES json_schemer (~> 0.2.18) jwt (~> 2.5) kaminari (~> 1.2.2) - kas-grpc (~> 0.0.2) + kas-grpc (~> 0.1.0) knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) - lefthook (~> 1.3.10) + lefthook (~> 1.3.13) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) listen (~> 3.7) lockbox (~> 1.1.1) lograge (~> 0.5) - loofah (~> 2.20.0) - lookbook (~> 1.5, >= 1.5.3) + loofah (~> 2.21.0) + lookbook (~> 2.0, >= 2.0.1) lru_redux mail (= 2.8.1) mail-smtp_pool (~> 0.1.0)! @@ -1826,6 +1824,7 @@ DEPENDENCIES mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) + neighbor (~> 0.2.3) net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) @@ -1841,7 +1840,6 @@ DEPENDENCIES omniauth-auth0 (~> 3.1) omniauth-azure-activedirectory-v2 (~> 2.0) omniauth-azure-oauth2 (~> 0.0.9)! - omniauth-cas3 (~> 1.1.4)! omniauth-dingtalk-oauth2 (~> 1.0) omniauth-facebook (~> 4.0.0) omniauth-github (= 2.0.1) @@ -1849,28 +1847,28 @@ DEPENDENCIES omniauth-google-oauth2 (~> 1.1) omniauth-oauth2-generic (~> 0.2.2) omniauth-salesforce (~> 1.0.5)! - omniauth-saml (~> 2.0.0) + omniauth-saml (~> 2.1.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.6.1) openid_connect (= 1.3.0) - openssl (= 3.0.2) + openssl (~> 3.0) org-ruby (~> 0.9.12) pact (~> 1.63) parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.4.6) + pg (~> 1.5.3) pg_query (~> 2.2, >= 2.2.1) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.19) + prometheus-client-mmap (~> 0.23) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.1) puma (~> 5.6.5) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.6, >= 2.2.6.4) + rack (~> 2.2.7) rack-attack (~> 6.6.1) rack-cors (~> 1.1.1) rack-oauth2 (~> 1.21.3) @@ -1912,13 +1910,12 @@ DEPENDENCIES sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 3.142, >= 3.142.7) + selenium-webdriver (= 4.9.0) semver_dialects (~> 1.2.1) sentry-rails (~> 5.8.0) sentry-raven (~> 3.1) sentry-ruby (~> 5.8.0) sentry-sidekiq (~> 5.8.0) - settingslogic (~> 2.0.9) shoulda-matchers (~> 5.1.0) sidekiq (~> 6.5.7) sidekiq-cron (~> 1.8.0) @@ -1936,7 +1933,7 @@ DEPENDENCIES sprite-factory (~> 1.7) sprockets (~> 3.7.0) ssh_data (~> 1.3) - stackprof (~> 0.2.23) + stackprof (~> 0.2.25) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.6) @@ -1949,14 +1946,13 @@ DEPENDENCIES toml-rb (~> 2.2.0) truncato (~> 0.7.12) typhoeus (~> 1.4.0) - u2f (~> 0.2.1) undercover (~> 0.4.4) unf (~> 0.1.4) unleash (~> 3.2.2) valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.3) - view_component (~> 2.74.1) + view_component (~> 2.82.0) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 237c9ab5a53d..ac66421c7094 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -379,10 +379,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmva6m4jjc1vl4mb45ar6jhwzbaw5mb80yc6s2wi729ijlqqhad"; + sha256 = "1whf6ppvdibfpsr660ajncig3hyc6q9dvnx645ajrjfz3r7487i9"; type = "gem"; }; - version = "1.733.0"; + version = "1.761.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -401,10 +401,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0732vv8zi67z25fss1sdvqx0vv1ap3w6hz1avxzwznkjp002vj39"; + sha256 = "06scfn1qjfqvgr05ddrcbihlnfi7bffk8r0m5z536w4mm1s3gh6x"; type = "gem"; }; - version = "3.171.0"; + version = "3.172.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -412,10 +412,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02"; + sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0"; type = "gem"; }; - version = "1.63.0"; + version = "1.64.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -423,10 +423,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s5v3799pi7ik53gv7dl02am5pngv6x4azzwx9my09nll4q3lfk8"; + sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx"; type = "gem"; }; - version = "1.121.0"; + version = "1.122.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -606,15 +606,15 @@ src: version = "0.4.0"; }; better_errors = { - dependencies = ["coderay" "erubi" "rack"]; + dependencies = ["erubi" "rack" "rouge"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11220lfzhsyf5fcril3qd689kgg46qlpiiaj00hc9mh4mcbc3vrr"; + sha256 = "0fhi891k7c4l967bacahq2jhnxswfmbpmbsg1yapczwpm1ynmaz3"; type = "gem"; }; - version = "2.9.1"; + version = "2.10.0"; }; bindata = { groups = ["default"]; @@ -810,16 +810,6 @@ src: }; version = "16.10.17"; }; - childprocess = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; - type = "gem"; - }; - version = "3.0.0"; - }; chunky_png = { groups = ["default"]; platforms = []; @@ -830,6 +820,16 @@ src: }; version = "1.3.5"; }; + circuitbox = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "056snhim934xysz630ysfbfdxa64vin5y24h2ha1wvj9fqg9qvj9"; + type = "gem"; + }; + version = "2.0.0"; + }; citrus = { groups = ["default"]; platforms = []; @@ -1158,6 +1158,16 @@ src: }; version = "0.0.4"; }; + devfile = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v34ivsfpc4d291j89jyg2jz970h94jbz01hdm2jwcmq798yfm98"; + type = "gem"; + }; + version = "0.0.17.pre.alpha1"; + }; device_detector = { groups = ["default"]; platforms = []; @@ -1290,10 +1300,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xi70vfh121an0gjpi388kqdvkaqqycy7kj8r51jhh25g5l5gvnl"; + sha256 = "00z0n4ix21nvqk74hhz5ab811366pdjx99cn2i26yiwpwr1nbi4d"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.6"; }; dotenv = { groups = ["default"]; @@ -2157,10 +2167,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13npl2yqcapsxwzm3b84537sa5s1cplcvba43nlwdcb1d22skfip"; + sha256 = "0ha0n6wkw8xm42v4wx9815ivpwjydp88jv9laq19qljj3w2zwk6z"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2190,20 +2200,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yxz433p9gg8avl94wnb68fm89zaq02r179dkirx5db614vkjfiy"; + sha256 = "0vl64blqz850d5vahwpwyrsvw4iarn578p8bzmcw11imqpnk62pk"; type = "gem"; }; - version = "0.31.1"; + version = "0.32.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c1dy32ai104nh7npxbzjdfpr2yhx2xdrd81zs5dz1r8ifzgdz1r"; + sha256 = "07pdi9zcifiw8vjv5zz5jdv2gmaq3rkyxfdkn0j3a0cdh9iwgjrc"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.2"; }; gitlab-mail_room = { dependencies = ["jwt" "net-imap" "oauth2"]; @@ -3217,10 +3227,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05lsvxb6mpx5h3zmp3pgs3cp52r1kb3a8yr9j7s3ksajb58zf7qi"; + sha256 = "1nhdllr7zi19b73q0flbc0lhqb5mn0jrw4bqdang7wfxgfdwf6dj"; type = "gem"; }; - version = "0.0.2"; + version = "0.1.0"; }; knapsack = { dependencies = ["rake"]; @@ -3282,10 +3292,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1csrkaaqxczq2gc9rmi1524l06wc9bxmivjy9vnlwj5hi4v5ikb8"; + sha256 = "0wnz60wh2yb7s5g7an64cw2brl9vvw960xnq4gs3q6drlgmbjl8g"; type = "gem"; }; - version = "1.3.10"; + version = "1.3.13"; }; letter_opener = { dependencies = ["launchy"]; @@ -3400,21 +3410,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8"; + sha256 = "0nq23yca06rq8qxxymh4nfbx484k2yll54y780b4ilyvmcipyh7c"; type = "gem"; }; - version = "2.20.0"; + version = "2.21.0"; }; lookbook = { - dependencies = ["actioncable" "activemodel" "css_parser" "htmlbeautifier" "htmlentities" "listen" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; + dependencies = ["activemodel" "css_parser" "htmlbeautifier" "htmlentities" "marcel" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f4b0bp7y7bw57lfynd5d5kgdn0dqkxl2masyk6hvpl5mxsz83sa"; + sha256 = "0jpwfdf6wk77ri85ksmsbxvfb4jpba3bx84j0zg10a4rijf7450g"; type = "gem"; }; - version = "1.5.3"; + version = "2.0.1"; }; lru_redux = { groups = ["default"]; @@ -3749,6 +3759,17 @@ src: }; version = "1.1.0"; }; + neighbor = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r9k34xz7x7fpd18bix0cd5bk2wv6mj8z67f8fr7l30d2717m23h"; + type = "gem"; + }; + version = "0.2.3"; + }; nenv = { groups = ["default" "test"]; platforms = []; @@ -4046,16 +4067,6 @@ src: }; version = "0.0.10"; }; - omniauth-cas3 = { - dependencies = ["addressable" "nokogiri" "omniauth"]; - groups = ["default"]; - platforms = []; - source = { - path = "${src}/vendor/gems/omniauth-cas3"; - type = "path"; - }; - version = "1.1.4"; - }; omniauth-dingtalk-oauth2 = { dependencies = ["omniauth-oauth2"]; groups = ["default"]; @@ -4159,10 +4170,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1is4vnikwmd148gpyv3sm57k4cmdx4il5rm2cng6mqhdcgb4yn82"; + sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; @@ -4222,10 +4233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mcg47zz4w902cq6c8cdj62npawgwq68sfh7n7aqy7vm3pgvls9h"; + sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -4380,10 +4391,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; + sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb"; type = "gem"; }; - version = "1.4.6"; + version = "1.5.3"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -4461,14 +4472,15 @@ src: version = "0.1.0"; }; prometheus-client-mmap = { + dependencies = ["rb_sys"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zcw8yx7c2mmmcl3kq7nswansshcpxzqjbxf61xqfydbmhd5z2vi"; + sha256 = "0h4w0947zwwg6kbdnvg4vbmrsc8yf5ijb37sg758apks44imym28"; type = "gem"; }; - version = "0.19.1"; + version = "0.23.1"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4581,10 +4593,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.6.4"; + version = "2.2.7"; }; rack-accept = { dependencies = ["rack"]; @@ -4780,6 +4792,16 @@ src: }; version = "0.10.1"; }; + rb_sys = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zx8v677r2gs050z4cdiflp14kp6nx5z285ynj2ach0w0z7jfm23"; + type = "gem"; + }; + version = "0.9.75"; + }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; groups = ["default"]; @@ -5526,15 +5548,15 @@ src: version = "2.3.7"; }; selenium-webdriver = { - dependencies = ["childprocess" "rubyzip"]; + dependencies = ["rexml" "rubyzip" "websocket"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; + sha256 = "1kxnv3ywssagv2q453hasrrrvsv68d5f3ccm33pyacdji88w8pqg"; type = "gem"; }; - version = "3.142.7"; + version = "4.9.0"; }; semver_dialects = { dependencies = ["pastel" "thor" "tty-command"]; @@ -5601,16 +5623,6 @@ src: }; version = "1.0.1"; }; - settingslogic = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar"; - type = "gem"; - }; - version = "2.0.9"; - }; sexp_processor = { groups = ["default"]; platforms = []; @@ -5910,10 +5922,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02r3a3ny27ljj19bzmxscw2vlmk7sw1p4ppbl2i69g17khi0p4sw"; + sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8"; type = "gem"; }; - version = "0.2.23"; + version = "0.2.25"; }; state_machines = { groups = ["default"]; @@ -6357,16 +6369,6 @@ src: }; version = "2.0.6"; }; - u2f = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr"; - type = "gem"; - }; - version = "0.2.1"; - }; uber = { groups = ["default"]; platforms = []; @@ -6541,10 +6543,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h4jhcp4h98lj5f7bn54313na25p9mhal0fw8d8a8m8lq6llgg8b"; + sha256 = "1bwvpkv1iqa8g5cmmllx8fx0nprapzrzfvf1m15rr3wxw5hrbdn8"; type = "gem"; }; - version = "2.74.1"; + version = "2.82.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6631,6 +6633,16 @@ src: }; version = "1.8.1"; }; + websocket = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + type = "gem"; + }; + version = "1.2.9"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default" "test"]; From 33411f27686e7535254879c0fddaa93a67ea4774 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 17:59:37 +0000 Subject: [PATCH 42/54] nixos/gitlab: Update redis configuration Configuring Redis via environment variable is not supported anymore since [1]. [1] https://gitlab.com/gitlab-org/gitlab/-/commit/12429653611af05ef960689c8971108d5a85c937 --- nixos/modules/services/misc/gitlab.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e8b6ae16c50d..10eb175fb7c9 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -84,6 +84,9 @@ let }; }; + # Redis configuration file + resqueYml = pkgs.writeText "resque.yml" (builtins.toJSON redisConfig); + gitlabConfig = { # These are the default settings from config/gitlab.example.yml production = flip recursiveUpdate cfg.extraConfig { @@ -167,7 +170,6 @@ let SCHEMA = "${cfg.statePath}/db/structure.sql"; GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads"; GITLAB_LOG_PATH = "${cfg.statePath}/log"; - GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig); prometheus_multiproc_dir = "/run/gitlab"; RAILS_ENV = "production"; MALLOC_ARENA_MAX = "2"; @@ -1310,6 +1312,7 @@ in { cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb ln -sf ${cableYml} ${cfg.statePath}/config/cable.yml + ln -sf ${resqueYml} ${cfg.statePath}/config/resque.yml ${cfg.packages.gitlab-shell}/bin/install From 4321e48b6851f187696bd4ef544cd2f6e6dfbd8b Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 23 May 2023 12:09:27 +0000 Subject: [PATCH 43/54] nixos/gitlab: Remove procps from gitaly service From my understanding, procps was added to the gitlay systemd service path in #58487 to fix gitaly-ruby's internal memory leak detection. Now that the last ruby remnants have been removed in gitaly 16.0.0, this should not be necessary anymore. --- nixos/modules/services/misc/gitlab.nix | 1 - ...> Remove-unsupported-database-names.patch} | 50 +++++++++++-------- .../version-management/gitlab/default.nix | 4 +- .../gitlab/remove-hardcoded-locations.patch | 10 ++-- 4 files changed, 36 insertions(+), 29 deletions(-) rename pkgs/applications/version-management/gitlab/{Remove-geo-from-database.yml.patch => Remove-unsupported-database-names.patch} (55%) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 10eb175fb7c9..998bf8074730 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1460,7 +1460,6 @@ in { partOf = [ "gitlab.target" ]; path = with pkgs; [ openssh - procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562 git gzip bzip2 diff --git a/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch b/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch similarity index 55% rename from pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch rename to pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch index 46d2c3171465..7de1779f4a74 100644 --- a/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch +++ b/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch @@ -1,20 +1,21 @@ -From 7d833508e3bc4c737834e9edf1c429d36f67a38c Mon Sep 17 00:00:00 2001 -From: "M. A" -Date: Sat, 25 Jun 2022 13:34:42 +0000 -Subject: [PATCH] Remove geo from database.yml +From 310245bad66048624e199000a1c7eb9d68ce2b5c Mon Sep 17 00:00:00 2001 +From: Yaya +Date: Tue, 23 May 2023 13:49:18 +0000 +Subject: [PATCH] Remove unsupported database names +The only supported ones are main, ci, main_clusterwide. --- - config/database.yml.postgresql | 28 ---------------------------- - 1 file changed, 28 deletions(-) + config/database.yml.postgresql | 35 ---------------------------------- + 1 file changed, 35 deletions(-) diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql -index c1b1247b5b08..a81437d1e1b5 100644 +index b210b9c412bc..900612080416 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -26,13 +26,6 @@ production: - # username: git - # password: "secure password" - # host: localhost + username: git + password: "secure password" + host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -26,9 +27,9 @@ index c1b1247b5b08..a81437d1e1b5 100644 # # Development specific @@ -57,13 +50,6 @@ development: - # host: localhost - # variables: - # statement_timeout: 15s + host: localhost + variables: + statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -40,9 +41,9 @@ index c1b1247b5b08..a81437d1e1b5 100644 # # Staging specific @@ -84,13 +70,6 @@ staging: - # username: git - # password: "secure password" - # host: localhost + username: git + password: "secure password" + host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -53,10 +54,10 @@ index c1b1247b5b08..a81437d1e1b5 100644 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -@@ -117,10 +96,3 @@ test: &test - # prepared_statements: false - # variables: - # statement_timeout: 15s +@@ -117,17 +96,3 @@ test: &test + prepared_statements: false + variables: + statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -64,6 +65,13 @@ index c1b1247b5b08..a81437d1e1b5 100644 - username: postgres - password: - host: localhost +- embedding: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_embedding_test +- username: postgres +- password: +- host: localhost -- -2.36.0 +2.38.4 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 105c2ce3e476..64447b9d8457 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -70,10 +70,10 @@ let ./remove-hardcoded-locations.patch # Gitlab edited the default database config since [1] and the - # installer complains about valid keywords only being "main" and "ci". + # installer now complains about valid keywords only being "main", "ci" and "embedded". # # [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028 - ./Remove-geo-from-database.yml.patch + ./Remove-unsupported-database-names.patch ]; # One of the patches uses this variable - if it's unset, execution # of rake tasks fails. diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 2b5053074052..e7d704237aed 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -31,10 +31,10 @@ index da1a15302da..c846db93e5c 100644 ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb -index 99335321f28..9d9d1c48af4 100644 +index d096174fca3a..02d0f689c523 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -185,7 +185,7 @@ +@@ -206,7 +206,7 @@ Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir rescue ArgumentError # no user configured @@ -43,13 +43,13 @@ index 99335321f28..9d9d1c48af4 100644 end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? -@@ -794,7 +794,7 @@ +@@ -959,7 +959,7 @@ # Git # - Settings['git'] ||= Settingslogic.new({}) + Settings['git'] ||= {} -Settings.git['bin_path'] ||= '/usr/bin/git' +Settings.git['bin_path'] ||= 'git' - + # Important: keep the satellites.path setting until GitLab 9.0 at # least. This setting is fed to 'rm -rf' in diff --git a/config/puma.rb.example b/config/puma.rb.example From 2a4536952a3d4481b22dfedeb0a8482083c321f4 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 20 May 2023 16:36:29 +0000 Subject: [PATCH 44/54] nixos/gitlab: Require at least postgresql 13.6 https://docs.gitlab.com/16.0/ee/install/requirements.html#postgresql-requirements --- nixos/modules/services/misc/gitlab.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 998bf8074730..ef1c9cea0476 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -12,7 +12,7 @@ let postgresqlPackage = if config.services.postgresql.enable then config.services.postgresql.package else - pkgs.postgresql_12; + pkgs.postgresql_13; gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; @@ -1098,8 +1098,8 @@ in { message = "services.gitlab.secrets.jwsFile must be set!"; } { - assertion = versionAtLeast postgresqlPackage.version "12.0.0"; - message = "PostgreSQL >=12 is required to run GitLab 14. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading"; + assertion = versionAtLeast postgresqlPackage.version "13.6.0"; + message = "PostgreSQL >=13.6 is required to run GitLab 16. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading"; } ]; From edc47cb9994e17e51b4a13fb8fa38f72e228cffb Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 23 May 2023 10:23:29 +0000 Subject: [PATCH 45/54] nixos/doc: Mention PostgreSQL requirement for gitlab `gitlab` has been upgraded to major version 16 and requires at least PostgreSQL 13.6. --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 4b34269712f4..a7af699417b9 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -277,6 +277,8 @@ In addition to numerous new and updated packages, this release has the following - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation. +- `gitlab` has been upgraded from major version 15 to major version 16 and requires at least PostgreSQL 13.6. Check the [upgrade guide](#module-services-postgres-upgrading) in the NixOS manual on how to upgrade your PostgreSQL installation. + - `fail2ban` has been updated to 1.0.2, which has a few breaking changes compared to 0.11.2 ([changelog for 1.0.1](https://github.com/fail2ban/fail2ban/blob/1.0.1/ChangeLog), [changelog for 1.0.2](https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog)) - `albert` has been updated from 0.17.6 to 0.20.13, and 0.18.0 changed the config format and many plugins ([changelog for 0.18.0](https://github.com/albertlauncher/albert/blob/v0.18.0/CHANGELOG.md)) From 75a7e0edea7095bf40c24c6afd2f4bfd4dba76ad Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 25 May 2023 09:25:14 +0200 Subject: [PATCH 46/54] gem-config: patch getconf path in prometheus-client-mmap --- pkgs/development/ruby-modules/gem-config/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 4e9f663d9ac5..22794da25167 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -283,6 +283,15 @@ in meta.mainProgram = "rbprettier"; }; + prometheus-client-mmap = attrs: { + dontBuild = false; + postPatch = let + getconf = if stdenv.hostPlatform.isGnu then stdenv.cc.libc else getconf; + in '' + substituteInPlace lib/prometheus/client/page_size.rb --replace "getconf" "${lib.getBin getconf}/bin/getconf" + ''; + }; + glib2 = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; From 82d9c2e91f88f17d75204b7819f6be533e4e93e9 Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 25 May 2023 10:01:45 +0200 Subject: [PATCH 47/54] nixosTests.gitlab: fix project ids --- nixos/tests/gitlab.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index d4e7603c20ca..88cd774f815a 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -19,13 +19,13 @@ let aliceUsername = "alice"; aliceUserId = "2"; alicePassword = "R5twyCgU0uXC71wT9BBTCqLs6HFZ7h3L"; - aliceProjectId = "2"; + aliceProjectId = "1"; aliceProjectName = "test-alice"; bobUsername = "bob"; bobUserId = "3"; bobPassword = "XwkkBbl2SiIwabQzgcoaTbhsotijEEtF"; - bobProjectId = "3"; + bobProjectId = "2"; in { name = "gitlab"; meta.maintainers = with lib.maintainers; [ globin yayayayaka ]; From 049d68051078fe4a10d7672ec5ec29c27890eb4a Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 31 May 2023 15:10:17 +0000 Subject: [PATCH 48/54] nixos/dockerRegistry: add package option This allows the module user to select an alternative container registry package such as `pkgs.gitlab-container-registry` for GitLab users. --- nixos/modules/services/misc/docker-registry.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 98edb413f3c4..8ea81f9a7ee2 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -49,6 +49,14 @@ in { options.services.dockerRegistry = { enable = mkEnableOption (lib.mdDoc "Docker Registry"); + package = mkOption { + type = types.package; + description = mdDoc "Which Docker registry package to use."; + default = pkgs.docker-distribution; + defaultText = literalExpression "pkgs.docker-distribution"; + example = literalExpression "pkgs.gitlab-container-registry"; + }; + listenAddress = mkOption { description = lib.mdDoc "Docker registry host or ip to bind to."; default = "127.0.0.1"; @@ -117,7 +125,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; script = '' - ${pkgs.docker-distribution}/bin/registry serve ${configFile} + ${cfg.package}/bin/registry serve ${configFile} ''; serviceConfig = { @@ -136,7 +144,7 @@ in { serviceConfig.Type = "oneshot"; script = '' - ${pkgs.docker-distribution}/bin/registry garbage-collect ${configFile} + ${cfg.package}/bin/registry garbage-collect ${configFile} /run/current-system/systemd/bin/systemctl restart docker-registry.service ''; From 014816cbe46973336739c450b6b80cc00f0508fa Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 30 May 2023 09:14:54 +0000 Subject: [PATCH 49/54] nixos/gitlab: Add support for gitlab-container-registry Support for external container registries (namely `pkgs.docker-distribution`) has ended in GitLab 16.0 [1] and is scheduled for removal in a future release. [2] This commit adds a new registry package option, defaulting to `pkgs.docker-distribution` and `pkgs.gitlab-container-registry` for system state versions >= 23.11. While it is still possible to use the docker container registry, module users should switch to gitlab's container registry fork soon. A warning message will be added in a future commit to advise affected users to back up their state and then switch to the new container registry package. [1]: https://gitlab.com/gitlab-org/gitlab/-/issues/376217 [2]: https://gitlab.com/gitlab-org/gitlab/-/issues/403322 --- nixos/modules/services/misc/gitlab.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index ef1c9cea0476..6bddb3615030 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -553,6 +553,20 @@ in { default = false; description = lib.mdDoc "Enable GitLab container registry."; }; + package = mkOption { + type = types.package; + default = + if versionAtLeast config.system.stateVersion "23.11" + then pkgs.gitlab-container-registry + else pkgs.docker-distribution; + defaultText = literalExpression "pkgs.docker-distribution"; + description = lib.mdDoc '' + Container registry package to use. + + External container registries such as `pkgs.docker-distribution` are not supported + anymore since GitLab 16.0.0. + ''; + }; host = mkOption { type = types.str; default = config.services.gitlab.host; @@ -1210,6 +1224,7 @@ in { services.dockerRegistry = optionalAttrs cfg.registry.enable { enable = true; enableDelete = true; # This must be true, otherwise GitLab won't manage it correctly + package = cfg.package; extraConfig = { auth.token = { realm = "http${optionalString (cfg.https == true) "s"}://${cfg.host}/jwt/auth"; From e9594e60319bae339c8cc7211e9f773d394839ae Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 30 May 2023 09:20:18 +0000 Subject: [PATCH 50/54] nixos/gitlab: Warn users who are still using an external registry This adds a warning for GitLab >=16.0.0 users who are still using an external container registry such as `pkgs.docker-distribution`. Support for external container registries has ended in GitLab 16.0 [1] and is scheduled for removal in a future release. [2] [1]: https://gitlab.com/gitlab-org/gitlab/-/issues/376217 [2]: https://gitlab.com/gitlab-org/gitlab/-/issues/403322 --- nixos/modules/services/misc/gitlab.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 6bddb3615030..bf0a12007447 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1081,6 +1081,13 @@ in { }; config = mkIf cfg.enable { + warnings = [ + (mkIf + (cfg.registry.enable && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0" && cfg.registry.package == pkgs.docker-distribution) + ''Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release. + Please back up your data and migrate to the gitlab-container-registry package.'' + ) + ]; assertions = [ { From 28ecd1752334b467929ef3f565389fdf94c03f1e Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 30 May 2023 10:18:07 +0000 Subject: [PATCH 51/54] nixos/doc: Mention container registry deprecation in gitlab Support for external container registries has ended in GitLab >=16 and module users are therefore advised to switch to gitlab's fork instead. --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index a7af699417b9..9b758adca57a 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -279,6 +279,8 @@ In addition to numerous new and updated packages, this release has the following - `gitlab` has been upgraded from major version 15 to major version 16 and requires at least PostgreSQL 13.6. Check the [upgrade guide](#module-services-postgres-upgrading) in the NixOS manual on how to upgrade your PostgreSQL installation. +- `gitlab` 16 deprecates the use of external container registries, in our case `pkgs.docker-distribution`. Module users who have [`services.gitlab.registry.enable`](#opt-services.gitlab.registry.enable) set to `true` are advised to back up their state and switch to gitlab's fork by setting [`services.gitlab.registry.package`](#opt-services.gitlab.registry.package) to `pkgs.gitlab-container-registry`. + - `fail2ban` has been updated to 1.0.2, which has a few breaking changes compared to 0.11.2 ([changelog for 1.0.1](https://github.com/fail2ban/fail2ban/blob/1.0.1/ChangeLog), [changelog for 1.0.2](https://github.com/fail2ban/fail2ban/blob/1.0.2/ChangeLog)) - `albert` has been updated from 0.17.6 to 0.20.13, and 0.18.0 changed the config format and many plugins ([changelog for 0.18.0](https://github.com/albertlauncher/albert/blob/v0.18.0/CHANGELOG.md)) From 1275444abb7d04308f62c93782bc60803e93790f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 May 2023 20:37:46 +0000 Subject: [PATCH 52/54] prometheus-gitlab-ci-pipelines-exporter: 0.5.4 -> 0.5.5 --- .../monitoring/prometheus/gitlab-ci-pipelines-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 31e511706474..df3bb356cd3f 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sVXLcz//1RLYOmKtH6u4tCPS8oqV0vOkmQLpWNBiUQY="; + sha256 = "sha256-TeXEfcmDHKgy5mGdixrIecxKO1rrg7+EWRIqzMYh3sU="; }; subPackages = [ "cmd/${pname}" ]; @@ -17,7 +17,7 @@ buildGoModule rec { "-X main.version=v${version}" ]; - vendorSha256 = "sha256-uyjj0Yh/bIvWvh76TEasgjJg9Dgj/GHgn3BOsO2peT0="; + vendorHash = "sha256-TXFwfqyvCAEn24vtUBcFABzIg0KaYlstiFwS7y6WbKo="; doCheck = true; meta = with lib; { From 2c6ae7132ca558f1052da0eececed3cad191b883 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Tue, 30 May 2023 16:42:09 +0200 Subject: [PATCH 53/54] Release NixOS 23.05 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- CONTRIBUTING.md | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 5f21df834d56..4fb4c0f68f9b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -22,7 +22,7 @@ For new packages please briefly describe the package or provide a link to its ho - made sure NixOS tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages - [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage) - [ ] Tested basic functionality of all binary files (usually in `./result/bin/`) -- [23.05 Release Notes (or backporting 22.11 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes) +- [23.11 Release Notes (or backporting 23.05 Release notes)](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#generating-2305-release-notes) - [ ] (Package updates) Added a release notes entry if the change is major or breaking - [ ] (Module updates) Added a release notes entry if the change is significant - [ ] (Module addition) Added a release notes entry if adding a new NixOS module diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82f8d022a92d..1ba2ae48da4e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -106,17 +106,17 @@ git push origin feature --force-with-lease Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). -You can add a label such as `backport release-22.11` to a PR, so that merging it will +You can add a label such as `backport release-23.05` to a PR, so that merging it will automatically create a backport (via [a GitHub Action](.github/workflows/backport.yml)). -This also works for PR's that have already been merged, and might take a couple of minutes to trigger. +This also works for pull requests that have already been merged, and might take a couple of minutes to trigger. You can also create the backport manually: 1. Take note of the commits in which the change was introduced into `master` branch. -2. Check out the target _release branch_, e.g. `release-22.11`. Do not use a _channel branch_ like `nixos-22.11` or `nixpkgs-22.11-darwin`. +2. Check out the target _release branch_, e.g. `release-23.05`. Do not use a _channel branch_ like `nixos-23.05` or `nixpkgs-23.05-darwin`. 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. -5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.11`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.11]`. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-23.05`) as the target branch of the pull request, and link to the pull request in which the original change was committed to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[23.05]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. ## Criteria for Backporting changes @@ -128,7 +128,7 @@ Anything that does not cause user or downstream dependency regressions can be ba - Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) - Security critical applications (E.g. `firefox`) -## Generating 23.05 Release Notes +## Generating 23.11 Release Notes