From 4e986960059078f0e1f55bdcf505cd01e2c1f830 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Tue, 27 Jun 2023 19:59:25 +0200 Subject: [PATCH 01/13] evdi: unstable-20221013 -> 1.13.1 (cherry picked from commit 5339931f835bd9dd10b2cb38697970fa6ee8c6fa) --- .../linux/evdi/0000-fix-drm-path.patch | 31 +++++++++++++++++++ pkgs/os-specific/linux/evdi/default.nix | 20 ++++++++---- 2 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch diff --git a/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch b/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch new file mode 100644 index 000000000000..a389b73185dd --- /dev/null +++ b/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch @@ -0,0 +1,31 @@ +diff --git a/module/Makefile b/module/Makefile +index fe573de..c8022c8 100644 +--- a/module/Makefile ++++ b/module/Makefile +@@ -50,7 +50,7 @@ ifneq ($(KERNELRELEASE),) + # inside kbuild + # Note: this can be removed once it is in kernel tree and Kconfig is properly used + CONFIG_DRM_EVDI := m +-ccflags-y := -isystem include/uapi/drm include/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG) ++ccflags-y := -isystem include/uapi/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG) + evdi-y := evdi_platform_drv.o evdi_platform_dev.o evdi_sysfs.o evdi_modeset.o evdi_connector.o evdi_encoder.o evdi_drm_drv.o evdi_fb.o evdi_gem.o evdi_painter.o evdi_params.o evdi_cursor.o evdi_debug.o evdi_i2c.o + evdi-$(CONFIG_COMPAT) += evdi_ioc32.o + obj-$(CONFIG_DRM_EVDI) := evdi.o +diff --git a/module/evdi_drm.h b/module/evdi_drm.h +index 29b8427..5012693 100644 +--- a/module/evdi_drm.h ++++ b/module/evdi_drm.h +@@ -12,12 +12,11 @@ + + #ifdef __KERNEL__ + #include ++#include + #else + #include + #endif + +-#include "drm.h" +- + /* Output events sent from driver to evdi lib */ + #define DRM_EVDI_EVENT_UPDATE_READY 0x80000000 + #define DRM_EVDI_EVENT_DPMS 0x80000001 diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index f8f4f400ade2..18b53e540d11 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,21 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, kernel, libdrm }: - +{ lib, stdenv, fetchFromGitHub, kernel, libdrm, python3 }: +let + python3WithLibs = python3.withPackages (ps: with ps; [ + pybind11 + ]); +in stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-2022-10-13"; + version = "1.13.1"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "bdc258b25df4d00f222fde0e3c5003bf88ef17b5"; - hash = "sha256-mt+vEp9FFf7smmE2PzuH/3EYl7h89RBN1zTVvv2qJ/o="; + rev = "v${version}"; + hash = "sha256-Or4hhnFOtC8vmB4kFUHbFHn2wg/NsUMY3d2Tiea6YbY="; }; env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; nativeBuildInputs = kernel.moduleBuildDependencies; - buildInputs = [ kernel libdrm ]; + buildInputs = [ kernel libdrm python3WithLibs ]; makeFlags = kernel.makeFlags ++ [ "KVER=${kernel.modDirVersion}" @@ -31,6 +35,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + ./0000-fix-drm-path.patch + ]; + meta = with lib; { description = "Extensible Virtual Display Interface"; maintainers = with maintainers; [ eyjhb ]; From 5d2628b4258b2c0bfb38b2d07e18d7cd0f738c3f Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Fri, 9 Jun 2023 13:54:20 +0800 Subject: [PATCH 02/13] gnome-solanum: 3.0.1 -> 4.0.0 (cherry picked from commit 789cd5ec5e60dc08e21a2ec6672115bf0d00e1e3) --- .../misc/gnome-solanum/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/applications/misc/gnome-solanum/default.nix index 7e1c5b1eba12..a93f55683b6f 100644 --- a/pkgs/applications/misc/gnome-solanum/default.nix +++ b/pkgs/applications/misc/gnome-solanum/default.nix @@ -5,6 +5,8 @@ , rustPlatform , cargo , desktop-file-utils +, appstream-glib +, blueprint-compiler , meson , ninja , pkg-config @@ -20,29 +22,20 @@ stdenv.mkDerivation rec { pname = "solanum"; - version = "3.0.1"; + version = "4.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Solanum"; - rev = "v${version}"; - sha256 = "0cga6cz6jfbipzp008rjznkz7844licdc34lk133fcyqil0cg0ap"; + rev = version; + hash = "sha256-ohUwxwhPxZlKoP5Nq/daD9z5Nj37C7MnFzyvQKp7R8E="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next update - # https://gitlab.gnome.org/World/Solanum/-/merge_requests/49 - (fetchpatch { - url = "https://gitlab.gnome.org/World/Solanum/-/commit/e5c5d88f95b0fe4145c9ed346b8ca98a613d7cfe.patch"; - sha256 = "j84P9KzMr0o38u4OD4ZPst+yqw1LCRoa1awT3nelFDI="; - }) - ]; - cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "10kzv98b2fiql9f6n2fv6lrgq4fdzxq0h4nzcq9jrw3fsggzl0wb"; + hash = "sha256-eDwMBxMmj246tplZfREJkViCDbKmuWSUZyM+tChNQDA="; }; postPatch = '' @@ -57,6 +50,8 @@ stdenv.mkDerivation rec { python3 git desktop-file-utils + appstream-glib + blueprint-compiler rustPlatform.cargoSetupHook cargo rustc From de64049098d95c04fb4c3860fed950bcfbe03278 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 3 Jul 2023 14:00:54 +0200 Subject: [PATCH 03/13] roundcube: 1.6.1 -> 1.6.2 ChangeLog: https://github.com/roundcube/roundcubemail/releases/tag/1.6.2 (cherry picked from commit b5c1e285a6ead67d307ddd3596d229fdb3ae6f48) --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 288aa6f4e78d..ee9fff230748 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-RsL2ujS8t+V+R8sDS/M45fx9zO3dqSEqLvO9MUbZe+0="; + sha256 = "sha256-yJgwfZXMSEGM+VUX71K1sAiMUAFPZ6bvgVdjQoqAQ/A="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From ab8fea4ec453033232c7fb2c4f83f9d697019227 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 5 Jul 2023 09:10:39 +0200 Subject: [PATCH 04/13] mullvad-browser: 12.5 -> 12.5.1 https://github.com/mullvad/mullvad-browser/releases/tag/12.5.1 (cherry picked from commit a60a5c503eeedafe36480bb41197b3d0890097d6) --- .../networking/browsers/mullvad-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index d166f044f7be..84ddc3e75844 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,12 +78,12 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "12.5"; + version = "12.5.1"; sources = { x86_64-linux = fetchurl { url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"; - hash = "sha256-RTDFi+vMkzRtDFgv9sP1bfIeWzzXR307aoMhNiT6vRs="; + hash = "sha256-yG22oyTDb7i1OnM7L9uOSaMhDytONAxE68Tg5XQSYq4="; }; }; From 42bd6e598ce17a560313d783b9440d8743905cf1 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Wed, 5 Jul 2023 01:23:39 +0200 Subject: [PATCH 05/13] tor-browser-bundle-bin: 12.5 -> 12.5.1 https://blog.torproject.org/new-release-tor-browser-1251/ (cherry picked from commit 063eb2a60eb4592b666531e2479b40fd1a261604) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index b0dc66dc910d..3ed322797fc2 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.5"; + version = "12.5.1"; lang = "ALL"; @@ -101,7 +101,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - hash = "sha256-ois/0ghnQVX6A4OsGybOX2Ph0eKHOHX0+qfR9rnA3v8="; + hash = "sha256-Kuq7ZNhaDl2nBcokWKm/XTIjJ8h4czEvwvsF2z3DzJ4="; }; i686-linux = fetchurl { @@ -111,7 +111,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - hash = "sha256-Wee3wCVT+Ius9qOJOLTdAEysMh6Z2+swoS9obF28bYo="; + hash = "sha256-WNIlwDNVUJyO5l33QxLwTn1knADXDzPvgG279QeRXl8="; }; }; From ec7606a3b12626f5601416eb9d04024525ebf6f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 5 Jul 2023 00:32:24 +0200 Subject: [PATCH 06/13] gitea: 1.19.3 -> 1.19.4 https://github.com/go-gitea/gitea/releases/tag/v1.19.4 (cherry picked from commit 2323ba3677e22cccf852b95b58aef35455f1c156) --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 17b839617ef8..0b9e1a9d93ab 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.19.3"; + version = "1.19.4"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-rSvBeSnJ356Yba7tZXg0S11ZRzYmF3xnOl4ZUJ8XQYw="; + hash = "sha256-vNMNEKMpUoVLUGwPPVhLKfElFmjCWgZHY5i1liNs+xk="; }; vendorHash = null; From f807233e88d29b4c1170c0634a2c0c9ac484ab66 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 18:35:21 +0200 Subject: [PATCH 07/13] linuxPackages_5_4_hardened.kernel: option removed in 5.4.208 change removing config option: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d0d583484d2ed9f5903edbbfa7e2a68f78b950b0 First release after: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=77ba2b9b46f8acead2606759e8196b7076eaeeea Fixes #233268 (cherry picked from commit 4d2df72e6a080b5f2e5c89a4f51a9af66291083f) --- pkgs/os-specific/linux/kernel/hardened/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 5a1a710ba3b7..3f23b8c1344d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -41,7 +41,7 @@ assert (versionAtLeast version "4.9"); DEBUG_SG = yes; SCHED_STACK_END_CHECK = yes; - REFCOUNT_FULL = whenOlder "5.5" yes; + REFCOUNT_FULL = whenOlder "5.4.208" yes; # Randomize page allocator when page_alloc.shuffle=1 SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; From 37213797733d005f8f02b9cae135cab50fd4bfcf Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 18:35:58 +0200 Subject: [PATCH 08/13] linuxPackages_5_4_hardened.kernel: unbreak (cherry picked from commit a65a9e313181d325bec9abf20149bcf1bfd07de4) --- pkgs/top-level/linux-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 40a8ff3020c5..8a6811d23c89 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -49,7 +49,7 @@ let broken = kernel.meta.broken || lib.versions.majorMinor version == "4.14" || - (stdenv.isx86_64 && lib.versionAtLeast version "4.19" && lib.versionOlder version "5.5"); + (stdenv.isx86_64 && lib.versions.majorMinor version == "4.19"); }; }; kernelPatches = kernel.kernelPatches ++ [ From 92d8ea62ea9dce4df9e5b43476b8bff49b358a88 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Wed, 31 May 2023 12:46:35 +0200 Subject: [PATCH 09/13] linuxKernel.packages.linux_(4_14,4_19}_hardened: unbreak (cherry picked from commit 7f330db6cc5d0074e8a7adaa62ba874f782eb9c6) --- pkgs/top-level/linux-kernels.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8a6811d23c89..bf3432f3cc2d 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -46,10 +46,7 @@ let inherit sha256; }; extraMeta = { - broken = - kernel.meta.broken || - lib.versions.majorMinor version == "4.14" || - (stdenv.isx86_64 && lib.versions.majorMinor version == "4.19"); + broken = kernel.meta.broken; }; }; kernelPatches = kernel.kernelPatches ++ [ From 59cc48393a510476d59c82088d3526243f4e9d87 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Wed, 31 May 2023 12:45:25 +0200 Subject: [PATCH 10/13] linuxKernel.kernels.linux_*_hardened: move overrides to kernels derive `packages` from `kernels`, unify definitions (cherry picked from commit 89c480cdc0a61513128aa2424ec9545f7dcf4b6c) --- pkgs/top-level/linux-kernels.nix | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index bf3432f3cc2d..890c898e129e 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -262,9 +262,18 @@ in { linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; - linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { }; - linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { }; - linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; + linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { + stdenv = gcc10Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; + }; + linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { + stdenv = gcc10Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; + }; + linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { + stdenv = gcc10Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; + }; linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; @@ -606,23 +615,14 @@ in { linux_testing = packagesFor kernels.linux_testing; linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs); - linux_hardened = recurseIntoAttrs (hardenedPackagesFor packageAliases.linux_default.kernel { }); + linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened); - linux_4_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_14 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { - stdenv = gcc10Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; }; - }); - linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); - linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); - linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { }); + linux_4_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_14_hardened); + linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened); + linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened); + linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); + linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); + linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_3_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_3_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); From 70bfeda1b639205c9c0320a7368f48f1bc957c38 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 14:57:02 +0200 Subject: [PATCH 11/13] gitlab: 16.1.1 -> 16.1.2 (#241687) https://gitlab.com/gitlab-org/gitlab/-/blob/v16.1.2-ee/CHANGELOG.md (cherry picked from commit 559da0415de0bc825874f13e625716f79b96b5ca) Co-authored-by: Yaya --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index d4acae1c4622..737125e864be 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "16.1.1", - "repo_hash": "sha256-y0a2jEWFVLtekZvhBZFOSyeDj8DI2Jxf208r5rhRUm4=", + "version": "16.1.2", + "repo_hash": "sha256-A9JkBwGym+CPpb5B7+Kwt8Ej4PGSHc3ZOgUA28hdyN8=", "yarn_hash": "1cqyf06810ls94nkys0l4p86ni902q32aqjp66m7j1x6ldh248al", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.1.1-ee", + "rev": "v16.1.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.1.1", - "GITLAB_PAGES_VERSION": "16.1.1", + "GITALY_SERVER_VERSION": "16.1.2", + "GITLAB_PAGES_VERSION": "16.1.2", "GITLAB_SHELL_VERSION": "14.23.0", - "GITLAB_WORKHORSE_VERSION": "16.1.1" + "GITLAB_WORKHORSE_VERSION": "16.1.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index ed0385290610..e37fabe21ba9 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 = "16.1.1"; + version = "16.1.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-bbAu9OIo1FT2KX186ajV5OUcvFpKUGaYPxY2S2RvXo8="; + sha256 = "sha256-/yCmFbmKTp8V8CjdhoAPpAdwNEcaP/wB0oAeTLdMESo="; }; vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 5c7c3af92d4f..90a79d943cbe 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 = "16.1.1"; + version = "16.1.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-xXA1KIn0uEuW3r4KnZ1A5Ci/pCbuUdZTYraVzYfUdoA="; + sha256 = "sha256-T33/SnV+aWUjfRKxVOQNWaPtFnounMkCXAeQCQ9w5RY="; }; vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ce642b32e164..93f8b1ae90c2 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 = "16.1.1"; + version = "16.1.2"; src = fetchFromGitLab { owner = data.owner; From c09e7b1a132460c1b57127a5d034b40bf663482c Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Thu, 9 Mar 2023 11:55:48 +0100 Subject: [PATCH 12/13] gitlab-elasticsearch-indexer: init at 4.3.5 (cherry picked from commit e977a4f8a0e227c7c1b0c17a701efec73d1c9983) --- .../version-management/gitlab/data.json | 1 + .../gitlab-elasticsearch-indexer/default.nix | 24 +++++++++++++++++++ .../version-management/gitlab/update.py | 12 +++++++++- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 737125e864be..7b4ababdcdca 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -9,6 +9,7 @@ "GITALY_SERVER_VERSION": "16.1.2", "GITLAB_PAGES_VERSION": "16.1.2", "GITLAB_SHELL_VERSION": "14.23.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.5", "GITLAB_WORKHORSE_VERSION": "16.1.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix new file mode 100644 index 000000000000..a52a9a753848 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitLab, pkg-config, icu }: + +buildGoModule rec { + pname = "gitlab-elasticsearch-indexer"; + version = "4.3.5"; + + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "gitlab-elasticsearch-indexer"; + rev = "v${version}"; + sha256 = "sha256-2idvN92H4Cc1W71gADrsuUl3+f2weAvL2MOP19NO/3I="; + }; + + vendorHash = "sha256-7LqzuBVYqpPI2thIJu4kQgCZGMlBlKI8L+j7AdUYrgQ="; + + buildInputs = [ icu ]; + nativeBuildInputs = [ pkg-config ]; + + meta = with lib; { + description = "Indexes Git repositories into Elasticsearch for GitLab."; + license = licenses.mit; + maintainers = with maintainers; [ xanderio yayayayaka ]; + }; +} diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 1abdd9bde0df..3df024b2c043 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -109,9 +109,9 @@ class GitLabRepo: "GITALY_SERVER_VERSION", "GITLAB_PAGES_VERSION", "GITLAB_SHELL_VERSION", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION", ] } - passthru["GITLAB_WORKHORSE_VERSION"] = version return dict( @@ -297,6 +297,14 @@ def update_gitlab_container_registry(rev: str, commit: bool): ) +@cli.command('update-gitlab-elasticsearch-indexer') +def update_gitlab_elasticsearch_indexer(): + """Update gitlab-elasticsearch-indexer""" + data = _get_data_json() + gitlab_elasticsearch_indexer_version = data['passthru']['GITLAB_ELASTICSEARCH_INDEXER_VERSION'] + _call_nix_update('gitlab-elasticsearch-indexer', gitlab_elasticsearch_indexer_version) + + @cli.command("update-all") @click.option("--rev", default="latest", help="The rev to use (vX.Y.Z-ee), or 'latest'") @click.option( @@ -317,6 +325,7 @@ def update_all(ctx, rev: str, commit: bool): ctx.invoke(update_gitlab_pages) ctx.invoke(update_gitlab_shell) ctx.invoke(update_gitlab_workhorse) + ctx.invoke(update_gitlab_elasticsearch_indexer) if commit: commit_gitlab( old_data_json["version"], new_data_json["version"], new_data_json["rev"] @@ -342,6 +351,7 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None: "gitlab-pages", "gitlab-shell", "gitlab-workhorse", + "gitlab-elasticsearch-indexer", ], cwd=GITLAB_DIR, ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e25487f23aa..73ab075615da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7927,6 +7927,8 @@ with pkgs; gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { }; + gitlab-elasticsearch-indexer = callPackage ../applications/version-management/gitlab/gitlab-elasticsearch-indexer { }; + gitleaks = callPackage ../tools/security/gitleaks { }; gitaly = callPackage ../applications/version-management/gitlab/gitaly { From c99004f75fd28cc10b9d2e01f51a412d768269c8 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Thu, 9 Mar 2023 12:00:33 +0100 Subject: [PATCH 13/13] nixos/gitlab: configure elasticsearch indexer path (cherry picked from commit 63e74e8b6e1317918493d870ee6d10ee9e50b243) --- nixos/modules/services/misc/gitlab.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 8967f7e1ddab..a442cb237edc 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -152,6 +152,7 @@ let api_url = "http://${config.services.dockerRegistry.listenAddress}:${toString config.services.dockerRegistry.port}/"; issuer = cfg.registry.issuer; }; + elasticsearch.indexer_path = "${pkgs.gitlab-elasticsearch-indexer}/bin/gitlab-elasticsearch-indexer"; extra = {}; uploads.storage_path = cfg.statePath; pages = optionalAttrs cfg.pages.enable {