Merge master into staging-next
This commit is contained in:
@@ -98,6 +98,8 @@
|
||||
|
||||
- `purple-matrix` has been removed, since it has been unmaintained since April 2022 and upstream does not recommend using it anymore.
|
||||
|
||||
- `sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead.
|
||||
|
||||
- The default Android NDK version has been raised to 27, and the default SDK version to 35.
|
||||
NDK 21–26 have been removed, as they are end‐of‐life.
|
||||
|
||||
@@ -156,6 +158,8 @@
|
||||
|
||||
- `telegram-desktop` packages now uses `Telegram` for its binary. The previous name was `telegram-desktop`. This is due to [an upstream decision](https://github.com/telegramdesktop/tdesktop/commit/56ff5808a3d766f892bc3c3305afb106b629ef6f) to make the name consistent with other platforms.
|
||||
|
||||
- `hsd` has been upgraded to version 8. See [their changelog](https://github.com/handshake-org/hsd/blob/v8.0.0/docs/release-notes/release-notes-8.x.md) for important instructions before upgrading.
|
||||
|
||||
- `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatible due to major API changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.
|
||||
Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md.
|
||||
|
||||
|
||||
@@ -9782,12 +9782,6 @@
|
||||
githubId = 95086304;
|
||||
name = "Guilherme Lima";
|
||||
};
|
||||
GuillaumeDesforges = {
|
||||
email = "aceus02@gmail.com";
|
||||
github = "GuillaumeDesforges";
|
||||
githubId = 1882000;
|
||||
name = "Guillaume Desforges";
|
||||
};
|
||||
guillaumekoenig = {
|
||||
email = "guillaume.edward.koenig@gmail.com";
|
||||
github = "guillaumekoenig";
|
||||
@@ -16585,13 +16579,6 @@
|
||||
githubId = 71893;
|
||||
name = "Michael Maclean";
|
||||
};
|
||||
mglolenstine = {
|
||||
email = "mglolenstine@gmail.com";
|
||||
github = "MGlolenstine";
|
||||
githubId = 9406770;
|
||||
matrix = "@mglolenstine:matrix.org";
|
||||
name = "MGlolenstine";
|
||||
};
|
||||
mgregoire = {
|
||||
email = "gregoire@martinache.net";
|
||||
github = "M-Gregoire";
|
||||
|
||||
@@ -667,6 +667,7 @@ with lib.maintainers;
|
||||
members = [
|
||||
euank
|
||||
frederictobiasc
|
||||
heywoodlh
|
||||
marcusramberg
|
||||
mic92
|
||||
rorosen
|
||||
|
||||
@@ -541,6 +541,7 @@
|
||||
./services/databases/tigerbeetle.nix
|
||||
./services/databases/victorialogs.nix
|
||||
./services/databases/victoriametrics.nix
|
||||
./services/databases/victoriatraces.nix
|
||||
./services/desktops/accountsservice.nix
|
||||
./services/desktops/ayatana-indicators.nix
|
||||
./services/desktops/bamf.nix
|
||||
|
||||
@@ -77,7 +77,7 @@ in
|
||||
'';
|
||||
};
|
||||
services.openssh.authorizedKeysCommand = "/etc/ssh/authorized_keys_command_google_oslogin %u";
|
||||
services.openssh.authorizedKeysCommandUser = "nobody";
|
||||
services.openssh.authorizedKeysCommandUser = "root";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,173 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib)
|
||||
escapeShellArgs
|
||||
getBin
|
||||
hasPrefix
|
||||
literalExpression
|
||||
mkBefore
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkOption
|
||||
mkPackageOption
|
||||
optionalString
|
||||
types
|
||||
;
|
||||
cfg = config.services.victoriatraces;
|
||||
startCLIList = [
|
||||
"${cfg.package}/bin/victoria-traces"
|
||||
"-storageDataPath=/var/lib/${cfg.stateDir}"
|
||||
"-httpListenAddr=${cfg.listenAddress}"
|
||||
]
|
||||
++ lib.optionals (cfg.basicAuthUsername != null) [
|
||||
"-httpAuth.username=${cfg.basicAuthUsername}"
|
||||
]
|
||||
++ lib.optionals (cfg.basicAuthPasswordFile != null) [
|
||||
"-httpAuth.password=file://%d/basic_auth_password"
|
||||
];
|
||||
in
|
||||
{
|
||||
options.services.victoriatraces = {
|
||||
enable = mkEnableOption "VictoriaTraces is an open source distributed traces storage and query engine from VictoriaMetrics";
|
||||
package = mkPackageOption pkgs "victoriatraces" { };
|
||||
listenAddress = mkOption {
|
||||
default = ":10428";
|
||||
type = types.str;
|
||||
description = ''
|
||||
TCP address to listen for incoming http requests.
|
||||
'';
|
||||
};
|
||||
stateDir = mkOption {
|
||||
type = types.str;
|
||||
default = "victoriatraces";
|
||||
description = ''
|
||||
Directory below `/var/lib` to store VictoriaTraces data.
|
||||
This directory will be created automatically using systemd's StateDirectory mechanism.
|
||||
'';
|
||||
};
|
||||
retentionPeriod = mkOption {
|
||||
type = types.str;
|
||||
default = "7d";
|
||||
example = "30d";
|
||||
description = ''
|
||||
Retention period for trace data. Data older than retentionPeriod is automatically deleted.
|
||||
'';
|
||||
};
|
||||
basicAuthUsername = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = ''
|
||||
Basic Auth username used to protect VictoriaTraces instance by authorization
|
||||
'';
|
||||
};
|
||||
|
||||
basicAuthPasswordFile = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = ''
|
||||
File that contains the Basic Auth password used to protect VictoriaTraces instance by authorization
|
||||
'';
|
||||
};
|
||||
extraOptions = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
example = literalExpression ''
|
||||
[
|
||||
"-loggerLevel=WARN"
|
||||
"-retention.maxDiskSpaceUsageBytes=1073741824"
|
||||
]
|
||||
'';
|
||||
description = ''
|
||||
Extra options to pass to VictoriaTraces. See {command}`victoria-traces -help` for
|
||||
possible options.
|
||||
'';
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion =
|
||||
(cfg.basicAuthUsername == null && cfg.basicAuthPasswordFile == null)
|
||||
|| (cfg.basicAuthUsername != null && cfg.basicAuthPasswordFile != null);
|
||||
message = "Both basicAuthUsername and basicAuthPasswordFile must be set together to enable basicAuth functionality, or neither should be set.";
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services.victoriatraces = {
|
||||
description = "VictoriaTraces distributed traces database";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
startLimitBurst = 5;
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = lib.concatStringsSep " " [
|
||||
(escapeShellArgs (startCLIList ++ [ "-retentionPeriod=${cfg.retentionPeriod}" ]))
|
||||
(utils.escapeSystemdExecArgs cfg.extraOptions)
|
||||
];
|
||||
DynamicUser = true;
|
||||
LoadCredential = lib.optional (
|
||||
cfg.basicAuthPasswordFile != null
|
||||
) "basic_auth_password:${cfg.basicAuthPasswordFile}";
|
||||
RestartSec = 1;
|
||||
Restart = "on-failure";
|
||||
RuntimeDirectory = "victoriatraces";
|
||||
RuntimeDirectoryMode = "0700";
|
||||
StateDirectory = cfg.stateDir;
|
||||
StateDirectoryMode = "0700";
|
||||
|
||||
# Increase the limit to avoid errors like 'too many open files' when handling many trace spans
|
||||
LimitNOFILE = 1048576;
|
||||
|
||||
# Hardening
|
||||
DeviceAllow = [ "/dev/null rw" ];
|
||||
DevicePolicy = "strict";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "full";
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_UNIX"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
];
|
||||
};
|
||||
|
||||
postStart =
|
||||
let
|
||||
bindAddr = (optionalString (hasPrefix ":" cfg.listenAddress) "127.0.0.1") + cfg.listenAddress;
|
||||
in
|
||||
mkBefore ''
|
||||
until ${getBin pkgs.curl}/bin/curl -s -o /dev/null http://${bindAddr}/ping; do
|
||||
sleep 1;
|
||||
done
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -113,9 +113,9 @@ You can install them like any other package:
|
||||
```nix
|
||||
{
|
||||
environment.systemPackages = [
|
||||
gnomeExtensions.dash-to-dock
|
||||
gnomeExtensions.gsconnect
|
||||
gnomeExtensions.mpris-indicator-button
|
||||
pkgs.gnomeExtensions.dash-to-dock
|
||||
pkgs.gnomeExtensions.gsconnect
|
||||
pkgs.gnomeExtensions.mpris-indicator-button
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
@@ -770,7 +770,7 @@ in
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
Type = "simple";
|
||||
Type = "notify";
|
||||
RestartSec = 60;
|
||||
LimitNOFILE = 65536;
|
||||
NoNewPrivileges = true;
|
||||
|
||||
@@ -16,9 +16,7 @@ in
|
||||
services.xserver.windowManager.bspwm = {
|
||||
enable = mkEnableOption "bspwm";
|
||||
|
||||
package = mkPackageOption pkgs "bspwm" {
|
||||
example = "bspwm-unstable";
|
||||
};
|
||||
package = mkPackageOption pkgs "bspwm" { };
|
||||
configFile = mkOption {
|
||||
type = with types; nullOr path;
|
||||
example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"'';
|
||||
@@ -30,9 +28,7 @@ in
|
||||
};
|
||||
|
||||
sxhkd = {
|
||||
package = mkPackageOption pkgs "sxhkd" {
|
||||
example = "sxhkd-unstable";
|
||||
};
|
||||
package = mkPackageOption pkgs "sxhkd" { };
|
||||
configFile = mkOption {
|
||||
type = with types; nullOr path;
|
||||
example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"'';
|
||||
@@ -52,9 +48,11 @@ in
|
||||
start = ''
|
||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||
SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${
|
||||
optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""
|
||||
optionalString (cfg.sxhkd.configFile != null) "-c ${escapeShellArg cfg.sxhkd.configFile}"
|
||||
} &
|
||||
${cfg.package}/bin/bspwm ${
|
||||
optionalString (cfg.configFile != null) "-c ${escapeShellArg cfg.configFile}"
|
||||
} &
|
||||
${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} &
|
||||
waitPID=$!
|
||||
'';
|
||||
};
|
||||
@@ -62,9 +60,6 @@ in
|
||||
};
|
||||
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]
|
||||
"Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm."
|
||||
)
|
||||
(mkRemovedOptionModule [
|
||||
"services"
|
||||
"xserver"
|
||||
|
||||
@@ -1587,6 +1587,7 @@ in
|
||||
vengi-tools = runTest ./vengi-tools.nix;
|
||||
victorialogs = import ./victorialogs { inherit runTest; };
|
||||
victoriametrics = import ./victoriametrics { inherit runTest; };
|
||||
victoriatraces = import ./victoriatraces { inherit runTest; };
|
||||
vikunja = runTest ./vikunja.nix;
|
||||
virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { };
|
||||
vm-variant = handleTest ./vm-variant.nix { };
|
||||
|
||||
@@ -16,7 +16,7 @@ let
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.pg-dump-anon ];
|
||||
environment.systemPackages = [ (pkgs.pg-dump-anon.override { postgresql = package; }) ];
|
||||
services.postgresql = {
|
||||
inherit package;
|
||||
enable = true;
|
||||
@@ -39,7 +39,7 @@ let
|
||||
create table player(id serial, name text, points int);
|
||||
insert into player(id,name,points) values (1,'Foo', 23);
|
||||
insert into player(id,name,points) values (2,'Bar',42);
|
||||
security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name();';
|
||||
security label for anon on column player.name is 'MASKED WITH FUNCTION anon.fake_last_name()';
|
||||
security label for anon on column player.points is 'MASKED WITH VALUE NULL';
|
||||
''}"
|
||||
)
|
||||
@@ -61,7 +61,7 @@ let
|
||||
COPY public.player ...
|
||||
1,Shields,
|
||||
2,Salazar,
|
||||
\.
|
||||
\\.
|
||||
|
||||
in the given dump (the commas are tabs in case of pg_dump).
|
||||
Extract the CSV lines and split by `sep`.
|
||||
|
||||
@@ -70,8 +70,6 @@ let
|
||||
|
||||
mlterm.pkg = p: p.mlterm;
|
||||
|
||||
mrxvt.pkg = p: p.mrxvt;
|
||||
|
||||
qterminal.pkg = p: p.lxqt.qterminal;
|
||||
qterminal.kill = true;
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{ runTest }:
|
||||
{
|
||||
service-endpoints = runTest ./service-endpoints.nix;
|
||||
otlp-ingestion = runTest ./otlp-ingestion.nix;
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
{ lib, pkgs, ... }:
|
||||
let
|
||||
# Simple protobuf trace
|
||||
traceGenerator = pkgs.writeScriptBin "trace-generator" ''
|
||||
#!${
|
||||
pkgs.python3.withPackages (
|
||||
ps: with ps; [
|
||||
requests
|
||||
protobuf
|
||||
opentelemetry-proto
|
||||
opentelemetry-api
|
||||
opentelemetry-sdk
|
||||
opentelemetry-exporter-otlp-proto-http
|
||||
]
|
||||
)
|
||||
}/bin/python3
|
||||
|
||||
import time
|
||||
from opentelemetry import trace
|
||||
from opentelemetry.sdk.trace import TracerProvider
|
||||
from opentelemetry.sdk.trace.export import BatchSpanProcessor
|
||||
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
|
||||
from opentelemetry.sdk.resources import Resource
|
||||
|
||||
resource = Resource.create({
|
||||
"service.name": "test-service",
|
||||
"service.version": "1.0.0"
|
||||
})
|
||||
|
||||
provider = TracerProvider(resource=resource)
|
||||
|
||||
otlp_exporter = OTLPSpanExporter(
|
||||
endpoint="http://localhost:10428/insert/opentelemetry/v1/traces",
|
||||
headers={},
|
||||
)
|
||||
|
||||
provider.add_span_processor(BatchSpanProcessor(otlp_exporter))
|
||||
trace.set_tracer_provider(provider)
|
||||
|
||||
tracer = trace.get_tracer("test-tracer", "1.0.0")
|
||||
|
||||
# Test span
|
||||
with tracer.start_as_current_span("test-span") as span:
|
||||
span.set_attribute("http.method", "GET")
|
||||
span.set_attribute("http.url", "/test")
|
||||
time.sleep(0.1)
|
||||
|
||||
provider.force_flush()
|
||||
|
||||
print("Test trace sent")
|
||||
'';
|
||||
in
|
||||
{
|
||||
name = "victoriatraces-otlp-ingestion";
|
||||
meta.maintainers = with lib.maintainers; [ cmacrae ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.victoriatraces = {
|
||||
enable = true;
|
||||
retentionPeriod = "1d";
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
curl
|
||||
jq
|
||||
traceGenerator
|
||||
];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("victoriatraces.service")
|
||||
machine.wait_for_open_port(10428)
|
||||
machine.succeed("curl --fail http://localhost:10428/")
|
||||
machine.succeed("trace-generator")
|
||||
|
||||
# Wait for trace to be indexed
|
||||
machine.wait_until_succeeds("""
|
||||
curl -s 'http://localhost:10428/select/jaeger/api/services' | \
|
||||
jq -e '.data[] | select(. == "test-service")'
|
||||
""", timeout=10)
|
||||
|
||||
# Query for traces from our test service
|
||||
machine.succeed("""
|
||||
curl -s 'http://localhost:10428/select/jaeger/api/traces?service=test-service' | \
|
||||
jq -e '.data[0].spans[0].operationName' | grep -q 'test-span'
|
||||
""")
|
||||
|
||||
# Verify the trace has the expected attributes
|
||||
machine.succeed("""
|
||||
curl -s 'http://localhost:10428/select/jaeger/api/traces?service=test-service' | \
|
||||
jq -e '.data[0].spans[0].tags[] | select(.key == "http.method") | .value == "GET"'
|
||||
""")
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
name = "victoriatraces-service-endpoints";
|
||||
meta.maintainers = with lib.maintainers; [ cmacrae ];
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.victoriatraces = {
|
||||
enable = true;
|
||||
extraOptions = [
|
||||
"-loggerLevel=WARN"
|
||||
];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
curl
|
||||
jq
|
||||
];
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("victoriatraces.service")
|
||||
machine.wait_for_open_port(10428)
|
||||
|
||||
with subtest("Service endpoints are accessible"):
|
||||
machine.succeed("curl --fail http://localhost:10428/")
|
||||
machine.succeed("curl --fail http://localhost:10428/select/vmui")
|
||||
machine.succeed("curl --fail http://localhost:10428/metrics | grep -E '^(vm_|process_)'")
|
||||
machine.succeed("curl --fail http://localhost:10428/select/jaeger/api/services")
|
||||
|
||||
with subtest("OTLP trace ingestion endpoint accepts requests"):
|
||||
machine.succeed("curl --fail -X POST http://localhost:10428/insert/opentelemetry/v1/traces -H 'Content-Type: application/x-protobuf'")
|
||||
machine.succeed("test -d /var/lib/victoriatraces")
|
||||
'';
|
||||
}
|
||||
@@ -38,17 +38,17 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "reaper";
|
||||
version = "7.45";
|
||||
version = "7.46";
|
||||
|
||||
src = fetchurl {
|
||||
url = url_for_platform version stdenv.hostPlatform.qemuArch;
|
||||
hash =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
"sha256-plXLOJcQbZlSGPgNdjNEPS2pZ9almrmNzxYfhOZGXjg="
|
||||
"sha256-uGWeaRl01rH7+RrMoqAv85EiKJ3/qUFiQVt1zILVJTQ="
|
||||
else
|
||||
{
|
||||
x86_64-linux = "sha256-pOPL8HoAAFNDq6L3SC/OygDtqqYVvfkWwVA6qv1xZPs=";
|
||||
aarch64-linux = "sha256-rclLjAiG8aLsVinghpPZJiPU4Iq5jQ6s2H0+du+a9Ts=";
|
||||
x86_64-linux = "sha256-8XEy7IXjjw7WbPxpxFP30ivMgi0/iWbtljuYCQ2BzDI=";
|
||||
aarch64-linux = "sha256-H+lvnpaKESad0DI9l1AexFxgwPi9EidVR1Gh6oITjHQ=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system};
|
||||
};
|
||||
|
||||
@@ -18,12 +18,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0-unstable-2024-03-19";
|
||||
version = "1.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OctopusET";
|
||||
repo = "sway-contrib";
|
||||
rev = "5d33a290e3cac3f0fed38ff950939da28e3ebfd7";
|
||||
hash = "sha256-2qYxkXowSSzVcpsPO4JoUqaH/VUkOOWu1RKFXp1CXGs=";
|
||||
tag = version;
|
||||
hash = "sha256-/gWL0hA8hDjpK5YJxuZqmvo0zuVRQkhAkgHlI4JzNP8=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
@@ -54,10 +54,10 @@ in
|
||||
];
|
||||
buildInputs = [ bash ];
|
||||
installPhase = ''
|
||||
installManPage grimshot.1
|
||||
installShellCompletion --cmd grimshot grimshot-completion.bash
|
||||
installManPage grimshot/grimshot.1
|
||||
installShellCompletion --cmd grimshot grimshot/grimshot-completion.bash
|
||||
|
||||
install -Dm 0755 grimshot $out/bin/grimshot
|
||||
install -Dm 0755 grimshot/grimshot $out/bin/grimshot
|
||||
wrapProgram $out/bin/grimshot --set PATH \
|
||||
"${
|
||||
lib.makeBinPath [
|
||||
|
||||
@@ -1,16 +1,62 @@
|
||||
# Nvidia GPU Support
|
||||
|
||||
To use Nvidia GPU in the cluster the nvidia-container-runtime and runc are needed. To get the two components it suffices to add the following to the configuration
|
||||
> Note: this article assumes `services.k3s.enable = true;` is already set
|
||||
|
||||
## Enable the Nvidia driver
|
||||
|
||||
```
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
enableNvidia = true;
|
||||
hardware.nvidia = {
|
||||
open = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable; # change to match your kernel
|
||||
nvidiaSettings = true;
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ docker runc ];
|
||||
|
||||
# Hack for getting the nvidia driver recognized
|
||||
services.xserver = {
|
||||
enable = false;
|
||||
videoDrivers = [ "nvidia" ];
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"nvidia-x11"
|
||||
"nvidia-settings"
|
||||
];
|
||||
```
|
||||
|
||||
Note, using docker here is a workaround, it will install nvidia-container-runtime and that will cause it to be accessible via /run/current-system/sw/bin/nvidia-container-runtime, currently its not directly accessible in nixpkgs.
|
||||
Also, enable the Nvidia container toolkit:
|
||||
|
||||
```
|
||||
hardware.nvidia-container-toolkit.enable = true;
|
||||
hardware.nvidia-container-toolkit.mount-nvidia-executables = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
nvidia-container-toolkit
|
||||
];
|
||||
```
|
||||
|
||||
Rebuild your NixOS configuration.
|
||||
|
||||
### Verify that the GPU is accessible
|
||||
|
||||
Use the following command to ensure the GPU is accessible:
|
||||
|
||||
```
|
||||
nvidia-smi
|
||||
```
|
||||
|
||||
If there is an error in the output, a reboot may be required for the driver to be assigned to the GPU.
|
||||
|
||||
Additionally, `lspci -k` can be used to ensure the driver has been assigned to the GPU:
|
||||
|
||||
```
|
||||
# lspci -k | grep -i nvidia
|
||||
|
||||
01:00.0 VGA compatible controller: NVIDIA Corporation TU106 [GeForce RTX 2060 Rev. A] (rev a1)
|
||||
Kernel driver in use: nvidia
|
||||
Kernel modules: nvidiafb, nouveau, nvidia_drm, nvidia
|
||||
```
|
||||
|
||||
## Configure k3s
|
||||
|
||||
You now need to create a new file in `/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl` with the following
|
||||
|
||||
@@ -22,15 +68,8 @@ You now need to create a new file in `/var/lib/rancher/k3s/agent/etc/containerd/
|
||||
runtime_engine = ""
|
||||
runtime_root = ""
|
||||
runtime_type = "io.containerd.runc.v2"
|
||||
|
||||
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia.options]
|
||||
BinaryName = "/run/current-system/sw/bin/nvidia-container-runtime"
|
||||
```
|
||||
|
||||
Update: As of 12/03/2024 It appears that the last two lines above are added by default, and if the two lines are present (as shown above) it will refuse to start the server. You will need to remove the two lines from that point onward.
|
||||
|
||||
Note here we are pointing the nvidia runtime to "/run/current-system/sw/bin/nvidia-container-runtime".
|
||||
|
||||
Now apply the following runtime class to k3s cluster:
|
||||
|
||||
```yaml
|
||||
@@ -43,16 +82,175 @@ metadata:
|
||||
name: nvidia
|
||||
```
|
||||
|
||||
Following [k8s-device-plugin](https://github.com/NVIDIA/k8s-device-plugin#deployment-via-helm) install the helm chart with `runtimeClassName: nvidia` set. In order to passthrough the nvidia card into the container, your deployments spec must contain
|
||||
Restart k3s:
|
||||
|
||||
```yaml
|
||||
runtimeClassName: nvidia
|
||||
# for each container
|
||||
env:
|
||||
- name: NVIDIA_VISIBLE_DEVICES
|
||||
value: all
|
||||
- name: NVIDIA_DRIVER_CAPABILITIES
|
||||
value: all
|
||||
```
|
||||
systemctl restart k3s.service
|
||||
```
|
||||
|
||||
to test its working exec onto a pod and run nvidia-smi. For more configurability of nvidia related matters in k3s look in [k3s-docs](https://docs.k3s.io/advanced#nvidia-container-runtime-support).
|
||||
Ensure that the Nvidia runtime is detected by k3s:
|
||||
|
||||
```
|
||||
grep nvidia /var/lib/rancher/k3s/agent/etc/containerd/config.toml
|
||||
```
|
||||
|
||||
Apply the DaemonSet in the [generic-cdi-plugin README](https://github.com/OlfillasOdikno/generic-cdi-plugin):
|
||||
|
||||
```
|
||||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
name: generic-cdi-plugin
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: generic-cdi-plugin-daemonset
|
||||
namespace: generic-cdi-plugin
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
name: generic-cdi-plugin
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
name: generic-cdi-plugin
|
||||
app.kubernetes.io/component: generic-cdi-plugin
|
||||
app.kubernetes.io/name: generic-cdi-plugin
|
||||
spec:
|
||||
containers:
|
||||
- image: ghcr.io/olfillasodikno/generic-cdi-plugin:main
|
||||
name: generic-cdi-plugin
|
||||
command:
|
||||
- /generic-cdi-plugin
|
||||
- /var/run/cdi/nvidia-container-toolkit.json
|
||||
imagePullPolicy: Always
|
||||
securityContext:
|
||||
privileged: true
|
||||
tty: true
|
||||
volumeMounts:
|
||||
- name: kubelet
|
||||
mountPath: /var/lib/kubelet
|
||||
- name: nvidia-container-toolkit
|
||||
mountPath: /var/run/cdi/nvidia-container-toolkit.json
|
||||
volumes:
|
||||
- name: kubelet
|
||||
hostPath:
|
||||
path: /var/lib/kubelet
|
||||
- name: nvidia-container-toolkit
|
||||
hostPath:
|
||||
path: /var/run/cdi/nvidia-container-toolkit.json
|
||||
affinity:
|
||||
nodeAffinity:
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
nodeSelectorTerms:
|
||||
- matchExpressions:
|
||||
- key: "nixos-nvidia-cdi"
|
||||
operator: In
|
||||
values:
|
||||
- "enabled"
|
||||
```
|
||||
|
||||
Apply the following node label (replace `#CHANGEME` with your node name):
|
||||
|
||||
```
|
||||
kind: Node
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: #CHANGEME
|
||||
labels:
|
||||
nixos-nvidia-cdi: enabled
|
||||
```
|
||||
|
||||
Now, GPU-enabled pods can be run with this configuration:
|
||||
|
||||
```
|
||||
spec:
|
||||
runtimeClassName: nvidia
|
||||
containers:
|
||||
resources:
|
||||
requests:
|
||||
nvidia.com/gpu-all: "1"
|
||||
limits:
|
||||
nvidia.com/gpu-all: "1"
|
||||
```
|
||||
|
||||
### Test pod
|
||||
|
||||
This is a complete pod configuration for reference/testing:
|
||||
|
||||
```
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: gpu-test
|
||||
namespace: default
|
||||
spec:
|
||||
runtimeClassName: nvidia # <- THIS FOR GPU
|
||||
containers:
|
||||
- name: gpu-test
|
||||
image: nvidia/cuda:12.6.3-base-ubuntu22.04
|
||||
command: [ "/bin/bash", "-c", "--" ]
|
||||
args: [ "while true; do sleep 30; done;" ]
|
||||
env:
|
||||
- name: NVIDIA_VISIBLE_DEVICES
|
||||
value: all
|
||||
- name: NVIDIA_DRIVER_CAPABILITIES
|
||||
value: all
|
||||
resources: # <- THIS FOR GPU
|
||||
requests:
|
||||
nvidia.com/gpu-all: "1"
|
||||
limits:
|
||||
nvidia.com/gpu-all: "1"
|
||||
```
|
||||
|
||||
Once the pod is running, use the following command to test that the GPU was detected:
|
||||
|
||||
```
|
||||
kubectl exec -n default -it pod/gpu-test -- nvidia-smi
|
||||
```
|
||||
|
||||
If successful, the output will look like the following:
|
||||
|
||||
```
|
||||
Thu Sep 25 04:17:42 2025
|
||||
|
||||
+-----------------------------------------------------------------------------------------+
|
||||
|
||||
| NVIDIA-SMI 580.82.09 Driver Version: 580.82.09 CUDA Version: 13.0 |
|
||||
|
||||
+-----------------------------------------+------------------------+----------------------+
|
||||
|
||||
| GPU Name Persistence-M | Bus-Id Disp.A | Volatile Uncorr. ECC |
|
||||
|
||||
| Fan Temp Perf Pwr:Usage/Cap | Memory-Usage | GPU-Util Compute M. |
|
||||
|
||||
| | | MIG M. |
|
||||
|
||||
|=========================================+========================+======================|
|
||||
|
||||
| 0 NVIDIA GeForce RTX 2060 Off | 00000000:01:00.0 On | N/A |
|
||||
|
||||
| 0% 36C P8 10W / 190W | 104MiB / 6144MiB | 0% Default |
|
||||
|
||||
| | | N/A |
|
||||
|
||||
+-----------------------------------------+------------------------+----------------------+
|
||||
|
||||
|
||||
|
||||
+-----------------------------------------------------------------------------------------+
|
||||
|
||||
| Processes: |
|
||||
|
||||
| GPU GI CI PID Type Process name GPU Memory |
|
||||
|
||||
| ID ID Usage |
|
||||
|
||||
|=========================================================================================|
|
||||
|
||||
| No running processes found |
|
||||
|
||||
+-----------------------------------------------------------------------------------------+
|
||||
```
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apktool";
|
||||
version = "2.11.1";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
|
||||
"https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
|
||||
];
|
||||
hash = "sha256-VtWcUk/HZCY7qNNFdU2Nr1WxiHgYsVzTtZT1VdJJ4ts=";
|
||||
hash = "sha256-Zs9FJKSkWn9WVn0Issm27CN7zdeM7mn9SlnIoCQ66vo=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atop";
|
||||
version = "2.12.0";
|
||||
version = "2.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.atoptool.nl/download/atop-${version}.tar.gz";
|
||||
hash = "sha256-DQnsyQwU5u9Bwi48V8FCw+T7nPPJQ3kHejPJYdU0MIY=";
|
||||
hash = "sha256-T9vmfF36+JQFY54YWZ9OrneXgHP/pU88eMNoq1S9EvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "azure-storage-azcopy";
|
||||
version = "10.29.2";
|
||||
version = "10.30.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "azure-storage-azcopy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wLErYkiN5V6aZx6Vztr3Gk5XB+aOo9de5QjEbwDLBXg=";
|
||||
hash = "sha256-lHgOQ9Ff3RSi49peDETx98QMnLrANfBvkAx8c+ubiG0=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-Aq38kpgQ1NQQVkF0hjMLzvK8HvxfzYARbeWmsc54Ldg=";
|
||||
vendorHash = "sha256-WTsngwFA4J1CuAePKwPew/FZNrHJ9IoDCQFv63WAlzo=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -14,19 +14,19 @@ let
|
||||
registry = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "bazel-central-registry";
|
||||
rev = "b03f4f95d8ba67873843eae80a73fef8ebf1522e";
|
||||
hash = "sha256-gJr5bJ6Kj7jiUhnCC+YOUh3ChFR/55eUbwpP2srsVvM=";
|
||||
rev = "1f55d91e1be0e4863a698b9d7582cf097ad456ee";
|
||||
hash = "sha256-ESHF5FhLvn4u4j//6AFiSJRJYSKrI4EKr4oDwvsrcPM=";
|
||||
};
|
||||
in
|
||||
buildBazelPackage rec {
|
||||
pname = "bant";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hzeller";
|
||||
repo = "bant";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wrzOszkqWDEylMDZYgtAqB837uWevWCwkhBhv9LGj4Y=";
|
||||
hash = "sha256-0RWR793+qXc5QYIc7wIL323iDkNts9w4e90FCdHT6t4=";
|
||||
};
|
||||
|
||||
bazelFlags = [
|
||||
@@ -44,9 +44,8 @@ buildBazelPackage rec {
|
||||
fetchAttrs = {
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-1iy2S0mmXksfwucks+HOZ2/HUGaVBqk7VlR+kO6iYZE=";
|
||||
x86_64-linux = "sha256-YOIwwlCYlNINlYbm/vq3Jjhe+/zgrtECdMRl+vE8FgI=";
|
||||
aarch64-darwin = "sha256-7g1deAihrjpwAxNbG7rv9dDs3FjOCuRIFieLbENKmbw=";
|
||||
aarch64-linux = "sha256-aGfFbeosrWhNqiHV9ng59DeMZSGjaylPRfolxatauJE";
|
||||
x86_64-linux = "sha256-nbHHkgN4O8bWZzrpQUMZbm4+iRffqdfu7C1kkLJ3GDQ=";
|
||||
}
|
||||
.${system} or (throw "No hash for system: ${system}");
|
||||
};
|
||||
|
||||
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
|
||||
mainProgram = "beebeep";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ mglolenstine ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,17 +7,18 @@
|
||||
xcbutil,
|
||||
xcbutilkeysyms,
|
||||
xcbutilwm,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bspwm";
|
||||
version = "0.9.10";
|
||||
version = "0.9.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baskerville";
|
||||
repo = "bspwm";
|
||||
rev = version;
|
||||
sha256 = "0qlv7b4c2mmjfd65y100d11x8iqyg5f6lfiws3cgmpjidhdygnxc";
|
||||
sha256 = "sha256-5mAw3uSsDozGUJdYE1gD1u0u6Xnik3/LbE654vCFU9E=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@@ -30,10 +31,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) startx;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tiling window manager based on binary space partitioning";
|
||||
homepage = "https://github.com/baskerville/bspwm";
|
||||
maintainers = with maintainers; [ meisternu ];
|
||||
maintainers = with maintainers; [
|
||||
meisternu
|
||||
ncfavier
|
||||
];
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "buildkite-agent-metrics";
|
||||
version = "5.9.13";
|
||||
version = "5.10.0";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -16,10 +18,10 @@ buildGoModule rec {
|
||||
owner = "buildkite";
|
||||
repo = "buildkite-agent-metrics";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AVFQ3GP4YDQ6d9NSeol3Eobxzmoa9bRyCAKTsDbyZyQ=";
|
||||
hash = "sha256-QE4IY1yU8X1zG+jf7eBWiSjN3HvDqr2Avhs3Bub+xB0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RQmxYxTcQn5VEy8Z96EtArYBnODmde1RlV4CA6fhbZA=";
|
||||
vendorHash = "sha256-r088XQKYx0D0OVfz/nqhWL0LLCf4X13WqYikJKlLr3c=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $lambda/bin
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "bundletool";
|
||||
version = "1.18.1";
|
||||
version = "1.18.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar";
|
||||
sha256 = "sha256-Z1eGSTmDeH/6EVUL23wHFWeaROFkPz/5gKUp6cgiWVw=";
|
||||
sha256 = "sha256-N4tUNM0TeL72srxSe4x/D/JYSyc4MDNbzlTW0IE8hYQ=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
{
|
||||
"dart_leap": "sha256-oO5851cIdrW/asgOePxvwUgjn1XchkH9CKJUruvlLYI=",
|
||||
"lw_file_system": "sha256-S2zNpZWPtUH8Q+gUPEX9zW+agH8rq6Wsz7aj/i1DF9c=",
|
||||
"lw_file_system_api": "sha256-/Ur9zu4Ovb4x8j1n6Q6FWFuJ9yp92YQG3b7H5CMf3II=",
|
||||
"lw_sysapi": "sha256-oGs5q8N46WNcRzbsgsPB/6fVBH3g9utK4tlXBpwU4Qc=",
|
||||
"material_leap": "sha256-AHkXi+ENvLmJBXyF8jdXOCn/CThb6/LDr18gl9sL0XE=",
|
||||
"networker": "sha256-/3jFIZj66hWbTcIQx9OB5QRrukcBT4zpek+56AVaGIA=",
|
||||
"networker_crypto": "sha256-nI0luldloScjjix75kR5yOE1ZX8KFxMIC2N4whKlXUg=",
|
||||
"networker_socket": "sha256-5y1oy0IYDs7nhiIx653vI5Gfh5jrVewkRFxB1mjxlE4=",
|
||||
"perfect_freehand": "sha256-eBiid097rkF82n65Yg6a4VkKPv+70HIOYJT+9sCD//U=",
|
||||
"reorderable_grid": "sha256-g30DSPL/gsk0r8c2ecoKU4f1P3BF15zLnBVO6RXvDGQ=",
|
||||
"swamp_api": "sha256-ONaCXeMwEEHDvVmbo3o66O3CTCx4xGR3T5ZtSEwPvaw="
|
||||
"lw_file_system": "sha256-cnGaTriJI3IEZjUg5sj4VrrG3cxfzBfDzJRkFRIKmu4=",
|
||||
"lw_file_system_api": "sha256-ozp/mJq2o5pzQgFcTWLzG67XgHZRHoIRW+W0QDLCTFM=",
|
||||
"lw_sysapi": "sha256-rs/nC6/uUGXHZ6kzb+RCcvtVP/zSYV9NdrUq+WHLOKQ=",
|
||||
"material_leap": "sha256-cnGaTriJI3IEZjUg5sj4VrrG3cxfzBfDzJRkFRIKmu4=",
|
||||
"networker": "sha256-YqCl/FODv8QZFnz1qVHoJLIioYhcluPiY4pP09MzvNE=",
|
||||
"networker_crypto": "sha256-8I/qBdxxbIse7un4W9MjaifbK7TqsyYrFnIbaTuezo0=",
|
||||
"networker_socket": "sha256-8I/qBdxxbIse7un4W9MjaifbK7TqsyYrFnIbaTuezo0=",
|
||||
"swamp_api": "sha256-74Zr2qUeS8JnWcqqU7zAwaD8ygnni76OuTOwQqobhCk="
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
flutter332,
|
||||
flutter335,
|
||||
fetchFromGitHub,
|
||||
runCommand,
|
||||
yq-go,
|
||||
@@ -9,16 +9,16 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.3.4";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LinwoodDev";
|
||||
repo = "Butterfly";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qmgM6h2HxvRwUv4UwkIBR3uYz2NiaWEgJWWjrpumQug=";
|
||||
hash = "sha256-kxX9gHNKDlRir9TGSob6iz8cRJOqHdoYlvIi4MQAroc=";
|
||||
};
|
||||
in
|
||||
flutter332.buildFlutterApplication {
|
||||
flutter335.buildFlutterApplication {
|
||||
pname = "butterfly";
|
||||
inherit version src;
|
||||
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
|
||||
"sha256": "dd3d2ad434b9510001d089e8de7556d50c834481b9abc2891a0184a8493a19dc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "85.0.0"
|
||||
"version": "89.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
|
||||
"sha256": "c22b6e7726d1f9e5db58c7251606076a71ca0dbcf76116675edfadbec0c9e875",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.7.1"
|
||||
"version": "8.2.0"
|
||||
},
|
||||
"animations": {
|
||||
"dependency": "direct main",
|
||||
@@ -114,11 +114,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build",
|
||||
"sha256": "6439a9c71a4e6eca8d9490c1b380a25b02675aa688137dfbe66d2062884a23ac",
|
||||
"sha256": "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.2"
|
||||
"version": "4.0.0"
|
||||
},
|
||||
"build_config": {
|
||||
"dependency": "transitive",
|
||||
@@ -140,35 +140,15 @@
|
||||
"source": "hosted",
|
||||
"version": "4.0.4"
|
||||
},
|
||||
"build_resolvers": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build_resolvers",
|
||||
"sha256": "2b21a125d66a86b9511cc3fb6c668c42e9a1185083922bf60e46d483a81a9712",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.2"
|
||||
},
|
||||
"build_runner": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "build_runner",
|
||||
"sha256": "fd3c09f4bbff7fa6e8d8ef688a0b2e8a6384e6483a25af0dac75fef362bcfe6f",
|
||||
"sha256": "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.7.0"
|
||||
},
|
||||
"build_runner_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "build_runner_core",
|
||||
"sha256": "ab27e46c8aa233e610cf6084ee6d8a22c6f873a0a9929241d8855b7a72978ae7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "9.3.0"
|
||||
"version": "2.8.0"
|
||||
},
|
||||
"built_collection": {
|
||||
"dependency": "transitive",
|
||||
@@ -184,11 +164,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "built_value",
|
||||
"sha256": "ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb",
|
||||
"sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.11.1"
|
||||
"version": "8.12.0"
|
||||
},
|
||||
"butterfly_api": {
|
||||
"dependency": "direct main",
|
||||
@@ -197,7 +177,7 @@
|
||||
"relative": true
|
||||
},
|
||||
"source": "path",
|
||||
"version": "2.3.4"
|
||||
"version": "2.4.0"
|
||||
},
|
||||
"camera": {
|
||||
"dependency": "direct main",
|
||||
@@ -213,31 +193,31 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "camera_android_camerax",
|
||||
"sha256": "58b8fe843a3c83fd1273c00cb35f5a8ae507f6cc9b2029bcf7e2abba499e28d8",
|
||||
"sha256": "0db8e7b161ec6cdb2219540eaa4cf599dc963929e5f8ded3b20b3acb52712fa4",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.19+1"
|
||||
"version": "0.6.21+1"
|
||||
},
|
||||
"camera_avfoundation": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "camera_avfoundation",
|
||||
"sha256": "e4aca5bccaf897b70cac87e5fdd789393310985202442837922fd40325e2733b",
|
||||
"sha256": "a5a90297520e3b9841331161a7511626681153849c690c138e04a2b6d0af3026",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.9.21+1"
|
||||
"version": "0.9.21+3"
|
||||
},
|
||||
"camera_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "camera_platform_interface",
|
||||
"sha256": "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2",
|
||||
"sha256": "ea1ef6ba79cdbed93df2d3eeef11542a90dec24dbcd9cde574926b86d7a09a10",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.10.0"
|
||||
"version": "2.11.0"
|
||||
},
|
||||
"camera_web": {
|
||||
"dependency": "transitive",
|
||||
@@ -303,11 +283,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "code_builder",
|
||||
"sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
|
||||
"sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.10.1"
|
||||
"version": "4.11.0"
|
||||
},
|
||||
"collection": {
|
||||
"dependency": "direct main",
|
||||
@@ -323,11 +303,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "connectivity_plus",
|
||||
"sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec",
|
||||
"sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.1.5"
|
||||
"version": "7.0.0"
|
||||
},
|
||||
"connectivity_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -414,21 +394,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_mappable",
|
||||
"sha256": "15f41a35da8ee690bbfa0059fa241edeeaea73f89a2ba685b354ece07cd8ada6",
|
||||
"sha256": "0e219930c9f7b9e0f14ae7c1de931c401875110fd5c67975b6b9492a6d3a531b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.6.0"
|
||||
"version": "4.6.1"
|
||||
},
|
||||
"dart_style": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_style",
|
||||
"sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
|
||||
"sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.1"
|
||||
"version": "3.1.2"
|
||||
},
|
||||
"dbus": {
|
||||
"dependency": "transitive",
|
||||
@@ -514,21 +494,21 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "file_selector",
|
||||
"sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828",
|
||||
"sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.3"
|
||||
"version": "1.0.4"
|
||||
},
|
||||
"file_selector_android": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "file_selector_android",
|
||||
"sha256": "3015702ab73987000e7ff2df5ddc99666d2bcd65cdb243f59da35729d3be6cff",
|
||||
"sha256": "4be8ae7374c81daf88e49084a1d68dfe68466ef38a6a3d711cc0b83d53e22465",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.1+15"
|
||||
"version": "0.5.1+16"
|
||||
},
|
||||
"file_selector_ios": {
|
||||
"dependency": "transitive",
|
||||
@@ -604,11 +584,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flex_color_scheme",
|
||||
"sha256": "3344f8f6536c6ce0473b98e9f084ef80ca89024ad3b454f9c32cf840206f4387",
|
||||
"sha256": "034d5720747e6af39b2ad090d82dd92d33fde68e7964f1814b714c9d49ddbd64",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.2.0"
|
||||
"version": "8.3.0"
|
||||
},
|
||||
"flex_seed_scheme": {
|
||||
"dependency": "transitive",
|
||||
@@ -668,15 +648,25 @@
|
||||
"source": "hosted",
|
||||
"version": "2.0.5"
|
||||
},
|
||||
"flutter_math_fork": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_math_fork",
|
||||
"sha256": "6d5f2f1aa57ae539ffb0a04bb39d2da67af74601d685a161aff7ce5bda5fa407",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.4"
|
||||
},
|
||||
"flutter_plugin_android_lifecycle": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "flutter_plugin_android_lifecycle",
|
||||
"sha256": "6382ce712ff69b0f719640ce957559dde459e55ecd433c767e06d139ddf16cab",
|
||||
"sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.29"
|
||||
"version": "2.0.30"
|
||||
},
|
||||
"flutter_secure_storage": {
|
||||
"dependency": "direct main",
|
||||
@@ -742,11 +732,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "flutter_svg",
|
||||
"sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
|
||||
"sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.0"
|
||||
"version": "2.2.1"
|
||||
},
|
||||
"flutter_test": {
|
||||
"dependency": "direct dev",
|
||||
@@ -764,11 +754,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "freezed",
|
||||
"sha256": "da32f8ba8cfcd4ec71d9decc8cbf28bd2c31b5283d9887eb51eb4a0659d8110c",
|
||||
"sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.2.0"
|
||||
"version": "3.2.3"
|
||||
},
|
||||
"freezed_annotation": {
|
||||
"dependency": "transitive",
|
||||
@@ -820,11 +810,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "go_router",
|
||||
"sha256": "8b1f37dfaf6e958c6b872322db06f946509433bec3de753c3491a42ae9ec2b48",
|
||||
"sha256": "b1488741c9ce37b72e026377c69a59c47378493156fc38efb5a54f6def3f92a3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "16.1.0"
|
||||
"version": "16.2.2"
|
||||
},
|
||||
"graphs": {
|
||||
"dependency": "transitive",
|
||||
@@ -956,41 +946,41 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "json_serializable",
|
||||
"sha256": "ce2cf974ccdee13be2a510832d7fba0b94b364e0b0395dee42abaa51b855be27",
|
||||
"sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.10.0"
|
||||
"version": "6.11.1"
|
||||
},
|
||||
"leak_tracker": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker",
|
||||
"sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
|
||||
"sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.0.9"
|
||||
"version": "11.0.2"
|
||||
},
|
||||
"leak_tracker_flutter_testing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker_flutter_testing",
|
||||
"sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
|
||||
"sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.9"
|
||||
"version": "3.0.10"
|
||||
},
|
||||
"leak_tracker_testing": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "leak_tracker_testing",
|
||||
"sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
|
||||
"sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.1"
|
||||
"version": "3.0.2"
|
||||
},
|
||||
"lints": {
|
||||
"dependency": "transitive",
|
||||
@@ -1016,8 +1006,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "packages/lw_file_system",
|
||||
"ref": "3eb0c455dd56cfcde08a7c7efaba5adbc38dd976",
|
||||
"resolved-ref": "3eb0c455dd56cfcde08a7c7efaba5adbc38dd976",
|
||||
"ref": "12843672e8f33e9370444b13fca8134f4543f7ee",
|
||||
"resolved-ref": "12843672e8f33e9370444b13fca8134f4543f7ee",
|
||||
"url": "https://github.com/LinwoodDev/dart_pkgs.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1027,8 +1017,8 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"path": "packages/lw_file_system_api",
|
||||
"ref": "2ecf53489240f055c841d7c8f92fe374cc6a27ae",
|
||||
"resolved-ref": "2ecf53489240f055c841d7c8f92fe374cc6a27ae",
|
||||
"ref": "ddd0761c3ed5a48108bddd0448df76d77eeb9da0",
|
||||
"resolved-ref": "ddd0761c3ed5a48108bddd0448df76d77eeb9da0",
|
||||
"url": "https://github.com/LinwoodDev/dart_pkgs.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1038,8 +1028,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "packages/lw_sysapi",
|
||||
"ref": "82ef4b4f68a18e55226b3030293e26c28b4964c2",
|
||||
"resolved-ref": "82ef4b4f68a18e55226b3030293e26c28b4964c2",
|
||||
"ref": "7a9ebaba930ca39b6d2a4a76ab5056d7fad18a01",
|
||||
"resolved-ref": "7a9ebaba930ca39b6d2a4a76ab5056d7fad18a01",
|
||||
"url": "https://github.com/LinwoodDev/dart_pkgs.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1079,8 +1069,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "packages/material_leap",
|
||||
"ref": "792044f51747d7d078203904e460d4ef504a9db9",
|
||||
"resolved-ref": "792044f51747d7d078203904e460d4ef504a9db9",
|
||||
"ref": "12843672e8f33e9370444b13fca8134f4543f7ee",
|
||||
"resolved-ref": "12843672e8f33e9370444b13fca8134f4543f7ee",
|
||||
"url": "https://github.com/LinwoodDev/dart_pkgs.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1130,11 +1120,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "network_info_plus",
|
||||
"sha256": "f926b2ba86aa0086a0dfbb9e5072089bc213d854135c1712f1d29fc89ba3c877",
|
||||
"sha256": "2866dadcbee2709e20d67737a1556f5675b8b0cdcf2c1659ba74bc21bffede4f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.1.4"
|
||||
"version": "7.0.0"
|
||||
},
|
||||
"network_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1150,8 +1140,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "packages/networker/networker",
|
||||
"ref": "2e0ab5b548cb8e2d64ca24e0d7b4a6cfcc6d57fe",
|
||||
"resolved-ref": "2e0ab5b548cb8e2d64ca24e0d7b4a6cfcc6d57fe",
|
||||
"ref": "4f221c5943ceb786eb7bd427eb71a8cc1346b9b8",
|
||||
"resolved-ref": "4f221c5943ceb786eb7bd427eb71a8cc1346b9b8",
|
||||
"url": "https://github.com/LinwoodDev/dart_pkgs.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1161,8 +1151,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "packages/networker/networker_crypto",
|
||||
"ref": "1cc2988f680758fcb45c88b3905b0312d8c5a513",
|
||||
"resolved-ref": "1cc2988f680758fcb45c88b3905b0312d8c5a513",
|
||||
"ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
|
||||
"resolved-ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
|
||||
"url": "https://github.com/LinwoodDev/dart_pkgs.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1172,8 +1162,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "packages/networker/networker_socket",
|
||||
"ref": "72c7cdd7a60d98c3a7f587122da83dc8b99b7ed0",
|
||||
"resolved-ref": "72c7cdd7a60d98c3a7f587122da83dc8b99b7ed0",
|
||||
"ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
|
||||
"resolved-ref": "ec6f31ba3eb0da17bdef6a8d66ef6caafcabd908",
|
||||
"url": "https://github.com/LinwoodDev/dart_pkgs.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1193,11 +1183,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "one_dollar_unistroke_recognizer",
|
||||
"sha256": "459ba12aaada0e85e8f211f62fea649f246ccb74f726527593a0716bf1bcf6c4",
|
||||
"sha256": "599a074c6cec9c1517e382368e5ea470abbd04a82fe3700472a7b042de882384",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.3"
|
||||
"version": "1.3.4"
|
||||
},
|
||||
"package_config": {
|
||||
"dependency": "transitive",
|
||||
@@ -1213,11 +1203,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "package_info_plus",
|
||||
"sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
|
||||
"sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "8.3.1"
|
||||
"version": "9.0.0"
|
||||
},
|
||||
"package_info_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1263,11 +1253,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "path_provider_android",
|
||||
"sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
|
||||
"sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.17"
|
||||
"version": "2.2.18"
|
||||
},
|
||||
"path_provider_foundation": {
|
||||
"dependency": "transitive",
|
||||
@@ -1332,23 +1322,22 @@
|
||||
"perfect_freehand": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "85a6db5889db2916733a0f6c6914e66d06931f71",
|
||||
"resolved-ref": "85a6db5889db2916733a0f6c6914e66d06931f71",
|
||||
"url": "https://github.com/CodeDoctorDE/perfect-freehand-dart.git"
|
||||
"name": "perfect_freehand",
|
||||
"sha256": "399c16dc35a6eb1dee4d9a2c638ff0fe71ebb5e8980ab41261bf4306dafaa4af",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "2.3.2"
|
||||
"source": "hosted",
|
||||
"version": "2.5.0"
|
||||
},
|
||||
"petitparser": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "petitparser",
|
||||
"sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
|
||||
"sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.1.0"
|
||||
"version": "7.0.1"
|
||||
},
|
||||
"phosphor_flutter": {
|
||||
"dependency": "direct main",
|
||||
@@ -1394,11 +1383,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "pool",
|
||||
"sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
|
||||
"sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.5.1"
|
||||
"version": "1.5.2"
|
||||
},
|
||||
"popover": {
|
||||
"dependency": "direct main",
|
||||
@@ -1434,21 +1423,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "process",
|
||||
"sha256": "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d",
|
||||
"sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "5.0.3"
|
||||
"version": "5.0.5"
|
||||
},
|
||||
"provider": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "provider",
|
||||
"sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
|
||||
"sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.1.5"
|
||||
"version": "6.1.5+1"
|
||||
},
|
||||
"pub_semver": {
|
||||
"dependency": "transitive",
|
||||
@@ -1483,13 +1472,12 @@
|
||||
"reorderable_grid": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": ".",
|
||||
"ref": "d6f6a4fcf23129400529a055292133f1030b7eee",
|
||||
"resolved-ref": "d6f6a4fcf23129400529a055292133f1030b7eee",
|
||||
"url": "https://github.com/CodeDoctorDE/reorderable_grid.git"
|
||||
"name": "reorderable_grid",
|
||||
"sha256": "c7d2e1f2e032a8fffe121f9da828546ee58db35c9c7d19d7a2d189dea2f9939d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "git",
|
||||
"version": "1.0.9"
|
||||
"source": "hosted",
|
||||
"version": "1.0.12"
|
||||
},
|
||||
"replay_bloc": {
|
||||
"dependency": "direct main",
|
||||
@@ -1575,11 +1563,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "share_plus",
|
||||
"sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
|
||||
"sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "11.1.0"
|
||||
"version": "12.0.0"
|
||||
},
|
||||
"share_plus_platform_interface": {
|
||||
"dependency": "transitive",
|
||||
@@ -1605,11 +1593,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "shared_preferences_android",
|
||||
"sha256": "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e",
|
||||
"sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.11"
|
||||
"version": "2.4.12"
|
||||
},
|
||||
"shared_preferences_foundation": {
|
||||
"dependency": "transitive",
|
||||
@@ -1691,21 +1679,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_gen",
|
||||
"sha256": "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3",
|
||||
"sha256": "ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.0"
|
||||
"version": "4.0.1"
|
||||
},
|
||||
"source_helper": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_helper",
|
||||
"sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca",
|
||||
"sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.7"
|
||||
"version": "1.3.8"
|
||||
},
|
||||
"source_span": {
|
||||
"dependency": "transitive",
|
||||
@@ -1791,8 +1779,8 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"path": "api",
|
||||
"ref": "e3731236887b11685aa9c7c94d453babf726b46c",
|
||||
"resolved-ref": "e3731236887b11685aa9c7c94d453babf726b46c",
|
||||
"ref": "1c15259fc8c5e043997ffcaafbf45348a77e3003",
|
||||
"resolved-ref": "1c15259fc8c5e043997ffcaafbf45348a77e3003",
|
||||
"url": "https://github.com/LinwoodDev/Swamp.git"
|
||||
},
|
||||
"source": "git",
|
||||
@@ -1832,21 +1820,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
|
||||
"sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.4"
|
||||
"version": "0.7.6"
|
||||
},
|
||||
"timing": {
|
||||
"tuple": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "timing",
|
||||
"sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
|
||||
"name": "tuple",
|
||||
"sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.2"
|
||||
"version": "2.0.2"
|
||||
},
|
||||
"type_plus": {
|
||||
"dependency": "transitive",
|
||||
@@ -1882,11 +1870,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "url_launcher_android",
|
||||
"sha256": "0aedad096a85b49df2e4725fa32118f9fa580f3b14af7a2d2221896a02cd5656",
|
||||
"sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.3.17"
|
||||
"version": "6.3.22"
|
||||
},
|
||||
"url_launcher_ios": {
|
||||
"dependency": "transitive",
|
||||
@@ -1982,41 +1970,41 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_graphics_compiler",
|
||||
"sha256": "ca81fdfaf62a5ab45d7296614aea108d2c7d0efca8393e96174bf4d51e6725b0",
|
||||
"sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.18"
|
||||
"version": "1.1.19"
|
||||
},
|
||||
"vector_math": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vector_math",
|
||||
"sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
|
||||
"sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.4"
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"vm_service": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vm_service",
|
||||
"sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
|
||||
"sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "15.0.0"
|
||||
"version": "15.0.2"
|
||||
},
|
||||
"watcher": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "watcher",
|
||||
"sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
|
||||
"sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.2"
|
||||
"version": "1.1.3"
|
||||
},
|
||||
"web": {
|
||||
"dependency": "direct main",
|
||||
@@ -2102,11 +2090,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "xml",
|
||||
"sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
|
||||
"sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.5.0"
|
||||
"version": "6.6.1"
|
||||
},
|
||||
"yaml": {
|
||||
"dependency": "transitive",
|
||||
@@ -2120,7 +2108,7 @@
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.8.0 <4.0.0",
|
||||
"flutter": ">=3.32.8"
|
||||
"dart": ">=3.9.0 <4.0.0",
|
||||
"flutter": ">=3.35.4"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
|
||||
asl20 # or
|
||||
mit
|
||||
];
|
||||
maintainers = with maintainers; [ mglolenstine ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cherrytree";
|
||||
version = "1.6.0";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "giuspen";
|
||||
repo = "cherrytree";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VzY91ZyHL1gNj5liTzisA6iL74294CPLLa8duJy0m8A=";
|
||||
hash = "sha256-YsxhjATadOielthdPyfNrPCL9nhFny00WugDHmRk03k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,17 +3,18 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clipper2";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AngusJohnson";
|
||||
repo = "Clipper2";
|
||||
rev = "Clipper2_${version}";
|
||||
hash = "sha256-6lvzU93+UnArEtRe2mJ4YB16+5sDCrBcPzljNAEFt8M=";
|
||||
hash = "sha256-2vZXxT5hISz2xbWbvYNGTrq9QovTjNwUK103iVtz8ok=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/CPP";
|
||||
@@ -28,6 +29,8 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Polygon Clipping and Offsetting - C++ Only";
|
||||
longDescription = ''
|
||||
|
||||
@@ -41,13 +41,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cockpit";
|
||||
version = "346";
|
||||
version = "347";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cockpit-project";
|
||||
repo = "cockpit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ZTVcZ1a43cwm8y74XKp9z8tqSK1wxlW9lfoLN/cSFcs=";
|
||||
hash = "sha256-9jVtO97QdFe8pp6JmuftaKyVM/MnRCYCWLPLrtjgbJ8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -2,47 +2,62 @@
|
||||
lib,
|
||||
stdenv,
|
||||
buildGoModule,
|
||||
docker,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
installShellFiles,
|
||||
nix-update-script,
|
||||
oras,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "copacetic";
|
||||
version = "0.10.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-copacetic";
|
||||
repo = "copacetic";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-aLFRhmxJ5Hj2vvdYCwALBeK0avPF/jDWUgQiSw0fFGg=";
|
||||
hash = "sha256-kgFT+IK6zCGoGK8L/lwXyiUXCWYG7ElziPs0Q1cq+fw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+iS6nom52eofgcj/fZPVs2Eog9Un5ThSX+EBVmHTSlo=";
|
||||
vendorHash = "sha256-qe2VJHXSYtZJlMd5R2J1NXWcXb8+cbTiDBQeN20fbEE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
docker
|
||||
oras
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
env.CGO_ENABLED = "0";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/project-copacetic/copacetic/pkg/version.GitVersion=${version}"
|
||||
"-X main.version=${version}"
|
||||
"-X=github.com/project-copacetic/copacetic/pkg/version.GitVersion=${version}"
|
||||
"-X=main.version=${version}"
|
||||
];
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
# Skip tests that require network access
|
||||
# Skip tests that require network access and container services
|
||||
skippedTests = [
|
||||
"TestNewClient/custom_buildkit_addr"
|
||||
"TestPatch"
|
||||
"TestPlugins/docker.io"
|
||||
"TestPatchPartialArchitectures"
|
||||
"TestPushToRegistry"
|
||||
"TestMultiPlatformPluginPatch"
|
||||
"TestPodmanLoader_Load_Success"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
|
||||
|
||||
postInstall = ''
|
||||
@@ -58,8 +73,9 @@ buildGoModule rec {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://project-copacetic.github.io/copacetic/";
|
||||
description = "Tool for directly patching vulnerabilities in container images";
|
||||
homepage = "https://project-copacetic.github.io/copacetic/";
|
||||
changelog = "https://github.com/project-copacetic/copacetic/releases/tag/${src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "copa";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "cosmic-protocols";
|
||||
version = "0-unstable-2025-09-01";
|
||||
version = "0-unstable-2025-09-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-protocols";
|
||||
rev = "6254f50abc6dbfccadc6939f80e20081ab5f9d51";
|
||||
hash = "sha256-gOYgz07RGZoBp2RbHn0jUGLGXH/geoch/Y27Qh+jBao=";
|
||||
rev = "af1997b1827ad64aab46fa31c0b77fb20d7a537a";
|
||||
hash = "sha256-gIfCk8FqZo1iFwTTtcLqnX14Jg3k6UXIBkpKsom43EU=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
@@ -1,19 +1,20 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
python3,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "crackql";
|
||||
version = "unstable-20230818";
|
||||
version = "1.0-unstable-2023-08-18";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nicholasaleks";
|
||||
repo = "CrackQL";
|
||||
# rev = "refs/tags/${version}";
|
||||
# Switch to tag with the next update
|
||||
# tag = version;
|
||||
# Switch to tag (and remove the extraArgs from the updateScript) next update
|
||||
rev = "ac26a44c2dd201f65da0d1c3f95eaf776ed1b2dd";
|
||||
hash = "sha256-XlHbGkwdOV1nobjtQP/M3IIEuzXHBuwf52EsXf3MWoM=";
|
||||
};
|
||||
@@ -33,6 +34,10 @@ python3.pkgs.buildPythonApplication {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "GraphQL password brute-force and fuzzing utility";
|
||||
mainProgram = "crackql";
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "crates-lsp";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MathiasPius";
|
||||
repo = "crates-lsp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s42nWQC2tD7vhQNPdTQNRokwXqeBhELidVYTlos+No0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XqUWcbaOZXRWzIvL9Kbo6Unl0rmeGxHO4+674uHukAs=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Language Server implementation for Cargo.toml";
|
||||
homepage = "https://github.com/MathiasPius/crates-lsp";
|
||||
license = with lib.licenses; [ mit ];
|
||||
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"aarch64-darwin"
|
||||
"x86_64-darwin"
|
||||
"x86_64-windows"
|
||||
];
|
||||
maintainers = with lib.maintainers; [ steveej ];
|
||||
mainProgram = "crates-lsp";
|
||||
};
|
||||
})
|
||||
@@ -157,6 +157,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
homepage = "https://github.com/databrickslabs/dbx";
|
||||
changelog = "https://github.com/databrickslabs/dbx/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.databricks-dbx;
|
||||
maintainers = with lib.maintainers; [ GuillaumeDesforges ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "diesel-cli";
|
||||
version = "2.2.12";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version;
|
||||
crateName = "diesel_cli";
|
||||
hash = "sha256-cBufd4HwNffkK2VDPMMUT1qZfgKNa6XKpxT5QlQesyc=";
|
||||
hash = "sha256-s/RJ83TuW42MIYgKXq5tlqJ73u0aucuXrR8bFArqT5A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CmzUe/R9iFU//u0/FxMonYWyx0EJnI/blUktYN/eNe8=";
|
||||
cargoHash = "sha256-XmWrXLOYm7y7+0mqT0WSmT6LhHAPA9UbGODlluBKyZw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "Super simple HTTP server that replies a fixed body with a fixed response code";
|
||||
homepage = "https://github.com/svenstaro/dummyhttp";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ GuillaumeDesforges ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "dummyhttp";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "eiquadprog";
|
||||
version = "1.2.9";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stack-of-tasks";
|
||||
repo = "eiquadprog";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VqRx06sCCZrnB+NWm6Z9OMKzjKQIydGgKQU6fMY7phk=";
|
||||
hash = "sha256-8CwyTREHzTtgXTnzAIcRAlKm3fBEUEeMxNwzzEMADqk=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
ffmpeg-full,
|
||||
gtk3,
|
||||
pango,
|
||||
@@ -11,7 +12,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "escrotum";
|
||||
version = "unstable-2020-12-07";
|
||||
version = "1.0.1-unstable-2020-12-07";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -57,6 +58,10 @@ python3Packages.buildPythonApplication {
|
||||
cp man/escrotum.1 $man/share/man/man1/
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Roger/escrotum";
|
||||
description = "Linux screen capture using pygtk, inspired by scrot";
|
||||
|
||||
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = with licenses; [ asl20 ];
|
||||
mainProgram = "spin";
|
||||
maintainers = with maintainers; [ mglolenstine ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -83,13 +83,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal";
|
||||
version = "3.11.3";
|
||||
version = "3.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "gdal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3C/gJejqfdT5pVNej2KlIdbOKZbYJY7jUFTfLsRoeQk=";
|
||||
hash = "sha256-CFQF3vDhhXsAnIfUcn6oTQ4Xm+GH/36dqSGc0HvyEJ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
|
||||
hash = "sha256-f0kqLk6Poc8jiwJGetNnN2zQ72I104R8uXHpS5MNkFY=";
|
||||
hash = "sha256-zp5BiOhld/M5Boje4RCi27fWkkGFExcUhVLdtRse7WA=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
|
||||
hash = "sha256-AYj1o6yiChVCrZypulN1bTzmLlCMonv4lbkw/uzEv6w=";
|
||||
hash = "sha256-We5VDTgtc0pso8a8+9jXMPUtEwg2437Ps5t84ZdgJjc=";
|
||||
}
|
||||
else
|
||||
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
}:
|
||||
let
|
||||
version = "5.5.239";
|
||||
version = "5.5.241";
|
||||
pname = "gdevelop";
|
||||
meta = {
|
||||
description = "Graphical Game Development Studio";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-town";
|
||||
version = "21.5.0";
|
||||
version = "22.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-town";
|
||||
repo = "git-town";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-H0WfUBrXPkqS2UnZpL6TyguzOa34KMetCwMKIvNKJ28=";
|
||||
hash = "sha256-yLDzMKyg9t5VNFXRS+FDD6W0Z80eNNywfZAMOhxNSZU=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -10,20 +10,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-guest-oslogin";
|
||||
version = "20230831.00";
|
||||
version = "20250821.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = "guest-oslogin";
|
||||
rev = version;
|
||||
sha256 = "sha256-9QCB94HVbeLjioJuSN1Aa+EqFncojPoWFxw5mS9bDGw=";
|
||||
sha256 = "sha256-dvLr3rOzHs5gRbllxqmnkLlHUFYv9Hm2vz6AkwZoZy4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles)
|
||||
substituteInPlace src/pam/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d
|
||||
substituteInPlace src/oslogin_utils.cc --replace-fail /var/google-sudoers.d /run/google-sudoers.d
|
||||
# fix "User foo not allowed because shell /bin/bash does not exist"
|
||||
substituteInPlace src/include/compat.h --replace /bin/bash /run/current-system/sw/bin/bash
|
||||
substituteInPlace src/include/compat.h --replace-fail /bin/bash /run/current-system/sw/bin/bash
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hatchet";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simagix";
|
||||
repo = "hatchet";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-m/TuO5Z4Pc2Hruxb2uRwKcccUQjExnGOt3A0fqXVt5s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FbwwAeK9L6yIVZEBN1Ay5PB2D89vQNjbtMG5pI5jAAw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=v${finalAttrs.version}"
|
||||
"-X main.repo=${finalAttrs.src.owner}/${finalAttrs.src.repo}"
|
||||
];
|
||||
|
||||
postInstall = "mv $out/bin/main $out/bin/${finalAttrs.meta.mainProgram}";
|
||||
|
||||
# the tests are using fixture files not available from the git repo.
|
||||
doCheck = false;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/simagix/hatchet";
|
||||
changelog = "https://github.com/simagix/hatchet/releases/tag/${finalAttrs.src.tag}";
|
||||
description = "MongoDB JSON Log Analyzer";
|
||||
maintainers = with lib.maintainers; [ aduh95 ];
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "hatchet";
|
||||
};
|
||||
})
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "havn";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrjackwills";
|
||||
repo = "havn";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8eufAIiUT4ahlXwlkIg9C2KN/2hJZYO4kX5ulETZriY=";
|
||||
hash = "sha256-IPCV7rpnoZfmkMepdbsbKm3s8PsA+Nn3h4ZmubwkR5E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JnPgExfdlk8SDjcnVSMvG9S2oVbBGhhLlQEmeYcbVxI=";
|
||||
cargoHash = "sha256-0a8p7mC/abltpxEpk1KwGYQ14Kk8HJNL9wY6601+qgE=";
|
||||
|
||||
checkFlags = [
|
||||
# Skip tests that require network access
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "hsd";
|
||||
version = "7.0.1";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "handshake-org";
|
||||
repo = "hsd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bmvoykpaYQDWLYKOwgKZ1V6ivzDJFM1Yo+ATkzKTP2s=";
|
||||
hash = "sha256-7hF8cJf9Oewfg5WvNpqQSrBZjpnERcdDAaxixOdArpo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-qM1oPTKffJHlHWhF5huCBPmBSajiYstjhC2GB/iMQ7E=";
|
||||
npmDepsHash = "sha256-fO8ia0FwNvMMVBUO22gUNImkXY3kjdUjQIP7s5MOJDs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "hysteria";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apernet";
|
||||
repo = "hysteria";
|
||||
rev = "app/v${version}";
|
||||
hash = "sha256-r8A1kY5zVIYLH4BmTF8BF135K5zQNBN0cvQpWI9SR2I=";
|
||||
hash = "sha256-0gXvox+/HPeyLbpyVGgP+40bsAgZZWs7MrLkdMFcqX8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TWGHOn64QvIiH5gr+il98IdO7cheAjQs/VFVwm2jKWU=";
|
||||
vendorHash = "sha256-inHWL8/ZpEMSEWhz1dwkjllN8oqNCEKAQdqvCoA6Vec=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags =
|
||||
|
||||
@@ -11,16 +11,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "imgproxy";
|
||||
version = "3.28.0";
|
||||
version = "3.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imgproxy";
|
||||
repo = "imgproxy";
|
||||
hash = "sha256-aI+rWXt+tioHFGBJk/RkYeo7JaV+10jurx7YKX448Yk=";
|
||||
hash = "sha256-vT+Nyjx2TTOCzosCV/EfMLEnyT6RCebBFNu0/IRuwak=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-L18vxiFXBlKeipMm1N/c+F+zHDQYN5CHjYwa4xi9I3s=";
|
||||
vendorHash = "sha256-0NIsaSMOBenDCGvnGdLB60sp08EaC/CezWogxTrcDdY=";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "junicode";
|
||||
version = "2.218";
|
||||
version = "2.220";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip";
|
||||
hash = "sha256-X4BN4USa/Ig2TqauOVMwAAASYISGuVHl/43Kqm0r828=";
|
||||
hash = "sha256-NZdNWnWMWscAI0p878mQ8rOoo5TlEDrKYzfiqGeo4lc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -24,11 +24,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keycloak";
|
||||
version = "26.3.4";
|
||||
version = "26.3.5";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
|
||||
hash = "sha256-K+7ZUBN3iYGMteP/ycu4M5rJPdIavN144BgOwktdu3g=";
|
||||
hash = "sha256-y95R+mUkqvfCwnnjyFQOcs03ekezR/yR+61zBx/w/Ow=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "kirsch";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/molarmanful/kirsch/releases/download/v${finalAttrs.version}/kirsch-release_v${finalAttrs.version}.zip";
|
||||
hash = "sha256-6POi3N1JX6FFWHwqOlB3mrkHMYG+TJXz9URarbSPrZw=";
|
||||
hash = "sha256-VGkZ4pWR83SpDd3osLEmmsSecGpAaHiQ5apRcxa8EhA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ xorg.mkfontscale ];
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.namesys.com/";
|
||||
description = "Support library for Reiser4";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ mglolenstine ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ let
|
||||
|
||||
pname = "librewolf-bin-unwrapped";
|
||||
|
||||
version = "142.0.1-1";
|
||||
version = "143.0-1";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -47,9 +47,9 @@ stdenv.mkDerivation {
|
||||
url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz";
|
||||
hash =
|
||||
{
|
||||
i686-linux = "sha256-hDB1bo5TCiahFGAOzWLRMxy6hc7whsGbfiJsNxhnXok=";
|
||||
x86_64-linux = "sha256-ijfsxA9XUZanPUXvOysouJNv7tUoclE1E4PoFOZP/EY=";
|
||||
aarch64-linux = "sha256-pB+AQropvNw7kCUqeDHPMkDVht4Dl/98tcaszlw3Qj8=";
|
||||
i686-linux = "sha256-ZDsPexyrK8FgMKAP3TzHnBTvDXLnW50SW6tOTGqWVaI=";
|
||||
x86_64-linux = "sha256-jP6PBvh+RNDpgv5OGX7HSR1Lo//vDSVjUFUsayMONTM=";
|
||||
aarch64-linux = "sha256-DuCQMjL7ZsHAtu2ppX/46QRL/Dt3acOJaTzGoYGfQuM=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or throwSystem;
|
||||
};
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
makeFontsConf,
|
||||
nix-update-script,
|
||||
gitUpdater,
|
||||
testers,
|
||||
autoreconfHook,
|
||||
docSupport ? true,
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsidplayfp";
|
||||
version = "2.15.0";
|
||||
version = "2.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libsidplayfp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-rK7Il8WE4AJbn7GKn21fXr1o+DDdyOjfJ0saeqcZ5Pg=";
|
||||
hash = "sha256-wnbQy0PHHpkgNm3SC7GZyxSAUYd5eexVY9Dg1oiCjRo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
|
||||
@@ -82,7 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
updateScript = nix-update-script { };
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.1.7";
|
||||
version = "2.1.10";
|
||||
pname = "lunatask";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
|
||||
hash = "sha256-Nj3CTy0qVSYMFyuUKmSkfwwqZVLh//Zqnh+tJVaVAIM=";
|
||||
hash = "sha256-8lnMg3mkdfXqimOdyujk/DE8CU6lzj9RDM8Nb2cEUms=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -26,7 +26,7 @@ buildNpmPackage rec {
|
||||
description = "About A CLI interface for Marp and Marpit based converters";
|
||||
homepage = "https://github.com/marp-team/marp-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GuillaumeDesforges ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = nodejs.meta.platforms;
|
||||
mainProgram = "marp";
|
||||
};
|
||||
|
||||
@@ -1,69 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
libX11,
|
||||
libXft,
|
||||
libXi,
|
||||
xorgproto,
|
||||
libSM,
|
||||
libICE,
|
||||
freetype,
|
||||
pkg-config,
|
||||
which,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mrxvt";
|
||||
version = "0.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz";
|
||||
sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXft
|
||||
libXi
|
||||
xorgproto
|
||||
libSM
|
||||
libICE
|
||||
freetype
|
||||
which
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-x"
|
||||
"--enable-frills"
|
||||
"--enable-xft"
|
||||
"--enable-xim"
|
||||
# "--with-term=xterm"
|
||||
"--with-max-profiles=100"
|
||||
"--with-max-term=100"
|
||||
"--with-save-lines=10000"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2";
|
||||
'';
|
||||
|
||||
passthru.tests.test = nixosTests.terminal-emulators.mrxvt;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight multitabbed feature-rich X11 terminal emulator";
|
||||
longDescription = "
|
||||
Multitabbed lightweight terminal emulator based on rxvt.
|
||||
Supports transparency, backgroundimages, freetype fonts, ...
|
||||
";
|
||||
homepage = "https://sourceforge.net/projects/materm";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
knownVulnerabilities = [
|
||||
"Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)"
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nakama";
|
||||
version = "3.31.0";
|
||||
version = "3.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "heroiclabs";
|
||||
repo = "nakama";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-e31Mn4Ma+7vjOtwV13w79AshN9LCg2V0V3h9sSaad1U=";
|
||||
hash = "sha256-Ly8NYqaJIC/ySPrCiEwwWR3+Zyk6dEW0r7SeyOS1CwE=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nb";
|
||||
version = "7.21.1";
|
||||
version = "7.21.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xwmx";
|
||||
repo = "nb";
|
||||
rev = version;
|
||||
hash = "sha256-d9QhJBRdfTMIDHFOX4/fMmZnqCMeGqQhJTr60Ea7ucw=";
|
||||
hash = "sha256-jvjAxXynLo19D5GdnEXtmcrxjXQRYQYOiZ6I1Wl47xA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -26,16 +26,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
|
||||
pname = "neovide";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovide";
|
||||
repo = "neovide";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-2iV3g6tcCkMF7sFG/GZDz3czPZNIDi6YLfrVzYO9jYI=";
|
||||
hash = "sha256-NJ4BuJLABIuB7We11QGoKZ3fgjDBdZDyZuBKq6LIWA8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YlHAcUCRk6ROg5yXIumHfsiR/2TrsSzbuXz/IQK7sEo=";
|
||||
cargoHash = "sha256-DD2c63JHMdzwD1OmC7c9dMB59qjvdAYZ9drQf3f8xCs=";
|
||||
|
||||
SKIA_SOURCE_DIR =
|
||||
let
|
||||
@@ -43,8 +43,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
|
||||
owner = "rust-skia";
|
||||
repo = "skia";
|
||||
# see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
|
||||
tag = "m135-0.83.1";
|
||||
hash = "sha256-TSGPJl9DfWQtrkNIhv40s8VcuudCjbiSh+QjLc0hKN4=";
|
||||
tag = "m140-0.87.4";
|
||||
hash = "sha256-pHxqTrqguZcPmuZgv0ASbJ3dgn8JAyHI7+PdBX5gAZQ=";
|
||||
};
|
||||
# The externals for skia are taken from skia/DEPS
|
||||
externals = linkFarm "skia-externals" (
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{
|
||||
"expat": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git",
|
||||
"rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
|
||||
"sha256": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg="
|
||||
"rev": "8e49998f003d693213b538ef765814c7d21abada",
|
||||
"sha256": "sha256-zP2kiB4nyLi0/I8OsRhxKG0qRGPe2ALLQ+HHfqlBJ6Y="
|
||||
},
|
||||
"libjpeg-turbo": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
|
||||
"rev": "ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf",
|
||||
"sha256": "sha256-UhDKDfAgcCS92R2EvxKpoiJMvakUDQgyHu2k/xeE7do="
|
||||
"rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
|
||||
"sha256": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs="
|
||||
},
|
||||
"icu": {
|
||||
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
|
||||
@@ -21,8 +21,8 @@
|
||||
},
|
||||
"harfbuzz": {
|
||||
"url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
|
||||
"rev": "a070f9ebbe88dc71b248af9731dd49ec93f4e6e6",
|
||||
"sha256": "sha256-DSjzCLqMmlYCz2agrrY2iwr+VdpxukE/QbhzXmVOVpw="
|
||||
"rev": "08b52ae2e44931eef163dbad71697f911fadc323",
|
||||
"sha256": "sha256-sP9FQLUEgTZFlvfYqSZnzZqBMxVotzD0FKKsu3/OdUw="
|
||||
},
|
||||
"wuffs": {
|
||||
"url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
|
||||
|
||||
@@ -68,13 +68,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.57.1";
|
||||
version = "0.58.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DwNJSQAbFVIkxOZCdZkMWtPe1YQglpF6kIsy653jFMo=";
|
||||
hash = "sha256-I6nWYc/eITqXMBZVEcNj/b4rgJLQovA19PJW7ceHyD8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZjeTKj99BTSNFOvtywfmuXfYVxU3s9O2EwD/4IZodvs=";
|
||||
|
||||
@@ -25,14 +25,14 @@ in
|
||||
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "oci-cli";
|
||||
version = "3.66.0";
|
||||
version = "3.66.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oracle";
|
||||
repo = "oci-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Hxmon49aaa0uUWiyL4QX9qUKQK+rkSbfcB26qdBweU4=";
|
||||
hash = "sha256-aU7rVbmKWkB119oy2sbEMe3nNXrWcpTa4hPHGil8HFg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@@ -9,12 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pg-dump-anon";
|
||||
version = "1.3.2";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "dalibo";
|
||||
repo = "postgresql_anonymizer";
|
||||
rev = version;
|
||||
hash = "sha256-MGdGvd4P1fFKdd6wnS2V5Tdly6hJlAmSA4TspnO/6Tk=";
|
||||
tag = version;
|
||||
hash = "sha256-vAsKTkFx8HLKDdXIQt6fEF3l7EzzvcilGfqNtBa0AMM=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/pg_dump_anon";
|
||||
@@ -29,11 +30,11 @@ buildGoModule rec {
|
||||
--prefix PATH : ${lib.makeBinPath [ postgresql ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Export databases with data being anonymized with the anonymizer extension";
|
||||
homepage = "https://postgresql-anonymizer.readthedocs.io/en/stable/";
|
||||
teams = [ teams.flyingcircus ];
|
||||
license = licenses.postgresql;
|
||||
teams = [ lib.teams.flyingcircus ];
|
||||
license = lib.licenses.postgresql;
|
||||
mainProgram = "pg_dump_anon";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
|
||||
description = "Picoprobe udev rules list";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ mglolenstine ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pigeon";
|
||||
version = "1.1.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mna";
|
||||
repo = "pigeon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg=";
|
||||
hash = "sha256-rEkeB5NI51dsLOxd9RnJWmfUP78owOJl6j9t3nz277s=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JbBXRkxnB7LeeWdBLIQvyjvWo0zZ1EOuEUPXxHWiq+E=";
|
||||
vendorHash = "sha256-vaCgvj/n8MuktaZ2+tQVlQW0LrptQkEQK2qM+YwXXhg=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -62,6 +62,6 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
homepage = "https://pizarra.categulario.xyz/en/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mglolenstine ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,30 +3,22 @@
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "plecost";
|
||||
version = "1.1.4";
|
||||
version = "0-unstable-2022-08-03";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iniqua";
|
||||
repo = "plecost";
|
||||
# Release is untagged
|
||||
rev = "aa40e504bee95cf731f0cc9f228bcf5fdfbe6194";
|
||||
sha256 = "K8ESI2EOqH9zBDfSKgVcTKjCMdRhBiwltIbXDt1vF+M=";
|
||||
rev = "4895e345d71bffe956be43530632e303dd379a5f";
|
||||
hash = "sha256-cXXFLoiLZpo3qiAPztavns4EkOG2aC6UKMf0N4Eun/w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compatibility with aiohttp 3.x
|
||||
# Merged - pending next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/iniqua/plecost/pull/34/commits/c09e7fab934f136f8fbc5f219592cf5fec151cf9.patch";
|
||||
sha256 = "sha256-G7Poo3+d+PQTrg8PCrmsG6nMHt8CXgiuAu+ZNvK8oiw=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
@@ -41,6 +33,8 @@ python3Packages.buildPythonApplication {
|
||||
|
||||
pythonImportsCheck = [ "plecost_lib" ];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vulnerability fingerprinting and vulnerability finder for Wordpress blog engine";
|
||||
mainProgram = "plecost";
|
||||
|
||||
@@ -1,22 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchgit,
|
||||
rust-jemalloc-sys,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "postgres-lsp";
|
||||
version = "0.13.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase-community";
|
||||
repo = "postgres-language-server";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/supabase-community/postgres-language-server";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0Q8MxKeh12STWIJ9441uTz+qQXEJjCESj21C4X8CBC4=";
|
||||
hash = "sha256-ZintjrSeNsYR6A8tlEfSetse7d79jgLdCpdu+sMe3Zk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oIbS5BUpNOXwiRconqJI/jdXeX05FIZVNl2kYt+79wY=";
|
||||
cargoHash = "sha256-x/Wbx3noH6YOQIis1sN8ylQApjhSy4/mrxX6jvZFs6A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
glib,
|
||||
@@ -9,7 +10,7 @@
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "printrun";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kliment";
|
||||
@@ -18,46 +19,41 @@ python3Packages.buildPythonApplication rec {
|
||||
hash = "sha256-INJNGAmghoPIiivQp6AV1XmhyIu8SjfKqL8PTpi/tkY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pyglet"
|
||||
"cairosvg"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
appdirs
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
cython
|
||||
dbus-python
|
||||
numpy
|
||||
six
|
||||
wxpython
|
||||
psutil
|
||||
pyglet
|
||||
pyopengl
|
||||
pyserial
|
||||
cffi
|
||||
cairosvg
|
||||
lxml
|
||||
puremagic
|
||||
];
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
pyserial
|
||||
wxpython
|
||||
numpy
|
||||
pyglet
|
||||
psutil
|
||||
lxml
|
||||
platformdirs
|
||||
puremagic
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux dbus-python
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin pyobjc-framework-Cocoa;
|
||||
|
||||
pythonRelaxDeps = [ "pyglet" ];
|
||||
|
||||
# pyglet.canvas.xlib.NoSuchDisplayException: Cannot connect to "None"
|
||||
doCheck = false;
|
||||
|
||||
setupPyBuildFlags = [ "-i" ];
|
||||
|
||||
postInstall = ''
|
||||
for f in $out/share/applications/*.desktop; do
|
||||
sed -i -e "s|/usr/|$out/|g" "$f"
|
||||
done
|
||||
substituteInPlace $out/share/applications/*.desktop \
|
||||
--replace-fail /usr/bin/ ""
|
||||
substituteInPlace $out/share/applications/pronterface.desktop \
|
||||
--replace-fail "Path=/usr/share/pronterface/" ""
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
@@ -70,6 +66,6 @@ python3Packages.buildPythonApplication rec {
|
||||
description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software";
|
||||
homepage = "https://github.com/kliment/Printrun";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/kliment/Printrun/releases/tag/${src.tag}";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "proj";
|
||||
version = "9.6.1";
|
||||
version = "9.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-81wrwBB11SKhq2dTBrvbuUd97iYkTYYrYyKpk2IlHAA=";
|
||||
hash = "sha256-Vdznj9WGuws1p+owDNHlVERjOM3fS1+RBtqe01q500E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -21,14 +21,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "prowler";
|
||||
version = "5.7.5";
|
||||
version = "5.12.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prowler-cloud";
|
||||
repo = "prowler";
|
||||
tag = version;
|
||||
hash = "sha256-KcHHZPklJZ7o5cs30rL+vGaeST8LUdGfdhG7daZZzX0=";
|
||||
hash = "sha256-HSMlWuwYc8m6WUNy0Ja5VuC2lbC3mbK2bPHNQY+nk0U=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
@@ -40,23 +40,29 @@ py.pkgs.buildPythonApplication rec {
|
||||
awsipranges
|
||||
azure-identity
|
||||
azure-keyvault-keys
|
||||
azure-mgmt-apimanagement
|
||||
azure-mgmt-applicationinsights
|
||||
azure-mgmt-authorization
|
||||
azure-mgmt-compute
|
||||
azure-mgmt-containerregistry
|
||||
azure-mgmt-containerservice
|
||||
azure-mgmt-cosmosdb
|
||||
azure-mgmt-databricks
|
||||
azure-mgmt-keyvault
|
||||
azure-mgmt-loganalytics
|
||||
azure-mgmt-monitor
|
||||
azure-mgmt-network
|
||||
azure-mgmt-rdbms
|
||||
azure-mgmt-recoveryservices
|
||||
azure-mgmt-recoveryservicesbackup
|
||||
azure-mgmt-resource
|
||||
azure-mgmt-security
|
||||
azure-mgmt-search
|
||||
azure-mgmt-security
|
||||
azure-mgmt-sql
|
||||
azure-mgmt-storage
|
||||
azure-mgmt-subscription
|
||||
azure-mgmt-web
|
||||
azure-monitor-query
|
||||
azure-storage-blob
|
||||
boto3
|
||||
botocore
|
||||
@@ -65,6 +71,7 @@ py.pkgs.buildPythonApplication rec {
|
||||
dash
|
||||
dash-bootstrap-components
|
||||
detect-secrets
|
||||
dulwich
|
||||
google-api-python-client
|
||||
google-auth-httplib2
|
||||
jsonschema
|
||||
@@ -73,6 +80,7 @@ py.pkgs.buildPythonApplication rec {
|
||||
msgraph-sdk
|
||||
numpy
|
||||
pandas
|
||||
py-iam-expand
|
||||
py-ocsf-models
|
||||
pydantic_1
|
||||
pygithub
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
jq,
|
||||
git,
|
||||
ripgrep,
|
||||
}:
|
||||
|
||||
@@ -30,7 +31,10 @@ buildNpmPackage (finalAttrs: {
|
||||
jq
|
||||
];
|
||||
|
||||
buildInputs = [ ripgrep ];
|
||||
buildInputs = [
|
||||
git
|
||||
ripgrep
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Remove @lvce-editor/ripgrep dependency (no network on buildPhase
|
||||
@@ -76,6 +80,7 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
mkdir -p $out/bin $out/share/qwen-code
|
||||
cp -r bundle/* $out/share/qwen-code/
|
||||
cp node_modules/tiktoken/tiktoken_bg.wasm $out/share/qwen-code/
|
||||
patchShebangs $out/share/qwen-code
|
||||
ln -s $out/share/qwen-code/gemini.js $out/bin/qwen
|
||||
|
||||
|
||||
@@ -39,13 +39,13 @@ assert (!withHyperscan) || (!withVectorscan);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rspamd";
|
||||
version = "3.12.1";
|
||||
version = "3.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rspamd";
|
||||
repo = "rspamd";
|
||||
rev = version;
|
||||
hash = "sha256-bAkT0msUkgGkjAIlF7lnJbimBKW1NSn2zjkCj3ErJ1I=";
|
||||
hash = "sha256-0qX/rvcEXxzr/PGL2A59T18Mfcalrjz0KJpEWBKJsZg=";
|
||||
};
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "rustlings";
|
||||
version = "6.4.0";
|
||||
version = "6.5.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@@ -19,15 +19,16 @@ rustPlatform.buildRustPackage {
|
||||
owner = "rust-lang";
|
||||
repo = "rustlings";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VdIIcpyoCuid3MECVc9aKeIOUlxGlxcG7znqbqo9pjc=";
|
||||
hash = "sha256-dUQIzNPxmKbhew9VjFIW7bY0D1IkuJ5+hRY2/CwmYhY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QWmK+chAUnMGjqLq2xN5y6NJZJBMDTszImB9bXhO4+w=";
|
||||
cargoHash = "sha256-AvwulWEqZMywaG7lEmT8nn9s2hda+bbIV1rnVXnKH8o=";
|
||||
|
||||
# Disabled test that does not work well in an isolated environment
|
||||
checkFlags = [
|
||||
"--skip=run_compilation_success"
|
||||
"--skip=run_test_success"
|
||||
"--skip=init"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,21 +9,21 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sauce-connect";
|
||||
version = "5.2.2";
|
||||
version = "5.3.0";
|
||||
|
||||
passthru = {
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_linux.x86_64.tar.gz";
|
||||
hash = "sha256-JyQkXp7/jrgWEKNPHUw/exXc5nqjejHWsy3IiEJ5gqU=";
|
||||
hash = "sha256-7DeGVdRtbgwpDpt7txuYLmf7R6KYeneMOGPH0B1PTIQ=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_linux.aarch64.tar.gz";
|
||||
hash = "sha256-8EZjqid4/r2p8jZxQiI1x1IyDFXHwWDbmCOVXdnmmgs=";
|
||||
hash = "sha256-3fUB0KLFEmSzRlYSZhJ3VP4QJC/S1R2Iyk3+o82sNRg=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://saucelabs.com/downloads/sauce-connect/${version}/sauce-connect-${version}_darwin.all.zip";
|
||||
hash = "sha256-E4S7hbLSnRd5M/yOiUyPasYNg7ZmQ10S6fyn9Qs1BFk=";
|
||||
hash = "sha256-nSmDenuel+L4HKhDEHMirGwKj0A7plIXAqf+T7Agc3A=";
|
||||
};
|
||||
aarch64-darwin = passthru.sources.x86_64-darwin;
|
||||
};
|
||||
|
||||
@@ -19,7 +19,7 @@ all_versions=$(jq --exit-status --raw-output \
|
||||
'.all_downloads | to_entries[] | select(.value | has("linux") and has("osx")) | .key' \
|
||||
<<< "$response")
|
||||
latest_version=$(sort --version-sort <<< "$all_versions" | tail -n 1)
|
||||
for platform in x86_64-linux x86_64-darwin; do
|
||||
for platform in x86_64-linux aarch64-linux x86_64-darwin; do
|
||||
update-source-version sauce-connect "$latest_version" \
|
||||
--ignore-same-version \
|
||||
--source-key="passthru.sources.$platform"
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
{
|
||||
pname,
|
||||
version,
|
||||
src,
|
||||
meta,
|
||||
lib,
|
||||
stdenv,
|
||||
xar,
|
||||
cpio,
|
||||
libusb1,
|
||||
fixDarwinDylibNames,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
;
|
||||
|
||||
nativeBuildInputs = [
|
||||
xar
|
||||
cpio
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
xar -xf $src
|
||||
zcat SDRplayAPI.pkg/Payload | cpio -i
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
env = {
|
||||
majorVersion = lib.versions.major version;
|
||||
majorMinorVersion = lib.versions.majorMinor version;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
root="$PWD/Library/SDRplayAPI/${version}"
|
||||
|
||||
mkdir -p $out/{bin,lib}
|
||||
|
||||
cp "$root/bin/sdrplay_apiService" "$out/bin"
|
||||
cp -r "$root/include" "$out/include"
|
||||
|
||||
lib="$out/lib/libsdrplay_api.$majorMinorVersion.dylib"
|
||||
cp "$root/lib/libsdrplay_api.so.$majorMinorVersion" "$lib"
|
||||
ln -s "$lib" "$out/lib/libsdrplay_api.$majorVersion.dylib"
|
||||
ln -s "$lib" "$out/lib/libsdrplay_api.dylib"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
install_name_tool -add_rpath "${lib.getLib libusb1}/lib" $out/bin/sdrplay_apiService
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
{
|
||||
pname,
|
||||
version,
|
||||
src,
|
||||
meta,
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
udev,
|
||||
libusb1,
|
||||
}:
|
||||
let
|
||||
arch = stdenv.hostPlatform.qemuArch;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
;
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
udev
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
sh "$src" --noexec --target source
|
||||
'';
|
||||
|
||||
sourceRoot = "source";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
env = {
|
||||
majorVersion = lib.versions.major version;
|
||||
majorMinorVersion = lib.versions.majorMinor version;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,lib,include}
|
||||
libName="libsdrplay_api"
|
||||
cp "${arch}/$libName.so.$majorMinorVersion" $out/lib/
|
||||
ln -s "$out/lib/$libName.so.$majorMinorVersion" "$out/lib/$libName.so.$majorVersion"
|
||||
ln -s "$out/lib/$libName.so.$majorVersion" "$out/lib/$libName.so"
|
||||
cp "${arch}/sdrplay_apiService" $out/bin/
|
||||
cp -r inc/* $out/include/
|
||||
'';
|
||||
}
|
||||
@@ -1,79 +1,59 @@
|
||||
{
|
||||
callPackage,
|
||||
fetchurl,
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
udev,
|
||||
libusb1,
|
||||
}:
|
||||
|
||||
let
|
||||
arch =
|
||||
if stdenv.hostPlatform.isx86_64 then
|
||||
"x86_64"
|
||||
else if stdenv.hostPlatform.isi686 then
|
||||
"i686"
|
||||
else if stdenv.hostPlatform.isAarch64 then
|
||||
"aarch64"
|
||||
else
|
||||
throw "unsupported architecture";
|
||||
version = "3.15.1";
|
||||
|
||||
version = "3.07.1";
|
||||
|
||||
srcs = rec {
|
||||
aarch64 = {
|
||||
url = "https://www.sdrplay.com/software/SDRplay_RSP_API-ARM64-${version}.run";
|
||||
hash = "sha256-GJPFW6W8Ke4mnczcSLFYfioOMGCfFn2/EIA07VnmVGY=";
|
||||
};
|
||||
|
||||
x86_64 = {
|
||||
sources = rec {
|
||||
x86_64-linux = {
|
||||
url = "https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${version}.run";
|
||||
sha256 = "1a25c7rsdkcjxr7ffvx2lwj7fxdbslg9qhr8ghaq1r53rcrqgzmf";
|
||||
hash = "sha256-CTcyv10Xz9G2LqHh4qOW9tKBEcB+rztE2R7xJIU4QBQ=";
|
||||
};
|
||||
|
||||
i686 = x86_64;
|
||||
x86_64-darwin = {
|
||||
url = "https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.1.pkg";
|
||||
hash = "sha256-XRSM7aH653XS0t9bP89G3uJ7YiLiU1xMBjwvLqL3rMM=";
|
||||
};
|
||||
|
||||
aarch64-linux = x86_64-linux;
|
||||
aarch64-darwin = x86_64-darwin;
|
||||
};
|
||||
|
||||
platforms = lib.attrNames sources;
|
||||
|
||||
package = if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix;
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
callPackage package {
|
||||
pname = "sdrplay";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl srcs."${arch}";
|
||||
src =
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
source =
|
||||
if lib.hasAttr system sources then
|
||||
sources."${system}"
|
||||
else
|
||||
throw "SDRplay is not supported on ${system}";
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
libusb1
|
||||
udev
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
sh "$src" --noexec --target source
|
||||
'';
|
||||
|
||||
sourceRoot = "source";
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,lib,include,lib/udev/rules.d}
|
||||
majorVersion="${lib.concatStringsSep "." (lib.take 1 (builtins.splitVersion version))}"
|
||||
majorMinorVersion="${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}"
|
||||
libName="libsdrplay_api"
|
||||
cp "${arch}/$libName.so.$majorMinorVersion" $out/lib/
|
||||
ln -s "$out/lib/$libName.so.$majorMinorVersion" "$out/lib/$libName.so.$majorVersion"
|
||||
ln -s "$out/lib/$libName.so.$majorVersion" "$out/lib/$libName.so"
|
||||
cp "${arch}/sdrplay_apiService" $out/bin/
|
||||
cp -r inc/* $out/include/
|
||||
cp 66-mirics.rules $out/lib/udev/rules.d/
|
||||
'';
|
||||
in
|
||||
fetchurl source;
|
||||
|
||||
meta = with lib; {
|
||||
inherit platforms;
|
||||
|
||||
description = "SDRplay API";
|
||||
longDescription = ''
|
||||
Proprietary library and api service for working with SDRplay devices. For documentation and licensing details see
|
||||
https://www.sdrplay.com/docs/SDRplay_API_Specification_v${lib.concatStringsSep "." (lib.take 2 (builtins.splitVersion version))}.pdf
|
||||
'';
|
||||
|
||||
homepage = "https://www.sdrplay.com/downloads/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
@@ -81,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
pmenke
|
||||
zaninime
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
|
||||
mainProgram = "sdrplay_apiService";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shader-slang";
|
||||
version = "2025.16.1";
|
||||
version = "2025.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shader-slang";
|
||||
repo = "slang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9kCqE/jwnQrwbKXdcY3rp8YoPju+/ZupH1HBc5qu53o=";
|
||||
hash = "sha256-0rpjwUCOJedafF6ZKyV+a3fHhnEcflFC6nflTApN4Z0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
python3,
|
||||
python3Packages,
|
||||
adwaita-icon-theme,
|
||||
@@ -13,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "snapper-gui";
|
||||
version = "2020-10-20";
|
||||
version = "0.1-unstable-2022-06-26";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ricardomv";
|
||||
repo = "snapper-gui";
|
||||
rev = "f0c67abe0e10cc9e2ebed400cf80ecdf763fb1d1";
|
||||
sha256 = "13j4spbi9pxg69zifzai8ifk4207sn0vwh6vjqryi0snd5sylh7h";
|
||||
rev = "191575084a4e951802c32a4177dc704cf435883a";
|
||||
sha256 = "sha256-uy1oLJx4ERGc8OHzmPpnJX81jPB9ztrA0qbmm1UcmTY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -44,6 +45,10 @@ python3Packages.buildPythonApplication {
|
||||
snapper
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical interface for snapper";
|
||||
mainProgram = "snapper-gui";
|
||||
|
||||
@@ -47,7 +47,9 @@ buildGoModule {
|
||||
"cmd/sointu-play"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Fork of 4klang that can target 386, amd64 and WebAssembly";
|
||||
|
||||
@@ -1,51 +1,45 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
pkg-config,
|
||||
libspnav,
|
||||
libX11,
|
||||
|
||||
# Qt6 support is close: https://github.com/FreeSpacenav/spnavcfg/issues/43
|
||||
libsForQt5,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "spnavcfg";
|
||||
version = "1.1";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeSpacenav";
|
||||
repo = "spnavcfg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchLFS = true;
|
||||
hash = "sha256-P3JYhZnaCxzJETwC4g5m4xAGBk28/Va7Z/ybqwacIaA=";
|
||||
hash = "sha256-HYBb1/SgjayJjdA0N8UHPde3y4SugYiWIPP+3Eu3CEI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/FreeSpacenav/spnavcfg/commit/fd9aa10fb8e19a257398757943b3d8e79906e583.patch";
|
||||
hash = "sha256-XKEyLAFrA4qRU3zkBozblb/fKtLKsaItze0xv1uLnq0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libsForQt5.qtbase
|
||||
qt6.qtbase
|
||||
libspnav
|
||||
libX11
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
configureFlags = [
|
||||
"--qt6"
|
||||
"--qt-tooldir=${qt6.qtbase}/libexec"
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://spacenav.sourceforge.net/";
|
||||
description = "Interactive configuration GUI for space navigator input devices";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "spnavcfg";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,109 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
pango,
|
||||
wrapGAppsHook3,
|
||||
chromecastSupport ? false,
|
||||
serverSupport ? false,
|
||||
keyringSupport ? true,
|
||||
notifySupport ? true,
|
||||
libnotify,
|
||||
networkSupport ? true,
|
||||
networkmanager,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sublime-music";
|
||||
version = "0.12.0-unstable-2024-01-06";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sublime-music";
|
||||
repo = "sublime-music";
|
||||
rev = "0b4ba69a7ff7ad2dfcb0a264587921f323030766";
|
||||
hash = "sha256-NoJ50n/AjM738ebQ/Wccwp2l0sC3VBvKovJvDhDa5SU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix loadfile command https://github.com/sublime-music/sublime-music/pull/461
|
||||
(fetchpatch {
|
||||
url = "https://github.com/sublime-music/sublime-music/commit/1d107fec2ac7f83e0c49bab663273b31c9072411.patch";
|
||||
hash = "sha256-fUss4kqlFiXRr37AIaeWEv/4Bpzx5xkW28OEnsjQqzY=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
flit-core
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
pango
|
||||
]
|
||||
++ lib.optional notifySupport libnotify
|
||||
++ lib.optional networkSupport networkmanager;
|
||||
|
||||
propagatedBuildInputs =
|
||||
with python3.pkgs;
|
||||
[
|
||||
bleach
|
||||
bottle
|
||||
dataclasses-json
|
||||
deepdiff
|
||||
levenshtein
|
||||
mpv
|
||||
peewee
|
||||
pychromecast
|
||||
pygobject3
|
||||
python-dateutil
|
||||
requests
|
||||
semver
|
||||
thefuzz
|
||||
]
|
||||
++ lib.optional keyringSupport keyring;
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/sublime-music/sublime-music/issues/439
|
||||
"test_get_music_directory"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sublime_music"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 sublime-music.desktop -t $out/share/applications
|
||||
install -Dm444 sublime-music.metainfo.xml -t $out/share/metainfo
|
||||
|
||||
for size in 16 22 32 48 64 72 96 128 192 512 1024; do
|
||||
install -Dm444 logo/rendered/"$size".png \
|
||||
$out/share/icons/hicolor/"$size"x"$size"/apps/sublime-music.png
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GTK3 Subsonic/Airsonic client";
|
||||
homepage = "https://sublimemusic.app";
|
||||
changelog = "https://github.com/sublime-music/sublime-music/blob/v${version}/CHANGELOG.rst";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
albakham
|
||||
sumnerevans
|
||||
];
|
||||
mainProgram = "sublime-music";
|
||||
};
|
||||
}
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "subnetcalc";
|
||||
version = "2.6.4";
|
||||
version = "2.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dreibh";
|
||||
repo = "subnetcalc";
|
||||
tag = "subnetcalc-${finalAttrs.version}";
|
||||
hash = "sha256-FpDbU9kqen+NsJd8bSMUkTeq441+BXTKx/xKwcEBk10=";
|
||||
hash = "sha256-Zv1qrox1Yg6qNg81QVXPZkB5lElaPICue+hc5muzI5Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -65,13 +65,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "syslog-ng";
|
||||
version = "4.9.0";
|
||||
version = "4.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syslog-ng";
|
||||
repo = "syslog-ng";
|
||||
tag = "syslog-ng-${finalAttrs.version}";
|
||||
hash = "sha256-/hLrUwJhA0jesOl7gmWHfTVO2M7IG8QNPRzc/TIGTH4=";
|
||||
hash = "sha256-XqYfDRJc+AwkdQGSbkslFadYqNK0UDiZOruUUMYO1po=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
rec {
|
||||
version = "2.2.3";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TandoorRecipes";
|
||||
repo = "recipes";
|
||||
tag = version;
|
||||
hash = "sha256-ezjeUOlbVoPWfUBs865ixBKet3U6O7UwfvqJY4v1hwQ=";
|
||||
hash = "sha256-N6d5T11fOAtPKAV/tqTWGdwMkWNY8rPpWT2TBSc0ybc=";
|
||||
};
|
||||
|
||||
yarnHash = "sha256-1p79Bdsn6KDApYKz9BAwrA97svbB8ub+Wl49MTIumW8=";
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
asar,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -38,6 +39,10 @@ appimageTools.wrapAppImage {
|
||||
substituteInPlace $out/share/applications/todoist.desktop \
|
||||
--replace-fail "Exec=AppRun" "Exec=todoist-electron --" \
|
||||
--replace-fail "Exec=todoist" "Exec=todoist-electron --"
|
||||
|
||||
. ${makeWrapper}/nix-support/setup-hook
|
||||
wrapProgram $out/bin/todoist-electron \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tun2proxy";
|
||||
version = "0.7.15";
|
||||
version = "0.7.16";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "tun2proxy";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-Yyct1yGSXbZf49t4+8hP+V4ydyIi7zyff5IIqrTfJS0=";
|
||||
hash = "sha256-VO0dxX2FVKFSW157HYJxvlc2Xe6W+npw+4ls/1ePu80=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DhfUhjA8/+gmIe+91vVnK7Zca0x0r6lisTxPmg5yM8k=";
|
||||
cargoHash = "sha256-CWaHHKuDr731cf3tms4Sg9NvCjW0TgmxG3vO37z/UrE=";
|
||||
|
||||
env.GIT_HASH = "000000000000000000000000000000000000000000000000000";
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vcluster";
|
||||
version = "0.26.0";
|
||||
version = "0.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loft-sh";
|
||||
repo = "vcluster";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NLZmtiQ4fM5iKjdvV4TsTed9sOSpQH6KYctsSJJ8Mdk=";
|
||||
hash = "sha256-ddt9UDLKlC16ki+D35Ct1uvygeFb++fNeHVps0vCsPA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
withServer ? true,
|
||||
withVtInsert ? false,
|
||||
withVtSelect ? false,
|
||||
withVtStorage ? false,
|
||||
withVtGen ? false,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "VictoriaTraces";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaTraces";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-b4/ix191xtW2HpczfRbez2gibgGx7jBRm0hvuP/rTpA=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
subPackages =
|
||||
lib.optionals withServer [ "app/victoria-traces" ]
|
||||
++ lib.optionals withVtInsert [ "app/vtinsert" ]
|
||||
++ lib.optionals withVtSelect [ "app/vtselect" ]
|
||||
++ lib.optionals withVtStorage [ "app/vtstorage" ]
|
||||
++ lib.optionals withVtGen [ "app/vtgen" ];
|
||||
|
||||
postPatch = ''
|
||||
# Allow older go versions
|
||||
substituteInPlace go.mod \
|
||||
--replace-fail "go 1.24.6" "go ${finalAttrs.passthru.go.version}"
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/VictoriaMetrics/VictoriaTraces/lib/buildinfo.Version=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit (nixosTests) victoriatraces;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://docs.victoriametrics.com/victoriatraces/";
|
||||
description = "Fast open-source observability solution for distributed traces";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ cmacrae ];
|
||||
changelog = "https://github.com/VictoriaMetrics/VictoriaTraces/releases/tag/${finalAttrs.src.tag}";
|
||||
mainProgram = "victoria-traces";
|
||||
};
|
||||
})
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vipsdisp";
|
||||
version = "3.1.0";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcupitt";
|
||||
repo = "vipsdisp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3HciPvem8ySIW/H7d5M71lQV9mBcT6ZlpF3yo8BXsPE=";
|
||||
hash = "sha256-9L8l/afD6phq8T3ReYqQQgD1CztW5gw0MME23Ut/lEE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
let
|
||||
selectSystem = attrs: attrs.${stdenv.hostPlatform.system};
|
||||
pname = "waveterm";
|
||||
version = "0.11.5";
|
||||
version = "0.11.6";
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
@@ -62,8 +62,8 @@ let
|
||||
fetchurl {
|
||||
url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-3HPDjrY8hMMZFqzncEtdr2ap2HT3UZvEDv6PO1Hn/KE=";
|
||||
aarch64-linux = "sha256-lDlMlGgPthBIMA3HIj8ZudIbQA98/tXD7d/Mc2ZZ3t0=";
|
||||
x86_64-linux = "sha256-OM64Tyqo+phMiH6TWmp47hBhnFo0cTvzFvhX/7/JUec=";
|
||||
aarch64-linux = "sha256-g+e2wn1n0EqFeUah5ZgvL5D/y1khRQ2BUEowQf/ZoaI=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -136,8 +136,8 @@ let
|
||||
fetchurl {
|
||||
url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip";
|
||||
hash = selectSystem {
|
||||
x86_64-darwin = "sha256-5TViV0XG9TTqnNHY7vYClxrczHE8gpMb+m0Euvfu+iQ=";
|
||||
aarch64-darwin = "sha256-RKptVWAEO5YKbyitYEyGxVf/NoRSeT1BfkXPwHmOvkc=";
|
||||
x86_64-darwin = "sha256-AW4AQ/U/WHIlXmgbQJ8g0yQQgpBolYT2kb/fDNWUS1g=";
|
||||
aarch64-darwin = "sha256-Laxjj/MZzKsKhfRvOROQcPiatwNJKVqUCcGWB0chnok=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user