Merge master into staging-next
This commit is contained in:
@@ -61,16 +61,27 @@ in
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
|
||||
unitConfig = {
|
||||
After = "graphical-session.target";
|
||||
ConditionEnvironment = [
|
||||
"|WAYLAND_DISPLAY"
|
||||
"|DISPLAY"
|
||||
];
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
# workaround for https://github.com/NixOS/nixpkgs/issues/469340
|
||||
ExecStartPre = pkgs.writeShellScript "disable-for-gdm-greeter" ''
|
||||
if [[ "$USER" = "gdm-greeter"* ]]; then
|
||||
# workaround for https://github.com/NixOS/nixpkgs/issues/469340 and
|
||||
# https://github.com/OpenTabletDriver/OpenTabletDriver/issues/4885
|
||||
ExecStartPre = pkgs.writeShellScript "poll-for-non-gdm-greeter-display" ''
|
||||
if [[ "$USER" = "gdm-greeter"* \
|
||||
|| ( "$${XDG_SESSION_TYPE}" = wayland && -z "$${WAYLAND_DISPLAY}" ) ]]; then
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
ExecStart = lib.getExe' cfg.package "otd-daemon";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 3;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -91,6 +91,20 @@ in
|
||||
};
|
||||
users.groups.errbot = { };
|
||||
|
||||
systemd.tmpfiles.settings = {
|
||||
"10-errbot" = lib.mapAttrs' (
|
||||
name: instanceCfg:
|
||||
let
|
||||
dataDir = if instanceCfg.dataDir != null then instanceCfg.dataDir else "/var/lib/errbot/${name}";
|
||||
in
|
||||
lib.nameValuePair "${dataDir}".d {
|
||||
group = "errbot";
|
||||
user = "errbot";
|
||||
mode = "0755";
|
||||
}
|
||||
) cfg.instances;
|
||||
};
|
||||
|
||||
systemd.services = lib.mapAttrs' (
|
||||
name: instanceCfg:
|
||||
lib.nameValuePair "errbot-${name}" (
|
||||
@@ -103,12 +117,7 @@ in
|
||||
serviceConfig = {
|
||||
User = "errbot";
|
||||
Restart = "on-failure";
|
||||
ExecStartPre = [
|
||||
"${lib.getExe' pkgs.coreutils "mkdir"} -p ${dataDir}"
|
||||
"${lib.getExe' pkgs.coreutils "chown"} -R errbot:errbot ${dataDir}"
|
||||
];
|
||||
ExecStart = "${pkgs.errbot}/bin/errbot -c ${mkConfigDir instanceCfg dataDir}/config.py";
|
||||
PermissionsStartOnly = true;
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
@@ -374,6 +374,10 @@ in
|
||||
anubis = { };
|
||||
};
|
||||
|
||||
systemd.slices.system-anubis = {
|
||||
description = "Anubis AI Firewall System Slice";
|
||||
documentation = [ "https://anubis.techaro.lol" ];
|
||||
};
|
||||
systemd.services = lib.mapAttrs' (
|
||||
name: instance:
|
||||
lib.nameValuePair "${instanceName name}" {
|
||||
@@ -396,6 +400,7 @@ in
|
||||
);
|
||||
|
||||
serviceConfig = {
|
||||
Slice = "system-anubis.slice";
|
||||
User = instance.user;
|
||||
Group = instance.group;
|
||||
DynamicUser = true;
|
||||
|
||||
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-/RKpbsdp7MjakNvKWvq2OiwLJ7mftHKKrb5xwKlM76Y=";
|
||||
hash = "sha256-JYg1P0t3YadTxmqeRSky8X9emLnP2cO3BYO9R7PgQfM=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-mdgzM0dymFjSYFm018wsuWzzUJJsA896YmRwoH1wLmM=";
|
||||
hash = "sha256-miK4K8THmT+ebjcAl/3Cp9vtVWfMlpIWWIqyAm5+YeQ=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-0EFuSvcSLTfrR74Uxpwiq2K39cWqi33q80AhtlilCnQ=";
|
||||
hash = "sha256-ao9yGH9xIBmNrp/sHpwpxKZnR8LjXl1Cegfgw7Nq+2M=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "claude-code";
|
||||
publisher = "anthropic";
|
||||
version = "2.1.214";
|
||||
version = "2.1.215";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
@@ -68,11 +68,11 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
jq
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
jq
|
||||
libkrb5
|
||||
zlib
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
|
||||
@@ -73,6 +73,9 @@ let
|
||||
# This cannot be removed, it is used by some extensions.
|
||||
installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [ unpackVsixSetupHook ] ++ nativeBuildInputs;
|
||||
|
||||
installPhase =
|
||||
|
||||
@@ -435,7 +435,7 @@ let
|
||||
;;
|
||||
*)
|
||||
# Copy if the symlink resolves to a Mach-O dylib
|
||||
otool -l "$file" 2>/dev/null | grep -q 'LC_ID_DYLIB' || continue
|
||||
otool -l "$file" 2>/dev/null | grep -F 'LC_ID_DYLIB' >/dev/null || continue
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weechat";
|
||||
version = "4.9.3";
|
||||
version = "4.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
|
||||
hash = "sha256-XH2VOfqGyZ6nalUaiJqSusIeq3uyeQ29NGRS0AsQw3w=";
|
||||
hash = "sha256-P8UDWfOjsljJ8DFIsC87nFkZRTXRtGXEgfuFp2wu0AU=";
|
||||
};
|
||||
|
||||
# Why is this needed? https://github.com/weechat/weechat/issues/2031
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://4ti2.github.io/";
|
||||
description = "Software package for algebraic, geometric and combinatorial problems on linear spaces";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ coolcuber ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "arftracksat";
|
||||
version = "1.0-unstable-2025-09-15";
|
||||
version = "1.0-unstable-2026-02-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arf20";
|
||||
repo = "arftracksat";
|
||||
rev = "5c9b3866b6fcd95382ff56c68cdd38f3d08c1372";
|
||||
hash = "sha256-inCgsxrJkBNGmdGPd28XnOJYCiatL35TxDcfvZjA2cY=";
|
||||
rev = "a9b86878e2ee6f332dc1df07685b7d20970c2f7e";
|
||||
hash = "sha256-guDgy4H0pnQCihYwG7HoKApOlEcDtcaRaj6fRuVdLlc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -35,11 +35,13 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
curl
|
||||
nlohmann_json
|
||||
curlpp
|
||||
glm
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
freeglut
|
||||
libGL
|
||||
libGLU
|
||||
curlpp
|
||||
glm
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
fetchPnpmDeps,
|
||||
pnpm,
|
||||
pnpmConfigHook,
|
||||
nodejs,
|
||||
openssl,
|
||||
pkg-config,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bichon";
|
||||
version = "1.6.2";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rustmailer";
|
||||
repo = "bichon";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-a8BAO93eI2eiFwmvMqUsgL1KZ11X3qg/r/Iw6ckMSTs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GC/2bswme76bAFRCsBHFi3lWnYx5x5H58emCmkiyKfE=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
sourceRoot = "${finalAttrs.src.name}/web";
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-Ax8z1sjt8v6XOenhw7eRuEEo0huPv9fbcfzqc8RxJEc=";
|
||||
};
|
||||
pnpmRoot = "web";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
];
|
||||
|
||||
env.GIT_HASH = finalAttrs.src.rev;
|
||||
|
||||
preBuild = ''
|
||||
# Build web frontend before rust build
|
||||
pushd web
|
||||
pnpm run build
|
||||
popd
|
||||
|
||||
# Just sets the GIT_HASH variable for builds, we set it above so we don't need git
|
||||
rm crates/server/build.rs
|
||||
'';
|
||||
|
||||
# The tests are flaky and some require the network
|
||||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
# `bichon-server` doesn't have a `--version` option but `bichon-cli` does.
|
||||
versionCheckProgram = "${placeholder "out"}/bin/bichon-cli";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/rustmailer/bichon/releases/tag/${finalAttrs.version}";
|
||||
description = "Lightweight, high-performance Rust email archiver with WebUI";
|
||||
homepage = "https://github.com/rustmailer/bichon";
|
||||
license = with lib.licenses; [ agpl3Only ];
|
||||
maintainers = with lib.maintainers; [ pyrox0 ];
|
||||
mainProgram = "bichon-server";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buf";
|
||||
version = "1.71.0";
|
||||
version = "1.72.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "buf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GrGtJzZoyyEoIyqc8iItH7/LhXNEuTKbDl+gdB/5bHw=";
|
||||
hash = "sha256-cnCwaa9vzoaqUmrFWqmHPiO/7UjeIburisIiLJZUpl4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8FJtJ/mHldia6t5yIPUfCvOlsKJSzT/vVcF+WxRO1Mo=";
|
||||
vendorHash = "sha256-8LTi/+ODA8Tyd5mp5OeTDECjp6+bmNFFHxxCi6RtzTs=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-psp";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-Jud89nYJq4xZn2HudmSA82hOYwItrrTblhIfeqqIqm8=";
|
||||
hash = "sha256-zifaXT7Yzo1tG11PrwIIopOul83jBR2Nbdb02l6M0rk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oL2KbhpqvPhtN7hpAuR6a383pPKlW1XuXkoew0ZvPUo=";
|
||||
cargoHash = "sha256-M7dBm5a+xAVORvX6sSTZ5JBSNsImi5OTXr+JPFq0DtU=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
|
||||
@@ -1,47 +1,47 @@
|
||||
{
|
||||
"version": "2.1.214",
|
||||
"commit": "e158e55a79995c80ed463a5d2de322bc0ac2f711",
|
||||
"buildDate": "2026-07-17T23:32:51Z",
|
||||
"version": "2.1.215",
|
||||
"commit": "316ce99628e89900bf0b1328fed3b8fec0c0c92d",
|
||||
"buildDate": "2026-07-19T00:11:19Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "59796dd18e9d77f1256f367db6d28ce4bd9cd5968e402ad3a327aac36abc6dec",
|
||||
"size": 247091504
|
||||
"checksum": "90608b5c5ab504e96e77365cea6203d046e291d59b2bb42cf28dcb2ccdf9dd58",
|
||||
"size": 247124336
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "d979ba15662828969e5d0f39f1367798a07ef6e031b524efdad37fe7caf84010",
|
||||
"size": 256507024
|
||||
"checksum": "1ef5f5e56ede9f7765a9bef654ece6045dba58f48b7f5b699765375953d52b6b",
|
||||
"size": 256540048
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "4c38f26a57a42619ee813f15dc39fc1fa4fe0bb403215c3cdc342b58fa689c3c",
|
||||
"size": 261995424
|
||||
"checksum": "2b43a3d5b0787217e5d7381fad42c7314292546fe9db9eb8b9b379de90509b30",
|
||||
"size": 262060960
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "3c029136f7c81f54ed4a38e9d52e655aad536433dbbde50519c8c31bb646ad14",
|
||||
"size": 265210864
|
||||
"checksum": "c1efffaaf370aa187cb6a09dd93d4e511c646899b0078476f83791b664bde7fe",
|
||||
"size": 265239536
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "bbcdec27500f1c7f04a8697fa1d55cdae183ba9054b984ac95d82ccdcccaec3e",
|
||||
"size": 255243624
|
||||
"checksum": "95f1bb89dd94ae099c7b5e53832f99624fdf82da8e0f11d81e1632b26e61973e",
|
||||
"size": 255309160
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "1744afe6baa7d5321917bc6f807883daf4f0abda8e9e5d006c03356eb3df8945",
|
||||
"size": 259838544
|
||||
"checksum": "3a14b862d102d0b6b88650a00b8489b1dfec7f84b367f8192ee62c8bdaeb9220",
|
||||
"size": 259863120
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "da26afacbc58d6f569d0921ff6825772220c734327f5f976c0c73bd0b7dd3cf8",
|
||||
"size": 256220832
|
||||
"checksum": "f14452d1e199273795f2920c00fd7a7f818178ddf1f3efb4d005a7e3d4ec4eff",
|
||||
"size": 256247968
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "4c62218523c562991ef05985af3cffa1a69a588bbcfb3b3bf7b59e9bcb69e963",
|
||||
"size": 250596512
|
||||
"checksum": "0e976441467cb09e35b52c83e661ce8e148c5a8766e0899a4255d95c4b8110f6",
|
||||
"size": 250623648
|
||||
}
|
||||
},
|
||||
"sdkCompat": {
|
||||
@@ -58,6 +58,7 @@
|
||||
"0.3.196",
|
||||
"0.3.197",
|
||||
"0.3.198",
|
||||
"0.3.199",
|
||||
"0.3.200",
|
||||
"0.3.201",
|
||||
"0.3.202",
|
||||
|
||||
@@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://projects.coin-or.org/CoinMP/";
|
||||
description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL";
|
||||
maintainers = with lib.maintainers; [ coolcuber ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.epl10;
|
||||
};
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "dnscontrol";
|
||||
version = "4.42.0";
|
||||
version = "4.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DNSControl";
|
||||
repo = "dnscontrol";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iB2PFPvcASRwpBkFJQ3Vi2r89H3a9BBbC1moAymWDOI=";
|
||||
hash = "sha256-7t/j6vLeoYHTf7wMIZ1hns1Uo0udEqTu/0K/96C5aPQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8rL5v/0Vb+gxmbDaEB57UsQEnKCJtbZh0lFUyKYMZgs=";
|
||||
vendorHash = "sha256-NEFfYDLo/UiITlUd7XptBmWesJQexvaXH95gyMpgNqA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -33,19 +33,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fractal";
|
||||
version = "14";
|
||||
version = "14.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "fractal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-pgu+O9fRyZiRYkxRTlPgnd5jaGPL1nN0agMR+x6+oGg=";
|
||||
hash = "sha256-GQdEa5JHXkpQdKcnzT4udZ0Cr4eJv4zoB7sknWnuGCI=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-Fsw0hIAYiF+31PNuC5a9SatRatY7A8OwABhlyHIl1Lc=";
|
||||
hash = "sha256-y3osmwhrB9x2s9V8L9qI1qs2fv2ygynq+mS+cA/KIyA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "fusee-nano";
|
||||
version = "unstable-2023-05-17";
|
||||
version = "0.5.3-unstable-2023-05-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DavidBuchanan314";
|
||||
|
||||
@@ -29,19 +29,19 @@
|
||||
|
||||
let
|
||||
inherit (stdenv.hostPlatform.node) arch platform;
|
||||
cacheRootHash = "sha256-/3niIma45fx3cmplxZsSxmnuS+vGtzjF2wqqZ5DcuJI=";
|
||||
cacheAppHash = "sha256-/hmUmaPNGoIaIY9qdlP5CG/IKn2nnKCpOqf9Wvj1AwM=";
|
||||
cacheRootHash = "sha256-2LV8hZCuX96h1KYYcL6b6XGC3uGcH5IQM4D61R7Em/U=";
|
||||
cacheAppHash = "sha256-zX4V9mg7ljQ1AKl1fgATPVrFpx1a6jsyiLzN2VixpFE=";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "github-desktop";
|
||||
version = "3.6.1";
|
||||
version = "3.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "desktop";
|
||||
repo = "desktop";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-S4lWh+6tOP3hw5nAgg6i6//Sd+gaI2aQnoRDQzHsxUg=";
|
||||
hash = "sha256-HzfecIgPp/Hof5djWkKrrZD83Z0Afr1iC2WbzQrOyyI=";
|
||||
fetchSubmodules = true;
|
||||
postCheckout = "git -C $out rev-parse HEAD > $out/.gitrev";
|
||||
};
|
||||
|
||||
@@ -50,21 +50,21 @@
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.47.4";
|
||||
version = "0.48.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-UDuWbWg7HiyJ4q/fVLLD+ZFmK74H2A2HRRwPoyGyGtU=";
|
||||
hash = "sha256-+x3saXQw+6BzBYfwwur0DiTaJZVNgOYKJ4UVzeScbtk=";
|
||||
};
|
||||
|
||||
goModules =
|
||||
(buildGo126Module {
|
||||
pname = "kitty-go-modules";
|
||||
inherit src version;
|
||||
vendorHash = "sha256-o9S5KFT+9DRQ+OcZ5Wh8ZwtWE/19DYR810zCk+yUIr4=";
|
||||
vendorHash = "sha256-nxPca7xDgxQd8vXbGKGuKXmB5vu0d3me//m8AULJZ6o=";
|
||||
}).goModules;
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kn";
|
||||
version = "1.22.0";
|
||||
version = "1.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "knative";
|
||||
repo = "client";
|
||||
tag = "knative-v${finalAttrs.version}";
|
||||
hash = "sha256-G5kadNskSwKBxSuvs58aJUM7+lraevk2GKH/sncslTo=";
|
||||
hash = "sha256-/mQvYYMwOvrwrIt8xo3j5qXXmfwDFJByaj1quHc5ebk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+IiDWoT9E4SCkmOwPQMTM7AdrXVA6OJa0Fg9Xjq42gI=";
|
||||
vendorHash = "sha256-1CTzRMlMsF4AZHYZMq0klmNpfmk4/O6ToitHyA9eEg0=";
|
||||
|
||||
env.GOWORK = "off";
|
||||
|
||||
@@ -48,7 +48,7 @@ buildGoModule (finalAttrs: {
|
||||
description = "Create Knative resources interactively from the command line or from within scripts";
|
||||
mainProgram = "kn";
|
||||
homepage = "https://github.com/knative/client";
|
||||
changelog = "https://github.com/knative/client/releases/tag/v${finalAttrs.version}";
|
||||
changelog = "https://github.com/knative/client/releases/tag/knative-v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kontainer";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "DenysMb";
|
||||
repo = "Kontainer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-15H4fTZ4Tja+nt0iKtFuULj/4g/0UK+W79R4kH7BFcs=";
|
||||
hash = "sha256-sifNSnfvjZSDvCqXIOQWtmr3t/SQst20xpTfSr8YZh8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lessc";
|
||||
version = "4.6.7";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "less";
|
||||
repo = "less.js";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D/gPyPoxHeLjF7EU40Jw2Mb4ZRrnaLq8XnL+kL2yhic=";
|
||||
hash = "sha256-j0RfzD7wfpscbHQJQyypvOF729D5a7uGoEFY7KToS14=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
;
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-tlms2b0aodWkI+btdmCnwSDgsURekaBdiI8IZ/iMVnI=";
|
||||
hash = "sha256-uV91YMyqWKXmGdx20Z0+rjJKF02vL7vdomY0IzAky9U=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "marge-bot";
|
||||
version = "1.1.0";
|
||||
version = "1.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "marge-org";
|
||||
repo = "marge-bot";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-nTVfsprCTa2S/F8GDdDw5SwQw+OrGkHrX/QwU1FZDsw=";
|
||||
hash = "sha256-Wg+yWkHkCbry13SRaEvULF4jjCaBI524FsVfcP/+u/k=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
+4
-6
@@ -4,13 +4,14 @@
|
||||
fetchpatch,
|
||||
callPackage,
|
||||
runCommand,
|
||||
python,
|
||||
python3,
|
||||
encryptionSupport ? true,
|
||||
sqliteSupport ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
maubot = python.pkgs.buildPythonPackage (finalAttrs: {
|
||||
python = python3;
|
||||
|
||||
maubot = python.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "maubot";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
@@ -56,9 +57,6 @@ let
|
||||
python-olm
|
||||
pycryptodome
|
||||
unpaddedbase64
|
||||
]
|
||||
++ lib.optionals sqliteSupport [
|
||||
sqlalchemy_1_3
|
||||
];
|
||||
|
||||
# used for plugin tests
|
||||
+5
-2
@@ -28,8 +28,11 @@ lib.flip builtins.mapAttrs json (
|
||||
dash = builtins.replaceStrings [ "_" ] [ "-" ] packageName;
|
||||
lowerDash = builtins.replaceStrings [ "_" ] [ "-" ] lower;
|
||||
in
|
||||
python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash}
|
||||
or python3.pkgs.${lowerDash} or null
|
||||
if lower == "maubot" then
|
||||
null
|
||||
else
|
||||
python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash}
|
||||
or python3.pkgs.${lowerDash} or null
|
||||
) (builtins.filter (x: x != "maubot" && x != null) deps);
|
||||
|
||||
reqDeps = resolveDeps (lib.toList (manifest.dependencies or null));
|
||||
+2
-2
@@ -213,8 +213,8 @@ def main():
|
||||
for plugin_name in os.listdir(directory):
|
||||
process_repo(os.path.join(directory, plugin_name), official)
|
||||
|
||||
if os.path.isdir("pkgs/development/python-modules/maubot/plugins"):
|
||||
generated = "pkgs/development/python-modules/maubot/plugins/generated.json"
|
||||
if os.path.isdir("pkgs/by-name/ma/maubot/plugins"):
|
||||
generated = "pkgs/by-name/ma/maubot/plugins/generated.json"
|
||||
else:
|
||||
script_dir = os.path.dirname(os.path.realpath(__file__))
|
||||
generated = os.path.join(script_dir, "generated.json")
|
||||
@@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.11.0";
|
||||
version = "0.12.1";
|
||||
|
||||
# me3 creates a pipe under /tmp needed by the compat tool subprocess
|
||||
steam-run =
|
||||
@@ -22,10 +22,10 @@ let
|
||||
owner = "garyttierney";
|
||||
repo = "me3";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-XyeMVPGzNF2syipLz9HPtUg7lhxcEq434FnRH3Ax+HM=";
|
||||
sha256 = "sha256-pGK6A85Xp6NbpYRKJTgi47acv4c8dZgb+Jdmeu8F/uU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T1HeYe9FUC5oy/SDeEd6vV4D9YIGIXMkbzf43gRNyt8=";
|
||||
cargoHash = "sha256-ss2NkDHfd5NBLGpnZ80UdvO0nn2mGueO0mnlWkog1jc=";
|
||||
|
||||
me3-cli = rustPlatform.buildRustPackage (final: {
|
||||
inherit cargoHash version src;
|
||||
|
||||
@@ -25,15 +25,15 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "1.1.2";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${suffix}/${version}/mill-dist-${suffix}-${version}.exe";
|
||||
sha256 =
|
||||
{
|
||||
aarch64-darwin = "sha256-UiooqMbxceUepk4uJV8ZSL1o4VLeTZgWs3URQFXFmQs=";
|
||||
aarch64-linux = "sha256-Az/NCaFVrKANJvgIHx9QlW/fPyFVc4XiJ6BZr4ahfxk=";
|
||||
x86_64-linux = "sha256-YhygFs8+ffOgoOSpggrYQ+xS19q8koYbN9UnozlLTPY=";
|
||||
aarch64-darwin = "sha256-tQpV0Goe9Oq16rm14mavS5ELl7z4Bsu7JBVbbFgauPE=";
|
||||
aarch64-linux = "sha256-lq0mR0lFhl7ESY+BM6kVRjyI3bpZOSwj+bSo37dAkaI=";
|
||||
x86_64-linux = "sha256-2GSLEvRTlH9QPzkGM52sYiJh6OqXQzn/V0sPQ+SA39s=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py
|
||||
index aeca3e3..aeb6763 100644
|
||||
--- a/minigalaxy/launcher.py
|
||||
+++ b/minigalaxy/launcher.py
|
||||
@@ -84,6 +84,7 @@ def get_execute_command(game) -> list:
|
||||
if game.get_info("use_mangohud") is True:
|
||||
exe_cmd.insert(0, "mangohud")
|
||||
exe_cmd.insert(1, "--dlsym")
|
||||
+ exe_cmd.insert(0, "@steamrun@")
|
||||
exe_cmd = get_exe_cmd_with_var_command(game, exe_cmd)
|
||||
logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd))
|
||||
return exe_cmd
|
||||
diff --git a/tests/test_installer.py b/tests/test_installer.py
|
||||
index d459b62..dee93cb 100644
|
||||
--- a/tests/test_installer.py
|
||||
+++ b/tests/test_installer.py
|
||||
@@ -405,13 +405,13 @@ class Test(TestCase):
|
||||
mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"]
|
||||
|
||||
result1 = installer.get_exec_line(game1)
|
||||
- self.assertEqual("scummvm -c beneath.ini", result1)
|
||||
+ self.assertEqual("@steamrun@ scummvm -c beneath.ini", result1)
|
||||
|
||||
game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux")
|
||||
mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"]
|
||||
|
||||
result2 = installer.get_exec_line(game2)
|
||||
- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
+ self.assertEqual('@steamrun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
|
||||
@mock.patch('os.path.getsize')
|
||||
@mock.patch('os.listdir')
|
||||
@@ -0,0 +1,47 @@
|
||||
diff --git a/minigalaxy/installer.py b/minigalaxy/installer.py
|
||||
index a68c2c8..2a34680 100644
|
||||
--- a/minigalaxy/installer.py
|
||||
+++ b/minigalaxy/installer.py
|
||||
@@ -477,7 +477,7 @@ def postinstaller(game):
|
||||
postinst_script = os.path.join(game.install_dir, "support", "postinst.sh")
|
||||
if os.path.isfile(postinst_script):
|
||||
os.chmod(postinst_script, 0o775)
|
||||
- stdout, stderr, exitcode = _exe_cmd([postinst_script])
|
||||
+ stdout, stderr, exitcode = _exe_cmd(["env", "PROTONPATH=umu-sniper", "@umurun@", postinst_script])
|
||||
if exitcode not in [0]:
|
||||
err_msg = "Postinstallation script failed: {}".format(postinst_script)
|
||||
return err_msg
|
||||
diff --git a/minigalaxy/launch_command.py b/minigalaxy/launch_command.py
|
||||
index fc27c1a..cf9de5f 100644
|
||||
--- a/minigalaxy/launch_command.py
|
||||
+++ b/minigalaxy/launch_command.py
|
||||
@@ -11,11 +11,15 @@ class LaunchCommand:
|
||||
command: list[str]
|
||||
|
||||
def apply_game_launch_config(self, game: Game) -> None:
|
||||
+ if self.name == "start.sh":
|
||||
+ self.command.insert(0, "@umurun@")
|
||||
if game.get_info(InfoKey.GAMEMODE) is True:
|
||||
self.command.insert(0, "gamemoderun")
|
||||
if game.get_info(InfoKey.MANGOHUD) is True:
|
||||
self.command.insert(0, "mangohud")
|
||||
- self.command.insert(1, "--dlsym")
|
||||
+ if self.name == "start.sh":
|
||||
+ self.command.insert(0, "PROTONPATH=umu-sniper")
|
||||
+ self.command.insert(0, "env")
|
||||
|
||||
var_list = shlex.split(game.get_info(InfoKey.VARIABLES))
|
||||
command_list = shlex.split(game.get_info(InfoKey.COMMAND))
|
||||
diff --git a/tests/test_installer.py b/tests/test_installer.py
|
||||
index 4b2fe1e..fd4dfef 100644
|
||||
--- a/tests/test_installer.py
|
||||
+++ b/tests/test_installer.py
|
||||
@@ -440,7 +440,7 @@ class Test(TestCase):
|
||||
mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"]
|
||||
|
||||
result2 = installer.get_exec_line(game2)
|
||||
- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
+ self.assertEqual('env PROTONPATH=umu-sniper @umurun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2)
|
||||
|
||||
@mock.patch('os.path.getsize')
|
||||
@mock.patch('os.listdir')
|
||||
@@ -1,15 +1,16 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
glibcLocales,
|
||||
glib-networking,
|
||||
glibcLocales,
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
innoextract,
|
||||
lib,
|
||||
libnotify,
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
steam-run,
|
||||
replaceVars,
|
||||
umu-launcher,
|
||||
unzip,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook3,
|
||||
@@ -18,25 +19,25 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "minigalaxy";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkwouter";
|
||||
repo = "minigalaxy";
|
||||
tag = version;
|
||||
hash = "sha256-YZhgVeWdVaNiTj7hvYuHbaVtoKN6EFoOANWdkrlj4dU=";
|
||||
hash = "sha256-qq5XLWmQ0x6/hK8beKxJDxHmbu//EuukuyOG+CpF9ug=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(replaceVars ./inject-launcher-steam-run.diff {
|
||||
steamrun = lib.getExe steam-run;
|
||||
(replaceVars ./inject-launcher-umu-run.diff {
|
||||
umurun = lib.getExe umu-launcher;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
gobject-introspection
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -72,6 +73,7 @@ python3Packages.buildPythonApplication rec {
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--suffix PATH : "${
|
||||
lib.makeBinPath [
|
||||
innoextract
|
||||
unzip
|
||||
xdg-utils
|
||||
]
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opengamepadui";
|
||||
version = "0.45.0";
|
||||
version = "0.45.1";
|
||||
|
||||
buildType = if withDebug then "debug" else "release";
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ShadowBlip";
|
||||
repo = "OpenGamepadUI";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-B3s9fJzOUNKqvdz1CuJQKJTcQKBUsn8cEV0F6e9Pjr0=";
|
||||
hash = "sha256-4pLorBNCKX9gq9uE7uqi05r6eBwerZJpThzbiK6FOXo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -24,9 +24,10 @@ python.pkgs.buildPythonPackage (finalAttrs: {
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
# remove supervisor from dependencies
|
||||
# remove supervisor from dependencies and fix version
|
||||
postPatch = ''
|
||||
sed -i 's/supervisor.*$//' pyproject.toml
|
||||
sed -i 's/^version = .*$/version = "${finalAttrs.version}"/' pyproject.toml
|
||||
'';
|
||||
|
||||
dependencies =
|
||||
|
||||
@@ -14,16 +14,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
|
||||
pname = "pgdog";
|
||||
version = "0.1.48";
|
||||
version = "0.1.49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgdogdev";
|
||||
repo = "pgdog";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0lun9HmJvpSWguckUtudDcNlBc/KgpHk/fBJnj4HSuo=";
|
||||
hash = "sha256-zfVNF/y1wzkvPjJ64HSzez0pOR/AEZHWc/S+cUYgat0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cNIjTNuxHPofkTYpEb3+8Jhqz5AMAeXj7avNAAOG5D8=";
|
||||
cargoHash = "sha256-B4jigKyK19IhCygF9ZMvO6rHDrEquLLpTVeptaFBuX0=";
|
||||
|
||||
# Hardcoded paths for C compiler and linker
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "13.2.1";
|
||||
version = "13.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-bwedO6b4gL3FiddxmOnPn0czIV2UwCiV5iM1Cu7kFR0=";
|
||||
hash = "sha256-TL6KYumNXUQ2nvkw3s/0UtT3CVw1YZfAmaCn8FHznrg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u89MpsCKwYn44/69evX+a+SJtqMctx6uCXnhKEdqhTE=";
|
||||
vendorHash = "sha256-Vlpjra9pcqhEy6fe6he6gsivQEmaHRgspy14DwCEOW4=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -48,11 +48,11 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.85.0";
|
||||
version = "0.86.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
|
||||
hash = "sha256-DXRRN2kCVW9ISF/IcLPkPHGXSQ7aHynQj3zh7czSWhI=";
|
||||
hash = "sha256-7qSWHlHKIzqHO5iCbi+y0+u7OoIC9tUYL1e0mpAHAWM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prst";
|
||||
version = "13.3";
|
||||
version = "14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patnashev";
|
||||
repo = "prst";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J+45JwkA/z3HmzO9J6RVVXutUAVSzOXDMkyUR3zSh9E=";
|
||||
hash = "sha256-41yUbSpUwV2jh8jSZjGb8X9YNc+UaS3jRaKtbaEVamA=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "pyrra";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyrra-dev";
|
||||
repo = "pyrra";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2tRl5pQ2fo9FGoSHqTK0P7o3t9GU/ygKXTkVw+ijPz4=";
|
||||
hash = "sha256-szIDkCLp0zCjrWguw7UpC1p/BiN5orvtBmyPvcgbeeU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SHv7M6BMwgVVMtCADoqzfAnamAInPIjOC/kylULzX7M=";
|
||||
vendorHash = "sha256-/IKzAsA3/2ygW7RocxFq4KmJj1z8ZSdx7wyxWeULet8=";
|
||||
|
||||
ui = buildNpmPackage {
|
||||
inherit (finalAttrs) version;
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromRadicle,
|
||||
fetchFromGitHub,
|
||||
radicle-httpd,
|
||||
writers,
|
||||
_experimental-update-script-combinators,
|
||||
unstableGitUpdater,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -20,18 +23,16 @@ in
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "radicle-explorer";
|
||||
inherit (radicle-httpd) version;
|
||||
version = "0-unstable-2026-07-16";
|
||||
|
||||
# radicle-explorer uses the radicle-httpd API, and they are developed in the
|
||||
# same repo. For this reason we pin the sources to each other, but due to
|
||||
# radicle-httpd using a more limited sparse checkout we need to carry a
|
||||
# separate hash.
|
||||
src = radicle-httpd.src.override {
|
||||
hash = "sha256-cnQsPWkRChC8yPrICRoUpGW2GGLB2TK9+3v8ZRGe3x0=";
|
||||
sparseCheckout = [ ];
|
||||
src = fetchFromRadicle {
|
||||
seed = "seed.radicle.dev";
|
||||
repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5";
|
||||
rev = "3c2935704f5767d60b3caf609ef772948bbecb10";
|
||||
hash = "sha256-EpHKuFNgRLwCVdDDRKjPJEvfDpS9qka75B2fQEVc1ns=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-8vmAs788PjdUTaQ5E8YLX0KiIPymJbH51oNaGZACe6I=";
|
||||
npmDepsHash = "sha256-74r7cyggbuva9XpW++HdAHHFqEBJ6BgNuJJUR+8HE4c=";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build ./scripts
|
||||
@@ -74,6 +75,11 @@ buildNpmPackage (finalAttrs: {
|
||||
config:
|
||||
finalAttrs.finalPackage.overrideAttrs { configFile = writers.writeJSON "config.json" config; };
|
||||
|
||||
passthru.updateScript = _experimental-update-script-combinators.sequence [
|
||||
(unstableGitUpdater { hardcodeZeroVersion = true; })
|
||||
(nix-update-script { extraArgs = [ "--version=skip" ]; })
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Web frontend for Radicle";
|
||||
longDescription = ''
|
||||
|
||||
@@ -15,22 +15,24 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "radicle-httpd";
|
||||
version = "0.25.0";
|
||||
version = "0.26.0";
|
||||
|
||||
env.RADICLE_VERSION = finalAttrs.version;
|
||||
|
||||
# You must update the radicle-explorer source hash when changing this.
|
||||
src = fetchFromRadicle {
|
||||
seed = "seed.radicle.dev";
|
||||
repo = "z4V1sjrXqjvFdnCUbxPFqd5p4DtH5";
|
||||
tag = "releases/${finalAttrs.version}";
|
||||
sparseCheckout = [ "radicle-httpd" ];
|
||||
hash = "sha256-gejNiCQ511OGGItmqXoyB+TmsUw+ozoEmOWooBXBkQ8=";
|
||||
nonConeMode = true;
|
||||
sparseCheckout = [
|
||||
"/crates"
|
||||
"/Cargo.toml"
|
||||
"/Cargo.lock"
|
||||
];
|
||||
hash = "sha256-zSU8B5IwOEUS9d4Y/UWJ6eD0p3zvp0nWVgJmZ/kVB1Q=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/radicle-httpd";
|
||||
|
||||
cargoHash = "sha256-Oawin/2R5dZ46pf3SarwNgILF9dXSkw02Z4gYQ4HtzE=";
|
||||
cargoHash = "sha256-rdW+WLkQ4UEn6hRZfgJhJkJWb7A26MayXVnVwAlLAG8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
asciidoctor
|
||||
@@ -78,7 +80,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
repositories on a Radicle node via their web browser.
|
||||
'';
|
||||
homepage = "https://radicle.dev";
|
||||
changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5/tree/radicle-httpd/CHANGELOG.md";
|
||||
changelog = "https://radicle.network/nodes/seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5/tree/CHANGELOG.md";
|
||||
# cargo.toml says MIT and asl20, LICENSE file says GPL3
|
||||
license = with lib.licenses; [
|
||||
gpl3Only
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
|
||||
version=$(list-git-tags | grep -oP '^releases/\K\d+\.\d+\.\d+$' | sort -rV | head -1)
|
||||
nix-update --version="$version" radicle-httpd
|
||||
nix-update --version=skip radicle-explorer
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "reframe";
|
||||
version = "1.18.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlynxZhou";
|
||||
repo = "reframe";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DXWW1QXgHnfsnH6O3qnVZoioIn+UOePNy1ZPNzVK1ks=";
|
||||
hash = "sha256-WbF52bXRYKj3q4SqTrICrZgWKFg+YnJt0hXjz4S6aRo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -28,15 +28,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
buildNum = "2025-12-08-1746";
|
||||
buildNum = "2026-05-28-1806";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "rgp";
|
||||
version = "2.6.1";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gpuopen.com/download/RadeonDeveloperToolSuite-${buildNum}.tgz";
|
||||
hash = "sha256-rfFZPA8DzgP5axSHToEBvhRTgWAejn/z0WlLMectya0=";
|
||||
hash = "sha256-hMUAo72JVfDEv8Rp0/0YZDXX7p8ioVH40WtK/PQnRb8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scipopt-soplex";
|
||||
version = "8.0.2";
|
||||
version = "8.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
repo = "soplex";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TW3OSBw8ok64kZedsXYjkO2eFqr0LH8uvrOsi3bwQC4=";
|
||||
hash = "sha256-5UTlSfnNPVCkAE2oMVukVbbs2drbSh0HfiDqXUktBHQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "stackit-cli";
|
||||
version = "0.66.0";
|
||||
version = "0.67.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackitcloud";
|
||||
repo = "stackit-cli";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-xGjp+3yqQS4n4I8xgDZb0WzS4mDQwa9tvOADxy1aRPE=";
|
||||
hash = "sha256-8fwTJfvsK9cYlu+m+BtcT8M0FPOfyUqcHFHsnz/qBQM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ALBq9urUqonQqkLevsHNghIbnBz7LNb+7987Gg+eRVE=";
|
||||
vendorHash = "sha256-z7y7N3/DilvNa7eo0xP33fUIYWXqYdpLgkcqub3ezYU=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "stalwart-cli";
|
||||
version = "1.0.10";
|
||||
version = "1.0.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "stalwartlabs";
|
||||
repo = "cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9fB9qkRtXIL/8qROl3FiK0w5XUA+nDVjxi1+dhwtxJM=";
|
||||
hash = "sha256-nU9KL25zS71tRRc6Z9r6cEQDuw35RVhesfJf5hSVx4s=";
|
||||
};
|
||||
cargoHash = "sha256-91S7XMbNClc349AvXixQdBnPV5+3G1RA5fpfNUfFmwk=";
|
||||
cargoHash = "sha256-yByKWH4o43zGki8Tf9pNQATyQO6UNvzFtjj9cqzvP1I=";
|
||||
__structuredAttrs = true;
|
||||
# `Result::unwrap()` on an `Err` value: Network(reqwest::Error { kind: Builder, source: General("No CA certificates were loaded from the system") })
|
||||
nativeCheckInputs = [ cacert ];
|
||||
|
||||
@@ -64,8 +64,19 @@ rustPlatform.buildRustPackage {
|
||||
# thread 'ampc::dht::tests::proptest_chaos' panicked at crates/core/src/ampc/dht/mod.rs:670:33:
|
||||
# assertion `left == right` failed
|
||||
"--skip=ampc::dht::tests::proptest_chaos"
|
||||
# thread 'ranking::tests::freshness_ranking' (105864) panicked at crates/core/src/ranking/mod.rs:355:9:
|
||||
# assertion `left == right` failed
|
||||
# left: "https://www.old.com/"
|
||||
# right: "https://www.new.com/"
|
||||
"--skip=ranking::tests::freshness_ranking"
|
||||
# thread 'crawler::robot_client::tests::test_errs_disallowed_path'
|
||||
# panicked at ../stract-...-vendor/source-registry-0/system-configuration-0.5.1/src/dynamic_store.rs:154:1:
|
||||
# Attempted to create a NULL object
|
||||
"--skip=crawler::robot_client::tests::test_errs_disallowed_path"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
@@ -76,9 +87,7 @@ rustPlatform.buildRustPackage {
|
||||
'';
|
||||
homepage = "https://github.com/StractOrg/stract";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
ailsa-sun
|
||||
];
|
||||
teams = [ lib.teams.ngi ];
|
||||
maintainers = with lib.maintainers; [ ailsa-sun ];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -49,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
description = "Efficient Task Space Inverse Dynamics (TSID) based on Pinocchio";
|
||||
homepage = "https://github.com/stack-of-tasks/tsid";
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tty-clock";
|
||||
version = "2.3+unstable=2021-04-07";
|
||||
version = "2.3-unstable-2021-04-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xorg62";
|
||||
|
||||
@@ -8,20 +8,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wasm-tools";
|
||||
version = "1.253.0";
|
||||
version = "1.254.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasm-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z17Y6bqsAkZ25Rkbtx7g0x2R9+tllYrpumLkgL13gjI=";
|
||||
hash = "sha256-Zy+cJdbsRmwRyy9y/nfpi3kWmklKOrgrw78DwQ/s+fs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-mBp9QbjEpwT3v0Bmvur+HTUOncSNYkqmfoyORzEqR+k=";
|
||||
cargoHash = "sha256-RgAew00flGTwt1FvfWsmPgg/MK4CMFVG2h5dmDgCZMo=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"wasm-tools"
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "weaviate";
|
||||
version = "1.38.3";
|
||||
version = "1.38.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "weaviate";
|
||||
repo = "weaviate";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-S37l12pMPrMjHRJ8n9/1vT2lZ5Ma6riX8Q7MGAhioGk=";
|
||||
hash = "sha256-jv0/zya98kncWAZL/EYgN0oXu7R9gC+jmu0pkQhyhyo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MxCR1Owy0tOYU2GGHbxI9STfT5ZitsZGbI0ttYuFeAQ=";
|
||||
|
||||
@@ -40,6 +40,7 @@ in
|
||||
srfi-13
|
||||
]) old);
|
||||
cmark = addToBuildInputs pkgs.cmark;
|
||||
crypt = addToBuildInputs pkgs.libxcrypt;
|
||||
epoxy =
|
||||
old:
|
||||
(addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old)
|
||||
@@ -55,6 +56,7 @@ in
|
||||
];
|
||||
};
|
||||
espeak = addToBuildInputsWithPkgConfig pkgs.espeak-ng;
|
||||
ephem = addToBuildInputs pkgs.libnova;
|
||||
exif = addToBuildInputsWithPkgConfig pkgs.libexif;
|
||||
expat =
|
||||
old:
|
||||
@@ -109,6 +111,7 @@ in
|
||||
] old
|
||||
)
|
||||
// (addToBuildInputs pkgs.libglut old);
|
||||
hypergiant = addPkgConfig;
|
||||
icu = addToBuildInputsWithPkgConfig pkgs.icu;
|
||||
imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2;
|
||||
inotify =
|
||||
@@ -116,6 +119,10 @@ in
|
||||
(addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue) old)
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin (addToCscOptions "-L -linotify" old);
|
||||
leveldb = addToBuildInputs pkgs.leveldb;
|
||||
libyaml = old: {
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
|
||||
};
|
||||
lmdb-ht = addToBuildInputs pkgs.lmdb;
|
||||
magic = addToBuildInputs pkgs.file;
|
||||
magic-pipes = addToBuildInputs pkgs.chickenPackages_5.chickenEggs.regex;
|
||||
# requires PCRE
|
||||
@@ -123,8 +130,28 @@ in
|
||||
# missing dependency in upstream egg
|
||||
mistie = addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 ]);
|
||||
mosquitto = addToPropagatedBuildInputs [ pkgs.mosquitto ];
|
||||
mpi =
|
||||
old:
|
||||
(addToBuildInputs pkgs.openmpi old)
|
||||
// {
|
||||
preBuild = ''
|
||||
mkdir -p $NIX_BUILD_TOP/mpi-dir
|
||||
ln -sf ${lib.getDev pkgs.openmpi}/include $NIX_BUILD_TOP/mpi-dir/include
|
||||
ln -sf ${lib.getLib pkgs.openmpi}/lib $NIX_BUILD_TOP/mpi-dir/lib
|
||||
export MPI_DIR=$NIX_BUILD_TOP/mpi-dir
|
||||
'';
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
};
|
||||
nanomsg = addToBuildInputs pkgs.nanomsg;
|
||||
ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ];
|
||||
oauthtoothy =
|
||||
old:
|
||||
(addToPropagatedBuildInputs [ chickenEggs.http-client ] old)
|
||||
// {
|
||||
postPatch = ''
|
||||
sed -i 's/http-curl/http-client/' oauthtoothy.scm oauthtoothy.egg
|
||||
'';
|
||||
};
|
||||
opencl = addToBuildInputs [
|
||||
pkgs.opencl-headers
|
||||
pkgs.ocl-icd
|
||||
@@ -132,6 +159,7 @@ in
|
||||
openssl = addToBuildInputs pkgs.openssl;
|
||||
plot = addToBuildInputs pkgs.plotutils;
|
||||
postgresql = addToBuildInputsWithPkgConfig pkgs.libpq;
|
||||
pyffi = addToBuildInputsWithPkgConfig pkgs.python3;
|
||||
rocksdb = addToBuildInputs pkgs.rocksdb_8_3;
|
||||
# missing dependency in upstream egg
|
||||
s9fes-char-graphics-shapes = addToPropagatedBuildInputs (
|
||||
@@ -188,6 +216,22 @@ in
|
||||
stemmer = old: (addToBuildInputs pkgs.libstemmer old) // (addToCscOptions "-L -lstemmer" old);
|
||||
stfl =
|
||||
old: (addToBuildInputs [ pkgs.ncurses pkgs.stfl ] old) // (addToCscOptions "-L -lncurses" old);
|
||||
svn-client =
|
||||
old:
|
||||
(addToBuildInputs [ pkgs.subversion pkgs.aprutil ] old)
|
||||
// (addToNativeBuildInputs pkgs.apr old)
|
||||
// {
|
||||
postPatch =
|
||||
let
|
||||
svnInclude = "${lib.getDev pkgs.subversion}/include/subversion-1";
|
||||
aprUtilInclude = "${lib.getDev pkgs.aprutil}/include";
|
||||
in
|
||||
''
|
||||
substituteInPlace build-svn-client svn-client.setup \
|
||||
--replace-fail '-I/usr/include/subversion-1' "-I${svnInclude}" \
|
||||
--replace-fail '-I/usr/local/include/subversion-1' "-I${aprUtilInclude} -I${svnInclude}"
|
||||
'';
|
||||
};
|
||||
taglib =
|
||||
old:
|
||||
(addToBuildInputs [ pkgs.zlib pkgs.taglib_1 ] old)
|
||||
@@ -195,6 +239,12 @@ in
|
||||
# needed for tablib-config to be in PATH
|
||||
addToNativeBuildInputs pkgs.taglib_1 old
|
||||
);
|
||||
tokyocabinet =
|
||||
old:
|
||||
(addToBuildInputs pkgs.tokyocabinet old)
|
||||
// {
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
};
|
||||
uuid-lib = addToBuildInputs pkgs.libuuid;
|
||||
ws-client = addToBuildInputs pkgs.zlib;
|
||||
xlib =
|
||||
@@ -222,31 +272,17 @@ in
|
||||
// {
|
||||
postPatch = ''
|
||||
substituteInPlace libgit2.scm \
|
||||
--replace "asize" "reserved"
|
||||
'';
|
||||
};
|
||||
lazy-ffi =
|
||||
old:
|
||||
(addToBuildInputs pkgs.libffi old)
|
||||
// {
|
||||
postPatch = ''
|
||||
substituteInPlace lazy-ffi.scm \
|
||||
--replace "ffi/ffi.h" "ffi.h"
|
||||
--replace-fail "asize" "reserved"
|
||||
'';
|
||||
};
|
||||
lazy-ffi = old: (addToBuildInputs pkgs.libffi old);
|
||||
opengl =
|
||||
old:
|
||||
(brokenOnDarwin old)
|
||||
// (addToBuildInputsWithPkgConfig (lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
pkgs.libGL
|
||||
pkgs.libGLU
|
||||
]) old)
|
||||
// {
|
||||
postPatch = ''
|
||||
substituteInPlace opengl.egg \
|
||||
--replace 'framework ' 'framework" "'
|
||||
'';
|
||||
};
|
||||
]) old);
|
||||
posix-shm = old: {
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace build.scm \
|
||||
@@ -268,8 +304,8 @@ in
|
||||
preBuild = ''
|
||||
substituteInPlace \
|
||||
dbus.egg dbus.setup \
|
||||
--replace '`pkg-config --cflags dbus-1`' "$(pkg-config --cflags dbus-1)" \
|
||||
--replace '`pkg-config --libs dbus-1`' "$(pkg-config --libs dbus-1)"
|
||||
--replace-fail '`pkg-config --cflags dbus-1`' "$(pkg-config --cflags dbus-1)" \
|
||||
--replace-fail '`pkg-config --libs dbus-1`' "$(pkg-config --libs dbus-1)"
|
||||
'';
|
||||
};
|
||||
math = old: {
|
||||
@@ -302,27 +338,12 @@ in
|
||||
];
|
||||
};
|
||||
canvas-draw = broken;
|
||||
coops-utils = broken;
|
||||
crypt = broken;
|
||||
ephem = addToBuildInputs pkgs.libnova;
|
||||
gemini = broken;
|
||||
gemini-client = broken;
|
||||
hypergiant = broken;
|
||||
iup = broken;
|
||||
kiwi = broken;
|
||||
libyaml = broken;
|
||||
lmdb-ht = broken;
|
||||
mpi = broken;
|
||||
oauthtoothy = broken;
|
||||
pyffi = broken;
|
||||
qt-light = broken;
|
||||
schematra-csrf = broken;
|
||||
schematra-session = broken;
|
||||
srfi-174 = broken;
|
||||
srfi-19 = broken;
|
||||
sundials = broken;
|
||||
svn-client = broken;
|
||||
tokyocabinet = broken;
|
||||
# webkitgtk_4_0 was removed
|
||||
webview = broken;
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@ let
|
||||
'';
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ coolcuber ];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildDunePackage (finalAttrs: {
|
||||
pname = "dockerfile";
|
||||
version = "8.4.0";
|
||||
version = "8.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocurrent";
|
||||
repo = "ocaml-dockerfile";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5CHKuVWOVWJ1ZO7r+lrSpHK1mm75Ek1vDR14pDXR9Dk=";
|
||||
hash = "sha256-xI+kjIwaGd7K9zLyoBgN2AFmQ/rL0/C/hPwrEgHkCgs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,19 +8,22 @@
|
||||
prettytable,
|
||||
pycrypto,
|
||||
pydub,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aigpy";
|
||||
version = "2022.7.8.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-1kQced6YdC/wvegqFVhZfej4+4aemGXvKysKjejP13w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
mutagen
|
||||
requests
|
||||
colorama
|
||||
@@ -36,4 +39,4 @@ buildPythonPackage rec {
|
||||
maintainers = [ lib.maintainers.misterio77 ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -3,39 +3,40 @@
|
||||
fetchPypi,
|
||||
openssl,
|
||||
buildPythonPackage,
|
||||
pytest,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
dnspython,
|
||||
pynacl,
|
||||
authres,
|
||||
python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "dkimpy";
|
||||
version = "1.1.8";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-tfYPtHu/XY12LxNLzqDDiOumtJg0KmgqIfFoZUUJS3c=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
openssl
|
||||
dnspython
|
||||
pynacl
|
||||
authres
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace dkim/dknewkey.py --replace \
|
||||
/usr/bin/openssl ${openssl}/bin/openssl
|
||||
postPatch = ''
|
||||
substituteInPlace dkim/dknewkey.py --replace-fail \
|
||||
/usr/bin/openssl ${lib.getExe openssl}
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} ./test.py
|
||||
'';
|
||||
pythonImportsCheck = [ "dkim" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "DKIM + ARC email signing/verification tools + Python module";
|
||||
@@ -49,4 +50,4 @@ buildPythonPackage rec {
|
||||
homepage = "https://launchpad.net/dkimpy";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,19 +2,29 @@
|
||||
buildPythonPackage,
|
||||
lib,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "greek-accentuation";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "greek-accentuation";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-l2HZXdqlLubvy2bWhhZVYGMpF0DXVKTDFehkcGF5xdk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "greek_accentuation" ];
|
||||
|
||||
meta = {
|
||||
description = "Python 3 library for accenting (and analyzing the accentuation of) Ancient Greek words";
|
||||
homepage = "https://github.com/jtauber/greek-accentuation";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kmein ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,20 +2,26 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
grpcio,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "grpcio-gcp";
|
||||
version = "0.2.2";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e292605effc7da39b7a8734c719afb12ec4b5362add3528d8afad3aa3aa9057c";
|
||||
pname = "grpcio-gcp";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-4pJgXv/H2jm3qHNMcZr7EuxLU2Kt01KNivrTqjqpBXw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ grpcio ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ grpcio ];
|
||||
|
||||
meta = {
|
||||
description = "gRPC extensions for Google Cloud Platform";
|
||||
@@ -23,4 +29,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,18 +2,21 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
version = "0.6.4";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
pname = "i3-py";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y";
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-HjF5xqX0dhqtP/CFl4D/wx+nefWDLXiob4ysLNEg9Ok=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# no tests in tarball
|
||||
doCheck = false;
|
||||
|
||||
@@ -23,4 +26,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kopf";
|
||||
version = "1.44.5";
|
||||
version = "1.44.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nolar";
|
||||
repo = "kopf";
|
||||
tag = version;
|
||||
hash = "sha256-iwAq06qXtD3c0otC1S9TfRPDpc54y/NJQpJ7X8dCgGI=";
|
||||
hash = "sha256-ffBdauplO1WkrXcsJuCKBhlkXpoinFqRU24uSoDQIm0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ab8aea44..9e1b06f4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -100,10 +100,7 @@ elseif(MLX_BUILD_METAL)
|
||||
endif()
|
||||
|
||||
# Throw an error if xcrun not found
|
||||
- execute_process(
|
||||
- COMMAND zsh "-c" "/usr/bin/xcrun -sdk macosx --show-sdk-version"
|
||||
- OUTPUT_VARIABLE MACOS_SDK_VERSION
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY)
|
||||
+ set(MACOS_SDK_VERSION @sdkVersion@)
|
||||
|
||||
if(${MACOS_SDK_VERSION} LESS 14.0)
|
||||
message(
|
||||
@@ -3,7 +3,6 @@
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
nanobind,
|
||||
|
||||
# build-system
|
||||
@@ -12,7 +11,6 @@
|
||||
typing-extensions,
|
||||
|
||||
# buildInputs
|
||||
apple-sdk,
|
||||
fmt,
|
||||
nlohmann_json,
|
||||
# linux-only
|
||||
@@ -20,7 +18,6 @@
|
||||
|
||||
# tests
|
||||
numpy,
|
||||
psutil,
|
||||
pytestCheckHook,
|
||||
python,
|
||||
runCommand,
|
||||
@@ -42,7 +39,7 @@ let
|
||||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mlx";
|
||||
version = "0.31.2";
|
||||
version = "0.32.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -50,18 +47,12 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "ml-explore";
|
||||
repo = "mlx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0Oxacz61WGWZrpWw+fMQjEQfwOx1l1L2d0kWl54/LrQ=";
|
||||
hash = "sha256-yHpTyRf9FOPbdyDWSM7b6VC72STnUpgCMLbDxLbdaqs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use nix packages instead of fetching their sources
|
||||
./dont-fetch-nanobind.patch
|
||||
./dont-fetch-json.patch
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
(replaceVars ./darwin-build-fixes.patch {
|
||||
sdkVersion = apple-sdk.version;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -92,10 +83,8 @@ buildPythonPackage (finalAttrs: {
|
||||
(lib.cmakeBool "MLX_BUILD_METAL" false)
|
||||
(lib.cmakeBool "USE_SYSTEM_FMT" true)
|
||||
(lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}")
|
||||
(lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_NANOBIND" "${nanobind.src}")
|
||||
(lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${lib.getDev nlohmann_json}/include/nlohmann")
|
||||
|
||||
# Cmake cannot find nanobind-config.cmake by itself
|
||||
(lib.cmakeFeature "nanobind_DIR" "${nanobind}/${python.sitePackages}/nanobind/cmake")
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
(lib.cmakeBool "MLX_ENABLE_X64_MAC" true)
|
||||
@@ -122,7 +111,6 @@ buildPythonPackage (finalAttrs: {
|
||||
# Run the mlx Python test suite.
|
||||
nativeCheckInputs = [
|
||||
numpy
|
||||
psutil
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a2395d02..6d24df02 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -354,13 +354,7 @@ if(MLX_BUILD_PYTHON_BINDINGS)
|
||||
Python 3.10
|
||||
COMPONENTS Interpreter Development.Module
|
||||
REQUIRED)
|
||||
- FetchContent_Declare(
|
||||
- nanobind
|
||||
- GIT_REPOSITORY https://github.com/wjakob/nanobind.git
|
||||
- GIT_TAG v2.12.0
|
||||
- GIT_SHALLOW TRUE
|
||||
- EXCLUDE_FROM_ALL)
|
||||
- FetchContent_MakeAvailable(nanobind)
|
||||
+ find_package(nanobind CONFIG REQUIRED)
|
||||
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/python/src)
|
||||
endif()
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "neo";
|
||||
version = "0.14.4";
|
||||
version = "0.14.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NeuralEnsemble";
|
||||
repo = "python-neo";
|
||||
tag = version;
|
||||
hash = "sha256-VdT7PFSle8HxWfsPrrI+mHtsTO315+Sw0RGx8HSYtwk=";
|
||||
hash = "sha256-IB+RuQBJTu0Ss7PLdBpONBl50xdTiR512ni+w3Z+DEM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -31,14 +31,14 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-arango";
|
||||
version = "8.3.2";
|
||||
version = "8.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arangodb";
|
||||
repo = "python-arango";
|
||||
tag = version;
|
||||
hash = "sha256-wN1KsOK5WidQDyyUII5OWsqMyIkh0XstPXKccNO0clI=";
|
||||
hash = "sha256-4nDMu0n6O0C9QMPDXCA2TkN56zqajn8qQqB6ma+JvAA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,7 +20,7 @@ let
|
||||
in
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "python-sat";
|
||||
version = "1.9.dev5";
|
||||
version = "1.9.dev6";
|
||||
pyproject = true;
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: {
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) version;
|
||||
pname = "python_sat";
|
||||
hash = "sha256-OxH2AQbusuv5aB/t85nrNOXAuyCfNFZRvMFMWFfmdhg=";
|
||||
hash = "sha256-7YCz8nvHcKNKtgQoRShp/xgWHMyJ48GkFMZCkR+g54w=";
|
||||
};
|
||||
|
||||
# The kissat source archive is not included in the repo and pysat attempts to
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "scikit-bio";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scikit-bio";
|
||||
repo = "scikit-bio";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zBOUZukqLhTxKG9BluWB+2zTCx5ALhM1s+YP2itqg9A=";
|
||||
hash = "sha256-7cptpv7x/2KJbyMCZ4X6wVVUMx+CDcZ6nOtbeUoD5a0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
ciso8601,
|
||||
async-timeout,
|
||||
kasa-crypt,
|
||||
msgpack,
|
||||
orjson,
|
||||
requests,
|
||||
websocket-client,
|
||||
@@ -15,14 +16,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "sense-energy";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scottbonline";
|
||||
repo = "sense";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-QFwESlynFXV/OqD9LfPeUdIsWgK7R6XZqhSchmHUtSw=";
|
||||
hash = "sha256-Ug58qKlFBe4DpAKMWNup7A2QTslGaaY2OMPyJtnfWfM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -36,6 +37,7 @@ buildPythonPackage (finalAttrs: {
|
||||
aiohttp
|
||||
async-timeout
|
||||
kasa-crypt
|
||||
msgpack
|
||||
orjson
|
||||
ciso8601
|
||||
requests
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tesla-fleet-api";
|
||||
version = "1.6.4";
|
||||
version = "1.7.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Teslemetry";
|
||||
repo = "python-tesla-fleet-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Z27HPmlat0GfVmTeRYmqp9HlUsuZ+5A9FStqGGFMfiw=";
|
||||
hash = "sha256-EgHV0O2i6ib85D23qPCPkVN1RAOQ/PzNVwz8VQIF7xw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,23 +2,30 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
ua-parser,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "user-agents";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
# PyPI is missing devices.json
|
||||
src = fetchFromGitHub {
|
||||
owner = "selwin";
|
||||
repo = "python-user-agents";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pcbjqj21c2ixhl414bh2h8khi8y1igzfpkyqwan1pakix0lq45a";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qhBMQY9T3WAVx35e918MHkU4ERRwkUAo7FGwICSWi10=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ua-parser ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ ua-parser ];
|
||||
|
||||
pythonImportsCheck = [ "user_agents" ];
|
||||
|
||||
meta = {
|
||||
description = "Python library to identify devices by parsing user agent strings";
|
||||
@@ -27,4 +34,4 @@ buildPythonPackage rec {
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# This builds+installs
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
ninja -v install
|
||||
ninja install
|
||||
runHook postInstall
|
||||
'';
|
||||
# tests are intended to be ran manually as test/ python scripts and need accelerator
|
||||
|
||||
@@ -57,7 +57,7 @@ in
|
||||
};
|
||||
|
||||
jetty_12 = common {
|
||||
version = "12.1.10";
|
||||
hash = "sha256-5/R4/mrmixhCfemqXbZcNwLSYY51p/IX+vT4jhGCqb4=";
|
||||
version = "12.1.11";
|
||||
hash = "sha256-fkXPjyO6xFZ/r5RiSzrEPgrrSSXLklQJ52BAmQocvpw=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -648,46 +648,6 @@ rec {
|
||||
enableParallelBuilding = true;
|
||||
};
|
||||
|
||||
pygmentex = python3Packages.buildPythonApplication rec {
|
||||
pname = "pygmentex";
|
||||
inherit (src) version;
|
||||
pyproject = false;
|
||||
|
||||
src = assertFixedHash pname texlive.pkgs.pygmentex.tex;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygments
|
||||
chardet
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D ./scripts/pygmentex/pygmentex.py "$out"/bin/pygmentex
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.ctan.org/pkg/pygmentex";
|
||||
description = "Auxiliary tool for typesetting code listings in LaTeX documents using Pygments";
|
||||
longDescription = ''
|
||||
PygmenTeX is a Python-based LaTeX package that can be used for
|
||||
typesetting code listings in a LaTeX document using Pygments.
|
||||
|
||||
Pygments is a generic syntax highlighter for general use in all kinds of
|
||||
software such as forum systems, wikis or other applications that need to
|
||||
prettify source code.
|
||||
'';
|
||||
license = lib.licenses.lppl13c;
|
||||
maintainers = with lib.maintainers; [ romildo ];
|
||||
};
|
||||
};
|
||||
|
||||
asymptote =
|
||||
let
|
||||
version = "3.09";
|
||||
|
||||
@@ -671,6 +671,7 @@ allPkgLists
|
||||
// {
|
||||
# for backward compatibility
|
||||
latexindent = texlive.pkgs.latexindent;
|
||||
pygmentex = texlive.pkgs.pigmentex;
|
||||
};
|
||||
|
||||
combine =
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
N;
|
||||
# add script folder to path, unless we interfere with a docstring
|
||||
/\nr"""/b skip-python-path-patch
|
||||
s!\n!\nimport sys; sys.path.insert(0,'@scriptsFolder@')\n!
|
||||
# skip encoding declarations
|
||||
/\n\s*#.*coding[=:]\s*[-a-zA-Z0-9_.]/N
|
||||
s!\n\([^\n]*\)$!\nimport sys; sys.path.insert(0,'@scriptsFolder@')\n\1!
|
||||
:skip-python-path-patch
|
||||
}
|
||||
|
||||
|
||||
@@ -146,6 +146,14 @@ lib.recursiveUpdate orig rec {
|
||||
ulqda.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ DigestSHA1 ])) ];
|
||||
|
||||
#### python packages
|
||||
pygmentex.extraBuildInputs = [
|
||||
(python3.withPackages (
|
||||
ps: with ps; [
|
||||
pygments
|
||||
chardet
|
||||
]
|
||||
))
|
||||
];
|
||||
pythontex.extraBuildInputs = [ (python3.withPackages (ps: with ps; [ pygments ])) ];
|
||||
|
||||
#### other runtime PATH dependencies
|
||||
|
||||
@@ -2358,8 +2358,6 @@ with pkgs;
|
||||
|
||||
matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins;
|
||||
|
||||
maubot = with python3Packages; toPythonApplication maubot;
|
||||
|
||||
md2gemini = with python3.pkgs; toPythonApplication md2gemini;
|
||||
|
||||
mdcat = callPackage ../tools/text/mdcat {
|
||||
|
||||
@@ -373,6 +373,7 @@ mapAliases {
|
||||
Markups = throw "'Markups' has been renamed to/replaced by 'markups'"; # Converted to throw 2025-10-29
|
||||
mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
|
||||
matlink-gpapi = throw "'matlink-gpapi' has been removed as it was broken and unmaintained"; # Added 2025-11-09
|
||||
maubot = throw "'maubot' has been promoted to a top-level attribute: `pkgs.maubot`"; # added 2026-07-12
|
||||
mdformat-tables = "'mdformat-tables' has been archived and replaced by 'mdformat-gfm"; # added 2025-01-25
|
||||
MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29
|
||||
MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29
|
||||
|
||||
@@ -10170,8 +10170,6 @@ self: super: with self; {
|
||||
|
||||
mattermostdriver = callPackage ../development/python-modules/mattermostdriver { };
|
||||
|
||||
maubot = callPackage ../development/python-modules/maubot { };
|
||||
|
||||
mautrix = callPackage ../development/python-modules/mautrix { };
|
||||
|
||||
mautrix-appservice = self.mautrix; # alias 2019-12-28
|
||||
|
||||
Reference in New Issue
Block a user