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 release-23.11 into staging-next-23.11

Browse Source
This commit is contained in:
github-actions[bot]
2024-06-23 00:15:32 +00:00
committed by GitHub
parent 700365c644 5e8e3b89ad
commit cfc2b6ce32
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/by-name/de/deltachat-rpc-server/package.nix Normal file
View File

@@ -0,0 +1,26 @@
{ lib
, rustPlatform
, libdeltachat
, perl
, pkg-config
}:
rustPlatform.buildRustPackage {
pname = "deltachat-rpc-server";
inherit (libdeltachat) version src cargoLock buildInputs;
nativeBuildInputs = [
perl
pkg-config
];
cargoBuildFlags = [ "--package" "deltachat-rpc-server" ];
doCheck = false;
meta = libdeltachat.meta // {
description = "Delta Chat RPC server exposing JSON-RPC core API over standard I/O";
mainProgram = "deltachat-rpc-server";
};
}

3
pkgs/development/libraries/libdeltachat/default.nix
View File

@@ -5,6 +5,7 @@
, cmake
, deltachat-desktop
, deltachat-repl
, deltachat-rpc-server
, openssl
, perl
, pkg-config
@@ -81,7 +82,7 @@ in stdenv.mkDerivation rec {
passthru = {
inherit cargoLock;
tests = {
inherit deltachat-desktop deltachat-repl;
inherit deltachat-desktop deltachat-repl deltachat-rpc-server;
python = python3.pkgs.deltachat;
};
};

6
pkgs/os-specific/linux/kernel/common-config.nix
View File

@@ -346,7 +346,7 @@ let
DRM_GMA500 = whenAtLeast "5.12" module;
DRM_GMA600 = whenOlder "5.13" yes;
DRM_GMA3600 = whenOlder "5.12" yes;
DRM_VMWGFX_FBCON = whenOlder "6.2" yes;
DRM_VMWGFX_FBCON = whenOlder "6.1" yes;
# (experimental) amdgpu support for verde and newer chipsets
DRM_AMDGPU_SI = yes;
# (stable) amdgpu support for bonaire and newer chipsets
@@ -481,8 +481,8 @@ let
F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes;
UDF_FS = module;
NFSD_V2_ACL = whenOlder "5.15" yes;
NFSD_V3 = whenOlder "5.15" yes;
NFSD_V2_ACL = whenOlder "5.10" yes;
NFSD_V3 = whenOlder "5.10" yes;
NFSD_V3_ACL = yes;
NFSD_V4 = yes;
NFSD_V4_SECURITY_LABEL = yes;