nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-17 03:39:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt 2023-12-26 14:39:18 +01:00
commit a5b30bdf1d
21 changed files with 151 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maintainers/maintainer-list.nix
View File

@ -1281,9 +1281,11 @@
githubId = 6060545;
matrix = "@anpin:matrix.org";
name = "Pavel Anpin";
keys = [{
fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407";
}];
keys = [
{ fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; }
# compare with https://keybase.io/anpin/pgp_keys.asc
{ fingerprint = "DADF F3EA 06DC 8C1B 100A 24DB 312E 8F17 91C5 DA8C"; }
];
};
anpryl = {
email = "anpryl@gmail.com";

8
pkgs/applications/misc/wttrbar/default.nix
View File

@ -7,18 +7,18 @@
rustPlatform.buildRustPackage rec {
pname = "wttrbar";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "bjesus";
repo = "wttrbar";
rev = version;
hash = "sha256-Qe1Is13RXUIT5JkfuLK3Lj5gxKxVbfA4FCNgkqSTMNE=";
hash = "sha256-AGIUMw4lvYiUJol4VYS+ozNMsCDNGPCsg+fwMlpWEJY=";
};
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ];
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
cargoHash = "sha256-IK6ciz+XtNsC4QsAop7Pf5qjiTCUQa30xnHWW4PobnA=";
cargoHash = "sha256-3FDY0SUl1lb9jUjUj14j/5gF5NoSpS1PMj1AtXr/4Hk=";
meta = {
description = "A simple but detailed weather indicator for Waybar using wttr.in";

86
pkgs/applications/networking/instant-messengers/jami/default.nix
View File

@ -2,7 +2,6 @@
, lib
, pkg-config
, fetchFromGitLab
, fetchpatch
, gitUpdater
, ffmpeg_6
@ -66,14 +65,14 @@ let
in
stdenv.mkDerivation rec {
pname = "jami";
version = "20230619.1";
version = "20231201.0";
src = fetchFromGitLab {
domain = "git.jami.net";
owner = "savoirfairelinux";
repo = "jami-client-qt";
rev = "stable/${version}";
hash = "sha256-gOl4GtGmEvhM8xtlyFvTwXrUsbocUKULnVy9cnCNAM0=";
hash = "sha256-A38JwjqdQVy03d738p2tpTFA6EWRSPNiesS5wZfti7Y=";
fetchSubmodules = true;
};
@ -82,24 +81,16 @@ stdenv.mkDerivation rec {
patch-src = src + "/daemon/contrib/src/pjproject/";
in
rec {
version = "e4b83585a0bdf1523e808a4fc1946ec82ac733d0";
version = "311bd018fc07aaf62d4c2d2494e08b5ee97e6846";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "pjproject";
rev = version;
hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4=";
hash = "sha256-pZiOSOUxAXzMY4c1/AyKcwa7nyIJC/ZVOqDg9/QO/Nk=";
};
patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [
(fetchpatch {
name = "CVE-2023-27585.patch";
url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch";
hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg=";
})
];
patchFlags = [ "-p1" "-l" ];
patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
configureFlags = (readLinesToList ./config/pjsip_args_common)
++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);
@ -110,6 +101,52 @@ stdenv.mkDerivation rec {
enablePushNotifications = true;
};
dhtnet = stdenv.mkDerivation {
pname = "dhtnet";
version = "unstable-2023-11-23";
src = fetchFromGitLab {
domain = "git.jami.net";
owner = "savoirfairelinux";
repo = "dhtnet";
rev = "b1bcdecbac2a41de3941ef5a34faa6fbe4472535";
hash = "sha256-EucSsUuHXbVqr7drrTLK0f+WZT2k9Tx/LV+IBldTQO8=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
asio
fmt
gnutls
http-parser
jsoncpp
libupnp
msgpack
opendht-jami
openssl
pjsip-jami
restinio
];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=Off"
"-DBUILD_BENCHMARKS=Off"
"-DBUILD_TOOLS=Off"
"-DBUILD_TESTING=Off"
];
meta = with lib; {
description = "Lightweight Peer-to-Peer Communication Library";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = [ maintainers.linsui ];
};
};
daemon = stdenv.mkDerivation {
pname = "jami-daemon";
inherit src version meta;
@ -125,6 +162,7 @@ stdenv.mkDerivation rec {
alsa-lib
asio
dbus
dhtnet
sdbus-cpp
fmt
ffmpeg_6
@ -154,13 +192,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
};
postPatch = ''
substituteInPlace src/app/commoncomponents/ModalTextEdit.qml \
--replace 'required property string placeholderText' 'property string placeholderText: ""'
'';
preConfigure = ''
echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h
# Currently the daemon is still built seperately but jami expects it in CMAKE_INSTALL_PREFIX
# This can be removed in future versions when JAMICORE_AS_SUBDIR is on
mkdir -p $out
ln -s ${daemon} $out/daemon
'';
nativeBuildInputs = [
@ -172,7 +209,6 @@ stdenv.mkDerivation rec {
];
buildInputs = [
daemon
ffmpeg_6
libnotify
networkmanager
@ -189,10 +225,7 @@ stdenv.mkDerivation rec {
qtwebengine
];
cmakeFlags = [
"-DLIBJAMI_INCLUDE_DIR=${daemon}/include/jami"
"-DLIBJAMI_XML_INTERFACES_DIR=${daemon}/share/dbus-1/interfaces"
] ++ lib.optionals (!withWebengine) [
cmakeFlags = lib.optionals (!withWebengine) [
"-DWITH_WEBENGINE=false"
];
@ -201,11 +234,6 @@ stdenv.mkDerivation rec {
"--set-default QT_QPA_PLATFORM xcb"
];
postInstall = ''
# Make the jamid d-bus services available
ln -s ${daemon}/share/dbus-1 $out/share
'';
passthru.updateScript = gitUpdater {
rev-prefix = "stable/";
};

4
pkgs/applications/window-managers/cagebreak/default.nix
View File

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "cagebreak";
version = "2.2.1";
version = "2.2.3";
src = fetchFromGitHub {
owner = "project-repo";
repo = pname;
rev = version;
hash = "sha256-cJEJ8V9lDbNb07eY3nWmNcT7ULGlcmOeyb9UDOLGWfI=";
hash = "sha256-ppNzc6ojxF9FkgsqSWBSbtmI9aRc+RGN1R1RQLwCtv0=";
};
nativeBuildInputs = [

6
pkgs/by-name/ek/eksctl/package.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "eksctl";
version = "0.165.0";
version = "0.167.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
hash = "sha256-Gx8HobnE7qAfX79ZSLaN8fki+TQYz6XLyxnoSpvFOyk=";
hash = "sha256-8CxXfjYN9i2AxuKeYmmYN0TQROGkurfmzbqU+aOMbTY=";
};
vendorHash = "sha256-niULedV/9r3PFI69AenGfk3oCTvKE/h6edjW5sgHg3Q=";
vendorHash = "sha256-cuLzn0OZ5VC+RWGsJ8DCdJN8wm0DrsjH55K/cnyuqB8=";
doCheck = false;

6
pkgs/development/libraries/opendht/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "opendht";
version = "2.5.5";
version = "3.1.4";
src = fetchFromGitHub {
owner = "savoirfairelinux";
repo = "opendht";
rev = "v${version}";
sha256 = "sha256-OXLVuyPFlo7VD8f9wAN71p4PZpfM2ISq9UoUiAYEXUQ=";
hash = "sha256-KtsQ25uStmlf7RZLAcabhPMyGbxKxvpR6Vm632+EBvw=";
};
nativeBuildInputs = [
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [
asio
fmt
nettle
gnutls
msgpack
@ -47,7 +48,6 @@ stdenv.mkDerivation rec {
restinio
http-parser
openssl
fmt
] ++ lib.optionals stdenv.isDarwin [
Security
];

4
pkgs/development/libraries/science/math/blas/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "blas";
version = "3.11.0";
version = "3.12.0";
src = fetchurl {
url = "http://www.netlib.org/blas/${pname}-${version}.tgz";
sha256 = "sha256-LZ/e59NhlU/uUyEApQ5gKCbJzBFT+M0Fe6pl7VfpAoM=";
sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0=";
};
passthru = { inherit blas64; };

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "mysqlclient";
version = "2.2.0";
version = "2.2.1";
format = "setuptools";
nativeBuildInputs = [
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-BDaERfnEh9irt6h449I+kj5gcsBKbDIPng3IqC77oU4=";
hash = "sha256-LHrRW4cpOxL9RLR8RoeeyV7GR/RWfoZszXC4M3WE6bI=";
};
meta = with lib; {

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

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pglast";
version = "5.6";
version = "5.7";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-WHFc8rXzdcRrp1U6tAuepQYagFYo8+0WQr8783w/Ql8=";
hash = "sha256-5JYygEthxFvjjbKpzw2CJNAvtrnCqdnR0sbJHhNRYFw=";
};
propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "types-awscrt";
version = "0.19.19";
version = "0.20.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "types_awscrt";
inherit version;
hash = "sha256-hQ1a2V2PM3sV+xVHkPOa8Hf69cCNQ3WP11Dzeah9X3M=";
hash = "sha256-mXeMlS4erhDMelNGhBMAEXcCbJQ0NFvwASC7LqW3kQk=";
};
nativeBuildInputs = [

13
pkgs/development/python-modules/whois/default.nix
View File

@ -1,14 +1,15 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, hatchling
, inetutils
, pythonOlder
}:
buildPythonPackage rec {
pname = "whois";
version = "0.9.27";
format = "setuptools";
version = "0.99.3";
pyproject = true;
disabled = pythonOlder "3.7";
@ -16,15 +17,19 @@ buildPythonPackage rec {
owner = "DannyCork";
repo = "python-whois";
rev = "refs/tags/${version}";
hash = "sha256-hs4iCv2OqwLhTj2H4oijRYIyqXrHmewqgnMtU+3Uup0=";
hash = "sha256-uKAqpxb72fo0DiaChuJvDizq0z/oFSDHWJuK4vuYIzo=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
# whois is needed
inetutils
];
# tests require network access
# Tests require network access
doCheck = false;
pythonImportsCheck = [

4
pkgs/development/tools/analysis/flow/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.224.0";
version = "0.225.1";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
hash = "sha256-HxJRsIjNXbalqfCBnx5yfWhxdgud1nCNlx1WPUJmALU=";
hash = "sha256-tJWq2l5axnukjqJGZwrVF/UDcPdPGDyjol8fs0a777g=";
};
postPatch = ''

6
pkgs/development/web/flyctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.1.134";
version = "0.1.135";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-dkzoSu9Aug1PyYwjVEvoAXPHa4a5tTTd6CaUjs+x9+I=";
hash = "sha256-eQqYfH/qNlUkqd82h8O7kSa/QTL+Y9vRKd3LDqCnnCI=";
};
vendorHash = "sha256-MUsZ/OXPoaHvLLabC0/MvvcYn1VcgDBjiq3kKhyvr6g=";
vendorHash = "sha256-IM4xk+KAimBBR1Mq4ptfA9LbC1YZLErP1XtSEPeGi/c=";
subPackages = [ "." ];

4
pkgs/os-specific/linux/libtraceevent/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libtraceevent";
version = "1.7.3";
version = "1.8.0";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-libtraceevent-${version}.tar.gz";
hash = "sha256-poF+Cqcdj0KIgEJWW7XDAlRLz2/Egi948s1M24ETvBo=";
hash = "sha256-l1x9tiHKhfdetlnn9S/EfpcHDzZqiTOrdFhHQtOC6Do=";
};
postPatch = ''

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

@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "snappymail";
version = "2.29.4";
version = "2.31.0";
src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
sha256 = "sha256-dWWwBee7pfYMo8trX9KnqNaMw+CZe8svj/pjmZnl/qo=";
sha256 = "sha256-5fDHXoa8ra+VDrViG7Xu9yQSAN/a3lL+rz0rVAmCD/0=";
};
sourceRoot = "snappymail";

49
pkgs/servers/sql/postgresql/ext/pg_repack.nix
View File

@ -1,24 +1,54 @@
{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
{ lib
, stdenv
, fetchFromGitHub
, openssl
, postgresql
, postgresqlTestHook
, readline
, testers
, zlib
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pg_repack";
version = "1.4.8";
version = "1.5.0";
buildInputs = [ postgresql openssl zlib readline ];
src = fetchFromGitHub {
owner = "reorg";
repo = "pg_repack";
rev = "ver_${version}";
sha256 = "sha256-Et8aMRzG7ez0uy9wG6qsg57/kPPZdUhb+/gFxW86D08=";
owner = "reorg";
repo = "pg_repack";
rev = "ver_${finalAttrs.version}";
sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c=";
};
installPhase = ''
install -D bin/pg_repack -t $out/bin/
install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/
install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension
install -D lib/{pg_repack--${finalAttrs.version}.sql,pg_repack.control} -t $out/share/postgresql/extension
'';
passthru.tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
};
extension = stdenv.mkDerivation {
name = "plpgsql-check-test";
dontUnpack = true;
doCheck = true;
buildInputs = [ postgresqlTestHook ];
nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.pg_repack ])) ];
postgresqlTestUserOptions = "LOGIN SUPERUSER";
failureHook = "postgresqlStop";
checkPhase = ''
runHook preCheck
psql -a -v ON_ERROR_STOP=1 -c "CREATE EXTENSION pg_repack;"
runHook postCheck
'';
installPhase = "touch $out";
};
};
meta = with lib; {
description = "Reorganize tables in PostgreSQL databases with minimal locks";
longDescription = ''
@ -31,5 +61,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers; [ danbst ];
inherit (postgresql.meta) platforms;
mainProgram = "pg_repack";
};
}
})

6
pkgs/tools/admin/aliyun-cli/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "aliyun-cli";
version = "3.0.189";
version = "3.0.190";
src = fetchFromGitHub {
rev = "v${version}";
owner = "aliyun";
repo = pname;
fetchSubmodules = true;
sha256 = "sha256-XSFIf2/k6uRHTSpvSpFApU+RjS5WlYVFoVJiyOU7Lvg=";
sha256 = "sha256-16mHIvrXtFHmH6Uc2qcBTSltuHDs5jfZ2+hHvUpOjOQ=";
};
vendorHash = "sha256-5Pmd1gQ0nS3h43YXGP4s8uZNQAH30o1s8y8r1nuh6b0=";
vendorHash = "sha256-ZcW0Ab7uPx8XUpo3tSSt2eKjUlRlbiMvrLGJK2StKf8=";
subPackages = [ "main" ];

4
pkgs/tools/misc/esphome/default.nix
View File

@ -16,14 +16,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2023.11.6";
version = "2023.12.5";
pyproject = true;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-9LqZlhCt+7p6tnSHFhbnUzkEOJQDsg/Pd/hgd/Il0ZQ=";
hash = "sha256-ajpYwquVyznIngZKcWxI9Pyiqf4VYcWtGFRZSpi6+3I=";
};
nativeBuildInputs = with python.pkgs; [

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "frp";
version = "0.52.0";
version = "0.53.2";
src = fetchFromGitHub {
owner = "fatedier";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8cpNKXEQI+3VaP1qwXTd5L9y0EKR2LfxrCU5i+K2ptY=";
sha256 = "sha256-/z/pZgB4PepJXXjOBuuq1wHXI2pn/KCxY9cdfANdWGQ=";
};
vendorHash = "sha256-4+qzaSdku6qSqF0eT45sJ1zxw/zXYhxhNgq3WwrBIY0=";
vendorHash = "sha256-mcgHbwdqcIu4BceuQg+Es0dsIpWG0bsIpd056IOxuiY=";
doCheck = false;

4
pkgs/tools/video/bento4/default.nix
View File

@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
pname = "bento4";
version = "1.6.0-640";
version = "1.6.0-641";
src = fetchFromGitHub {
owner = "axiomatic-systems";
repo = "Bento4";
rev = "v${version}";
hash = "sha256-VhlFfNYw3xpAIyWqDyhgXIv3JtpFJH0BL97dFX8diRY=";
hash = "sha256-Qy8D3cbCVHmLAaXtiF64rL2oRurXNCtd5Dsgt0W7WdY=";
};
patches = [

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

@ -41978,7 +41978,6 @@ with pkgs;
btcdeb = callPackage ../applications/blockchains/btcdeb { };
jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
fmt = fmt_9;
# TODO: remove once `udev` is `systemdMinimal` everywhere.
udev = systemdMinimal;
jack = libjack2;
@ -42011,7 +42010,7 @@ with pkgs;
bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { };
cagebreak = callPackage ../applications/window-managers/cagebreak {
wlroots = wlroots_0_16;
wlroots = wlroots_0_17;
};
psftools = callPackage ../os-specific/linux/psftools { };