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

Merge staging-next-22.11 into staging-22.11

Browse Source
This commit is contained in:
github-actions[bot]
2023-02-10 00:15:09 +00:00
committed by GitHub
parent 03c9fffdbb 04f5439263
commit cec2af4eaa
14 changed files with 107 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/web-servers/caddy/default.nix
View File

@@ -35,7 +35,8 @@ let
Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } ''
mkdir -p $out
${cfg.package}/bin/caddy fmt ${Caddyfile}/Caddyfile > $out/Caddyfile
cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile
caddy fmt --overwrite $out/Caddyfile
'';
in
"${if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile}/Caddyfile";

4
pkgs/applications/networking/browsers/brave/default.nix
View File

@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.47.186";
version = "1.48.158";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-47LkjcC+fEE+cn2m434+9fQ+N2yZSc1eF0gDO7jGfPI=";
sha256 = "sha256-hgV8+Mjth43KItly98lTh3Ur+h9vA9BfJxOqMGl1ndY=";
};
dontConfigure = true;

20
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@@ -1,21 +1,21 @@
{
"stable": {
"version": "109.0.5414.119",
"sha256": "0bdyb14v12izxkldq27jx532p0bid3wdwfpd1mwm7jqswxgfzkfb",
"sha256bin64": "0iap6i4zmflp4fsj16knwdp03gixsdkbys0scbvvzs3fzy2r5zkx",
"version": "110.0.5481.77",
"sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73",
"sha256bin64": "0jjdgfps6siy9hk2r553vvh0jmkn987ad77sv2zqs9gvx0vsrwgp",
"deps": {
"gn": {
"version": "2022-11-10",
"version": "2022-12-12",
"url": "https://gn.googlesource.com/gn",
"rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41",
"sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b"
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
}
},
"chromedriver": {
"version": "109.0.5414.74",
"sha256_linux": "1mhnw4maixwfhrz3r3mhpr9bl9hn7cvr2ji6y6ai32hxa1ix9m6f",
"sha256_darwin": "0w46xd05m7irfxqsfnjwgd2v65c9vgnh8awaknqgh02wmdgx3nm0",
"sha256_darwin_aarch64": "0amb2kd4cq4clir9gqr1b1mdy46m8nwzka227xxjd2i14vwzckb0"
"version": "110.0.5481.30",
"sha256_linux": "08j28ahyahlgmy67hcm8b1vd4kilvf2yvc25746a46gdf8zz0nmw",
"sha256_darwin": "0xlq0fi9g15yvd6ysqcfkxpbr37av32h0f3af9vxl8vbywjfsxn4",
"sha256_darwin_aarch64": "03j47ha9janbawbjxy9n84sx70iisk6qr0bvb218cq5j1d5x058b"
}
},
"beta": {

8
pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix
View File

@@ -7,10 +7,16 @@ symlinkJoin {
nativeBuildInputs = [ makeWrapper ];
postBuild = ''
declare -a schemas;
for plugin in ${toString plugins}; do
for schema in $plugin/share/gsettings-schemas/*; do
schemas+=($schema);
done
done
for i in $out/bin/* $out/libexec/**; do
if [ ! -d $i ]; then
echo wrapping $i
wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}"
wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}" --prefix XDG_DATA_DIRS : "''${schemas[@]}"
fi
done

11
pkgs/development/libraries/ldb/default.nix
View File

@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "ldb";
version = "2.3.0";
version = "2.6.1";
src = fetchurl {
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
sha256 = "0bcjj4gv48ddg44wyxpsvrs26xry6yy9x9k16qgz0bljs2rhilx4";
sha256 = "sha256-RnQD9334Z4LDlluxdUQLqi7XUan+uVYBlL2MBr8XNsk=";
};
outputs = [ "out" "dev" ];
@@ -44,6 +44,13 @@ stdenv.mkDerivation rec {
cmocka
];
# otherwise the configure script fails with
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
preConfigure = ''
export PKGCONFIG="$PKG_CONFIG"
export PYTHONHASHSEED=1
'';
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [

13
pkgs/development/libraries/libarchive/default.nix
View File

@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, acl
, attr
, autoreconfHook
@@ -37,6 +38,18 @@ stdenv.mkDerivation rec {
hash = "sha256-wQbA6vlXH8pnpY7LJLkjrRFEBpcaPR1SqxnK71UVwxg=";
};
patches =
assert version == "3.6.2";
lib.optionals stdenv.hostPlatform.isStatic [
# fixes static linking; upstream in releases after 3.6.2
# https://github.com/libarchive/libarchive/pull/1825 merged upstream
(fetchpatch {
name = "001-only-add-iconv-to-pc-file-if-needed.patch";
url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch";
hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY=";
})
];
postPatch = ''
substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)"

11
pkgs/development/libraries/talloc/default.nix
View File

@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "talloc";
version = "2.3.3";
version = "2.3.4";
src = fetchurl {
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
sha256 = "sha256-a+lbI2i9CvHEzXqIFG62zuoY5Gw//JMwv2JitA0diqo=";
sha256 = "sha256-F5+eviZeZ+SrLCbK0rfeS2p3xsIS+WaQM4KGnwa+ZQU=";
};
nativeBuildInputs = [
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
libxcrypt
];
# otherwise the configure script fails with
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
preConfigure = ''
export PKGCONFIG="$PKG_CONFIG"
export PYTHONHASHSEED=1
'';
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [

11
pkgs/development/libraries/tdb/default.nix
View File

@@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "tdb";
version = "1.4.6";
version = "1.4.7";
src = fetchurl {
url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
sha256 = "sha256-1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws=";
sha256 = "sha256-pPsWje9TPzH/LAf32YRLsxMeZ5nwlOvnfQOArcmHwg4=";
};
nativeBuildInputs = [
@@ -34,6 +34,13 @@ stdenv.mkDerivation rec {
libxcrypt
];
# otherwise the configure script fails with
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
preConfigure = ''
export PKGCONFIG="$PKG_CONFIG"
export PYTHONHASHSEED=1
'';
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [

13
pkgs/development/libraries/tevent/default.nix
View File

@@ -2,6 +2,7 @@
, fetchurl
, python3
, pkg-config
, cmocka
, readline
, talloc
, libxslt
@@ -13,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "tevent";
version = "0.10.2";
version = "0.13.0";
src = fetchurl {
url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
sha256 = "15k6i8ad5lpxfjsjyq9h64zlyws8d3cm0vwdnaw8z1xjwli7hhpq";
sha256 = "sha256-uUN6kX+lU0Q2G+tk7J4AQumcroh5iCpi3Tj2q+I3HQw=";
};
nativeBuildInputs = [
@@ -32,10 +33,18 @@ stdenv.mkDerivation rec {
buildInputs = [
python3
cmocka
readline # required to build python
talloc
];
# otherwise the configure script fails with
# PYTHONHASHSEED=1 missing! Don't use waf directly, use ./configure and make!
preConfigure = ''
export PKGCONFIG="$PKG_CONFIG"
export PYTHONHASHSEED=1
'';
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [

10
pkgs/os-specific/linux/ddcci/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, kernel }:
{ lib, stdenv, fetchFromGitLab, kernel, fetchpatch }:
stdenv.mkDerivation rec {
pname = "ddcci-driver";
@@ -32,6 +32,14 @@ stdenv.mkDerivation rec {
"INCLUDEDIR=$(out)/include"
];
patches = [
# fix to support linux 6.1
(fetchpatch {
url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/ce52d6ac5e5ed7119a0028eed8823117a004766e.patch";
sha256 = "sha256-Tmf4oiMWLR5ma/3X0eoFuriK29HwDqy6dBT7WdqE3mI=";
})
];
meta = with lib; {
description = "Kernel module driver for DDC/CI monitors";
homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux";

12
pkgs/servers/caddy/default.nix
View File

@@ -7,12 +7,12 @@
, installShellFiles
}:
let
version = "2.6.2";
version = "2.6.3";
dist = fetchFromGitHub {
owner = "caddyserver";
repo = "dist";
rev = "v${version}";
sha256 = "sha256-EXs+LNb87RWkmSWvs8nZIVqRJMutn+ntR241gqI7CUg=";
sha256 = "sha256-SJO1q4g9uyyky9ZYSiqXJgNIvyxT5RjrpYd20YDx8ec=";
};
in
buildGoModule {
@@ -23,10 +23,10 @@ buildGoModule {
owner = "caddyserver";
repo = "caddy";
rev = "v${version}";
sha256 = "sha256-Tbf6RB3106OEZGc/Wx7vk+I82Z8/Q3WqnID4f8uZ6z0=";
sha256 = "sha256-YH+lo6gKqmhu1/3HZdWXnxTXaUwC8To+OCmGpji6i3k=";
};
vendorSha256 = "sha256-YxGXk3Q1qw6uZxrGc8l2lKExP2GP+nm3eYbHDoEbgdY=";
vendorSha256 = "sha256-sqjN+NgwdP2qw7/CBxKvSwwA3teg/trXg/oa1Ff0N8s=";
subPackages = [ "cmd/caddy" ];
@@ -58,8 +58,8 @@ buildGoModule {
meta = with lib; {
homepage = "https://caddyserver.com";
description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";
description = "Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS";
license = licenses.asl20;
maintainers = with maintainers; [ Br1ght0ne techknowlogick ];
maintainers = with maintainers; [ Br1ght0ne indeednotjames techknowlogick ];
};
}

7
pkgs/servers/samba/4.x.nix
View File

@@ -21,9 +21,12 @@
, libunwind
, systemd
, samba
, talloc
, jansson
, ldb
, libtasn1
, tdb
, tevent
, libxcrypt
, cmocka
, rpcsvc-proto
@@ -99,8 +102,11 @@ stdenv.mkDerivation rec {
zlib
libunwind
gnutls
ldb
talloc
libtasn1
tdb
tevent
libxcrypt
] ++ optionals stdenv.isLinux [ liburing systemd ]
++ optionals enableLDAP [ openldap.dev python3Packages.markdown ]
@@ -140,6 +146,7 @@ stdenv.mkDerivation rec {
++ optionals (!enableLDAP) [
"--without-ldap"
"--without-ads"
"--bundled-libraries=!ldb,!pyldb-util!talloc,!pytalloc-util,!tevent,!tdb,!pytdb"
] ++ optional enableProfiling "--with-profiling-data"
++ optional (!enableAcl) "--without-acl-support"
++ optional (!enablePam) "--without-pam"

6
pkgs/servers/web-apps/shiori/default.nix
View File

@@ -2,9 +2,9 @@
buildGoModule rec {
pname = "shiori";
version = "1.5.3";
version = "1.5.4";
vendorSha256 = "sha256-vyBb8jNpXgpiktbn2lphL2wAeKmvjJLxV8ZrHoUSNYY=";
vendorHash = "sha256-8aiaG2ry/XXsosbrLBmwnjbwIhbKMdM6WHae07MG7WI=";
doCheck = false;
@@ -12,7 +12,7 @@ buildGoModule rec {
owner = "go-shiori";
repo = pname;
rev = "v${version}";
sha256 = "sha256-razBb/flqwyFG4SPWhSapDO1sB5DYzyjYGx8ABFg/I8=";
sha256 = "sha256-QZTYhRz65VLs3Ytv0k8ptfeQ/36M2VBXFaD9zhQXDh8=";
};
passthru.tests = {

11
pkgs/tools/misc/less/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ncurses, lessSecure ? false }:
{ lib, stdenv, fetchurl, fetchpatch, ncurses, lessSecure ? false }:
stdenv.mkDerivation rec {
pname = "less";
@@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "02f2d9d6hyf03va28ip620gjc6rf4aikmdyk47h7frqj18pbx6m6";
};
patches = [
(fetchpatch {
# https://github.com/advisories/GHSA-5xw7-xf7p-gm82
name = "CVE-2022-46663.patch";
url = "https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c.patch";
hash = "sha256-gWgCzoMt1WyVJVKYzkMq8HfaTlU1XUtC8fvNFUQT0sI=";
})
];
configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.
++ lib.optionals lessSecure [ "--with-secure" ];