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] 2024-04-20 06:01:11 +00:00 committed by GitHub
commit 0dd90bc468
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
26 changed files with 890 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/CODEOWNERS vendored
View File

@ -185,17 +185,17 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/lib/licenses.nix @alyssais
# Qt
/pkgs/development/libraries/qt-5 @NixOS/qt-kde
/pkgs/development/libraries/qt-6 @NixOS/qt-kde
/pkgs/development/libraries/qt-5 @K900 @NickCao @SuperSandro2000 @ttuegel
/pkgs/development/libraries/qt-6 @K900 @NickCao @SuperSandro2000 @ttuegel
# KDE / Plasma 5
/pkgs/applications/kde @NixOS/qt-kde
/pkgs/desktops/plasma-5 @NixOS/qt-kde
/pkgs/development/libraries/kde-frameworks @NixOS/qt-kde
/pkgs/applications/kde @K900 @NickCao @SuperSandro2000 @ttuegel
/pkgs/desktops/plasma-5 @K900 @NickCao @SuperSandro2000 @ttuegel
/pkgs/development/libraries/kde-frameworks @K900 @NickCao @SuperSandro2000 @ttuegel
# KDE / Plasma 6
/pkgs/kde @NixOS/qt-kde
/maintainers/scripts/kde @NixOS/qt-kde
/pkgs/kde @K900 @NickCao @SuperSandro2000 @ttuegel
/maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel
# PostgreSQL and related stuff
/pkgs/servers/sql/postgresql @thoughtpolice @marsam

12
maintainers/maintainer-list.nix
View File

@ -6456,6 +6456,12 @@
githubId = 4246921;
name = "Florian Beeres";
};
fccapria = {
email = "francesco@capria.eu";
github = "fccapria";
githubId = 62179193;
name = "Francesco Carmelo Capria";
};
fd = {
email = "simon.menke@gmail.com";
github = "fd";
@ -14810,6 +14816,12 @@
githubId = 127548;
name = "Judson Lester";
};
nyawox = {
name = "nyawox";
email = "nyawox.git@gmail.com";
github = "nyawox";
githubId = 93813719;
};
nzbr = {
email = "nixos@nzbr.de";
github = "nzbr";

10
pkgs/applications/misc/1password/default.nix
View File

@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.26.1";
version = "2.27.0";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-dV3VDPjiA9xKbL4tmDJ6T4B8NmPHBB2aKj3HWNGifr4=" "zip";
i686-linux = fetch "linux_386" "sha256-61zjjg2+UU3cMP+kcn1zXopTdRR2v/Wom3Vtz0/KnUQ=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-2Cq0tbdFpvFYSGRmdPclCw4jqfIKPoixv/gZKkBqgH0=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-NOCRGKF32tAh5HwwYgm+f3el3l1djqvIHNdpR5NsoM8=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-yutS8xSTRABt12+mEyU99R4eCHvuAwWdO40SZlUrtdc=" "zip";
i686-linux = fetch "linux_386" "sha256-juP//g9quhd7GRq5TNm3qAq+rOegGJ9u9F+fmGbfmbw=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-cFQ3lsHBV9fDoNK5ujTummIXA4591meP43KbiyWcbQk=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-fUwiEJxn4JdsViBQU2Odrw+Focp0ngH/RmfmW2Uu0Bo=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;

2
pkgs/applications/misc/orca/default.nix
View File

@ -96,7 +96,7 @@ buildPythonApplication rec {
};
meta = with lib; {
homepage = "https://wiki.gnome.org/Projects/Orca";
homepage = "https://orca.gnome.org/";
description = "Screen reader";
mainProgram = "orca";
longDescription = ''

4
pkgs/applications/science/astronomy/stellarium/default.nix
View File

@ -24,13 +24,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "stellarium";
version = "23.4";
version = "24.1";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${finalAttrs.version}";
hash = "sha256-rDqDs6sFaZQbqJcCRhY5w8sFM2mYHHvw0Ud2Niimg4Y=";
hash = "sha256-t3eFmiG9X2cmnjc/PQwZ2bw1SCHaNRA83wiT1cPbKJc=";
};
patches = [

6
pkgs/by-name/ez/eza/package.nix
View File

@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
version = "0.18.10";
version = "0.18.11";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
hash = "sha256-qXyuibsgEF/wv2736r3EMpoXjyDFI3QFjVRsg9cI0u0=";
hash = "sha256-jh1YmY3G3oL8HfgojGtrJLvgLT+gyTX0fsv/11UDIJ0=";
};
cargoHash = "sha256-9xtJJDP3f4aRPTgnpor0nSp5ehbX7Qt9U3LN9kkDWrI=";
cargoHash = "sha256-4ziEG7P7igCkN6UnVqaWXgqfW+XssUP4Rn867ELXYmU=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]

41
pkgs/by-name/fo/fork-cleaner/package.nix Normal file
View File

@ -0,0 +1,41 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
let
version = "2.3.1";
in
buildGoModule {
name = "fork-cleaner";
inherit version;
src = fetchFromGitHub {
owner = "caarlos0";
repo = "fork-cleaner";
rev = "v${version}";
sha256 = "sha256-JNmpcDwmxR+s4regOWz8FAJllBNRfOCmVwkDs7tlChA=";
};
vendorHash = "sha256-QuIaXXkch5PCpX8P755X8j7MeNnbewWo7NB+Vue1/Pk=";
# allowGoRefence adds the flag `-trimpath` which is also denoted by, fork-cleaner goreleaser config
# <https://github.com/caarlos0/fork-cleaner/blob/645345bf97d751614270de4ade698ddbc53509c1/goreleaser.yml#L38>
allowGoReference = true;
ldflags = [
"-s"
"-w"
"-X main.version=${version}"
"-X main.builtBy=nixpkgs"
];
meta = {
description = "Quickly clean up unused forks on your GitHub account";
homepage = "https://github.com/caarlos0/fork-cleaner";
changelog = "https://github.com/caarlos0/fork-cleaner/releases/tag/${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ isabelroses ];
mainProgram = "fork-cleaner";
};
}

35
pkgs/by-name/po/poppins/package.nix Normal file
View File

@ -0,0 +1,35 @@
{
lib,
stdenvNoCC,
fetchFromGitHub,
unzip,
}:
stdenvNoCC.mkDerivation rec {
pname = "poppins";
version = "4.003";
src = fetchFromGitHub {
owner = "itfoundry";
repo = "poppins";
rev = "v${version}";
hash = "sha256-7+RQHYxNFqOw2EeS2hgrbK/VbUAiPorUtkyRb5MFh5w=";
};
nativeBuildInputs = [unzip];
installPhase = ''
runHook preInstall
unzip products/Poppins-4.003-GoogleFonts-TTF.zip
unzip products/PoppinsLatin-5.001-Latin-TTF.zip
install -Dm644 *.ttf -t $out/share/fonts/truetype
runHook postInstall
'';
meta = {
description = "A Devanagari + Latin family for Google Fonts";
homepage = "https://github.com/itfoundry/Poppins/";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [nyawox];
platforms = lib.platforms.all;
};
}

6
pkgs/by-name/pr/proto/package.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "proto";
version = "0.34.3";
version = "0.34.4";
src = fetchFromGitHub {
owner = "moonrepo";
repo = pname;
rev = "v${version}";
hash = "sha256-4stIazXr7+P6gF98NTWQoVW52ov9tQ1DQjPPuN7ssLU=";
hash = "sha256-sh4EeK9LGY1t7BDWV31pOjp6CYhOIRR/wCb6LAv68ok=";
};
cargoHash = "sha256-lijDw55F7QBPqA17CPoee5unW/++LXo3Gbn24C7FLi8=";
cargoHash = "sha256-PU6r6Iwv00TLhAZSt9hERWvCgpC27Cuf3rrsjN1gO5k=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration

47
pkgs/by-name/sa/sandbar/package.nix Normal file
View File

@ -0,0 +1,47 @@
{
lib,
stdenv,
fetchFromGitHub,
pixman,
fcft,
pkg-config,
wayland-protocols,
wayland-scanner,
wayland
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sandbar";
version = "0.1";
src = fetchFromGitHub {
owner = "kolunmi";
repo = "sandbar";
rev = "v${finalAttrs.version}";
hash = "sha256-uG+/e75s/OQtEotR+8aXTEjW6p3oJM8btuRNgUVmIiQ=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
wayland-scanner
wayland-protocols
wayland
pixman
fcft
];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://github.com/kolunmi/sandbar";
description = "DWM-like bar for the river wayland compositor";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fccapria ];
platforms = platforms.all;
badPlatforms = platforms.darwin;
mainProgram = "sandbar";
};
})

1051
pkgs/by-name/uv/uv/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
pkgs/by-name/uv/uv/package.nix
View File

@ -12,20 +12,20 @@
rustPlatform.buildRustPackage rec {
pname = "uv";
version = "0.1.24";
version = "0.1.34";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = version;
hash = "sha256-XsBTfe2+J5CGdjYZjhgxiP20OA7+VTCvD9JniLOjhKs=";
hash = "sha256-B0UvQM1A1DRPb59HcLMNZo4r86lF4fcI+R8/fLWHkHM=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0=";
"pubgrub-0.2.1" = "sha256-SdgxoJ37cs+XwWRCFX4uKhJ9Juu9R/jENb6tzUMam4k=";
"async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs=";
"pubgrub-0.2.1" = "sha256-sqC7R2mtqymYFULDW0wSbM/MKCZc8rP7Yy/gaQpjYEI=";
};
};

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

@ -13,14 +13,15 @@
, cmocka
, wafHook
, libxcrypt
, testers
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ldb";
version = "2.9.0";
src = fetchurl {
url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
url = "mirror://samba/ldb/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
hash = "sha256-EFqv9xrYgaf661gv1BauKCIbb94zj/+CgoBlBiwlB6U=";
};
@ -70,11 +71,16 @@ stdenv.mkDerivation rec {
stripDebugList = [ "bin" "lib" "modules" ];
passthru.tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
meta = with lib; {
broken = stdenv.isDarwin;
description = "A LDAP-like embedded database";
homepage = "https://ldb.samba.org/";
license = licenses.lgpl3Plus;
pkgConfigModules = [ "ldb" ];
platforms = platforms.all;
};
}
})

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

@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "anywidget";
version = "0.9.6";
version = "0.9.7";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-nhDPAXwcsxwrTBG1kEBj77bDXMb3j/Xckk3FENjCS5E=";
hash = "sha256-mepiQbJVtIHgzEhnjy8MjBOEMYLvlpLJ/wzMSm3+2bE=";
};
# We do not need the jupyterlab build dependency, because we do not need to

21
pkgs/development/python-modules/ipyniivue/default.nix
View File

@ -4,37 +4,32 @@
, pythonOlder
, hatchling
, hatch-jupyter-builder
, ipywidgets
, jupyter-ui-poll
, anywidget
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "ipyniivue";
version = "1.1.0";
format = "pyproject";
version = "2.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-kym7949VI6C+62p3IOQ2QIzWnuSBcrmySb83oqUwhjI=";
hash = "sha256-CvMSUvPyXxPexs0/0sa/xt65RFWtvmYZwGSMIQGvLkc=";
};
# We do not need the jupyterlab build dependency, because we do not need to
# We do not need the build hooks, because we do not need to
# build any JS components; these are present already in the PyPI artifact.
#
postPatch = ''
substituteInPlace pyproject.toml \
--replace '"jupyterlab==3.*",' ""
'';
env.HATCH_BUILD_NO_HOOKS = true;
nativeBuildInputs = [
build-system = [
hatchling
hatch-jupyter-builder
];
propagatedBuildInputs = [ ipywidgets jupyter-ui-poll ];
dependencies = [ anywidget ];
nativeCheckImports = [ pytestCheckHook ];
pythonImportsCheck = [ "ipyniivue" ];

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

@ -64,6 +64,10 @@ buildPythonPackage rec {
export HOME=$TEMP
'';
pytestFlagsArray = [
"-Wignore::DeprecationWarning"
];
disabledTests = [
# ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
"test_dirty"

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

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "jupyter-lsp";
version = "2.2.4";
version = "2.2.5";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-XlADMUk0QGU0jmiGCPPG1lTvBtmFa2dlW9e2usnuLVk=";
hash = "sha256-eTFHoFrURvgJ/VPvHNGan1JW/Qota3zpQ6mCy09UUAE=";
};
nativeBuildInputs = [

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

@ -34,14 +34,14 @@
buildPythonPackage rec {
pname = "jupyter-server";
version = "2.13.0";
version = "2.14.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "jupyter_server";
inherit version;
hash = "sha256-yAv7BJ6iAFPD2WQcKt1ISLOAc7958XKc6h+u0y/Bx44=";
hash = "sha256-ZZFUzqUSCDQ0/XyTt/4Il696L9C53UdJKCtC6qxK5nc=";
};
nativeBuildInputs = [

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

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "notebook";
version = "7.1.2";
version = "7.1.3";
disabled = pythonOlder "3.8";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-78LIAEOQng+qF/zp6bN8BZwDrw7Jmk1NuEyyHZ0uk2o=";
hash = "sha256-Qfzr/0TPe7k3cYCAi8uuBmYptV2MdyLx6751ykT5z8E=";
};
postPatch = ''

4
pkgs/development/r-modules/default.nix
View File

@ -1353,6 +1353,10 @@ let
'';
});
rgoslin = old.rgoslin.overrideAttrs (attrs: {
patches = [ ./patches/rgoslin.patch ];
});
rpanel = old.rpanel.overrideAttrs (attrs: {
preConfigure = ''
export TCLLIBPATH="${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"

12
pkgs/development/r-modules/patches/rgoslin.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/src/cppgoslin/cppgoslin/domain/StringFunctions.h b/src/cppgoslin/cppgoslin/domain/StringFunctions.h
index 70e8544..de5c040 100644
--- a/src/cppgoslin/cppgoslin/domain/StringFunctions.h
+++ b/src/cppgoslin/cppgoslin/domain/StringFunctions.h
@@ -35,6 +35,7 @@ SOFTWARE.
#include "cppgoslin/domain/Element.h"
#include <algorithm>
#include <cctype>
+#include <cstdint>
#define contains_val(X, Y) ((X).find(Y) != (X).end())

4
pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.115.3";
version = "0.116.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-kO2RgT5Y3fvayiYSFZsiHNwmOpIrNvNuD3BzbvhNRvg=";
sha256 = "sha256-cij6Yw8UEPDHsm9Oy809PWxfPpbCGXUFRALKFH80pqM=";
};
vendorHash = "sha256-tkKxg08uL1vlOyD/tpRLzjHpOVWOmYZxcq8B+Q7/3Zo=";

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

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "1.156.3";
version = "1.162.6";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
hash = "sha256-mNWM+EKd6RVnh82aoKkqV8nOu9IZHslvE1qovkvo5yQ=";
hash = "sha256-BCJlYutgfHlJqUR1W/yWHkc/trszUuZZmgMMGd1XdFU=";
};
vendorHash = "sha256-8V4rg7rKmogzZNPdNBhllxU4aDTQrSzabb5hDHqp+lU=";
vendorHash = "sha256-n69PwTcjEWqLetcRUM1YFkovYsE90Q3WaoBr4L/IwQU=";
ldflags = [
"-s"

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

@ -35,6 +35,7 @@
, python3Packages
, nixosTests
, libiconv
, testers
, enableLDAP ? false, openldap
, enablePrinting ? false, cups
@ -60,12 +61,12 @@ let
inherit python;
};
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "samba";
version = "4.20.0";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
url = "mirror://samba/pub/samba/stable/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
hash = "sha256-AmclQlEKxuXQyRwMFNkKtObsOXxwnpUsbaOm4LTVpC8=";
};
@ -239,8 +240,15 @@ stdenv.mkDerivation rec {
lib.optionals (buildPackages.python3Packages.python != python3Packages.python)
[ buildPackages.python3Packages.python ];
passthru = {
tests.samba = nixosTests.samba;
passthru.tests = {
samba = nixosTests.samba;
pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
version = testers.testVersion {
command = "${finalAttrs.finalPackage}/bin/smbd -V";
package = finalAttrs.finalPackage;
};
};
meta = with lib; {
@ -250,5 +258,20 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
broken = enableGlusterFS;
maintainers = with maintainers; [ aneeshusa ];
pkgConfigModules = [
"dcerpc_samr"
"dcerpc"
"ndr_krb5pac"
"ndr_nbt"
"ndr_standard"
"ndr"
"netapi"
"samba-credentials"
"samba-hostconfig"
"samba-util"
"samdb"
"smbclient"
"wbclient"
];
};
}
})

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "copilot-cli";
version = "1.33.2";
version = "1.33.3";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
hash = "sha256-+1ri9l6ngNIMFYg+n0wDluqZ6/Zl3it4yPOBglk/0JU=";
hash = "sha256-WPPEox4NKFsVUpLkXawCK2QFwW1BAFaxQ85elvrneHo=";
};
vendorHash = "sha256-HoiBg32L+aRsdDXFOvwZFURV2RttLIGuOOjB8lcYGXU=";
vendorHash = "sha256-tVZ8TxJ77Qy+wn+O0otjZ6/VoKkav4OhNKWcrLhudgU=";
nativeBuildInputs = [ installShellFiles ];

15
pkgs/tools/system/acpica-tools/default.nix
View File

@ -1,17 +1,19 @@
{ lib
, stdenv
, fetchurl
, fetchFromGitHub
, bison
, flex
}:
stdenv.mkDerivation rec {
pname = "acpica-tools";
version = "20230628";
version = "20240322";
src = fetchurl {
url = "https://downloadmirror.intel.com/783534/acpica-unix-${version}.tar.gz";
hash = "sha256-hodqdF49Ik3P0iLtPeRltHVZ6FgR3y25gg7wmp3/XM4=";
src = fetchFromGitHub {
owner = "acpica";
repo = "acpica";
rev = "refs/tags/G${version}";
hash = "sha256-k5rDaRKYPwdP4SmEXlrqsA2NLZDlqXBclz1Lwmufa2M=";
};
nativeBuildInputs = [ bison flex ];
@ -29,9 +31,6 @@ stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE = toString ([
"-O3"
] ++ lib.optionals (stdenv.cc.isGNU) [
# Needed with GCC 12
"-Wno-dangling-pointer"
]);
enableParallelBuilding = true;