Merge master into staging-nixos
This commit is contained in:
@@ -94,6 +94,10 @@
|
||||
|
||||
- `python3Packages.pygame` has been been renamed to `python3Packages.pygame-original`, the attribute `python3Packages.pygame` will from python 3.14 default to the more actively maintained `python3Packages.pygame-ce`
|
||||
|
||||
- `peertube` has been updated from `7.3.0` to `8.0.2`, introducing several breaking changes.
|
||||
Some notable new features include channel collaboration and video player redesign with a new theme.
|
||||
For details on how to upgrade, see the `IMPORTANT NOTES` section of the [v8.0.0 CHANGELOG entry](https://docs.joinpeertube.org/CHANGELOG#v8-0-0).
|
||||
|
||||
- `python3Packages.gradio` has been updated to version 6. See upstream's migration guide at https://www.gradio.app/main/guides/gradio-6-migration-guide.
|
||||
|
||||
- `vicinae` has been updated to v0.17. Version 0.17 contains a complete overhaul of the configuration system. For update instructions, see the [release notes for v0.17.0](https://github.com/vicinaehq/vicinae/releases/tag/v0.17.0) and the [upstream configuration documentation](https://docs.vicinae.com/config).
|
||||
|
||||
@@ -24779,6 +24779,14 @@
|
||||
githubId = 1505617;
|
||||
name = "Sean Lee";
|
||||
};
|
||||
sleroq = {
|
||||
name = "Sleroq";
|
||||
email = "sleroq@cum.army";
|
||||
github = "sleroq";
|
||||
matrix = "@sleroq:sleroq.link";
|
||||
githubId = 52239427;
|
||||
keys = [ { fingerprint = "2502 640F 4254 7933 FEF1 7A33 3414 5C1D B76E 618F"; } ];
|
||||
};
|
||||
SlothOfAnarchy = {
|
||||
email = "slothofanarchy1@gmail.com";
|
||||
matrix = "@michel.weitbrecht:helsinki-systems.de";
|
||||
@@ -27136,12 +27144,6 @@
|
||||
githubId = 5623227;
|
||||
name = "Quentin Boyer";
|
||||
};
|
||||
TredwellGit = {
|
||||
email = "tredwell@tutanota.com";
|
||||
github = "TredwellGit";
|
||||
githubId = 61860346;
|
||||
name = "Tredwell";
|
||||
};
|
||||
treemo = {
|
||||
email = "matthieu.chevrier@treemo.fr";
|
||||
github = "treemo";
|
||||
|
||||
@@ -242,8 +242,8 @@ in
|
||||
}
|
||||
];
|
||||
|
||||
# Bcachefs upstream recommends using the latest kernel
|
||||
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
|
||||
# Use LTS that bcachefs is compatible with.
|
||||
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_6_18;
|
||||
|
||||
# needed for systemd-remount-fs
|
||||
system.fsPackages = [ cfg.package ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
vimUtils.buildVimPlugin rec {
|
||||
pname = "codediff.nvim";
|
||||
version = "2.16.3";
|
||||
version = "2.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esmuellert";
|
||||
repo = "codediff.nvim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-nIDjE5hf5kt3diEFgUEBz4dCxHatCYtdHY5Zc4YlHFg=";
|
||||
hash = "sha256-l8bP8NNCoE7SLRMRh+Nq5OxUD+xdJ2qYyWbA140aFV0=";
|
||||
};
|
||||
|
||||
dependencies = [ vimPlugins.nui-nvim ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2026-01-18";
|
||||
version = "0-unstable-2026-02-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "3faea4f9c678bad8063f3a2774b051f42848c856";
|
||||
hash = "sha256-tH9XMBfg3O2oKIUeKWi2hl4yQuHa9BMgvkWjIxv/KIo=";
|
||||
rev = "e21e3f3c40eb4422b93b8984ef46fe04cdaee9db";
|
||||
hash = "sha256-7hZ2TJwHtgyHd+CZahazXZnKhfNpWZqfev9jtTHlmag=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame";
|
||||
version = "0-unstable-2026-01-01";
|
||||
version = "0-unstable-2026-01-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame";
|
||||
rev = "b207f9c6fc93b9d21417a9e4424607840c71db6b";
|
||||
hash = "sha256-n9vDYSzij01rRgUc8l763FCLXsFGHIsZxAIZ+N8IBGo=";
|
||||
rev = "6cdc40fc53ba5574073d4009b531fda07156ff49";
|
||||
hash = "sha256-4XmQsVuieIEcLTP1CJfNrJjXD2ENkh4MPLkTVjrx8dE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -12,51 +12,15 @@ let
|
||||
extraArgs = removeAttrs args [ "callPackage" ];
|
||||
in
|
||||
{
|
||||
k3s_1_32 = common (
|
||||
(import ./1_32/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"32"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
k3s_1_32 = common (import ./1_32/versions.nix) extraArgs;
|
||||
|
||||
k3s_1_33 = common (
|
||||
(import ./1_33/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"33"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
k3s_1_33 = common (import ./1_33/versions.nix) extraArgs;
|
||||
|
||||
k3s_1_34 =
|
||||
(common (
|
||||
(import ./1_34/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"34"
|
||||
];
|
||||
}
|
||||
) extraArgs).overrideAttrs
|
||||
{
|
||||
patches = [ ./go_runc_require.patch ];
|
||||
};
|
||||
k3s_1_34 = (common (import ./1_34/versions.nix) extraArgs).overrideAttrs {
|
||||
patches = [ ./go_runc_require.patch ];
|
||||
};
|
||||
|
||||
k3s_1_35 =
|
||||
(common (
|
||||
(import ./1_35/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"35"
|
||||
];
|
||||
}
|
||||
) extraArgs).overrideAttrs
|
||||
{
|
||||
patches = [ ./go_runc_require.patch ];
|
||||
};
|
||||
k3s_1_35 = (common (import ./1_35/versions.nix) extraArgs).overrideAttrs {
|
||||
patches = [ ./go_runc_require.patch ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -108,19 +108,9 @@ respective package block.
|
||||
|
||||
```nix
|
||||
{
|
||||
rke2_1_34 =
|
||||
(common (
|
||||
(import ./1_34/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"34"
|
||||
];
|
||||
}
|
||||
) extraArgs).overrideAttrs
|
||||
{
|
||||
meta.knownVulnerabilities = [ "rke2_1_34 has reached end-of-life on 2026-10-27" ];
|
||||
};
|
||||
rke2_1_34 = (common (import ./1_34/versions.nix) extraArgs).overrideAttrs {
|
||||
meta.knownVulnerabilities = [ "rke2_1_34 has reached end-of-life on 2026-10-27" ];
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ lib:
|
||||
rke2Commit,
|
||||
rke2TarballHash,
|
||||
rke2VendorHash,
|
||||
updateScript,
|
||||
updateScript ? null,
|
||||
k8sImageTag,
|
||||
etcdVersion,
|
||||
pauseVersion,
|
||||
|
||||
@@ -5,45 +5,13 @@ let
|
||||
extraArgs = removeAttrs args [ "callPackage" ];
|
||||
in
|
||||
rec {
|
||||
rke2_1_32 = common (
|
||||
(import ./1_32/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"32"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
rke2_1_32 = common (import ./1_32/versions.nix) extraArgs;
|
||||
|
||||
rke2_1_33 = common (
|
||||
(import ./1_33/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"33"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
rke2_1_33 = common (import ./1_33/versions.nix) extraArgs;
|
||||
|
||||
rke2_1_34 = common (
|
||||
(import ./1_34/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"34"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
rke2_1_34 = common (import ./1_34/versions.nix) extraArgs;
|
||||
|
||||
rke2_1_35 = common (
|
||||
(import ./1_35/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
./update-script.sh
|
||||
"35"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
rke2_1_35 = common (import ./1_35/versions.nix) extraArgs;
|
||||
|
||||
# Automatically set by update script, changes shouldn't be backported
|
||||
rke2_stable = rke2_1_34;
|
||||
|
||||
@@ -33,7 +33,9 @@ const fixupYarnLock = async (lockContents, verbose) => {
|
||||
if (hash)
|
||||
pkg.resolved += `#${hash}`
|
||||
|
||||
return [dep, pkg]
|
||||
// Rewrite key to remove git+ prefix and .git suffix to prevent yarn git resolver
|
||||
let fixedDep = dep.replace(/@git\+/, '@').replace(/\.git(#|$)/, '$1')
|
||||
return [fixedDep, pkg]
|
||||
})
|
||||
)
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
wavpack,
|
||||
#, musepackSupport ? false, TODO: mpcenc
|
||||
monkeysAudioSupport ? false,
|
||||
monkeysAudio,
|
||||
monkeys-audio,
|
||||
#, aacSupport ? false, TODO: neroAacEnc
|
||||
}:
|
||||
|
||||
@@ -31,7 +31,7 @@ let
|
||||
++ lib.optional flacSupport flac
|
||||
++ lib.optional opusSupport opusTools
|
||||
++ lib.optional wavpackSupport wavpack
|
||||
++ lib.optional monkeysAudioSupport monkeysAudio
|
||||
++ lib.optional monkeysAudioSupport monkeys-audio
|
||||
++ [ cdparanoia ];
|
||||
in
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
cmake,
|
||||
elfutils,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
flex,
|
||||
iperf,
|
||||
lib,
|
||||
@@ -23,14 +22,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bcc";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "bcc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-eP/VEq7cPALi2oDKAZFQGQ3NExdmcBKyi6ddRZiYmbI=";
|
||||
hash = "sha256-J00GRIM9AemLkKHoyKqLR2U2aEBwNy/a5hbGjLRrO8w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -44,12 +43,6 @@ python3Packages.buildPythonApplication rec {
|
||||
(replaceVars ./absolute-ausyscall.patch {
|
||||
ausyscall = lib.getExe' audit "ausyscall";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "clang-21.patch";
|
||||
url = "https://github.com/iovisor/bcc/commit/8c5c96ad3beeed2fa827017f451a952306826974.diff";
|
||||
hash = "sha256-VOzhdeZ3mRstLlMhxHwEgqCa6L39eRpbFJuKZqFnBws=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "beans";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hmans";
|
||||
repo = "beans";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3SgTqR5DGAb5r+VU3YknoWATqglq8G7QV3kTVUSL9u4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TprfPZ/clb7PLMAkxF0y78bCef4XarhgHlIhIPn1nQA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-X github.com/hmans/beans/cmd.version=${finalAttrs.version}"
|
||||
"-X github.com/hmans/beans/cmd.commit=${finalAttrs.src.rev}"
|
||||
"-X github.com/hmans/beans/cmd.date=unknown"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "version";
|
||||
|
||||
meta = {
|
||||
description = "Issue tracker for you, your team, and your coding agents";
|
||||
homepage = "https://github.com/hmans/beans";
|
||||
changelog = "https://github.com/hmans/beans/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ sleroq ];
|
||||
mainProgram = "beans";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buildah";
|
||||
version = "1.42.2";
|
||||
version = "1.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YWyA2wTIlJNwuqcPHOBFZ2wr46Z0I83FWRew/FC3Wxs=";
|
||||
hash = "sha256-SihJXPnUrOe4TxbbnQOhXoZlbQZfLy0YGMV32CtojV8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://ccrypt.sourceforge.net/";
|
||||
description = "Utility for encrypting and decrypting files and streams with AES-256";
|
||||
|
||||
@@ -23,7 +23,17 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
]
|
||||
# From some reason upstream installs documentation only for Linux, solaris,
|
||||
# sunos and any gnu system.
|
||||
++ lib.optionals (lib.pipe stdenv.hostPlatform [
|
||||
(lib.attrVals [
|
||||
"isLinux"
|
||||
"isSunOS"
|
||||
"isGnu"
|
||||
])
|
||||
(builtins.any lib.id)
|
||||
]) [ "doc" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -89,6 +99,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
rm $out/bin/fail2ban-python
|
||||
ln -s ${python3.interpreter} $out/bin/fail2ban-python
|
||||
|
||||
# Irrelevant for NixOS
|
||||
rm -r $out/var
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# see https://github.com/NixOS/nixpkgs/issues/4968
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
taglib,
|
||||
wavpack,
|
||||
vorbisgain,
|
||||
monkeysAudio,
|
||||
monkeys-audio,
|
||||
sox,
|
||||
gtk3,
|
||||
libsForQt5,
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mp3gain
|
||||
lame
|
||||
wavpack
|
||||
monkeysAudio
|
||||
monkeys-audio
|
||||
vorbisgain
|
||||
sox
|
||||
];
|
||||
|
||||
@@ -2,29 +2,20 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "clasp";
|
||||
version = "3.1.3";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "clasp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Pxt3MaDDsk/qq3NSuwG3jOoPthwrL0QelaruoC37hfA=";
|
||||
hash = "sha256-JLfkGxUHvde5RXlIWH+raBvTwqvpHOR/ul4yArLFj28=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/google/clasp/pull/1112
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/clasp/commit/b183d4b5fbdb51f7bc2e3edadf5fd3bbff28bad1.patch";
|
||||
hash = "sha256-lnC7DfKsV4E5guxbjZ+WfkLj5wDLYwObPtH21dmFUcc=";
|
||||
})
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-IyFcGcT3ceoaaf2sCPriEIoWPavg+YGsvkxr1MkLj5c=";
|
||||
npmDepsHash = "sha256-dT0HA21wvU+wP5/9juMYinY60Fq5ngWl5dgj0JJi9hM=";
|
||||
|
||||
# `npm run build` tries installing clasp globally
|
||||
npmBuildScript = [ "compile" ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hcxtools";
|
||||
version = "7.1.0";
|
||||
version = "7.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ZerBea";
|
||||
repo = "hcxtools";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-wfLeHL9xqHAkWPodrz7+dDcLcylwVrS6Kes5meV4UDM=";
|
||||
sha256 = "sha256-v33RpDKA4OeUU4YXXWhHpdlqQvxk4HIWQKCPskdTSTU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -32,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/benhoyt/inih";
|
||||
changelog = "https://github.com/benhoyt/inih/releases/tag/r${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ TredwellGit ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "kubernetes-validate";
|
||||
version = "1.34.1";
|
||||
version = "1.35.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "kubernetes_validate";
|
||||
inherit version;
|
||||
hash = "sha256-uC2kR6QG/EdauD4PZ4tkQixZX8EHcN0nMyDCRMm0AxU=";
|
||||
hash = "sha256-UKnkbaLARxwoK7MTjH14XSkjH28be8LmimEatBsigyY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libGDSII";
|
||||
pname = "libgdsii";
|
||||
version = "0.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -31,6 +31,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ popt ] ++ lib.optionals aclSupport [ acl ];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
sed -i 's#/bin/date#${lib.getExe' coreutils "date"}#' test/*.sh
|
||||
# Exiting with 77 signals that a test is skipped, and we only place it on line 2 because the shebang is on line 1
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "metacubexd";
|
||||
version = "1.235.3";
|
||||
version = "1.240.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MetaCubeX";
|
||||
repo = "metacubexd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-3CtXD8fG/JEK13VcovjckrtPLTQUltut1AOk2nufdCc=";
|
||||
hash = "sha256-6GsUiOBYFDov3/O36iYglxEn7qtcGmn4WeIls68i4Og=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-cT0HGAc/eu7LMZp4/MNRgodo+nkhLoN5yOWfcrtsr5I=";
|
||||
hash = "sha256-PAtw+qrxl3gZC+kdWcsp34tj8CH/jEOkXgodycs2cZg=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -1,79 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
nixosTests,
|
||||
fetchPnpmDeps,
|
||||
|
||||
# build
|
||||
brotli,
|
||||
fixup-yarn-lock,
|
||||
jq,
|
||||
dart-sass,
|
||||
fd,
|
||||
nodejs_20,
|
||||
jq,
|
||||
pnpmConfigHook,
|
||||
pnpm_10,
|
||||
which,
|
||||
yarn,
|
||||
|
||||
# runtime
|
||||
nodejs_20,
|
||||
|
||||
# tests
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
bcryptHostPlatformAttrs = {
|
||||
x86_64-linux = {
|
||||
arch = "linux-x64";
|
||||
libc = "glibc";
|
||||
hash = "sha256-C5N6VgFtXPLLjZt0ZdRTX095njRIT+12ONuUaBBj7fQ=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
arch = "linux-arm64";
|
||||
libc = "glibc";
|
||||
hash = "sha256-TerDujO+IkSRnHYlSbAKSP9IS7AT7XnQJsZ8D8pCoGc=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwin-x64";
|
||||
libc = "unknown";
|
||||
hash = "sha256-gphOONWujbeCCr6dkmMRJP94Dhp1Jvp2yt+g7n1HTv0=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
arch = "darwin-arm64";
|
||||
libc = "unknown";
|
||||
hash = "sha256-JMnELVUxoU1C57Tzue3Sg6OfDFAjfCnzgDit0BWzmlo=";
|
||||
};
|
||||
};
|
||||
bcryptAttrs =
|
||||
bcryptHostPlatformAttrs."${stdenv.hostPlatform.system}"
|
||||
or (throw "Unsupported architecture: ${stdenv.hostPlatform.system}");
|
||||
bcryptVersion = "5.1.1";
|
||||
bcryptLib = fetchurl {
|
||||
url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v${bcryptVersion}/bcrypt_lib-v${bcryptVersion}-napi-v3-${bcryptAttrs.arch}-${bcryptAttrs.libc}.tar.gz";
|
||||
inherit (bcryptAttrs) hash;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "peertube";
|
||||
version = "7.3.0";
|
||||
version = "8.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chocobozzz";
|
||||
repo = "PeerTube";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WbZFOOvX6WzKB9tszxJl6z+V6cDBH6Y2SjoxF17WvUo=";
|
||||
};
|
||||
|
||||
yarnOfflineCacheServer = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-T1stKz8+1ghQBJB8kujwcqmygMdoswjFBL/QWAHSis0=";
|
||||
};
|
||||
|
||||
yarnOfflineCacheClient = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/client/yarn.lock";
|
||||
hash = "sha256-jeE6Xpi/A1Ldbbp12rkG19auud61AZna/vbVE2mpp/8=";
|
||||
};
|
||||
|
||||
yarnOfflineCacheAppsCli = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/apps/peertube-cli/yarn.lock";
|
||||
hash = "sha256-lcWtZGE/6XGm8KXmzSowCHAb/vGwBoqkwk32Ru3mMYU=";
|
||||
};
|
||||
|
||||
yarnOfflineCacheAppsRunner = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/apps/peertube-runner/yarn.lock";
|
||||
hash = "sha256-OX9em03iqaRCqFuo2QO/r+CBdk7hHk3WY1EBXlFr1cY=";
|
||||
hash = "sha256-u4LDk9r88h3EqX6ZRMPCQmjOvfJDXwV2YYrKEkGBWgs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -82,55 +36,40 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"runner"
|
||||
];
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-1CmfcDZ23oITP8GQGIBeZP4Z5AON0f3CtdHGnpZxHgQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
brotli
|
||||
fixup-yarn-lock
|
||||
jq
|
||||
which
|
||||
yarn
|
||||
fd
|
||||
jq
|
||||
pnpmConfigHook
|
||||
pnpm_10
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [ nodejs_20 ];
|
||||
buildInputs = [
|
||||
nodejs_20
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# force sass-embedded to use our own sass instead of the bundled one
|
||||
for dep in node_modules/.pnpm/sass-embedded@*; do
|
||||
substituteInPlace $dep/node_modules/sass-embedded/dist/lib/src/compiler-path.js \
|
||||
--replace-fail \
|
||||
'compilerCommand = (() => {' \
|
||||
'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'
|
||||
done
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
# Build node modules
|
||||
runHook preBuild
|
||||
|
||||
export HOME=$PWD
|
||||
fixup-yarn-lock ~/yarn.lock
|
||||
fixup-yarn-lock ~/client/yarn.lock
|
||||
fixup-yarn-lock ~/apps/peertube-cli/yarn.lock
|
||||
fixup-yarn-lock ~/apps/peertube-runner/yarn.lock
|
||||
yarn config --offline set yarn-offline-mirror $yarnOfflineCacheServer
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
|
||||
cd ~/client
|
||||
yarn config --offline set yarn-offline-mirror $yarnOfflineCacheClient
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
|
||||
|
||||
# Switch sass-embedded to sass
|
||||
find node_modules/vite/dist -name "*.js" -type f -exec grep -l "sass-embedded" {} \; | while read file; do
|
||||
echo "Patching $file"
|
||||
sed -i 's/"sass-embedded"/"sass"/g; s/'"'"'sass-embedded'"'"'/'"'"'sass'"'"'/g' "$file"
|
||||
done
|
||||
|
||||
cd ~/apps/peertube-cli
|
||||
yarn config --offline set yarn-offline-mirror $yarnOfflineCacheAppsCli
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
|
||||
cd ~/apps/peertube-runner
|
||||
yarn config --offline set yarn-offline-mirror $yarnOfflineCacheAppsRunner
|
||||
yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
|
||||
|
||||
patchShebangs ~/{node_modules,client/node_modules,/apps/peertube-cli/node_modules,apps/peertube-runner/node_modules,scripts}
|
||||
|
||||
# Fix bcrypt node module
|
||||
cd ~/node_modules/bcrypt
|
||||
if [ "${bcryptVersion}" != "$(cat package.json | jq -r .version)" ]; then
|
||||
echo "Mismatching version please update bcrypt in derivation"
|
||||
exit
|
||||
fi
|
||||
mkdir -p ./lib/binding && tar -C ./lib/binding -xf ${bcryptLib}
|
||||
|
||||
# Return to home directory
|
||||
cd ~
|
||||
|
||||
# Build PeerTube server
|
||||
npm run build:server
|
||||
@@ -147,7 +86,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patchShebangs ~/apps/peertube-runner/dist/peertube-runner.js
|
||||
|
||||
# Clean up declaration files
|
||||
find ~/dist/ \
|
||||
find \
|
||||
~/dist/ \
|
||||
~/packages/core-utils/dist/ \
|
||||
~/packages/ffmpeg/dist/ \
|
||||
~/packages/models/dist/ \
|
||||
@@ -156,14 +96,20 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
~/packages/transcription/dist/ \
|
||||
~/packages/typescript-utils/dist/ \
|
||||
\( -name '*.d.ts' -o -name '*.d.ts.map' \) -type f -delete
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/dist
|
||||
mv ~/dist $out
|
||||
mv ~/node_modules $out/node_modules
|
||||
|
||||
mkdir $out/client
|
||||
mv ~/client/{dist,node_modules,package.json,yarn.lock} $out/client
|
||||
mv ~/client/{dist,node_modules,package.json} $out/client
|
||||
|
||||
mkdir -p $out/packages/{core-utils,ffmpeg,models,node-utils,server-commands,transcription,typescript-utils}
|
||||
mv ~/packages/core-utils/{dist,package.json} $out/packages/core-utils
|
||||
mv ~/packages/ffmpeg/{dist,package.json} $out/packages/ffmpeg
|
||||
@@ -172,22 +118,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mv ~/packages/server-commands/{dist,package.json} $out/packages/server-commands
|
||||
mv ~/packages/transcription/{dist,package.json} $out/packages/transcription
|
||||
mv ~/packages/typescript-utils/{dist,package.json} $out/packages/typescript-utils
|
||||
mv ~/{config,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,yarn.lock} $out
|
||||
mv ~/{config,support,CREDITS.md,FAQ.md,LICENSE,README.md,package.json,pnpm-lock.yaml} $out
|
||||
|
||||
# Remove broken symlinks in node_modules from workspace packages that aren't needed
|
||||
# by the built artifact. If any new packages break the check for broken symlinks,
|
||||
# they should be checked before adding them here to make sure they aren't likely to
|
||||
# be needed, either now or in the future. If they might be, then we probably want
|
||||
# to move the package to $out above instead of removing the broken symlink.
|
||||
rm $out/node_modules/@peertube/{peertube-server,peertube-transcription-devtools,peertube-types-generator,tests}
|
||||
rm $out/client/node_modules/@peertube/{peertube-transcription-devtools,peertube-types-generator,tests,player}
|
||||
rm $out/node_modules/.pnpm/node_modules/@peertube/{peertube-cli,peertube-runner,peertube-server,peertube-transcription-devtools,peertube-types-generator,tests,player}
|
||||
rm $out/client/node_modules/@peertube/player
|
||||
|
||||
mkdir -p $cli/bin
|
||||
mv ~/apps/peertube-cli/{dist,node_modules,package.json,yarn.lock} $cli
|
||||
mv ~/apps/peertube-cli/{dist,node_modules,package.json} $cli
|
||||
ln -s $cli/dist/peertube.js $cli/bin/peertube-cli
|
||||
|
||||
mkdir -p $runner/bin
|
||||
mv ~/apps/peertube-runner/{dist,node_modules,package.json,yarn.lock} $runner
|
||||
mv ~/apps/peertube-runner/{dist,node_modules,package.json} $runner
|
||||
ln -s $runner/dist/peertube-runner.js $runner/bin/peertube-runner
|
||||
|
||||
# Create static gzip and brotli files
|
||||
@@ -195,6 +141,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
--type file --search-path $out/client/dist --threads $NIX_BUILD_CORES \
|
||||
--exec gzip -9 -n -c {} > {}.gz \;\
|
||||
--exec brotli --best -f {} -o {}.br
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests.peertube = nixosTests.peertube;
|
||||
@@ -228,5 +176,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
izorkin
|
||||
stevenroose
|
||||
];
|
||||
teams = with lib.teams; [
|
||||
ngi
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
picom.overrideAttrs (previousAttrs: {
|
||||
pname = "picom-pijulius";
|
||||
version = "8.2-unstable-2026-01-24";
|
||||
version = "8.2-unstable-2026-02-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pijulius";
|
||||
repo = "picom";
|
||||
rev = "cb09df27efb4cd78417926f02338e93805067730";
|
||||
hash = "sha256-/8865rKifoRk73YVul6IaDYmF2q1oFD9TCXDAIEEy5Q=";
|
||||
rev = "6a97dddc348a753ecf8e34d68a5e43541186b1ee";
|
||||
hash = "sha256-AaZ4xddlLjq3SoS0KrDA6AOHSB6sz4DWFzBMgXZ5LXE=";
|
||||
};
|
||||
|
||||
dontVersionCheck = true;
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "protonup-rs";
|
||||
version = "0.9.3";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-GpKiecfEV66TGgU3f/WlQZZ4mVJD4+quZSb+45fsWpM=";
|
||||
hash = "sha256-Ro5bYnmWs+Yjj6x5qkY2X1qBuQlvV7WIw4Oluvono54=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-15K6n7npZmbxDroIN09Tr5L8oTUJ0js9/cfiPQDeTTQ=";
|
||||
cargoHash = "sha256-w6SBIsyxtbRtWRocskAG/UqBVRSvLoVS2fy9pTpWL4U=";
|
||||
|
||||
checkFlags = [
|
||||
# Requires internet access
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "redli";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IBM-Cloud";
|
||||
repo = "redli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pEEfJWDwMBkx2Ff9pHuvO6N8FvEe93pOI3EO40sNV+8=";
|
||||
hash = "sha256-RSiXJwsQ1hj9+hIA4Q/xadNsS3skJhdGyJBV2LUX3n4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-30a/cZNkXsR0+fv74mfFZnvsylqJDRU72t/cwJur1dU=";
|
||||
vendorHash = "sha256-WMDQG69VWQyhDyEBzHaUIPXJChfdl/jO/POqtPxIDGU=";
|
||||
|
||||
meta = {
|
||||
description = "Humane alternative to the Redis-cli and TLS";
|
||||
|
||||
@@ -66,14 +66,14 @@ let
|
||||
in
|
||||
flutter329.buildFlutterApplication rec {
|
||||
pname = "rustdesk";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustdesk";
|
||||
repo = "rustdesk";
|
||||
tag = version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-o7jsVWiCkHaKFpAu27r/Lr1Q9g7uR/OYJdwsiQeDJUA=";
|
||||
hash = "sha256-FRtYafsIKHnGPV8NaiaHxIHkon8/T2P83uq9taUD1Xc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -95,7 +95,7 @@ flutter329.buildFlutterApplication rec {
|
||||
src
|
||||
patches
|
||||
;
|
||||
hash = "sha256-gd2vS+p+1QtOWZcRWJWahFGo5rFG+soqxx3vJYSYJUo=";
|
||||
hash = "sha256-mEtTo1ony5w/dzJcHieG9WywHirBoQ/C0WpiAr7pUVc=";
|
||||
};
|
||||
|
||||
dontCargoBuild = true;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
lame,
|
||||
lib,
|
||||
makeWrapper,
|
||||
monkeysAudio,
|
||||
monkeys-audio,
|
||||
nixosTests,
|
||||
perlPackages,
|
||||
sox,
|
||||
@@ -24,7 +24,7 @@ let
|
||||
sox
|
||||
wavpack
|
||||
]
|
||||
++ (lib.optional stdenv.hostPlatform.isLinux monkeysAudio)
|
||||
++ (lib.optional stdenv.hostPlatform.isLinux monkeys-audio)
|
||||
);
|
||||
|
||||
libPath = lib.makeLibraryPath [
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "snips-sh";
|
||||
version = "0.6.1";
|
||||
vendorHash = "sha256-1aS9aICqakGaKPVju5Y9VQ1LV5SjW3oqZciihwhORag=";
|
||||
version = "0.7.0";
|
||||
vendorHash = "sha256-smmfGpnHcY570RelGbE3R7cOiYLaJs+LE+H2eq8j81A=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robherley";
|
||||
repo = "snips.sh";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-lXR6tDVH4CSJOn6n8dM1OoBqeynFnP/Hg046LH9J3Bs=";
|
||||
hash = "sha256-WsfDFgu1a55i3lu5/nlNr7TCYOrpKMX2vsK6SqT3vrw=";
|
||||
};
|
||||
|
||||
tags = (lib.optional (!withTensorflow) "noguesser");
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
}:
|
||||
|
||||
symlinkJoin {
|
||||
name = "${tectonic-unwrapped.pname}-wrapped-${tectonic-unwrapped.version}";
|
||||
inherit (tectonic-unwrapped) version;
|
||||
pname = "${tectonic-unwrapped.pname}-wrapped";
|
||||
paths = [ tectonic-unwrapped ];
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "uptime-kuma";
|
||||
version = "2.0.2";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "louislam";
|
||||
repo = "uptime-kuma";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zW5sl1g96PvDK3S6XhJ6F369/NSnvU9uSQORCQugfvs=";
|
||||
hash = "sha256-9wgrzZrog5QMx6vnQ+kIP4pkQdvQo1QSxGZav2ikNRY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-EmSZJUbtD4FW7Rzdpue6/bV8oZt7RUL11tFBXGJQthg=";
|
||||
npmDepsHash = "sha256-r3QkAE1Bm2rh+h/4dpqj6c8yldcH3J1/38JYXcVV80o=";
|
||||
|
||||
patches = [
|
||||
# Fixes the permissions of the database being not set correctly
|
||||
|
||||
@@ -146,7 +146,7 @@ let
|
||||
'';
|
||||
|
||||
phpWithExtensions = symlinkJoin {
|
||||
name = "php-with-extensions-${version}";
|
||||
pname = "php-with-extensions";
|
||||
inherit (php) version;
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
passthru = php.passthru // {
|
||||
|
||||
@@ -32,11 +32,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpich";
|
||||
version = "4.3.2";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
|
||||
hash = "sha256-R9d0WHpxVqU3UiGMgRyFLnCsRNucUC3D85m0y4F+OBg=";
|
||||
hash = "sha256-6TUOMiJCg+lTEfIhNPNsmOPNHGZdF/riCmzJLtPP/hE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -79,12 +79,16 @@ let
|
||||
]
|
||||
++ extraNativeBuildInputs;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# The headers of wlroots #include <libinput.h>, and consumers of `wlroots` need not add it explicitly, hence we propagate it.
|
||||
libinput
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libliftoff
|
||||
libdisplay-info
|
||||
libGL
|
||||
libcap
|
||||
libinput
|
||||
libxkbcommon
|
||||
libgbm
|
||||
pixman
|
||||
|
||||
@@ -1,37 +1,31 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
dask,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
xarray,
|
||||
|
||||
# optional-dependencies
|
||||
matplotlib,
|
||||
pint,
|
||||
pooch,
|
||||
pytestCheckHook,
|
||||
regex,
|
||||
rich,
|
||||
shapely,
|
||||
|
||||
# tests
|
||||
dask,
|
||||
pytestCheckHook,
|
||||
scipy,
|
||||
setuptools-scm,
|
||||
setuptools,
|
||||
shapely,
|
||||
xarray,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cf-xarray";
|
||||
version = "0.10.10";
|
||||
version = "0.10.11";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xarray-contrib";
|
||||
repo = "cf-xarray";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-t6b4Tog0BLk5y+wi3QH6IKLbJSKw5NkLa3kJRtSBKRs=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SHVSHfB80iLz8uONwH1WoUajef/YT4k0CIzTrHTG3kI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -58,7 +52,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
scipy
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
|
||||
|
||||
pythonImportsCheck = [ "cf_xarray" ];
|
||||
|
||||
@@ -72,8 +66,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Accessor for xarray objects that interprets CF attributes";
|
||||
homepage = "https://github.com/xarray-contrib/cf-xarray";
|
||||
changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -51,7 +52,7 @@
|
||||
tomlkit,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "kserve";
|
||||
version = "0.16.0";
|
||||
pyproject = true;
|
||||
@@ -59,23 +60,22 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "kserve";
|
||||
repo = "kserve";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms=";
|
||||
};
|
||||
|
||||
# Fix vllm 0.12.0 compatibility
|
||||
# Patch submitted upstream: https://github.com/kserve/kserve/pull/4882
|
||||
postPatch = ''
|
||||
substituteInPlace kserve/protocol/rest/openai/types/__init__.py \
|
||||
--replace-fail \
|
||||
"from vllm.entrypoints.openai.protocol import EmbeddingRequest, EmbeddingResponse as Embedding, EmbeddingResponseData, EmbeddingCompletionRequest" \
|
||||
"from vllm.entrypoints.pooling.embed.protocol import EmbeddingRequest, EmbeddingResponse as Embedding, EmbeddingResponseData, EmbeddingCompletionRequest" \
|
||||
--replace-fail \
|
||||
"from vllm.entrypoints.openai.protocol import RerankRequest, RerankResponse as Rerank" \
|
||||
"from vllm.entrypoints.pooling.score.protocol import RerankRequest, RerankResponse as Rerank"
|
||||
'';
|
||||
patches = [
|
||||
# Fix vllm imports in python/kserve/kserve/protocol/rest/openai/types/__init__.py
|
||||
# Submitted upstream: https://github.com/kserve/kserve/pull/4882
|
||||
(fetchpatch2 {
|
||||
name = "update-vllm-imports-to-fix-compat";
|
||||
url = "https://github.com/kserve/kserve/commit/dd1575501e56f588103f448efca684bc54569b81.patch";
|
||||
stripLen = 2;
|
||||
hash = "sha256-K0ImsDADhH6G3R+27nRX/sD7UdRXptYIkLaoxuwB8+M=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "${src.name}/python/kserve";
|
||||
sourceRoot = "${finalAttrs.src.name}/python/kserve";
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"fastapi"
|
||||
@@ -142,7 +142,7 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
tomlkit
|
||||
]
|
||||
++ lib.concatAttrValues optional-dependencies;
|
||||
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
|
||||
|
||||
pythonImportsCheck = [ "kserve" ];
|
||||
|
||||
@@ -205,8 +205,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Standardized Serverless ML Inference Platform on Kubernetes";
|
||||
homepage = "https://github.com/kserve/kserve/tree/master/python/kserve";
|
||||
changelog = "https://github.com/kserve/kserve/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/kserve/kserve/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
gsl,
|
||||
harminv,
|
||||
libctl,
|
||||
libGDSII,
|
||||
libgdsii,
|
||||
guile,
|
||||
mpb,
|
||||
python,
|
||||
@@ -65,7 +65,7 @@ buildPythonPackage rec {
|
||||
hdf5-mpi
|
||||
harminv
|
||||
libctl
|
||||
libGDSII
|
||||
libgdsii
|
||||
guile
|
||||
gsl
|
||||
mpb
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "msgraph-sdk";
|
||||
version = "1.53.0";
|
||||
version = "1.54.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoftgraph";
|
||||
repo = "msgraph-sdk-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zBVqH1mPAFhMmGlaI/bYCP4d+Rsu8aH6egi4MVECtYs=";
|
||||
hash = "sha256-xlUZFw3A9ByXswVGBsxi00n3WvLc4OzCQnIQkTZp21A=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "myst-docutils";
|
||||
version = "4.0.1";
|
||||
version = "5.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "executablebooks";
|
||||
repo = "MyST-Parser";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/Prauz4zuJY39EK2BmgBbH1uwjF4K38e5X5hPYwRBl0=";
|
||||
hash = "sha256-0lGejdGVVvZar3sPBbvThXzJML7PcR5+shyDHTTtVEY=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitLab,
|
||||
pytestCheckHook,
|
||||
|
||||
cffi,
|
||||
icontract,
|
||||
setuptools,
|
||||
sfcgal,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pysfcgal";
|
||||
version = "2.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sfcgal";
|
||||
repo = "pysfcgal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/G6yC7u2CYM7D9xO2IOB8+AjWc4ErzTIdvHmwGRxXBc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
sfcgal
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
cffi
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pysfcgal"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
icontract
|
||||
];
|
||||
|
||||
# remove src module, so tests use the installed module instead
|
||||
preCheck = ''
|
||||
rm -rf pysfcgal
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# this test is failing due to mismatched output
|
||||
"test_wrap_geom_segfault"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python wrapper for SFCGAL";
|
||||
homepage = "https://gitlab.com/sfcgal/pysfcgal";
|
||||
changelog = "https://gitlab.com/sfcgal/pysfcgal/-/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
teams = with lib.teams; [
|
||||
geospatial
|
||||
ngi
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tlds";
|
||||
version = "2025102200";
|
||||
version = "2026020700";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kichik";
|
||||
repo = "tlds";
|
||||
tag = version;
|
||||
hash = "sha256-rulYXgVjzPcb5cBi57u4uzR6KDCp+NUaUMzi1o/SrN4=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cpm3x17B+w+Tq+ztQjd0Xttkyivv5Al+3w6RD+SU3T8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
@@ -33,4 +33,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -133,8 +133,8 @@ let
|
||||
cutlass-flashmla = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "cutlass";
|
||||
tag = "v3.9.0";
|
||||
hash = "sha256-Q6y/Z6vahASeSsfxvZDwbMFHGx8CnsF90IlveeVLO9g=";
|
||||
rev = "147f5673d0c1c3dcf66f78d677fd647e4a020219";
|
||||
hash = "sha256-dHQto08IwTDOIuFUp9jwm1MWkFi8v2YJ/UESrLuG71g=";
|
||||
};
|
||||
|
||||
flashmla = stdenv.mkDerivation {
|
||||
@@ -148,8 +148,8 @@ let
|
||||
name = "FlashMLA-source";
|
||||
owner = "vllm-project";
|
||||
repo = "FlashMLA";
|
||||
rev = "46d64a8ebef03fa50b4ae74937276a5c940e3f95";
|
||||
hash = "sha256-jtMzWB5hKz8mJGsdK6q4YpQbGp9IrQxbwmB3a64DIl0=";
|
||||
rev = "c2afa9cb93e674d5a9120a170a6da57b89267208";
|
||||
hash = "sha256-pKlwxV6G9iHag/jbu3bAyvYvnu5TbrQwUMFV0AlGC3s=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -324,14 +324,14 @@ in
|
||||
|
||||
buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: {
|
||||
pname = "vllm";
|
||||
version = "0.14.0";
|
||||
version = "0.15.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vllm-project";
|
||||
repo = "vllm";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gUfEjoNgS/FgSDqQDnDe/onWGigzwkKuPgmdRZHVGn0=";
|
||||
hash = "sha256-qsAvcOB8ugGlBqBrLfNHqaIUcxLwaXBTg8xWRnGyd94=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.25.5";
|
||||
version = "0.27.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jemGZkWmN1x2+ZzJ5cLp3MoXO0oDKjtZTmZS9Be/TDw=";
|
||||
hash = "sha256-JbJB3F1NQlmA5d0rdsLm4RVD24OPdV4QXpxW8VWbESA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "pgmq";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tembo-io";
|
||||
repo = "pgmq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Rgs3iZfnKAijz8mk9A2tM1WuL8uMFYE3IRa+JgWk0LE=";
|
||||
hash = "sha256-sNOFr3tiZATFBvRBm4pSsn8YR62zqN06VBOBnvdXgts=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/pgmq-extension";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "plpgsql-check";
|
||||
version = "2.8.5";
|
||||
version = "2.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = "plpgsql_check";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1EMK6WTJ/LBB0oD4i+Lni8wMh80HZtop8uRqwm3XwKw=";
|
||||
hash = "sha256-jAcQ5gUWjyw4A+pJWKf06EayY/UKeSzlNmnTD4mV/c4=";
|
||||
};
|
||||
|
||||
passthru.tests.extension = postgresqlTestExtension {
|
||||
|
||||
@@ -664,7 +664,8 @@ let
|
||||
let
|
||||
installedExtensions = f postgresql.pkgs;
|
||||
finalPackage = buildEnv {
|
||||
name = "${postgresql.pname}-and-plugins-${postgresql.version}";
|
||||
pname = "${postgresql.pname}-and-plugins";
|
||||
inherit (postgresql) version;
|
||||
paths = installedExtensions ++ [
|
||||
# consider keeping in-sync with `postBuild` below
|
||||
postgresql
|
||||
@@ -694,7 +695,6 @@ let
|
||||
inherit (postgresql)
|
||||
pkgs
|
||||
psqlSchema
|
||||
version
|
||||
;
|
||||
|
||||
pg_config = postgresql.pg_config.override {
|
||||
|
||||
@@ -989,6 +989,7 @@ mapAliases {
|
||||
libFS = libfs; # Added 2026-02-04
|
||||
libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
|
||||
libgda = throw "'libgda' has been renamed to/replaced by 'libgda5'"; # Converted to throw 2025-10-27
|
||||
libGDSII = libgdsii; # Added 2026-02-08
|
||||
libgme = throw "'libgme' has been renamed to/replaced by 'game-music-emu'"; # Converted to throw 2025-10-27
|
||||
libgnome-keyring3 = throw "'libgnome-keyring3' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2025-10-27
|
||||
libheimdal = throw "'libheimdal' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2025-10-27
|
||||
@@ -1280,6 +1281,7 @@ mapAliases {
|
||||
mold-wrapped = warnAlias "'mold-wrapped' has been renamed to 'mold'" pkgs.mold; # Added 2025-11-12
|
||||
mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23
|
||||
monitor = pantheon.elementary-monitor; # Added 2025-10-10
|
||||
monkeysAudio = monkeys-audio; # Added 2026-02-08
|
||||
mono4 = mono6; # Added 2025-08-25
|
||||
mono5 = mono6; # Added 2025-08-25
|
||||
mono-addins = throw "mono-addins has been removed due to its dependency on the removed mono4. Consider alternative frameworks or migrate to newer .NET technologies."; # Added 2025-08-25
|
||||
|
||||
@@ -14683,6 +14683,8 @@ self: super: with self; {
|
||||
|
||||
pyseventeentrack = callPackage ../development/python-modules/pyseventeentrack { };
|
||||
|
||||
pysfcgal = callPackage ../development/python-modules/pysfcgal { };
|
||||
|
||||
pysftp = callPackage ../development/python-modules/pysftp { };
|
||||
|
||||
pyshark = callPackage ../development/python-modules/pyshark { };
|
||||
|
||||
Reference in New Issue
Block a user