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

Merge staging-next-23.05 into staging-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-06-22 00:15:25 +00:00
committed by GitHub
parent 35f0003d82 cfabb0f661
commit 2f1d2deb81
39 changed files with 1111 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/module-list.nix
View File

@@ -751,6 +751,7 @@
./services/monitoring/munin.nix
./services/monitoring/nagios.nix
./services/monitoring/netdata.nix
./services/monitoring/opentelemetry-collector.nix
./services/monitoring/parsedmarc.nix
./services/monitoring/prometheus/alertmanager-irc-relay.nix
./services/monitoring/prometheus/alertmanager.nix

99
nixos/modules/services/monitoring/grafana.nix
View File

@@ -10,7 +10,26 @@ let
useMysql = cfg.settings.database.type == "mysql";
usePostgresql = cfg.settings.database.type == "postgres";
settingsFormatIni = pkgs.formats.ini { };
# Prefer using the values from the default config file[0] directly. This way,
# people reading the NixOS manual can see them without cross-referencing the
# official documentation.
#
# However, if there is no default entry or if the setting is optional, use
# `null` as the default value. It will be turned into the empty string.
#
# If a setting is a list, always allow setting it as a plain string as well.
#
# [0]: https://github.com/grafana/grafana/blob/main/conf/defaults.ini
settingsFormatIni = pkgs.formats.ini {
listToValue = concatMapStringsSep " " (generators.mkValueStringDefault { });
mkKeyValue = generators.mkKeyValueDefault
{
mkValueString = v:
if v == null then ""
else generators.mkValueStringDefault { } v;
}
"=";
};
configFile = settingsFormatIni.generate "config.ini" cfg.settings;
mkProvisionCfg = name: attr: provisionCfg:
@@ -405,7 +424,6 @@ in
This setting is also important if you have a reverse proxy in front of Grafana that exposes it through a subpath.
In that case add the subpath to the end of this URL setting.
'';
# https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L54
default = "%(protocol)s://%(domain)s:%(http_port)s/";
type = types.str;
};
@@ -453,16 +471,16 @@ in
description = lib.mdDoc ''
Path to the certificate file (if `protocol` is set to `https` or `h2`).
'';
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
cert_key = mkOption {
description = lib.mdDoc ''
Path to the certificate key file (if `protocol` is set to `https` or `h2`).
'';
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
socket_gid = mkOption {
@@ -505,8 +523,8 @@ in
For example, given a cdn url like `https://cdn.myserver.com`
grafana will try to load a javascript file from `http://cdn.myserver.com/grafana-oss/7.4.0/public/build/app.<hash>.js`.
'';
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
read_timeout = mkOption {
@@ -572,7 +590,7 @@ in
max_open_conn = mkOption {
description = lib.mdDoc "The maximum number of open connections to the database.";
default = 0; # https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L123-L124
default = 0;
type = types.int;
};
@@ -606,7 +624,7 @@ in
For Postgres, use either `disable`, `require` or `verify-full`.
For MySQL, use either `true`, `false`, or `skip-verify`.
'';
default = "disable"; # https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L134
default = "disable";
type = types.enum [ "disable" "require" "verify-full" "true" "false" "skip-verify" ];
};
@@ -621,20 +639,20 @@ in
ca_cert_path = mkOption {
description = lib.mdDoc "The path to the CA certificate to use.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
client_key_path = mkOption {
description = lib.mdDoc "The path to the client key. Only if server requires client authentication.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
client_cert_path = mkOption {
description = lib.mdDoc "The path to the client cert. Only if server requires client authentication.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
server_cert_name = mkOption {
@@ -642,8 +660,8 @@ in
The common name field of the certificate used by the `mysql` or `postgres` server.
Not necessary if `ssl_mode` is set to `skip-verify`.
'';
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
path = mkOption {
@@ -751,8 +769,8 @@ in
Format: `ip_or_domain:port` separated by spaces.
PostgreSQL, MySQL, and MSSQL data sources do not use the proxy and are therefore unaffected by this setting.
'';
default = "";
type = types.str;
default = [ ];
type = types.oneOf [ types.str (types.listOf types.str) ];
};
disable_brute_force_login_protection = mkOption {
@@ -870,6 +888,27 @@ in
# how exactly the quoting of the default value works. See also
# https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L364
# https://github.com/grafana/grafana/blob/cb7e18938b8eb6860a64b91aaba13a7eb31bc95b/conf/defaults.ini#L373
# These two options are lists joined with spaces:
# https://github.com/grafana/grafana/blob/916d9793aa81c2990640b55a15dee0db6b525e41/pkg/middleware/csrf/csrf.go#L37-L38
csrf_trusted_origins = mkOption {
description = lib.mdDoc ''
List of additional allowed URLs to pass by the CSRF check.
Suggested when authentication comes from an IdP.
'';
default = [ ];
type = types.oneOf [ types.str (types.listOf types.str) ];
};
csrf_additional_headers = mkOption {
description = lib.mdDoc ''
List of allowed headers to be set by the user.
Suggested to use for if authentication lives behind reverse proxies.
'';
default = [ ];
type = types.oneOf [ types.str (types.listOf types.str) ];
};
};
smtp = {
@@ -887,8 +926,8 @@ in
user = mkOption {
description = lib.mdDoc "User used for authentication.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
password = mkOption {
@@ -905,14 +944,14 @@ in
cert_file = mkOption {
description = lib.mdDoc "File path to a cert file.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
key_file = mkOption {
description = lib.mdDoc "File path to a key file.";
default = "";
type = types.str;
default = null;
type = types.nullOr types.str;
};
skip_verify = mkOption {
@@ -933,6 +972,12 @@ in
type = types.str;
};
ehlo_identity = mkOption {
description = lib.mdDoc "Name to be used as client identity for EHLO in SMTP dialog.";
default = null;
type = types.nullOr types.str;
};
startTLS_policy = mkOption {
description = lib.mdDoc "StartTLS policy when connecting to server.";
default = null;
@@ -1050,6 +1095,8 @@ in
type = types.str;
};
# Lists are joined via space, so this option can't be a list.
# Users have to manually join their values.
hidden_users = mkOption {
description = lib.mdDoc ''
This is a comma-separated list of usernames.

73
nixos/modules/services/monitoring/opentelemetry-collector.nix Normal file
View File

@@ -0,0 +1,73 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkEnableOption mkIf mkOption types getExe;
cfg = config.services.opentelemetry-collector;
opentelemetry-collector = cfg.package;
settingsFormat = pkgs.formats.yaml {};
in {
options.services.opentelemetry-collector = {
enable = mkEnableOption (lib.mdDoc "Opentelemetry Collector");
package = mkOption {
type = types.package;
default = pkgs.opentelemetry-collector;
defaultText = lib.literalExpression "pkgs.opentelemetry-collector";
description = lib.mdDoc "The opentelemetry-collector package to use.";
};
settings = mkOption {
type = settingsFormat.type;
default = {};
description = lib.mdDoc ''
Specify the configuration for Opentelemetry Collector in Nix.
See https://opentelemetry.io/docs/collector/configuration/ for available options.
'';
};
configFile = mkOption {
type = types.nullOr types.path;
default = null;
description = lib.mdDoc ''
Specify a path to a configuration file that Opentelemetry Collector should use.
'';
};
};
config = mkIf cfg.enable {
assertions = [{
assertion = (
(cfg.settings == {}) != (cfg.configFile == null)
);
message = ''
Please specify a configuration for Opentelemetry Collector with either
'services.opentelemetry-collector.settings' or
'services.opentelemetry-collector.configFile'.
'';
}];
systemd.services.opentelemetry-collector = {
description = "Opentelemetry Collector Service Daemon";
wantedBy = [ "multi-user.target" ];
serviceConfig = let
conf = if cfg.configFile == null
then settingsFormat.generate "config.yaml" cfg.settings
else cfg.configFile;
in
{
ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}";
DynamicUser = true;
Restart = "always";
ProtectSystem = "full";
DevicePolicy = "closed";
NoNewPrivileges = true;
WorkingDirectory = "/var/lib/opentelemetry-collector";
StateDirectory = "opentelemetry-collector";
};
};
};
}

22
nixos/modules/services/networking/fakeroute.nix
View File

@@ -1,10 +1,8 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.fakeroute;
routeConf = pkgs.writeText "route.conf" (concatStringsSep "\n" cfg.route);
routeConf = pkgs.writeText "route.conf" (lib.concatStringsSep "\n" cfg.route);
in
@@ -16,16 +14,10 @@ in
services.fakeroute = {
enable = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether to enable the fakeroute service.
'';
};
enable = lib.mkEnableOption (lib.mdDoc "the fakeroute service");
route = mkOption {
type = types.listOf types.str;
route = lib.mkOption {
type = with lib.types; listOf str;
default = [];
example = [
"216.102.187.130"
@@ -46,14 +38,16 @@ in
###### implementation
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
systemd.services.fakeroute = {
description = "Fakeroute Daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "forking";
User = "root";
User = "fakeroute";
DynamicUser = true;
AmbientCapabilities = [ "CAP_NET_RAW" ];
ExecStart = "${pkgs.fakeroute}/bin/fakeroute -f ${routeConf}";
};
};

2
nixos/tests/all-tests.nix
View File

@@ -251,6 +251,7 @@ in {
etebase-server = handleTest ./etebase-server.nix {};
etesync-dav = handleTest ./etesync-dav.nix {};
evcc = handleTest ./evcc.nix {};
fakeroute = handleTest ./fakeroute.nix {};
fancontrol = handleTest ./fancontrol.nix {};
fcitx5 = handleTest ./fcitx5 {};
fenics = handleTest ./fenics.nix {};
@@ -554,6 +555,7 @@ in {
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
opentabletdriver = handleTest ./opentabletdriver.nix {};
opentelemetry-collector = handleTest ./opentelemetry-collector.nix {};
owncast = handleTest ./owncast.nix {};
image-contents = handleTest ./image-contents.nix {};
openvscode-server = handleTest ./openvscode-server.nix {};

22
nixos/tests/fakeroute.nix Normal file
View File

@@ -0,0 +1,22 @@
import ./make-test-python.nix ({ lib, pkgs, ...} : {
name = "fakeroute";
meta.maintainers = with lib.maintainers; [ rnhmjoj ];
nodes.machine = { ... }: {
imports = [ ../modules/profiles/minimal.nix ];
services.fakeroute.enable = true;
services.fakeroute.route =
[ "216.102.187.130" "4.0.1.122"
"198.116.142.34" "63.199.8.242"
];
environment.systemPackages = [ pkgs.traceroute ];
};
testScript =
''
start_all()
machine.wait_for_unit("fakeroute.service")
machine.succeed("traceroute 127.0.0.1 | grep -q 216.102.187.130")
'';
})

76
nixos/tests/opentelemetry-collector.nix Normal file
View File

@@ -0,0 +1,76 @@
import ./make-test-python.nix ({ pkgs, ...} : let
port = 4318;
in {
name = "opentelemetry-collector";
meta = with pkgs.lib.maintainers; {
maintainers = [ tylerjl ];
};
nodes.machine = { ... }: {
networking.firewall.allowedTCPPorts = [ port ];
services.opentelemetry-collector = {
enable = true;
settings = {
exporters.logging.verbosity = "detailed";
receivers.otlp.protocols.http = {};
service = {
pipelines.logs = {
receivers = [ "otlp" ];
exporters = [ "logging" ];
};
};
};
};
virtualisation.forwardPorts = [{
host.port = port;
guest.port = port;
}];
};
extraPythonPackages = p: [
p.requests
p.types-requests
];
# Send a log event through the OTLP pipeline and check for its
# presence in the collector logs.
testScript = /* python */ ''
import requests
import time
from uuid import uuid4
flag = str(uuid4())
machine.wait_for_unit("opentelemetry-collector.service")
machine.wait_for_open_port(${toString port})
event = {
"resourceLogs": [
{
"resource": {"attributes": []},
"scopeLogs": [
{
"logRecords": [
{
"timeUnixNano": str(time.time_ns()),
"severityNumber": 9,
"severityText": "Info",
"name": "logTest",
"body": {
"stringValue": flag
},
"attributes": []
},
]
}
]
}
]
}
response = requests.post("http://localhost:${toString port}/v1/logs", json=event)
assert response.status_code == 200
assert flag in machine.execute("journalctl -u opentelemetry-collector")[-1]
'';
})

6
pkgs/applications/editors/emacs/sources.nix
View File

@@ -17,12 +17,12 @@
emacs29 = import ./generic.nix {
pname = "emacs";
version = "29.0.91";
version = "29.0.92";
variant = "mainline";
src = fetchFromSavannah {
repo = "emacs";
rev = "29.0.91";
hash = "sha256-YU/sbIr7xX5ELJtPcTL9ZQgZtjEW5oI7YC20fQsOVSY=";
rev = "29.0.92";
hash = "sha256-Vkry+2zYejZVwZKQlmQiAJnbjsj87DiIZ1ungooYd8A=";
};
};

17
pkgs/applications/editors/vscode/extensions/default.nix
View File

@@ -305,6 +305,23 @@ let
};
};
asdine.cue = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "cue";
publisher = "asdine";
version = "0.3.2";
sha256 = "sha256-jMXqhgjRdM3UG/9NtiwWAg61mBW8OYVAKDWgb4hzhA4=";
};
meta = {
description = "Cue language support for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=asdine.cue";
homepage = "https://github.com/asdine/vscode-cue";
changelog = "https://marketplace.visualstudio.com/items/asdine.cue/changelog";
license = lib.licenses.mit;
maintainers = [lib.maintainers.matthewpi];
};
};
astro-build.astro-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "astro-vscode";

7
pkgs/applications/misc/protonup-qt/default.nix
View File

@@ -1,14 +1,14 @@
{ appimageTools, fetchurl, lib }:
let
pname = "protonup-qt";
version = "2.7.7";
version = "2.8.0";
src = fetchurl {
url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage";
sha256 = "sha256-eDi13DYS4Rtj3ouuhRoET1Ctc4D7p50khqXNOSBIvto=";
hash = "sha256-o3Tsrdrj5qDcTqhdgdf4Lcpp9zfBQY+/l3Ohm1A/pm4=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in
appimageTools.wrapType2 rec {
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
@@ -27,6 +27,7 @@ appimageTools.wrapType2 rec {
license = licenses.gpl3;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
mainProgram = "protonup-qt";
changelog = "https://github.com/DavidoTek/ProtonUp-Qt/releases/tag/v${version}";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ michaelBelsanti ];
};

810
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

5
pkgs/applications/networking/browsers/firefox/common.nix
View File

@@ -55,6 +55,7 @@
, gnum4
, gtk3
, icu
, icu72
, libGL
, libGLU
, libevent
@@ -427,7 +428,6 @@ buildStdenv.mkDerivation ({
freetype
glib
gtk3
icu
libffi
libGL
libGLU
@@ -455,6 +455,9 @@ buildStdenv.mkDerivation ({
zip
zlib
]
# icu73 changed how it follows symlinks which breaks in the firefox sandbox
# https://bugzilla.mozilla.org/show_bug.cgi?id=1839287
++ [ (if (lib.versionAtLeast version "115") then icu else icu72) ]
++ [ (if (lib.versionAtLeast version "103") then nss_latest else nss_esr) ]
++ lib.optional alsaSupport alsa-lib
++ lib.optional jackSupport libjack2

12
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "114.0.1";
version = "114.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f";
sha512 = "1d514d09c6b964b96c6d52d54b89a89a92d53a6fe669e16a6370346c980db4d0ac6c502fa89219c71b680566b9eb982e9b3191c21f81d7326f34f6c837c0a872";
};
meta = {
@@ -29,11 +29,11 @@
firefox-beta = buildMozillaMach rec {
pname = "firefox-beta";
version = "114.0b7";
version = "115.0b7";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "6cfcaa08d74d6e123047cd33c1bc2e012e948890ea8bab5feb43459048a41c10f6bc549241386a3c81d438b59e966e7949161fe3f18b359ec8659bdf2ba0f187";
sha512 = "4ae6b74e7a47c06c3630c911d5bbcd6c390f1462f4335c8fd084cf455675c88872864390e22847da16564484b70fbac09625015fc6a4cf10a01ed8052016991e";
};
meta = {
@@ -56,12 +56,12 @@
firefox-devedition = buildMozillaMach rec {
pname = "firefox-devedition";
version = "114.0b7";
version = "115.0b7";
applicationName = "Mozilla Firefox Developer Edition";
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "2aa9ec2eb57b6debe3a15ac43f4410a4d649c8373725be8ed2540effa758d970e29c9ca675d9ac27a4b58935fc428aaf8b84ecd769b88f3607e911178492ebf1";
sha512 = "f360ca7c5eb69d16a54b37a95195f4981c19e7e081cf7d494dafc1838ec69f2beabae5eaed23b0b551e71b32e3d0213383bc43e63416d390aa453bfa8b0f1993";
};
meta = {

2
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View File

@@ -1,6 +1,6 @@
{ lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }:
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230510";

2
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@@ -194,6 +194,6 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = builtins.attrNames srcs;
maintainers = with maintainers; [ danbst tadfisher doronbehar ];
maintainers = with maintainers; [ danbst tadfisher ];
};
}

2
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@@ -82,7 +82,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ asciidoctor bison cmake ninja flex makeWrapper pkg-config python3 perl ]
++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.stdenv.cc ];
buildInputs = [
gettext

2
pkgs/desktops/plasma-5/fetch.sh
View File

@@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.5/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.6/ -A '*.tar.xz' )

2
pkgs/desktops/plasma-5/flatpak-kcm.nix
View File

@@ -4,6 +4,7 @@
, kcmutils
, kconfig
, kdeclarative
, kitemmodels
}:
mkDerivation {
@@ -14,5 +15,6 @@ mkDerivation {
kcmutils
kconfig
kdeclarative
kitemmodels
];
}

2
pkgs/desktops/plasma-5/plasma-sdk.nix
View File

@@ -16,11 +16,11 @@
, ktexteditor
, kwidgetsaddons
, kdoctools
, qtbase
}:
mkDerivation {
pname = "plasma-sdk";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
karchive

54
pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch
View File

@@ -1,20 +1,21 @@
From 65ed69a38a9ffee21f0eb36de1f7a3f152111cad Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Mon, 7 Sep 2020 18:09:52 +0100
Subject: [PATCH] startkde
---
startkde/plasma-session/startup.cpp | 2 +-
startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +-
startkde/startplasma.cpp | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
index 46363ddcb..d787f9993 100644
--- a/kcms/krdb/krdb.cpp
+++ b/kcms/krdb/krdb.cpp
@@ -468,7 +468,7 @@ void runRdb(unsigned int flags)
proc.execute();
// Needed for applications that don't set their own cursor.
- QProcess::execute(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
+ QProcess::execute(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
applyGtkStyles(1);
applyGtkStyles(2);
diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
index 270744053..356160e96 100644
index ffec07ebf..11e70fef8 100644
--- a/startkde/plasma-session/startup.cpp
+++ b/startkde/plasma-session/startup.cpp
@@ -179,7 +179,7 @@ Startup::Startup(QObject *parent)
@@ -176,7 +176,7 @@ Startup::Startup(QObject *parent)
}
// Keep for KF5; remove in KF6 (KInit will be gone then)
@@ -24,10 +25,10 @@ index 270744053..356160e96 100644
KJob *phase1 = nullptr;
m_lock.reset(new QEventLoopLocker);
diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
index 3a054a04f..b2e7ab3fb 100644
index 04875c358..5822af37c 100644
--- a/startkde/startplasma-wayland.cpp
+++ b/startkde/startplasma-wayland.cpp
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
out << "startplasma-wayland: Shutting down...\n";
// Keep for KF5; remove in KF6 (KInit will be gone then)
@@ -37,10 +38,10 @@ index 3a054a04f..b2e7ab3fb 100644
out << "startplasmacompositor: Shutting down...\n";
cleanupPlasmaEnvironment(oldSystemdEnvironment);
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
index d6b2c5439..534eeb0e5 100644
index 8e82e29c3..1ed176706 100644
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
out << "startkde: Shutting down...\n";
// Keep for KF5; remove in KF6 (KInit will be gone then)
@@ -50,10 +51,10 @@ index d6b2c5439..534eeb0e5 100644
cleanupPlasmaEnvironment(oldSystemdEnvironment);
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index 008fdfcaf..72468f21c 100644
index b0158c97d..c8f7fe223 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -50,7 +50,7 @@ QTextStream out(stderr);
@@ -50,7 +50,7 @@ void sigtermHandler(int signalNumber)
void messageBox(const QString &text)
{
out << text;
@@ -62,16 +63,7 @@ index 008fdfcaf..72468f21c 100644
}
QStringList allServices(const QLatin1String &prefix)
@@ -412,7 +412,7 @@ void setupX11()
// If the user has overwritten fonts, the cursor font may be different now
// so don't move this up.
- runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
+ runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
}
void cleanupPlasmaEnvironment(const std::optional<QProcessEnvironment> &oldSystemdEnvironment)
@@ -501,7 +501,7 @@ QProcess *setupKSplash()
@@ -484,7 +484,7 @@ QProcess *setupKSplash()
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
p->setProcessChannelMode(QProcess::ForwardedChannels);
@@ -80,5 +72,3 @@ index 008fdfcaf..72468f21c 100644
}
}
return p;
--
2.33.0

472
pkgs/desktops/plasma-5/srcs.nix
View File

@@ -4,475 +4,475 @@
{
aura-browser = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/aura-browser-5.27.5.tar.xz";
sha256 = "0vqw9kxskx3d6wfgrfbhrsw2vy71zr3cwhmfk7qj4vfpmilmsvy5";
name = "aura-browser-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/aura-browser-5.27.6.tar.xz";
sha256 = "1ppsxzy6hdnnsrrhlx5b7vq1f8v2d1rhfg5j5ypa77ixvi1yglh2";
name = "aura-browser-5.27.6.tar.xz";
};
};
bluedevil = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/bluedevil-5.27.5.tar.xz";
sha256 = "1vadllkv4fjjwqb30jyawi56jflslw5nc391r0bixg55cpk5llv1";
name = "bluedevil-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/bluedevil-5.27.6.tar.xz";
sha256 = "0x6zfcdw03kggd4mhkhva2b2v2w2ajzs7svslm1p1p8f41vzivvw";
name = "bluedevil-5.27.6.tar.xz";
};
};
breeze = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/breeze-5.27.5.tar.xz";
sha256 = "0s68zr21wniqsdkb14lzqz0hj7hb4mbvcwrq7sf8yxf0z1ds7n3h";
name = "breeze-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/breeze-5.27.6.tar.xz";
sha256 = "0v3cz9phdalvawfjrg3yirn2n4z6h872p12g7hcf8706bdz8v6jx";
name = "breeze-5.27.6.tar.xz";
};
};
breeze-grub = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/breeze-grub-5.27.5.tar.xz";
sha256 = "0kkrsda7ml3cbvfxb0ng3np1bk61fnl1jndk3c13lyi0jj97na7f";
name = "breeze-grub-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/breeze-grub-5.27.6.tar.xz";
sha256 = "0lg2fba5v22z666wkbm5a6gzlq79jxski1cqnpp1z5laj7nrh8mv";
name = "breeze-grub-5.27.6.tar.xz";
};
};
breeze-gtk = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/breeze-gtk-5.27.5.tar.xz";
sha256 = "0s69alp490yhm2v42vkngz99ji4b10n6fd36ybf72m6nnkd6v5f4";
name = "breeze-gtk-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/breeze-gtk-5.27.6.tar.xz";
sha256 = "1nkbhcsb359sqjampyc7cyl0hfnrx6gsrnqgaskdwk92p49snamc";
name = "breeze-gtk-5.27.6.tar.xz";
};
};
breeze-plymouth = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/breeze-plymouth-5.27.5.tar.xz";
sha256 = "0k014dvx2sw4hd63n74vjglg8dgyjjlvipxhb5cfp44x7ch52wii";
name = "breeze-plymouth-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/breeze-plymouth-5.27.6.tar.xz";
sha256 = "0gjg3ddc3g45dnj0lv5k52bf1v403qpgv2nhqrx9z3x43kidb3vc";
name = "breeze-plymouth-5.27.6.tar.xz";
};
};
discover = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/discover-5.27.5.tar.xz";
sha256 = "06xk780a60f4a1n2052q1wxydjvvb8nlw9r2cj7x4rg02s57hpvq";
name = "discover-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/discover-5.27.6.tar.xz";
sha256 = "1ici6p7bvvfszcy79lrr5xa6q1kfskxyijfr2pq9lkdhn8sdfq8n";
name = "discover-5.27.6.tar.xz";
};
};
drkonqi = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/drkonqi-5.27.5.tar.xz";
sha256 = "0mmcp5fzlygcchv5v10mn39iqfxjxig9x8h74n3hq0rw7arax3a4";
name = "drkonqi-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/drkonqi-5.27.6.tar.xz";
sha256 = "04yam1xjwxi6jbh4r2k0ci7vdjc5cwfg4nn36lb64f5gj2bicppr";
name = "drkonqi-5.27.6.tar.xz";
};
};
flatpak-kcm = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/flatpak-kcm-5.27.5.tar.xz";
sha256 = "16ms8l7cncbmll808mb0hfjsfjpg1m3f1j38y9zh1hal0rw42xbv";
name = "flatpak-kcm-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/flatpak-kcm-5.27.6.tar.xz";
sha256 = "0ykzjaz45qxq7bl05chh3fg5b3qd0vdva5jf61dxnn7bksxr9vpw";
name = "flatpak-kcm-5.27.6.tar.xz";
};
};
kactivitymanagerd = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kactivitymanagerd-5.27.5.tar.xz";
sha256 = "06dn0cnspp2qsjxa10vz81vrhhb6przr9lcfyia4gi65gdrg82d2";
name = "kactivitymanagerd-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kactivitymanagerd-5.27.6.tar.xz";
sha256 = "0bdhqn809jxgrq6j4jx1vf4q3xicqj3yi6557qpqxy34mlr0n606";
name = "kactivitymanagerd-5.27.6.tar.xz";
};
};
kde-cli-tools = {
version = "5.27.5.1";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kde-cli-tools-5.27.5.1.tar.xz";
sha256 = "sha256-E13W626S1tKdeL6Ls/ag1eBcJrPP2kmLJIB8HihEiIU=";
name = "kde-cli-tools-5.27.5.1.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kde-cli-tools-5.27.6.tar.xz";
sha256 = "1ahgpaa073lg6n7xnrkflqz9cj8sl7f77sla93415hc2pz1v3qmm";
name = "kde-cli-tools-5.27.6.tar.xz";
};
};
kde-gtk-config = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kde-gtk-config-5.27.5.tar.xz";
sha256 = "0a0hbif6xvlfg6jm2kmzsfjr2f73c7pxbn8amam6z4h1171bfys7";
name = "kde-gtk-config-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kde-gtk-config-5.27.6.tar.xz";
sha256 = "087qj3c46f5wn7vh3nvf0pg40rspja3113phbzapf2sk09b3mwmk";
name = "kde-gtk-config-5.27.6.tar.xz";
};
};
kdecoration = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kdecoration-5.27.5.tar.xz";
sha256 = "0hmy621b8zb8jvanw6w6y8mgrfspkl5d92sgl5zx00lqqz2zdyzg";
name = "kdecoration-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kdecoration-5.27.6.tar.xz";
sha256 = "1rllab85yzx9s3vfm2j31wxwi1s0js0a6jz7bcy8cv4sk91rpdlx";
name = "kdecoration-5.27.6.tar.xz";
};
};
kdeplasma-addons = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kdeplasma-addons-5.27.5.tar.xz";
sha256 = "1y8gaqmbqcjvzpxk6bb7bjgycrmsnw3cjk741csb0xbw66q1ldf9";
name = "kdeplasma-addons-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kdeplasma-addons-5.27.6.tar.xz";
sha256 = "11zhpb4gcz4yy2v0j8mfzihi9rj35f83i8bi7iirix0vm100sfrl";
name = "kdeplasma-addons-5.27.6.tar.xz";
};
};
kgamma5 = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kgamma5-5.27.5.tar.xz";
sha256 = "1nadx1fgpz1k7c2j93wk4ipzp6pydz8ak1p9p2pv9a24753jcrkv";
name = "kgamma5-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kgamma5-5.27.6.tar.xz";
sha256 = "14nn3wsk9w9x8m0mbdmdi86xh6x2946zhzhwdbsfgynjrkn13wb1";
name = "kgamma5-5.27.6.tar.xz";
};
};
khotkeys = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/khotkeys-5.27.5.tar.xz";
sha256 = "087cws4g8p0fzalspnizsd8fxk3745g9ar03pl746fqyvqk57s43";
name = "khotkeys-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/khotkeys-5.27.6.tar.xz";
sha256 = "0zixhdnsm3956w2bff6fk1ksvk61ywjkylg690b90l041rhfriyv";
name = "khotkeys-5.27.6.tar.xz";
};
};
kinfocenter = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kinfocenter-5.27.5.tar.xz";
sha256 = "0j6w9b4pf353l0dfv8b8a90q4swylqxwx818271abs1bkq271s8b";
name = "kinfocenter-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kinfocenter-5.27.6.tar.xz";
sha256 = "06whh4wzc292xvzabv7q6x8wm0gkyd2nsy50vlvk7iy85jayk5nd";
name = "kinfocenter-5.27.6.tar.xz";
};
};
kmenuedit = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kmenuedit-5.27.5.tar.xz";
sha256 = "09qiydq3v4yl51cn0l2ndsr54m33n6x3ngz9q18j4nf4pk266qj4";
name = "kmenuedit-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kmenuedit-5.27.6.tar.xz";
sha256 = "15j63b2vg5dmgqfin4irv3pz3ws6wvji0b5fdi82fml5hgx4y549";
name = "kmenuedit-5.27.6.tar.xz";
};
};
kpipewire = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kpipewire-5.27.5.tar.xz";
sha256 = "166xggr22k2ksnsx97kngc02r8fy0fagd2m7zghdbl5axvf6lcj1";
name = "kpipewire-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kpipewire-5.27.6.tar.xz";
sha256 = "12rjwkk272r9r583vgxb64p5nylkcqsfyvbn0lpa6ap8q2zm7mky";
name = "kpipewire-5.27.6.tar.xz";
};
};
kscreen = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kscreen-5.27.5.tar.xz";
sha256 = "0s24halra8gnczmlj8kvbqvls1njck2abxbdsvn7gm3rkg1sm5vj";
name = "kscreen-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kscreen-5.27.6.tar.xz";
sha256 = "0m7jidcs9xf5xzlnhx2s9qnzn6z80fxhssrxz8i2zqk7xhg6bl6y";
name = "kscreen-5.27.6.tar.xz";
};
};
kscreenlocker = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kscreenlocker-5.27.5.tar.xz";
sha256 = "14pch0w4cgsx1q18hssdnjxdbdcparyrqqr9kd5a33zdqbqhg22c";
name = "kscreenlocker-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kscreenlocker-5.27.6.tar.xz";
sha256 = "0pgmy4dw41kim7syk4xb2n4g4iz3jjikhwnh3bjianl9h87rc12x";
name = "kscreenlocker-5.27.6.tar.xz";
};
};
ksshaskpass = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/ksshaskpass-5.27.5.tar.xz";
sha256 = "1mqckg3j5flx02fji7lcqv2iip4nblrzf2wqq23q7six7rljdvgn";
name = "ksshaskpass-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/ksshaskpass-5.27.6.tar.xz";
sha256 = "1ig8qvjvrl27q1bg34c4lg34yx4pdvcjzxn4jxg6h9wbxdwssk45";
name = "ksshaskpass-5.27.6.tar.xz";
};
};
ksystemstats = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/ksystemstats-5.27.5.tar.xz";
sha256 = "1y6w6v1vf2bphspk7a3lgwgmz6ahdycbbsrr6qn8mkf9z36q97fm";
name = "ksystemstats-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/ksystemstats-5.27.6.tar.xz";
sha256 = "0xi3z8pk1byc4wcds0an2ndnw8j5zgq3wr0gm517rc8vck30m0gi";
name = "ksystemstats-5.27.6.tar.xz";
};
};
kwallet-pam = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kwallet-pam-5.27.5.tar.xz";
sha256 = "144ijabyj9w2yi9j5r0m945l6ysccwyq27cc0mc21mjyqa6sm6ka";
name = "kwallet-pam-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kwallet-pam-5.27.6.tar.xz";
sha256 = "0c38s7iqha94vz2d8dfch4qfb7zpc6k5z7wm33f5x190bw3g1bdp";
name = "kwallet-pam-5.27.6.tar.xz";
};
};
kwayland-integration = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kwayland-integration-5.27.5.tar.xz";
sha256 = "1y8qrdyvz61zcxsp9ylz7bg6hp7wk7is5p0n3s25650dlx0grqcs";
name = "kwayland-integration-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kwayland-integration-5.27.6.tar.xz";
sha256 = "10rc14ggbs86bq0sky4i3kdwarwk8mh2yx4g77if8vr7z96xpdqh";
name = "kwayland-integration-5.27.6.tar.xz";
};
};
kwin = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kwin-5.27.5.tar.xz";
sha256 = "1si01jrhxa6sfqgl2ljl5czyls5mli7b4n6yy6jiws0rb6qjc4mv";
name = "kwin-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kwin-5.27.6.tar.xz";
sha256 = "1v4r4h2zbandg43iyww5p66sgv2z90lrri1gijnwjlg9j5gbvmb2";
name = "kwin-5.27.6.tar.xz";
};
};
kwrited = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kwrited-5.27.5.tar.xz";
sha256 = "14fcby31017mmplcp5v2mfmfnlds5mgn35b725d06z584xcfrfpj";
name = "kwrited-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/kwrited-5.27.6.tar.xz";
sha256 = "153q38msna94wy8qbss02hzw7vabfghxs90bq9g9qjsr28428r86";
name = "kwrited-5.27.6.tar.xz";
};
};
layer-shell-qt = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/layer-shell-qt-5.27.5.tar.xz";
sha256 = "088xilf31485mqxw09v2h7v3dayzd19c6yipmlxpyhzhg6jnmpyc";
name = "layer-shell-qt-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/layer-shell-qt-5.27.6.tar.xz";
sha256 = "14w7kr5d5s9fg2qkybk5axg11cafc6rrxkivynj5v55zcp52jp76";
name = "layer-shell-qt-5.27.6.tar.xz";
};
};
libkscreen = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/libkscreen-5.27.5.tar.xz";
sha256 = "0rgbdlchhks5bxicdc8v7388wlg5b6ms9phlp5jfh1l7iprg7br9";
name = "libkscreen-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/libkscreen-5.27.6.tar.xz";
sha256 = "1ywyg1i9bg0nawndl4hzivd4yfsqk5snls8ak1vyr9xmm8zkgaf1";
name = "libkscreen-5.27.6.tar.xz";
};
};
libksysguard = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/libksysguard-5.27.5.tar.xz";
sha256 = "052yx04sihlvf7j94y140g9hldq9fjad9ziqdgmczvszy0xbazky";
name = "libksysguard-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/libksysguard-5.27.6.tar.xz";
sha256 = "1nqv0gxq011acvmqc2rpqrw4l928mcmg4rq2g45qzfmnmas2rjwy";
name = "libksysguard-5.27.6.tar.xz";
};
};
milou = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/milou-5.27.5.tar.xz";
sha256 = "1602imffywir1il1xsq3n413fjxg4s3w9c49z20yn1igcwz0l6qv";
name = "milou-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/milou-5.27.6.tar.xz";
sha256 = "1il1sg7xi9p7snz9w3mygpydl6y02r5n24wa14yk23qhphwsgbpy";
name = "milou-5.27.6.tar.xz";
};
};
oxygen = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/oxygen-5.27.5.tar.xz";
sha256 = "1gby4a9sf666i10nwjv4wswsbi34idcczz0cknfan08ahal4wxpv";
name = "oxygen-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/oxygen-5.27.6.tar.xz";
sha256 = "01h9vh8gk4ncgwa1p25ps5rm6m180081vh0ryw9x3z1qw893j1m9";
name = "oxygen-5.27.6.tar.xz";
};
};
oxygen-sounds = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/oxygen-sounds-5.27.5.tar.xz";
sha256 = "0rl55k6h34bcf5pk71942m3bf831ymh4kk89xkimczq4qki33yr1";
name = "oxygen-sounds-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/oxygen-sounds-5.27.6.tar.xz";
sha256 = "0zijzkr6xqx3lqfccr9fkhmzmvqp5c8025nlh8sy94fi846g7smg";
name = "oxygen-sounds-5.27.6.tar.xz";
};
};
plank-player = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plank-player-5.27.5.tar.xz";
sha256 = "0anws5npjdqq0p94fdrqmvyc55x3vwfx8v59l10k8qmj6habarph";
name = "plank-player-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plank-player-5.27.6.tar.xz";
sha256 = "1mjn2qvzav3c2sxfnfv2h9bj7cd00vidl85zmljm17nflv9cvwa8";
name = "plank-player-5.27.6.tar.xz";
};
};
plasma-bigscreen = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-bigscreen-5.27.5.tar.xz";
sha256 = "1wab0l0cz5a82lgq83s9ipmjqmj5nzzfk689lbz3swxns71qx03n";
name = "plasma-bigscreen-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-bigscreen-5.27.6.tar.xz";
sha256 = "097f5whppwla0y7zil7ykyp97glx2wdc05mwd7pk6y2l6d60fhl7";
name = "plasma-bigscreen-5.27.6.tar.xz";
};
};
plasma-browser-integration = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-browser-integration-5.27.5.tar.xz";
sha256 = "09frs7yxaiqi10j9f7vnr05nk53mvx0jshjk9wlz1cibcwflb45l";
name = "plasma-browser-integration-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-browser-integration-5.27.6.tar.xz";
sha256 = "12hrd6mvhmi649n4jc9pmv116f2cpzd3j90hxlhljixnw4g6vy3j";
name = "plasma-browser-integration-5.27.6.tar.xz";
};
};
plasma-desktop = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-desktop-5.27.5.tar.xz";
sha256 = "1c8wx4al96vnz9p02ml8ax6dzna1xvm6gvnn2w3n93v56hqmfasg";
name = "plasma-desktop-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-desktop-5.27.6.tar.xz";
sha256 = "10x68lqg6zxb8fajd277lm0qfrdg2jz7m58l3wna4nv9bni5wj72";
name = "plasma-desktop-5.27.6.tar.xz";
};
};
plasma-disks = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-disks-5.27.5.tar.xz";
sha256 = "02s8n7da2i2zjqi2q9k8fddqr4868dqyx9bf1lyfag3bb64y447a";
name = "plasma-disks-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-disks-5.27.6.tar.xz";
sha256 = "09v4hwx2q8sz0b4qak8xaxnyqj6ccjlgk28fijvmnv61nxb49h1w";
name = "plasma-disks-5.27.6.tar.xz";
};
};
plasma-firewall = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-firewall-5.27.5.tar.xz";
sha256 = "0hav4d2pgsvzvr9lw93v3zm473gii44x012fs1gx6dgcaam90b73";
name = "plasma-firewall-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-firewall-5.27.6.tar.xz";
sha256 = "1jbcyz92q63gh1ihkrvs4ffp1xjav9miy6n5adhqik9qxpgkqqn8";
name = "plasma-firewall-5.27.6.tar.xz";
};
};
plasma-integration = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-integration-5.27.5.tar.xz";
sha256 = "0ywzz2s46kaidzg5cagx2wp4kqndynfssz6a29czpw1811iwbvcd";
name = "plasma-integration-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-integration-5.27.6.tar.xz";
sha256 = "1awd9l874gxxkbcfzb76xga1f6firaqpshrapg0492vq33r5vzd5";
name = "plasma-integration-5.27.6.tar.xz";
};
};
plasma-mobile = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-mobile-5.27.5.tar.xz";
sha256 = "0h61q8nkwl5adrgm0353l2kada76760rqzwb94xdc7r9cjxjy6yc";
name = "plasma-mobile-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-mobile-5.27.6.tar.xz";
sha256 = "16djcga7ljq7zv979im8zd1l1fz7qfw9g2ya6kvdn9mf8li0l98j";
name = "plasma-mobile-5.27.6.tar.xz";
};
};
plasma-nano = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-nano-5.27.5.tar.xz";
sha256 = "1w6pq6wrnb3lq2jyfx9lpn11vmfka5rw4mn52cdz8997g4zyrhlj";
name = "plasma-nano-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-nano-5.27.6.tar.xz";
sha256 = "02qig2zh6py0i5phcyjln0yawbd6sdx4cm13l2kgi3bl1826kklb";
name = "plasma-nano-5.27.6.tar.xz";
};
};
plasma-nm = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-nm-5.27.5.tar.xz";
sha256 = "0bm6ihcg5cgfzz1pcj7zg2bjm8gik3rcjj4mp03ac1v29gj4hbqm";
name = "plasma-nm-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-nm-5.27.6.tar.xz";
sha256 = "1jfrd3xi4hyivkwrif6s87f9jasrnsihd7c80sqhwd1k2kl9wr0a";
name = "plasma-nm-5.27.6.tar.xz";
};
};
plasma-pa = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-pa-5.27.5.tar.xz";
sha256 = "1241v4igi3d1n2x46vp9qgqvw2gngsk75gx3rnjnivfypxrkzay2";
name = "plasma-pa-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-pa-5.27.6.tar.xz";
sha256 = "0kvfhpsiv0nkilirjwsplx67m5zdqc5w6zmp9gkgyym46ax0hxjf";
name = "plasma-pa-5.27.6.tar.xz";
};
};
plasma-remotecontrollers = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-remotecontrollers-5.27.5.tar.xz";
sha256 = "04d0rp4jpavn999lbvfni007l98i1zglwv7byrkb494zs40gqylc";
name = "plasma-remotecontrollers-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-remotecontrollers-5.27.6.tar.xz";
sha256 = "0ibngr1qy0vpdi6sx071225g354cdsag7j0gv3b6vrhq7s0z66b0";
name = "plasma-remotecontrollers-5.27.6.tar.xz";
};
};
plasma-sdk = {
version = "5.27.5";
version = "5.27.6.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-sdk-5.27.5.tar.xz";
sha256 = "05b9n2h7qkxm5yws4mi4f929dassi6hng0p730dx5fw7fsr4a0pi";
name = "plasma-sdk-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-sdk-5.27.6.1.tar.xz";
sha256 = "1byfknk60j4hajy1ibh25dv96irkpl4b5hyrrdg39m6fdx30wjrf";
name = "plasma-sdk-5.27.6.1.tar.xz";
};
};
plasma-systemmonitor = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-systemmonitor-5.27.5.tar.xz";
sha256 = "0d1ficiqv7zjcc1fkh7jx4f7pcpkygk1pyfm8gsp10i0iwwm3rc2";
name = "plasma-systemmonitor-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-systemmonitor-5.27.6.tar.xz";
sha256 = "07cwzcy7qd3b6rlyqjwhc2z567dn5j8gx701b57cs18z0rgv4vkr";
name = "plasma-systemmonitor-5.27.6.tar.xz";
};
};
plasma-thunderbolt = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-thunderbolt-5.27.5.tar.xz";
sha256 = "1mchvgh180m8anjznpwihay934c331fqc88l1wyiqqn6072n819i";
name = "plasma-thunderbolt-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-thunderbolt-5.27.6.tar.xz";
sha256 = "1ikcbn9awh5zh9ivdm3ysi1dw208byj8d4ls5c9ckclvylkfx7v6";
name = "plasma-thunderbolt-5.27.6.tar.xz";
};
};
plasma-vault = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-vault-5.27.5.tar.xz";
sha256 = "1s176masmip1qzv5am3phkwvb7yalmiasgzbx7r2rq705bh2pwkl";
name = "plasma-vault-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-vault-5.27.6.tar.xz";
sha256 = "0wxa80m2ppjp8l8nchwcvrmx20j0rgm9ydn93x4w4d4rmi6mypr4";
name = "plasma-vault-5.27.6.tar.xz";
};
};
plasma-welcome = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-welcome-5.27.5.tar.xz";
sha256 = "1ddfyi1a2ccs8ny9is0x8fjz0yh2v65sin85nrv6j483n3qqxjfb";
name = "plasma-welcome-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-welcome-5.27.6.tar.xz";
sha256 = "0lvvxllhshawj7pjx3d9l53clcnr73x519khgf27fpblil1x0hm8";
name = "plasma-welcome-5.27.6.tar.xz";
};
};
plasma-workspace = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-workspace-5.27.5.tar.xz";
sha256 = "05rayz8n3qgpnddr4wpzjwgvk3if4vnnwb1ccpm841zxxsr9a2zd";
name = "plasma-workspace-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-workspace-5.27.6.tar.xz";
sha256 = "10w8ix9c29gvykr9970aax7jcz2fi99cafr1kknvj2drgc7zgrhw";
name = "plasma-workspace-5.27.6.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plasma-workspace-wallpapers-5.27.5.tar.xz";
sha256 = "0h6871pwn000jzilhh4w5wa3s017cgkphhj4sxxpqds7q7f5x013";
name = "plasma-workspace-wallpapers-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plasma-workspace-wallpapers-5.27.6.tar.xz";
sha256 = "018vvxhs0rlc25hd5kafhzk6anl1yabggby7b5vsqvip2rsma0qk";
name = "plasma-workspace-wallpapers-5.27.6.tar.xz";
};
};
plymouth-kcm = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/plymouth-kcm-5.27.5.tar.xz";
sha256 = "0r00kmqzkzpjvp3s02h7vjiiyzfpvzn5j158jf6khvb4vywljqjr";
name = "plymouth-kcm-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/plymouth-kcm-5.27.6.tar.xz";
sha256 = "03qkrdin7s4kx14f518f6amvgd5adavgirjy8mk1zj62mz4f1sy5";
name = "plymouth-kcm-5.27.6.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.27.5";
version = "1-5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/polkit-kde-agent-1-5.27.5.tar.xz";
sha256 = "0brab8hn2qdnxzzx0q37m40h67s00s0zpc2wx1gzbnbl1kzv9qra";
name = "polkit-kde-agent-1-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/polkit-kde-agent-1-5.27.6.tar.xz";
sha256 = "0k7d9jz49fp4h7gxakqsmj16h5xdv8jw69068sz5mazzczi7lwyz";
name = "polkit-kde-agent-1-5.27.6.tar.xz";
};
};
powerdevil = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/powerdevil-5.27.5.tar.xz";
sha256 = "03jhzcwg1kjhm8ly3w12slgdxbyycqymijgnh3llrvzgawn8cy83";
name = "powerdevil-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/powerdevil-5.27.6.tar.xz";
sha256 = "1dbz479ikjy6fi3l701hvhkwhbll1gkibay3vzimb13kyamhy8vb";
name = "powerdevil-5.27.6.tar.xz";
};
};
qqc2-breeze-style = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/qqc2-breeze-style-5.27.5.tar.xz";
sha256 = "0vcq59m074zvcivlhk0jp7k5vywmamfdq4bsacvsjzxhlvzkvjlh";
name = "qqc2-breeze-style-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/qqc2-breeze-style-5.27.6.tar.xz";
sha256 = "02hxczlhyy2vwrsrw7hncmhcidany4xirlrw9caxsq4rylp7vszj";
name = "qqc2-breeze-style-5.27.6.tar.xz";
};
};
sddm-kcm = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/sddm-kcm-5.27.5.tar.xz";
sha256 = "16hrmbl413zy89if8yj9jsvnzv58rvs7w6y5isq33drkzvgz41an";
name = "sddm-kcm-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/sddm-kcm-5.27.6.tar.xz";
sha256 = "1qmmsvfs22byx5i48icgqh0cdh228yk40946yymacm39iwbsnw6w";
name = "sddm-kcm-5.27.6.tar.xz";
};
};
systemsettings = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/systemsettings-5.27.5.tar.xz";
sha256 = "1nxla37vr1j1h2vklm6cdzr5h5my9d3m05nr9dr1wcxsmaq4wifm";
name = "systemsettings-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/systemsettings-5.27.6.tar.xz";
sha256 = "17bqdsaih11wpcmv7qzk701l67431pf2nm8nnrix1s8k3qglfb5w";
name = "systemsettings-5.27.6.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.27.5";
version = "5.27.6";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/xdg-desktop-portal-kde-5.27.5.tar.xz";
sha256 = "1aqsiwfhca7nimdflwnq86fai4lhjqpi4pi4xyp8pcgrrwj3zykw";
name = "xdg-desktop-portal-kde-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.6/xdg-desktop-portal-kde-5.27.6.tar.xz";
sha256 = "0wzp21l521d9z9mnfgiapzljqpg5qc5ghyzndpr8cz54c2bf9mdf";
name = "xdg-desktop-portal-kde-5.27.6.tar.xz";
};
};
}

7
pkgs/development/haskell-modules/configuration-nix.nix
View File

@@ -290,11 +290,14 @@ self: super: builtins.intersectAttrs super {
src = assert super.nix-serve-ng.version == "1.0.0";
# Workaround missing files in sdist
# https://github.com/aristanetworks/nix-serve-ng/issues/10
#
# Workaround for libstore incompatibility with Nix 2.13
# https://github.com/aristanetworks/nix-serve-ng/issues/22
pkgs.fetchFromGitHub {
repo = "nix-serve-ng";
owner = "aristanetworks";
rev = "433f70f4daae156b84853f5aaa11987aa5ce7277";
sha256 = "0mqp67z5mi8rsjahdh395n7ppf0b65k8rd3pvnl281g02rbr69y2";
rev = "dabf46d65d8e3be80fa2eacd229eb3e621add4bd";
hash = "sha256-SoJJ3rMtDMfUzBSzuGMY538HDIj/s8bPf8CjIkpqY2w=";
};
} (addPkgconfigDepend pkgs.boost.dev super.nix-serve-ng);

4
pkgs/development/libraries/nss/generic.nix
View File

@@ -47,6 +47,10 @@ stdenv.mkDerivation rec {
./85_security_load_3.85+.patch
)
./fix-cross-compilation.patch
] ++ lib.optionals (lib.versionAtLeast version "3.90") [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1836925
# https://phabricator.services.mozilla.com/D180068
./remove-c25519-support.patch
];
patchFlags = [ "-p0" ];

4
pkgs/development/libraries/nss/latest.nix
View File

@@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.89.1";
hash = "sha256-OtrtuecMPF9AYDv2CgHjNhkKbb4Bkp05XxawH+hKAVY=";
version = "3.90";
hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y=";
}

69
pkgs/development/libraries/nss/remove-c25519-support.patch Normal file
View File

@@ -0,0 +1,69 @@
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
index 74e8e65..aa9dd95 100644
--- nss/lib/freebl/Makefile
+++ nss/lib/freebl/Makefile
@@ -568,7 +568,6 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)
HAVE_INT128_SUPPORT = 1
DEFINES += -DHAVE_INT128_SUPPORT
else ifeq (1,$(CC_IS_GCC))
- SUPPORTS_VALE_CURVE25519 = 1
ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
HAVE_INT128_SUPPORT = 1
DEFINES += -DHAVE_INT128_SUPPORT
@@ -593,11 +592,6 @@ ifndef HAVE_INT128_SUPPORT
DEFINES += -DKRML_VERIFIED_UINT128
endif
-ifdef SUPPORTS_VALE_CURVE25519
- VERIFIED_SRCS += Hacl_Curve25519_64.c
- DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
-endif
-
ifndef NSS_DISABLE_CHACHAPOLY
ifeq ($(CPU_ARCH),x86_64)
ifndef NSS_DISABLE_AVX2
diff --git a/nss/lib/freebl/freebl.gyp b/nss/lib/freebl/freebl.gyp
index 65f9a80..23940ef 100644
--- nss/lib/freebl/freebl.gyp
+++ nss/lib/freebl/freebl.gyp
@@ -866,12 +866,6 @@
}],
],
}],
- [ 'supports_vale_curve25519==1', {
- 'defines': [
- # The Makefile does version-tests on GCC, but we're not doing that here.
- 'HACL_CAN_COMPILE_INLINE_ASM',
- ],
- }],
[ 'OS=="linux" or OS=="android"', {
'conditions': [
[ 'target_arch=="x64"', {
@@ -934,11 +928,6 @@
'variables': {
'module': 'nss',
'conditions': [
- [ 'target_arch=="x64" and cc_is_gcc==1', {
- 'supports_vale_curve25519%': 1,
- }, {
- 'supports_vale_curve25519%': 0,
- }],
[ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
'have_int128_support%': 1,
}, {
diff --git a/nss/lib/freebl/freebl_base.gypi b/nss/lib/freebl/freebl_base.gypi
index d198c44..34b6b3c 100644
--- nss/lib/freebl/freebl_base.gypi
+++ nss/lib/freebl/freebl_base.gypi
@@ -151,11 +151,6 @@
'ecl/curve25519_32.c',
],
}],
- ['supports_vale_curve25519==1', {
- 'sources': [
- 'verified/Hacl_Curve25519_64.c',
- ],
- }],
['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {
'sources': [
# Gyp does not support per-file cflags, so working around like this.

4
pkgs/development/libraries/openssl/default.nix
View File

@@ -220,7 +220,9 @@ let
in {
# If you do upgrade here, please update in pkgs/top-level/release.nix
# the permitted insecure version to ensure it gets cached for our users
# and backport this to stable release (23.05).
openssl_1_1 = common {
version = "1.1.1u";
sha256 = "sha256-4vjYS1I+7NBse+diaDA3AwD7zBU4a/UULXJ1j2lj68Y=";

4
pkgs/development/web/nodejs/v16.nix
View File

@@ -10,8 +10,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.20.0";
sha256 = "sha256-4JkPmSI05ApR/hH5LDgWyTp34bCBFF0912LNECY0U0k=";
version = "16.20.1";
sha256 = "sha256-g+AzgeJx8aVhkYjnrqnYXZt+EvW+KijOt41ySe0it/E=";
patches = [
./disable-darwin-v8-system-instrumentation.patch
./bypass-darwin-xcrun-node16.patch

4
pkgs/development/web/nodejs/v18.nix
View File

@@ -9,8 +9,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "18.16.0";
sha256 = "sha256-M9gaIz4jWlCa3aSk8iCQCNBFkZed5rPw9nwckGCT8Rg=";
version = "18.16.1";
sha256 = "sha256-6EBPjI2J/f336Vu7xgZr0OVxrLpY9USSWZthX77v4nI=";
patches = [
./disable-darwin-v8-system-instrumentation.patch
./bypass-darwin-xcrun-node16.patch

4
pkgs/development/web/nodejs/v20.nix
View File

@@ -9,8 +9,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "20.2.0";
sha256 = "sha256-IlI98jFsNVaXFP8fabBTwuKGztRgiYQX3uRpRe/N+Yk=";
version = "20.3.1";
sha256 = "sha256-EqgtswZpeVm0OJs1Gl+XhImGsTE/mQGw4LPYz08/mZE=";
patches = [
./revert-arm64-pointer-auth.patch
./disable-darwin-v8-system-instrumentation-node19.patch

13
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
View File

@@ -69,7 +69,18 @@ let
stdenvs = {
stdenv = mkStdenv stdenv;
} // builtins.listToAttrs (map
(v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; })
(v: {
name = "llvmPackages_${v}";
value = pkgs."llvmPackages_${v}" // {
stdenv = mkStdenv pkgs."llvmPackages_${v}".stdenv;
};
})
[ "12" "13" "14" "15" "16" ]
) // builtins.listToAttrs (map
(v: {
name = "clang${v}Stdenv";
value = mkStdenv pkgs."llvmPackages_${v}".stdenv;
})
[ "12" "13" "14" "15" "16" ]
);

45
pkgs/servers/clickhouse/default.nix
View File

@@ -1,5 +1,5 @@
{ lib
, stdenv
, llvmPackages
, fetchFromGitHub
, cmake
, ninja
@@ -7,6 +7,8 @@
, perl
, yasm
, nixosTests
, darwin
, findutils
# currently for BLAKE3 hash function
, rustSupport ? true
@@ -17,7 +19,13 @@
, rustPlatform
}:
stdenv.mkDerivation rec {
let
inherit (llvmPackages) stdenv;
mkDerivation = (
if stdenv.isDarwin
then darwin.apple_sdk_11_0.llvmPackages_15.stdenv
else llvmPackages.stdenv).mkDerivation;
in mkDerivation rec {
pname = "clickhouse";
version = "23.3.3.52";
@@ -26,20 +34,16 @@ stdenv.mkDerivation rec {
repo = "ClickHouse";
rev = "v${version}-lts";
fetchSubmodules = true;
hash = "sha256-yeoL3HA1wRDg2+t3FtrM4wBtuu94Lpe4xxGxc09duQI=";
name = "clickhouse-${rev}.tar.gz";
hash = "sha256-fVwwMj0WbyCbe4WfpYMGVM6vXFgHsjg9MUZbNyd+a/w=";
postFetch = ''
# compress to not exceed the 4GB output limit
# try to make a deterministic tarball
tar -I 'gzip -n' \
--sort=name \
--mtime=1970-01-01 \
--owner=root --group=root \
--numeric-owner --mode=go=rX,u+rw,a-s \
--transform='s@^@source/@S' \
-cf temp -C "$out" .
rm -r "$out"
mv temp "$out"
# delete files that make the source too big
rm -rf $out/contrib/llvm-project/llvm/test
rm -rf $out/contrib/llvm-project/clang/test
rm -rf $out/contrib/croaring/benchmarks
# fix case insensitivity on macos https://github.com/NixOS/nixpkgs/issues/39308
rm -rf $out/contrib/sysroot/linux-*
rm -rf $out/contrib/liburing/man
'';
};
@@ -51,6 +55,10 @@ stdenv.mkDerivation rec {
perl
] ++ lib.optionals stdenv.isx86_64 [
yasm
] ++ lib.optionals stdenv.isDarwin [
llvmPackages.bintools
findutils
darwin.bootstrap_cmds
] ++ lib.optionals rustSupport [
rustc
cargo
@@ -110,6 +118,9 @@ stdenv.mkDerivation rec {
--replace 'git rev-parse --show-toplevel' '$src'
substituteInPlace utils/check-style/check-style \
--replace 'git rev-parse --show-toplevel' '$src'
'' + lib.optionalString stdenv.isDarwin ''
sed -i 's|gfind|find|' cmake/tools.cmake
sed -i 's|ggrep|grep|' cmake/tools.cmake
'' + lib.optionalString rustSupport ''
pushd contrib/corrosion/generator
@@ -129,7 +140,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_TESTS=OFF"
"-DENABLE_CCACHE=0"
"-DCOMPILER_CACHE=disabled"
"-DENABLE_EMBEDDED_COMPILER=ON"
"-DWERROR=OFF"
];
@@ -157,7 +168,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ orivej ];
# not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) platforms.linux;
platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) (platforms.linux ++ platforms.darwin);
broken = stdenv.buildPlatform != stdenv.hostPlatform;
};
}

6
pkgs/servers/matrix-synapse/default.nix
View File

@@ -12,20 +12,20 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.85.2";
version = "1.86.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
hash = "sha256-pFafBsisBPfpDnFYWcimUuBgfFVPZzLna3yHeqIBAAE=";
hash = "sha256-vSNAISWTTT3IAeA8hxQhQNp9T3soey4vgh7v+BxI+K0=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-dnno+5Ma0YNYpmj3oZ5UG22uAanKwVT67BwQW+mHoFc=";
hash = "sha256-lPLhh5FkxpBUQ5UH6eAfUIyGvHIcZHmbYBT5QUW/W4k=";
};
postPatch = ''

5
pkgs/servers/monitoring/prometheus/pve-exporter.nix
View File

@@ -5,11 +5,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "prometheus-pve-exporter";
version = "2.2.2";
version = "2.3.0";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "0vvsiw8nj8zkx6v42f260xbsdd92l0ac4vwpm7w38j3qwvanar7k";
sha256 = "sha256-hL1+vP+/Xi3od+17906YARgg4APlFhRkdOCnRxDHJmM=";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -18,6 +18,7 @@ python3.pkgs.buildPythonApplication rec {
pyyaml
requests
werkzeug
gunicorn
];
doCheck = false;

4
pkgs/servers/sql/postgresql/ext/postgis.nix
View File

@@ -15,13 +15,13 @@
}:
stdenv.mkDerivation rec {
pname = "postgis";
version = "3.3.2";
version = "3.3.3";
outputs = [ "out" "doc" ];
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
sha256 = "sha256-miohnaAFoXMKOdGVmhx87GGbHvsAm2W+gP/CW60pkGg=";
sha256 = "sha256-dOs1bj+F8UIzeRATNgiBtnSPeAgcxoj/nW8PZzp2LRM=";
};
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]

1
pkgs/tools/misc/opentelemetry-collector/default.nix
View File

@@ -42,5 +42,6 @@ buildGoModule rec {
'';
license = licenses.asl20;
maintainers = with maintainers; [ uri-canva jk ];
mainProgram = "otelcorecol";
};
}

4
pkgs/tools/misc/yt-dlp/default.nix
View File

@@ -22,11 +22,11 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2023.3.4";
version = "2023.6.21";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Jl1dqXp2wV19mkCIpnt4rNXc9vjP2CV8UvWB/5lv9RU=";
sha256 = "sha256-VsNdGtPs+4KMO4n/4HsjWzVO3dguGjHdw9FuuMPnHo4=";
};
propagatedBuildInputs = [

17
pkgs/tools/networking/fakeroute/default.nix
View File

@@ -1,24 +1,21 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchurl, nixosTests }:
stdenv.mkDerivation rec {
pname = "fakeroute";
version = "0.3";
src = fetchFromGitHub {
owner = "museoa";
repo = "fakeroute";
rev = "f8cb9c0ae3abb4c0662d9e1fcac67eefeeac3963";
sha256 = "12dhahwlpjzv79wpdpryjihamfbh4d8cfzfw4wi1jkl0dv2d41jg";
src = fetchurl {
url = "https://maxwell.ydns.eu/git/rnhmjoj/fakeroute/releases/download/v${version}/fakeroute-${version}.tar.gz";
hash = "sha256-DoXGJm8vOlAD6ZuvVAt6bkgfahc8WgyYIXCrgqzfiWg=";
};
sourceRoot = "source/fakeroute-0.3";
passthru.tests.fakeroute = nixosTests.fakeroute;
meta = with lib; {
description = ''
Makes your machine appear to be anywhere on the internet
to any host running a (UDP) unix traceroute
Make your machine appears to be anywhere on the internet in a traceroute
'';
homepage = "https://github.com/museoa/fakeroute"; # Formerly https://moxie.org/software/fakeroute/
homepage = "https://maxwell.ydns.eu/git/rnhmjoj/fakeroute";
license = licenses.bsd3;
platforms = platforms.linux;
};

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

@@ -25204,7 +25204,7 @@ with pkgs;
clamsmtp = callPackage ../servers/mail/clamsmtp { };
clickhouse = callPackage ../servers/clickhouse {
stdenv = llvmPackages_15.stdenv;
llvmPackages = llvmPackages_15;
};
clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
@@ -30605,8 +30605,8 @@ with pkgs;
welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };
wireshark = callPackage ../applications/networking/sniffers/wireshark {
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration;
libpcap = libpcap.override { withBluez = stdenv.isLinux; };
};
wireshark-qt = wireshark;
@@ -32011,7 +32011,7 @@ with pkgs;
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv;
};
lazpaint = callPackage ../applications/graphics/lazpaint { };

2
pkgs/top-level/release.nix
View File

@@ -26,7 +26,7 @@
# for no real reason.
# Remove them for 23.11.
"nodejs-16.20.0"
"openssl-1.1.1t"
"openssl-1.1.1u"
];
}; }
}: