Merge staging-next into staging
This commit is contained in:
@@ -53,6 +53,8 @@
|
||||
- `kanata` now requires `karabiner-dk` version 6.0+ or later.
|
||||
The package has been updated to use the new `karabiner-dk` package and the `darwinDriver` output stays at the version defined in the package.
|
||||
|
||||
- Reloading or restarting systemd units from the NixOS activation script is deprecated, and will be removed in NixOS 26.11. This deprecation is part of a bigger effort to deprecate activation scripts altogether, which will take place over several releases. There are no in-tree usages of the now-deprecated reload/restart functionality.
|
||||
|
||||
- `elegant-sddm` has been updated to be Qt6 compatible. Themes for SDDM are slightly different so read the [wiki](https://wiki.nixos.org/wiki/SDDM_Themes) for more.
|
||||
|
||||
- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.
|
||||
|
||||
@@ -34,25 +34,6 @@ is also run when `nixos-rebuild dry-activate` is run. To differentiate between
|
||||
real and dry activation, the `$NIXOS_ACTION` environment variable can be
|
||||
read which is set to `dry-activate` when a dry activation is done.
|
||||
|
||||
An activation script can write to special files instructing
|
||||
`switch-to-configuration` to restart/reload units. The script will take these
|
||||
requests into account and will incorporate the unit configuration as described
|
||||
above. This means that the activation script will "fake" a modified unit file
|
||||
and `switch-to-configuration` will act accordingly. By doing so, configuration
|
||||
like [systemd.services.\<name\>.restartIfChanged](#opt-systemd.services) is
|
||||
respected. Since the activation script is run **after** services are already
|
||||
stopped, [systemd.services.\<name\>.stopIfChanged](#opt-systemd.services)
|
||||
cannot be taken into account anymore and the unit is always restarted instead
|
||||
of being stopped and started afterwards.
|
||||
|
||||
The files that can be written to are `/run/nixos/activation-restart-list` and
|
||||
`/run/nixos/activation-reload-list` with their respective counterparts for
|
||||
dry activation being `/run/nixos/dry-activation-restart-list` and
|
||||
`/run/nixos/dry-activation-reload-list`. Those files can contain
|
||||
newline-separated lists of unit names where duplicates are being ignored. These
|
||||
files are not create automatically and activation scripts must take the
|
||||
possibility into account that they have to create them first.
|
||||
|
||||
## NixOS snippets {#sec-activation-script-nixos-snippets}
|
||||
|
||||
There are some snippets NixOS enables by default because disabling them would
|
||||
@@ -63,12 +44,8 @@ do:
|
||||
- `etc` sets up the contents of `/etc`, this includes systemd units and
|
||||
excludes `/etc/passwd`, `/etc/group`, and `/etc/shadow` (which are managed by
|
||||
the `users` snippet)
|
||||
- `hostname` sets the system's hostname in the kernel (not in `/etc`)
|
||||
- `modprobe` sets the path to the `modprobe` binary for module auto-loading
|
||||
- `nix` prepares the nix store and adds a default initial channel
|
||||
- `specialfs` is responsible for mounting filesystems like `/proc` and `sys`
|
||||
- `users` creates and removes users and groups by managing `/etc/passwd`,
|
||||
`/etc/group` and `/etc/shadow`. This also creates home directories
|
||||
- `usrbinenv` creates `/usr/bin/env`
|
||||
- `var` creates some directories in `/var` that are not service-specific
|
||||
- `wrappers` creates setuid wrappers like `sudo`
|
||||
|
||||
@@ -245,9 +245,9 @@ in
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@chown"
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"@chown"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,26 +7,31 @@
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
icoutils,
|
||||
fetchpatch2,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "antares";
|
||||
version = "0.7.29";
|
||||
version = "0.7.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antares-sql";
|
||||
repo = "antares";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3zgr3Eefx3WDUW9/1NOaneUbFy3GTnJ3tGgivtW1K/g=";
|
||||
hash = "sha256-A/ievIKXfFGu90aijxhmEWvfg2RqDtd7AtU+iyma3lU=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-WJ5HVVa4rEOsvr52L/OGk+vlxRiKLJTxWmUnpN1FnbY=";
|
||||
npmDepsHash = "sha256-X2dG75fpeXeU40wb22KAI7tDBybFwWUpKVj0Mlo3xhc=";
|
||||
|
||||
patches = [
|
||||
# Since version 0.7.28, package-lock is not updated properly so this patch update it to be able to build the package
|
||||
# This patch will probably be removed in the next version
|
||||
# If it does not build without it, you just need to do a npm update in the antares project and copy the patch
|
||||
./npm-lock.patch
|
||||
# https://github.com/antares-sql/antares/pull/1005
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/antares-sql/antares/commit/6b2a45d93cf7fefdc92e0d87f390cd21a069b9a4.patch?full_index=1";
|
||||
hash = "sha256-2dOGY0K6jMxSLNLDhwy/+ysTRB24XRXSoDu1AVxi4w4=";
|
||||
})
|
||||
];
|
||||
|
||||
nodejs = nodejs_22;
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bulky";
|
||||
version = "4.0";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "bulky";
|
||||
tag = version;
|
||||
hash = "sha256-BHMCtvnz3Ua4pa3Pnh2PbxZ9a0vJOJ+Se2/DaPbUqQA=";
|
||||
hash = "sha256-rUQ4GN8Pj7dXLbQBt99RmFk4rs+mFL/1taFJiTTVC2A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deark";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jsummers";
|
||||
repo = "deark";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EnolN4uSHDm1sIkbwCmZUe70DdHyXP3Si4QwGaMtN0A=";
|
||||
hash = "sha256-FA0O/yJoFByOPEb1UcRWARr2z7CdjWHKa4s8Q4Sl5Zo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,16 +19,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "flying-carpet";
|
||||
version = "9.0.9";
|
||||
version = "9.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spieglt";
|
||||
repo = "FlyingCarpet";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-XwhK0/eK8KxVf4aZUY2qgc6IMPnixxdwwrm3dl5Sfmk=";
|
||||
hash = "sha256-7yGU4HCuP8/6UC1J6fNA5CpppJGGhS/ywThXRToDTqo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-BtL6tAKIaj7wtJ9VTRbR3Kx8mGi56h9oBG63suCl1OA=";
|
||||
cargoHash = "sha256-/Z+0hdQ1H9R7FMLunGT5WgQKFY0b0b6gzrR2CNMe2II=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-online-accounts-gtk";
|
||||
version = "3.50.9";
|
||||
version = "3.50.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xapp-project";
|
||||
repo = "gnome-online-accounts-gtk";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-X7/TfY4Amei/CYO+FaXoSb48Y3/mQwduw40rTl6pN50=";
|
||||
hash = "sha256-tBBCnB3JhGaaN/uv6BqyJDSvSyV1mPA4WvsvNS8cbOA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,10 +2,12 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
vala,
|
||||
rustPlatform,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
cargo,
|
||||
rustc,
|
||||
wrapGAppsHook4,
|
||||
blueprint-compiler,
|
||||
desktop-file-utils,
|
||||
@@ -13,26 +15,32 @@
|
||||
gtk4,
|
||||
libadwaita,
|
||||
webkitgtk_6_0,
|
||||
json-glib,
|
||||
libgee,
|
||||
glib-networking,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "karere";
|
||||
version = "1.1.0";
|
||||
version = "2.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tobagin";
|
||||
repo = "karere";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4jV2vE7KtdpA9qjKR4xj/w6g1WZD/l8ezRtuFyzJtZ8=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-roxynxGiM43VHl+ngo/EMKEJ56XaYA6qaok/SzppFlY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-BYG1TgCbkaQlquFy/tmjzdfypc8yno7w7SdBsgqOxkU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
vala
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
cargo
|
||||
rustc
|
||||
rustPlatform.cargoSetupHook
|
||||
wrapGAppsHook4
|
||||
blueprint-compiler
|
||||
desktop-file-utils
|
||||
@@ -43,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtk4
|
||||
libadwaita
|
||||
webkitgtk_6_0
|
||||
json-glib
|
||||
libgee
|
||||
glib-networking
|
||||
];
|
||||
|
||||
meta = {
|
||||
@@ -52,7 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/tobagin/karere";
|
||||
changelog = "https://github.com/tobagin/karere/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ marcel ];
|
||||
maintainers = with lib.maintainers; [
|
||||
marcel
|
||||
aleksana
|
||||
];
|
||||
mainProgram = "karere";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lightdm-slick-greeter";
|
||||
version = "2.2.5";
|
||||
version = "2.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "slick-greeter";
|
||||
rev = version;
|
||||
hash = "sha256-soXhVpzO4bJfZ5EV6uEDJOhwV9HJDfxUIuHi9AxaE0A=";
|
||||
hash = "sha256-zYjtd/Lb9ialq+pzOml4FMfPq9maX848Or6lzyZj4qs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -33,13 +33,13 @@ let
|
||||
|
||||
finalAttrs = {
|
||||
pname = "ncps";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kalbasit";
|
||||
repo = "ncps";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/Fa8cpBACbbB74W1HSQmsS06BLofnH094be6I2peX0U=";
|
||||
hash = "sha256-GIAZ1fKIYCi+qPCIYJpi7q1AigEcIk60SxNUvzYnROA=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "shore";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MoonKraken";
|
||||
repo = "shore";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-K9GKMijLU1ii5O8P4fT5Vl3S3HoVmvcUyCiIC69dTdU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HYdTODIHA1TGhu6BKrKFkvBlGtqVt89wYX9Ehn0EOC0=";
|
||||
|
||||
env.OPENSSL_NO_VENDOR = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
meta = {
|
||||
description = "CLI-based frontend for inference providers with vim inspired keybindings";
|
||||
homepage = "https://github.com/MoonKraken/shore";
|
||||
changelog = "https://github.com/MoonKraken/shore/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
mainProgram = "shore";
|
||||
};
|
||||
})
|
||||
@@ -1452,6 +1452,13 @@ won't take effect until you reboot the system.
|
||||
.map(|mut child| child.wait());
|
||||
|
||||
// Handle the activation script requesting the restart or reload of a unit.
|
||||
|
||||
if std::fs::exists(DRY_RESTART_BY_ACTIVATION_LIST_FILE)?
|
||||
|| std::fs::exists(DRY_RELOAD_BY_ACTIVATION_LIST_FILE)?
|
||||
{
|
||||
eprintln!("WARN: restarting or reloading systemd units from the activation script is deprecated and will be removed in NixOS 26.11.");
|
||||
}
|
||||
|
||||
for unit in std::fs::read_to_string(DRY_RESTART_BY_ACTIVATION_LIST_FILE)
|
||||
.unwrap_or_default()
|
||||
.lines()
|
||||
@@ -1616,6 +1623,12 @@ won't take effect until you reboot the system.
|
||||
}
|
||||
}
|
||||
|
||||
if std::fs::exists(RESTART_BY_ACTIVATION_LIST_FILE)?
|
||||
|| std::fs::exists(RELOAD_BY_ACTIVATION_LIST_FILE)?
|
||||
{
|
||||
eprintln!("WARN: restarting or reloading systemd units from the activation script is deprecated and will be removed in NixOS 26.11.");
|
||||
}
|
||||
|
||||
// Handle the activation script requesting the restart or reload of a unit.
|
||||
for unit in std::fs::read_to_string(RESTART_BY_ACTIVATION_LIST_FILE)
|
||||
.unwrap_or_default()
|
||||
|
||||
@@ -8,12 +8,14 @@
|
||||
glibc,
|
||||
harfbuzz,
|
||||
libheif,
|
||||
nixosTests,
|
||||
x265,
|
||||
libde265,
|
||||
icu,
|
||||
jdk,
|
||||
lib,
|
||||
nodejs,
|
||||
# workaround https://github.com/NixOS/nixpkgs/issues/477805
|
||||
nodejs_22,
|
||||
# needs to be static and built with MD2 support!
|
||||
openssl,
|
||||
pkg-config,
|
||||
@@ -27,7 +29,7 @@
|
||||
|
||||
let
|
||||
qmake = qt5.qmake;
|
||||
libv8 = nodejs.libv8;
|
||||
libv8 = nodejs_22.libv8;
|
||||
fixIcu = writeScript "fix-icu.sh" ''
|
||||
substituteInPlace \
|
||||
$BUILDRT/Common/3dParty/icu/icu.pri \
|
||||
@@ -42,13 +44,6 @@ let
|
||||
"QMAKE_LFLAGS+=-licudata"
|
||||
"QMAKE_LFLAGS+=-L${icu}/lib"
|
||||
];
|
||||
# see core/Common/3dParty/html/fetch.sh
|
||||
katana-parser-src = fetchFromGitHub {
|
||||
owner = "jasenhuang";
|
||||
repo = "katana-parser";
|
||||
rev = "be6df458d4540eee375c513958dcb862a391cdd1";
|
||||
hash = "sha256-SYJFLtrg8raGyr3zQIEzZDjHDmMmt+K0po3viipZW5c=";
|
||||
};
|
||||
# see core/Common/3dParty/html/fetch.py
|
||||
gumbo-parser-src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
@@ -56,6 +51,13 @@ let
|
||||
rev = "aa91b27b02c0c80c482e24348a457ed7c3c088e0";
|
||||
hash = "sha256-+607iXJxeWKoCwb490pp3mqRZ1fWzxec0tJOEFeHoCs=";
|
||||
};
|
||||
# see core/Common/3dParty/html/fetch.sh
|
||||
katana-parser-src = fetchFromGitHub {
|
||||
owner = "jasenhuang";
|
||||
repo = "katana-parser";
|
||||
rev = "be6df458d4540eee375c513958dcb862a391cdd1";
|
||||
hash = "sha256-SYJFLtrg8raGyr3zQIEzZDjHDmMmt+K0po3viipZW5c=";
|
||||
};
|
||||
# see build_tools scripts/core_common/modules/googletest.py
|
||||
googletest-src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
@@ -117,26 +119,29 @@ let
|
||||
qmakeFlags = [ ];
|
||||
dontStrip = false;
|
||||
|
||||
# Revisions that correspond to onlyoffice-documentserver 9.1.0
|
||||
core-rev = "82e281cf6bf89498e4de6018423b36576706c2b6";
|
||||
# Revisions that correspond to onlyoffice-documentserver 9.2.1
|
||||
core-rev = "a22f0bfb6032e91f218951ef1c0fc29f6d1ceb36";
|
||||
core = fetchFromGitHub {
|
||||
owner = "ONLYOFFICE";
|
||||
repo = "core";
|
||||
# rev that the 'core' submodule in documentserver points at
|
||||
rev = core-rev;
|
||||
hash = "sha256-LzbO2A29WxM0XTAO2LGTtg9omL0Pvoh+6+q3ux4i7do=";
|
||||
hash = "sha256-RSoCRcUGnavcNdZEfmBdtxJbEXhiOvbA8IwSeGBkWcs=";
|
||||
};
|
||||
web-apps = buildNpmPackage (finalAttrs: {
|
||||
name = "onlyoffice-core-webapps";
|
||||
|
||||
# workaround for https://github.com/NixOS/nixpkgs/issues/477803
|
||||
nodejs = nodejs_22;
|
||||
|
||||
#src = /home/aengelen/d/onlyoffice/documentserver/web-apps;
|
||||
#sourceRoot = "/build/web-apps/build";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ONLYOFFICE";
|
||||
repo = "web-apps";
|
||||
# rev that the 'web-apps' submodule in documentserver points at
|
||||
rev = "f63e9674a5d2d2e5a660ab726ec00a359fc3c750";
|
||||
hash = "sha256-kKm6+phd6a7kP/kv6/v/FFgh96Kbs6h6jIjpFtRJgps=";
|
||||
rev = "c2074bbff69902490d49fa7fb511801a11c581f4";
|
||||
hash = "sha256-i+m8a1b8RaVmyUAC+FiEdSyXmPWse9XaJaaLL7iq73o=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/build";
|
||||
|
||||
@@ -175,8 +180,8 @@ let
|
||||
owner = "ONLYOFFICE";
|
||||
repo = "sdkjs";
|
||||
# rev that the 'sdkjs' submodule in documentserver points at
|
||||
rev = "d169f841a7e9e46368c36236dd5820e3e10d4a98";
|
||||
hash = "sha256-GQwzz3P49sWjCxh41zyuUs5MyMjBQXaMKzxUUTHq0UE=";
|
||||
rev = "1e81e7e844fcc602c639067cce7d7726749dc11b";
|
||||
hash = "sha256-9vDGU8paLUAk3GtLbawhog2EDtCVHzNPBjkryxyg6Gs=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/build";
|
||||
|
||||
@@ -738,7 +743,7 @@ buildCoreComponent "X2tConverter/build/Qt" {
|
||||
pname = "x2t";
|
||||
# x2t is not 'directly' versioned, so we version it after the version
|
||||
# of documentserver it's pulled into as a submodule
|
||||
version = "9.1.0";
|
||||
version = "9.2.1";
|
||||
|
||||
buildInputs = [
|
||||
unicodeConverter
|
||||
@@ -814,6 +819,7 @@ buildCoreComponent "X2tConverter/build/Qt" {
|
||||
x2t = runCommand "x2t-test" { } ''
|
||||
(${x2t}/bin/x2t || true) | grep "OOX/binary file converter." && mkdir -p $out
|
||||
'';
|
||||
nixos-module = nixosTests.onlyoffice;
|
||||
};
|
||||
passthru.components = {
|
||||
inherit
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
@@ -30,22 +31,21 @@
|
||||
pythonAtLeast,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cleanlab";
|
||||
version = "2.7.1";
|
||||
version = "2.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cleanlab";
|
||||
repo = "cleanlab";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KzVqBOLTxxkgvoGPYMeYb7zMuG8VwQwX6SYR/FUhfBw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sgDQJy0iNxs3bIVuqV7LVEFC0jjlWvnqFzKr7ZDGmPo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"numpy"
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
@@ -56,13 +56,6 @@ buildPythonPackage rec {
|
||||
pandas
|
||||
];
|
||||
|
||||
# This is ONLY turned off when we have testing enabled.
|
||||
# The reason we do this is because of duplicate packages in the enclosure
|
||||
# when using the packages in nativeCheckInputs.
|
||||
# Affected packages: grpcio protobuf tensorboard tensorboard-plugin-profile
|
||||
catchConflicts = (!doCheck);
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
cleanvision
|
||||
datasets
|
||||
@@ -111,7 +104,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Standard data-centric AI package for data quality and machine learning with messy, real-world data and labels";
|
||||
homepage = "https://github.com/cleanlab/cleanlab";
|
||||
changelog = "https://github.com/cleanlab/cleanlab/releases/tag/v${version}";
|
||||
changelog = "https://github.com/cleanlab/cleanlab/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
# cleanlab is incompatible with datasets>=4.0.0
|
||||
@@ -119,4 +112,4 @@ buildPythonPackage rec {
|
||||
# https://github.com/cleanlab/cleanlab/issues/1244
|
||||
broken = lib.versionAtLeast datasets.version "4.0.0";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
pandas,
|
||||
pyparsing,
|
||||
pyro-ppl,
|
||||
scikit-base,
|
||||
scikit-learn,
|
||||
scipy,
|
||||
statsmodels,
|
||||
@@ -23,17 +24,18 @@
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
mock,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pgmpy";
|
||||
version = "1.0.0";
|
||||
version = "1.0.0-unstable-2025-12-20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmpy";
|
||||
repo = "pgmpy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WmRtek3lN7vEfXqoaZDiaNjMQ7R2PmJ/OEwxOV7m5sE=";
|
||||
rev = "197e1e0444c77c00581a4c32763811e5b03f8503";
|
||||
hash = "sha256-TCnn3GrITW8HCrYVeeythiULV130b6uulkijkPpJOqA=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
@@ -45,6 +47,7 @@ buildPythonPackage rec {
|
||||
pandas
|
||||
pyparsing
|
||||
pyro-ppl
|
||||
scikit-base
|
||||
scikit-learn
|
||||
scipy
|
||||
statsmodels
|
||||
@@ -67,6 +70,20 @@ buildPythonPackage rec {
|
||||
|
||||
# AssertionError
|
||||
"test_estimate_example_smoke_test"
|
||||
"test_gcm"
|
||||
];
|
||||
|
||||
enabledTestPaths = [
|
||||
"pgmpy/tests"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires network access
|
||||
"pgmpy/tests/test_datasets"
|
||||
|
||||
# Very slow
|
||||
"pgmpy/tests/test_estimators"
|
||||
"pgmpy/tests/test_models"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -74,6 +91,7 @@ buildPythonPackage rec {
|
||||
# xdoctest
|
||||
pytest-cov-stub
|
||||
mock
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pgmpy" ];
|
||||
@@ -81,8 +99,11 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python Library for learning (Structure and Parameter), inference (Probabilistic and Causal), and simulations in Bayesian Networks";
|
||||
homepage = "https://github.com/pgmpy/pgmpy";
|
||||
changelog = "https://github.com/pgmpy/pgmpy/releases/tag/${src.tag}";
|
||||
# changelog = "https://github.com/pgmpy/pgmpy/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
maintainers = with lib.maintainers; [
|
||||
happysalada
|
||||
sarahec
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -28,17 +28,17 @@
|
||||
pocl,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pyopencl";
|
||||
version = "2025.2.7";
|
||||
version = "2026.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "inducer";
|
||||
repo = "pyopencl";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-LrV4NHn4I2kaZvXuWs706fvHUOR4sc+Pv8wVHPVKpPo=";
|
||||
hash = "sha256-1P0An6yP7+ie893i1AkKlfXprhfikJGY3FTTnxQgWtI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -93,8 +93,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python wrapper for OpenCL";
|
||||
homepage = "https://github.com/pyopencl/pyopencl";
|
||||
changelog = "https://github.com/inducer/pyopencl/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/inducer/pyopencl/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-manilaclient";
|
||||
version = "5.7.0";
|
||||
version = "5.7.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "python_manilaclient";
|
||||
inherit version;
|
||||
hash = "sha256-ozpvEpIR1DdfG8+7RD0NisDfqa109GtMDEVB+H91uAQ=";
|
||||
hash = "sha256-BdFUVnvSX7yitHSlP/GzD2jzvF8vh9B4QVVQrqYwW9Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
protobuf,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tensorflow-metadata";
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "metadata";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YqFQOm8K4WFUlpWqkZm8pZpfupf7ZtJTODJodjLnzK4=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4xj2JfQryGy7a9ho9/JJtyg+0H5VLQzq9JevOmOWJZk=";
|
||||
};
|
||||
|
||||
patches = [ ./build.patch ];
|
||||
@@ -54,8 +54,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Standard representations for metadata that are useful when training machine learning models with TensorFlow";
|
||||
homepage = "https://github.com/tensorflow/metadata";
|
||||
changelog = "https://github.com/tensorflow/metadata/releases/tag/v${version}";
|
||||
changelog = "https://github.com/tensorflow/metadata/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ndl ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user