Merge staging-next into staging
This commit is contained in:
@@ -174,6 +174,59 @@ To make sure that your package does not add extra manual effort when upgrading M
|
||||
</plugin>
|
||||
```
|
||||
|
||||
## Maven 4 {#maven-4}
|
||||
|
||||
Alongside the default `maven` package (the latest Maven 3 release), nixpkgs ships `maven_4`, which packages the [Maven 4](https://maven.apache.org/whatsnewinmaven4.html) release line.
|
||||
|
||||
`maven_4` is a standalone derivation and can be used as a drop-in replacement wherever `maven` is used, for example to build a project with the latest Maven 4:
|
||||
|
||||
```nix
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
jre,
|
||||
makeWrapper,
|
||||
maven_4,
|
||||
}:
|
||||
|
||||
maven_4.buildMavenPackage (finalAttrs: {
|
||||
pname = "jd-cli";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intoolswetrust";
|
||||
repo = "jd-cli";
|
||||
tag = "jd-cli-${finalAttrs.version}";
|
||||
hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
|
||||
};
|
||||
|
||||
mvnHash = "";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/jd-cli
|
||||
install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/jd-cli \
|
||||
--add-flags "-jar $out/share/jd-cli/jd-cli.jar"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple command line wrapper around JD Core Java Decompiler project";
|
||||
homepage = "https://github.com/intoolswetrust/jd-cli";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ majiir ];
|
||||
};
|
||||
})
|
||||
```
|
||||
|
||||
`maven_4` exposes the same `buildMavenPackage` helper as `maven` (see [](#maven-buildmavenpackage)), so all of the patterns documented above apply equally. Note that the Maven dependencies resolved by Maven 4 differ from those resolved by Maven 3, so `mvnHash` must be recomputed when switching between the two.
|
||||
|
||||
## Manually using `mvn2nix` {#maven-mvn2nix}
|
||||
::: {.warning}
|
||||
This way is no longer recommended; see [](#maven-buildmavenpackage) for the simpler and preferred way.
|
||||
|
||||
@@ -885,8 +885,7 @@ general. A number of other parameters can be overridden:
|
||||
empty, or `"forbid"` (no cap) when `lints` is set. Because `rustc`
|
||||
only honours the first `--cap-lints` it receives, this cannot be
|
||||
changed via `extraRustcOpts`; use this attribute instead. Useful
|
||||
when overriding the `rust` attribute to point at `clippy-driver`,
|
||||
since clippy lints are also capped by this flag:
|
||||
with `useClippy`, since clippy lints are also capped by this flag:
|
||||
|
||||
```nix
|
||||
(hello { }).override { capLints = "warn"; }
|
||||
@@ -912,6 +911,34 @@ general. A number of other parameters can be overridden:
|
||||
}
|
||||
```
|
||||
|
||||
- Whether to compile the crate with `clippy-driver` instead of `rustc`.
|
||||
Build scripts (`build.rs`) keep plain `rustc`. The default `capLints`
|
||||
of `"allow"` suppresses all lints including clippy's, so this is
|
||||
usually paired with `capLints` and lint flags via `extraRustcOpts`:
|
||||
|
||||
```nix
|
||||
(hello { }).override {
|
||||
useClippy = true;
|
||||
capLints = "warn";
|
||||
extraRustcOpts = [
|
||||
"-Dwarnings"
|
||||
"-Wclippy::all"
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
When using a Rust toolchain that bundles its own `clippy-driver`
|
||||
(rust-overlay, Fenix), pass it via `clippy` so the sysroot matches:
|
||||
|
||||
```nix
|
||||
(hello { }).override {
|
||||
rust = myToolchain;
|
||||
clippy = myToolchain;
|
||||
useClippy = true;
|
||||
capLints = "warn";
|
||||
}
|
||||
```
|
||||
|
||||
- Phases, just like in any other derivation, can be specified using
|
||||
the following attributes: `preUnpack`, `postUnpack`, `prePatch`,
|
||||
`patches`, `postPatch`, `preConfigure` (in the case of a Rust crate,
|
||||
|
||||
@@ -3972,6 +3972,9 @@
|
||||
"maven": [
|
||||
"index.html#maven"
|
||||
],
|
||||
"maven-4": [
|
||||
"index.html#maven-4"
|
||||
],
|
||||
"maven-buildmavenpackage": [
|
||||
"index.html#maven-buildmavenpackage"
|
||||
],
|
||||
|
||||
@@ -53,6 +53,8 @@
|
||||
[pnpm `fetcherVersion` section](#javascript-pnpm-fetcherVersion) of the manual
|
||||
for details.
|
||||
|
||||
- `rebuilderd` has been updated to 0.27.0 introducing breaking changes. See upstream changelog for details: [0.26.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0), [0.27.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0)
|
||||
|
||||
## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
@@ -23,6 +23,7 @@ let
|
||||
platforms = import ./platforms.nix { inherit lib; };
|
||||
examples = import ./examples.nix { inherit lib; };
|
||||
architectures = import ./architectures.nix { inherit lib; };
|
||||
rustc-target-env = import ./rustc-target-env.nix;
|
||||
|
||||
/**
|
||||
Elaborated systems contain functions, which means that they don't satisfy
|
||||
@@ -449,6 +450,16 @@ let
|
||||
else
|
||||
final.parsed.cpu.name;
|
||||
|
||||
# https://doc.rust-lang.org/reference/conditional-compilation.html#target_env
|
||||
# Accomodate system definitions written before Nixpkgs learned about target_env.
|
||||
env =
|
||||
if rust ? platform.env then
|
||||
rust.platform.env
|
||||
else if rustc-target-env ? ${final.rust.rustcTargetSpec} then
|
||||
rustc-target-env.${final.rust.rustcTargetSpec}
|
||||
else
|
||||
"";
|
||||
|
||||
# https://doc.rust-lang.org/reference/conditional-compilation.html#target_os
|
||||
os =
|
||||
if rust ? platform then
|
||||
|
||||
@@ -0,0 +1,160 @@
|
||||
# As of rustc 1.96.0. Empty `target_env` values are omitted.
|
||||
#
|
||||
# Generation script:
|
||||
# #!/bin/bash
|
||||
# rustc --print target-list | while read -r target ; do
|
||||
# env=$(rustc --print cfg --target "$target" | grep '^target_env=' | sed 's/# ^target_env="//;s/"$//')
|
||||
# [[ -z "$env" ]] && continue
|
||||
# printf ' %s = "%s";\n' "$target" "$env"
|
||||
# done
|
||||
{
|
||||
aarch64-apple-ios-macabi = "macabi";
|
||||
aarch64-apple-ios-sim = "sim";
|
||||
aarch64-apple-tvos-sim = "sim";
|
||||
aarch64-apple-visionos-sim = "sim";
|
||||
aarch64-apple-watchos-sim = "sim";
|
||||
aarch64-pc-windows-gnullvm = "gnu";
|
||||
aarch64-pc-windows-msvc = "msvc";
|
||||
aarch64-unknown-linux-gnu = "gnu";
|
||||
aarch64-unknown-linux-gnu_ilp32 = "gnu";
|
||||
aarch64-unknown-linux-musl = "musl";
|
||||
aarch64-unknown-linux-ohos = "ohos";
|
||||
aarch64-unknown-managarm-mlibc = "mlibc";
|
||||
aarch64-unknown-nto-qnx700 = "nto70";
|
||||
aarch64-unknown-nto-qnx710 = "nto71";
|
||||
aarch64-unknown-nto-qnx710_iosock = "nto71_iosock";
|
||||
aarch64-unknown-nto-qnx800 = "nto80";
|
||||
aarch64-unknown-redox = "relibc";
|
||||
aarch64-uwp-windows-msvc = "msvc";
|
||||
aarch64-wrs-vxworks = "gnu";
|
||||
aarch64_be-unknown-linux-gnu = "gnu";
|
||||
aarch64_be-unknown-linux-gnu_ilp32 = "gnu";
|
||||
aarch64_be-unknown-linux-musl = "musl";
|
||||
arm-unknown-linux-gnueabi = "gnu";
|
||||
arm-unknown-linux-gnueabihf = "gnu";
|
||||
arm-unknown-linux-musleabi = "musl";
|
||||
arm-unknown-linux-musleabihf = "musl";
|
||||
arm64ec-pc-windows-msvc = "msvc";
|
||||
armeb-unknown-linux-gnueabi = "gnu";
|
||||
armv4t-unknown-linux-gnueabi = "gnu";
|
||||
armv5te-unknown-linux-gnueabi = "gnu";
|
||||
armv5te-unknown-linux-musleabi = "musl";
|
||||
armv5te-unknown-linux-uclibceabi = "uclibc";
|
||||
armv6k-nintendo-3ds = "newlib";
|
||||
armv7-rtems-eabihf = "newlib";
|
||||
armv7-sony-vita-newlibeabihf = "newlib";
|
||||
armv7-unknown-linux-gnueabi = "gnu";
|
||||
armv7-unknown-linux-gnueabihf = "gnu";
|
||||
armv7-unknown-linux-musleabi = "musl";
|
||||
armv7-unknown-linux-musleabihf = "musl";
|
||||
armv7-unknown-linux-ohos = "ohos";
|
||||
armv7-unknown-linux-uclibceabi = "uclibc";
|
||||
armv7-unknown-linux-uclibceabihf = "uclibc";
|
||||
armv7-wrs-vxworks-eabihf = "gnu";
|
||||
armv7a-vex-v5 = "v5";
|
||||
csky-unknown-linux-gnuabiv2 = "gnu";
|
||||
csky-unknown-linux-gnuabiv2hf = "gnu";
|
||||
hexagon-unknown-linux-musl = "musl";
|
||||
i386-apple-ios = "sim";
|
||||
i586-unknown-linux-gnu = "gnu";
|
||||
i586-unknown-linux-musl = "musl";
|
||||
i586-unknown-redox = "relibc";
|
||||
i686-pc-nto-qnx700 = "nto70";
|
||||
i686-pc-windows-gnu = "gnu";
|
||||
i686-pc-windows-gnullvm = "gnu";
|
||||
i686-pc-windows-msvc = "msvc";
|
||||
i686-unknown-hurd-gnu = "gnu";
|
||||
i686-unknown-linux-gnu = "gnu";
|
||||
i686-unknown-linux-musl = "musl";
|
||||
i686-uwp-windows-gnu = "gnu";
|
||||
i686-uwp-windows-msvc = "msvc";
|
||||
i686-win7-windows-gnu = "gnu";
|
||||
i686-win7-windows-msvc = "msvc";
|
||||
i686-wrs-vxworks = "gnu";
|
||||
loongarch64-unknown-linux-gnu = "gnu";
|
||||
loongarch64-unknown-linux-musl = "musl";
|
||||
loongarch64-unknown-linux-ohos = "ohos";
|
||||
m68k-unknown-linux-gnu = "gnu";
|
||||
mips-unknown-linux-gnu = "gnu";
|
||||
mips-unknown-linux-musl = "musl";
|
||||
mips-unknown-linux-uclibc = "uclibc";
|
||||
mips64-openwrt-linux-musl = "musl";
|
||||
mips64-unknown-linux-gnuabi64 = "gnu";
|
||||
mips64-unknown-linux-muslabi64 = "musl";
|
||||
mips64el-unknown-linux-gnuabi64 = "gnu";
|
||||
mips64el-unknown-linux-muslabi64 = "musl";
|
||||
mipsel-unknown-linux-gnu = "gnu";
|
||||
mipsel-unknown-linux-musl = "musl";
|
||||
mipsel-unknown-linux-uclibc = "uclibc";
|
||||
mipsisa32r6-unknown-linux-gnu = "gnu";
|
||||
mipsisa32r6el-unknown-linux-gnu = "gnu";
|
||||
mipsisa64r6-unknown-linux-gnuabi64 = "gnu";
|
||||
mipsisa64r6el-unknown-linux-gnuabi64 = "gnu";
|
||||
powerpc-unknown-linux-gnu = "gnu";
|
||||
powerpc-unknown-linux-gnuspe = "gnu";
|
||||
powerpc-unknown-linux-musl = "musl";
|
||||
powerpc-unknown-linux-muslspe = "musl";
|
||||
powerpc-wrs-vxworks = "gnu";
|
||||
powerpc-wrs-vxworks-spe = "gnu";
|
||||
powerpc64-unknown-linux-gnu = "gnu";
|
||||
powerpc64-unknown-linux-musl = "musl";
|
||||
powerpc64-wrs-vxworks = "gnu";
|
||||
powerpc64le-unknown-linux-gnu = "gnu";
|
||||
powerpc64le-unknown-linux-musl = "musl";
|
||||
riscv32-wrs-vxworks = "gnu";
|
||||
riscv32gc-unknown-linux-gnu = "gnu";
|
||||
riscv32gc-unknown-linux-musl = "musl";
|
||||
riscv32imac-esp-espidf = "newlib";
|
||||
riscv32imafc-esp-espidf = "newlib";
|
||||
riscv32imc-esp-espidf = "newlib";
|
||||
riscv64-wrs-vxworks = "gnu";
|
||||
riscv64a23-unknown-linux-gnu = "gnu";
|
||||
riscv64gc-unknown-linux-gnu = "gnu";
|
||||
riscv64gc-unknown-linux-musl = "musl";
|
||||
riscv64gc-unknown-managarm-mlibc = "mlibc";
|
||||
riscv64gc-unknown-redox = "relibc";
|
||||
s390x-unknown-linux-gnu = "gnu";
|
||||
s390x-unknown-linux-musl = "musl";
|
||||
sparc-unknown-linux-gnu = "gnu";
|
||||
sparc64-unknown-linux-gnu = "gnu";
|
||||
thumbv7a-pc-windows-msvc = "msvc";
|
||||
thumbv7a-uwp-windows-msvc = "msvc";
|
||||
thumbv7neon-unknown-linux-gnueabihf = "gnu";
|
||||
thumbv7neon-unknown-linux-musleabihf = "musl";
|
||||
wasm32-wali-linux-musl = "musl";
|
||||
wasm32-wasip1 = "p1";
|
||||
wasm32-wasip1-threads = "p1";
|
||||
wasm32-wasip2 = "p2";
|
||||
wasm32-wasip3 = "p3";
|
||||
x86_64-apple-ios = "sim";
|
||||
x86_64-apple-ios-macabi = "macabi";
|
||||
x86_64-apple-tvos = "sim";
|
||||
x86_64-apple-watchos-sim = "sim";
|
||||
x86_64-fortanix-unknown-sgx = "sgx";
|
||||
x86_64-pc-nto-qnx710 = "nto71";
|
||||
x86_64-pc-nto-qnx710_iosock = "nto71_iosock";
|
||||
x86_64-pc-nto-qnx800 = "nto80";
|
||||
x86_64-pc-windows-gnu = "gnu";
|
||||
x86_64-pc-windows-gnullvm = "gnu";
|
||||
x86_64-pc-windows-msvc = "msvc";
|
||||
x86_64-unikraft-linux-musl = "musl";
|
||||
x86_64-unknown-hurd-gnu = "gnu";
|
||||
x86_64-unknown-l4re-uclibc = "uclibc";
|
||||
x86_64-unknown-linux-gnu = "gnu";
|
||||
x86_64-unknown-linux-gnuasan = "gnu";
|
||||
x86_64-unknown-linux-gnumsan = "gnu";
|
||||
x86_64-unknown-linux-gnutsan = "gnu";
|
||||
x86_64-unknown-linux-gnux32 = "gnu";
|
||||
x86_64-unknown-linux-musl = "musl";
|
||||
x86_64-unknown-linux-ohos = "ohos";
|
||||
x86_64-unknown-managarm-mlibc = "mlibc";
|
||||
x86_64-unknown-redox = "relibc";
|
||||
x86_64-uwp-windows-gnu = "gnu";
|
||||
x86_64-uwp-windows-msvc = "msvc";
|
||||
x86_64-win7-windows-gnu = "gnu";
|
||||
x86_64-win7-windows-msvc = "msvc";
|
||||
x86_64-wrs-vxworks = "gnu";
|
||||
xtensa-esp32-espidf = "newlib";
|
||||
xtensa-esp32s2-espidf = "newlib";
|
||||
xtensa-esp32s3-espidf = "newlib";
|
||||
}
|
||||
@@ -128,7 +128,6 @@
|
||||
"Pandapip1": 45835846,
|
||||
"a-kenji": 65275785,
|
||||
"drakon64": 6444703,
|
||||
"michaelBelsanti": 62124625,
|
||||
"thefossguy": 44400303
|
||||
},
|
||||
"name": "COSMIC"
|
||||
@@ -847,6 +846,18 @@
|
||||
},
|
||||
"name": "Radicle"
|
||||
},
|
||||
"redis": {
|
||||
"description": "Maintain Redis, related packages, module, and tests.",
|
||||
"id": 17932473,
|
||||
"maintainers": {
|
||||
"Hythera": 87016780,
|
||||
"MiniHarinn": 52773156,
|
||||
"debtquity": 225436867,
|
||||
"kybe236": 118068228
|
||||
},
|
||||
"members": {},
|
||||
"name": "Redis"
|
||||
},
|
||||
"reproducible": {
|
||||
"description": "Team that is interested in reproducible builds",
|
||||
"id": 7625643,
|
||||
|
||||
@@ -172,6 +172,7 @@ toml-edit,,,,,5.1,mrcjkb
|
||||
tomlua,,,,,,birdee
|
||||
tree-sitter-cli,,,,,,
|
||||
tree-sitter-http,,,,0.0.33-1,,
|
||||
tree-sitter-kulala_http,,,,,,
|
||||
tree-sitter-norg,,,,,5.1,mrcjkb
|
||||
tree-sitter-norg-meta,,,,,,
|
||||
tree-sitter-orgmode,,,,,5.1,
|
||||
|
||||
|
@@ -37,6 +37,11 @@ let
|
||||
;
|
||||
}
|
||||
) cfg.waylandCompositors;
|
||||
|
||||
sessionServices = [
|
||||
"wayland-wm@"
|
||||
"wayland-session-bindpid@"
|
||||
];
|
||||
in
|
||||
{
|
||||
options.programs.uwsm = {
|
||||
@@ -136,6 +141,17 @@ in
|
||||
|
||||
# UWSM recommends dbus broker for better compatibility
|
||||
services.dbus.implementation = "broker";
|
||||
|
||||
# Restarting these kills the graphical session, same treatment as the
|
||||
# display-manager modules.
|
||||
systemd.user.services = lib.genAttrs sessionServices (_: {
|
||||
restartIfChanged = false;
|
||||
# Defining the units here generates drop-ins; without this they
|
||||
# would carry the NixOS default Environment="PATH=coreutils:…",
|
||||
# clobbering the PATH that uwsm imported into the user manager
|
||||
# and breaking spawn actions that rely on it.
|
||||
enableDefaultPath = false;
|
||||
});
|
||||
}
|
||||
|
||||
(lib.mkIf (cfg.waylandCompositors != { }) {
|
||||
|
||||
@@ -39,6 +39,17 @@ in
|
||||
options = {
|
||||
enable = mkEnableOption "Wyoming faster-whisper server";
|
||||
|
||||
task = mkOption {
|
||||
type = enum [
|
||||
"transcribe"
|
||||
"translate"
|
||||
];
|
||||
default = "transcribe";
|
||||
description = ''
|
||||
Whisper task to perform.
|
||||
'';
|
||||
};
|
||||
|
||||
zeroconf = {
|
||||
enable = mkEnableOption "zeroconf discovery" // {
|
||||
default = true;
|
||||
@@ -349,6 +360,8 @@ in
|
||||
options.uri
|
||||
"--device"
|
||||
options.device
|
||||
"--whisper-task"
|
||||
options.task
|
||||
"--stt-library"
|
||||
options.sttLibrary
|
||||
"--model"
|
||||
|
||||
@@ -76,6 +76,26 @@ in
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
default = "";
|
||||
description = ''
|
||||
Extra frp TOML configuration included at the end of the generated configuration file.
|
||||
Especially useful for [port range mapping].
|
||||
|
||||
[port range mapping]: https://github.com/fatedier/frp#port-range-mapping
|
||||
'';
|
||||
example = ''
|
||||
{{- range $_, $v := parseNumberRangePair "6000-6006,6007" "6000-6006,6007" }}
|
||||
[[proxies]]
|
||||
name = "tcp-{{ $v.First }}"
|
||||
type = "tcp"
|
||||
localPort = {{ $v.First }}
|
||||
remotePort = {{ $v.Second }}
|
||||
{{- end }}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
@@ -94,7 +114,18 @@ in
|
||||
instance: options:
|
||||
let
|
||||
serviceName = "frp" + lib.optionalString (instance != "") ("-" + instance);
|
||||
configFile = settingsFormat.generate "${serviceName}.toml" options.settings;
|
||||
baseConfigFile = settingsFormat.generate "${serviceName}-base.toml" options.settings;
|
||||
configFile =
|
||||
if options.extraConfig == "" then
|
||||
baseConfigFile
|
||||
else
|
||||
pkgs.writeText "${serviceName}.toml" ''
|
||||
# Nixos Module settings
|
||||
${builtins.readFile baseConfigFile}
|
||||
|
||||
# Nixos Module extraConfig
|
||||
${options.extraConfig}
|
||||
'';
|
||||
isClient = (options.role == "client");
|
||||
isServer = (options.role == "server");
|
||||
serviceCapability = lib.optionals isServer [ "CAP_NET_BIND_SERVICE" ];
|
||||
@@ -144,5 +175,8 @@ in
|
||||
) enabledInstances;
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ zaldnoay ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
zaldnoay
|
||||
epireyn
|
||||
];
|
||||
}
|
||||
|
||||
@@ -54,27 +54,6 @@ let
|
||||
${system} = hydraJob test;
|
||||
}
|
||||
);
|
||||
}
|
||||
// {
|
||||
# for typechecking of the scripts and evaluation of
|
||||
# the nodes, without running VMs.
|
||||
allDrivers = import ./tests/all-tests.nix {
|
||||
inherit system;
|
||||
pkgs = import ./.. { inherit system; };
|
||||
callTest =
|
||||
config:
|
||||
let
|
||||
inherit (config) driver;
|
||||
in
|
||||
lib.optionalAttrs (builtins.elem system (getPlatforms driver)) (
|
||||
if attrNamesOnly then
|
||||
hydraJob driver
|
||||
else
|
||||
{
|
||||
${system} = hydraJob driver;
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
allTests = foldAttrs recursiveUpdate { } (
|
||||
|
||||
+37
-5
@@ -9,10 +9,14 @@ let
|
||||
name = "secrets";
|
||||
text = "token=${token}";
|
||||
};
|
||||
portRange = 6003;
|
||||
in
|
||||
{
|
||||
name = "frp";
|
||||
meta.maintainers = with lib.maintainers; [ zaldnoay ];
|
||||
meta.maintainers = with lib.maintainers; [
|
||||
zaldnoay
|
||||
epireyn
|
||||
];
|
||||
nodes = {
|
||||
frps = {
|
||||
networking = {
|
||||
@@ -56,14 +60,25 @@ in
|
||||
services.httpd = {
|
||||
enable = true;
|
||||
adminAddr = "admin@example.com";
|
||||
virtualHosts."test-appication" =
|
||||
virtualHosts =
|
||||
let
|
||||
testdir = pkgs.writeTextDir "web/index.php" "<?php phpinfo();";
|
||||
in
|
||||
{
|
||||
documentRoot = "${testdir}/web";
|
||||
locations."/" = {
|
||||
index = "index.php index.html";
|
||||
"test-appication" = {
|
||||
documentRoot = "${testdir}/web";
|
||||
locations."/" = {
|
||||
index = "index.php index.html";
|
||||
};
|
||||
};
|
||||
"test-range" = {
|
||||
documentRoot = "${testdir}/web";
|
||||
listen = [
|
||||
{ port = portRange; }
|
||||
];
|
||||
locations."/" = {
|
||||
index = "index.php index.html";
|
||||
};
|
||||
};
|
||||
};
|
||||
phpPackage = pkgs.php84;
|
||||
@@ -87,6 +102,15 @@ in
|
||||
}
|
||||
];
|
||||
};
|
||||
extraConfig = ''
|
||||
{{- range $_, $v := parseNumberRangePair "6000-6006,6007" "6000-6006,6007" }}
|
||||
[[proxies]]
|
||||
name = "tcp-{{ $v.First }}"
|
||||
type = "tcp"
|
||||
localPort = {{ $v.First }}
|
||||
remotePort = {{ $v.Second }}
|
||||
{{- end }}
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -96,9 +120,17 @@ in
|
||||
frps.wait_for_unit("frp-server.service")
|
||||
frps.wait_for_open_port(80)
|
||||
frpc.wait_for_unit("frp-client.service")
|
||||
|
||||
# Test config written in Nix
|
||||
response = frpc.succeed("curl -fvvv -s http://127.0.0.1/")
|
||||
assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
|
||||
response = frpc.succeed("curl -fvvv -s http://10.0.0.1/")
|
||||
assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
|
||||
|
||||
# Test `extraConfig` option with port range
|
||||
response = frpc.succeed("curl -fvvv -s http://127.0.0.1:${toString portRange}/")
|
||||
assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
|
||||
response = frpc.succeed("curl -fvvv -s http://10.0.0.1:${toString portRange}/")
|
||||
assert "PHP Version ${pkgs.php84.version}" in response, "PHP version not detected"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
# - Open a browser or something that plays sound. Ex: chromium
|
||||
|
||||
name = "xrdp-with-audio-pulseaudio";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ lucasew ];
|
||||
meta = {
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@@ -55,7 +55,9 @@ mapAliases (
|
||||
mind-nvim = throw "'vimPlugins.mind-nvim' has been removed: the upstream repository got deleted"; # Added 2026-05-03
|
||||
minsnip-nvim = throw "'vimPlugins.minsnip-nvim' has been removed: the upstream repository got deleted"; # Added 2025-08-30
|
||||
neuron-nvim = throw "'vimPlugins.neuron-nvim' has been removed: archived repository 2023-02-19"; # Added 2025-09-10
|
||||
null-ls-nvim = throw "'vimPlugins.null-ls-nvim' has been removed: upstream deleted repository. Use none-ls-nvim instead."; # Added 2026-06-15
|
||||
nvim-gps = throw "'vimPlugins.nvim-gps' has been archived since 2022. Use nvim-navic instead."; # Added 2025-12-18
|
||||
nvim-lsp-ts-utils = throw "'vimPlugins.nvim-lsp-ts-utils' has been removed: upstream deleted repository"; # Added 2026-06-15
|
||||
nvim-ts-rainbow = throw "'vimPlugins.nvim-ts-rainbow' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
|
||||
nvim-ts-rainbow2 = throw "'vimPlugins.nvim-ts-rainbow2' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
|
||||
peskcolor-vim = throw "'vimPlugins.peskcolor-vim' has been removed: abandoned by upstream"; # Added 2024-08-23
|
||||
@@ -69,6 +71,7 @@ mapAliases (
|
||||
sparkup = throw "'vimPlugins.sparkup' was removed: the upstream repository got deleted"; # Added 2025-08-06
|
||||
syntax-tree-surfer = throw "'vimPlugins.syntax-tree-surfer' has been archived"; # Added 2025-12-18
|
||||
todo-nvim = throw "'vimPlugins.todo-nvim' has been removed: abandoned by upstream"; # Added 2023-08-23
|
||||
typescript-nvim = throw "'vimPlugins.typescript-nvim' has been removed: upstream deleted repository"; # Added 2026-06-15
|
||||
vim-csharp = throw "'vimPlugins.vim-csharp' has been removed: repository deleted"; # Added 2026-05-12
|
||||
vim-sourcetrail = throw "'vimPlugins.vim-sourcetrail' has been removed: abandoned by upstream"; # Added 2022-08-14
|
||||
# keep-sorted end
|
||||
|
||||
@@ -446,12 +446,12 @@ final: prev: {
|
||||
|
||||
SchemaStore-nvim = buildVimPlugin {
|
||||
pname = "SchemaStore.nvim";
|
||||
version = "0-unstable-2026-06-10";
|
||||
version = "0-unstable-2026-06-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "b0o";
|
||||
repo = "SchemaStore.nvim";
|
||||
rev = "961c2a806abf56d4e100713ec9dc71d2c8d9d022";
|
||||
hash = "sha256-p4YkQeJybRAbZ2zwK39rm/0Q5iSJqYlhJde7bXV6J/Y=";
|
||||
rev = "3dca2d2153cfbc9aab937c1be0441e371101b0b8";
|
||||
hash = "sha256-TBm3EG55pAQIR4cPHuiu4bK5/oRblnAxxzX7u07rpBE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
@@ -924,12 +924,12 @@ final: prev: {
|
||||
|
||||
amp-nvim = buildVimPlugin {
|
||||
pname = "amp.nvim";
|
||||
version = "0-unstable-2025-12-15";
|
||||
version = "0-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ampcode";
|
||||
repo = "amp.nvim";
|
||||
rev = "3b9ad5ef0328de1b35cc9bfa723a37db5daf9434";
|
||||
hash = "sha256-f/li32jpVigbZANnnbgSArnOH4nusj0DUz7952K+Znw=";
|
||||
rev = "b851d97d8e8782e58343608d8de7d9eb3a88090f";
|
||||
hash = "sha256-SdpKR1hfSyJ25tD7G1u4wYOHRNyeuTKbdMKG80iCUB4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ampcode/amp.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
@@ -1050,12 +1050,12 @@ final: prev: {
|
||||
|
||||
artio-nvim = buildVimPlugin {
|
||||
pname = "artio.nvim";
|
||||
version = "0-unstable-2026-05-04";
|
||||
version = "0-unstable-2026-06-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "comfysage";
|
||||
repo = "artio.nvim";
|
||||
rev = "0b08d6862afe685fd78963808d022d7c15c89546";
|
||||
hash = "sha256-SrYZPFBQVJgm0X/CzyOOTfDwgNBIrjH+jlW6K8aE2Ec=";
|
||||
rev = "ff2b4351004f3b512525276d554dc6f0cd412a14";
|
||||
hash = "sha256-6wEtjgF36RfaHBanNp49Nb/+WR/b9qElUpV7SNbpESU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/comfysage/artio.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "EUPL-1.2";
|
||||
@@ -1120,12 +1120,12 @@ final: prev: {
|
||||
|
||||
async-nvim = buildVimPlugin {
|
||||
pname = "async.nvim";
|
||||
version = "0-unstable-2026-06-10";
|
||||
version = "0-unstable-2026-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "async.nvim";
|
||||
rev = "f72017409d703ecf25972a05c6f89acb31adb952";
|
||||
hash = "sha256-E8ZS7m2QejmImzmQ+wrgSUlC2x4tkMHv7xGt+XDqcXQ=";
|
||||
rev = "e2a813be9cd143ab1181de6d8a0720e0230cd86e";
|
||||
hash = "sha256-b7jE3tY+6nlbIFTuOxKz4w6jDw7hlyvgBYy0Jg6McAc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/lewis6991/async.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -2030,12 +2030,12 @@ final: prev: {
|
||||
|
||||
blink-indent = buildVimPlugin {
|
||||
pname = "blink.indent";
|
||||
version = "2.1.2";
|
||||
version = "2.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Saghen";
|
||||
repo = "blink.indent";
|
||||
tag = "v2.1.2";
|
||||
hash = "sha256-SS66JZFCX8viYxYaObASlwtrG5h7yHbVvRBVXBNXkng=";
|
||||
tag = "v2.2.0";
|
||||
hash = "sha256-x4nILac79C60FVsMQiWqlU1FjM891W5U9UZWwGAjnk0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Saghen/blink.indent/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -2547,12 +2547,12 @@ final: prev: {
|
||||
|
||||
claudecode-nvim = buildVimPlugin {
|
||||
pname = "claudecode.nvim";
|
||||
version = "0.3.0-unstable-2026-06-09";
|
||||
version = "0.3.0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "coder";
|
||||
repo = "claudecode.nvim";
|
||||
rev = "7b8b7090c16f4151401a281741a4bf37050ebd26";
|
||||
hash = "sha256-NHhoAqCTa1+go+DYFj25eH0ZDmAqbA9tpHtj3IarCUU=";
|
||||
rev = "2ee26319eb0c101fb2a6da1c9d6650dfa39363da";
|
||||
hash = "sha256-wf+O0PxSoslPkpn1owN2jGUiH0zN7o7hWcKAb6Pd5ns=";
|
||||
};
|
||||
meta.homepage = "https://github.com/coder/claudecode.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -2631,12 +2631,12 @@ final: prev: {
|
||||
|
||||
cmake-tools-nvim = buildVimPlugin {
|
||||
pname = "cmake-tools.nvim";
|
||||
version = "0-unstable-2026-06-05";
|
||||
version = "0-unstable-2026-06-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Civitasv";
|
||||
repo = "cmake-tools.nvim";
|
||||
rev = "38f320fb9f0c4c9f1019f412f561c4d370a94d23";
|
||||
hash = "sha256-U8lLK5FzeOiJVUI0Y3AQ7TM+21tegMnnRbn18c7yXfc=";
|
||||
rev = "98cdc162572a7b77733030425d8d045d68f2a1fd";
|
||||
hash = "sha256-juAaEd08WGmI3ipfKMUbeTmLDK6nCOx/omCbRopIMHE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
|
||||
@@ -3484,12 +3484,12 @@ final: prev: {
|
||||
|
||||
coc-nvim = buildVimPlugin {
|
||||
pname = "coc.nvim";
|
||||
version = "0.0.82-unstable-2026-06-08";
|
||||
version = "0.0.82-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neoclide";
|
||||
repo = "coc.nvim";
|
||||
rev = "92ab906cab1e6b19ad03f754df4f3930f9eae22c";
|
||||
hash = "sha256-c0ChbihCajCuEh1hu5XOFtomiFA6OzbCl7eNpzPfBXM=";
|
||||
rev = "207dc0f4feb2fc5db54bf4f7b6fea9b21168c293";
|
||||
hash = "sha256-3dGV25DHXSt40N/X2XyaCg5rzgP3cxjoGHJx/ZwRt0o=";
|
||||
};
|
||||
meta.homepage = "https://github.com/neoclide/coc.nvim/";
|
||||
meta.license = unfree;
|
||||
@@ -3568,12 +3568,12 @@ final: prev: {
|
||||
|
||||
codecompanion-nvim = buildVimPlugin {
|
||||
pname = "codecompanion.nvim";
|
||||
version = "19.15.0";
|
||||
version = "19.16.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "olimorris";
|
||||
repo = "codecompanion.nvim";
|
||||
tag = "v19.15.0";
|
||||
hash = "sha256-M/2pkFeL+sWwrXiCcE38WWmPb73kdCwC8AWg3ldScY0=";
|
||||
tag = "v19.16.0";
|
||||
hash = "sha256-EUzpQYHEtIP5pVdhsUNWF0Gv7PegMVd25j9WC3Knsq4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
@@ -3582,12 +3582,12 @@ final: prev: {
|
||||
|
||||
codecompanion-spinner-nvim = buildVimPlugin {
|
||||
pname = "codecompanion-spinner.nvim";
|
||||
version = "0.2.5";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "franco-ruggeri";
|
||||
repo = "codecompanion-spinner.nvim";
|
||||
tag = "v0.2.5";
|
||||
hash = "sha256-QSkiyV70kFkArCnTXYRR+Dt4i5XSq072tYnOnHbKEBc=";
|
||||
tag = "v0.3.0";
|
||||
hash = "sha256-icFyR0q814mfLj+wT3ArSYwo50EWpn9BgI81qhbQDCQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/franco-ruggeri/codecompanion-spinner.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -4073,12 +4073,12 @@ final: prev: {
|
||||
|
||||
copilot-lua = buildVimPlugin {
|
||||
pname = "copilot.lua";
|
||||
version = "2.0.4";
|
||||
version = "3.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zbirenbaum";
|
||||
repo = "copilot.lua";
|
||||
tag = "v2.0.4";
|
||||
hash = "sha256-+hQ4Og0ZZS/tvs4z5733qRu5+W4D24HgHHPIL5vd0Eo=";
|
||||
tag = "v3.0.0";
|
||||
hash = "sha256-xjdTysyt7BMb8a9c2HPQN85EujhQv9ZCQ87yWHjELls=";
|
||||
};
|
||||
meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -4171,12 +4171,12 @@ final: prev: {
|
||||
|
||||
coq_nvim = buildVimPlugin {
|
||||
pname = "coq_nvim";
|
||||
version = "0-unstable-2026-06-10";
|
||||
version = "0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ms-jpq";
|
||||
repo = "coq_nvim";
|
||||
rev = "5054268e58e9e45dbdae598c2d7cca232085d2ce";
|
||||
hash = "sha256-SxffEztUDSXp1skO52Pi8XQCinWwFbw34Nn3cvC9GW8=";
|
||||
rev = "7911f272700449891cbe79e3f87690c4ac638c91";
|
||||
hash = "sha256-kP+LrA9Rs0Kfx8eTJ0Cpt5Yg/7RDZS8Ujkm7M8D2pHM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
|
||||
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
|
||||
@@ -4591,12 +4591,12 @@ final: prev: {
|
||||
|
||||
ddc-source-lsp = buildVimPlugin {
|
||||
pname = "ddc-source-lsp";
|
||||
version = "1.2.0-unstable-2026-05-24";
|
||||
version = "1.2.0-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Shougo";
|
||||
repo = "ddc-source-lsp";
|
||||
rev = "a8fef26851f3b648e064fa3aeb7c8c054684e846";
|
||||
hash = "sha256-vB3sCEJw67kJLON+AXo6B/38jBAFq079EouVxaI9QlQ=";
|
||||
rev = "7718b6d9539ebddc18e961f90ff1aca7975ffe5c";
|
||||
hash = "sha256-2JVCuFXc6mtXUDEB1lVgWC2q38kvwr9tyjKO/Z4iY9k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Shougo/ddc-source-lsp/";
|
||||
meta.license = unfree;
|
||||
@@ -5181,12 +5181,12 @@ final: prev: {
|
||||
|
||||
diagram-nvim = buildVimPlugin {
|
||||
pname = "diagram.nvim";
|
||||
version = "0-unstable-2026-02-21";
|
||||
version = "0-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "3rd";
|
||||
repo = "diagram.nvim";
|
||||
rev = "89d8110ec15021ac9a03ff2317d27b900c45bf60";
|
||||
hash = "sha256-0KgZ/3q26b7MxMPRXp4/mgfl7tIUD3PnC6TYgagDGP4=";
|
||||
rev = "a221810b17cdda2d5fdddba9bab3eba6fab8fabc";
|
||||
hash = "sha256-+K5o50CtBFqn37t6GnAnI1p2CfCyA1w4TIhMKpfZX4A=";
|
||||
};
|
||||
meta.homepage = "https://github.com/3rd/diagram.nvim/";
|
||||
meta.license = unfree;
|
||||
@@ -5209,12 +5209,12 @@ final: prev: {
|
||||
|
||||
diffs-nvim = buildVimPlugin {
|
||||
pname = "diffs.nvim";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "barrettruth";
|
||||
repo = "diffs.nvim";
|
||||
tag = "v0.3.3";
|
||||
hash = "sha256-g/kXdeNT2NLgQ+iPTI1GdlJyzvSHrcJoCLa0tPDj3gM=";
|
||||
tag = "v0.4.0";
|
||||
hash = "sha256-ZkdvFn5oIlHfXXbO68GxtLrVkF2vxYlG8Fglrkc3Byc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/barrettruth/diffs.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -5237,12 +5237,12 @@ final: prev: {
|
||||
|
||||
diffview-plus-nvim = buildVimPlugin {
|
||||
pname = "diffview-plus.nvim";
|
||||
version = "0.34";
|
||||
version = "0.35";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlyongemallo";
|
||||
repo = "diffview-plus.nvim";
|
||||
tag = "v0.34";
|
||||
hash = "sha256-M3Hf4y9HGFquBOK/Stv5FIxoVYX4aoO4dbbYQNPhisk=";
|
||||
tag = "v0.35";
|
||||
hash = "sha256-yoxylfQjTRrN95w+pgkBWLquBdb4knB5Sjplk2rcKVs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/dlyongemallo/diffview-plus.nvim/";
|
||||
meta.license = unfree;
|
||||
@@ -5419,12 +5419,12 @@ final: prev: {
|
||||
|
||||
easy-dotnet-nvim = buildVimPlugin {
|
||||
pname = "easy-dotnet.nvim";
|
||||
version = "0-unstable-2026-06-09";
|
||||
version = "0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "GustavEikaas";
|
||||
repo = "easy-dotnet.nvim";
|
||||
rev = "5c9577f6fc086e211ccc7d93b763e9a5ace4e64b";
|
||||
hash = "sha256-E+f0SHaTN8FI3gEs4t+6NuS5xn45kneK39kSam+Ya9M=";
|
||||
rev = "70f29290cad01cdcbdb03941034a95e5ef9fc365";
|
||||
hash = "sha256-4fqj9U24NizLuEWs5sL2MZXyGmznTTV0dmmZgZ0zdmA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -6334,12 +6334,12 @@ final: prev: {
|
||||
pname = "fyler.nvim";
|
||||
version = "2.0.0-unstable-2025-11-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "A7Lavinraj";
|
||||
owner = "FylerOrg";
|
||||
repo = "fyler.nvim";
|
||||
rev = "bb8b9f30c652c948d35211958b0deec3496bcc08";
|
||||
hash = "sha256-Caf1dJiIATbs0PNjSANjA3QgHg7PdeMz9Pjoc0Ti7G4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/A7Lavinraj/fyler.nvim/";
|
||||
meta.homepage = "https://github.com/FylerOrg/fyler.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
@@ -6388,12 +6388,12 @@ final: prev: {
|
||||
|
||||
fzf-vim = buildVimPlugin {
|
||||
pname = "fzf.vim";
|
||||
version = "0-unstable-2026-06-02";
|
||||
version = "0-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "junegunn";
|
||||
repo = "fzf.vim";
|
||||
rev = "356608e2ae5d9127e2c964885ea2b21ea7aea9ab";
|
||||
hash = "sha256-3u6E8HgLVwAk75fOAWP1zrRb54N4YG6MbRDrKpn7bdw=";
|
||||
rev = "d2a59a992a2455f609c0fde2ebd84427ea8f919a";
|
||||
hash = "sha256-TQR+ivA4nnichGdCDSeL2WeT+dHfNeQM1BPdrXM0Cd8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/junegunn/fzf.vim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -7073,12 +7073,12 @@ final: prev: {
|
||||
|
||||
guh-nvim = buildVimPlugin {
|
||||
pname = "guh.nvim";
|
||||
version = "0.0.1-unstable-2026-06-10";
|
||||
version = "0.0.1-unstable-2026-06-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "justinmk";
|
||||
repo = "guh.nvim";
|
||||
rev = "89bca23616361fa316c72b1171bc7aa3401800be";
|
||||
hash = "sha256-HEDQMSbWWg7UEru+hf0cT+7KbIMi1r1cU5YcgaBLq/E=";
|
||||
rev = "92ffef63af03b7188b8d11e052eaa3822b59820c";
|
||||
hash = "sha256-5vAyerfY08J0J4qQY5vPmNRRjDQGv2B+nUxIgs6I1DQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/justinmk/guh.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -8418,12 +8418,12 @@ final: prev: {
|
||||
|
||||
koda-nvim = buildVimPlugin {
|
||||
pname = "koda.nvim";
|
||||
version = "2.10.3";
|
||||
version = "2.11.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "oskarnurm";
|
||||
repo = "koda.nvim";
|
||||
tag = "v2.10.3";
|
||||
hash = "sha256-CU634QzBkPRVntJ/fKBu/V0WNQ7K9fzqOtMIUEb9/Vw=";
|
||||
tag = "v2.11.0";
|
||||
hash = "sha256-OiWW7c+cd/MioepNN40pFO3hTAm9ov80I1mVYmTW428=";
|
||||
};
|
||||
meta.homepage = "https://github.com/oskarnurm/koda.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -8460,13 +8460,12 @@ final: prev: {
|
||||
|
||||
kulala-nvim = buildVimPlugin {
|
||||
pname = "kulala.nvim";
|
||||
version = "6.9.2";
|
||||
version = "6.11.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mistweaverco";
|
||||
repo = "kulala.nvim";
|
||||
tag = "v6.9.2";
|
||||
hash = "sha256-7q/lV939qxozpsE0SM272ztSdzqIDuAdrgXSITCDLko=";
|
||||
fetchSubmodules = true;
|
||||
tag = "v6.11.1";
|
||||
hash = "sha256-w3psD4EYntFeX7otMPXN3altJf3UPjcaS2XLlqSnH4k=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -9580,12 +9579,12 @@ final: prev: {
|
||||
|
||||
mason-lspconfig-nvim = buildVimPlugin {
|
||||
pname = "mason-lspconfig.nvim";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mason-org";
|
||||
repo = "mason-lspconfig.nvim";
|
||||
tag = "v2.2.0";
|
||||
hash = "sha256-wWoRUg2nvmqaEWxjYEOk1q+jQyKupgJi2LubhewcVCw=";
|
||||
tag = "v2.3.0";
|
||||
hash = "sha256-yaR7P33ZQdJNAh0P3slN/TS0OL9p6ShMEIWGF4rFqxQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
@@ -9608,12 +9607,12 @@ final: prev: {
|
||||
|
||||
mason-nvim = buildVimPlugin {
|
||||
pname = "mason.nvim";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mason-org";
|
||||
repo = "mason.nvim";
|
||||
tag = "v2.3.0";
|
||||
hash = "sha256-O+11o3c0iNZ4tMZV80QbzwuMV3mP2Ml4lXQKHz4uR54=";
|
||||
tag = "v2.3.1";
|
||||
hash = "sha256-zx45l5yZeWgnkzaQeY+V3GK84arritj7jfpJ64Go9rg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mason-org/mason.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
@@ -10014,12 +10013,12 @@ final: prev: {
|
||||
|
||||
mini-diff = buildVimPlugin {
|
||||
pname = "mini.diff";
|
||||
version = "0.17.0-unstable-2026-05-19";
|
||||
version = "0.17.0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.diff";
|
||||
rev = "5af2b6be4a4beb673f3196a414f6fd932bbedd48";
|
||||
hash = "sha256-DVvZOwUQCT/TGfkdy65BjH7gPPDIQ9ib2VCqOPzG5fs=";
|
||||
rev = "05be51814a718e74244829754a2a900a430a8d8b";
|
||||
hash = "sha256-B7Z7rYEnxWTl09oO2fXtRFKdGVYwRCY3B7hsgj5kNzE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.diff/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -10126,12 +10125,12 @@ final: prev: {
|
||||
|
||||
mini-icons = buildVimPlugin {
|
||||
pname = "mini.icons";
|
||||
version = "0.17.0-unstable-2026-05-19";
|
||||
version = "0.17.0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.icons";
|
||||
rev = "520995f1d75da0e4cc901ee95080b1ff2bc46b94";
|
||||
hash = "sha256-Q61iFTDA2groQu3qMNJu0yuVnB6NtsGNihpGD5ppeuI=";
|
||||
rev = "d48ad47359218d2b019034f95f601b3861180885";
|
||||
hash = "sha256-sDW/9Y5MhzvklkiW7XmrDslCCGDcYliJ5awgj1Ko558=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.icons/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -10154,12 +10153,12 @@ final: prev: {
|
||||
|
||||
mini-input = buildVimPlugin {
|
||||
pname = "mini.input";
|
||||
version = "0-unstable-2026-06-07";
|
||||
version = "0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.input";
|
||||
rev = "44477bc40a1d9556decab08cd0e13187f9d909e4";
|
||||
hash = "sha256-ex0BKThn97+lnWm6EaI4JuCViQ7B6na+n5yCX9OJavU=";
|
||||
rev = "d97776877c2dadbc7b5830d47eefa99e33e48cb1";
|
||||
hash = "sha256-fOILbrCQciZtMTKtLzXtFKghc/ocR09szG7yyPaunFs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.input/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -10224,12 +10223,12 @@ final: prev: {
|
||||
|
||||
mini-misc = buildVimPlugin {
|
||||
pname = "mini.misc";
|
||||
version = "0.17.0-unstable-2026-05-28";
|
||||
version = "0.17.0-unstable-2026-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.misc";
|
||||
rev = "eb2246ede307fc863a12e9d9b0fa4b7ca9b88188";
|
||||
hash = "sha256-gX1li7+jJq0/I0rT13aJsBIbFFrufJIFhz2bFGGy+mw=";
|
||||
rev = "317e20ad3bdf0f4535f9a7efdae7fbe5c4439f29";
|
||||
hash = "sha256-arVLHeI7ON1pMTNq1D17XqQdWZHRMrNKwnYXUb1PWNM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.misc/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -10266,12 +10265,12 @@ final: prev: {
|
||||
|
||||
mini-nvim = buildVimPlugin {
|
||||
pname = "mini.nvim";
|
||||
version = "0.17.0-unstable-2026-06-07";
|
||||
version = "0.17.0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.nvim";
|
||||
rev = "ff8b3580935818ef2f21bdd651f057a2ae071eab";
|
||||
hash = "sha256-wVRhe2ufPG/2DRtJGyAAhoCOTX8CLB2zZ8TQOQz9TqQ=";
|
||||
rev = "7ed410c73ebb910754c2938a6dae50c51c3a096a";
|
||||
hash = "sha256-yyJ0BwKMOi+c2WODEUnlRB5iz+3i4u8G7zL4mtayRMQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -10308,12 +10307,12 @@ final: prev: {
|
||||
|
||||
mini-pick = buildVimPlugin {
|
||||
pname = "mini.pick";
|
||||
version = "0.17.0-unstable-2026-06-06";
|
||||
version = "0.17.0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.pick";
|
||||
rev = "1ffba38c7221669d3da7792d4bbe1c9761075f4d";
|
||||
hash = "sha256-N/RdA7mEno3E5D4c9gxm9ZIlzAz3f7CPAJbyGEiECBM=";
|
||||
rev = "f8ea97c5e89cc923f466e0706046eaa3988f246c";
|
||||
hash = "sha256-ZQcB/4D0xVAJswotuSFOspFFHs1BtrHvCF0uDv1yhr0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.pick/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -10336,12 +10335,12 @@ final: prev: {
|
||||
|
||||
mini-snippets = buildVimPlugin {
|
||||
pname = "mini.snippets";
|
||||
version = "0.17.0-unstable-2026-05-19";
|
||||
version = "0.17.0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-mini";
|
||||
repo = "mini.snippets";
|
||||
rev = "9a08aa14e02abb790c823a622d7d6c736cbbe65a";
|
||||
hash = "sha256-1w8t2ANiBue7mNk5QYhi8aBHGGNvIbrKPQgGqGO0RqI=";
|
||||
rev = "c59e203fef0de69b8cb67edb07b4fc10d455bb44";
|
||||
hash = "sha256-5auuFMTQGO4gSUadW4iSwAZDZYyKBHZVAJCJjXDO1yI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-mini/mini.snippets/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -11022,12 +11021,12 @@ final: prev: {
|
||||
|
||||
neoconf-nvim = buildVimPlugin {
|
||||
pname = "neoconf.nvim";
|
||||
version = "1.4.0-unstable-2026-06-10";
|
||||
version = "1.4.0-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "folke";
|
||||
repo = "neoconf.nvim";
|
||||
rev = "3a0a976a10cba0ff9d9406e4652755881321ecf9";
|
||||
hash = "sha256-hPv22eaPTY0UKoCxOXq/D1eUGOomAc8D0CB5mRs1ueQ=";
|
||||
rev = "0748437c07b5e7fd19af738ed0562479381424b1";
|
||||
hash = "sha256-rCYdnx//W0m20ph62PEwdMcx8xd0ZIlATBxjlZARjJ4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/folke/neoconf.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Apache-2.0";
|
||||
@@ -11106,12 +11105,12 @@ final: prev: {
|
||||
|
||||
neogit = buildVimPlugin {
|
||||
pname = "neogit";
|
||||
version = "3.0.0-unstable-2026-05-13";
|
||||
version = "3.0.0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NeogitOrg";
|
||||
repo = "neogit";
|
||||
rev = "99326a1310fb2d616b455d2fd16d01bf00682f06";
|
||||
hash = "sha256-ZKK4JbeuMGYvUjG1B6vLZTeSMeQTXQGFQAlIMqqN660=";
|
||||
rev = "5d1b65d6215928e941e1a6a4e76e02fd45ada31f";
|
||||
hash = "sha256-K7AtBKS2b77pjfdxb11A7U7ED+XTjn4W8ajk//8U7TA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/NeogitOrg/neogit/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -11487,12 +11486,12 @@ final: prev: {
|
||||
|
||||
neotest-java = buildVimPlugin {
|
||||
pname = "neotest-java";
|
||||
version = "0.37.3";
|
||||
version = "0.38.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcasia";
|
||||
repo = "neotest-java";
|
||||
tag = "v0.37.3";
|
||||
hash = "sha256-ALVudtC49gAQOGwucOh7zvhbUyZX0lTGyizhn+QCPl4=";
|
||||
tag = "v0.38.0";
|
||||
hash = "sha256-R24mbFbYTH166gq8EZOuLDZ7dA2Yhjmrc77K2os5jtE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/rcasia/neotest-java/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -12184,20 +12183,6 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
null-ls-nvim = buildVimPlugin {
|
||||
pname = "null-ls.nvim";
|
||||
version = "0-unstable-2023-08-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "null-ls.nvim";
|
||||
rev = "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7";
|
||||
hash = "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
|
||||
meta.license = unfree;
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
numb-nvim = buildVimPlugin {
|
||||
pname = "numb.nvim";
|
||||
version = "1.1.0";
|
||||
@@ -12521,11 +12506,11 @@ final: prev: {
|
||||
|
||||
nvim-dap-disasm = buildVimPlugin {
|
||||
pname = "nvim-dap-disasm";
|
||||
version = "0-unstable-2026-02-25";
|
||||
version = "0-unstable-2026-06-14";
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/Jorenar/nvim-dap-disasm";
|
||||
rev = "1119f3f2b22e411adcd123cdcf6d0425b61a31a7";
|
||||
hash = "sha256-lq0tbMksVXccf6GGD7OxWAuoD9w8tlt30dpJSMtN4g8=";
|
||||
rev = "b86a1e3f03f268635f9b362ccc8ffa5f240dd25d";
|
||||
hash = "sha256-hkoFEH8UoAzWOue1YTrHCQn7/N54fXsHpOZ5xAaSbIw=";
|
||||
};
|
||||
meta.homepage = "https://codeberg.org/Jorenar/nvim-dap-disasm";
|
||||
meta.license = unfree;
|
||||
@@ -12687,12 +12672,12 @@ final: prev: {
|
||||
|
||||
nvim-docs-view = buildVimPlugin {
|
||||
pname = "nvim-docs-view";
|
||||
version = "0-unstable-2026-05-08";
|
||||
version = "0-unstable-2026-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "amrbashir";
|
||||
repo = "nvim-docs-view";
|
||||
rev = "9a262fa7e181e924d355e8725c68c48f076138b1";
|
||||
hash = "sha256-zsrrsTIpjRqDS/NXQH7TA6CjZj3PK8kstD9EB4omSGw=";
|
||||
rev = "a1696d058a4223d8c3615bb305abfa638c5689a9";
|
||||
hash = "sha256-Ws/s3tgFTZczTVDjagBSY2bfso7oWRFB4oy/Y3DFdEA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/amrbashir/nvim-docs-view/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -12757,12 +12742,12 @@ final: prev: {
|
||||
|
||||
nvim-gdb = buildVimPlugin {
|
||||
pname = "nvim-gdb";
|
||||
version = "0-unstable-2026-05-08";
|
||||
version = "0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "sakhnik";
|
||||
repo = "nvim-gdb";
|
||||
rev = "3ea9e52a7be60373a127be9dcc94773bc1d6e25c";
|
||||
hash = "sha256-y8dxr4xAOX7+PKCd2h3iMlmWZtmBr9Wp6ecjAYFtunc=";
|
||||
rev = "67abac716b626ece57f3a7c72121542f0b3edfe9";
|
||||
hash = "sha256-6MnwKYvOL3b0hKOnLTvdRYrZkZBYt4XAK2jlFw+DfTM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -13116,20 +13101,6 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-lsp-ts-utils = buildVimPlugin {
|
||||
pname = "nvim-lsp-ts-utils";
|
||||
version = "0-unstable-2022-07-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "nvim-lsp-ts-utils";
|
||||
rev = "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7";
|
||||
hash = "sha256-38YOgLDtku2BPCaNEmX0555x1QmHuuDSCZL274bBhcg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/";
|
||||
meta.license = getLicenseFromSpdxId "Unlicense";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
nvim-lspconfig = buildVimPlugin {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2.10.0";
|
||||
@@ -13706,12 +13677,12 @@ final: prev: {
|
||||
|
||||
nvim-tree-lua = buildVimPlugin {
|
||||
pname = "nvim-tree.lua";
|
||||
version = "1.17.0-unstable-2026-06-08";
|
||||
version = "1.17.0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-tree";
|
||||
repo = "nvim-tree.lua";
|
||||
rev = "82f58063d67defc620e1ef8be606fc62a7b5dc1e";
|
||||
hash = "sha256-JfOkJkTGVWPw7dhcbDNPsyeNbidrtIvzJhPYUQJ1NoY=";
|
||||
rev = "fb343438d49fba8c35ecc4829d66fca7a1f0ed3d";
|
||||
hash = "sha256-JhLDjrRqY/vWN+R6suVvMZLkZQkLq5IpSFwPojkYYqg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
|
||||
meta.license = unfree;
|
||||
@@ -14434,12 +14405,12 @@ final: prev: {
|
||||
|
||||
opencode-nvim = buildVimPlugin {
|
||||
pname = "opencode.nvim";
|
||||
version = "0.11.0";
|
||||
version = "0.13.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickjvandyke";
|
||||
repo = "opencode.nvim";
|
||||
tag = "v0.11.0";
|
||||
hash = "sha256-i6Ty/TXy9Ph6Ex39qumfgH7ArenH159EHy1UFvNBJfI=";
|
||||
tag = "v0.13.1";
|
||||
hash = "sha256-RusMzeU22v4Lnx1n7q3uucLI6AFVk1AUE+IvpDlvuLw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -15500,12 +15471,12 @@ final: prev: {
|
||||
|
||||
refactoring-nvim = buildVimPlugin {
|
||||
pname = "refactoring.nvim";
|
||||
version = "0-unstable-2026-05-26";
|
||||
version = "0-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theprimeagen";
|
||||
repo = "refactoring.nvim";
|
||||
rev = "624c01e8175901484eac74512baf35e9dfe269b8";
|
||||
hash = "sha256-PPGSMbLVHLghqaVfRsViw7gYHrL4RtiH0Svw8H65TpE=";
|
||||
rev = "7eaa150061ea18fdbe18fbb924d236e3ddccc57d";
|
||||
hash = "sha256-CMnRH1M4/ha+QEGGCcuVXwRFSs69O6VycJlKMFYh6CI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -15906,12 +15877,12 @@ final: prev: {
|
||||
|
||||
scnvim = buildVimPlugin {
|
||||
pname = "scnvim";
|
||||
version = "0-unstable-2026-04-20";
|
||||
version = "0-unstable-2026-06-15";
|
||||
src = fetchFromGitHub {
|
||||
owner = "davidgranstrom";
|
||||
repo = "scnvim";
|
||||
rev = "ec347b24168ac922de4dcddc181efd2fcdcfa0d0";
|
||||
hash = "sha256-cqZF3b+DkOQUOSU502vGQx8RNzH4b97B9zqHO9v8IBI=";
|
||||
rev = "b7d48851e98e6111ad62f94a3c3ddc9b037122e8";
|
||||
hash = "sha256-k5a7d3exVXdjHuILfYIj6cinWoev8h6wYBlNXowuHsw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/davidgranstrom/scnvim/";
|
||||
meta.license = getLicenseFromSpdxId "GPL-3.0-only";
|
||||
@@ -16004,12 +15975,12 @@ final: prev: {
|
||||
|
||||
searchbox-nvim = buildVimPlugin {
|
||||
pname = "searchbox.nvim";
|
||||
version = "0-unstable-2026-06-01";
|
||||
version = "0-unstable-2026-06-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "VonHeikemen";
|
||||
repo = "searchbox.nvim";
|
||||
rev = "e66c850fbdebf493969da87e4f665acfb539b9c3";
|
||||
hash = "sha256-3HFofdEzVK+kXENrll8rxq/Huyg8HhiDg8P7n0JFQXE=";
|
||||
rev = "83a43dbc52d27755ab1a9f710a11c987f6a73813";
|
||||
hash = "sha256-kUJZvXY1JbHvPUyq80nfP7aygi+ZtjcWGPCbsbvHLLQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -16201,12 +16172,12 @@ final: prev: {
|
||||
|
||||
smart-splits-nvim = buildVimPlugin {
|
||||
pname = "smart-splits.nvim";
|
||||
version = "2.1.0-unstable-2026-06-05";
|
||||
version = "2.1.0-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjones2014";
|
||||
repo = "smart-splits.nvim";
|
||||
rev = "6806149fd36d1c5e797debe3e18b2c07219b685a";
|
||||
hash = "sha256-INxUHLtQBnnmbKBmQNgcdm4FxP5Amig2Q2s6pAub11U=";
|
||||
rev = "501ea73e433246cbd53f0b14bbd205fa44831e4d";
|
||||
hash = "sha256-P7XFoM3zZmlOrhRwiY3xJdJZuiIlJAgijLWukt6OHfI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -17085,12 +17056,12 @@ final: prev: {
|
||||
|
||||
tagbar = buildVimPlugin {
|
||||
pname = "tagbar";
|
||||
version = "3.1.1-unstable-2026-05-17";
|
||||
version = "3.1.1-unstable-2026-06-14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "preservim";
|
||||
repo = "tagbar";
|
||||
rev = "b37b05ff1925b0b3931f031ebf88690aa0974375";
|
||||
hash = "sha256-Vqjq6ClXntfg2579MG37MQJWv6tN/4Y5/uuF4OqFMDQ=";
|
||||
rev = "07cb8247487208124978daff8e13624667635457";
|
||||
hash = "sha256-bezgPiUz5EKKjTLuP6SpWGRCEYo8VXGvoF96qhR0aF8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/preservim/tagbar/";
|
||||
meta.license = unfree;
|
||||
@@ -18168,15 +18139,15 @@ final: prev: {
|
||||
|
||||
transparent-nvim = buildVimPlugin {
|
||||
pname = "transparent.nvim";
|
||||
version = "0-unstable-2025-06-22";
|
||||
version = "0-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "xiyaowong";
|
||||
repo = "transparent.nvim";
|
||||
rev = "8ac59883de84e9cd1850ea25cf087031c5ba7d54";
|
||||
hash = "sha256-GlN7/+TmXld2UVPN2rDP7nKqbnswiezmGXn+uGK5I5c=";
|
||||
rev = "e00ca1cf09caef575edf8da7e5a8b9193893b4c7";
|
||||
hash = "sha256-VMWvh5QLV7y65SPEbKacrdL6WvHSF+z+LEaWugxqQOI=";
|
||||
};
|
||||
meta.homepage = "https://github.com/xiyaowong/transparent.nvim/";
|
||||
meta.license = unfree;
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
@@ -18434,20 +18405,6 @@ final: prev: {
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
typescript-nvim = buildVimPlugin {
|
||||
pname = "typescript.nvim";
|
||||
version = "0-unstable-2023-08-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jose-elias-alvarez";
|
||||
repo = "typescript.nvim";
|
||||
rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467";
|
||||
hash = "sha256-tStomym4qd7IXj/ohYAc3akImNsOJdC7nQL+CkdMomc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "Unlicense";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
typescript-tools-nvim = buildVimPlugin {
|
||||
pname = "typescript-tools.nvim";
|
||||
version = "0-unstable-2025-11-18";
|
||||
@@ -18758,12 +18715,12 @@ final: prev: {
|
||||
|
||||
vague-nvim = buildVimPlugin {
|
||||
pname = "vague.nvim";
|
||||
version = "2.1.2";
|
||||
version = "2.1.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vague-theme";
|
||||
repo = "vague.nvim";
|
||||
tag = "v2.1.2";
|
||||
hash = "sha256-8y4Dc+AXx4+DmnOAYYD6Yyi0GDyI6fwdM4AKsmM5hZU=";
|
||||
tag = "v2.1.3";
|
||||
hash = "sha256-ULBLMmJQe93N3uOPx6h8wif+38g0OSC7haklfVJyZdA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/vague-theme/vague.nvim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -21882,12 +21839,12 @@ final: prev: {
|
||||
|
||||
vim-just = buildVimPlugin {
|
||||
pname = "vim-just";
|
||||
version = "0-unstable-2026-05-10";
|
||||
version = "0-unstable-2026-06-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NoahTheDuke";
|
||||
repo = "vim-just";
|
||||
rev = "6034ccf6a4682c91f90f38fae4c882068e6723fe";
|
||||
hash = "sha256-3ytgSsTvtmq9jC2qyeBzKLK+x0UppyVODggcspDX7ZE=";
|
||||
rev = "49f318424ed17fb8d49122daa39820fd6a2880f5";
|
||||
hash = "sha256-r/YS0LFio0BNTCUh0nRrAndUfcJgYio+ADCoqq8NH8U=";
|
||||
};
|
||||
meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -22190,12 +22147,12 @@ final: prev: {
|
||||
|
||||
vim-lsp-settings = buildVimPlugin {
|
||||
pname = "vim-lsp-settings";
|
||||
version = "0.0.1-unstable-2026-05-21";
|
||||
version = "0.0.1-unstable-2026-06-11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "vim-lsp-settings";
|
||||
rev = "1558bbaba4cbb593901e3dfc4d0f1a0cd212b09c";
|
||||
hash = "sha256-wMF4y4eMz7UR50GpBvStDsQ0SpKUt48tll6rqEr6AHY=";
|
||||
rev = "bffb50ffa688e651a3d4ad827c90b887d5c67200";
|
||||
hash = "sha256-4AzLUvDTv8stTk2oKvjXetinK5YGx636TwP9yKdluZs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -23940,11 +23897,11 @@ final: prev: {
|
||||
|
||||
vim-solarized8 = buildVimPlugin {
|
||||
pname = "vim-solarized8";
|
||||
version = "1.6.4-unstable-2026-03-11";
|
||||
version = "1.6.4-unstable-2026-06-11";
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/lifepillar/vim-solarized8/";
|
||||
rev = "5dfbfb00be8237619c680302fc9250e391b1686a";
|
||||
hash = "sha256-qJLlHsXKcLC+bpirfcuBj3igK9dDk8L9oVGPzWhtkEI=";
|
||||
rev = "1cb22c68158a3e27cf5943052a4bd36c3dd4151c";
|
||||
hash = "sha256-XPhiSwyV0A23e6NOEb8OejC68WtVVTL5A4YranlghZs=";
|
||||
};
|
||||
meta.homepage = "https://codeberg.org/lifepillar/vim-solarized8/";
|
||||
meta.license = unfree;
|
||||
@@ -25241,12 +25198,12 @@ final: prev: {
|
||||
|
||||
vimtex = buildVimPlugin {
|
||||
pname = "vimtex";
|
||||
version = "2.17-unstable-2026-05-26";
|
||||
version = "2.17-unstable-2026-06-13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "vimtex";
|
||||
rev = "24e229914182ff301496a3e2c4214b28c4928d3f";
|
||||
hash = "sha256-y45zOpF68G51jVdCsa27iiDdw2YEmHZNgkIHDI62nAo=";
|
||||
rev = "fedb7ffc1bebf254cc74e7419c3a5930b6719065";
|
||||
hash = "sha256-h1GZnhQrm8c+e/vbecBwWbFj4QOX3TbagYp3Ea3tk/Q=";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/vimtex/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -25535,12 +25492,12 @@ final: prev: {
|
||||
|
||||
wiki-vim = buildVimPlugin {
|
||||
pname = "wiki.vim";
|
||||
version = "0.11-unstable-2026-03-26";
|
||||
version = "0.12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lervag";
|
||||
repo = "wiki.vim";
|
||||
rev = "44f266fc8ed6f8fbc6bae47ee1ca6ba32e5995f8";
|
||||
hash = "sha256-wcoiv8lPBr/r4yMw4tO6SmNQ09f1SjFqWlNDat7oXDk=";
|
||||
tag = "v0.12";
|
||||
hash = "sha256-6562XAJFqmWUo/IzBI6Mmy2Jp1p9smwt4LV95X6Cf5w=";
|
||||
};
|
||||
meta.homepage = "https://github.com/lervag/wiki.vim/";
|
||||
meta.license = getLicenseFromSpdxId "MIT";
|
||||
@@ -25747,12 +25704,12 @@ final: prev: {
|
||||
pname = "xeno.nvim";
|
||||
version = "0-unstable-2025-10-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyzadev";
|
||||
owner = "kyzabuilds";
|
||||
repo = "xeno.nvim";
|
||||
rev = "f70c22447c7d954973f35c10dd9e9942cd7fb2eb";
|
||||
hash = "sha256-zTGclrlxThgqEvj8K3fQ87G98g3VDqvp/dCnZwSm4I8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/kyzadev/xeno.nvim/";
|
||||
meta.homepage = "https://github.com/kyzabuilds/xeno.nvim/";
|
||||
meta.license = unfree;
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
@@ -1656,7 +1656,8 @@ assertNoAdditions {
|
||||
];
|
||||
checkInputs = with self; [
|
||||
luasnip
|
||||
null-ls-nvim
|
||||
none-ls-nvim
|
||||
plenary-nvim
|
||||
];
|
||||
nvimSkipModules = [
|
||||
"init"
|
||||
@@ -2012,9 +2013,8 @@ assertNoAdditions {
|
||||
let
|
||||
kulala-http-grammar = neovimUtils.grammarToPlugin (
|
||||
tree-sitter.buildGrammar {
|
||||
inherit (old) version src meta;
|
||||
language = "kulala_http";
|
||||
location = "lua/tree-sitter";
|
||||
inherit (luaPackages.tree-sitter-kulala_http) version src meta;
|
||||
generate = false;
|
||||
}
|
||||
);
|
||||
@@ -2036,6 +2036,7 @@ assertNoAdditions {
|
||||
"cli.kulala_cli"
|
||||
# Upstream test harnesses are not require-safe modules
|
||||
"minit"
|
||||
"minit-userscript"
|
||||
"minitest"
|
||||
"test"
|
||||
# Legacy parser module; active parsing is handled by kulala-core
|
||||
@@ -2481,7 +2482,8 @@ assertNoAdditions {
|
||||
mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
mason-nvim
|
||||
null-ls-nvim
|
||||
none-ls-nvim
|
||||
plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
@@ -3094,13 +3096,6 @@ assertNoAdditions {
|
||||
dependencies = [ self.aniseed ];
|
||||
};
|
||||
|
||||
null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
meta = old.meta // {
|
||||
license = lib.licenses.unlicense;
|
||||
};
|
||||
});
|
||||
|
||||
nvchad = super.nvchad.overrideAttrs {
|
||||
# You've signed up for a distro, providing dependencies.
|
||||
dependencies = with self; [
|
||||
@@ -4632,17 +4627,6 @@ assertNoAdditions {
|
||||
runtimeDeps = [ television ];
|
||||
};
|
||||
|
||||
typescript-nvim = super.typescript-nvim.overrideAttrs {
|
||||
checkInputs = [
|
||||
# Optional null-ls integration
|
||||
self.none-ls-nvim
|
||||
];
|
||||
dependencies = with self; [
|
||||
nvim-lspconfig
|
||||
plenary-nvim
|
||||
];
|
||||
};
|
||||
|
||||
typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs {
|
||||
dependencies = with self; [
|
||||
nvim-lspconfig
|
||||
|
||||
+4
-4
@@ -10,10 +10,10 @@ index 5f37046..c60c474 100644
|
||||
return vim.treesitter.language.add(parser_name) == true
|
||||
end
|
||||
|
||||
@@ -48,7 +47,6 @@ M.register_parser = function()
|
||||
-- queries/kulala_http/*.scm live under lua/tree-sitter/queries/
|
||||
vim.opt.rtp:prepend(parser_source_path)
|
||||
ensure_site_rtp()
|
||||
@@ -48,7 +47,3 @@ M.register_parser = function()
|
||||
- -- kulala_http/*.scm live under tree-sitter-kulala-http/queries/
|
||||
- vim.opt.rtp:prepend(parser_source_path)
|
||||
- ensure_site_rtp()
|
||||
- sync_queries()
|
||||
vim.treesitter.language.register(parser_name, filetypes)
|
||||
vim.treesitter.language.register("markdown", "kulala_ui")
|
||||
|
||||
@@ -450,7 +450,7 @@ https://github.com/shumphrey/fugitive-gitlab.vim/,,
|
||||
https://github.com/BeneCollyridam/futhark-vim/,,
|
||||
https://github.com/tzachar/fuzzy.nvim/,,
|
||||
https://github.com/rktjmp/fwatch.nvim/,,
|
||||
https://github.com/A7Lavinraj/fyler.nvim/,stable,
|
||||
https://github.com/FylerOrg/fyler.nvim/,stable,
|
||||
https://github.com/stsewd/fzf-checkout.vim/,,
|
||||
https://github.com/monkoose/fzf-hoogle.vim/,,
|
||||
https://github.com/gfanto/fzf-lsp.nvim/,,
|
||||
@@ -868,7 +868,6 @@ https://github.com/shaunsingh/nord.nvim/,,
|
||||
https://github.com/alexvzyl/nordic.nvim/,,
|
||||
https://github.com/vigoux/notifier.nvim/,,
|
||||
https://github.com/jlesquembre/nterm.nvim/,,
|
||||
https://github.com/jose-elias-alvarez/null-ls.nvim/,,
|
||||
https://github.com/nacro90/numb.nvim/,,
|
||||
https://github.com/nvchad/nvchad/,,
|
||||
https://github.com/nvchad/ui/,,nvchad-ui
|
||||
@@ -935,7 +934,6 @@ https://github.com/martineausimon/nvim-lilypond-suite/,,
|
||||
https://codeberg.org/mfussenegger/nvim-lint/,,
|
||||
https://github.com/antosha417/nvim-lsp-file-operations/,,
|
||||
https://github.com/mrded/nvim-lsp-notify/,,
|
||||
https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
|
||||
https://github.com/neovim/nvim-lspconfig/,,
|
||||
https://github.com/RishabhRD/nvim-lsputils/,,
|
||||
https://github.com/sam4llis/nvim-lua-gf/,,
|
||||
@@ -1316,7 +1314,6 @@ https://github.com/alexpasmantier/tv.nvim/,,
|
||||
https://github.com/folke/twilight.nvim/,,
|
||||
https://github.com/pmizio/typescript-tools.nvim/,,
|
||||
https://github.com/leafgarland/typescript-vim/,,
|
||||
https://github.com/jose-elias-alvarez/typescript.nvim/,,
|
||||
https://github.com/MrPicklePinosaur/typst-conceal.vim/,,
|
||||
https://github.com/chomosuke/typst-preview.nvim/,,
|
||||
https://github.com/kaarmu/typst.vim/,,
|
||||
@@ -1836,7 +1833,7 @@ https://github.com/natecraddock/workspaces.nvim/,,
|
||||
https://github.com/andrewferrier/wrapping.nvim/,,
|
||||
https://github.com/tweekmonster/wstrip.vim/,,
|
||||
https://github.com/piersolenski/wtf.nvim/,,
|
||||
https://github.com/kyzadev/xeno.nvim/,,
|
||||
https://github.com/kyzabuilds/xeno.nvim/,,
|
||||
https://github.com/Mythos-404/xmake.nvim/,,
|
||||
https://github.com/drmingdrmer/xptemplate/,,
|
||||
https://github.com/guns/xterm-color-table.vim/,,
|
||||
|
||||
@@ -1375,8 +1375,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "competitive-programming-helper";
|
||||
publisher = "DivyanshuAgrawal";
|
||||
version = "2026.6.1780508121";
|
||||
hash = "sha256-4kb7Nk+gctECMQM/cko+q1Bta1EKPXPEqyCQLBMkbEo=";
|
||||
version = "2026.6.1780853884";
|
||||
hash = "sha256-4nxH5qW3u3/9Vqf+QFs7l5BDusE5wcxxHiJFcPq/2EE=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";
|
||||
|
||||
@@ -175,7 +175,7 @@ let
|
||||
homepage = "https://pidgin.im/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.lucasew ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
{
|
||||
crateName,
|
||||
version,
|
||||
dependencies,
|
||||
crateFeatures,
|
||||
crateRenames,
|
||||
@@ -25,6 +26,7 @@
|
||||
buildTests,
|
||||
codegenUnits,
|
||||
capLints,
|
||||
useClippy,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -32,6 +34,20 @@ let
|
||||
(if release then "-C opt-level=3" else "-C debuginfo=2")
|
||||
"-C codegen-units=${toString codegenUnits}"
|
||||
"--remap-path-prefix=$NIX_BUILD_TOP=/"
|
||||
# Map the unpacked source root to a stable, crate-identifying path.
|
||||
# Sources from fetchCrate unpack to $NIX_BUILD_TOP/<crateName>-<version>,
|
||||
# so the prefix above already yields /<crateName>-<version>/src/... and
|
||||
# this remap is a no-op for them. Sources supplied via a custom `src`
|
||||
# (lib.fileset.toSource, lib.cleanSource, a flake's `self`) all unpack to
|
||||
# a fixed basename like `source`, so without this every such crate
|
||||
# collapses to /source/src/... — losing crate identity in panic
|
||||
# backtraces, file!() expansions, debuginfo, and coverage maps. rustc
|
||||
# applies remaps last-match-wins, so this more-specific prefix wins
|
||||
# for everything under the source root (including OUT_DIR, which
|
||||
# configure-crate.nix places at $sourceRoot/target/build/); the
|
||||
# broader $NIX_BUILD_TOP remap above remains as a fallback for any
|
||||
# path that happens to fall outside $sourceRoot.
|
||||
"--remap-path-prefix=$NIX_BUILD_TOP/$sourceRoot=/${crateName}-${version}"
|
||||
# When the rust-src component is present (common with rust-overlay
|
||||
# toolchains), rustc unvirtualises libstd source paths. Panic
|
||||
# locations from monomorphised generic std code then embed the
|
||||
@@ -94,6 +110,7 @@ in
|
||||
runHook preBuild
|
||||
|
||||
# configure & source common build functions
|
||||
RUSTC_DRIVER="${if useClippy then "clippy-driver" else "rustc"}"
|
||||
LIB_RUSTC_OPTS="${libRustcOpts}"
|
||||
BIN_RUSTC_OPTS="${binRustcOpts}"
|
||||
LIB_EXT="${stdenv.hostPlatform.extensions.library}"
|
||||
|
||||
@@ -148,7 +148,7 @@ in
|
||||
export CARGO_CFG_TARGET_OS=${stdenv.hostPlatform.rust.platform.os}
|
||||
export CARGO_CFG_TARGET_FAMILY="unix"
|
||||
export CARGO_CFG_UNIX=1
|
||||
export CARGO_CFG_TARGET_ENV="gnu"
|
||||
export CARGO_CFG_TARGET_ENV=${stdenv.hostPlatform.rust.platform.env}
|
||||
export CARGO_CFG_TARGET_ENDIAN=${
|
||||
if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
pkgsBuildBuild,
|
||||
rustc,
|
||||
cargo,
|
||||
clippy,
|
||||
jq,
|
||||
libiconv,
|
||||
# Controls codegen parallelization for all crates.
|
||||
@@ -155,14 +156,37 @@ crate_:
|
||||
lib.makeOverridable
|
||||
(
|
||||
# The rust compiler to use.
|
||||
#
|
||||
# Default: pkgs.rustc
|
||||
{
|
||||
rust ? rustc,
|
||||
# The cargo package to use for getting some metadata.
|
||||
#
|
||||
# Default: pkgs.cargo
|
||||
cargo ? cargo,
|
||||
# Whether to compile the crate's library, binary, and test targets with
|
||||
# `clippy-driver` instead of `rustc`. Build scripts (`build.rs`) keep
|
||||
# plain `rustc` — they are typically auto-generated and clippy findings
|
||||
# there are not actionable.
|
||||
#
|
||||
# `clippy-driver` wraps `rustc_driver` with extra lint passes and emits
|
||||
# link-compatible `.rlib`/`.rmeta`, so dependency crates built with plain
|
||||
# `rustc` are still usable; only the crate being linted needs this flag.
|
||||
#
|
||||
# Note that the default `capLints` of `"allow"` suppresses ALL lints,
|
||||
# including clippy's. Set `capLints = "warn"` (or `"forbid"`) or supply
|
||||
# a `lints` table — otherwise `useClippy` is a silent no-op. Lint flags
|
||||
# such as `-D warnings` or `-W clippy::pedantic` go through the regular
|
||||
# `extraRustcOpts` (clippy-driver forwards rustc flags unchanged).
|
||||
#
|
||||
# Example: true
|
||||
# Default: false
|
||||
useClippy,
|
||||
# The clippy package providing `clippy-driver`. Only consulted when
|
||||
# `useClippy = true`. Override this together with `rust` when using a
|
||||
# toolchain (rust-overlay, Fenix) that bundles its own `clippy-driver`,
|
||||
# so the sysroot matches.
|
||||
#
|
||||
# Default: pkgs.clippy
|
||||
clippy ? clippy,
|
||||
# Whether to build a release version (`true`) or a debug
|
||||
# version (`false`). Debug versions are faster to build
|
||||
# but might be much slower at runtime.
|
||||
@@ -198,6 +222,13 @@ lib.makeOverridable
|
||||
# Rust build dependencies, i.e. other libraries that were built
|
||||
# with buildRustCrate and are used by a build script.
|
||||
buildDependencies,
|
||||
# Rust dev-dependencies, i.e. other libraries that were built
|
||||
# with buildRustCrate and are linked only when `buildTests = true`.
|
||||
# Mirrors Cargo's `[dev-dependencies]`: ignored for the regular
|
||||
# lib/bin build, appended to `dependencies` for the test build.
|
||||
#
|
||||
# Default: []
|
||||
devDependencies,
|
||||
# Specify the "extern" name of a library if it differs from the library target.
|
||||
# See above for an extended explanation.
|
||||
#
|
||||
@@ -329,6 +360,7 @@ lib.makeOverridable
|
||||
crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: { }) crateOverrides crate_);
|
||||
dependencies_ = dependencies;
|
||||
buildDependencies_ = buildDependencies;
|
||||
devDependencies_ = devDependencies;
|
||||
processedAttrs = [
|
||||
"src"
|
||||
"propagatedBuildInputs"
|
||||
@@ -340,6 +372,7 @@ lib.makeOverridable
|
||||
"libPath"
|
||||
"buildDependencies"
|
||||
"dependencies"
|
||||
"devDependencies"
|
||||
"features"
|
||||
"crateRenames"
|
||||
"crateName"
|
||||
@@ -432,6 +465,7 @@ lib.makeOverridable
|
||||
cargo
|
||||
jq
|
||||
]
|
||||
++ lib.optional useClippy clippy
|
||||
++ lib.optionals stdenv.hasCC [ stdenv.cc ]
|
||||
++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ]
|
||||
++ (crate.nativeBuildInputs or [ ])
|
||||
@@ -441,7 +475,10 @@ lib.makeOverridable
|
||||
++ (crate.buildInputs or [ ])
|
||||
++ buildInputs_
|
||||
++ completePropagatedBuildInputs;
|
||||
dependencies = map lib.getLib dependencies_;
|
||||
# Dev-dependencies are only linked when building tests, mirroring
|
||||
# Cargo. When buildTests is false this is a no-op, so the metadata
|
||||
# hash and store path of normal lib/bin builds are unchanged.
|
||||
dependencies = map lib.getLib (dependencies_ ++ lib.optionals buildTests_ devDependencies_);
|
||||
buildDependencies = map lib.getLib buildDependencies_;
|
||||
|
||||
completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies);
|
||||
@@ -563,6 +600,7 @@ lib.makeOverridable
|
||||
buildPhase = buildCrate {
|
||||
inherit
|
||||
crateName
|
||||
version
|
||||
dependencies
|
||||
crateFeatures
|
||||
crateRenames
|
||||
@@ -579,6 +617,7 @@ lib.makeOverridable
|
||||
buildTests
|
||||
codegenUnits
|
||||
capLints
|
||||
useClippy
|
||||
;
|
||||
};
|
||||
dontStrip = !release;
|
||||
@@ -614,6 +653,8 @@ lib.makeOverridable
|
||||
{
|
||||
rust = crate_.rust or rustc;
|
||||
cargo = crate_.cargo or cargo;
|
||||
useClippy = crate_.useClippy or false;
|
||||
clippy = crate_.clippy or clippy;
|
||||
release = crate_.release or true;
|
||||
verbose = crate_.verbose or true;
|
||||
extraRustcOpts = [ ];
|
||||
@@ -638,6 +679,7 @@ lib.makeOverridable
|
||||
postInstall = crate_.postInstall or "";
|
||||
dependencies = crate_.dependencies or [ ];
|
||||
buildDependencies = crate_.buildDependencies or [ ];
|
||||
devDependencies = crate_.devDependencies or [ ];
|
||||
crateRenames = crate_.crateRenames or { };
|
||||
buildTests = crate_.buildTests or false;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ build_lib() {
|
||||
lib_src=$1
|
||||
echo_build_heading $lib_src ${libName}
|
||||
|
||||
noisily env "${CARGO_BIN_EXE_ENV[@]}" rustc \
|
||||
noisily env "${CARGO_BIN_EXE_ENV[@]}" "${RUSTC_DRIVER:-rustc}" \
|
||||
--crate-name $CRATE_NAME \
|
||||
$lib_src \
|
||||
--out-dir target/lib \
|
||||
@@ -42,7 +42,7 @@ build_bin() {
|
||||
main_file=$2
|
||||
fi
|
||||
echo_build_heading $crate_name $main_file
|
||||
noisily env "${CARGO_BIN_EXE_ENV[@]}" rustc \
|
||||
noisily env "${CARGO_BIN_EXE_ENV[@]}" "${RUSTC_DRIVER:-rustc}" \
|
||||
--crate-name $crate_name_ \
|
||||
$main_file \
|
||||
--crate-type bin \
|
||||
|
||||
@@ -404,6 +404,27 @@ rec {
|
||||
"test something ... ok"
|
||||
];
|
||||
};
|
||||
rustLibTestsWithDevDependency =
|
||||
let
|
||||
devDep = mkHostCrate {
|
||||
crateName = "dev-dep";
|
||||
src = mkLib "src/lib.rs";
|
||||
};
|
||||
in
|
||||
{
|
||||
src = mkFile "src/lib.rs" ''
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
fn uses_dev_dep() {
|
||||
assert_eq!(dev_dep::test(), 23);
|
||||
}
|
||||
}
|
||||
'';
|
||||
devDependencies = [ devDep ];
|
||||
buildTests = true;
|
||||
expectedTestOutputs = [ "test tests::uses_dev_dep ... ok" ];
|
||||
};
|
||||
rustBinTestsCombined = {
|
||||
src = symlinkJoin {
|
||||
name = "rust-bin-tests-combined";
|
||||
@@ -1008,6 +1029,66 @@ rec {
|
||||
];
|
||||
};
|
||||
|
||||
crateWasm32TargetEnv = assertOutputs {
|
||||
name = "gnu64-crate-target-env";
|
||||
mkCrate = mkCrate pkgsCross.wasm32-unknown-none.buildRustCrate;
|
||||
crateArgs = {
|
||||
crateName = "wasm32-crate-target-env";
|
||||
crateBin = [ { name = "wasm32-crate-target-env"; } ];
|
||||
src = symlinkJoin {
|
||||
name = "wasm32-crate-target-env-sources";
|
||||
paths = [
|
||||
(mkFile "build.rs" ''
|
||||
fn main() {
|
||||
assert_eq!(std::env::var("CARGO_CFG_TARGET_ENV"), Ok("".to_string()));
|
||||
}
|
||||
'')
|
||||
(mkFile "src/main.rs" ''
|
||||
use std::env;
|
||||
#[cfg(target_env = "")]
|
||||
fn main() {
|
||||
let name: String = env::args().nth(0).unwrap();
|
||||
println!("executed {}", name);
|
||||
}
|
||||
'')
|
||||
];
|
||||
};
|
||||
};
|
||||
expectedFiles = [
|
||||
"./bin/wasm32-crate-target-env.wasm"
|
||||
];
|
||||
};
|
||||
|
||||
crateGnu64TargetEnv = assertOutputs {
|
||||
name = "gnu64-crate-target-env";
|
||||
mkCrate = mkCrate pkgsCross.gnu64.buildRustCrate;
|
||||
crateArgs = {
|
||||
crateName = "gnu64-crate-target-env";
|
||||
crateBin = [ { name = "gnu64-crate-target-env"; } ];
|
||||
src = symlinkJoin {
|
||||
name = "gnu64-crate-target-env-sources";
|
||||
paths = [
|
||||
(mkFile "build.rs" ''
|
||||
fn main() {
|
||||
assert_eq!(std::env::var("CARGO_CFG_TARGET_ENV"), Ok("gnu".to_string()));
|
||||
}
|
||||
'')
|
||||
(mkFile "src/main.rs" ''
|
||||
use std::env;
|
||||
#[cfg(target_env = "gnu")]
|
||||
fn main() {
|
||||
let name: String = env::args().nth(0).unwrap();
|
||||
println!("executed {}", name);
|
||||
}
|
||||
'')
|
||||
];
|
||||
};
|
||||
};
|
||||
expectedFiles = [
|
||||
"./bin/gnu64-crate-target-env"
|
||||
];
|
||||
};
|
||||
|
||||
brotliTest =
|
||||
let
|
||||
pkg = brotliCrates.brotli_2_5_0 { };
|
||||
@@ -1068,6 +1149,75 @@ rec {
|
||||
touch $out
|
||||
'';
|
||||
|
||||
# `useClippy = true` plus a denied clippy lint should fail the build,
|
||||
# proving clippy-driver (not plain rustc) compiled the crate. The
|
||||
# `clippy::` prefix in the diagnostic is the fingerprint: rustc has no
|
||||
# such lint group.
|
||||
useClippyDenyFails =
|
||||
let
|
||||
crate = mkHostCrate {
|
||||
crateName = "useClippyDenyFails";
|
||||
useClippy = true;
|
||||
lints.clippy.eq_op = "deny";
|
||||
src = mkFile "src/lib.rs" ''
|
||||
pub fn check() -> bool {
|
||||
1 == 1
|
||||
}
|
||||
'';
|
||||
};
|
||||
failed = testers.testBuildFailure crate;
|
||||
in
|
||||
runCommand "assert-useClippyDenyFails" { inherit failed; } ''
|
||||
grep -q 'clippy::eq.op' "$failed/testBuildFailure.log"
|
||||
grep -q 'equal expressions' "$failed/testBuildFailure.log"
|
||||
touch $out
|
||||
'';
|
||||
|
||||
# `useClippy = true` with the default `capLints` (which resolves to
|
||||
# `"allow"` when `lints` is empty) must still build: the cap silences
|
||||
# clippy lints just like rustc lints. Same source as the failing test
|
||||
# above — only the `lints` table differs.
|
||||
useClippyDefaultCapAllows = mkHostCrate {
|
||||
crateName = "useClippyDefaultCapAllows";
|
||||
useClippy = true;
|
||||
src = mkFile "src/lib.rs" ''
|
||||
pub fn check() -> bool {
|
||||
1 == 1
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
# A library compiled by clippy-driver must produce an `.rlib` that a
|
||||
# plain-rustc dependent can link against and run. This is the property
|
||||
# that makes `useClippy` safe to flip per-crate.
|
||||
useClippyRlibLinkCompat =
|
||||
let
|
||||
libCrate = mkHostCrate {
|
||||
crateName = "clippylib";
|
||||
useClippy = true;
|
||||
src = mkFile "src/lib.rs" ''
|
||||
pub fn test() -> i32 {
|
||||
23
|
||||
}
|
||||
'';
|
||||
};
|
||||
binCrate = mkHostCrate {
|
||||
crateName = "clippybin";
|
||||
dependencies = [ libCrate ];
|
||||
src = mkBinExtern "src/main.rs" "clippylib";
|
||||
};
|
||||
in
|
||||
runCommand "run-useClippyRlibLinkCompat" { nativeBuildInputs = [ binCrate ]; } (
|
||||
if stdenv.hostPlatform == stdenv.buildPlatform then
|
||||
''
|
||||
${binCrate}/bin/clippybin && touch $out
|
||||
''
|
||||
else
|
||||
''
|
||||
test -x '${binCrate}/bin/clippybin' && touch $out
|
||||
''
|
||||
);
|
||||
|
||||
rcgenTest =
|
||||
let
|
||||
pkg = rcgenCrates.rootCrate.build;
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "angle-grinder";
|
||||
version = "0.19.4";
|
||||
version = "0.19.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcoh";
|
||||
repo = "angle-grinder";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c=";
|
||||
sha256 = "sha256-CkDDX9U3e57fbKA9hwdy1AZ/ZDNpIFe6uvemmc6DcKA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-B7JFwFzE8ZvbTjCUZ6IEtjavPGkx3Nb9FMSPbNFqiuU=";
|
||||
cargoHash = "sha256-w1+wdvl4wmxOynsg7SmL5lSASd4Cl4OkMJoIBUmuKGY=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
|
||||
|
||||
@@ -39,13 +39,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "art";
|
||||
version = "1.26.5";
|
||||
version = "1.26.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artpixls";
|
||||
repo = "ART";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kNe+1jwMJ8RVm4dBUg6/ik3TJRZVuGbZt5Wtx8qVbvk=";
|
||||
hash = "sha256-m5KQUY7loLKH7X2cDw5n7biH1GJTVONTbguILdjNWrI=";
|
||||
};
|
||||
|
||||
# Fix the build with CMake 4.
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
autoreconfHook,
|
||||
fetchurl,
|
||||
dbus-glib,
|
||||
gtk2,
|
||||
pkg-config,
|
||||
wordnet,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "artha";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/artha/${finalAttrs.version}/artha-${finalAttrs.version}.tar.bz2";
|
||||
sha256 = "034r7vfk5y7705k068cdlq52ikp6ip10w6047a5zjdakbn55c3as";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
dbus-glib
|
||||
gtk2
|
||||
wordnet
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Offline thesaurus based on WordNet";
|
||||
homepage = "https://artha.sourceforge.net";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "artha";
|
||||
};
|
||||
})
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "asciinema";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciinema";
|
||||
repo = "asciinema";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-03olFWB/6O7V/B9gz6QACMxugrIx560fpp81IGVWv58=";
|
||||
hash = "sha256-MZMc1YypMP2JEbpDmsGj+Sm+y3mfr50DnoCN04rY9xY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-B6s3uUPGL8m076dl3P26j+frHWLi+wzED41BQ/rQAM8=";
|
||||
cargoHash = "sha256-Qzxlp/c5VowlZplu7iMVh0a3+raQXsYmO8OEC45dSl4=";
|
||||
|
||||
env.ASCIINEMA_GEN_DIR = "gendir";
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
gtk2,
|
||||
gtk3,
|
||||
libcddb,
|
||||
intltool,
|
||||
pkg-config,
|
||||
@@ -36,20 +37,24 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "3.0.2";
|
||||
pname = "asunder";
|
||||
src = fetchurl {
|
||||
url = "http://littlesvr.ca/asunder/releases/asunder-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-txNB10bM9WqnexeFxq+BqmQdCErD00t4vrU3YYhItks=";
|
||||
version = "3.1.0-unstable-2025-03-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rizalmart";
|
||||
repo = "asunder-gtk3";
|
||||
rev = "e3676704f7c7912e61ad7d78fe19015c102a27e1";
|
||||
hash = "sha256-bJVrSbjOUkmrF76e6euM5VPwbvvRrA5ZLPzZGjEep98=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
intltool
|
||||
makeWrapper
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
gtk2
|
||||
gtk3
|
||||
libcddb
|
||||
];
|
||||
|
||||
@@ -61,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "Graphical Audio CD ripper and encoder for Linux";
|
||||
mainProgram = "asunder";
|
||||
homepage = "http://littlesvr.ca/asunder/index.php";
|
||||
homepage = "https://github.com/rizalmart/asunder-gtk3";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ mudri ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "azurehound";
|
||||
version = "2.12.1";
|
||||
version = "2.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpecterOps";
|
||||
repo = "AzureHound";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-qJ7mzG1G9ck4xM9dB9rcpojGCAbUoZ8bKZwuZV5bhjA=";
|
||||
hash = "sha256-w8PmSt+QvU0HELkgdYLfIUgK3R5vCYzlPbMyrHztiPw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WF46wXaNU/Em0KpF6hkuuJ+7K1IKLGqpNS/HxpxX5WY=";
|
||||
|
||||
@@ -107,7 +107,7 @@ let
|
||||
homepage = "https://BackgroundRemoverAI.com";
|
||||
downloadPage = "https://github.com/nadermx/backgroundremover/releases";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.lucasew ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -119,7 +119,6 @@ buildNpmPackage {
|
||||
maintainers = with lib.maintainers; [
|
||||
gepbird
|
||||
kashw2
|
||||
lucasew
|
||||
mattpolzin
|
||||
water-sucks
|
||||
];
|
||||
|
||||
@@ -196,7 +196,6 @@ buildNpmPackage rec {
|
||||
maintainers = with lib.maintainers; [
|
||||
gepbird
|
||||
kashw2
|
||||
lucasew
|
||||
mattpolzin
|
||||
redyf
|
||||
water-sucks
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "c2patool";
|
||||
version = "0.26.62";
|
||||
version = "0.26.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "contentauth";
|
||||
repo = "c2pa-rs";
|
||||
tag = "c2patool-v${finalAttrs.version}";
|
||||
hash = "sha256-OcZQ8z/hQh5oqXf6JTZ7qN4OSQAyewaBKHwID38aWmc=";
|
||||
hash = "sha256-18gGrIleSpSwHohX+Qn6Zj6kPIzNri53tHIBlED5/LY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-x5QH1iysCdez5V4OQE2xqVXFBpxDygqCrs3MiXNTfTw=";
|
||||
cargoHash = "sha256-YZKQmekJ0RxtyrLkCeiAry+m7j2jhxm0lsQ+Xi29nEw=";
|
||||
|
||||
# use the non-vendored openssl
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cameradar";
|
||||
version = "6.1.1";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ullaakut";
|
||||
repo = "cameradar";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wJiHCJHG8S+iGFd9jFyavyxAtJ5FGlbvfFcGQfwpi9Y=";
|
||||
hash = "sha256-NgzTZpRrFLoFNn3xiR5ysORTO9Yj2kn2aPSwSa441t0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1jqGRwgbfcOq6fE3h9RJSeLRlFkd4w4L/2RwscA0zZ0=";
|
||||
vendorHash = "sha256-NljQGN/B/+gdMGmE1pI2rJPfZNY3xBHYLf+xPxzuh3w=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
Generated
+4
-4
@@ -6,19 +6,19 @@ GEM
|
||||
mime-types (3.7.0)
|
||||
logger
|
||||
mime-types-data (~> 3.2025, >= 3.2025.0507)
|
||||
mime-types-data (3.2025.0924)
|
||||
mime-types-data (3.2026.0414)
|
||||
mini_exiftool (2.14.0)
|
||||
ostruct (>= 0.6.0)
|
||||
pstore (>= 0.1.3)
|
||||
mini_portile2 (2.8.9)
|
||||
nokogiri (1.18.10)
|
||||
nokogiri (1.19.3)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
ostruct (0.6.3)
|
||||
pstore (0.2.0)
|
||||
pstore (0.2.1)
|
||||
racc (1.8.1)
|
||||
rexml (3.4.4)
|
||||
rubyzip (3.2.2)
|
||||
rubyzip (3.4.0)
|
||||
spider (0.7.0)
|
||||
|
||||
PLATFORMS
|
||||
|
||||
Generated
+18
-8
@@ -38,10 +38,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
|
||||
sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2025.0924";
|
||||
version = "3.2026.0414";
|
||||
};
|
||||
mini_exiftool = {
|
||||
dependencies = [
|
||||
@@ -76,10 +76,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
|
||||
sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.10";
|
||||
version = "1.19.3";
|
||||
};
|
||||
ostruct = {
|
||||
groups = [ "default" ];
|
||||
@@ -96,10 +96,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1a3lrq8k62n8bazhxgdmjykni9wv0mcjks5vi1g274i3wblcgrfn";
|
||||
sha256 = "06icf1n6z7snygcq51zdm1zdz20cpkd4qw76s6b9wmv65h7lv403";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
};
|
||||
racc = {
|
||||
groups = [ "default" ];
|
||||
@@ -126,10 +126,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0";
|
||||
sha256 = "0yzmmwya4zis5f7zkhhp8p92m1xh2sg6rlbnlhsvc0m3xg4rpqvd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.2";
|
||||
version = "3.4.0";
|
||||
};
|
||||
spider = {
|
||||
groups = [ "default" ];
|
||||
@@ -141,4 +141,14 @@
|
||||
};
|
||||
version = "0.7.0";
|
||||
};
|
||||
getoptlong = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.1";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
bundlerEnv,
|
||||
bundlerUpdateScript,
|
||||
@@ -14,12 +14,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cewl";
|
||||
version = "5.5.2";
|
||||
version = "6.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "digininja";
|
||||
repo = "CeWL";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc=";
|
||||
hash = "sha256-wMTGAB4P925z2UYNvlN4kSu1SLzKyB4a/Cjq4BofJ9w=";
|
||||
};
|
||||
|
||||
buildInputs = [ rubyEnv.wrappedRuby ];
|
||||
@@ -34,8 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Custom wordlist generator";
|
||||
mainProgram = "cewl";
|
||||
homepage = "https://digi.ninja/projects/cewl.php/";
|
||||
changelog = "https://github.com/digininja/CeWL/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
mainProgram = "cewl";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -90,7 +90,7 @@ buildNpmPackage rec {
|
||||
homepage = "https://github.com/BruceMacD/chatd";
|
||||
changelog = "https://github.com/BruceMacD/chatd/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.lucasew ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "chatd";
|
||||
platforms = electron.meta.platforms;
|
||||
};
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "check-jsonschema";
|
||||
version = "0.37.2";
|
||||
version = "0.37.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-jsonschema";
|
||||
repo = "check-jsonschema";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Uflc92J8oSl633FD+DDIDGXvrFCfwpyxTqoNHLcHEpE=";
|
||||
hash = "sha256-9s0AitPH9PAuQ7FH009ppBbH5Z2aNjhinAungoXX3OQ=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
libx11,
|
||||
gtk2,
|
||||
fig2dev,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chemtool";
|
||||
version = "1.6.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
buildInputs = [
|
||||
libx11
|
||||
gtk2
|
||||
fig2dev
|
||||
];
|
||||
|
||||
# Workaround build on -fno-common toolchains like upstream gcc-10.
|
||||
# Otherwise built fails as:
|
||||
# ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of
|
||||
# `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/";
|
||||
description = "Draw chemical structures";
|
||||
longDescription = ''
|
||||
Chemtool is a program for drawing organic molecules. It runs under the X
|
||||
Window System using the GTK widget set.
|
||||
|
||||
Most operations in chemtool can be accomplished using the mouse - the
|
||||
first (usually the left) button is used to select or place things, the
|
||||
middle button modifies properties (e.g. reverses the direction of a bond),
|
||||
and the right button is used to delete objects.
|
||||
|
||||
The program offers essentially unlimited undo/redo, two text fonts plus
|
||||
symbols, seven colors, drawing at several zoom scales, and square and
|
||||
hexagonal backdrop grids for easier alignment.
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rebar3,
|
||||
erlang,
|
||||
beamPackages,
|
||||
opencl-headers,
|
||||
ocl-icd,
|
||||
}:
|
||||
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
erlang
|
||||
beamPackages.erlang
|
||||
rebar3
|
||||
opencl-headers
|
||||
ocl-icd
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import ./generic.nix {
|
||||
version = "26.3.12.3-lts";
|
||||
rev = "d23c7536b980c34b39c850b08ef23c509f06aaaa";
|
||||
hash = "sha256-xM+dqOSNa4rMaCGgz86UCdF3szwXgYr5vH1Ov7y4X08=";
|
||||
version = "26.3.13.31-lts";
|
||||
rev = "27ae4e9fe0e3f97f012b3be293caf42a60d08747";
|
||||
hash = "sha256-NTts2SiaQ+B+iPCAPLF4fLQmZ9/0Gp2FFu/E0aXfCMc=";
|
||||
lts = true;
|
||||
}
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cnspec";
|
||||
version = "13.21.1";
|
||||
version = "13.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-uc2W1OWvnzXqEpDtkXd2b8ieCHxOIQ0QAvayDyah7pc=";
|
||||
hash = "sha256-GyaK9aupJ8ki7UlKnkKEtv1jZnbZbzSaFRDDIBBXsYI=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-RGuV0gZgCxmIVb2neb/Yn/Tvo4hZDAK5vUVEl8FxYBI=";
|
||||
vendorHash = "sha256-jeJmizGXrEwtbDzoQZyNfu+GtvAkPHt7qIQthai/i1Y=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cocoon";
|
||||
version = "0.9.0";
|
||||
version = "0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "haileyok";
|
||||
repo = "cocoon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MmDUTFcXonAwHzeeIBxTk4KOVuCNHmaBFHMqHkf4+Yc=";
|
||||
hash = "sha256-SvLXtn4Nr8zcvvjGarNLYeKqyniI6eg50cnqV6Q+3/s=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
|
||||
"-X main.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-bux3OfHT8f1FVpBAZUP23vo8M6h8nPTJbi/GTUzhdc4=";
|
||||
vendorHash = "sha256-Vkf5XyJA/Vdufa1OpCzgIGSQa5pVsFCTfaAVI7l947E=";
|
||||
|
||||
passthru = {
|
||||
tests = lib.optionalAttrs stdenvNoCC.hostPlatform.isLinux { inherit (nixosTests) cocoon; };
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"codebuff": "^1.0.680"
|
||||
"codebuff": "^1.0.681"
|
||||
}
|
||||
},
|
||||
"node_modules/@isaacs/fs-minipass": {
|
||||
@@ -30,9 +30,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/codebuff": {
|
||||
"version": "1.0.680",
|
||||
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.680.tgz",
|
||||
"integrity": "sha512-+HrrSchE7wsAQNcq5yJfL4YygOf+ng3T9S3yF+FZFVfnT29KVXSoar5mdRmzsVFNGjHZKc9I+kqt0dEO01G9Ow==",
|
||||
"version": "1.0.681",
|
||||
"resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.681.tgz",
|
||||
"integrity": "sha512-xRj1kKCvXA522IiomLVV0EyORdsjjS4T/shLVeoTrdM9MNZRqrCcm/b9bsiTIzwlYz4oQFgBfmWeHapKKPjh7A==",
|
||||
"cpu": [
|
||||
"x64",
|
||||
"arm64"
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "codebuff";
|
||||
version = "1.0.680";
|
||||
version = "1.0.681";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/codebuff/-/codebuff-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-glsZk5q+Qd2NbMk/jIXklCHf9MSSqkMN67d7k1fuzlk=";
|
||||
hash = "sha256-tkQ8MOkQk4vaS9PFqlFBV6unEgysXcwHrKGgxfe60fM=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
npmDepsHash = "sha256-+HZN4oal+Bn7uKfWrWd/eDRvuAPvRKlGO4ThFamNZCI=";
|
||||
npmDepsHash = "sha256-KB0QCfpGP32O5dU+/2dOEmX87iclJrZudIkTNp9ZxSw=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -16,7 +16,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ctx7";
|
||||
version = "0.4.4";
|
||||
version = "0.5.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "upstash";
|
||||
repo = "context7";
|
||||
tag = "${finalAttrs.pname}@${finalAttrs.version}";
|
||||
hash = "sha256-3Hk3YEXIR6SAEtCeDeaU1fU/CyvxuObZSNbgqrzeJ/o=";
|
||||
hash = "sha256-CAOFt/oKjeFOIesJCTQsAq0miXssEJKNMLcd6Eb9HZs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
inherit pnpm;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-ugUN1U0OR8dPTq4PADJaq6ElngSlw6PlmYDUFoW+2F4=";
|
||||
hash = "sha256-C+4QgpSJa5sDZr/0ltxHeaPX7IJTgG957dK/iA5sFXs=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "drawterm";
|
||||
version = "0-unstable-2026-05-26";
|
||||
version = "0-unstable-2026-06-06";
|
||||
|
||||
src = fetchFrom9Front {
|
||||
owner = "plan9front";
|
||||
repo = "drawterm";
|
||||
rev = "0385fd3dc0343c4c882096c60558b01f61260736";
|
||||
hash = "sha256-OiGliIVMUpFaNkMn15qaYdBsU429Q0RUw68lqTOu880=";
|
||||
rev = "3fdee4c284c98c84a85b2c9101aab7bbebf3dfbf";
|
||||
hash = "sha256-GUc69wONBOtVKjIJu+zgsUdUADWXUJlh3Fl7W0Ub99k=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dua";
|
||||
version = "2.34.0";
|
||||
version = "2.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Byron";
|
||||
repo = "dua-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F09Ne+2Ospw44L97nwHXp/ELM9B3G2Mt0Crau//zV/c=";
|
||||
hash = "sha256-dlm8jp7Bh0DgUN4ztalE6uPSzeJy+JDfai39xZKiptw=";
|
||||
# Remove unicode file names which leads to different checksums on HFS+
|
||||
# vs. other filesystems because of unicode normalisation.
|
||||
postFetch = ''
|
||||
@@ -22,12 +22,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-g92G/4mfHH7zW14eoodL7j179Iah5iAH78zlmcxM/AM=";
|
||||
cargoHash = "sha256-620Emfkuzyc8/LVr8codB1/IAemxDBOnhS/rL6gR8R8=";
|
||||
|
||||
checkFlags = [
|
||||
# Skip interactive tests
|
||||
"--skip=interactive::app::tests::journeys_readonly::quit_instantly_when_nothing_marked"
|
||||
"--skip=interactive::app::tests::journeys_readonly::quit_requires_two_presses_when_items_marked"
|
||||
"--skip=interactive::app::tests::journeys_readonly::once_allows_replayed_quit_to_exit stdout"
|
||||
"--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only"
|
||||
"--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion"
|
||||
"--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels"
|
||||
|
||||
@@ -6,20 +6,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "ec2-metadata-mock";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-ec2-metadata-mock";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y=";
|
||||
hash = "sha256-gqzROHfwhd3i1GWSp58dBKjS1EU7Xu0Fqbzv2PoLaF8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jRJX4hvfRuhR5TlZe7LsXaOlUCwmQGem2QKlX3vuk8c=";
|
||||
vendorHash = "sha256-Px4vhFW1mhXbBuPbxEpukmeLZewF7zooOXKxL8sEFLU=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{cmd,ec2-metadata-mock}
|
||||
'';
|
||||
subPackages = [ "cmd/ec2-metadata-mock" ];
|
||||
|
||||
meta = {
|
||||
description = "Amazon EC2 Metadata Mock";
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
homepage = "https://github.com/NVIDIA/enroot";
|
||||
changelog = "https://github.com/NVIDIA/enroot/releases/tag/v${finalAttrs.version}";
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.lucasew ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "enroot";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
erlang,
|
||||
beamPackages,
|
||||
}:
|
||||
let
|
||||
# erlang-language-platform supports multiple OTP versions.
|
||||
@@ -15,7 +15,7 @@ let
|
||||
"elp-macos-${arch}-apple-darwin"
|
||||
else
|
||||
"elp-linux-${arch}-unknown-linux-gnu";
|
||||
otp_version = "otp-${lib.versions.major erlang.version}";
|
||||
otp_version = "otp-${lib.versions.major beamPackages.erlang.version}";
|
||||
release_major = "${platform}-${otp_version}";
|
||||
|
||||
hashes = builtins.fromJSON (builtins.readFile ./hashes.json);
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
netlify-cli,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
pname = "esbuild";
|
||||
version = "0.14.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netlify";
|
||||
repo = "esbuild";
|
||||
rev = "5faa7ad54c99a953d05c06819298d2b6f8c82d80";
|
||||
sha256 = "pYiwGjgFMclPYTW0Qml7Pr/knT1gywUAGANra5aojYM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit netlify-cli;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Fork of esbuild maintained by netlify";
|
||||
homepage = "https://github.com/netlify/esbuild";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ roberth ];
|
||||
mainProgram = "esbuild";
|
||||
};
|
||||
}
|
||||
@@ -130,7 +130,7 @@ index 9d986d2..d63902a 100644
|
||||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c
|
||||
index 60ff97f..8535dec 100644
|
||||
index c24a37a..e5cf57e 100644
|
||||
--- a/src/addressbook/libedata-book/e-book-meta-backend.c
|
||||
+++ b/src/addressbook/libedata-book/e-book-meta-backend.c
|
||||
@@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void)
|
||||
@@ -338,7 +338,7 @@ index 94f0769..8de758b 100644
|
||||
g_clear_object (&settings);
|
||||
|
||||
diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c
|
||||
index 2c0b6ef..b354332 100644
|
||||
index 3de034a..b6732ba 100644
|
||||
--- a/src/camel/camel-utils.c
|
||||
+++ b/src/camel/camel-utils.c
|
||||
@@ -363,7 +363,19 @@ void
|
||||
@@ -363,10 +363,10 @@ index 2c0b6ef..b354332 100644
|
||||
G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
|
||||
G_UNLOCK (mi_user_headers);
|
||||
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
index e605049..9961fea 100644
|
||||
index e3f2391..374c72d 100644
|
||||
--- a/src/camel/providers/imapx/camel-imapx-server.c
|
||||
+++ b/src/camel/providers/imapx/camel-imapx-server.c
|
||||
@@ -5666,7 +5666,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
|
||||
@@ -5682,7 +5682,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
|
||||
if (do_old_flags_update) {
|
||||
GSettings *eds_settings;
|
||||
|
||||
@@ -507,10 +507,10 @@ index 3738359..f9ce2d9 100644
|
||||
g_object_unref (settings);
|
||||
|
||||
diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c
|
||||
index c999d4d..e9cf7c5 100644
|
||||
index 9f56da2..f82921a 100644
|
||||
--- a/src/libedataserver/e-oauth2-service.c
|
||||
+++ b/src/libedataserver/e-oauth2-service.c
|
||||
@@ -93,7 +93,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
|
||||
@@ -95,7 +95,18 @@ eos_default_guess_can_process (EOAuth2Service *service,
|
||||
name_len = strlen (name);
|
||||
hostname_len = strlen (hostname);
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.60.1";
|
||||
version = "3.60.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-M/ktO4gi66BMMTeWwHeMu2Who4Ry6FftxfmIVMyps0w=";
|
||||
hash = "sha256-IITb2sOWNxs2XVBMH/RYZrqNyi8SUuXaHT2cM6vcEoY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -92,7 +92,6 @@ flutter338.buildFlutterApplication rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
heyimnova
|
||||
lucasew
|
||||
];
|
||||
mainProgram = "flet";
|
||||
};
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
flex,
|
||||
bison,
|
||||
fig2dev,
|
||||
imagemagick,
|
||||
netpbm,
|
||||
gtk2,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "fped";
|
||||
version = "unstable-2017-05-11";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://projects.qi-hardware.com/fped.git";
|
||||
rev = "fa98e58157b6f68396d302c32421e882ac87f45b";
|
||||
sha256 = "0xv364a00zwxhd9kg1z9sch5y0cxnrhk546asspyb9bh58sdzfy7";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config'
|
||||
'';
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: postscript.o:postscript.h:29: multiple definition of
|
||||
# `postscript_params'; fped.o:postscript.h:29: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
# This uses '/bin/bash', '/usr/local' and 'lex' by default
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"LEX=flex"
|
||||
"RGBDEF=${netpbm.out}/share/netpbm/misc/rgb.txt"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
flex
|
||||
bison
|
||||
pkg-config
|
||||
imagemagick
|
||||
fig2dev
|
||||
netpbm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
flex
|
||||
gtk2
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Editor that allows the interactive creation of footprints electronic components";
|
||||
mainProgram = "fped";
|
||||
homepage = "http://projects.qi-hardware.com/index.php/p/fped/";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
buildNpmPackage,
|
||||
frp,
|
||||
}:
|
||||
let
|
||||
builder =
|
||||
name:
|
||||
buildNpmPackage {
|
||||
pname = "${name}-dashboard";
|
||||
inherit (frp) version src;
|
||||
|
||||
sourceRoot = "source/web";
|
||||
|
||||
preBuild = ''
|
||||
pushd ${name}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cp -r dist $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-XuqQPfywzK81anAD1pAl1TMQqb1+hH2QxLwuTn7zCPU=";
|
||||
|
||||
meta = frp.meta // {
|
||||
description = "Dashboard for frp";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
frpc = builder "frpc";
|
||||
frps = builder "frps";
|
||||
}
|
||||
@@ -1,22 +1,24 @@
|
||||
{
|
||||
buildGoModule,
|
||||
callPackage,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
let
|
||||
web = callPackage ./dashboard.nix { };
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "frp";
|
||||
version = "0.66.0";
|
||||
|
||||
version = "0.69.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatedier";
|
||||
repo = "frp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GFvXdhX7kA43kppWWdL7KhummUCqpa1cQ7V2d9ISGfo=";
|
||||
hash = "sha256-3tOOgnzZZ05En5NMLbp4UFNazX950Jbosvszmjf947c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-m5ECF0cgp2LfsTKey02MHz5TfqfzOCT5cU5trUfrOjY=";
|
||||
vendorHash = "sha256-JrkIztnmhEYAogr4pDWrPu9/j+C0VLpEyNbh2UK5UcY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@@ -25,8 +27,14 @@ buildGoModule (finalAttrs: {
|
||||
"cmd/frps"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
frp = nixosTests.frp;
|
||||
preBuild = ''
|
||||
cp -r ${web.frpc} web/frpc/dist
|
||||
cp -r ${web.frps} web/frps/dist
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.frp = nixosTests.frp;
|
||||
inherit web;
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -39,5 +47,6 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://github.com/fatedier/frp";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ epireyn ];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -55,7 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
dawidsowa
|
||||
FlameFlag
|
||||
lucasew
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "gauge-plugin-js";
|
||||
version = "5.0.5";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getgauge";
|
||||
repo = "gauge-js";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qWnBx6bvut/bSvFC8WPAetyAsF16Wz99Pq0tGg+YpZw=";
|
||||
hash = "sha256-/hfsBoZ37A4W3uejmOnl6nZv0oCedkQFMNidqWb9DN8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-HD1JsAewyzoUPKFwtpGGwjHWmYUpLSN3Spb5FW+3d10=";
|
||||
npmDepsHash = "sha256-2kZDpRUegHqZOEc49h3+RRAbKroW7v63bXjzDAu/bCc=";
|
||||
npmBuildScript = "package";
|
||||
|
||||
buildInputs = [ nodejs ];
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
diff --git "a/Makefile.in" "b/Makefile.in"
|
||||
index b482958..472b8da 100644
|
||||
--- "a/Makefile.in"
|
||||
+++ "b/Makefile.in"
|
||||
@@ -27,9 +27,7 @@ MKINSTALLDIRS = ./mkinstalldirs
|
||||
CC = @CC@
|
||||
CFLAGS = @XX_CFLAGS@ @CFLAGS@
|
||||
|
||||
-DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \
|
||||
- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
|
||||
- -DGTK_DISABLE_DEPRECATED
|
||||
+DEFINES = @DEFINES@
|
||||
|
||||
SRCS = bdf.c \
|
||||
bdfcons.c \
|
||||
@@ -1,49 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
freetype,
|
||||
gtk2-x11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.6";
|
||||
pname = "gbdfed";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-${finalAttrs.version}.tar.bz2";
|
||||
sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
freetype
|
||||
gtk2-x11
|
||||
];
|
||||
|
||||
patches = [ ./Makefile.patch ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
postPatch = ''
|
||||
# gcc15
|
||||
substituteInPlace bdfgrab.c --replace-fail 'int (*old_error_handler)();' 'XErrorHandler old_error_handler;'
|
||||
substituteInPlace hbf.c --replace-fail 'typedef int bool;' '// typedef int bool;'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Bitmap Font Editor";
|
||||
longDescription = ''
|
||||
gbdfed lets you interactively create new bitmap font files or modify existing ones.
|
||||
It allows editing multiple fonts and multiple glyphs,
|
||||
it allows cut and paste operations between fonts and glyphs and editing font properties.
|
||||
The editor works natively with BDF fonts.
|
||||
'';
|
||||
homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "gbdfed";
|
||||
};
|
||||
})
|
||||
@@ -44,7 +44,7 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdm";
|
||||
version = "50.0";
|
||||
version = "50.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-ZG9T1o8tLRRxRv+uuFBH3ti4E9yxwQTY8Ow2ymCetb8=";
|
||||
hash = "sha256-dwFZNzUSGSQQ9BK10MRnjsFXPxrks5yB/nWGH+iJAXQ=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
||||
@@ -5,24 +5,22 @@
|
||||
meson,
|
||||
ninja,
|
||||
gettext,
|
||||
gtk2,
|
||||
gtk3,
|
||||
ncurses,
|
||||
openssl,
|
||||
pkg-config,
|
||||
readline,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gftp";
|
||||
version = "2.9.1b-unstable-2025-05-12";
|
||||
version = "2.9.1b-unstable-2026-03-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "masneyb";
|
||||
repo = "gftp";
|
||||
rev = "48114635f7b7b1f9a5eda985021ea53b10a7a030";
|
||||
hash = "sha256-unTsd2xX8Y71ItE3gYHoxUPgViK/xhZdx0IQYvDPaEc=";
|
||||
rev = "f64d27b116be1fc444e0f50ec375847b72df65f7";
|
||||
hash = "sha256-2CVRIrSOBi1AUoEKiyYhMmGcIIBnwMQ3EQsgBIvlXEs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk2
|
||||
gtk3
|
||||
ncurses
|
||||
openssl
|
||||
readline
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
pkg-config,
|
||||
erlang,
|
||||
beamPackages,
|
||||
nodejs,
|
||||
bun,
|
||||
deno,
|
||||
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
erlang
|
||||
beamPackages.erlang
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -77,11 +77,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-control-center";
|
||||
version = "50.1";
|
||||
version = "50.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-64MkkdCI5PdCbopZKxBCikWlc2wL/+IQXFHExow6Ud0=";
|
||||
hash = "sha256-tWvriHuUMumAp1e5juydMdiWlev/tHkbPDvUeWI6kmE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-session";
|
||||
# Also bump ./ctl.nix when bumping major version.
|
||||
version = "50.0";
|
||||
version = "50.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-vncIzZ0mDhrBg4FTE9u2ILGHbq1bo5zn6i5tx629ckY=";
|
||||
hash = "sha256-Yom2r6RNPkyZnOV2H/iywQujCfVflCXysT+YIIyB9vs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -73,7 +73,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-shell";
|
||||
version = "50.1";
|
||||
version = "50.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-G0d2AXLBTz9O3Rya/zZfTeRVg1F78PgN9NOsvU5MspQ=";
|
||||
hash = "sha256-UyFUIOUO/dTQYRultZ4Qy0yJ+j9R4q3f2Vyt4GGgmik=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -48,11 +48,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-software";
|
||||
version = "50.1";
|
||||
version = "50.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-aWfu/sadUdNNIAWFye3+JPFRgD5J7ZKEo9dO2w5TQKg=";
|
||||
hash = "sha256-ysroXVfkbRj0p8j+M0vzXIwY51uKZvrVbgzioA4c/j8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-text-editor";
|
||||
version = "50.0";
|
||||
version = "50.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-ncKZ2k2qCFQjtdSNtZ8AIa1V50FDpcuKsuX/4Xln9Fs=";
|
||||
hash = "sha256-9oA2sJ03j6qIO/6Tbkecb/NwJ8L/7RAdr5Et9wxR0OY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-user-docs";
|
||||
version = "50.0";
|
||||
version = "50.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major finalAttrs.version}/gnome-user-docs-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-6OIzJBhMfphcUE8F9tnGNCDJqdH2Tv3l2iqBEjYHL3g=";
|
||||
hash = "sha256-g0hj2RYYmuE/clYr6B04FyMuE20NN+w3aBERH/oVlUI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -26,11 +26,11 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-user-share";
|
||||
version = "48.2";
|
||||
version = "48.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Ayho1Ar4UIC6Thi6XatGwOZj7H5DiUnwgsgFeV9ivwY=";
|
||||
hash = "sha256-oE1IP0mz92naj/Xi0/y/++rztsa3HYLSoqYju0seDdQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gomuks-web";
|
||||
version = "26.05";
|
||||
version = "26.06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gomuks";
|
||||
repo = "gomuks";
|
||||
tag = "v0.${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.0";
|
||||
hash = "sha256-BoTD4c9ZhfyFytsxUCvTIoCoBiFbPW1T1uGWRDx+OIE=";
|
||||
hash = "sha256-Q4hu3bcB16iuqASZvlv7nDvxj8CFX66qWp6DHIUTmh4=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-WJQmei6+T98k2Dkma3rHM2c7pzvze0hT8W5UnnARLok=";
|
||||
vendorHash = "sha256-UH/T3eqFy0KrG/ouEzifJeWXXwe5cUPYG7DpIO0GsYc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
@@ -37,11 +37,20 @@ buildGoModule (finalAttrs: {
|
||||
npmRoot = "web";
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${finalAttrs.src}/web";
|
||||
hash = "sha256-H76LUuhEqjuAh7PxjIjMBW5TvsOg9Ra2T7Y39SfktqM=";
|
||||
hash = "sha256-RiOes+tmAxhA9IkyA6yWQXTjjXyZg2Z8FmPTgcmCg/g=";
|
||||
};
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# required until libheif gets bumped
|
||||
substituteInPlace ./go.mod \
|
||||
--replace-fail 'github.com/strukturag/libheif v1.23.0' 'github.com/strukturag/libheif v1.21.2'
|
||||
|
||||
substituteInPlace ./go.sum \
|
||||
--replace-fail 'github.com/strukturag/libheif v1.23.0 h1:G9Fjf/b8dvTgLIk148tUKp7Z7rgu88FC+Mc8o92U98k=' 'github.com/strukturag/libheif v1.21.2 h1:YFD3crf+d33cFVQh3aTkkVGwJFyWpfqVT4XhzHWU6mA=' \
|
||||
--replace-fail 'github.com/strukturag/libheif v1.23.0/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks=' 'github.com/strukturag/libheif v1.21.2/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks='
|
||||
|
||||
|
||||
substituteInPlace ./web/build-wasm.sh \
|
||||
--replace-fail 'go.mau.fi/gomuks/version.Tag=$(git describe --exact-match --tags 2>/dev/null)' "go.mau.fi/gomuks/version.Tag=${finalAttrs.src.tag}" \
|
||||
--replace-fail 'go.mau.fi/gomuks/version.Commit=$(git rev-parse HEAD)' "go.mau.fi/gomuks/version.Commit=unknown"
|
||||
@@ -52,6 +61,7 @@ buildGoModule (finalAttrs: {
|
||||
tags = [
|
||||
"goolm"
|
||||
"libheif"
|
||||
"sqlite_fts5"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gore";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "motemen";
|
||||
repo = "gore";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-EPySMj+mQxTJbGheAtzKvQq23DLljPR6COrmytu1x/Q=";
|
||||
sha256 = "sha256-niMYoYkDaZsv6ntUIfB0B4VheiG6rMouZGUSjHnm51w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W9hMxANySY31X2USbs4o5HssxQfK/ihJ+vCQ/PTyTDc=";
|
||||
vendorHash = "sha256-oS5LJfLFrmHEwayoD+HygfamZpmerIL1i4QtoRL4Om4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cdk,
|
||||
unzip,
|
||||
gtk2,
|
||||
glib,
|
||||
ncurses,
|
||||
pkg-config,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtdialog";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orbitalquark";
|
||||
repo = "gtdialog";
|
||||
rev = "gtdialog_${finalAttrs.version}";
|
||||
hash = "sha256-TdYwT4bC+crTSNGJIr1Nno+/h1YgxNp0BR5MQtxdrVg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
unzip
|
||||
];
|
||||
buildInputs = [
|
||||
cdk
|
||||
gtk2
|
||||
glib
|
||||
ncurses
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
description = "Cross-platform helper for creating interactive dialogs";
|
||||
mainProgram = "gtdialog";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "http://foicica.com/gtdialog";
|
||||
downloadPage = "http://foicica.com/gtdialog/download";
|
||||
};
|
||||
})
|
||||
@@ -1,23 +0,0 @@
|
||||
Patch origin: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/3
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b7a30e9..3768ae9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AM_GNU_GETTEXT([external])
|
||||
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
|
||||
|
||||
dnl Extra params
|
||||
CUPSCONFIGPATH=""
|
||||
@@ -30,8 +31,6 @@ AC_SUBST(XLIBS)
|
||||
|
||||
dnl Checks for header files
|
||||
|
||||
-dnl internationalization macros
|
||||
-AM_GNU_GETTEXT
|
||||
|
||||
|
||||
# Forte Compiler ############################################################
|
||||
@@ -1,22 +0,0 @@
|
||||
Patch source: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/1
|
||||
|
||||
--- a/libgtklp/libgtklp.c 2020-08-25 17:31:52.427298559 +0100
|
||||
+++ b/libgtklp/libgtklp.c 2020-08-25 17:36:37.728154682 +0100
|
||||
@@ -939,7 +939,7 @@
|
||||
gtk_widget_show(pixmapwid);
|
||||
|
||||
if (strlen(gerror2) == 0)
|
||||
- snprintf(tmplabel, (size_t) MAXLINE, gerror1);
|
||||
+ snprintf(tmplabel, (size_t) MAXLINE, "%s", gerror1);
|
||||
else
|
||||
snprintf(tmplabel, (size_t) MAXLINE, gerror1, gerror2);
|
||||
label = gtk_label_new(tmplabel);
|
||||
@@ -973,7 +973,7 @@
|
||||
#endif
|
||||
} else {
|
||||
if (strlen(gerror2) == 0)
|
||||
- g_warning(gerror1);
|
||||
+ g_warning("%s", gerror1);
|
||||
else
|
||||
g_warning(gerror1, gerror2);
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
autoreconfHook,
|
||||
cups,
|
||||
fetchurl,
|
||||
gettext,
|
||||
glib,
|
||||
gtk2,
|
||||
libtool,
|
||||
openssl,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gtklp";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gtklp/gtklp-${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-vgdgkEJZX6kyA047LXA4zvM5AewIY/ztu1GIrLa1O6s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
cups
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cups
|
||||
gettext
|
||||
glib
|
||||
gtk2
|
||||
libtool
|
||||
openssl
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"doc"
|
||||
"man"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
patches = [
|
||||
./000-autoconf.patch
|
||||
./001-format-parameter.patch
|
||||
];
|
||||
|
||||
# Workaround build failure on -fno-common toolchains:
|
||||
# ld: libgtklp.a(libgtklp.o):libgtklp/libgtklp.h:83: multiple definition of `progressBar';
|
||||
# file.o:libgtklp/libgtklp.h:83: first defined here
|
||||
env.NIX_CFLAGS_COMPILE = "-fcommon";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace include/defaults.h \
|
||||
--replace "netscape" "firefox" \
|
||||
--replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \
|
||||
"http://localhost:631/help/"
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
install -D -m0644 -t $doc/share/doc AUTHORS BUGS ChangeLog README USAGE
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://gtklp.sirtobi.com";
|
||||
description = "GTK-based graphical frontend for CUPS";
|
||||
license = with lib.licenses; [ gpl2Only ];
|
||||
mainProgram = "gtklp";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gupnp-av";
|
||||
version = "0.14.4";
|
||||
version = "0.14.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor finalAttrs.version}/gupnp-av-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "Idl0sydctdz1uKodmj/IDn7cpwaTX2+9AEx5eHE4+Mc=";
|
||||
sha256 = "k5GPz1r1Kf2ls9LZ/Dt3zZPfiAZJObgvJJ9Vd9jeHAI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
pango,
|
||||
cairo,
|
||||
gtk2,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
pname = "hasmail-unstable";
|
||||
version = "2019-08-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonhoo";
|
||||
repo = "hasmail";
|
||||
rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d";
|
||||
hash = "sha256-QcUk2+JmKWfmCy46i9gna5brWS4r/D6nC6uG2Yvi09w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kWGNsCekWI7ykcM4k6qukkQtyx3pnPerkb0WiFHeMIk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pango
|
||||
cairo
|
||||
gtk2
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Simple tray icon for detecting new email on IMAP servers";
|
||||
mainProgram = "hasmail";
|
||||
homepage = "https://github.com/jonhoo/hasmail";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ doronbehar ];
|
||||
};
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchPypi,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "haxor-news";
|
||||
version = "unstable-2022-04-22";
|
||||
format = "setuptools";
|
||||
|
||||
# haven't done a stable release in 3+ years, but actively developed
|
||||
src = fetchFromGitHub {
|
||||
owner = "donnemartin";
|
||||
repo = "haxor-news";
|
||||
rev = "8294e4498858f036a344b06e82f08b834c2a8270";
|
||||
hash = "sha256-0eVk5zj7F3QDFvV0Kv9aeV1oeKxr/Kza6M3pK6hyYuY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
click
|
||||
colorama
|
||||
requests
|
||||
pygments
|
||||
prompt-toolkit
|
||||
six
|
||||
];
|
||||
|
||||
# will fail without pre-seeded config files
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
unittestCheckHook
|
||||
mock
|
||||
];
|
||||
|
||||
unittestFlagsArray = [
|
||||
"-s"
|
||||
"tests"
|
||||
"-v"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/donnemartin/haxor-news";
|
||||
description = "Browse Hacker News like a haxor";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
|
||||
}
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kubernetes";
|
||||
version = "1.36.1";
|
||||
version = "1.36.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "kubernetes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-QG2zFaFtGXoWIlyp3hVBRU+OHre/6vWcvijUe1DdjIo=";
|
||||
hash = "sha256-vE+2iBoJvkRhJDAHMCrJLIJKD53YWRBN6fBUP4589OU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -4,23 +4,42 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "legitify";
|
||||
version = "1.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Legit-Labs";
|
||||
repo = "legitify";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ijW0vvamuqcN6coV5pAtmjAUjzNXxiqr2S9EwrNlrJc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QwSh7+LuwdbBtrIGk3ZK6cMW9h7wzNArPT/lVZgUGBU=";
|
||||
vendorHash = "sha256-XPfqQFGJ5yZJVFzHq4zzTXzwuxsAPJvTrZBK+gZWRKE=";
|
||||
|
||||
overrideModAttrs = oldAttrs: {
|
||||
postPatch = (oldAttrs.postPatch or "") + ''
|
||||
export GOCACHE=$TMPDIR/go-cache
|
||||
export GOPATH=$TMPDIR/go
|
||||
go mod edit -replace golang.org/x/tools=golang.org/x/tools@v0.30.0
|
||||
go mod tidy
|
||||
'';
|
||||
postBuild = (oldAttrs.postBuild or "") + ''
|
||||
cp go.mod go.sum vendor/
|
||||
'';
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
if [ -d vendor ]; then
|
||||
chmod -R u+w vendor
|
||||
cp vendor/go.mod vendor/go.sum .
|
||||
fi
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
"-s"
|
||||
"-X=github.com/Legit-Labs/legitify/internal/version.Version=${version}"
|
||||
"-X=github.com/Legit-Labs/legitify/internal/version.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
@@ -30,10 +49,9 @@ buildGoModule rec {
|
||||
meta = {
|
||||
description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets";
|
||||
homepage = "https://github.com/Legit-Labs/legitify";
|
||||
changelog = "https://github.com/Legit-Labs/legitify/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "legitify";
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchPnpmDeps,
|
||||
nodejs,
|
||||
pnpm_9,
|
||||
pnpm_11,
|
||||
pnpmConfigHook,
|
||||
callPackage,
|
||||
testers,
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lessc";
|
||||
version = "4.6.3";
|
||||
version = "4.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "less";
|
||||
repo = "less.js";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-udfqfjdIhQ6UGAeXCT5FbI+iXNqfkbQMqZnnIDUrQaQ=";
|
||||
hash = "sha256-onTaVj69LYeYnywYXSC0I3ewF4rT0LAlRI61NEroLvc=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
@@ -32,16 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src
|
||||
pnpmWorkspaces
|
||||
;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-ZdADm6WKPP48DK+ezk/jdzXVEBX161SqgYgU5fsCW2k=";
|
||||
pnpm = pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
hash = "sha256-tlms2b0aodWkI+btdmCnwSDgsURekaBdiI8IZ/iMVnI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pnpmConfigHook
|
||||
pnpm_9
|
||||
pnpm_11
|
||||
nodejs
|
||||
];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "material-symbols";
|
||||
version = "4.0.0-unstable-2026-06-05";
|
||||
version = "4.0.0-unstable-2026-06-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "material-design-icons";
|
||||
rev = "27aa4d49e4fabcb2a7f3acc86d205d33b159fad3";
|
||||
hash = "sha256-l8uXZZZ0rtQIYiEua8xmpuacLiR8hVjclAyc9dUI8z8=";
|
||||
rev = "5d5d1fdd5476f3df3749e9fb872e32021ec7a750";
|
||||
hash = "sha256-e0bxJpehssgnxigSgPt9qxMrKRZcvlVDyLu5DY6MkTA=";
|
||||
sparseCheckout = [ "variablefont" ];
|
||||
};
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mathicgb";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Macaulay2";
|
||||
repo = "mathicgb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zcHaYzznvbBkfeFXNxIxy9qlyD0esOvwUIOuEli4rwc=";
|
||||
hash = "sha256-34ASkRPNH6d8TSJmyZmYZVOi1p02nHgMVXXWVJMNZ1c=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -121,6 +121,7 @@ let
|
||||
-o -name resolver-status.properties \
|
||||
-o -name _remote.repositories \) \
|
||||
-delete
|
||||
rm -rf $out/.m2/.meta
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -47,17 +47,26 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
// {
|
||||
overrideMavenAttrs = newArgs: makeOverridableMavenPackage mavenRecipe (overrideWith newArgs);
|
||||
};
|
||||
|
||||
# Exposed so other Maven versions (e.g. maven_4) can reuse the builder
|
||||
# without duplicating build-maven-package.nix.
|
||||
mkBuildMavenPackage =
|
||||
maven:
|
||||
makeOverridableMavenPackage (
|
||||
callPackage ./build-maven-package.nix {
|
||||
inherit maven;
|
||||
}
|
||||
);
|
||||
in
|
||||
{
|
||||
buildMaven = callPackage ./build-maven.nix {
|
||||
maven = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
buildMavenPackage = makeOverridableMavenPackage (
|
||||
callPackage ./build-maven-package.nix {
|
||||
maven = finalAttrs.finalPackage;
|
||||
}
|
||||
);
|
||||
inherit mkBuildMavenPackage;
|
||||
|
||||
buildMavenPackage = mkBuildMavenPackage finalAttrs.finalPackage;
|
||||
|
||||
tests = {
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
jdk25_headless,
|
||||
makeWrapper,
|
||||
maven,
|
||||
stdenvNoCC,
|
||||
testers,
|
||||
}:
|
||||
let
|
||||
# Maven 4 defaults to the latest LTS JDK. Bump this binding to change it.
|
||||
jdk_headless = jdk25_headless;
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "maven";
|
||||
version = "4.0.0-rc-5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/maven/maven-4/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz";
|
||||
hash = "sha256-7OalyZ09BBx25/7RgU656jogoSC8s8I1pz0sTo2xbKE=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/maven
|
||||
cp -r apache-maven-${finalAttrs.version}/* $out/maven
|
||||
|
||||
makeWrapper $out/maven/bin/mvn $out/bin/mvn \
|
||||
--set-default JAVA_HOME "${jdk_headless}"
|
||||
makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \
|
||||
--set-default JAVA_HOME "${jdk_headless}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# Reuse maven's builder so build-maven-package.nix is not duplicated.
|
||||
buildMavenPackage = maven.mkBuildMavenPackage finalAttrs.finalPackage;
|
||||
|
||||
tests = {
|
||||
version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = ''
|
||||
env MAVEN_OPTS="-Dmaven.repo.local=$TMPDIR/m2" \
|
||||
mvn --version
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://maven.apache.org/";
|
||||
description = "Build automation tool (used primarily for Java projects)";
|
||||
longDescription = ''
|
||||
Apache Maven is a software project management and comprehension
|
||||
tool. Based on the concept of a project object model (POM), Maven can
|
||||
manage a project's build, reporting and documentation from a central piece
|
||||
of information.
|
||||
'';
|
||||
changelog = "https://maven.apache.org/docs/${finalAttrs.version}/release-notes.html";
|
||||
sourceProvenance = with lib.sourceTypes; [
|
||||
binaryBytecode
|
||||
binaryNativeCode
|
||||
];
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "mvn";
|
||||
maintainers = with lib.maintainers; [
|
||||
tricktron
|
||||
britter
|
||||
];
|
||||
teams = [ lib.teams.java ];
|
||||
inherit (jdk_headless.meta) platforms;
|
||||
};
|
||||
})
|
||||
@@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "melonds";
|
||||
version = "1.1-unstable-2026-05-27";
|
||||
version = "1.1-unstable-2026-06-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melonDS-emu";
|
||||
repo = "melonDS";
|
||||
rev = "c69c1ceb1176a03782f13bb8ae54883a44cb2d5d";
|
||||
hash = "sha256-d/9tlGAo66v0C2/erdoDyLXqoxqaTExztlxbFE4V7d8=";
|
||||
rev = "10a173b5536fc75cd93f8a3868349dad963542ef";
|
||||
hash = "sha256-YsVCU40BZgYoxyuscbD0Ab613eUIgYlXJkm0KJQg+yY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
bison,
|
||||
texinfo,
|
||||
openjdk8_headless,
|
||||
erlang,
|
||||
beamPackages,
|
||||
makeWrapper,
|
||||
readline,
|
||||
}:
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
bison
|
||||
texinfo
|
||||
openjdk8_headless
|
||||
erlang
|
||||
beamPackages.erlang
|
||||
readline
|
||||
];
|
||||
|
||||
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram $out/bin/$e \
|
||||
--prefix PATH ":" "${gcc}/bin" \
|
||||
--prefix PATH ":" "${openjdk8_headless}/bin" \
|
||||
--prefix PATH ":" "${erlang}/bin"
|
||||
--prefix PATH ":" "${beamPackages.erlang}/bin"
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
buildDotnetModule rec {
|
||||
pname = "min-ed-launcher";
|
||||
version = "0.12.2";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfvgyhn";
|
||||
repo = "min-ed-launcher";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jx8R/8mWuluD7ub8J3UqiP4A8k1npBgZpqRti3mhBrM=";
|
||||
hash = "sha256-blqGq6PORBEtCLO007TR3xJ6UXX8nFSOIoFh8Dc/5B8=";
|
||||
|
||||
leaveDotGit = true; # During build the current commit is appended to the version
|
||||
};
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
let
|
||||
pname = "mochi";
|
||||
version = "1.21.14";
|
||||
version = "1.21.16";
|
||||
|
||||
linux = appimageTools.wrapType2 rec {
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.mochi.cards/releases/Mochi-${version}.AppImage";
|
||||
hash = "sha256-+iMT8xofQB2m1V4rNZHR6loRfxNGgcptD3FPlFXC5Mw=";
|
||||
hash = "sha256-LWwv/+2/djc2bdqhnJiG5etXg+MFaEZbpttewVBZdeg=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
@@ -44,9 +44,9 @@ let
|
||||
url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg";
|
||||
hash =
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
"sha256-/ML5jWTBVLzitZDaBoU6sVJ0iNmq0jjMIV33yLnX1io="
|
||||
"sha256-dtdQZYGrukT/UgfNdsnGxOYmpuebJCDHXW8cAGN2GZE="
|
||||
else
|
||||
"sha256-vldyC/VkHf+BofpKvOxzCTM8F77k2aX9CxFP+frKvKc=";
|
||||
"sha256-FdNFpuIOMgRzniB9Aze3GUpNY27h++StTdwqfF1k07I=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -90,14 +90,14 @@ let
|
||||
};
|
||||
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-ewJ/XxqwVLF3/MsiN+AZ+jQodMr+JmPtpbcdXe6HNPo=";
|
||||
aarch64-linux = "sha256-hpuLpDA3PMrlOkF172f0PZY+cGe2gBkRTWCwwwYJwQo=";
|
||||
x86_64-linux = "sha256-OMbuc66AhwaIVgkiooUlttDazGLC5BCTiGPXA46TGso=";
|
||||
aarch64-linux = "sha256-pEzb21CSPn/ZflzZGTSJI5Hz3Q+ERFILg8q7V89AN1Q=";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mullvad-vpn";
|
||||
version = "2026.2";
|
||||
version = "2026.3";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
runCommand,
|
||||
lib,
|
||||
stdenv,
|
||||
@@ -72,7 +73,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "50.1";
|
||||
version = "50.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -83,9 +84,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-k0RQLORz94h5Xya0X4uP9TwKNrhnRw1wWhGj7gkRAh4=";
|
||||
hash = "sha256-/ejfinRlAMUfHJJbUeV8PdhwByM771Yweegx9Tv6O1Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# mutter 50.2 spams logs, clutter_input_focus_set_cursor_location
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/work_items/4840
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/f1570318ec3e9a38615eb91708bb71628ab8bcfd.patch";
|
||||
hash = "sha256-73GI2DTgoEBUQGa7nTUIur/ZuDHgDu4SwjUWHBRCyuo=";
|
||||
})
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Degl_device=true"
|
||||
"-Dinstalled_tests=false" # TODO: enable these
|
||||
|
||||
@@ -26,20 +26,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n8n";
|
||||
version = "2.23.4";
|
||||
version = "2.25.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n8n-io";
|
||||
repo = "n8n";
|
||||
tag = "n8n@${finalAttrs.version}";
|
||||
hash = "sha256-0LROPZKLKEKHBgV0kWAfataZB2nMzdsmq1WImCA6bgA=";
|
||||
hash = "sha256-V8CqEzCw4DcLPCao4HRXrJXFeID2+Ef8fNW1xd1b8Vs=";
|
||||
};
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_10;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-oqnLywIOhAZr7nmeGvq6k0brcGjHRhR3pVvBQK3Fg0k=";
|
||||
hash = "sha256-JS4OY6CmihsbJRyPszSlNUEViFKfLm2vu+G2upIoLW8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user