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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-06-11 06:01:38 +00:00 committed by GitHub
commit 7d7111ffdb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
22 changed files with 118 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
flake.nix
View File

@ -5,14 +5,15 @@
outputs = { self }:
let
jobs = import ./pkgs/top-level/release.nix {
nixpkgs = self;
};
libVersionInfoOverlay = import ./lib/flake-version-info.nix self;
lib = (import ./lib).extend libVersionInfoOverlay;
forAllSystems = lib.genAttrs lib.systems.flakeExposed;
jobs = forAllSystems (system: import ./pkgs/top-level/release.nix {
nixpkgs = self;
inherit system;
});
in
{
lib = lib.extend (final: prev: {
@ -43,12 +44,14 @@
);
});
checks.x86_64-linux = {
tarball = jobs.tarball;
checks = forAllSystems (system: {
tarball = jobs.${system}.tarball;
} // lib.optionalAttrs (self.legacyPackages.${system}.stdenv.isLinux) {
# Test that ensures that the nixosSystem function can accept a lib argument
# Note: prefer not to extend or modify `lib`, especially if you want to share reusable modules
# alternatives include: `import` a file, or put a custom library in an option or in `_module.args.<libname>`
nixosSystemAcceptsLib = (self.lib.nixosSystem {
pkgs = self.legacyPackages.${system};
lib = self.lib.extend (final: prev: {
ifThisFunctionIsMissingTheTestFails = final.id;
});
@ -64,13 +67,13 @@
})
];
}).config.system.build.toplevel;
};
});
htmlDocs = {
nixpkgsManual = jobs.manual;
nixpkgsManual = builtins.mapAttrs (_: jobSet: jobSet.manual) jobs;
nixosManual = (import ./nixos/release-small.nix {
nixpkgs = self;
}).nixos.manual.x86_64-linux;
}).nixos.manual;
};
# The "legacy" in `legacyPackages` doesn't imply that the packages exposed

4
lib/tests/release.nix
View File

@ -24,7 +24,9 @@ in
#
# https://github.com/NixOS/nixpkgs/issues/272591
#
[(import ../../pkgs/test/release {})]
[(import ../../pkgs/test/release {
inherit pkgs lib nix;
})]
;
}

6
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -21,11 +21,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "1.8.4";
version = "1.9.0";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
hash = "sha256-WPzth7HOAbPVJpvN8zSZJGUzsBtACNlwHrHhDPlOScU=";
hash = "sha256-eiRLQZr60BvjqqnoYEY+LswgW6e+S9mTLvBKVCXrCzI=";
};
format = "pyproject";
@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi
omemo-dr qrcode
omemo-dr qrcode sqlalchemy emoji
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
++ lib.optional enableRST docutils
++ extraPythonPackages python3.pkgs;

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

@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "weston";
version = "13.0.2";
version = "13.0.3";
src = fetchurl {
url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz";
hash = "sha256-T+EUAfVe3Dp7Z1/RwJ8VmGAWL6p9PJegpNaCOzHu0Qw=";
hash = "sha256-J/aNluO5fZjare8TogI1ZSSST6OBQY+mcWuRNu8JkJM=";
};
postPatch = ''

4
pkgs/by-name/js/jsoncons/package.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jsoncons";
version = "0.175.0";
version = "0.176.0";
src = fetchFromGitHub {
owner = "danielaparker";
repo = "jsoncons";
rev = "v${finalAttrs.version}";
hash = "sha256-pLOKgZx3f0Jka0Tm3SBC1JlQ2Rc3ViPgmXRbjgF4UXI=";
hash = "sha256-RDF5HL6utM/6wna1TxCefl7X8B1qp6nsEDrguTLrtgA=";
};
nativeBuildInputs = [ cmake ];

26
pkgs/by-name/ma/mako/package.nix
View File

@ -1,7 +1,21 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc
, systemd, pango, cairo, gdk-pixbuf, jq, bash
, wayland, wayland-protocols
, wrapGAppsHook3 }:
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, scdoc
, systemd
, pango
, cairo
, gdk-pixbuf
, jq
, bash
, wayland
, wayland-scanner
, wayland-protocols
, wrapGAppsHook3
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mako";
@ -14,7 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-QtYtondP7E5QXLRnmcaOQlAm9fKXctfjxeUFqK6FnnE=";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 ];
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 wayland-scanner ];
buildInputs = [ systemd pango cairo gdk-pixbuf wayland ];
mesonFlags = [

9
pkgs/development/libraries/gnu-efi/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, pciutils
, gitUpdater }:
, gitUpdater, fwupd-efi, ipxe, refind, syslinux }:
stdenv.mkDerivation rec {
pname = "gnu-efi";
@ -27,10 +27,15 @@ stdenv.mkDerivation rec {
--replace "-Werror" ""
'';
passthru.updateScript = gitUpdater {
passthru = {
updateScript = gitUpdater {
# No nicer place to find latest release.
url = "https://git.code.sf.net/p/gnu-efi/code";
};
tests = {
inherit fwupd-efi ipxe refind syslinux;
};
};
meta = with lib; {
description = "GNU EFI development toolchain";

2
pkgs/development/libraries/mesa/default.nix
View File

@ -270,6 +270,8 @@ self = stdenv.mkDerivation {
(lib.mesonEnable "gallium-va" false)
(lib.mesonEnable "gallium-xa" false)
(lib.mesonEnable "lmsensors" false)
# Don’t build with glvnd support to make sure Mesa builds libGL on Darwin
(lib.mesonEnable "glvnd" false)
] ++ lib.optionals enableOpenCL [
# Clover, old OpenCL frontend
(lib.mesonOption "gallium-opencl" "icd")

8
pkgs/development/php-packages/composer/default.nix
View File

@ -15,13 +15,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "composer";
version = "2.7.6";
version = "2.7.7";
# Hash used by ../../../build-support/php/pkgs/composer-phar.nix to
# use together with the version from this package to keep the
# bootstrap phar file up-to-date together with the end user composer
# package.
passthru.pharHash = "sha256-KdyaGe8zU12wYbMRgLKoM6fPjSz0FFszovg1BId7ugg=";
passthru.pharHash = "sha256-qrlAzVPShaVMUEZYIKIID8txgqS6Hl95Wr+xBBSktL4=";
composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix {
inherit (finalAttrs) version;
@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
owner = "composer";
repo = "composer";
rev = finalAttrs.version;
hash = "sha256-LZwg3PR3zl07Nb6MS8oKkRfjLgqtT/c4sfUOzWE4S+U=";
hash = "sha256-N8el4oyz3ZGIXN2qmpf6Df0SIjuc1GjyuMuQCcR/xN4=";
};
nativeBuildInputs = [ makeBinaryWrapper ];
@ -86,7 +86,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-AyX57oV5Jf8U4B9tEl+b2Rnt/Igu7ockEap0wfN9b2Q=";
outputHash = "sha256-AsuiTDXJs7jN4N/dJr10BT2PH0f6K2CWDvI8zQW5L9c=";
};
installPhase = ''

12
pkgs/development/python-modules/langchain-community/default.nix
View File

@ -29,7 +29,7 @@
buildPythonPackage rec {
pname = "langchain-community";
version = "0.2.1";
version = "0.2.4";
pyproject = true;
disabled = pythonOlder "3.8";
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langchain";
rev = "langchain-community==${version}";
hash = "sha256-h8ZJiQYmyvzaRrEVNS7SamJTq4zY7J1IgYdQiVBFh4I=";
hash = "sha256-rqlYaSfDZIQHCndsnydeR1oeVZNIOH6NAgXeOSdBF5A=";
};
sourceRoot = "${src.name}/libs/community";
@ -83,11 +83,13 @@ buildPythonPackage rec {
updateScript = langchain-core.updateScript;
};
meta = with lib; {
__darwinAllowLocalNetworking = true;
meta = {
description = "Community contributed LangChain integrations";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/community";
changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ natsukium ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
};
}

15
pkgs/development/python-modules/langchain-core/default.nix
View File

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "langchain-core";
version = "0.2.1";
version = "0.2.5";
pyproject = true;
disabled = pythonOlder "3.8";
@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langchain";
rev = "langchain-core==${version}";
hash = "sha256-D0y6kW5bWcCKW2TwVPlZcAUxqADgsOm9fWySAjHYYIg=";
hash = "sha256-EBs6BHxBPBR1TfSyesM2gJJtxgClM6lLXko1qisrz7A=";
};
sourceRoot = "${src.name}/libs/core";
@ -71,6 +71,11 @@ buildPythonPackage rec {
pytestFlagsArray = [ "tests/unit_tests" ];
disabledTests = [
"test_config_traceable_handoff"
"test_config_traceable_async_handoff"
];
passthru = {
updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
@ -84,11 +89,11 @@ buildPythonPackage rec {
'';
};
meta = with lib; {
meta = {
description = "Building applications with LLMs through composability";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core";
changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ natsukium ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
};
}

10
pkgs/development/python-modules/langchain-text-splitters/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "langchain-text-splitters";
version = "0.2.0";
version = "0.2.1";
pyproject = true;
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langchain";
rev = "refs/tags/langchain-text-splitters==${version}";
hash = "sha256-QrgZ0j/YdOgEgLeQNSKjOIwqdr/Izuw9Gh6eKQ/00tQ=";
hash = "sha256-5le+P+7iGjrTetnTHiJilqtc7G7kJbZnEsUgFyF2aQ8=";
};
sourceRoot = "${src.name}/libs/text-splitters";
@ -42,11 +42,11 @@ buildPythonPackage rec {
inherit (langchain-core) updateScript;
};
meta = with lib; {
meta = {
description = "Build context-aware reasoning applications";
homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters";
changelog = "https://github.com/langchain-ai/langchain/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
};
}

10
pkgs/development/python-modules/langchain/default.nix
View File

@ -48,7 +48,7 @@
buildPythonPackage rec {
pname = "langchain";
version = "0.2.1";
version = "0.2.3";
pyproject = true;
disabled = pythonOlder "3.8";
@ -57,7 +57,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langchain";
rev = "refs/tags/langchain==${version}";
hash = "sha256-cLJhdeft9XNLk5njSBaEBSuP31c2VFCJ1ET+ypo6mNY=";
hash = "sha256-9WrWQuZxtl/eBEDdgKCUqT7fYBl6gSsW9rB8tTBqMso=";
};
sourceRoot = "${src.name}/libs/langchain";
@ -164,12 +164,12 @@ buildPythonPackage rec {
updateScript = langchain-core.updateScript;
};
meta = with lib; {
meta = {
description = "Building applications with LLMs through composability";
homepage = "https://github.com/langchain-ai/langchain";
changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ natsukium ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
mainProgram = "langchain-server";
};
}

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "nbxmpp";
version = "4.5.4";
version = "5.0.0";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "gajim";
repo = "python-nbxmpp";
rev = "refs/tags/${version}";
hash = "sha256-n5Pzw8aikzCml+dOhkLoHR0ytFkEb4AYpw/bIpo6Wd4=";
hash = "sha256-WSeY9v1ELIZEWvbVHGZFq+8tZVVPkOwUwQ/4cOh8IwQ=";
};
nativeBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyschlage";
version = "2024.2.0";
version = "2024.6.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "dknowles2";
repo = "pyschlage";
rev = "refs/tags/${version}";
hash = "sha256-kjAV7VHKp7WpT6dNjuzYMTlcXbyIB2MNZQXOckDLWF8=";
hash = "sha256-mfrESWXkGV6r+VNw1dHRpIEtfZsLdsCf3D74ydgcy58=";
};
nativeBuildInputs = [

5
pkgs/kde/plasma/plasma-workspace/default.nix
View File

@ -31,6 +31,11 @@ mkKdeDerivation {
})
];
postInstall = ''
# Prevent patching this shell file, it only is used by sourcing it from /bin/sh.
chmod -x $out/libexec/plasma-sourceenv.sh
'';
extraNativeBuildInputs = [pkg-config spirv-tools];
extraBuildInputs = [
qtsvg

8
pkgs/os-specific/linux/firmware/linux-firmware/source.nix
View File

@ -1,7 +1,7 @@
# This file is autogenerated! Run ./update.sh to regenerate.
{
version = "20240513";
revision = "20240513";
sourceHash = "sha256-8yzs8lgPHG3zbUvlsWSuP1O/4s28dRFbju2c9kbaFsg=";
outputHash = "sha256-LDd6FU1/16X7KoCCDq0yPvwJzK4H9NxHgrEdhEfaUGY=";
version = "20240610";
revision = "20240610";
sourceHash = "sha256-tjDqviOMvrBoEG8+Yn+XqdBlIDfQUX0KK2kpW6/jed8=";
outputHash = "sha256-2VxzN778TLov5N1DPSnnkT7wQnLg85PyKsljZOoSoNM=";
}

2
pkgs/os-specific/linux/syslinux/default.nix
View File

@ -69,6 +69,8 @@ stdenv.mkDerivation {
"sha256-dVzXBi/oSV9vYgU85mRFHBKuZdup+1x1BipJX74ED7E=")
# Fixes build with "modern" gnu-efi
./import-efisetjmp.patch
# Upstream patch: https://www.syslinux.org/archives/2024-February/026903.html
./define-wchar_t.patch
];
postPatch = ''

11
pkgs/os-specific/linux/syslinux/define-wchar_t.patch Normal file
View File

@ -0,0 +1,11 @@
diff --git a/com32/include/stddef.h b/com32/include/stddef.h
index f52d62f3..437b11f2 100644
--- a/com32/include/stddef.h
+++ b/com32/include/stddef.h
@@ -29,4 +29,6 @@
*/
#define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m)))
+typedef short wchar_t;
+
#endif /* _STDDEF_H */

6
pkgs/servers/monitoring/telegraf/default.nix
View File

@ -9,7 +9,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.30.3";
version = "1.31.0";
subPackages = [ "cmd/telegraf" ];
@ -17,10 +17,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
hash = "sha256-B3Eeh3eOYg58NnMpV6f04HFzOtOn/enBqzCJRst6u2U=";
hash = "sha256-bnto39X/Mn8M5YbdM8JSoEPGCb5+UpHS6FPc5Q0kprE=";
};
vendorHash = "sha256-Cudnc5ZyCQUqgao58ww69gfF6tPW6/oGP9zXbuPSTAE=";
vendorHash = "sha256-uyZZnEdAfkCYtgyjgPTLt463kcfdNczOruHaVmA+VIk=";
proxyVendor = true;
ldflags = [

3
pkgs/top-level/release-lib.nix
View File

@ -1,4 +1,5 @@
{ supportedSystems
, system ? builtins.currentSystem
, packageSet ? (import ../..)
, scrubJobs ? true
, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
@ -33,7 +34,7 @@ let
systems
;
pkgs = packageSet (recursiveUpdate { system = "x86_64-linux"; config.allowUnsupportedSystem = true; } nixpkgsArgs);
pkgs = packageSet (recursiveUpdate { inherit system; config.allowUnsupportedSystem = true; } nixpkgsArgs);
hydraJob' = if scrubJobs then hydraJob else id;

3
pkgs/top-level/release.nix
View File

@ -9,6 +9,7 @@
$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
*/
{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
, system ? builtins.currentSystem
, officialRelease ? false
# The platform doubles for which we build Nixpkgs.
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]
@ -54,7 +55,7 @@
let
release-lib = import ./release-lib.nix {
inherit supportedSystems scrubJobs nixpkgsArgs;
inherit supportedSystems scrubJobs nixpkgsArgs system;
};
inherit (release-lib) mapTestOn pkgs;