gador/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:
nixpkgs-ci[bot]
2025-10-21 06:06:18 +00:00
committed by GitHub
parent 4fa29a8513 956f93135f
commit 65a2cad20c
33 changed files with 218 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release-notes/rl-2511.section.md
View File

@@ -306,6 +306,8 @@
- `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support.
- `plasma6`: Fixed the `ksycoca` cache not being re-built when `$XDG_CACHE_HOME` is set to something that isn't `$HOME/.cache`.
## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

6
maintainers/maintainer-list.nix
View File

@@ -14431,6 +14431,12 @@
githubId = 4701504;
name = "James Robinson";
};
leha44581 = {
email = "leha55481@gmail.com";
github = "Leha44581";
githubId = 70238465;
name = "Leha";
};
leifhelm = {
email = "jakob.leifhelm@gmail.com";
github = "leifhelm";

2
nixos/modules/services/desktop-managers/plasma6.nix
View File

@@ -20,7 +20,7 @@ let
activationScript = ''
# will be rebuilt automatically
rm -fv "$HOME/.cache/ksycoca"*
rm -fv "''${XDG_CACHE_HOME:-$HOME/.cache}/ksycoca"*
'';
in
{

10
pkgs/applications/emulators/wine/sources.nix
View File

@@ -133,9 +133,9 @@ rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "10.15";
version = "10.17";
url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
hash = "sha256-MH4hI3xui96iZvlG0x8J7SexlX35oDUW2Ccf0T4cJh0=";
hash = "sha256-u/jn3jLOqf4wU2HUr4XjBJIlTEvwIDnuJtrHpmcBtOY=";
patches = [
# Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +145,7 @@ rec {
# see https://gitlab.winehq.org/wine/wine-staging
staging = fetchFromGitLab {
inherit version;
hash = "sha256-VzHM4Qm0XDP7suCT5dmJgoDJmZ1DLg6qqOUVQzNc0g4=";
hash = "sha256-fTEzj3o7A9H9jIh3yhw8SCfNsnVeJ6pyL3jERqhVbr8=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine-staging";
@@ -168,9 +168,9 @@ rec {
## see http://wiki.winehq.org/Mono
mono = fetchurl rec {
version = "10.2.0";
version = "10.3.0";
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
hash = "sha256-Th7T8C6S0FMTPQPd++/PbbSk3CMamu0zZ7FxF6iIR9g=";
hash = "sha256-zs5cYxgAlN/98B0PvjYqS2BuUoC5jN/RuFaM35tXL5g=";
};
updateScript = writeShellScript "update-wine-unstable" ''

4
pkgs/applications/misc/zathura/core/default.nix
View File

@@ -32,11 +32,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zathura";
version = "0.5.12";
version = "0.5.13";
src = fetchurl {
url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";
hash = "sha256-6Ehw+/lrdmuCJKPzps58z6Nu+jtpGcyKL792XqTf5HY=";
hash = "sha256-YwIXO81G+JflIJyIOltRrR2rSUbC84YcujdKO4DY88E=";
};
outputs = [

45
pkgs/by-name/au/audiomatch/package.nix Normal file
View File

@@ -0,0 +1,45 @@
{
lib,
chromaprint,
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonPackage rec {
version = "0.2.2";
pname = "audiomatch";
pyproject = true;
src = fetchFromGitHub {
owner = "unmade";
repo = "audiomatch";
tag = version;
hash = "sha256-I7gTP2lwg4EDNmI+tVmI721/nEDShb7q21tD9tRbskY=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'poetry>=0.12,<1.0' "poetry-core" \
--replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api'
substituteInPlace src/audiomatch/fingerprints.py \
--replace-fail 'fpcalc' '${lib.getExe chromaprint}'
'';
build-system = [
python3Packages.poetry-core
python3Packages.distutils
];
nativeCheckInputs = [
python3Packages.pytestCheckHook
];
meta = {
homepage = "https://github.com/unmade/audiomatch";
description = "A small command-line tool to find similar audio files";
changelog = "https://github.com/unmade/audiomatch/releases/tag/${version}";
license = lib.licenses.mit;
platforms = lib.platforms.all;
mainProgram = "audiomatch";
maintainers = with lib.maintainers; [ leha44581 ];
};
}

4
pkgs/by-name/cl/cljfmt/package.nix
View File

@@ -8,11 +8,11 @@
buildGraalvmNativeImage (finalAttrs: {
pname = "cljfmt";
version = "0.13.4";
version = "0.14.0";
src = fetchurl {
url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar";
hash = "sha256-i6ZUhN7gwADw0tZFPOjiGpC/po8us5QSAJAW7n3LgIU=";
hash = "sha256-A12co+7Ux9rGCcBMRMqwTH7s4hllfs0Ku/+HFQJ4XGE=";
};
extraNativeImageBuildArgs = [

10
pkgs/by-name/db/dbeaver-bin/package.nix
View File

@@ -18,7 +18,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbeaver-bin";
version = "25.2.2";
version = "25.2.3";
src =
let
@@ -31,10 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
aarch64-darwin = "macos-aarch64.dmg";
};
hash = selectSystem {
x86_64-linux = "sha256-e0xIFoDmhX1+VetCEJoDZqu6+wrFwTwgIzU8hQ/mXnI=";
aarch64-linux = "sha256-80HW2GGBAuCYo+fxz+XZG3sZm0/QW5krHLS4jSGgGvU=";
x86_64-darwin = "sha256-w1b22Uce2PmX3f6UMrrkVxSxT/E5rFhiSgb3PjYaYvY=";
aarch64-darwin = "sha256-oQ10VB4puNBxFcFRdOtFFF+FcN9I7CUbWMc56V1Z90E=";
x86_64-linux = "sha256-tOUOZP+A3vB73xvAj+OEvCR+APbwlKLwZN9iJYi/W7c=";
aarch64-linux = "sha256-yQ6+kZP22CtdaKQiRgWoYvUDMLz1mdlV3AWC+nKQVBI=";
x86_64-darwin = "sha256-tIkAkBcnF37sZV2ZHSgqe3PnAqSoU7iYRu8tNZ8fhfE=";
aarch64-darwin = "sha256-imkW4Dz8qWjIKLT6CvdjhIjWpEmfKk1MWVh5+NGujb4=";
};
in
fetchurl {

6
pkgs/by-name/ed/edk2/package.nix
View File

@@ -33,14 +33,14 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "edk2";
version = "202508";
version = "202508.01";
srcWithVendoring = fetchFromGitHub {
owner = "tianocore";
repo = "edk2";
tag = "edk2-stable${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-YZcjPGPkUQ9CeJS9JxdHBmpdHsAj7T0ifSZWZKyNPMk=";
hash = "sha256-BgNNKA+YFeaZDm1mLzBN3VA7RAwNT9MXV3JX5ZLrFOo=";
};
src = applyPatches {
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
#!nix-shell -i bash -p common-updater-scripts coreutils gnused
set -eu -o pipefail
version="$(list-git-tags --url="${finalAttrs.srcWithVendoring.url}" |
sed -E --quiet 's/^edk2-stable([0-9]{6})$/\1/p' |
sed -E --quiet 's/^edk2-stable([0-9\\.]+)$/\1/p' |
sort --reverse --numeric-sort |
head -n 1)"
if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then

6
pkgs/by-name/im/immich-public-proxy/package.nix
View File

@@ -8,17 +8,17 @@
}:
buildNpmPackage rec {
pname = "immich-public-proxy";
version = "1.13.2";
version = "1.13.7";
src = fetchFromGitHub {
owner = "alangrainger";
repo = "immich-public-proxy";
tag = "v${version}";
hash = "sha256-AoRqlTEwcS+RhN59/opqlYAftihmN20mW6Vn6RbLzSw=";
hash = "sha256-XENy/zmH4UzUaqE4doiSNmTrbrsTMrd/hlhbanEhg6k=";
};
sourceRoot = "${src.name}/app";
npmDepsHash = "sha256-ZH1D0Q5SCoOwr8CLe2HLMy4xJoO3VLha4MfE9fBmhec=";
npmDepsHash = "sha256-T3YPIvK5h3XmCTLybzY1fhjlB2u2fLdeOHiGbT3Xgd4=";
# patch in absolute nix store paths so the process doesn't need to cwd in $out
postPatch = ''

5
pkgs/by-name/li/libclipboard/package.nix
View File

@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-553hNG8QUlt/Aff9EKYr6w279ELr+2MX7nh1SKIklhA=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
'';
buildInputs = [
libxcb
libXau

4
pkgs/by-name/li/linyaps-box/package.nix
View File

@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "linyaps-box";
version = "2.1.1";
version = "2.1.2";
src = fetchFromGitHub {
owner = "OpenAtom-Linyaps";
repo = "linyaps-box";
rev = finalAttrs.version;
hash = "sha256-h7tbjIcVgwTw3SLGzJzG17WpDdsCqHD4AXvAFEiwesw=";
hash = "sha256-i4wSddstCosDpBEcunoVsV464PTHmuvDDEFrsPQKnxU=";
};
nativeBuildInputs = [

4
pkgs/by-name/mp/mpd/package.nix
View File

@@ -197,13 +197,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "mpd";
version = "0.24.5";
version = "0.24.6";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-MgepOQeOl+n65+7b8zXe2u0fCHFAviSqL1aNu2iSXiM=";
sha256 = "sha256-KAyTDfe3bEFWwImNaTOgq0jAs49kH8H+8ZJPQipN4QA=";
};
buildInputs = [

14
pkgs/by-name/mu/mullvad-browser/package.nix
View File

@@ -97,7 +97,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "14.5.7";
version = "14.5.8";
sources = {
x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-/PR0CDQByiUWlU5lP8QlJ7IQUWiXGTwrZbn9Cbe5xEg=";
hash = "sha256-82Y1QpnvXFKEXQtgUHCGh+2KYytbA+B1YwF0OtfvtSA=";
};
};
@@ -296,12 +296,12 @@ stdenv.mkDerivation rec {
};
};
meta = with lib; {
meta = {
description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad";
mainProgram = "mullvad-browser";
homepage = "https://mullvad.net/en/browser";
platforms = attrNames sources;
maintainers = with maintainers; [
platforms = lib.attrNames sources;
maintainers = with lib.maintainers; [
felschr
panicgh
sigmasquadron
@@ -309,12 +309,12 @@ stdenv.mkDerivation rec {
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain
# restrictions on redistribution), it's free enough for our purposes.
license = with licenses; [
license = with lib.licenses; [
mpl20
lgpl21Plus
lgpl3Plus
free
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
}

27
pkgs/by-name/qu/quiet/package.nix
View File

@@ -5,11 +5,15 @@
appimageTools,
makeWrapper,
_7zz,
writeShellScript,
curl,
jq,
common-updater-scripts,
}:
let
pname = "quiet";
version = "6.0.0";
version = "6.3.0";
meta = {
description = "Private, p2p alternative to Slack and Discord built on Tor & IPFS";
@@ -19,25 +23,36 @@ let
maintainers = with lib.maintainers; [ kashw2 ];
};
passthru.updateScript = writeShellScript "update-quiet" ''
latestVersion=$(${lib.getExe curl} --fail --location --silent https://api.github.com/repos/TryQuiet/quiet/releases/latest | ${lib.getExe jq} '.tag_name | ltrimstr("@quiet/desktop@")' --raw-output)
currentVersion=$(nix eval --raw --file . quiet.version)
if [[ "$latestVersion" == "$currentVersion" ]]; then
exit 0
fi
${lib.getExe' common-updater-scripts "update-source-version"} quiet $latestVersion --system=x86_64-linux --ignore-same-hash
hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . quiet.src.url --system aarch64-darwin)))
${lib.getExe' common-updater-scripts "update-source-version"} quiet $latestVersion $hash --system=aarch64-darwin --ignore-same-version --ignore-same-hash
'';
linux = appimageTools.wrapType2 {
inherit pname version;
inherit pname version passthru;
src = fetchurl {
url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.AppImage";
hash = "sha256-YIkbS3L6DIof9gsgHKaguHIwGggVLjQXPM8o7810Wgs=";
hash = "sha256-LRUm2QMYg2oD6USOUYRyNUDf1VHu2txsaCUhbi1Ar5o=";
};
meta = meta // {
platforms = lib.platforms.linux;
platforms = [ "x86_64-linux" ];
};
};
darwin = stdenv.mkDerivation {
inherit pname version;
inherit pname version passthru;
src = fetchurl {
url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.dmg";
hash = "sha256-B1rT+6U0gjScr1FPuh3xGxkpfumT/8feTJbEbCgXPpo=";
hash = "sha256-T3EDgQ2DhYttbRjAklhw/C4paUzkdEx6i6Gi+Jx1N+w=";
};
nativeBuildInputs = [

16
pkgs/by-name/ra/raffi/package.nix
View File

@@ -7,23 +7,25 @@
additionalPrograms ? [ ],
}:
rustPlatform.buildRustPackage rec {
rustPlatform.buildRustPackage (finalAttrs: {
pname = "raffi";
version = "0.8.2";
version = "0.9.0";
src = fetchFromGitHub {
owner = "chmouel";
repo = "raffi";
rev = "v${version}";
hash = "sha256-97gZZp2taX800Izhya4mYzS4PtCNCBbRnrn6cm1w8zY=";
tag = "v${finalAttrs.version}";
hash = "sha256-k0NJEv76f33yd+mtCJ7bxzaT3UAn0TOaLC/HlzEXUyo=";
};
cargoHash = "sha256-1n0JQdeExszuGFbpkBRT44eMov/x3BrIeofObdPNNdU=";
cargoHash = "sha256-udXVIV6qDmpLR2QNF+/h69WNGbe7QRDD5YWQ3Sl5Ol0=";
nativeBuildInputs = [
makeBinaryWrapper
];
checkFlags = [ "--skip=tests::test_read_config_from_reader" ];
postFixup = ''
wrapProgram $out/bin/raffi \
--prefix PATH : ${lib.makeBinPath ([ fuzzel ] ++ additionalPrograms)}
@@ -32,10 +34,10 @@ rustPlatform.buildRustPackage rec {
meta = {
description = "Fuzzel launcher based on yaml configuration";
homepage = "https://github.com/chmouel/raffi";
changelog = "https://github.com/chmouel/raffi/releases/tag/v${version}";
changelog = "https://github.com/chmouel/raffi/releases/tag/v${finalAttrs.version}";
license = with lib.licenses; [ asl20 ];
maintainers = with lib.maintainers; [ aos ];
mainProgram = "raffi";
platforms = lib.platforms.linux;
};
}
})

6
pkgs/by-name/sp/speedscope/package.nix
View File

@@ -7,13 +7,13 @@
buildNpmPackage rec {
pname = "speedscope";
version = "1.23.1";
version = "1.24.0";
src = fetchFromGitHub {
owner = "jlfwong";
repo = "speedscope";
tag = "v${version}";
hash = "sha256-PIyx4ceihTSLRDP5MW3n6edtYNFOnx8Uo7qUWW7LTs8=";
hash = "sha256-QL+Hm3ujfZeKHMoNgQdxYStgWOIbxjDmXMHKnWddTfs=";
# scripts/prepack.sh wants to extract the git commit from .git
# We don't want to keep .git for reproducibility reasons, so save the commit
@@ -25,7 +25,7 @@ buildNpmPackage rec {
'';
};
npmDepsHash = "sha256-xpFrkKAaFbVE1zJ/haibQte4HjUWmeBR8BVjZuSoyjI=";
npmDepsHash = "sha256-MgCIiVeq9w5XRPIsZ/9AbZpVwRQdzZgK7VC5Gl7cn78=";
patches = [
./fix-shebang.patch

13
pkgs/by-name/yu/yutto/package.nix
View File

@@ -3,12 +3,11 @@
python3Packages,
fetchFromGitHub,
ffmpeg,
nix-update-script,
}:
python3Packages.buildPythonApplication rec {
pname = "yutto";
version = "2.0.3";
version = "2.1.0";
pyproject = true;
pythonRelaxDeps = true;
@@ -17,21 +16,21 @@ python3Packages.buildPythonApplication rec {
owner = "yutto-dev";
repo = "yutto";
tag = "v${version}";
hash = "sha256-giwCLA9M1XR0neLJVfO017Q1wK34yVQpOxUzgShDJL0=";
hash = "sha256-A9LM+hdev9/vH4HV2DUhpiA2XqvXYxtSUt2dyUnZwsU=";
};
build-system = with python3Packages; [ hatchling ];
build-system = with python3Packages; [ uv-build ];
dependencies =
with python3Packages;
[
httpx
aiofiles
biliass
dict2xml
colorama
httpx
typing-extensions
pydantic
returns
]
++ (with httpx.optional-dependencies; http2 ++ socks);
@@ -41,8 +40,6 @@ python3Packages.buildPythonApplication rec {
pythonImportsCheck = [ "yutto" ];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Bilibili downloader";
homepage = "https://github.com/yutto-dev/yutto";

27
pkgs/by-name/zu/zulip-term/package.nix
View File

@@ -29,25 +29,35 @@ with py.pkgs;
buildPythonApplication rec {
pname = "zulip-term";
version = "0.7.0";
version = "0.7.0-unstable-2025-05-19";
pyproject = true;
src = fetchFromGitHub {
owner = "zulip";
repo = "zulip-terminal";
rev = "refs/tags/${version}";
hash = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw=";
rev = "8e5c0357c8746df64ac427d5db3d2cb0f002f975";
hash = "sha256-DW3GZ1hY/wZ6P/djPUlAvNIFcBV994FLJ3aiPfDVUBM=";
};
patches = [
./pytest-executable-name.patch
];
nativeBuildInputs = with py.pkgs; [
build-system = with py.pkgs; [
setuptools
];
propagatedBuildInputs = with py.pkgs; [
pythonRelaxDeps = [
# zulip-term sets these versions for compat with python 3.6/3.7
"lxml"
"pygments"
"typing_extensions"
"tzlocal"
"urwid_readline"
"zulip"
];
dependencies = with py.pkgs; [
beautifulsoup4
lxml
pygments
@@ -70,6 +80,13 @@ buildPythonApplication rec {
pytest-mock
]);
disabledTests = [
# these break the build but don't seem to affect
# the application at all
"test_soup2markup"
"test_main_help"
];
makeWrapperArgs = [
"--prefix"
"PATH"

6
pkgs/by-name/zw/zwave-js-ui/package.nix
View File

@@ -7,15 +7,15 @@
buildNpmPackage rec {
pname = "zwave-js-ui";
version = "11.4.1";
version = "11.5.2";
src = fetchFromGitHub {
owner = "zwave-js";
repo = "zwave-js-ui";
tag = "v${version}";
hash = "sha256-28FaP8T5TllbibUPJIQBgmnR8Bc4dXWyIS2AGSY0YtE=";
hash = "sha256-G/ZHp5JmCpFCsjbgHyAS4+5eihyzqVtkcZT5vj6Pxos=";
};
npmDepsHash = "sha256-OEewVf9CL17Koq2bFE0rOjPaBIgotSo8iHWl3Lp/chk=";
npmDepsHash = "sha256-amw6eVKWCIuF/XcY1dHb9/qMADGkUANT4WmQNx3O+NY=";
passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;

12
pkgs/development/beam-modules/default.nix
View File

@@ -8,8 +8,6 @@ let
pkgs = __splicedPackages;
inherit (lib) makeExtensible;
lib' = pkgs.callPackage ./lib.nix { };
# FIXME: add support for overrideScope
callPackageWithScope =
scope: drv: args:
@@ -51,27 +49,27 @@ let
# BEAM-based languages.
elixir = elixir_1_18;
elixir_1_19 = lib'.callElixir ../interpreters/elixir/1.19.nix {
elixir_1_19 = callPackage ../interpreters/elixir/1.19.nix {
inherit erlang;
debugInfo = true;
};
elixir_1_18 = lib'.callElixir ../interpreters/elixir/1.18.nix {
elixir_1_18 = callPackage ../interpreters/elixir/1.18.nix {
inherit erlang;
debugInfo = true;
};
elixir_1_17 = lib'.callElixir ../interpreters/elixir/1.17.nix {
elixir_1_17 = callPackage ../interpreters/elixir/1.17.nix {
inherit erlang;
debugInfo = true;
};
elixir_1_16 = lib'.callElixir ../interpreters/elixir/1.16.nix {
elixir_1_16 = callPackage ../interpreters/elixir/1.16.nix {
inherit erlang;
debugInfo = true;
};
elixir_1_15 = lib'.callElixir ../interpreters/elixir/1.15.nix {
elixir_1_15 = callPackage ../interpreters/elixir/1.15.nix {
inherit erlang;
debugInfo = true;
};

85
pkgs/development/beam-modules/lib.nix
View File

@@ -1,85 +0,0 @@
{ __splicedPackages, lib }:
let
pkgs = __splicedPackages;
in
rec {
# Similar to callPackageWith/callPackage, but without makeOverridable
callPackageWith =
autoArgs: fn: args:
let
f = if pkgs.lib.isFunction fn then fn else import fn;
auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
in
f (auto // args);
callPackage = callPackageWith pkgs;
/*
Uses generic-builder to evaluate provided drv containing OTP-version
specific data.
drv: package containing version-specific args;
builder: generic builder for all Erlang versions;
args: arguments merged into version-specific args, used mostly to customize
dependencies;
Arguments passed to the generic-builder are overridable, used to
enable/disable high-level OTP features, like ODBC or WX support;
Please note that "mkDerivation" defined here is the one called from R16.nix
and similar files.
*/
callErlang =
drv: args:
let
genericBuilder =
versionArgs: import ../../development/interpreters/erlang/generic-builder.nix (versionArgs // args);
in
pkgs.callPackage (import drv genericBuilder) { };
/*
Uses generic-builder to evaluate provided drv containing Elixir version
specific data.
drv: file containing version-specific args;
genericBuilder: generic builder for all Erlang versions;
args: arguments merged into version-specific args, used mostly to customize
high level options;
Arguments passed to the generic-builder are overridable.
*/
callElixir =
drv: args:
let
builder = callPackage ../interpreters/elixir/generic-builder.nix args;
in
callPackage drv {
mkDerivation = pkgs.makeOverridable builder;
};
/*
Uses generic-builder to evaluate provided drv containing Elixir version
specific data.
drv: package containing version-specific args;
builder: generic builder for all Erlang versions;
args: arguments merged into version-specific args, used mostly to customize
dependencies;
Arguments passed to the generic-builder are overridable.
Please note that "mkDerivation" defined here is the one called from 1.2.nix
and similar files.
*/
callLFE =
drv: args:
let
builder = callPackage ../interpreters/lfe/generic-builder.nix args;
in
callPackage drv {
mkDerivation = pkgs.makeOverridable builder;
};
}

6
pkgs/development/interpreters/elixir/1.15.nix
View File

@@ -1,9 +1,7 @@
{ mkDerivation }:
mkDerivation {
import ./generic-builder.nix {
version = "1.15.7";
sha256 = "sha256-6GfZycylh+sHIuiQk/GQr1pRQRY1uBycSQdsVJ0J13k=";
hash = "sha256-6GfZycylh+sHIuiQk/GQr1pRQRY1uBycSQdsVJ0J13k=";
# https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
minimumOTPVersion = "24";
maximumOTPVersion = "26";
escriptPath = "lib/elixir/scripts/generate_app.escript";
}

6
pkgs/development/interpreters/elixir/1.16.nix
View File

@@ -1,9 +1,7 @@
{ mkDerivation }:
mkDerivation {
import ./generic-builder.nix {
version = "1.16.3";
sha256 = "sha256-WUBqoz3aQvBlSG3pTxGBpWySY7I0NUcDajQBgq5xYTU=";
hash = "sha256-WUBqoz3aQvBlSG3pTxGBpWySY7I0NUcDajQBgq5xYTU=";
# https://hexdocs.pm/elixir/1.16.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
minimumOTPVersion = "24";
maximumOTPVersion = "26";
escriptPath = "lib/elixir/scripts/generate_app.escript";
}

6
pkgs/development/interpreters/elixir/1.17.nix
View File

@@ -1,9 +1,7 @@
{ mkDerivation }:
mkDerivation {
import ./generic-builder.nix {
version = "1.17.3";
sha256 = "sha256-7Qo6y0KAQ9lwD4oH+7wQ4W5i6INHIBDN9IQAAsYzNJw=";
hash = "sha256-7Qo6y0KAQ9lwD4oH+7wQ4W5i6INHIBDN9IQAAsYzNJw=";
# https://hexdocs.pm/elixir/1.17.3/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
minimumOTPVersion = "25";
maximumOTPVersion = "27";
escriptPath = "lib/elixir/scripts/generate_app.escript";
}

6
pkgs/development/interpreters/elixir/1.18.nix
View File

@@ -1,8 +1,6 @@
{ mkDerivation }:
mkDerivation {
import ./generic-builder.nix {
version = "1.18.4";
sha256 = "sha256-PwogI+HfRXy5M7Xn/KyDjm5vUquTBoGxliSV0A2AwSA=";
hash = "sha256-PwogI+HfRXy5M7Xn/KyDjm5vUquTBoGxliSV0A2AwSA=";
# https://hexdocs.pm/elixir/1.18.0/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
minimumOTPVersion = "25";
escriptPath = "lib/elixir/scripts/generate_app.escript";
}

6
pkgs/development/interpreters/elixir/1.19.nix
View File

@@ -1,9 +1,7 @@
{ mkDerivation }:
mkDerivation {
import ./generic-builder.nix {
version = "1.19.1";
sha256 = "sha256-0rJx1BoJGDS0FsXyngBfQL3LhhNZvwh+TLQZjqOPFQw=";
hash = "sha256-0rJx1BoJGDS0FsXyngBfQL3LhhNZvwh+TLQZjqOPFQw=";
# https://hexdocs.pm/elixir/1.19.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
minimumOTPVersion = "26";
maximumOTPVersion = "28";
escriptPath = "lib/elixir/scripts/generate_app.escript";
}

55
pkgs/development/interpreters/elixir/generic-builder.nix
View File

@@ -1,32 +1,22 @@
{
config,
lib,
stdenv,
fetchFromGitHub,
erlang,
makeWrapper,
nix-update-script,
coreutils,
curl,
bash,
debugInfo ? false,
}@inputs:
{
baseName ? "elixir",
version,
erlang ? inputs.erlang,
hash,
minimumOTPVersion,
maximumOTPVersion ? null,
sha256 ? null,
rev ? "v${version}",
src ? fetchFromGitHub {
inherit rev sha256;
owner = "elixir-lang";
repo = "elixir";
},
escriptPath ? "lib/elixir/generate_app.escript",
}@args:
}:
{
bash,
config,
coreutils,
curl,
debugInfo ? false,
erlang,
fetchFromGitHub,
lib,
makeWrapper,
nix-update-script,
stdenv,
}:
let
inherit (lib)
@@ -79,9 +69,16 @@ if !config.allowAliases && !bothAssert then
else
assert assertMsg bothAssert compatibilityMsg;
stdenv.mkDerivation {
pname = "${baseName}";
pname = "elixir";
inherit src version debugInfo;
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "elixir";
rev = "v${version}";
inherit hash;
};
inherit version debugInfo;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ erlang ];
@@ -95,7 +92,7 @@ else
};
preBuild = ''
patchShebangs ${escriptPath} || true
patchShebangs lib/elixir/scripts/generate_app.escript || true
'';
# copy stdlib source files for LSP access
@@ -136,8 +133,6 @@ else
];
};
pos = builtins.unsafeGetAttrPos "sha256" args;
meta = {
homepage = "https://elixir-lang.org/";
description = "Functional, meta-programming aware language built on top of the Erlang VM";

6
pkgs/development/python-modules/biliass/default.nix
View File

@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "biliass";
version = "2.2.2";
version = "2.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "yutto-dev";
repo = "yutto";
tag = "biliass@${version}";
hash = "sha256-IQokpJbUhR8FMCJcxPSDD1X1o+Lb2j1G7d/jFEsR/Eg=";
hash = "sha256-ZB18BQJRSwA/ERHjqmp+D39UqTvdYpbhwLjaizM5R2I=";
};
sourceRoot = "${src.name}/packages/biliass";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
sourceRoot
cargoRoot
;
hash = "sha256-tkHl6z0En+od//fCGJXK/p8Dz5KDOXltHrXhxHmHL6U=";
hash = "sha256-gOYgYi8RlWBe0astv6D6/J7Ge20TM/19zJHwoCevpIo=";
};
nativeBuildInputs = with rustPlatform; [

3
pkgs/development/python-modules/docling-parse/default.nix
View File

@@ -102,5 +102,8 @@ buildPythonPackage rec {
homepage = "https://github.com/DS4SD/docling-parse";
license = lib.licenses.mit;
maintainers = [ ];
# error: no matching conversion for functional-style cast from 'bool' to 'nlohmann::basic_json<>'
# See https://github.com/docling-project/docling-parse/issues/172 for context
broken = true;
};
}

4
pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
View File

@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-network-connectivity";
version = "2.10.0";
version = "2.11.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "google_cloud_network_connectivity";
hash = "sha256-wbznAUjwh57xuvuLWOrk1eXvxuDE+wWh6Cx3oQI8dqE=";
hash = "sha256-PBqFMVGTn7si4UgAc4zk/97M9mWSnVJMX9gZk0eXpSY=";
};
build-system = [ setuptools ];

5
pkgs/games/the-butterfly-effect/default.nix
View File

@@ -25,6 +25,11 @@ mkDerivation rec {
# fix translations not building: https://gitlab.kitware.com/cmake/cmake/-/issues/21931
substituteInPlace i18n/CMakeLists.txt --replace qt5_create_translation qt_add_translation
substituteInPlace CMakeLists.txt \
--replace-fail "cmake_minimum_required (VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
substituteInPlace src/Box2D/CMakeLists.txt \
--replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
'';
nativeBuildInputs = [

17
pkgs/top-level/beam-packages.nix
View File

@@ -6,16 +6,23 @@
wxSupport ? true,
systemd,
systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
__splicedPackages,
}:
let
self = beam;
pkgs = __splicedPackages;
callErlang =
drv: args:
let
genericBuilder =
versionArgs: import ../development/interpreters/erlang/generic-builder.nix (versionArgs // args);
in
pkgs.callPackage (import drv genericBuilder) { };
in
{
beamLib = callPackage ../development/beam-modules/lib.nix { };
latestVersion = "erlang_28";
# Each
@@ -27,15 +34,15 @@ in
#
# Three versions are supported according to https://github.com/erlang/otp/security
erlang_28 = self.beamLib.callErlang ../development/interpreters/erlang/28.nix {
erlang_28 = callErlang ../development/interpreters/erlang/28.nix {
inherit wxSupport systemdSupport;
};
erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix {
erlang_27 = callErlang ../development/interpreters/erlang/27.nix {
inherit wxSupport systemdSupport;
};
erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix {
erlang_26 = callErlang ../development/interpreters/erlang/26.nix {
inherit wxSupport systemdSupport;
};