colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-07-29 06:01:06 +00:00 committed by GitHub
commit d64d339ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 186 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View File

@ -3909,6 +3909,12 @@
githubId = 75067;
name = "Daniel Duan";
};
de11n = {
email = "nixpkgs-commits@deshaw.com";
github = "de11n";
githubId = 130508846;
name = "Elliot Cameron";
};
dearrude = {
name = "Ebrahim Nejati";
email = "dearrude@tfwno.gf";
@ -7237,6 +7243,12 @@
fingerprint = "5CB5 9AA0 D180 1997 2FB3 E0EC 943A 1DE9 372E BE4E";
}];
};
invokes-su = {
email = "nixpkgs-commits@deshaw.com";
github = "invokes-su";
githubId = 88038050;
name = "Souvik Sen";
};
ionutnechita = {
email = "ionut_n2001@yahoo.com";
github = "ionutnechita";

5
maintainers/team-list.nix
View File

@ -193,10 +193,11 @@ with lib.maintainers; {
deshaw = {
# Verify additions to this team with at least one already existing member of the team.
members = [
limeytexan
de11n
invokes-su
];
scope = "Group registration for D. E. Shaw employees who collectively maintain packages.";
shortName = "Shaw employees";
shortName = "D. E. Shaw employees";
};
determinatesystems = {

18
nixos/modules/services/networking/tailscale.nix
View File

@ -29,12 +29,7 @@ in {
description = lib.mdDoc "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node.";
};
package = mkOption {
type = types.package;
default = pkgs.tailscale;
defaultText = literalExpression "pkgs.tailscale";
description = lib.mdDoc "The package to use for tailscale";
};
package = lib.mkPackageOptionMD pkgs "tailscale" {};
useRoutingFeatures = mkOption {
type = types.enum [ "none" "client" "server" "both" ];
@ -58,6 +53,13 @@ in {
A file containing the auth key.
'';
};
extraUpFlags = mkOption {
description = lib.mdDoc "Extra flags to pass to {command}`tailscale up`.";
type = types.listOf types.str;
default = [];
example = ["--ssh"];
};
};
config = mkIf cfg.enable {
@ -98,10 +100,10 @@ in {
serviceConfig = {
Type = "oneshot";
};
script = with pkgs; ''
script = ''
status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service)
if [[ $status != Connected* ]]; then
${pkgs.tailscale}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}'
${cfg.package}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags}
fi
'';
};

5
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -110,10 +110,11 @@ let
createImportService = { pool, systemd, force, prefix ? "" }:
nameValuePair "zfs-import-${pool}" {
description = "Import ZFS pool \"${pool}\"";
# we need systemd-udev-settle to ensure devices are available
# We wait for systemd-udev-settle to ensure devices are available,
# but don't *require* it, because mounts shouldn't be killed if it's stopped.
# In the future, hopefully someone will complete this:
# https://github.com/zfsonlinux/zfs/pull/4943
requires = [ "systemd-udev-settle.service" ];
wants = [ "systemd-udev-settle.service" ];
after = [
"systemd-udev-settle.service"
"systemd-modules-load.service"

5
pkgs/applications/misc/blender/default.nix
View File

@ -35,7 +35,9 @@ stdenv.mkDerivation rec {
hash = "sha256-SzdWyzdGhsaesv1VX5ZUfUnLHvRvW8buJTlOVxz6yOk=";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
patches = [
./draco.patch
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
nativeBuildInputs =
[ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev
@ -165,6 +167,7 @@ stdenv.mkDerivation rec {
mkdir $out/Applications
mv $out/Blender.app $out/Applications
'' + ''
mv $out/share/blender/${lib.versions.majorMinor version}/python{,-ext}
buildPythonPath "$pythonPath"
wrapProgram $blenderExecutable \
--prefix PATH : $program_PATH \

26
pkgs/applications/misc/blender/draco.patch Normal file
View File

@ -0,0 +1,26 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -898,11 +898,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES OFF)
set_and_warn_dependency(WITH_PYTHON WITH_DRACO OFF)
set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID OFF)
-if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
- message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
- set(WITH_DRACO OFF)
-endif()
-
# enable boost for cycles, audaspace or i18n
# otherwise if the user disabled
--- a/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
+++ b/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
@@ -17,7 +17,7 @@ def dll_path() -> Path:
"""
lib_name = 'extern_draco'
- blender_root = Path(bpy.app.binary_path).parent
+ blender_root = Path(bpy.app.binary_path).parent.parent
- python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))
+ python_lib = Path('share/blender/{v[0]}.{v[1]}/python-ext/lib'.format(v=bpy.app.version))
python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info)
path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH')

4
pkgs/applications/misc/iptsd/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "iptsd";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "linux-surface";
repo = pname;
rev = "v${version}";
hash = "sha256-6sP50sdjuOijukztLQ4HoXqU9qjZuTzs5NMIBENVw2w=";
hash = "sha256-06KGMXkp5lR05iNQOll1h0q+Z+XWMberqG1C9Cs7VfA=";
};
nativeBuildInputs = [

6
pkgs/applications/misc/kbt/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "kbt";
version = "1.1.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "bloznelis";
repo = "kbt";
rev = version;
hash = "sha256-dC/o5VzdhoggEgY2LvdapT4CuSdz2iI+zbv3RZD/8XU=";
hash = "sha256-IVKGpifLcpqPD4ZYP+1mY0EokNoQW6qSbxt66w6b81w=";
};
cargoHash = "sha256-UVTUcc8OeGdCRGFt9FV1rQuOsVWmh2KEDpu1jSC0XHM=";
cargoHash = "sha256-iPsBYccLQdPvzaV7pRa3ZLFFwJ1lIJoFMWChLkQpyyk=";
nativeBuildInputs = lib.optionals stdenv.isLinux [
pkg-config

4
pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubernetes-metrics-server";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "metrics-server";
rev = "v${version}";
sha256 = "sha256-hPI+Wq0mZ2iu4FSDpdPdGEqgFCeUdqeK5ldJCByDE4M=";
sha256 = "sha256-e9iFOe2iZaKbYNUk0vuyzcGDCNxot34kRH06L5UQs4I=";
};
vendorHash = "sha256-BR9mBBH5QE3FMTNtyHfHA1ei18CIDr5Yhvg28hGbDR4=";

17
pkgs/applications/networking/pjsip/default.nix
View File

@ -2,7 +2,6 @@
, testers
, stdenv
, fetchFromGitHub
, fetchpatch
, openssl
, libsamplerate
, swig
@ -16,27 +15,17 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pjsip";
version = "2.13";
version = "2.13.1";
src = fetchFromGitHub {
owner = finalAttrs.pname;
repo = "pjproject";
rev = finalAttrs.version;
sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE=";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-R1iKIkWyNCRV2PjQgTqKmJYUgHAZrREanD60Jz6MY1Y=";
};
patches = [
./fix-aarch64.patch
(fetchpatch {
name = "CVE-2022-23537.patch";
url = "https://github.com/pjsip/pjproject/commit/d8440f4d711a654b511f50f79c0445b26f9dd1e1.patch";
sha256 = "sha256-7ueQCHIiJ7MLaWtR4+GmBc/oKaP+jmEajVnEYqiwLRA=";
})
(fetchpatch {
name = "CVE-2022-23547.patch";
url = "https://github.com/pjsip/pjproject/commit/bc4812d31a67d5e2f973fbfaf950d6118226cf36.patch";
sha256 = "sha256-bpc8e8VAQpfyl5PX96G++6fzkFpw3Or1PJKNPKl7N5k=";
})
];
nativeBuildInputs =

4
pkgs/applications/system/psitop/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "psitop";
version = "1.0.0";
version = "1.1.3";
src = fetchFromGitHub {
owner = "jamespwilliams";
repo = "psitop";
rev = version;
hash = "sha256-C8WEbA7XXohKFz7QgII0LPU1eJ4Z7CSlmEOamgo4wQI=";
hash = "sha256-TD+NTlfmBtz+m2w2FnTcUIJQakpvVBCK/MAHfCrOue4=";
};
vendorHash = "sha256-oLtKpBvTsM5TbzfWIDfqgb7DL5D3Mldu0oimVeiUeSc=";

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

@ -6,7 +6,7 @@
let
pname = "lefthook";
version = "1.4.6";
version = "1.4.7";
in
buildGoModule rec {
inherit pname version;
@ -15,7 +15,7 @@ buildGoModule rec {
owner = "evilmartians";
repo = "lefthook";
rev = "v${version}";
hash = "sha256-2SgzNDG63Lsddhn1phqBNuar4I5Gr4mkHv3pYvMIZ28=";
hash = "sha256-zpey+2j0pLpE+wvqPcjVS5Mp+eQJiYtRsFAC8lPh4ck=";
};
vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA=";

6
pkgs/applications/video/multiviewer-for-f1/default.nix
View File

@ -24,15 +24,15 @@
}:
let
id = "117980724";
id = "118976581";
in
stdenvNoCC.mkDerivation rec {
pname = "multiviewer-for-f1";
version = "1.24.1";
version = "1.24.2";
src = fetchurl {
url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
sha256 = "sha256-uEcxDIWolouIUJ8Xuva3rtW51gfCddAwTGqOBnucmmY=";
sha256 = "sha256-zll639fQFdrNvIj/4ECqEGxQw4VgfERGlti7opSmSi0=";
};
nativeBuildInputs = [

12
pkgs/applications/window-managers/cage/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper
, wlroots, wayland, wayland-protocols, pixman, libxkbcommon
, wlroots, wayland, wayland-protocols, pixman, libxkbcommon, xcbutilwm
, systemd, libGL, libX11, mesa
, xwayland ? null
, nixosTests
@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "cage";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "Hjdskes";
repo = "cage";
rev = "v${version}";
sha256 = "0vm96gxinhy48m3x9p1sfldyd03w3gk6iflb7n9kn06j1vqyswr6";
hash = "sha256-Suq14YRw/MReDRvO/TQqjpZvpzAEDnHUyVbQj0BPT4c=";
};
depsBuildBuild = [
@ -24,15 +24,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc makeWrapper ];
buildInputs = [
wlroots wayland wayland-protocols pixman libxkbcommon
wlroots wayland wayland-protocols pixman libxkbcommon xcbutilwm
mesa # for libEGL headers
systemd libGL libX11
];
# https://github.com/cage-kiosk/cage/issues/231
# cage will segfault on start with `-m last` without this
CFLAGS = "-O0";
mesonFlags = [ "-Dxwayland=${lib.boolToString (xwayland != null)}" ];
postFixup = lib.optionalString (xwayland != null) ''

3
pkgs/build-support/fetchfirefoxaddon/default.nix
View File

@ -9,7 +9,6 @@
{ name
, url ? null
, md5 ? ""
, sha1 ? ""
, sha256 ? ""
, sha512 ? ""
@ -23,7 +22,7 @@ let
source = if url == null then src else
fetchurl {
url = url;
inherit md5 sha1 sha256 sha512 hash;
inherit sha1 sha256 sha512 hash;
};
in
stdenv.mkDerivation {

8
pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
View File

@ -26,6 +26,14 @@ mkXfceDerivation {
xfce4-panel
];
# using /run/current-system/sw/bin instead of nix store path prevents polkit permission errors on
# rebuild. See https://github.com/NixOS/nixpkgs/issues/77485
postPatch = ''
substituteInPlace src/org.xfce.power.policy.in2 --replace "@sbindir@" "/run/current-system/sw/bin"
substituteInPlace common/xfpm-brightness.c --replace "SBINDIR" "\"/run/current-system/sw/bin\""
substituteInPlace src/xfpm-suspend.c --replace "SBINDIR" "\"/run/current-system/sw/bin\""
'';
meta = with lib; {
description = "A power manager for the Xfce Desktop Environment";
maintainers = with maintainers; [ ] ++ teams.xfce.members;

3
pkgs/development/coq-modules/coquelicot/default.nix
View File

@ -7,12 +7,13 @@ mkCoqDerivation {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.12" "8.17"; out = "3.3.1"; }
{ case = range "8.12" "8.17"; out = "3.4.0"; }
{ case = range "8.12" "8.17"; out = "3.3.0"; }
{ case = range "8.8" "8.16"; out = "3.2.0"; }
{ case = range "8.8" "8.13"; out = "3.1.0"; }
{ case = range "8.5" "8.9"; out = "3.0.2"; }
] null;
release."3.4.0".sha256 = "sha256-LIj2SwTvVBxSAO58VYCQix/uxQQe8ey6hqFOSh3PNcg=";
release."3.3.1".sha256 = "sha256-YCvd4aIt2BxLKBYSWzN7aqo0AuY7z8oADmKvybhYBQI=";
release."3.3.0".sha256 = "sha256-bh9qP/EhWrHpTe2GMGG3S2vgBSSK088mFfhAIGejVoU=";
release."3.2.0".sha256 = "07w7dbl8x7xxnbr2q39wrdh054gvi3daqjpdn1jm53crsl1fjxm4";

3
pkgs/development/coq-modules/interval/default.nix
View File

@ -7,13 +7,14 @@ mkCoqDerivation rec {
domain = "gitlab.inria.fr";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.12" "8.17"; out = "4.7.0"; }
{ case = range "8.12" "8.17"; out = "4.8.0"; }
{ case = range "8.12" "8.16"; out = "4.6.0"; }
{ case = range "8.8" "8.16"; out = "4.5.2"; }
{ case = range "8.8" "8.12"; out = "4.0.0"; }
{ case = range "8.7" "8.11"; out = "3.4.2"; }
{ case = range "8.5" "8.6"; out = "3.3.0"; }
] null;
release."4.8.0".sha256 = "sha256-YPQ1tuUgGixAVdQUJ9a3lZUNVgm2pKK3RKvl3m+/8rY=";
release."4.7.0".sha256 = "sha256-Cel25w4BeaNqu9KAW3N2KYO2IGY0EOAK5FQ6VHBPmFQ=";
release."4.6.1".sha256 = "sha256-ZZSxt8ksz0g6dl/LEido5qJXgsaxHrVLqkGUHu90+e0=";
release."4.6.0".sha256 = "sha256-n9ECKnV0L6XYcIcbYyOJKwlbisz/RRbNW5YESHo07X0=";

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

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "libzim";
version = "8.2.0";
version = "8.2.1";
src = fetchFromGitHub {
owner = "openzim";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-Xh1SQNmG4lQ3f/g+i5m36LJO9JlPzP4bNqhyyKT7NEA=";
hash = "sha256-bhztigbiIGdVxBV5cpuHuuRGBN5UgC39w51uwLEq47w=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/aiohomekit/default.nix
View File

@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "2.6.11";
version = "2.6.12";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-oTH/YM21l9N03F9zFTOAvxgdG6SyL6qXeeA28jLAOq8=";
hash = "sha256-a1qxj/6VCnTqfcCfvjjnfM53JjJXP672wumGCvXwxUY=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/losant-rest/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "losant-rest";
version = "1.17.5";
version = "1.18.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Losant";
repo = "losant-rest-python";
rev = "v${version}";
hash = "sha256-P3MpnVWjeB2OwqRcm4Wj6GixBDguMOFN227iM+e5Fi8=";
hash = "sha256-wl8L+ZQQgzWb7QUHWHSOT3meCn1baE7Prs1nWAOvnKo=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyschlage/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyschlage";
version = "2023.6.0";
version = "2023.7.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "dknowles2";
repo = "pyschlage";
rev = "refs/tags/${version}";
hash = "sha256-ogYVk0Kvv595IlIa/qdV1lqlnW45IG29PX5EEaMaphw=";
hash = "sha256-PH8ClpuYwTu+34hSPPwI1KMFut6UaxWVrbf38LYb9EQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/python-homewizard-energy/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "python-homewizard-energy";
version = "2.0.1";
version = "2.0.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "DCSBL";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-s3FNRpMZC/MG3s+ZDHgdsIT2AhvBDmGvJfutUPzY4wE=";
hash = "sha256-XTSnIL/hBL1Rsyv/tBce/WCvA3n7mZern0v3i6gTOeA=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/riscv-isac/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "riscv-isac";
version = "0.17.0";
version = "0.18.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "riscv-software-src";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-I0RsvSCrSlNGVj8z+WUQx6vbdNkKCRyMFvNx+0mTBAE=";
hash = "sha256-7CWUyYwzynFq/Qk5SzQB+ljsVVI98kPPDT63Emhqihw=";
};
postPatch = ''

4
pkgs/development/python-modules/types-pillow/default.nix
View File

@ -5,13 +5,13 @@
buildPythonPackage rec {
pname = "types-pillow";
version = "9.5.0.4";
version = "10.0.0.2";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "types-Pillow";
hash = "sha256-8bavR6vRUYR+4lkR/+unhImbx9x/nrqMpqWqxSKwEu8=";
hash = "sha256-/gk4CrItQSztmJoGfp7kr3Gfo6R7obU7IytGUUqHEEI=";
};
# Modules doesn't have tests

6
pkgs/development/tools/efm-langserver/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "efm-langserver";
version = "0.0.44";
version = "0.0.46";
src = fetchFromGitHub {
owner = "mattn";
repo = "efm-langserver";
rev = "v${version}";
sha256 = "sha256-+yN08MAoFaixvt2EexhRNucG6I4v2FdHf44XlYIwzhA=";
sha256 = "sha256-mGcpV4PDD6HJZH+3Lybsds4xPJS5rkOouKqKX7j+7WA=";
};
vendorSha256 = "sha256-KABezphT5/o3XWSFNe2OvfawFR8uwsGMnjsI9xh378Q=";
vendorHash = "sha256-KABezphT5/o3XWSFNe2OvfawFR8uwsGMnjsI9xh378Q=";
subPackages = [ "." ];
meta = with lib; {

6
pkgs/development/tools/misc/circleci-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "circleci-cli";
version = "0.1.27660";
version = "0.1.28084";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bor2rQfyvUD6SYSxYYTTL7TvvFuZ0oZdN0E+HoVCo28=";
sha256 = "sha256-LyD9zAS/tjI6Ad+tC2mCadOEuXHlhkNpF0M5lzli5Qc=";
};
vendorHash = "sha256-Tbce59lQsj6Db0B734PAWiAz9NbLCp43it28j5IJf68=";
vendorHash = "sha256-bPi0voXVJPAMWuovDInzk2PzbP0kPFpyOyjYoPZTNLM=";
nativeBuildInputs = [ installShellFiles ];

30
pkgs/development/tools/rust/cargo-deny/default.nix
View File

@ -2,41 +2,33 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2_1_5
, openssl
, zlib
, zstd
, stdenv
, curl
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
version = "0.13.9";
version = "0.14.0";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = pname;
repo = "cargo-deny";
rev = version;
hash = "sha256-fkbYPn7GmnOgLvJqbizVKKLBnzVn0Ji6jQc23DimIX4=";
hash = "sha256-oNo/I0GblFnOZ6+/SBn31jp+Fywlf7PIpJQnWyPn8hU=";
};
cargoHash = "sha256-WHr2Ky0LlK/EVOrSK3MF9Yt/Qe/6o7Ftx7X8iECj6pM=";
cargoHash = "sha256-DbC9VeJl0OObZNvMkTIp0caiBMlw2EvJ9ib1TCRlJGQ=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libgit2_1_5
openssl
zlib
zstd
] ++ lib.optionals stdenv.isDarwin [
curl
darwin.apple_sdk.frameworks.Security
nativeBuildInputs = [
pkg-config
];
buildNoDefaultFeatures = true;
buildInputs = [
zstd
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;

4
pkgs/os-specific/darwin/airbuddy/default.nix
View File

@ -6,12 +6,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "airbuddy";
version = "2.7";
version = "2.7.1";
src = fetchurl {
name = "AirBuddy.dmg";
url = "https://download.airbuddy.app/WebDownload/AirBuddy_v${finalAttrs.version}.dmg";
hash = "sha256-i/pxRG5o03jh9D46F9s8cSpf8A1aQEb+u3JiPjDlubA=";
hash = "sha256-z8iy3kIBO+1HDgmWxXmFHArLdw85CLNSMvMFZfEJAp0=";
};
dontPatch = true;

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -65,11 +65,11 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
version = "525.47.34";
version = "525.47.35";
persistencedVersion = "525.116.04";
settingsVersion = "525.116.04";
sha256_64bit = "sha256-/QJmOZtzS7mnjWupz1RwVeqDAiqx4nw4xPp6mEGUHlk=";
openSha256 = "sha256-bQ7qW9KOPAxccbBfQs7s+UX4TrIW/eI4CvjIMlLekfo=";
sha256_64bit = "sha256-HnjCHsHHH/fqqyc8dXDx/wQhVkXWoH5Z9jJ+/zQWNFc=";
openSha256 = "sha256-/qkCMybr8sC/Da9zi2KbSkLBeQcSbVURnAg1IbjZiBk=";
settingsSha256 = "sha256-qNjfsT9NGV151EHnG4fgBonVFSKc4yFEVomtXg9uYD4=";
persistencedSha256 = "sha256-ci86XGlno6DbHw6rkVSzBpopaapfJvk0+lHcR4LDq50=";
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";

68
pkgs/servers/mail/stalwart/Cargo.lock generated
View File

@ -697,9 +697,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.3.17"
version = "4.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9"
checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
dependencies = [
"clap_builder",
"clap_derive",
@ -708,9 +708,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.3.17"
version = "4.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e"
checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
dependencies = [
"anstream",
"anstyle",
@ -1029,6 +1029,7 @@ dependencies = [
"argon2",
"async-trait",
"bb8",
"futures",
"ldap3",
"lru-cache",
"mail-builder",
@ -1039,6 +1040,7 @@ dependencies = [
"password-hash 0.5.0",
"pbkdf2 0.12.2",
"pwhash",
"regex",
"rustls 0.21.5",
"scrypt",
"sha1",
@ -1149,9 +1151,9 @@ dependencies = [
[[package]]
name = "either"
version = "1.8.1"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
dependencies = [
"serde",
]
@ -1920,7 +1922,7 @@ dependencies = [
[[package]]
name = "imap"
version = "0.3.1"
version = "0.3.2"
dependencies = [
"ahash 0.8.3",
"dashmap",
@ -2084,7 +2086,7 @@ dependencies = [
[[package]]
name = "jmap"
version = "0.3.1"
version = "0.3.2"
dependencies = [
"aes-gcm",
"aes-gcm-siv",
@ -2280,9 +2282,9 @@ dependencies = [
[[package]]
name = "libz-sys"
version = "1.1.9"
version = "1.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db"
checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
dependencies = [
"cc",
"pkg-config",
@ -2390,7 +2392,7 @@ dependencies = [
[[package]]
name = "mail-server"
version = "0.3.1"
version = "0.3.2"
dependencies = [
"directory",
"imap",
@ -3295,9 +3297,9 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.31"
version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
dependencies = [
"proc-macro2",
]
@ -3522,9 +3524,9 @@ dependencies = [
[[package]]
name = "roaring"
version = "0.10.1"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef0fb5e826a8bde011ecae6a8539dd333884335c57ff0f003fbe27c25bbe8f71"
checksum = "6106b5cf8587f5834158895e9715a3c6c9716c8aefab57f1f7680917191c7873"
dependencies = [
"bytemuck",
"byteorder",
@ -3704,7 +3706,7 @@ checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
dependencies = [
"log",
"ring",
"rustls-webpki 0.101.1",
"rustls-webpki 0.101.2",
"sct",
]
@ -3741,9 +3743,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
version = "0.101.1"
version = "0.101.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e"
checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59"
dependencies = [
"ring",
"untrusted",
@ -3832,9 +3834,9 @@ dependencies = [
[[package]]
name = "security-framework"
version = "2.9.1"
version = "2.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
@ -3845,9 +3847,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
version = "2.9.0"
version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
dependencies = [
"core-foundation-sys",
"libc",
@ -3855,9 +3857,9 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.174"
version = "1.0.176"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1"
checksum = "76dc28c9523c5d70816e393136b86d48909cfb27cecaa902d338c19ed47164dc"
dependencies = [
"serde_derive",
]
@ -3873,9 +3875,9 @@ dependencies = [
[[package]]
name = "serde_derive"
version = "1.0.174"
version = "1.0.176"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e"
checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f"
dependencies = [
"proc-macro2",
"quote",
@ -3884,9 +3886,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.103"
version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
dependencies = [
"itoa",
"ryu",
@ -4002,7 +4004,7 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
[[package]]
name = "sieve-rs"
version = "0.3.1"
source = "git+https://github.com/stalwartlabs/sieve#0ab2dc8cd41ee5dadcc3ab5e932b9b92abc5e067"
source = "git+https://github.com/stalwartlabs/sieve#f9c01ba6947d73855fdd645b17c9a5d347724ee3"
dependencies = [
"ahash 0.8.3",
"bincode",
@ -4055,7 +4057,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
[[package]]
name = "smtp"
version = "0.3.1"
version = "0.3.2"
dependencies = [
"ahash 0.8.3",
"blake3",
@ -4355,7 +4357,7 @@ dependencies = [
[[package]]
name = "stalwart-cli"
version = "0.3.1"
version = "0.3.2"
dependencies = [
"clap",
"console",
@ -4377,7 +4379,7 @@ dependencies = [
[[package]]
name = "stalwart-install"
version = "0.3.1"
version = "0.3.2"
dependencies = [
"base64 0.21.2",
"clap",
@ -5318,7 +5320,7 @@ version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
dependencies = [
"rustls-webpki 0.101.1",
"rustls-webpki 0.101.2",
]
[[package]]

9
pkgs/servers/mail/stalwart/default.nix
View File

@ -9,10 +9,11 @@
, zstd
, stdenv
, darwin
, nix-update-script
}:
let
version = "0.3.1";
version = "0.3.2";
in
rustPlatform.buildRustPackage {
pname = "stalwart-mail";
@ -22,7 +23,7 @@ rustPlatform.buildRustPackage {
owner = "stalwartlabs";
repo = "mail-server";
rev = "v${version}";
hash = "sha256-RLLKZ1nUYv8fCEd6SSIpy7o88Ee5vs5EaPcfulCXiIU=";
hash = "sha256-5+r1xWpxIwyvRUPw2X4vIvbvqUe6lBcYurbxwNySXAY=";
fetchSubmodules = true;
};
@ -35,7 +36,7 @@ rustPlatform.buildRustPackage {
"mail-builder-0.3.0" = "sha256-0o/fV7ZKiRKeitBBt8yOM/2nXIEgOGSMEMaBj+3i7Kw=";
"mail-parser-0.8.2" = "sha256-XvKEgzQ+HDoLI16CmqE/RRgApg0q9Au9sqOOEpZz6W0=";
"mail-send-0.4.0" = "sha256-bMPI871hBj/RvrW4kESGS9XzfnkSo8r2/9uUwgE12EU=";
"sieve-rs-0.3.1" = "sha256-0LE98L7JEc6FObygIsln4Enw2kx8FnLotJ/fXGpc4E8=";
"sieve-rs-0.3.1" = "sha256-FJBQorFRXQYhiCzprAqiv69Qae9YI5OAipjayooFDAw=";
"smtp-proto-0.1.1" = "sha256-HhKZQHQv3tMEfRZgCoAtyxVzwHbcB4FSjKlMoU1PkHg=";
};
};
@ -64,6 +65,8 @@ rustPlatform.buildRustPackage {
# Tests require reading to /etc/resolv.conf
doCheck = false;
passthru.update-script = nix-update-script { };
meta = with lib; {
description = "Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)";
homepage = "https://github.com/stalwartlabs/mail-server";

4
pkgs/shells/zsh/zsh-history-substring-search/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-history-substring-search";
version = "1.0.2";
version = "1.1.0";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-history-substring-search";
rev = "v${version}";
sha256 = "0y8va5kc2ram38hbk2cibkk64ffrabfv1sh4xm7pjspsba9n5p1y";
sha256 = "0vjw4s0h4sams1a1jg9jx92d6hd2swq4z908nbmmm2qnz212y88r";
};
strictDeps = true;

6
pkgs/tools/misc/killport/default.nix
View File

@ -5,14 +5,14 @@
rustPlatform.buildRustPackage rec {
pname = "killport";
version = "0.9.0";
version = "0.9.1";
src = fetchCrate {
inherit pname version;
hash = "sha256-aGnjLgDn86OUFQGj7K7+DUSGJuNEIL52yXJz/Mt5DT0=";
hash = "sha256-aaKvrWJGZ26wyqoblAcUkGUPkbt8XNx9Z4xT+qI2B3o=";
};
cargoHash = "sha256-Z3+hqssm5g7rl3XCnrmjuPhsG8E0Yc2Qg8/mjGlnaT4=";
cargoHash = "sha256-4CUMt5aDHq943uU5PAY1TJtmCqlBvgOruGQ69OG5fB4=";
nativeBuildInputs = [ rustPlatform.bindgenHook ];

4
pkgs/tools/networking/kapp/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kapp";
version = "0.57.1";
version = "0.58.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-kapp";
rev = "v${version}";
sha256 = "sha256-JNo6+WlMcIUGb/36GM6ofvJBIJnF4oRocdYsEw7V1Ks=";
sha256 = "sha256-E5QiR4hcO2Ii5qXAlMrw9Yxy8IYqjnonSGiUUyzhMVc=";
};
vendorHash = null;

13
pkgs/tools/networking/ntp/default.nix
View File

@ -2,18 +2,13 @@
stdenv.mkDerivation rec {
pname = "ntp";
version = "4.2.8p15";
version = "4.2.8p17";
src = fetchurl {
url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz";
sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n";
url = "https://archive.ntp.org/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz";
hash = "sha256-ED3ScuambFuN8H3OXpoCVV/NbxOXvft4IjcyjonTqGY=";
};
patches = [
# From https://patchwork.openembedded.org/patch/180019/
./glibc-2.34-fix.patch
];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
@ -33,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "http://www.ntp.org/";
homepage = "https://www.ntp.org/";
description = "An implementation of the Network Time Protocol";
license = {
# very close to isc and bsd2

28
pkgs/tools/networking/ntp/glibc-2.34-fix.patch
View File

@ -1,28 +0,0 @@
From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 31 Jul 2021 10:51:41 -0700
Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
could mean different stack sizes at runtime on different architectures
and it also causes compile failure. Default glibc thread stack size
or 64Kb set by ntp should be good in glibc these days.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libntp/work_thread.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libntp/work_thread.c b/libntp/work_thread.c
index 03a5647..3ddd751 100644
--- a/libntp/work_thread.c
+++ b/libntp/work_thread.c
@@ -41,7 +41,7 @@
#ifndef THREAD_MINSTACKSIZE
# define THREAD_MINSTACKSIZE (64U * 1024)
#endif
-#ifndef __sun
+#if !defined(__sun) && !defined(__GLIBC__)
#if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
# undef THREAD_MINSTACKSIZE
# define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
--
2.32.0

6
pkgs/tools/networking/proxify/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "proxify";
version = "0.0.9";
version = "0.0.10";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "proxify";
rev = "refs/tags/v${version}";
hash = "sha256-InHo5nfgCLDxciwjaB9tamV6MGEM3DlRGU00Ng2SfVY=";
hash = "sha256-bEAPj72HDiJHTN1WF50ow1OUwwsPhFwAkCvvEqgsVcA=";
};
vendorHash = "sha256-GPkxUU9HXLWnj+qjee/CuSE683l2V22cH9KBP2ssaXc=";
vendorHash = "sha256-ViUMPHj1udvyy19XToq3f7Bj708v6DuBg5k0tMtZmHA=";
meta = with lib; {
description = "Proxy tool for HTTP/HTTPS traffic capture";

4
pkgs/tools/security/vals/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vals";
version = "0.25.0";
version = "0.26.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "variantdev";
repo = pname;
sha256 = "sha256-MofzTQM/dREw9b+IzjvexKoYZZ/ptbdWICROtwYK4X8=";
sha256 = "sha256-gICEqwt34pllvxA8JVc0rCQ2F3w6wT96eKTTxE0j398=";
};
vendorHash = "sha256-6DJiqDEgEHQbyIt4iShoBnagBvspd3W3vD56/FGjESs=";

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

@ -30379,7 +30379,7 @@ with pkgs;
cardo = callPackage ../data/fonts/cardo { };
cage = callPackage ../applications/window-managers/cage {
wlroots = wlroots_0_14;
wlroots = wlroots_0_16;
};
calf = callPackage ../applications/audio/calf {