nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-23.05 into staging-next-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-07-06 00:16:21 +00:00
committed by GitHub
parent 3122f4f260 876975f68f
commit f7faab9167
17 changed files with 133 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/misc/gitlab.nix
View File

@@ -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 {

21
pkgs/applications/misc/gnome-solanum/default.nix
View File

@@ -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

4
pkgs/applications/networking/browsers/mullvad-browser/default.nix
View File

@@ -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=";
};
};

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@@ -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=";
};
};

4
pkgs/applications/version-management/gitea/default.nix
View File

@@ -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;

13
pkgs/applications/version-management/gitlab/data.json
View File

@@ -1,14 +1,15 @@
{
"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_ELASTICSEARCH_INDEXER_VERSION": "4.3.5",
"GITLAB_WORKHORSE_VERSION": "16.1.2"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@@ -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=";

24
pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix Normal file
View File

@@ -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 ];
};
}

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View File

@@ -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=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.1.1";
version = "16.1.2";
src = fetchFromGitLab {
owner = data.owner;

12
pkgs/applications/version-management/gitlab/update.py
View File

@@ -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,
)

31
pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch Normal file
View File

@@ -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 <linux/types.h>
+#include <drm/drm.h>
#else
#include <stdint.h>
#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

20
pkgs/os-specific/linux/evdi/default.nix
View File

@@ -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 ];

2
pkgs/os-specific/linux/kernel/hardened/config.nix
View File

@@ -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;

4
pkgs/servers/roundcube/default.nix
View File

@@ -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 ];

2
pkgs/top-level/all-packages.nix
View File

@@ -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 {

43
pkgs/top-level/linux-kernels.nix
View File

@@ -46,10 +46,7 @@ let
inherit sha256;
};
extraMeta = {
broken =
kernel.meta.broken ||
lib.versions.majorMinor version == "4.14" ||
(stdenv.isx86_64 && lib.versionAtLeast version "4.19" && lib.versionOlder version "5.5");
broken = kernel.meta.broken;
};
};
kernelPatches = kernel.kernelPatches ++ [
@@ -265,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 { };
@@ -609,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);