Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -1901,12 +1901,6 @@
|
||||
githubId = 750786;
|
||||
name = "Justin Wood";
|
||||
};
|
||||
anmonteiro = {
|
||||
email = "anmonteiro@gmail.com";
|
||||
github = "anmonteiro";
|
||||
githubId = 661909;
|
||||
name = "Antonio Nuno Monteiro";
|
||||
};
|
||||
anna328p = {
|
||||
email = "anna328p@gmail.com";
|
||||
github = "anna328p";
|
||||
@@ -16061,6 +16055,13 @@
|
||||
name = "Bernardo Meurer";
|
||||
keys = [ { fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246"; } ];
|
||||
};
|
||||
lovistovis = {
|
||||
email = "love.lysell.berglund@gmail.com";
|
||||
github = "lovistovis";
|
||||
githubId = 64896699;
|
||||
name = "Love Lysell Berglund";
|
||||
keys = [ { fingerprint = "7958 2B47 1D85 3CC9 A3FB 30D5 7B54 D564 D46D 9880"; } ];
|
||||
};
|
||||
lowfatcomputing = {
|
||||
email = "andreas.wagner@lowfatcomputing.org";
|
||||
github = "lowfatcomputing";
|
||||
@@ -29404,12 +29405,6 @@
|
||||
name = "Vince Rose";
|
||||
githubId = 9831420;
|
||||
};
|
||||
vrthra = {
|
||||
email = "rahul@gopinath.org";
|
||||
github = "vrthra";
|
||||
githubId = 70410;
|
||||
name = "Rahul Gopinath";
|
||||
};
|
||||
vsharathchandra = {
|
||||
email = "chandrasharath.v@gmail.com";
|
||||
github = "vsharathchandra";
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
- [Nezha](https://github.com/nezhahq/nezha), a self-hosted, lightweight server and website monitoring and O&M tool. Available as [services.nezha](#opt-services.nezha.enable).
|
||||
|
||||
- [CastSponsorSkip](https://github.com/gabe565/CastSponsorSkip/), skips YouTube sponsorships (and sometimes ads) on all local Google Cast devices.
|
||||
|
||||
- [FlapAlerted](https://github.com/Kioubit/FlapAlerted), detects BGP flapping events and provides statistics based on BGP update messages. Available as [services.flap-alerted](#opt-services.flap-alerted.enable).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-26.11-incompatibilities}
|
||||
@@ -42,6 +44,8 @@
|
||||
|
||||
- The `services.syncthing` module now updates the Syncthing REST API using partial updates (`PATCH`) instead of full replacements (`PUT`) for general settings. Updating these settings was broken and prone to errors after updates, see [#428808](https://github.com/NixOS/nixpkgs/issues/428808) and [#528889](https://github.com/NixOS/nixpkgs/issues/528889). As a result, settings modified manually through the Syncthing Web UI that are not explicitly defined in your Nix configuration will now persist across rebuilds.
|
||||
|
||||
- `services.plantuml-server.packages.jetty` now supports `jetty_12`, it no longer supports `jetty_11`.
|
||||
|
||||
## Other Notable Changes {#sec-release-26.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -838,6 +838,7 @@
|
||||
./services/misc/blenderfarm.nix
|
||||
./services/misc/calibre-server.nix
|
||||
./services/misc/canto-daemon.nix
|
||||
./services/misc/castsponsorskip.nix
|
||||
./services/misc/cfdyndns.nix
|
||||
./services/misc/cgminer.nix
|
||||
./services/misc/clipcat.nix
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.castsponsorskip;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.castsponsorskip = {
|
||||
enable = lib.mkEnableOption "castsponsorskip";
|
||||
package = lib.mkPackageOption pkgs "castsponsorskip" { };
|
||||
config = lib.mkOption {
|
||||
type = (pkgs.formats.yaml { }).type;
|
||||
default = { };
|
||||
example = {
|
||||
CSS_SKIP_SPONSORS = false;
|
||||
};
|
||||
description = "Configuration for the service. List of options all options <https://github.com/gabe565/CastSponsorSkip/blob/main/docs/envs.md>.";
|
||||
};
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.castsponsorskip =
|
||||
let
|
||||
# Needed, even if empty, to avoid searching for a file in
|
||||
# the user home directory, which doesn't exist for
|
||||
# dynamic users
|
||||
config = (pkgs.formats.yaml cfg.config).generate "config.yaml" { };
|
||||
in
|
||||
{
|
||||
description = "Skip YouTube ads and sponsorships on all local Google Cast devices";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
Restart = "always";
|
||||
ExecStart = "${lib.getExe cfg.package} --config=${config}";
|
||||
TimeoutStopSec = "20s";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ wariuccio ];
|
||||
};
|
||||
}
|
||||
@@ -37,15 +37,7 @@ in
|
||||
packages = {
|
||||
jdk = mkPackageOption pkgs "jdk" { };
|
||||
jetty = mkPackageOption pkgs "jetty" {
|
||||
default = [ "jetty_11" ];
|
||||
extraDescription = ''
|
||||
At the time of writing (v1.2023.12), PlantUML Server does not support
|
||||
Jetty versions higher than 12.x.
|
||||
|
||||
Jetty 12.x has introduced major breaking changes, see
|
||||
<https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.0> and
|
||||
<https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#pg-migration-11-to-12>
|
||||
'';
|
||||
default = [ "jetty_12" ];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -115,11 +107,11 @@ in
|
||||
script = ''
|
||||
${cfg.packages.jdk}/bin/java \
|
||||
-jar ${cfg.packages.jetty}/start.jar \
|
||||
--module=deploy,http,jsp \
|
||||
jetty.home=${cfg.packages.jetty} \
|
||||
jetty.base=${cfg.package} \
|
||||
jetty.http.host=${cfg.listenHost} \
|
||||
jetty.http.port=${toString cfg.listenPort}
|
||||
--module=http,ee11-deploy,ee11-jsp \
|
||||
-Djetty.home=${cfg.packages.jetty} \
|
||||
-Djetty.base=${cfg.package} \
|
||||
-Djetty.http.host=${cfg.listenHost} \
|
||||
-Djetty.http.port=${toString cfg.listenPort}
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
|
||||
@@ -1100,7 +1100,9 @@ in
|
||||
}
|
||||
{
|
||||
assertion = config.boot.initrd.systemd.enable -> all (dev: dev.preLVM) (attrValues luks.devices);
|
||||
message = "boot.initrd.luks.devices.<name>.preLVM is not used by systemd stage 1.";
|
||||
message = ''
|
||||
boot.initrd.luks.devices.<name>.preLVM has no effect with systemd stage 1. It can be safely removed from your configuration, and systemd will discover LVM devices automatically at runtime, whether they come before or after LUKS. The preLVM option will be removed in 26.11 along with scripted stage 1.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion =
|
||||
|
||||
@@ -14,8 +14,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "gplane";
|
||||
name = "wasm-language-tools";
|
||||
version = "1.20.0";
|
||||
hash = "sha256-AXLwEp6uospVZwd2NxLEfABsNQOt1uRJTQ4HMTXbrJc=";
|
||||
version = "1.21.0";
|
||||
hash = "sha256-r1gnq12O/tNx175/nmrQD3b7HVipVT0pEoLvg2HrWwI=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
name = "tinymist";
|
||||
publisher = "myriad-dreamin";
|
||||
inherit (tinymist) version;
|
||||
hash = "sha256-13/qw2BZ/WG+TYNVncJ/PuFLaUhlAn63zaa27JcLITE=";
|
||||
hash = "sha256-7kpW5EYOFsnib5i5xVcywgM82I0Ey/2mjC/LAjFy8qM=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -45,13 +45,13 @@
|
||||
"vendorHash": "sha256-5IfYhOEhXRpdL7G3Op9a0Ep14el2gwcVmRMkGB7oWH4="
|
||||
},
|
||||
"aliyun_alicloud": {
|
||||
"hash": "sha256-dIMlk/ZKIJjrkAk0EGCz3UTZvjbEltWq879331EEMD0=",
|
||||
"hash": "sha256-wBwFtW2hbBL7YkL8o7bkd3eMCmdjObIbBiuLPsmZqQo=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.281.0",
|
||||
"rev": "v1.282.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-lBD9ifRpUwg45V7zZG3grHvndG0V42oiX68zgcM7t74="
|
||||
"vendorHash": "sha256-sESuNlWNyjjGYb7z+tQF7RGBgicnPISuwXRzB+QJ7E4="
|
||||
},
|
||||
"aminueza_minio": {
|
||||
"hash": "sha256-TLwOp7dSMjwOjlxEzYbFgw/S+Zkv+tCdknSjonmsRJo=",
|
||||
@@ -1238,11 +1238,11 @@
|
||||
"vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
|
||||
},
|
||||
"spacelift-io_spacelift": {
|
||||
"hash": "sha256-pWj9K8+ssAuSz1oufi/Ce701xaBDmHKtyijA/R/kQ/g=",
|
||||
"hash": "sha256-k94bMIHlOBJ6zilasFCugt8fgZ4F5bl0kWOzdniy4D4=",
|
||||
"homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
|
||||
"owner": "spacelift-io",
|
||||
"repo": "terraform-provider-spacelift",
|
||||
"rev": "v1.51.0",
|
||||
"rev": "v1.52.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k="
|
||||
},
|
||||
|
||||
@@ -7,16 +7,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "air-formatter";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "posit-dev";
|
||||
repo = "air";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-9itu/coUlYNdH2go1AmMff1pMozv6nGeOEZKTwBqA8M=";
|
||||
hash = "sha256-u0icSo6aW6tLgY57RPAoVte5Awn16FLIvZEeeYNr5fk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-R7rUXx+I1bmdP6fvbXyKulaWQZQxBcngJihCg0SVFY0=";
|
||||
cargoHash = "sha256-51xkTVs6j7n0os5wHWxpFC/uLHm3tz+SiWUHsd+bNRw=";
|
||||
|
||||
useNextest = true;
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ assert lib.assertMsg (
|
||||
|
||||
let
|
||||
pname = "burpsuite";
|
||||
version = "2026.4.3";
|
||||
version = "2026.6";
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
@@ -24,7 +24,7 @@ let
|
||||
"https://portswigger.net/burp/releases/download?product=desktop&version=${version}&type=Jar"
|
||||
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?product=desktop&version=${version}&type=Jar"
|
||||
];
|
||||
hash = "sha256-mewbN1uZAFCsxAiXsrNKJ/AexCccVcza40DjxMDbrlM=";
|
||||
hash = "sha256-nafdpcXgWpuIinmgYp+uXkfoFkQfhFRsDaxsh+Rgb3M=";
|
||||
};
|
||||
|
||||
description = "Integrated platform for performing security testing of web applications";
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
lib,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "castsponsorskip";
|
||||
version = "0.8.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabe565";
|
||||
repo = "CastSponsorSkip";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qPn753aSKlMdSEEN1QYuS3hDYtjL4Pm07mEKY1kI5Ak=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ph6rwr4FxuNpFF5DedsrMEnm28xR11bC7EcaNQJcyug=";
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
skippedTests = [
|
||||
"Test_completeCategories" # Requires network access
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
meta = {
|
||||
description = "Skip YouTube sponsorships (and sometimes ads) on all local Google Cast devices";
|
||||
homepage = "https://github.com/gabe565/CastSponsorSkip";
|
||||
changelog = "https://github.com/gabe565/CastSponsorSkip/releases";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
wariuccio
|
||||
];
|
||||
};
|
||||
})
|
||||
@@ -202,7 +202,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
jsbeautifier
|
||||
jsondiff
|
||||
libarchive-c
|
||||
progressbar33
|
||||
progressbar
|
||||
pypdf
|
||||
python-magic
|
||||
pyxattr
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "forgejo-mcp";
|
||||
version = "2.28.0";
|
||||
version = "2.29.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "goern";
|
||||
repo = "forgejo-mcp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nq5Mccz2mKWfkrEyqQXli4BB3+99NFwT3c1Mf2vZ3sc=";
|
||||
hash = "sha256-ZG8TKcckdyrdVHiNhYK1SvKFZHetg5otEw1ytkCD+Zc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QDJRbF4mZzBv1vxvo1ZQJaUJayRHj1jMgjaRfAmLMik=";
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
versionCheckHook,
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gh-aw";
|
||||
version = "0.68.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = "gh-aw";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-P3psfcuzLJ0W+3iJbPI7lfWiy8CIfZsYyY/4bcLEEjs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1BMh4mC62usE4pUCU5osHm1a1pBrXsp4YCumvvcAHIY=";
|
||||
|
||||
subPackages = [ "cmd/gh-aw" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X"
|
||||
"main.version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/github/gh-aw";
|
||||
description = "gh extension for GitHub Agentic Workflows";
|
||||
longDescription = ''
|
||||
Repository automation, running the coding agents you know and
|
||||
love, with strong guardrails in GitHub Actions.
|
||||
'';
|
||||
changelog = "https://github.com/github/gh-aw/releases/tag/v${finalAttrs.version}";
|
||||
downloadPage = "https://github.com/github/gh-aw/releases";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ MH0386 ];
|
||||
mainProgram = "gh-aw";
|
||||
};
|
||||
})
|
||||
@@ -1,50 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
libsndfile,
|
||||
portaudio,
|
||||
gtk2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnaural";
|
||||
version = "20110606";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gnaural/gnaural_${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-0a09DUMfHEIGYuIYSBGJalBiIHIgejr/KVDXCFgKBb8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
gtk2
|
||||
libsndfile
|
||||
portaudio
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: src/net/../gnauralnet.h:233: multiple definition of `GN_ScheduleFingerprint';
|
||||
# src/net/../../src/gnauralnet.h:233: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
substitute \
|
||||
$out/share/gnome/apps/Multimedia/gnaural.desktop \
|
||||
$out/share/applications/gnaural.desktop \
|
||||
--replace \
|
||||
"/usr/share/gnaural/pixmaps/gnaural-icon.png" \
|
||||
"$out/share/gnaural/pixmaps/gnaural-icon.png" \
|
||||
|
||||
rm -rf $out/share/gnome
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Programmable auditory binaural-beat synthesizer";
|
||||
homepage = "https://gnaural.sourceforge.net/";
|
||||
license = with lib.licenses; [ gpl2Only ];
|
||||
mainProgram = "gnaural";
|
||||
};
|
||||
})
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mv * "$out/itgmania/Themes/Arrow Cloud"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Arrow Cloud's fork of Zmod";
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mv * "$out/itgmania/Themes/Zmod Simply Love"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Zmod fork of Simply Love";
|
||||
|
||||
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
impacket
|
||||
];
|
||||
|
||||
installChechPhase = ''
|
||||
installCheckPhase = ''
|
||||
$out/bin/kerbrute --version
|
||||
'';
|
||||
|
||||
|
||||
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ketesa";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etkecc";
|
||||
repo = "ketesa";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Yg5M3D4etEVwLXT5+QSLqebJwBIpRKV43nYycKSi/tw=";
|
||||
hash = "sha256-0YNCPOkWIzXMfs6Jptn+PBRHxuees6zVh7RpTXZKywQ=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = finalAttrs.src + "/yarn.lock";
|
||||
hash = "sha256-mLFCVt2LsF4/evlVyTXEdSSk4aDU2tF2m3v8j8eX8ng=";
|
||||
hash = "sha256-NJGAchoEVgIOjQyH9mNh7h4BZmq4HV2FjHOBhL88ZWw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
templ,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -20,17 +19,13 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
vendorHash = "sha256-sE8XGlQg6FLDfgYdioa5i5Gv8LyQo16p0oIaiyMOzZ4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
templ
|
||||
];
|
||||
|
||||
excludedPackages = [
|
||||
"internal/e2e"
|
||||
"internal/integration"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
templ generate
|
||||
go tool templ generate
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libxml2,
|
||||
glibmm,
|
||||
@@ -11,11 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libxmlxx5";
|
||||
version = "5.4";
|
||||
version = "5.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libxml++/${finalAttrs.version}/libxml++-${lib.versions.pad 3 finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-6aI8Q2aGqUaY0hOOa8uvhJEh1jv6D1DcNP77/XlWaEg=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "libxmlplusplus";
|
||||
repo = "libxmlplusplus";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-f8R2T5A7C/HqydhZOlbWIKj6Q9oc97f2PfV8ef70G0I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -31,9 +33,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/libxmlplusplus/libxmlplusplus/blob/${finalAttrs.src.tag}/NEWS";
|
||||
description = "C++ wrapper for the libxml2 XML parser library";
|
||||
homepage = "https://libxmlplusplus.sourceforge.net/";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
homepage = "https://libxmlplusplus.github.io/libxmlplusplus";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
||||
@@ -26,13 +26,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "liquidsoap";
|
||||
version = "2.4.4";
|
||||
version = "2.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "liquidsoap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uRqYyxLF6PuSDvbL77qn2PvttqqM9S00BjcaKUFxlQw=";
|
||||
hash = "sha256-aNsN65phkfFM7OD4oCMl0wP3quvUquHR325DDVIqs/M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "lunarclient";
|
||||
version = "3.6.11";
|
||||
version = "3.7.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
|
||||
hash = "sha512-WHjeAA+vS/gC8ZI2jUWpiJasvT+AgEWB14/ZnJGIOJPi4PUxtBNseM6HR8Aql8a8JGzobyZS9ISqYtFJEiYQ+A==";
|
||||
hash = "sha512-+xC7hvpQfmXkZ+FndNAWIxgfWjodfdcCrHmPe5XqEC+3cBkT6KpOxvuw7o0qAebxo6VNN5tKuAPfibfZfeH+RQ==";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
buildLua,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildLua (finalAttrs: {
|
||||
pname = "mpv-sub-select";
|
||||
version = "0-unstable-2025-04-04";
|
||||
|
||||
scriptPath = "sub-select.lua";
|
||||
src = fetchFromGitHub {
|
||||
owner = "CogentRedTester";
|
||||
repo = "mpv-sub-select";
|
||||
rev = "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb";
|
||||
hash = "sha256-+eVga4b7KIBnfrtmlgq/0HNjQVS3SK6YWVXCPvOeOOc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# changes default sub-select.json search location
|
||||
substituteInPlace sub-select.lua \
|
||||
--replace-fail '~~/script-opts' '${placeholder "out"}/share/mpv/script-opts'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir '${placeholder "out"}/share/mpv/script-opts'
|
||||
cp sub-select.json '${placeholder "out"}/share/mpv/script-opts'
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "An advanced conditional subtitle track selector for mpv player";
|
||||
homepage = "https://github.com/CogentRedTester/mpv-sub-select";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ lovistovis ];
|
||||
};
|
||||
})
|
||||
@@ -73,13 +73,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.73.0";
|
||||
version = "0.73.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xgZ1vteRQ9AEPdoV4gL9ZCzkiva8sTFUP0qt5S1u+zc=";
|
||||
hash = "sha256-KDtu29DaiaQ3IdlaqNdgJWt+n853pnE2PbRnYVxpU8A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qa++ONGrFsKJTK7R6Q/9FsMfptKNK9bza32nFKosDxY=";
|
||||
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
enableParalleBuilding = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
|
||||
|
||||
|
||||
@@ -39,7 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 ols odinfmt -t $out/bin/
|
||||
wrapProgram $out/bin/ols --set-default ODIN_ROOT ${odin}/share
|
||||
wrapProgram $out/bin/ols \
|
||||
--set-default ODIN_ROOT ${odin}/share \
|
||||
--set-default OLS_BUILTIN_FOLDER ${odin}/share/base/builtin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "ovhcloud-cli";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ovh";
|
||||
repo = "ovhcloud-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MiDX819XWBdtaeVwTRDMuuvmfWRQ0qhi3gQABHVQR3k=";
|
||||
hash = "sha256-t9opJiNvSWhaVVILkhvfXRh9fQKrrbzuJZDJ+vRNvEc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fDn6MUD2jr06T66xSxUtNFsL+upF1M2tD6IVdzhgfVI=";
|
||||
vendorHash = "sha256-gN6XQj0bjkeJq9coB7jBliyurrt4L+detXkTDSTN5lo=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "pi-coding-agent";
|
||||
version = "0.79.1";
|
||||
version = "0.79.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "earendil-works";
|
||||
repo = "pi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MvH8e21GVfzRQ9vsxFNC1GHJfB9GZpqY1Z2t8GCUaiQ=";
|
||||
hash = "sha256-eH1+vHrKBu1GcUXnTdvRtNuLuf0EdReAnFit8UqiXB4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ZWdfDDs+Hv+GWTmsNmpWNlUDBOMALw7H4lwo7CJHVCM=";
|
||||
npmDepsHash = "sha256-xrTpu4TkRmlflg7pMaw/QVsN+poQ41slVA5PET+NDoI=";
|
||||
|
||||
npmWorkspace = "packages/coding-agent";
|
||||
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plantuml-server";
|
||||
version = "1.2026.5";
|
||||
version = "1.2026.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/plantuml/plantuml-server/releases/download/v${finalAttrs.version}/plantuml-v${finalAttrs.version}.war";
|
||||
hash = "sha256-Ub6Ao+m1hC+tEerkVnMXN2CMRf8CKg9XcB9E8JsunvY=";
|
||||
hash = "sha256-1jcX6GMknJK5dGL74DMwYTDZNVkKI07MpL8qbb0WMi4=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
homepage = "https://www.prisma.io/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "prisma";
|
||||
mainProgram = "schema-engine";
|
||||
maintainers = with lib.maintainers; [
|
||||
aqrln
|
||||
];
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
enableParalleBuilding = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ libpng ];
|
||||
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rmux";
|
||||
version = "0.5.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Helvesec";
|
||||
repo = "rmux";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-W4Jw2r+4x90+x5WkrRwxrlqytRlU4wEY98MWJZbcblY=";
|
||||
hash = "sha256-zlgF+UOpQ67DPdD6U4r0eBTAQFMgFEljoQG4/YzNmlk=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
cargoHash = "sha256-fu96A2v5VH01HxNGpdLpBTH3o9DHrocSyvuK14nE1fk=";
|
||||
cargoHash = "sha256-GowybnjrP39ZZDmSR+2u3Y6tWNY9+MM712U/WZQE80Q=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
fetchFromGitHub,
|
||||
freetype,
|
||||
gtk3-x11,
|
||||
pcre,
|
||||
pcre2,
|
||||
pkg-config,
|
||||
webkitgtk_4_1,
|
||||
libxrandr,
|
||||
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
freetype
|
||||
gtk3-x11
|
||||
pcre
|
||||
pcre2
|
||||
libx11
|
||||
libxrandr
|
||||
]
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
diff --git a/build/build_plugs.ts b/build/build_plugs.ts
|
||||
index e72beaaa..e0660eef 100644
|
||||
--- a/build/build_plugs.ts
|
||||
+++ b/build/build_plugs.ts
|
||||
@@ -42,41 +42,15 @@ export async function buildPlugsAndLibraries(options?: {
|
||||
|
||||
export function updateVersionFile(): Promise<void> {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
- const gitProcess = spawn("git", ["describe", "--tags", "--long"], {
|
||||
- stdio: ["ignore", "pipe", "pipe"],
|
||||
- });
|
||||
-
|
||||
- let stdout = "";
|
||||
-
|
||||
- gitProcess.stdout?.on("data", (data) => {
|
||||
- stdout += data.toString();
|
||||
- });
|
||||
-
|
||||
- gitProcess.on("close", async (code) => {
|
||||
- let commitVersion = stdout.trim();
|
||||
-
|
||||
- if (!commitVersion || code !== 0) {
|
||||
- // Probably no valid .git repo, fallback to GITHUB_SHA env var (used in CI)
|
||||
- commitVersion = `${version}-${process.env.GITHUB_SHA || "unknown"}`;
|
||||
- }
|
||||
-
|
||||
- const versionFilePath = "./public_version.ts";
|
||||
- // Write version to file with date in YYYY-MM-DDTHH-MM-SSZ format attached to the version
|
||||
- const versionContent = `export const publicVersion = "${commitVersion}-${new Date()
|
||||
- .toISOString()
|
||||
- .split(".")[0]
|
||||
- .replaceAll(":", "-")
|
||||
- .concat("Z")}";`;
|
||||
-
|
||||
- try {
|
||||
- await writeFile(versionFilePath, versionContent, "utf-8");
|
||||
- resolve();
|
||||
- } catch (err) {
|
||||
- reject(err);
|
||||
- }
|
||||
- });
|
||||
-
|
||||
- gitProcess.on("error", reject);
|
||||
+ const versionFilePath = "./public_version.ts";
|
||||
+ const versionContent = `export const publicVersion = "@version@";`;
|
||||
+
|
||||
+ try {
|
||||
+ writeFile(versionFilePath, versionContent, "utf-8");
|
||||
+ resolve();
|
||||
+ } catch (err) {
|
||||
+ reject(err);
|
||||
+ }
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,75 +1,74 @@
|
||||
{
|
||||
autoPatchelfHook,
|
||||
common-updater-scripts,
|
||||
fetchzip,
|
||||
lib,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
stdenvNoCC,
|
||||
writeShellScript,
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
buildGoModule,
|
||||
replaceVars,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "silverbullet";
|
||||
version = "2.6.1";
|
||||
version = "2.9.0";
|
||||
|
||||
src =
|
||||
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
src = fetchFromGitHub {
|
||||
owner = "silverbulletmd";
|
||||
repo = "silverbullet";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-XQ0OKkiQrrmwmdGXk3dcim/2qosenF3EG2lkglQQ/iY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
vendorHash = "sha256-8zZlhVptJq8y3k2DBghJ0lPNcIcaZYkrxN67b6dNBPs=";
|
||||
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
subPackages = [ "." ];
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
pname = "silverbullet-frontend";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
npmDepsHash = "sha256-Twcv3I3scF09onJQdYsc1zOFzMFPOEyPF7VPYa7LBko=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./override-public-version.patch { inherit (finalAttrs) version; })
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
npm run build:plug-compile
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -r client_bundle public_version.ts $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${finalAttrs.frontend}/client_bundle .
|
||||
cp ${finalAttrs.frontend}/public_version.ts .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp $src/silverbullet $out/bin/
|
||||
|
||||
install -Dm755 "$GOPATH/bin/silverbullet" $out/bin/silverbullet
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
sources = {
|
||||
"x86_64-linux" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-linux-x86_64.zip";
|
||||
hash = "sha256-m0bQ3J99WZ9CBrA7M2i7Sh/lOI5c+z/an+9bNfQZW4c=";
|
||||
stripRoot = false;
|
||||
};
|
||||
"aarch64-linux" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-linux-aarch64.zip";
|
||||
hash = "sha256-BqTKMCpifX3Y5kFWQb/9exAjjTc/KeUhYtsHSR850qE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
"x86_64-darwin" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-darwin-x86_64.zip";
|
||||
hash = "sha256-sqvB9kEpMimcH/rtOc7lBMptu3Cdu6M3z85TfD9QuZ4=";
|
||||
stripRoot = false;
|
||||
};
|
||||
"aarch64-darwin" = fetchzip {
|
||||
url = "https://github.com/silverbulletmd/silverbullet/releases/download/${finalAttrs.version}/silverbullet-server-darwin-aarch64.zip";
|
||||
hash = "sha256-K/4w4jsa+RIYQA9cW2U/oycJx7PfUzcdG6WjZswRLU0=";
|
||||
stripRoot = false;
|
||||
};
|
||||
};
|
||||
|
||||
updateScript = writeShellScript "update-silverbullet" ''
|
||||
NEW_VERSION="$1"
|
||||
for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
|
||||
${lib.getExe' common-updater-scripts "update-source-version"} "silverbullet" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform"
|
||||
done
|
||||
'';
|
||||
|
||||
tests = {
|
||||
inherit (nixosTests) silverbullet;
|
||||
};
|
||||
};
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/silverbulletmd/silverbullet/blob/${finalAttrs.version}/website/CHANGELOG.md";
|
||||
description = "Open-source, self-hosted, offline-capable Personal Knowledge Management (PKM) web application";
|
||||
homepage = "https://silverbullet.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aorith ];
|
||||
maintainers = with lib.maintainers; [
|
||||
aorith
|
||||
CnTeng
|
||||
];
|
||||
mainProgram = "silverbullet";
|
||||
platforms = builtins.attrNames finalAttrs.passthru.sources;
|
||||
};
|
||||
})
|
||||
|
||||
Executable
+8
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update common-updater-scripts
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
nix-update silverbullet --src-only --override-filename
|
||||
update-source-version silverbullet --source-key=frontend.npmDeps --ignore-same-version
|
||||
update-source-version silverbullet --source-key=goModules --ignore-same-version
|
||||
@@ -40,13 +40,13 @@ in
|
||||
# note: there is a generic builder in pkgs/games/sm64ex/generic.nix that is meant to help build sm64ex and its forks; however sm64coopdx has departed significantly enough in its build that it doesn't make sense to use that other than the baseRom derivation
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sm64coopdx";
|
||||
version = "1.4.1";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coop-deluxe";
|
||||
repo = "sm64coopdx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BIdKKIp6q9Vp2DByXzT9CJzOszFhjriiWBEqFwUT28M=";
|
||||
hash = "sha256-AadjXTjUBnSbHP8tRHKvWotW58s5tMUJGtxbdPxYg6E=";
|
||||
};
|
||||
|
||||
patches = [ ./no-update-check.patch ];
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
libx11,
|
||||
libxi,
|
||||
libxtst,
|
||||
xdotool,
|
||||
libxkbcommon,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "snipt";
|
||||
version = "0.1.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snipt";
|
||||
repo = "snipt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UMsoTJtpS4vInviDdCrnZQk2scYHM/5a8l7/HK+o8Tc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mtw9mdUDxYhZcncTves0FH6COvRNVaMZOdapy3VEZrk=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libx11
|
||||
libxi
|
||||
libxtst
|
||||
xdotool
|
||||
libxkbcommon
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Powerful text snippet expansion tool";
|
||||
longDescription = ''
|
||||
Snipt is a powerful text snippet expansion tool that boosts your productivity
|
||||
by replacing short text shortcuts with longer content.
|
||||
Just type a prefix (like `:`) followed by your shortcut,
|
||||
and snipt automatically expands it into your predefined text.
|
||||
'';
|
||||
homepage = "https://github.com/snipt/snipt";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ chillcicada ];
|
||||
mainProgram = "snipt";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "spicedb";
|
||||
version = "1.52.0";
|
||||
version = "1.53.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "spicedb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-W9NYkZ+t2W0t7QsixCYxS8+Qke+RYj6IcdeyJBgEZsw=";
|
||||
hash = "sha256-kmhLvHPqHqSFkfUx9pr52Vvz+YgCPwknHqSY4zpVPtI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y3cQykB/GqIunWKHFQrUOuC26CduVHLAEfmKVqvvJMY=";
|
||||
vendorHash = "sha256-G3isae85B6Js6H7XFAJ+v00caBV4+PO9IPCpHXzkBOs=";
|
||||
|
||||
ldflags = [
|
||||
"-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'"
|
||||
|
||||
@@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/asg017/sqlite-vec/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
anmonteiro
|
||||
sarahec
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
supertuxkart,
|
||||
}:
|
||||
supertuxkart.override {
|
||||
nameSuffix = "-server";
|
||||
serverOnly = true;
|
||||
}
|
||||
@@ -24,6 +24,8 @@
|
||||
sqlite,
|
||||
libsamplerate,
|
||||
shaderc,
|
||||
serverOnly ? false,
|
||||
nameSuffix ? "",
|
||||
}:
|
||||
let
|
||||
assets = fetchsvn {
|
||||
@@ -66,7 +68,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
pname = "supertuxkart";
|
||||
pname = "supertuxkart${nameSuffix}";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -93,29 +95,32 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
shaderc
|
||||
SDL2
|
||||
glew
|
||||
libvorbis
|
||||
libogg
|
||||
freetype
|
||||
curl
|
||||
libjpeg
|
||||
libpng
|
||||
libx11
|
||||
harfbuzz
|
||||
mcpp
|
||||
wiiuse
|
||||
angelscript
|
||||
sqlite
|
||||
]
|
||||
++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder
|
||||
++ lib.optional stdenv.hostPlatform.isLinux openal
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libsamplerate
|
||||
];
|
||||
++ lib.optionals (!serverOnly) (
|
||||
[
|
||||
shaderc
|
||||
SDL2
|
||||
glew
|
||||
libvorbis
|
||||
libogg
|
||||
freetype
|
||||
libjpeg
|
||||
libpng
|
||||
libx11
|
||||
harfbuzz
|
||||
wiiuse
|
||||
]
|
||||
++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder
|
||||
++ lib.optional stdenv.hostPlatform.isLinux openal
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin libsamplerate
|
||||
);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSERVER_ONLY=${if serverOnly then "ON" else "OFF"}"
|
||||
"-DBUILD_RECORDER=${
|
||||
if (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) then "ON" else "OFF"
|
||||
}"
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tanka";
|
||||
version = "0.37.1";
|
||||
version = "0.37.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "tanka";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-7u6/IflJoZTG7N7QIiTGghrC+pby6t1+bUjMB2OJc4A=";
|
||||
sha256 = "sha256-C1Tg3ruitMa3t7FA74m73oL+kd7AvPGvnA66/x9VOpw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SD6Uj0OExlY6yjZYTarCyDywPZ2Uq3nz/wyd18ZC0/c=";
|
||||
vendorHash = "sha256-nEiHJgEnq3KrPO0geNAz7NIp7tvCvtAUF8eNeP7NjPM=";
|
||||
|
||||
doCheck = false;
|
||||
# Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "templ";
|
||||
version = "0.3.1001";
|
||||
version = "0.3.1020";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "a-h";
|
||||
repo = "templ";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-146QxN+osvlzp8NTGm5TN2yvbu3cOodXfIVeIKsS+7I=";
|
||||
hash = "sha256-wv7qKZfnavz8lxfaOaIJJySNsXsjke1ADJuv2kgQOHE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-pVZjZCXT/xhBCMyZdR7kEmB9jqhTwRISFp63bQf6w5A=";
|
||||
vendorHash = "sha256-i4uDGZb3VZUvIyO2Tt53VR1Do/3OYtj6JccGoFnnlbs=";
|
||||
|
||||
subPackages = [ "cmd/templ" ];
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
writableTmpDirAsHomeHook,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -21,6 +22,8 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
vendorHash = "sha256-N9K05Kcb0YaQO7M9gR22QzAOzbmgEhIqADcAESqYtQ8=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
subPackages = [
|
||||
@@ -30,7 +33,7 @@ buildGoModule (finalAttrs: {
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/temporalio/cli/temporalcli.Version=${finalAttrs.version}"
|
||||
"-X github.com/temporalio/cli/internal/temporalcli.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
# Tests fail with x86 on macOS Rosetta 2
|
||||
@@ -38,6 +41,9 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd temporal \
|
||||
--bash <($out/bin/temporal completion bash) \
|
||||
@@ -58,7 +64,10 @@ buildGoModule (finalAttrs: {
|
||||
description = "Command-line interface for running Temporal Server and interacting with Workflows, Activities, Namespaces, and other parts of Temporal";
|
||||
homepage = "https://docs.temporal.io/cli";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ aaronjheng ];
|
||||
maintainers = with lib.maintainers; [
|
||||
aaronjheng
|
||||
jlesquembre
|
||||
];
|
||||
mainProgram = "temporal";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tinymist";
|
||||
# Please update the corresponding vscode extension when updating
|
||||
# this derivation.
|
||||
version = "0.14.25";
|
||||
version = "0.15.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -23,10 +23,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Myriad-Dreamin";
|
||||
repo = "tinymist";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F+GDI+1n8PqhWIxHlKgdsZ8IhQo0CsyAV6g26f5ITVo=";
|
||||
hash = "sha256-SfkyyszTmleWHa19jMgHjiOUvBOniVybDr9GBmtMVDw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JpeXrk/6FP27rcG84CzeaCn9JEMopvtu/rg7/w1TgzI=";
|
||||
cargoHash = "sha256-ztJb2Br0Ph2qSeo9MGm9OdU66YPkep+9lBCrL2TimB4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -56,6 +56,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--skip=references::tests::test"
|
||||
"--skip=rename::tests::test"
|
||||
"--skip=semantic_tokens_full::tests::test"
|
||||
|
||||
# Return "No compatible device found" when testing preview
|
||||
"--skip=doc::tests::diff_v1_preview_frame_paints_generated_page"
|
||||
"--skip=doc::tests::full_current_preview_frame_paints_generated_page_after_reset"
|
||||
"--skip=doc::tests::page_canvas_exposes_synthetic_accesskit_link_nodes"
|
||||
"--skip=doc::tests::page_canvas_exposes_synthetic_accesskit_text_runs"
|
||||
"--skip=doc::tests::page_canvas_paints_selection_overlay_above_scene"
|
||||
"--skip=doc::tests::page_canvas_paints_supplied_white_background"
|
||||
"--skip=doc::tests::page_canvas_selects_and_copies_text"
|
||||
"--skip=doc::tests::page_canvas_uses_pointer_cursor_over_links"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "todoist-cli";
|
||||
version = "1.61.2";
|
||||
version = "1.74.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Doist";
|
||||
repo = "todoist-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A7SrwLD1296YCtiHRvrtN2AQ1PKDsvFCTWPwyimFWMI=";
|
||||
sha256 = "sha256-rPgTYZqqecOE3eVw9qJBLESNF7DMbR7E9cezHFmKeZs=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-vPts0GjwpDRiiWG7cP2N4Jlci3JGtaqpA8MYdrGCBkI=";
|
||||
npmDepsHash = "sha256-BW238pzFc7Cwt5lfnR5xAtSv87qE/4ge88h3ynjzVI0=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{ transmission_4 }:
|
||||
|
||||
transmission_4.override { enableGTK3 = true; }
|
||||
transmission_4.override { enableGTK4 = true; }
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
dht,
|
||||
libnatpmp,
|
||||
# Build options
|
||||
enableGTK3 ? false,
|
||||
gtkmm3,
|
||||
enableGTK4 ? false,
|
||||
gtkmm4,
|
||||
libpthread-stubs,
|
||||
libayatana-appindicator,
|
||||
wrapGAppsHook3,
|
||||
wrapGAppsHook4,
|
||||
enableQt5 ? false,
|
||||
enableQt6 ? false,
|
||||
enableMac ? false,
|
||||
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(cmakeBool "ENABLE_CLI" enableCli)
|
||||
(cmakeBool "ENABLE_DAEMON" enableDaemon)
|
||||
(cmakeBool "ENABLE_GTK" enableGTK3)
|
||||
(cmakeBool "ENABLE_GTK" enableGTK4)
|
||||
(cmakeBool "ENABLE_MAC" enableMac)
|
||||
(cmakeBool "ENABLE_QT" (enableQt5 || enableQt6))
|
||||
(cmakeBool "INSTALL_LIB" installLib)
|
||||
@@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmake
|
||||
python3
|
||||
]
|
||||
++ optionals enableGTK3 [ wrapGAppsHook3 ]
|
||||
++ optionals enableGTK4 [ wrapGAppsHook4 ]
|
||||
++ optionals enableQt5 [ qt5.wrapQtAppsHook ]
|
||||
++ optionals enableQt6 [ qt6Packages.wrapQtAppsHook ]
|
||||
++ optionals enableMac [
|
||||
@@ -186,8 +186,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qtsvg
|
||||
]
|
||||
)
|
||||
++ optionals enableGTK3 [
|
||||
gtkmm3
|
||||
++ optionals enableGTK4 [
|
||||
gtkmm4
|
||||
libpthread-stubs
|
||||
libayatana-appindicator
|
||||
]
|
||||
@@ -232,7 +232,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
mainProgram =
|
||||
if (enableQt5 || enableQt6) then
|
||||
"transmission-qt"
|
||||
else if enableGTK3 then
|
||||
else if enableGTK4 then
|
||||
"transmission-gtk"
|
||||
else if enableMac then
|
||||
"transmission-mac"
|
||||
|
||||
@@ -39,13 +39,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ugrep";
|
||||
version = "7.5.0";
|
||||
version = "7.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "ugrep";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-y++cW+N6KPm+/g4pqvPeTfiuR6IRiSMONJ0tJ4+5ym0=";
|
||||
hash = "sha256-EJU5PvwvDdN52/0vIqUJAIsHcfVJWuZHZ7tTR87eN7Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uutils-tar";
|
||||
version = "0-unstable-2026-05-13";
|
||||
version = "0-unstable-2026-06-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uutils";
|
||||
repo = "tar";
|
||||
rev = "840b16bd8fd53a2fe4e8780d710014c2908b9870";
|
||||
hash = "sha256-ZCTg7LEJdG6AzbR22l5MsNo17IO+eWO6dgFINx5xUeA=";
|
||||
rev = "4c1c362e5766760b7ffc120f0ccf25a5344122c5";
|
||||
hash = "sha256-oLa9KGqcSay3u6Jt3BMNz/evwS3g7u627qOhlqR+1Eg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-tv+Rw7fS2llSJBVhfsGSGcovcdU+8ZYNa89K+LYdcFg=";
|
||||
cargoHash = "sha256-xZqRhBq5zhCvJ6/qAXYNsylFpph6EiPobH0SuWHCtes=";
|
||||
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wasm-language-tools";
|
||||
version = "0.10.7";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g-plane";
|
||||
repo = "wasm-language-tools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iPZAF4BJ+uVUADsltJpkjc1O1X4dJOIQB5V6Nv5L3TU=";
|
||||
hash = "sha256-XyVWNhVDo190/hnKj6A5dDYnlO9/WI0GYJIrkyfUkTw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KrKtTcQFVHaaxTxozszH7V3qkOK/EVrCk17OWGkJa3E=";
|
||||
cargoHash = "sha256-VoApXHdD8SF8ZqnDVynxunjVoZ5WKai2Xzw0UYy7hSg=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/wat_server";
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "waypaper";
|
||||
version = "2.7-unstable-2026-01-13";
|
||||
version = "2.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "yaookctl";
|
||||
version = "0-unstable-2026-04-24";
|
||||
version = "0-unstable-2026-06-18";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "yaook";
|
||||
repo = "yaookctl";
|
||||
rev = "2b66a5bf50b05c68897ab80a17d41d9611d16a1d";
|
||||
hash = "sha256-cunSKWjOx+R0gTJic1DJRVHx0RG+vXCagbf8kmTrVKY=";
|
||||
rev = "697cf46425794c49fe9bb2b42550a58ddcac67a1";
|
||||
hash = "sha256-6pLDWPWKxVCGFZr/GhE7BegG86Zbgkw92S5lVMsvtHs=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -37,7 +37,7 @@ buildGoModule (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [ pinpox ];
|
||||
license = lib.licenses.gpl3;
|
||||
description = "Zettelkasten plain text note-taking assistant";
|
||||
homepage = "https://github.com/mickael-menu/zk";
|
||||
homepage = "https://github.com/zk-org/zk";
|
||||
mainProgram = "zk";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -108,7 +108,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [
|
||||
vrthra
|
||||
spacefrogg
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
||||
@@ -14,6 +14,9 @@
|
||||
xvfb-run,
|
||||
}:
|
||||
|
||||
let
|
||||
withQt6 = lib.versions.major qtbase.version == "6";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "accounts-qml-module";
|
||||
version = "0.7-unstable-2023-10-28";
|
||||
@@ -27,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
]
|
||||
++ lib.optionals (!withQt6) [
|
||||
"doc"
|
||||
];
|
||||
|
||||
@@ -54,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
qmake
|
||||
qtdeclarative # qmlplugindump
|
||||
]
|
||||
++ lib.optionals (!withQt6) [
|
||||
qttools # qdoc
|
||||
];
|
||||
|
||||
@@ -71,6 +78,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
qmakeFlags = lib.optionals withQt6 [
|
||||
# No qdoc in Qt6 qttools?
|
||||
"CONFIG+=no_docs"
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
make qmake_all
|
||||
'';
|
||||
@@ -87,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
postFixup = lib.optionalString (!withQt6) ''
|
||||
moveToOutput share/accounts-qml-module/doc $doc
|
||||
'';
|
||||
|
||||
|
||||
@@ -29,7 +29,6 @@ buildDunePackage {
|
||||
description = "Mirage implementation for Alcotest";
|
||||
maintainers = with lib.maintainers; [
|
||||
ulrikstrid
|
||||
anmonteiro
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,6 +28,6 @@ buildDunePackage (finalAttrs: {
|
||||
description = "Implementation of a platform specific runtime code for driving network libraries based on state machines, such as http/af, h2 and websocketaf";
|
||||
license = lib.licenses.bsd3;
|
||||
homepage = "https://github.com/anmonteiro/gluten";
|
||||
maintainers = with lib.maintainers; [ anmonteiro ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -31,7 +31,6 @@ buildDunePackage (finalAttrs: {
|
||||
homepage = "https://github.com/anmonteiro/ocaml-h2";
|
||||
maintainers = with lib.maintainers; [
|
||||
sternenseemann
|
||||
anmonteiro
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -58,6 +58,6 @@ buildDunePackage (finalAttrs: {
|
||||
description = "HTTP library with HTTP/2 support written entirely in OCaml";
|
||||
homepage = "https://github.com/anmonteiro/piaf";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ anmonteiro ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -22,7 +22,6 @@ buildDunePackage (finalAttrs: {
|
||||
homepage = "https://anuragsoni.github.io/routes";
|
||||
maintainers = with lib.maintainers; [
|
||||
ulrikstrid
|
||||
anmonteiro
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -42,7 +42,6 @@ buildDunePackage rec {
|
||||
ocamlLgplLinkingException
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
anmonteiro
|
||||
dandellion
|
||||
];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
{
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
ddt,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
lib,
|
||||
multidict,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
yarl,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiointercept";
|
||||
version = "0.1.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Polandia94";
|
||||
repo = "aiointercept";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+tl3Cb2Lkl40FdPNs5byCNoyfm9g6wEKtR0nT1jjrx0=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
multidict
|
||||
yarl
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiointercept"
|
||||
"aiointercept.pytest_plugin"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
ddt
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# different indentation
|
||||
"test_assert_called_with_json"
|
||||
"test_assert_called_with_data_bytes"
|
||||
"test_assert_called_with_data_dict"
|
||||
"test_assert_called_with_strict_headers_fail"
|
||||
# connect to DNS servers
|
||||
"test_address_as_instance_of_url_combined_with_pass_through"
|
||||
"test_pass_through_unmatched_requests"
|
||||
"test_pass_through_with_origin_params"
|
||||
"test_passthrough_host_is_allowed"
|
||||
"test_passthrough_https_explicit"
|
||||
"test_passthrough_unmatched_allows_real_requests"
|
||||
"test_passthrough_unmatched_https_no_patterns"
|
||||
"test_passthrough_unmatched_https_with_patterns"
|
||||
"test_passthrough_unmatched_url_handler_unknown_path_proxied"
|
||||
"test_passthrough_unmatched_with_pattern_proxies_unmatched"
|
||||
"test_real_request_then_mock_same_host_ignores_stale_dns"
|
||||
"test_shared_resolve_no_active_instances_uses_real_resolver"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/Polandia94/aiointercept/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
description = "Aiohttp mock library that routes requests through a real test server";
|
||||
homepage = "https://github.com/Polandia94/aiointercept";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.dotlambda ];
|
||||
};
|
||||
})
|
||||
@@ -5,17 +5,18 @@
|
||||
replaceVars,
|
||||
pyparsing,
|
||||
graphviz,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
texliveSmall,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "dot2tex";
|
||||
version = "2.11.3";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-KZoq8FruW74CV6VipQapPieSk9XDjyjQirissyM/584=";
|
||||
};
|
||||
|
||||
@@ -29,7 +30,9 @@ buildPythonPackage rec {
|
||||
./remove-duplicate-script.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ pyparsing ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ pyparsing ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
@@ -47,4 +50,4 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/kjellmf/dot2tex";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
|
||||
# build-system
|
||||
ninja,
|
||||
@@ -9,9 +10,7 @@
|
||||
torch,
|
||||
|
||||
# dependencies
|
||||
cuda-bindings,
|
||||
einops,
|
||||
nvidia-cutlass-dsl,
|
||||
|
||||
# tests
|
||||
apex,
|
||||
@@ -43,11 +42,6 @@ let
|
||||
hash = "sha256-IgK517JorAf9ERcimusF20HgnuETBNKgnGaOxWBuV/M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# cutlass.utils.ampere_helpers was removed from nvidia-cutlass-dsl, this patch is a workaround.
|
||||
./drop-cutlass-ampere-utils.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export MAX_JOBS="$NIX_BUILD_CORES"
|
||||
export NVCC_THREADS=2
|
||||
@@ -83,14 +77,18 @@ let
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
# Used in flash_attn/cute/interface.py
|
||||
cuda-bindings
|
||||
|
||||
einops
|
||||
nvidia-cutlass-dsl
|
||||
torch
|
||||
];
|
||||
|
||||
# The CuTeDSL implementation (flash_attn/cute) is the FlashAttention-4 module,
|
||||
# packaged separately as `flash-attn-4`. Drop the stale snapshot bundled in this
|
||||
# FA2 release so the two packages don't collide on flash_attn/cute/ when a single
|
||||
# environment installs both.
|
||||
postInstall = ''
|
||||
rm -rf "$out/${python.sitePackages}/flash_attn/cute"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "flash_attn" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
diff --git a/flash_attn/cute/ampere_helpers.py b/flash_attn/cute/ampere_helpers.py
|
||||
index 839f407..9f74824 100644
|
||||
--- a/flash_attn/cute/ampere_helpers.py
|
||||
+++ b/flash_attn/cute/ampere_helpers.py
|
||||
@@ -5,6 +5,15 @@ import cutlass
|
||||
import cutlass.cute as cute
|
||||
|
||||
|
||||
+# Max dynamic shared memory per SM, in bytes (architectural max minus 1 KB reserved for the driver).
|
||||
+# Mirrors the values previously exposed by cutlass.utils.ampere_helpers, which was removed in nvidia-cutlass-dsl 4.3.
|
||||
+SMEM_CAPACITY = {
|
||||
+ "sm80": (164 - 1) * 1024,
|
||||
+ "sm86": (100 - 1) * 1024,
|
||||
+ "sm89": (100 - 1) * 1024,
|
||||
+}
|
||||
+
|
||||
+
|
||||
def get_smem_layout_atom(dtype: Type[cutlass.Numeric], k_dim: int) -> cute.ComposedLayout:
|
||||
dtype_byte = cutlass.const_expr(dtype.width // 8)
|
||||
bytes_per_row = cutlass.const_expr(k_dim * dtype_byte)
|
||||
diff --git a/flash_attn/cute/flash_bwd.py b/flash_attn/cute/flash_bwd.py
|
||||
index 79f5ee8..be008b1 100644
|
||||
--- a/flash_attn/cute/flash_bwd.py
|
||||
+++ b/flash_attn/cute/flash_bwd.py
|
||||
@@ -11,7 +11,6 @@ import cuda.bindings.driver as cuda
|
||||
import cutlass
|
||||
import cutlass.cute as cute
|
||||
from cutlass.cute.nvgpu import cpasync, warp
|
||||
-import cutlass.utils.ampere_helpers as sm80_utils_basic
|
||||
|
||||
from flash_attn.cute import ampere_helpers as sm80_utils
|
||||
from flash_attn.cute import utils
|
||||
@@ -125,7 +124,7 @@ class FlashAttentionBackwardSm80:
|
||||
smem_usage_V = n_block_size * head_dim_v * 2
|
||||
smem_usage_QV = (smem_usage_Q + smem_usage_V) if not V_in_regs else max(smem_usage_Q, smem_usage_V)
|
||||
smem_usage = smem_usage_QV + smem_usage_dO + smem_usage_K
|
||||
- smem_capacity = sm80_utils_basic.SMEM_CAPACITY["sm80"]
|
||||
+ smem_capacity = sm80_utils.SMEM_CAPACITY["sm80"]
|
||||
if smem_usage > smem_capacity:
|
||||
return False
|
||||
return True
|
||||
diff --git a/flash_attn/cute/flash_fwd.py b/flash_attn/cute/flash_fwd.py
|
||||
index ddd5cfc..cf5ac81 100644
|
||||
--- a/flash_attn/cute/flash_fwd.py
|
||||
+++ b/flash_attn/cute/flash_fwd.py
|
||||
@@ -16,7 +16,6 @@ import cutlass
|
||||
import cutlass.cute as cute
|
||||
from cutlass import const_expr
|
||||
from cutlass.cute.nvgpu import cpasync, warp, warpgroup
|
||||
-import cutlass.utils.ampere_helpers as sm80_utils_basic
|
||||
import cutlass.utils.hopper_helpers as sm90_utils_basic
|
||||
|
||||
from flash_attn.cute import ampere_helpers as sm80_utils
|
||||
@@ -127,7 +126,7 @@ class FlashAttentionForwardBase:
|
||||
smem_usage_QV = (smem_usage_Q + smem_usage_V) if not Q_in_regs else max(smem_usage_Q, smem_usage_V)
|
||||
smem_usage = smem_usage_QV + smem_usage_K
|
||||
# TODO: sm86 and sm89
|
||||
- smem_capacity = sm80_utils_basic.SMEM_CAPACITY["sm80"]
|
||||
+ smem_capacity = sm80_utils.SMEM_CAPACITY["sm80"]
|
||||
if smem_usage > smem_capacity:
|
||||
return False
|
||||
# Check if twice the block size is divisible by the number of threads
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
aiofiles,
|
||||
aiohttp,
|
||||
aiointercept,
|
||||
aioresponses,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
@@ -15,18 +16,22 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "imgw-pib";
|
||||
version = "2.2.2";
|
||||
version = "2.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bieniu";
|
||||
repo = "imgw-pib";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LWyaTi4OIxK+Nyrwp9/Czl2hxCiRjoTeKhl0Yfw95pk=";
|
||||
hash = "sha256-IJOzQV2WYc6ZWo6S6kkgSJLC4Y5kWbwkyMDvuFSmESU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aiohttp"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
aiofiles
|
||||
aiohttp
|
||||
@@ -36,6 +41,7 @@ buildPythonPackage (finalAttrs: {
|
||||
pythonImportsCheck = [ "imgw_pib" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aiointercept
|
||||
aioresponses
|
||||
freezegun
|
||||
pytest-asyncio
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "kagglehub";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -46,7 +46,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "Kaggle";
|
||||
repo = "kagglehub";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HyPFGde1v++7Ef5dSLHLA2u2RfnlwM+63RAV+lulTjw=";
|
||||
hash = "sha256-a21HFUNU7zWGb0ZpXx8MSDVpgu7Ykx6SLbLaIO6wRm8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -9,21 +9,19 @@
|
||||
# dependencies
|
||||
protobuf,
|
||||
requests,
|
||||
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "kagglesdk";
|
||||
version = "0.1.23";
|
||||
version = "0.1.30";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kaggle";
|
||||
repo = "kagglesdk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0KzZy7Hghkljdbbp4AnafBmZL+jw/3q44+caSZ1S1mU=";
|
||||
hash = "sha256-7YjbJ6uo6R3jpo25wlHftYAA+0t7oUXc432N/REeCzU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mitsubishi-comfort";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikolairahimi";
|
||||
repo = "mitsubishi-comfort";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PyNWGCxO04+/4BCN22qvKoHB1Molp5jLFNHIxRFavNY=";
|
||||
hash = "sha256-fdP2E6ICxuaOUlNJxAa7k0WICWmxKtRFfB2eKRdanG8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "moyopy";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "spglib";
|
||||
repo = "moyo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PxKY/dhYKdvl2dfrDfsqg46TJ2EFx6Px27u8OddQjiI=";
|
||||
hash = "sha256-PnDE47R+OyJ5byBzjssHStTPtCZP9NUgIIO6065dLhI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/moyopy";
|
||||
@@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: {
|
||||
sourceRoot
|
||||
cargoRoot
|
||||
;
|
||||
hash = "sha256-8GNHuRv3neE0xhfLyxw92DvZRUJFrYm7JCi0Bd2KROs=";
|
||||
hash = "sha256-5/l3VL3CYTdTCrDXy8tg2hVXk9ZcUBoKtXPPIQcuAuc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-config";
|
||||
version = "10.4.0";
|
||||
version = "10.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo_config";
|
||||
inherit version;
|
||||
hash = "sha256-KuPgJZNHTs17ZOxOsRSCrbTJKKeCZ7yCD1w/gCQLGXo=";
|
||||
hash = "sha256-juozVsk4KMLWG+oesZuM14YKPtr/StJnjXdN01NzDfo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
let
|
||||
pname = "pynitrokey";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
mainProgram = "nitropy";
|
||||
in
|
||||
|
||||
@@ -35,7 +35,7 @@ buildPythonPackage {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fDLkYUVBdMFbHlnFSCUUlyJNP9OzRKOJM3ExFdzDEkU=";
|
||||
hash = "sha256-gVHa95vQH9mCxeU+hX6tXDM2WUc0vw+8iTcPs1msjbQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tt-flash";
|
||||
version = "3.8.0";
|
||||
version = "3.9.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: {
|
||||
owner = "tenstorrent";
|
||||
repo = "tt-flash";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-p1NzR53n9f4nVQXHDxTlbtqYVTL/5/ZSqkM3ldozsME=";
|
||||
hash = "sha256-YpkDBLkhN413wbJ2eLzRJGSG6Rn6eMNSkCBvy+G0wh4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
setuptools,
|
||||
mock,
|
||||
boto3,
|
||||
envs,
|
||||
@@ -13,33 +14,37 @@
|
||||
buildPythonPackage {
|
||||
pname = "warrant";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
# move to fetchPyPi when https://github.com/capless/warrant/issues/97 is fixed
|
||||
src = fetchFromGitHub {
|
||||
owner = "capless";
|
||||
repo = "warrant";
|
||||
rev = "ff2e4793d8479e770f2461ef7cbc0c15ee784395";
|
||||
sha256 = "0gw3crg64p1zx3k5js0wh0x5bldgs7viy4g8hld9xbka8q0374hi";
|
||||
hash = "sha256-EZIzAEZqrp4ahegRH/fRr9FVOoAcaFnm6D9cYl5mgz8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-pip10-compat.patch";
|
||||
url = "https://github.com/capless/warrant/commit/ae17d17d9888b9218a8facf6f6ad0bf4adae9a12.patch";
|
||||
sha256 = "1lvqi2qfa3kxdz05ab2lc7xnd3piyvvnz9kla2jl4pchi876z17c";
|
||||
hash = "sha256-7IRvDoqQXUKlUHSmb/f28Y5m+2FULFXAb30O5bCIeNM=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# this needs to go when 0.6.2 or later is released
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "python-jose-cryptodome>=1.3.2" "python-jose>=2.0.0"
|
||||
--replace-fail "python-jose-cryptodome>=1.3.2" "python-jose>=2.0.0"
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ mock ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
boto3
|
||||
envs
|
||||
python-jose
|
||||
@@ -49,6 +54,8 @@ buildPythonPackage {
|
||||
# all the checks are failing
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "warrant" ];
|
||||
|
||||
meta = {
|
||||
description = "Python library for using AWS Cognito with support for SRP";
|
||||
homepage = "https://github.com/capless/warrant";
|
||||
|
||||
@@ -4,21 +4,26 @@
|
||||
async-timeout,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "webthing-ws";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-ecosystem";
|
||||
repo = "webthing-ws";
|
||||
tag = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-j7nc4yJczDs28RVFDHeQ2ZIG9mIW2m25AAeErVKi4E4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
@@ -31,8 +36,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "WebThing WebSocket consumer and API client";
|
||||
homepage = "https://github.com/home-assistant-ecosystem/webthing-ws";
|
||||
changelog = "https://github.com/home-assistant-ecosystem/webthing-ws/releases/tag/${version}";
|
||||
changelog = "https://github.com/home-assistant-ecosystem/webthing-ws/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,70 +2,63 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
yarn-berry_4,
|
||||
nodejs,
|
||||
fetchPnpmDeps,
|
||||
makeWrapper,
|
||||
nodejs,
|
||||
pnpm_11,
|
||||
pnpmConfigHook,
|
||||
python3,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ansible-language-server";
|
||||
version = "1.2.4"; # Language server version from the repo at packages/ansible-language-server/package.json
|
||||
vscodeAnsibleVersion = "26.1.3"; # vscode-ansible version
|
||||
version = finalAttrs.vscodeAnsibleVersion; # Language server version from the repo at packages/ansible-language-server/package.json is stuck at 0.0.0
|
||||
vscodeAnsibleVersion = "26.6.0"; # vscode-ansible version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ansible";
|
||||
repo = "vscode-ansible";
|
||||
tag = "v${finalAttrs.vscodeAnsibleVersion}";
|
||||
hash = "sha256-DsEW3xP8Fa9nwPuyEFVqG6rvAZgr4TDB6jhyixdvqt8=";
|
||||
};
|
||||
patches = [
|
||||
# Remove when updating, the project migrated to pnpm in https://github.com/ansible/vscode-ansible/commit/afa700ff78ad0839df446d18cb26e71b28559af4
|
||||
./yarn-4.14-support.patch
|
||||
];
|
||||
|
||||
missingHashes = ./missing-hashes.json;
|
||||
|
||||
offlineCache = yarn-berry_4.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src missingHashes patches;
|
||||
hash = "sha256-Lm3cz+ydOee34J2tnlMQuSTzBzFKFpQTXcMreMS3ZiU=";
|
||||
hash = "sha256-GmeEVZumm+dfQFYLL8+Lf5usPw17a0vOZIe7ApTzFGI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
yarn-berry_4
|
||||
yarn-berry_4.yarnBerryConfigHook
|
||||
makeWrapper
|
||||
writableTmpDirAsHomeHook
|
||||
nodejs
|
||||
pnpmConfigHook
|
||||
pnpm_11
|
||||
];
|
||||
|
||||
# Prevent native module builds (e.g. keytar from the VS Code extension workspace)
|
||||
# The language server only needs TypeScript compilation, done manually in buildPhase
|
||||
env.YARN_ENABLE_SCRIPTS = "0";
|
||||
pnpmWorkspaces = [ "@ansible/ansible-language-server" ];
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs)
|
||||
pnpmWorkspaces
|
||||
pname
|
||||
version
|
||||
src
|
||||
;
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-z41U5Yr7e6SgIyFTfwx6TNcVnJIxGcYUWnLlIoDIgo0=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cd packages/ansible-language-server
|
||||
rm -rf test
|
||||
yarn run compile
|
||||
pnpm --filter=@ansible/ansible-language-server run build:dist
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/node_modules/ansible-language-server
|
||||
cp -r out package.json $out/lib/node_modules/ansible-language-server/
|
||||
|
||||
cd ../..
|
||||
cp -rL node_modules $out/lib/node_modules/ansible-language-server/
|
||||
|
||||
mkdir -p $out/lib/node_modules/ansible-language-server/bin
|
||||
cp packages/ansible-language-server/bin/ansible-language-server $out/lib/node_modules/ansible-language-server/bin/
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${nodejs}/bin/node $out/bin/ansible-language-server \
|
||||
|
||||
mv packages/ansible-language-server/dist/* $out/lib/node_modules/ansible-language-server/
|
||||
|
||||
makeWrapper ${lib.getExe nodejs} $out/bin/ansible-language-server \
|
||||
--prefix PATH : ${python3}/bin \
|
||||
--add-flags "$out/lib/node_modules/ansible-language-server/out/server/src/server.js"
|
||||
--add-flags "$out/lib/node_modules/ansible-language-server/server.cjs" \
|
||||
--set NODE_PATH "$out/lib/node_modules/"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
{
|
||||
"@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7",
|
||||
"@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2",
|
||||
"@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3",
|
||||
"@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa",
|
||||
"@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659",
|
||||
"@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910",
|
||||
"@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee",
|
||||
"@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267",
|
||||
"@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b",
|
||||
"@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702",
|
||||
"@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac",
|
||||
"@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d",
|
||||
"@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf",
|
||||
"@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff",
|
||||
"@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6",
|
||||
"@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469",
|
||||
"@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf",
|
||||
"@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687",
|
||||
"@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240",
|
||||
"@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c",
|
||||
"@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96",
|
||||
"@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56",
|
||||
"@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6",
|
||||
"@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73",
|
||||
"@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f",
|
||||
"@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2",
|
||||
"@node-rs/crc32-android-arm-eabi@npm:1.10.6": "a499d1438bc27e6540ec5e15817ffaccb8366bf062907cee05abd2ddea1e6049e79a516a972f272be35b10a33e5a63d4dfccf4c42213e8fc942de73e6bb88754",
|
||||
"@node-rs/crc32-android-arm64@npm:1.10.6": "3d1a8b500f48e8be8049439ea161130277f03ec63716aeae29dc73cc43f091ac8734405243c6f44bf71a59f194436a201cef3172ca7b93a4f3e627499ea1dfda",
|
||||
"@node-rs/crc32-darwin-arm64@npm:1.10.6": "d210071fc97efae6b20525c13577b91def09ecbc9489d6d061bc40c38fbd49b249f8f268f1d16f56581242517afdc18175e36bdec3411100994387fe88678560",
|
||||
"@node-rs/crc32-darwin-x64@npm:1.10.6": "2f70fcf61054d6210c733118a8bbfad8f464cf0f85cdc9f8ee9249b610964344306369e521804a4630829704778ec35e41c2cf93419c80962d3add672545a4fc",
|
||||
"@node-rs/crc32-freebsd-x64@npm:1.10.6": "250252cd1bde3ad5489d223f0229e13324ab6cb81a0a02644bba125c0c3c084f99bce5b265bc07c5c4c4f883bec3941fcddec6a67b91bd7d98c36960fbe96ec8",
|
||||
"@node-rs/crc32-linux-arm-gnueabihf@npm:1.10.6": "fefd763aeda918bfe3fc08a6bfac12247153b38588f5e02011b774fab4d1d4b0011554e3161f529e2511d25541b9f38f09024ef3b20802a97aa0d6c688f2ad88",
|
||||
"@node-rs/crc32-linux-arm64-gnu@npm:1.10.6": "ed947d071055500fcdc66b3adc68d52e80b6e12e2fad429efa4b6a0f63556c0bacd438bac71ad989ad90844a5138e2a92e66344a62e73791cdd4c68bec8584ac",
|
||||
"@node-rs/crc32-linux-arm64-musl@npm:1.10.6": "fe94b295661401d59866487cdca3cc9ce553e85119351c63b10f723f513ff22c0307c88842eebf14e2e841dc2c4c177ef61d506e3a6ad1b70b1aaa1a04b69b3b",
|
||||
"@node-rs/crc32-linux-x64-gnu@npm:1.10.6": "2e82bce0d59ccfd4bae7f85db7f5cf198e803c5ccb0d68efe27c588d496004e0753162578926fd9df8f5b241cc52ccfae352291ea3167d152de0e69c7fdae4be",
|
||||
"@node-rs/crc32-linux-x64-musl@npm:1.10.6": "8722d716d80f1e4dd2ebc96f6e552d9ce9091fad6c7bf1fa57033fd7129c404dbeccf9a175759fd80fcda6f50eda6fe99111865ff284edcb4d4bbd110025e6c2",
|
||||
"@node-rs/crc32-wasm32-wasi@npm:1.10.6": "8c03d8e2472937eacd3242b051bde1bc101556945cb0812a8aa319953f2bd2eecfd45fb41dc89c21987e2c646e27dc4e3f1aa523d6f83092bb5e7226ac0c5e10",
|
||||
"@node-rs/crc32-win32-arm64-msvc@npm:1.10.6": "3d4c3c0158ff8c248b8c903de79ac4f09f2961feace0d7577ecfdc0007d4ef4737822b281476042737e6ea8c7b4bb1327189f7af8ada855dfbfb53c98a4a35be",
|
||||
"@node-rs/crc32-win32-ia32-msvc@npm:1.10.6": "30d673a438a4a2fe136fa154717cec31659fea6b98234c48b307b772dd55eba95d592207293bb4f374997c116e5aa809594a98c76cd3ad54d6c8525168cdea83",
|
||||
"@node-rs/crc32-win32-x64-msvc@npm:1.10.6": "18194da0113883a94912172ec965f9d684eca02dacab1c38b7ea3eb7b91da549485a7c346a96aaab8089448f4ae231670f4a3313be48335676c42319974f9f5b",
|
||||
"@oxc-resolver/binding-android-arm-eabi@npm:11.16.3": "cc6555a7ef75832ad4c6af7c27b8e11edfeeb3cd52d71baddf1799fde4ef38639c1ed31b9989b39de09b995fd8621f7c9761e0a12768e02d0d0276c4329529cc",
|
||||
"@oxc-resolver/binding-android-arm64@npm:11.16.3": "590586523a22b60213728e03b3d2b5ed258120360340ca28d04db83898bb79d2443c1079bf37ce62d5d26d41c5766d3423ef260ac127d047b322a3b2527569fd",
|
||||
"@oxc-resolver/binding-darwin-arm64@npm:11.16.3": "0b65eaa8ac42fc451f0d1dcda5df946c3980de967a35b321944d2cb6cdcc4a0856f330212ed43bbbb719b664a33ed592579951950aabb6f2fc135e4d1c246e17",
|
||||
"@oxc-resolver/binding-darwin-x64@npm:11.16.3": "8845aaccb58c0a859ab386e9082c352523eb1c0a7f258bb0e3870424ff06ad967e185e4f87d1721874d39ec83889db3a9aa2f6ca85fcdace36f378929c1d26ae",
|
||||
"@oxc-resolver/binding-freebsd-x64@npm:11.16.3": "44441bda800f3e78a838334996612fc1e488b276e335c955518f388c2a0cd115b144e70f35672fc5fa192a9fa9fbe08c1b3923dcc5504f91210fdfc6c2b406d7",
|
||||
"@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.16.3": "d2b7a8c94f1e8cdcd901a9554a7b1ef45dcde5f8f9501fe46c0213309a812277711daf653f2949aacd7205c4e1334c2827f95b560c2a97ff2560ae47b861ae12",
|
||||
"@oxc-resolver/binding-linux-arm-musleabihf@npm:11.16.3": "2f2dd84869fed17ba27b8f52c72bf5292f266f144f911ccca2e0f0cfdc93b6f7f6684297ef119451a6fb1750b762ba85c5a6a8870d6f72e7cac3a0edae2cb970",
|
||||
"@oxc-resolver/binding-linux-arm64-gnu@npm:11.16.3": "d37969e2b3d6022d2a45dd7e6217a405d4b299ced4713d41e86973cb1e58852068e5dac5a8f119e8e5ed6ed267612a42ed29a779ef1a69b7056a14f4a2bae2ab",
|
||||
"@oxc-resolver/binding-linux-arm64-musl@npm:11.16.3": "7b1c7cbdc12931d0bf930a627dee73b07a8e815b6154d88f18719c263042a272606fefeec92b370f8e34b696991e1e97ff3a47944066e60e6e8e249e9cb6ee9b",
|
||||
"@oxc-resolver/binding-linux-ppc64-gnu@npm:11.16.3": "e59ebb74beed7235f332653fc59ed2ad788532242cf20aeebe9f4bc7cfe3f26b1007882bfc1447dd90daa189a7b3ad24d04dc8c30ec8903ac7b83a8dd482d304",
|
||||
"@oxc-resolver/binding-linux-riscv64-gnu@npm:11.16.3": "4faba58a846eca5f38575c99f36657088399276658b3b1367f7f6c176e4e4d4332117863193aaaf5fd01dfe962374a50c227b221f3f939862e565f871119778c",
|
||||
"@oxc-resolver/binding-linux-riscv64-musl@npm:11.16.3": "2d1337667667d9290db49903f2e55e62cb093efb931de6169a77a07d37c5f7df818f4573dc30e214c20e9bb98552ecdc972bd6a303541d82b6d9641cea0a5c46",
|
||||
"@oxc-resolver/binding-linux-s390x-gnu@npm:11.16.3": "87c08a045ee06c2eef737773866f095f975917ed0cf4f3a228bd1f52e130d277ad542376c40e4074c0ecb770f1f9cec360e35f9c92c2ee4f704fed48571504f0",
|
||||
"@oxc-resolver/binding-linux-x64-gnu@npm:11.16.3": "138f8910ad53f913b42d81012d534fd943f196eacda39fc91d28e20aba4f46c533db364664cec8aec275c1f2eb622ca9a58a9ced757f08f31bf74e886b89c308",
|
||||
"@oxc-resolver/binding-linux-x64-musl@npm:11.16.3": "4d7798ea78b1f15c464f8ed961f9f9ecbabe73dd9bef8508ae919ff859a922f4819fc4ce48eb07a07909118813ba076664f83e21223902c67d371a6f3d50f069",
|
||||
"@oxc-resolver/binding-openharmony-arm64@npm:11.16.3": "740852deadb4efbb0308fa5cf538d35de479a5605c34e3b7fc70e2e8d5aec408dcdbe9fa85cb2fa572021f5c9fa182976f9dbee7a6dc8c089b3ba37e69edc2a1",
|
||||
"@oxc-resolver/binding-wasm32-wasi@npm:11.16.3": "f9d3c69fdafdd81ec147f4aa8ed867b60b9a39920a9a81e043c0bb6783b6bc0316df938ce14bec9ee5c4f3650a0fb43e009fb41bbdfd6bf4305d62acd82bfa44",
|
||||
"@oxc-resolver/binding-win32-arm64-msvc@npm:11.16.3": "f456e67763c45747ba1f08d705358a7c6fba1a50a8c6b829ad1def972ad96c6327f9b619acb3de3f3b7a8abad16c57740e43392f42be0e13aeb4c584af933db1",
|
||||
"@oxc-resolver/binding-win32-ia32-msvc@npm:11.16.3": "4c749acb86161f268b526c1e791ae1ed6b1f65d772f25d9e646056bef80612c0d5355b197d3745e6159372fd22d20bc465425d5d732f997918575ffc78f91eda",
|
||||
"@oxc-resolver/binding-win32-x64-msvc@npm:11.16.3": "06d45a2a96242803db25337ea6979eb85302ed3385ab2286278e1624fd7435f864a159e658dce2b4ad01a4da4711b78c8614c9a6ce9b0bf281cebf2477db0e31",
|
||||
"@vscode/vsce-sign-alpine-arm64@npm:2.0.6": "82d20f61bc9a8bb5a401dedb8ca56240312f83e18092a4732ee5b08e3d1b55dbf30e143fd26d0b72cbc017c5229d723ba63f20cbbc935e5a25b62edd693b6ccc",
|
||||
"@vscode/vsce-sign-alpine-x64@npm:2.0.6": "eb93895082e908eb948022df100dd810d2bcd6ff4233d5b8f83e5040aae469710a9c545bdb48a1d6749cbcfed7954038b6d720e9b4feb2fe6f25d89a4dcd99f4",
|
||||
"@vscode/vsce-sign-darwin-arm64@npm:2.0.6": "962bb2fbc38b3b4e7e25d74d3396fc99c68544c421519a3bdda6e501af2f363c622d6a4e3b28ace63ac38153a03405eb012c93d0b722a75c9765e068af4d3663",
|
||||
"@vscode/vsce-sign-darwin-x64@npm:2.0.6": "b6f55bb9b95866c99fdbaa70f64dc30b3133545115f042e54041add56280cf65b5246376bb1529549524fc4b34f82cc105a6d2d811d13bcc49d1dba025d3c2a5",
|
||||
"@vscode/vsce-sign-linux-arm64@npm:2.0.6": "1cf2faeba5f3a1ea44149d77f51e4bdb38eb9a7a605ddea1a7f5c368ab040727d52a4e44083c4e7ab14988e68e43a9120204efaf2882986d7e411043f4527e91",
|
||||
"@vscode/vsce-sign-linux-arm@npm:2.0.6": "06c184d9ea62f37a93e7c2e17963cc8037b3a25904ae829384474084ddc45ee116f49fd8bb48ea902c6bbd8681e32837b36094f0bf4f626b0f45e0aa9a7681d8",
|
||||
"@vscode/vsce-sign-linux-x64@npm:2.0.6": "d225d8bbe31bcb4ddd9f8a3f9c46b4ad804b424e9a2bc75ab4e5b1eb928d539c8a9add0baa59f46e8428ab61158ab543f257694dcaf7e43fc10a0a5854d30327",
|
||||
"@vscode/vsce-sign-win32-arm64@npm:2.0.6": "cb552557dfc1094b7b6307224279ab0090cfc32d8c5285475d2308148d5b7a0e00d120ff18f26d3947a4b112b814312a1613ad3c045be9b308f0019c2a4f76f3",
|
||||
"@vscode/vsce-sign-win32-x64@npm:2.0.6": "838165c978836dd7180e4c07d71e7a351b4cf46a0400fc5186b9363d42cc89cc706f915f6907964ceaeaa885bc4a53313df88ebf6e580a34778036585b19a05d"
|
||||
}
|
||||
-23
@@ -1,23 +0,0 @@
|
||||
diff --git a/.yarnrc.yml b/.yarnrc.yml
|
||||
--- a/.yarnrc.yml
|
||||
+++ b/.yarnrc.yml
|
||||
@@ -20,4 +20,7 @@ supportedArchitectures:
|
||||
- darwin
|
||||
- win32
|
||||
|
||||
-yarnPath: .yarn/releases/yarn-4.12.0.cjs
|
||||
+approvedGitRepositories:
|
||||
+ - "**"
|
||||
+
|
||||
+enableScripts: true
|
||||
diff --git a/yarn.lock b/yarn.lock
|
||||
--- a/yarn.lock
|
||||
+++ b/yarn.lock
|
||||
@@ -2,6 +2,6 @@
|
||||
# Manual changes might be lost - proceed with caution!
|
||||
|
||||
__metadata:
|
||||
- version: 8
|
||||
+ version: 9
|
||||
cacheKey: 10
|
||||
|
||||
@@ -524,6 +524,27 @@ let
|
||||
"test-esm-import-meta-main-eval"
|
||||
"test-worker-debug"
|
||||
]
|
||||
# These network/fetch/inspector tests fail on riscv64
|
||||
++ lib.optionals (majorVersion == "24" && stdenv.hostPlatform.isRiscV64) [
|
||||
"test-fetch"
|
||||
"test-http2-allow-http1-upgrade-ws"
|
||||
"test-http-proxy-fetch"
|
||||
"test-http-set-global-proxy-from-env-fetch"
|
||||
"test-http-set-global-proxy-from-env-fetch-default"
|
||||
"test-http-set-global-proxy-from-env-fetch-empty"
|
||||
"test-http-set-global-proxy-from-env-fetch-no-proxy"
|
||||
"test-http-set-global-proxy-from-env-fetch-restore"
|
||||
"test-http-set-global-proxy-from-env-override-fetch"
|
||||
"test-inspector-invalid-protocol"
|
||||
"test-inspector-network-content-type"
|
||||
"test-inspector-network-fetch"
|
||||
"test-inspector-network-websocket"
|
||||
"test-report-exclude-network"
|
||||
"test-tls-set-default-ca-certificates-append-fetch"
|
||||
"test-tls-set-default-ca-certificates-reset-fetch"
|
||||
"test-use-env-proxy-cli-http"
|
||||
"test-wasm-web-api"
|
||||
]
|
||||
# Those are annoyingly flaky, but not enough to be marked as such upstream.
|
||||
++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit"
|
||||
++ lib.optional (
|
||||
|
||||
@@ -57,7 +57,7 @@ in
|
||||
};
|
||||
|
||||
jetty_12 = common {
|
||||
version = "12.1.9";
|
||||
hash = "sha256-pSDkG0d2ueSYyKj2HDPDkWoAtU5W3Cmd24B4/3Meyk4=";
|
||||
version = "12.1.10";
|
||||
hash = "sha256-5/R4/mrmixhCfemqXbZcNwLSYY51p/IX+vT4jhGCqb4=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
postgresqlBuildExtension {
|
||||
pname = "jsonb_deep_sum";
|
||||
version = "0-unstable-2021-12-24";
|
||||
version = "0-unstable-2026-06-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "furstenheim";
|
||||
repo = "jsonb_deep_sum";
|
||||
rev = "d9c69aa6b7da860e5522a9426467e67cb787980c";
|
||||
hash = "sha256-W1wNILAwTAjFPezq+grdRMA59KEnMZDz69n9xQUqdc0=";
|
||||
rev = "3f1b4be67e3bc74b7cc4635fc285dc3c602ee420";
|
||||
hash = "sha256-44GApqemY9sLukViGbyTzlI7qHeAGNdMCKZOawPUj8s=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "steampipe-plugin-aws";
|
||||
version = "1.30.0";
|
||||
version = "1.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "turbot";
|
||||
repo = "steampipe-plugin-aws";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SiiiWPSNLp5pVVokrKUvHFFm1qiU4zU/pKfUZyRB8xI=";
|
||||
hash = "sha256-Mt9KUyV9BrCdwDwF9NzOdOTF90W4vpT3N2n/QaVo6qo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4xHWVbqdEfnB6GIqqeyMg/xc42a1WKbhTgdo0GhA+NU=";
|
||||
vendorHash = "sha256-8ZVl70Lwz3j3PM3XljZGFaoGt+JP6TP+o5gOGoBlUY8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -938,6 +938,7 @@ mapAliases {
|
||||
gnatcoll-xref = throw "'gnatcoll-xref' has been renamed to/replaced by 'gnatPackages.gnatcoll-xref'"; # Converted to throw 2025-10-27
|
||||
gnatcoll-zlib = throw "'gnatcoll-zlib' has been renamed to/replaced by 'gnatPackages.gnatcoll-zlib'"; # Converted to throw 2025-10-27
|
||||
gnatinspect = throw "'gnatinspect' has been renamed to/replaced by 'gnatPackages.gnatinspect'"; # Converted to throw 2025-10-27
|
||||
gnaural = throw "'gnaural' has been removed due to lack of maintainance and relying on gtk2. Consider using 'sbagen' instead"; # Added 2026-05-22
|
||||
gnome-bluetooth_1_0 = throw "'gnome-bluetooth_1_0' has been removed as it is unmaintained upstream"; # Added 2026-03-09
|
||||
gnome-firmware-updater = throw "'gnome-firmware-updater' has been renamed to/replaced by 'gnome-firmware'"; # Converted to throw 2025-10-27
|
||||
gnome-passwordsafe = throw "'gnome-passwordsafe' has been renamed to/replaced by 'gnome-secrets'"; # Converted to throw 2025-10-27
|
||||
|
||||
@@ -374,6 +374,8 @@ self: super: with self; {
|
||||
|
||||
aioimmich = callPackage ../development/python-modules/aioimmich { };
|
||||
|
||||
aiointercept = callPackage ../development/python-modules/aiointercept { };
|
||||
|
||||
aioitertools = callPackage ../development/python-modules/aioitertools { };
|
||||
|
||||
aiojellyfin = callPackage ../development/python-modules/aiojellyfin { };
|
||||
|
||||
@@ -42,6 +42,7 @@ makeScopeWithSplicing' {
|
||||
// {
|
||||
|
||||
# LIBRARIES
|
||||
accounts-qml-module = callPackage ../development/libraries/accounts-qml-module { };
|
||||
accounts-qt = callPackage ../development/libraries/accounts-qt { };
|
||||
appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user