Merge master into staging-next
This commit is contained in:
@@ -586,6 +586,7 @@
|
||||
- any:
|
||||
- changed-files:
|
||||
- any-glob-to-any-file:
|
||||
- doc/release-notes/**/*
|
||||
- nixos/doc/manual/release-notes/**/*
|
||||
|
||||
"8.has: maintainer-list (update)":
|
||||
|
||||
@@ -50,7 +50,7 @@ jobs:
|
||||
|
||||
- name: Create backport PRs
|
||||
id: backport
|
||||
uses: korthout/backport-action@436145e922f9561fc5ea157ff406f21af2d6b363 # v3.2.0
|
||||
uses: korthout/backport-action@0193454f0c5947491d348f33a275c119f30eb736 # v3.2.1
|
||||
with:
|
||||
# Config README: https://github.com/korthout/backport-action#backport-action
|
||||
copy_labels_pattern: 'severity:\ssecurity'
|
||||
|
||||
@@ -52,9 +52,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration
|
||||
system, [Hydra](https://hydra.nixos.org/).
|
||||
|
||||
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
|
||||
* [Continuous package builds for the NixOS 24.11 release](https://hydra.nixos.org/jobset/nixos/release-24.11)
|
||||
* [Continuous package builds for the NixOS 25.05 release](https://hydra.nixos.org/jobset/nixos/release-25.05)
|
||||
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
|
||||
* [Tests for the NixOS 24.11 release](https://hydra.nixos.org/job/nixos/release-24.11/tested#tabs-constituents)
|
||||
* [Tests for the NixOS 25.05 release](https://hydra.nixos.org/job/nixos/release-25.05/tested#tabs-constituents)
|
||||
|
||||
Artifacts successfully built with Hydra are published to cache at
|
||||
https://cache.nixos.org/. When successful build and test criteria are
|
||||
|
||||
@@ -211,12 +211,6 @@
|
||||
github = "365tuwe";
|
||||
githubId = 10263091;
|
||||
};
|
||||
_3699n = {
|
||||
email = "nicholas@nvk.pm";
|
||||
github = "3699n";
|
||||
githubId = 7414843;
|
||||
name = "Nicholas von Klitzing";
|
||||
};
|
||||
_3JlOy-PYCCKUi = {
|
||||
name = "3JlOy-PYCCKUi";
|
||||
email = "3jl0y_pycckui@riseup.net";
|
||||
@@ -241,14 +235,6 @@
|
||||
githubId = 1714287;
|
||||
name = "Owen Shepherd";
|
||||
};
|
||||
_4825764518 = {
|
||||
email = "4825764518@purelymail.com";
|
||||
matrix = "@kenzie:matrix.kenzi.dev";
|
||||
github = "4825764518";
|
||||
githubId = 100122841;
|
||||
name = "Kenzie";
|
||||
keys = [ { fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B"; } ];
|
||||
};
|
||||
_4ever2 = {
|
||||
email = "eske@cs.au.dk";
|
||||
github = "4ever2";
|
||||
@@ -5311,13 +5297,6 @@
|
||||
name = "Carl Richard Theodor Schneider";
|
||||
keys = [ { fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; } ];
|
||||
};
|
||||
cryo = {
|
||||
email = "cryo@disroot.org";
|
||||
github = "cry0ice";
|
||||
githubId = 176274027;
|
||||
name = "Cryo";
|
||||
keys = [ { fingerprint = "2CF7 F8E8 2258 5751 2591 F97F 4B12 E34A 25A9 AB35"; } ];
|
||||
};
|
||||
Cryolitia = {
|
||||
name = "Cryolitia PukNgae";
|
||||
email = "Cryolitia@gmail.com";
|
||||
@@ -5411,12 +5390,6 @@
|
||||
|
||||
keys = [ { fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; } ];
|
||||
};
|
||||
cyewashish = {
|
||||
name = "Cyewashish";
|
||||
email = "wawashish@cyekaivy.dev";
|
||||
github = "cyewashish";
|
||||
githubId = 180875322;
|
||||
};
|
||||
cynerd = {
|
||||
name = "Karel Kočí";
|
||||
email = "cynerd@email.cz";
|
||||
@@ -10842,14 +10815,6 @@
|
||||
name = "Silvan Mosberger";
|
||||
keys = [ { fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; } ];
|
||||
};
|
||||
infinitivewitch = {
|
||||
name = "Infinitive Witch";
|
||||
email = "infinitivewitch@disroot.org";
|
||||
matrix = "@infinitivewitch:fedora.im";
|
||||
github = "infinitivewitch";
|
||||
githubId = 128256833;
|
||||
keys = [ { fingerprint = "CF3D F4AD C7BD 1FDB A88B E4B3 CA2D 43DA 939D 94FB"; } ];
|
||||
};
|
||||
ingenieroariel = {
|
||||
email = "ariel@nunez.co";
|
||||
github = "ingenieroariel";
|
||||
@@ -11385,6 +11350,17 @@
|
||||
githubId = 6789916;
|
||||
name = "Jason Odoom";
|
||||
};
|
||||
jaspersurmont = {
|
||||
email = "jasper@surmont.dev";
|
||||
github = "jaspersurmont";
|
||||
githubId = 28810440;
|
||||
name = "Jasper Surmont";
|
||||
keys = [
|
||||
{
|
||||
fingerprint = "D70D 66E3 3D82 C3F8 0F31 BE15 D213 BED5 67B1 9AF5";
|
||||
}
|
||||
];
|
||||
};
|
||||
javaes = {
|
||||
email = "jan+dev@vanesdonk.de";
|
||||
github = "javaes";
|
||||
@@ -13128,12 +13104,6 @@
|
||||
githubId = 59027018;
|
||||
name = "Andrey Khorokhorin";
|
||||
};
|
||||
kho-dialga = {
|
||||
email = "ivandashenyou@gmail.com";
|
||||
github = "Kho-Dialga";
|
||||
githubId = 55767703;
|
||||
name = "Iván Brito";
|
||||
};
|
||||
khumba = {
|
||||
email = "bog@khumba.net";
|
||||
github = "khumba";
|
||||
@@ -14278,12 +14248,6 @@
|
||||
name = "Liassica";
|
||||
keys = [ { fingerprint = "83BE 3033 6164 B971 FA82 7036 0D34 0E59 4980 7BDD"; } ];
|
||||
};
|
||||
liberatys = {
|
||||
email = "liberatys@hey.com";
|
||||
name = "Nick Anthony Flueckiger";
|
||||
github = "liberatys";
|
||||
githubId = 35100156;
|
||||
};
|
||||
liberodark = {
|
||||
email = "liberodark@gmail.com";
|
||||
github = "liberodark";
|
||||
@@ -14973,12 +14937,6 @@
|
||||
githubId = 208297;
|
||||
name = "Luz";
|
||||
};
|
||||
lw = {
|
||||
email = "lw@fmap.me";
|
||||
github = "lolwat97";
|
||||
githubId = 2057309;
|
||||
name = "Sergey Sofeychuk";
|
||||
};
|
||||
lx = {
|
||||
email = "alex@adnab.me";
|
||||
github = "Alexis211";
|
||||
@@ -16626,12 +16584,6 @@
|
||||
githubId = 24192522;
|
||||
name = "MithicSpirit";
|
||||
};
|
||||
mjanczyk = {
|
||||
email = "m@dragonvr.pl";
|
||||
github = "mjanczyk";
|
||||
githubId = 1001112;
|
||||
name = "Marcin Janczyk";
|
||||
};
|
||||
mjm = {
|
||||
email = "matt@mattmoriarity.com";
|
||||
github = "mjm";
|
||||
@@ -17596,12 +17548,6 @@
|
||||
githubId = 137805;
|
||||
name = "Alexander Tsvyashchenko";
|
||||
};
|
||||
ne9z = {
|
||||
email = "yuchen@apvc.uk";
|
||||
github = "ne9z";
|
||||
githubId = 77314501;
|
||||
name = "Maurice Zhou";
|
||||
};
|
||||
nealfennimore = {
|
||||
email = "hi@neal.codes";
|
||||
github = "nealfennimore";
|
||||
@@ -19511,12 +19457,6 @@
|
||||
github = "petee";
|
||||
githubId = 89916;
|
||||
};
|
||||
petercommand = {
|
||||
email = "petercommand@gmail.com";
|
||||
github = "ptrcmd";
|
||||
githubId = 1260660;
|
||||
name = "petercommand";
|
||||
};
|
||||
peterhoeg = {
|
||||
email = "peter@hoeg.com";
|
||||
matrix = "@peter:hoeg.com";
|
||||
@@ -23600,14 +23540,6 @@
|
||||
github = "SnO2WMaN";
|
||||
githubId = 15155608;
|
||||
};
|
||||
snowflake = {
|
||||
email = "snowflake@pissmail.com";
|
||||
name = "Snowflake";
|
||||
github = "snf1k";
|
||||
githubId = 149651684;
|
||||
matrix = "@snowflake:mozilla.org";
|
||||
keys = [ { fingerprint = "8223 7B6F 2FF4 8F16 B652 6CA3 934F 9E5F 9701 2C0B"; } ];
|
||||
};
|
||||
snpschaaf = {
|
||||
email = "philipe.schaaf@secunet.com";
|
||||
name = "Philippe Schaaf";
|
||||
@@ -26364,12 +26296,6 @@
|
||||
github = "vdot0x23";
|
||||
githubId = 40716069;
|
||||
};
|
||||
vector1dev = {
|
||||
name = "vector1dev";
|
||||
matrix = "@vector1dev:vector1.dev";
|
||||
github = "vector1dev";
|
||||
githubId = 127302590;
|
||||
};
|
||||
vedantmgoyal9 = {
|
||||
name = "Vedant Mohan Goyal";
|
||||
matrix = "@vedantmgoyal:beeper.com";
|
||||
|
||||
@@ -1197,6 +1197,7 @@
|
||||
./services/networking/lambdabot.nix
|
||||
./services/networking/legit.nix
|
||||
./services/networking/libreswan.nix
|
||||
./services/networking/livekit-ingress.nix
|
||||
./services/networking/livekit.nix
|
||||
./services/networking/lldpd.nix
|
||||
./services/networking/logmein-hamachi.nix
|
||||
|
||||
@@ -0,0 +1,181 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
utils,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.livekit.ingress;
|
||||
format = pkgs.formats.yaml { };
|
||||
settings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings;
|
||||
|
||||
isLocallyDistributed = config.services.livekit.enable;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ k900 ];
|
||||
options.services.livekit.ingress = {
|
||||
enable = lib.mkEnableOption "the livekit ingress service";
|
||||
package = lib.mkPackageOption pkgs "livekit-ingress" { };
|
||||
|
||||
openFirewall = {
|
||||
rtc = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Open WebRTC ports in the firewall.";
|
||||
};
|
||||
|
||||
rtmp = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Open RTMP port in the firewall.";
|
||||
};
|
||||
|
||||
whip = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Open WHIP port in the firewall.";
|
||||
};
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
freeformType = format.type;
|
||||
options = {
|
||||
rtmp_port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 1935;
|
||||
description = "TCP port for RTMP connections";
|
||||
};
|
||||
|
||||
whip_port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 8080;
|
||||
description = "TCP port for WHIP connections";
|
||||
};
|
||||
|
||||
redis = {
|
||||
address = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default =
|
||||
if isLocallyDistributed then
|
||||
"${config.services.livekit.redis.host}:${toString config.services.livekit.redis.port}"
|
||||
else
|
||||
null;
|
||||
example = "redis.example.com:6379";
|
||||
defaultText = "Host and port of the local livekit redis instance, if enabled, or null";
|
||||
description = "Address or hostname and port for redis connection";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
rtc_config = {
|
||||
port_range_start = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 50000;
|
||||
description = "Start of UDP port range for WebRTC";
|
||||
};
|
||||
|
||||
port_range_end = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 51000;
|
||||
description = "End of UDP port range for WebRTC";
|
||||
};
|
||||
|
||||
use_external_ip = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
When set to true, attempts to discover the host's public IP via STUN.
|
||||
This is useful for cloud environments such as AWS & Google where hosts have an internal IP that maps to an external one.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
LiveKit Ingress configuration.
|
||||
|
||||
See <https://github.com/livekit/ingress?tab=readme-ov-file#config> for possible options.
|
||||
'';
|
||||
example = {
|
||||
prometheus_port = 9039;
|
||||
cpu_cost = {
|
||||
rtmp_cpu_cost = 3.0;
|
||||
whip_cpu_cost = 1.0;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environmentFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = ''
|
||||
Environment file as defined in {manpage}`systemd.exec(5)` passed to the service.
|
||||
|
||||
Use this to specify `LIVEKIT_API_KEY` and `LIVEKIT_API_SECRET`.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = lib.mkMerge [
|
||||
(lib.mkIf cfg.openFirewall.rtmp [ cfg.settings.rtmp_port ])
|
||||
(lib.mkIf cfg.openFirewall.whip [ cfg.settings.whip_port ])
|
||||
];
|
||||
allowedUDPPortRanges = lib.mkIf cfg.openFirewall.rtc [
|
||||
{
|
||||
from = cfg.settings.rtc_config.port_range_start;
|
||||
to = cfg.settings.rtc_config.port_range_end;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
systemd.services.livekit-ingress = {
|
||||
description = "LiveKit Ingress server";
|
||||
documentation = [ "https://docs.livekit.io/home/self-hosting/ingress/" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = utils.escapeSystemdExecArgs [
|
||||
(lib.getExe cfg.package)
|
||||
"--config=${format.generate "ingress.yaml" settings}"
|
||||
];
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
|
||||
DynamicUser = true;
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
PrivateDevices = true;
|
||||
PrivateMounts = true;
|
||||
PrivateUsers = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
"AF_NETLINK"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
ProtectHome = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
];
|
||||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
UMask = "077";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -8,6 +8,9 @@
|
||||
let
|
||||
cfg = config.services.livekit;
|
||||
format = pkgs.formats.json { };
|
||||
settings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings;
|
||||
|
||||
isLocallyDistributed = config.services.livekit.ingress.enable;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ quadradical ];
|
||||
@@ -34,6 +37,32 @@ in
|
||||
description = "Opens port range for LiveKit on the firewall.";
|
||||
};
|
||||
|
||||
redis = {
|
||||
createLocally = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = isLocallyDistributed;
|
||||
defaultText = "true if any other Livekit component is enabled locally else false";
|
||||
description = "Whether to set up a local redis instance.";
|
||||
};
|
||||
|
||||
host = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default = if cfg.redis.createLocally then "127.0.0.1" else null;
|
||||
defaultText = "127.0.0.1 if config.services.livekit.redis.createLocally else null";
|
||||
description = ''
|
||||
Address to bind local redis instance to.
|
||||
'';
|
||||
};
|
||||
|
||||
port = lib.mkOption {
|
||||
type = with lib.types; nullOr port;
|
||||
default = null;
|
||||
description = ''
|
||||
Port to bind local redis instance to.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
freeformType = format.type;
|
||||
@@ -44,6 +73,16 @@ in
|
||||
description = "Main TCP port for RoomService and RTC endpoint.";
|
||||
};
|
||||
|
||||
redis = {
|
||||
address = lib.mkOption {
|
||||
type = with lib.types; nullOr str;
|
||||
default = if isLocallyDistributed then "${cfg.redis.host}:${toString cfg.redis.port}" else null;
|
||||
defaultText = lib.literalExpression "Local Redis host/port when a local ingress component is enabled else null";
|
||||
example = "redis.example.com:6379";
|
||||
description = "Host and port used to connect to a redis instance.";
|
||||
};
|
||||
};
|
||||
|
||||
rtc = {
|
||||
port_range_start = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
@@ -79,6 +118,15 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.redis.createLocally -> cfg.redis.port != null;
|
||||
message = ''
|
||||
When `services.livekit.redis.createLocally` is enabled `services.livekit.redis.port` must be configured.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
networking.firewall = lib.mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [
|
||||
cfg.settings.port
|
||||
@@ -91,6 +139,13 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
# Provision a redis instance, when livekit-ingress (or later livekit-egress) are enabled on the same host
|
||||
services.redis.servers.livekit = lib.mkIf cfg.redis.createLocally {
|
||||
enable = true;
|
||||
bind = cfg.redis.host;
|
||||
port = cfg.redis.port;
|
||||
};
|
||||
|
||||
systemd.services.livekit = {
|
||||
description = "LiveKit SFU server";
|
||||
documentation = [ "https://docs.livekit.io" ];
|
||||
@@ -102,7 +157,7 @@ in
|
||||
LoadCredential = [ "livekit-secrets:${cfg.keyFile}" ];
|
||||
ExecStart = utils.escapeSystemdExecArgs [
|
||||
(lib.getExe cfg.package)
|
||||
"--config=${format.generate "livekit.json" cfg.settings}"
|
||||
"--config=${format.generate "livekit.json" settings}"
|
||||
"--key-file=/run/credentials/livekit.service/livekit-secrets"
|
||||
];
|
||||
DynamicUser = true;
|
||||
|
||||
@@ -12,6 +12,7 @@ let
|
||||
escapeShellArgs
|
||||
filterAttrs
|
||||
getExe
|
||||
listToAttrs
|
||||
literalExpression
|
||||
maintainers
|
||||
makeBinPath
|
||||
@@ -28,6 +29,7 @@ let
|
||||
optional
|
||||
optionalAttrs
|
||||
optionalString
|
||||
optionals
|
||||
toShellVars
|
||||
versionAtLeast
|
||||
versionOlder
|
||||
@@ -471,6 +473,16 @@ in
|
||||
toClientList (client: optional client.openFirewall client.port)
|
||||
);
|
||||
|
||||
# Ports opened on a specific
|
||||
networking.firewall.interfaces = listToAttrs (
|
||||
toClientList (client: {
|
||||
name = client.interface;
|
||||
value.allowedUDPPorts = optionals client.openFirewall [
|
||||
5353 # required for the DNS forwarding/routing to work
|
||||
];
|
||||
})
|
||||
);
|
||||
|
||||
systemd.network.networks = mkIf config.networking.useNetworkd (
|
||||
toClientAttrs (
|
||||
client:
|
||||
@@ -504,7 +516,14 @@ in
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
path = optional (!config.services.resolved.enable) pkgs.openresolv;
|
||||
path =
|
||||
optionals (!config.services.resolved.enable) [ pkgs.openresolv ]
|
||||
# useful for `netbird debug` system info gathering
|
||||
++ optionals config.networking.nftables.enable [ pkgs.nftables ]
|
||||
++ optionals (!config.networking.nftables.enable) [
|
||||
pkgs.iptables
|
||||
pkgs.ipset
|
||||
];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${getExe client.wrapper} service run";
|
||||
|
||||
@@ -7,7 +7,6 @@ let
|
||||
socatPort = 1234;
|
||||
|
||||
createAX25Node = nodeId: {
|
||||
boot.kernelPackages = pkgs.linuxPackages_ham;
|
||||
boot.kernelModules = [ "ax25" ];
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ socatPort ];
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
name = "etesync-dav";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ _3699n ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
|
||||
+9
-10
@@ -18,19 +18,18 @@
|
||||
# TODO: confirm the whole solution is working end-to-end when netbird server is implemented
|
||||
testScript = ''
|
||||
start_all()
|
||||
def did_start(node, name):
|
||||
def did_start(node, name, interval=0.5, timeout=10):
|
||||
node.wait_for_unit(f"{name}.service")
|
||||
node.wait_for_file(f"/var/run/{name}/sock")
|
||||
output = node.succeed(f"{name} status")
|
||||
# `netbird status` returns a full "Disconnected" status during initialization
|
||||
# only after a while passes it starts returning "NeedsLogin" help message
|
||||
|
||||
# not sure why, but it can print either of:
|
||||
# - Daemon status: NeedsLogin
|
||||
# - Management: Disconnected
|
||||
expected = [
|
||||
"Disconnected",
|
||||
"NeedsLogin",
|
||||
]
|
||||
assert any(msg in output for msg in expected)
|
||||
start = time.time()
|
||||
output = node.succeed(f"{name} status")
|
||||
while "Disconnected" in output and (time.time() - start) < timeout:
|
||||
time.sleep(interval)
|
||||
output = node.succeed(f"{name} status")
|
||||
assert "NeedsLogin" in output
|
||||
|
||||
did_start(clients, "netbird")
|
||||
did_start(clients, "netbird-custom")
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -15,11 +16,28 @@
|
||||
};
|
||||
settings.port = 8000;
|
||||
};
|
||||
|
||||
specialisation.ingress = {
|
||||
inheritParentConfig = true;
|
||||
configuration = {
|
||||
services.livekit = {
|
||||
ingress.enable = true;
|
||||
redis.port = 6379;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("livekit.service")
|
||||
machine.wait_for_open_port(8000)
|
||||
machine.succeed("curl 127.0.0.1:8000 -L --fail")
|
||||
with subtest("Test livekit service"):
|
||||
machine.wait_for_unit("livekit.service")
|
||||
machine.wait_for_open_port(8000)
|
||||
machine.succeed("curl 127.0.0.1:8000 -L --fail")
|
||||
|
||||
with subtest("Test locally distributed livekit service with ingress component"):
|
||||
machine.succeed("${config.nodes.machine.system.build.toplevel}/specialisation/ingress/bin/switch-to-configuration test")
|
||||
machine.wait_for_unit("livekit-ingress.service")
|
||||
machine.wait_for_open_port(8080)
|
||||
machine.log(machine.succeed("curl --fail -X OPTIONS 127.0.0.1:8080/whip/test"))
|
||||
'';
|
||||
}
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pandoc";
|
||||
publisher = "chrischinchilla";
|
||||
version = "0.4.8";
|
||||
hash = "sha256-+U6AtT2wf1mE92IR+mv4aKD9/78ULus2GuwwgxdCvBA=";
|
||||
version = "0.6.2";
|
||||
hash = "sha256-d2nVjVTwvVSQXnhTdqv5gLV44L6FWGbHGZtCplbUQz4=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
||||
@@ -14,19 +14,19 @@ let
|
||||
{
|
||||
x86_64-linux = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-pEmDg//DyZvSiJdvqlNH7kuK6Dz3w2tpeAPpUTVCraI=";
|
||||
hash = "sha256-eXDHPU9QH95EcgOC8dl8H1ea6drkyKhrsz3/Dc83tVY=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-Vh7VkYH93wVS+WzGsGZ/w+DzbE5Z4y4KFl2SvmAgcVI=";
|
||||
hash = "sha256-gxJeffxK1q6hUt+j1i32WlUZoc+YAXgUfDBuxA1y73g=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-Lmru00/I43IP9Wf3wtXsnh5rlzWPdvMtNImJzN5ELsg=";
|
||||
hash = "sha256-F+OfjPnUbuUnfHp+r8yQwiJ9kCZMWUVOz2zcMTzfhgI=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-lh7YX65p/88GeAHAAGHovektYci3sXrXgdSyXJwfUF4=";
|
||||
hash = "sha256-w2sL0rojNrVnmjiG5efqtdQOjV7/vWx16Yev+8pUxsg=";
|
||||
};
|
||||
}
|
||||
.${system} or (throw "Unsupported system: ${system}");
|
||||
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
# Please update the corresponding binary (typos-lsp)
|
||||
# when updating this extension.
|
||||
# See pkgs/by-name/ty/typos-lsp/package.nix
|
||||
version = "0.1.38";
|
||||
version = "0.1.39";
|
||||
inherit (extInfo) hash arch;
|
||||
};
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ausweisapp";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Governikus";
|
||||
repo = "AusweisApp2";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-1G9H+1YBoIgSE8GO8UuUaG9gbVtY+gCp0oPNSNw0oO8=";
|
||||
hash = "sha256-xY5V5Z6HVtkFzLzWOVRTKdms356OO0EKnG+Nymurowo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
{
|
||||
version = "3.8.0";
|
||||
x86_64-linux = {
|
||||
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.8.0-linux.deb";
|
||||
sha256 = "sha256-0smSLq8PAwEWK9yf4GeUjXcKlKVRoqfb+qd8w3ppQqA=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.8.0-mac.dmg";
|
||||
sha256 = "sha256-lysO25oDNDs86Es2VO3XSafVpZU5mcKAZXEdkn0AHig=";
|
||||
};
|
||||
}
|
||||
@@ -54,13 +54,13 @@
|
||||
"vendorHash": "sha256-sf6gCPsKnBVjMsCw7ZA4BKt9GAGtAcgU7vRZN8xzN9Q="
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-Jn4VzU6aPhMv6eMmXQ5gD5SA9IZfpmkRKpTrjRGrNF8=",
|
||||
"hash": "sha256-RSZaZ8+m+e2ZbJIcv9In0HJRhuk1rTGmMcUT0hTqwHA=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.246.2",
|
||||
"rev": "v1.252.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
"vendorHash": "sha256-Ww4l3ffnx0CB+wnQfaiHI+25JtnNsGaTCsmXfd54R4g="
|
||||
},
|
||||
"ansible": {
|
||||
"hash": "sha256-3nha5V4rNgVzgqliebmbC5e12Lj/zlCsyyiIVFlmUrY=",
|
||||
|
||||
@@ -186,6 +186,8 @@ stdenv.mkDerivation rec {
|
||||
+ lib.optionalString isAppBundle ''
|
||||
mkdir -p $out/Applications
|
||||
mv $out/bin/Wireshark.app $out/Applications/Wireshark.app
|
||||
|
||||
ln -s $out/Applications/Wireshark.app/Contents/MacOS/Wireshark $out/bin/wireshark
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
local flags=()
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "alistral";
|
||||
version = "0.5.11";
|
||||
version = "0.5.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RustyNova016";
|
||||
repo = "Alistral";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wiNXwg6mC24nWwakA9cX8OYDOhghoEgm0yVR3Tmtod4=";
|
||||
hash = "sha256-qVVQs0BV/M+rhs+qFiK9nHCKXq+dco6RuBgaUURVpts=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-M3nwa93vzVm+GtCdmBn/jqIvgJRcULw+8FFFLPmfbyg=";
|
||||
cargoHash = "sha256-Uv4T65ByYsfmH5OPN0ZdTs7DAOZd9RLfPrT3fBsfXuw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -16,6 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
hash = "sha256-oY2hDOsws2WVQPKEFhGNPHITo26p/UZ5XzvRX7DoMyc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
cargoHash = "sha256-xriK88OY6W1cOZVgiUPBIuItVHwEyFNq5Ywh367K6CU=";
|
||||
@@ -57,6 +61,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"--skip=init_lint_zsh_pre_zprofile"
|
||||
"--skip=init_lint_zsh_pre_zshrc"
|
||||
"--skip=telemetry::cognito::test::pools"
|
||||
"--skip=auth::pkce::tests::test_pkce_flow_with_state_mismatch_throws_err"
|
||||
"--skip=auth::pkce::tests::test_pkce_flow_completes_successfully"
|
||||
"--skip=auth::pkce::tests::test_pkce_flow_with_authorization_redirect_error"
|
||||
"--skip=auth::pkce::tests::test_pkce_flow_with_timeout"
|
||||
"--skip=request::tests::request_test"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
@@ -73,6 +82,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
mainProgram = "amazon-q";
|
||||
maintainers = [ lib.maintainers.jamesward ];
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
})
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@sourcegraph/amp": "^0.0.1750147289-g2a47fe"
|
||||
"@sourcegraph/amp": "^0.0.1750924878-gfee7d7"
|
||||
}
|
||||
},
|
||||
"node_modules/@colors/colors": {
|
||||
@@ -29,9 +29,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@sourcegraph/amp": {
|
||||
"version": "0.0.1750147289-g2a47fe",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1750147289-g2a47fe.tgz",
|
||||
"integrity": "sha512-uoWvE5jE9cjmJDLx1DiyeA9VQ7ONReVelcly84VNwmcwIyI04OWyt7azoWK9OfFZU0hTBOyp21E632QsvtaiHw==",
|
||||
"version": "0.0.1750924878-gfee7d7",
|
||||
"resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1750924878-gfee7d7.tgz",
|
||||
"integrity": "sha512-3TZRSPaQY1eSIyAy4m/wSmW8CUq33r1oZfxguq2IWBLYdud90vPoLgOf6Hl9ZX3bkiLVRiU34oXXMmhb2Z5nzA==",
|
||||
"dependencies": {
|
||||
"@vscode/ripgrep": "1.15.11",
|
||||
"commander": "^11.1.0",
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "amp-cli";
|
||||
version = "0.0.1750147289-g2a47fe";
|
||||
version = "0.0.1750924878-gfee7d7";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
|
||||
hash = "sha256-mP4YOa2J4K3mr7PpRn+Nn+AMcmMSSTNcB59QEdAFZeE=";
|
||||
hash = "sha256-scp4Nw6fwn8uB5oLPg6eWkT7+YGFV/B5VlQbbFimsLg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
|
||||
chmod +x bin/amp-wrapper.js
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-aF4oMWmq4+tuXAhwDgqTX3dfHNV1upyD0dqBEoJiru8=";
|
||||
npmDepsHash = "sha256-INH8Pulds05pZm6DeaFYfZR+1derav2ZjQC6aPx+8qA=";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ripgrep
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "arc-browser";
|
||||
version = "1.97.0-63507";
|
||||
version = "1.100.0-64467";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-8HdPyJJT1boiMpflIe6wX4oOTqw4oKm982gm1Ei8h4w=";
|
||||
hash = "sha256-fMC35haQOB/YY5EbnvusTOiNbck7Vo9rmM6whVp8l80=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
@@ -38,14 +38,14 @@ in
|
||||
let
|
||||
bolt = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bolt-launcher";
|
||||
version = "0.15.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdamCake";
|
||||
repo = "bolt";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-zEExwQRzDmV0xd3lcxFE2ZVfkyTFYZQe3/c0IWJ9C/c=";
|
||||
hash = "sha256-RlWJcxSCKTbj6MNeQwweu20rPBQGzumEk42MtTAhGRU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -115,6 +115,7 @@ buildFHSEnv {
|
||||
xorg.libSM
|
||||
xorg.libXxf86vm
|
||||
xorg.libX11
|
||||
xorg.libXext
|
||||
glib
|
||||
pango
|
||||
cairo
|
||||
@@ -123,6 +124,7 @@ buildFHSEnv {
|
||||
libcap
|
||||
libsecret
|
||||
SDL2
|
||||
sdl3
|
||||
libGL
|
||||
])
|
||||
++ lib.optionals enableRS3 (
|
||||
@@ -151,7 +153,10 @@ buildFHSEnv {
|
||||
Bolt Launcher supports HDOS/RuneLite by default with an optional feature flag for RS3 (enableRS3).
|
||||
'';
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = with lib.maintainers; [ nezia ];
|
||||
maintainers = with lib.maintainers; [
|
||||
nezia
|
||||
jaspersurmont
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "${bolt.name}";
|
||||
};
|
||||
|
||||
+3
-1
@@ -4,7 +4,7 @@
|
||||
fetchurl,
|
||||
asar,
|
||||
dpkg,
|
||||
electron,
|
||||
electron_36,
|
||||
makeWrapper,
|
||||
nixosTests,
|
||||
undmg,
|
||||
@@ -13,6 +13,8 @@
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
||||
electron = electron_36;
|
||||
|
||||
sources = import ./sources.nix;
|
||||
|
||||
systemArgs =
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
version = "3.9.0";
|
||||
x86_64-linux = {
|
||||
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.9.0-linux.deb";
|
||||
sha256 = "sha256-OG+oZr5UHIjrQOxPmLs/DzGJuUAd5pAyvLuTOvhC+20=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.9.0-mac.dmg";
|
||||
sha256 = "sha256-Tvb2Cum/Bavu+VAVS/1O7pxSIVLdP2XzTG27fhgIh9E=";
|
||||
};
|
||||
}
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cdncheck";
|
||||
version = "1.1.23";
|
||||
version = "1.1.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cdncheck";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Oe1KjcyofOwrHbxc+MHEfKiYLhqTBPiB6LWu6ZTnCuw=";
|
||||
hash = "sha256-ecfYbqHUZnE6Ot4ekrbkow6iKoa0I3WtD17kj08vEw4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
|
||||
|
||||
@@ -25,14 +25,14 @@ with py.pkgs;
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.443";
|
||||
version = "3.2.447";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
tag = version;
|
||||
hash = "sha256-qROzLxbeH3DeB5RzUPXJU4zyI4p7j96/vp/+iab2M6A=";
|
||||
hash = "sha256-CSLp3ykBvTcx8xDpW5HKGtQsVQZGflXkNT3ktXb6dJU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gpl3Plus
|
||||
mit
|
||||
];
|
||||
maintainers = with lib.maintainers; [ cryo ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "chsrc";
|
||||
};
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "claude-code";
|
||||
version = "1.0.33";
|
||||
version = "1.0.35";
|
||||
|
||||
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
|
||||
hash = "sha256-AH/ZokL0Ktsx18DrpUKgYrZKdBnKo29jntwXUWspH8w=";
|
||||
hash = "sha256-Lt79XxHrgy6rPAHBf1QtwjsKnrZmsKFeVFOvHwN4aOY=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-oHSePK/QiAHP+2Fn+yUf66TcRGCoZg3mrI4x7S/nbCc=";
|
||||
|
||||
@@ -6,18 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cnspec";
|
||||
version = "11.59.0";
|
||||
version = "11.60.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondoohq";
|
||||
repo = "cnspec";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1KThATXyvoEX6Xz82E3aiLssPMZBD77zEX8ghUVbs8M=";
|
||||
hash = "sha256-ITmsY9vtrMkTsPJTXWe43V7Ao235/1A2xX/C/qP0WJk=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-m37AlKsTVkMqL288jKBdsm6JRxs0VqpgXHwne9OAa1s=";
|
||||
vendorHash = "sha256-pk4b2PCRXwlXwRNBkN5h4VBWjqccsIPJnCjEluM50tM=";
|
||||
|
||||
subPackages = [ "apps/cnspec" ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "conduktor-ctl";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "conduktor";
|
||||
repo = "ctl";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-u2WnFpVEN5tvVFyzPlIH68eUYVutJl2oTJKOwyxm18M=";
|
||||
hash = "sha256-z0D7+/mrtQhD5zrVCVqXLHJwArhXfE6R/XSjfWmr6Pg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kPCBzLU6aH6MNlKZcKKFcli99ZmdOtPV5+5gxPs5GH4=";
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
pname,
|
||||
version,
|
||||
src,
|
||||
sourceDir,
|
||||
yarnLock ? null,
|
||||
hash,
|
||||
extraFiles ? "",
|
||||
meta,
|
||||
|
||||
fetchYarnDeps,
|
||||
lib,
|
||||
nodejs_22,
|
||||
stdenvNoCC,
|
||||
yarnBuildHook,
|
||||
yarnConfigHook,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
;
|
||||
sourceRoot = "${finalAttrs.src.name}/${sourceDir}";
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = if yarnLock != null then yarnLock else "${finalAttrs.src}/${sourceDir}/yarn.lock";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (yarnLock != null) ''
|
||||
cp ${yarnLock} ./yarn.lock
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs_22
|
||||
yarnBuildHook
|
||||
yarnConfigHook
|
||||
];
|
||||
|
||||
BUILD_VERSION = finalAttrs.version;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -r dist/* ${extraFiles} $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
})
|
||||
@@ -0,0 +1,167 @@
|
||||
{
|
||||
withLocales ? true,
|
||||
|
||||
buildGoModule,
|
||||
callPackage,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2024.9.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cortezaproject";
|
||||
repo = "corteza";
|
||||
tag = version;
|
||||
hash = "sha256-1mekSiRfFSNa/6MSzwRrI3rb9GHABkn3i1b6tX+73fI=";
|
||||
};
|
||||
meta = {
|
||||
description = "Low-code platform";
|
||||
longDescription = ''
|
||||
The Corteza low-code platform lets you build and iterate CRM, business
|
||||
process and other structured data apps fast, create intelligent business
|
||||
process workflows and connect with almost any data source.
|
||||
'';
|
||||
homepage = "https://cortezaproject.org/";
|
||||
downloadPage = "https://github.com/cortezaproject/corteza/releases";
|
||||
changelog = "https://docs.cortezaproject.org/corteza-docs/${lib.versions.majorMinor version}/changelog/index.html";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ prince213 ];
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
|
||||
mkWebApp =
|
||||
name: hash:
|
||||
callPackage ./buildYarnDistOnly.nix {
|
||||
inherit
|
||||
version
|
||||
src
|
||||
hash
|
||||
meta
|
||||
;
|
||||
pname = "corteza-webapp-${name}";
|
||||
sourceDir = "client/web/${name}";
|
||||
extraFiles = "../../../{README.md,LICENSE,CONTRIBUTING.md,DCO}";
|
||||
};
|
||||
|
||||
webApps = lib.mapAttrs mkWebApp {
|
||||
admin = "sha256-34lfnK2mecvu1Lgg9IM61+fbnqRgZC/Agi7iyugn0fM=";
|
||||
compose = "sha256-1/Fyl6Z27TtZzNBeerKYNs4VhLWEW3wJyr0SCapzc9E=";
|
||||
discovery = "sha256-mL+ibAgVFCRV5AvN0VZc4LCCY8hyaIC8gOlgEdXayuU=";
|
||||
one = "sha256-SuGf72y4PXatZJQgbW5X4mPjtJmQlpwbjfFYCEZElBU=";
|
||||
privacy = "sha256-yHi6pq0OKCh+2reygNL7TvwULCHwxeD8BXVVMjlnpLc=";
|
||||
reporter = "sha256-AWKSzULOTdUZ5wdlTo8dJwVGc7RlYbimR4YF4ZAN1pQ=";
|
||||
workflow = "sha256-cxD2mG4uuO8KT1r2Y4opPlY84Hvqu7cbWh2BSo8CcEc=";
|
||||
};
|
||||
|
||||
server-webconsole = callPackage ./buildYarnDistOnly.nix {
|
||||
inherit version src meta;
|
||||
pname = "corteza-server-webconsole";
|
||||
sourceDir = "server/webconsole";
|
||||
yarnLock = ./server-webconsole-yarn.lock;
|
||||
hash = "sha256-GMXrQtplreg/3bWfRwQQwDNiHQNl6YHF5nhmFNCYsiM=";
|
||||
};
|
||||
|
||||
corteza-locale = fetchFromGitHub {
|
||||
owner = "cortezaproject";
|
||||
repo = "corteza-locale";
|
||||
rev = "64b6d5d562dce642652db55949231abf8b9af4ef";
|
||||
sha256 = "sha256-OKr/M91sEDlTwYBiDXwWkShlfazJBm21G0uU429fjW0=";
|
||||
};
|
||||
|
||||
corteza-webapp = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "corteza-webapp";
|
||||
inherit version meta;
|
||||
|
||||
srcs = lib.attrValues webApps;
|
||||
sourceRoot = ".";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
cp --no-preserve=mode -r ${webApps.one.name} dist
|
||||
${lib.concatStringsSep "\n" (
|
||||
lib.attrValues (
|
||||
lib.mapAttrs (name: src: ''
|
||||
cp -r ${src.name} dist/${name}
|
||||
'') (lib.removeAttrs webApps [ "one" ])
|
||||
)
|
||||
)}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -r dist/* $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
});
|
||||
|
||||
corteza-server = buildGoModule (finalAttrs: {
|
||||
pname = "corteza-server";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/server";
|
||||
# already vendored
|
||||
vendorHash = null;
|
||||
|
||||
preBuild =
|
||||
''
|
||||
cp -r ../locale/en pkg/locale/src/
|
||||
cp -r ${server-webconsole}/* webconsole/dist/
|
||||
''
|
||||
+ lib.optionalString withLocales ''
|
||||
cp -r ${corteza-locale}/src/* pkg/locale/src/
|
||||
'';
|
||||
|
||||
subPackages = [ "cmd/corteza" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/corteza{,-server}
|
||||
cp -r provision .env.example ../{README.md,LICENSE,CONTRIBUTING.md,DCO} $out
|
||||
rm -f $out/provision/README.adoc $out/provision/update.sh
|
||||
'';
|
||||
|
||||
meta = meta // {
|
||||
mainProgram = "corteza-server";
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "corteza";
|
||||
inherit version;
|
||||
|
||||
srcs = lib.attrValues finalAttrs.passthru.srcs;
|
||||
sourceRoot = ".";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
cp --no-preserve=mode -r ${finalAttrs.passthru.srcs.corteza-server.name} dist
|
||||
chmod a+x dist/bin/corteza-server
|
||||
mkdir dist/webapp
|
||||
cp -r ${finalAttrs.passthru.srcs.corteza-webapp.name}/* dist/webapp
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
srcs = { inherit corteza-server corteza-webapp; };
|
||||
};
|
||||
|
||||
inherit (corteza-server) meta;
|
||||
})
|
||||
File diff suppressed because it is too large
Load Diff
@@ -34,7 +34,7 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/m13253/dns-over-https/releases/tag/v${version}";
|
||||
description = "High performance DNS over HTTPS client & server";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ cryo ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "droidcam";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aramg";
|
||||
repo = "droidcam";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Pwq7PDj+MH1wzrUyfva2F2+oELm4Sb1EJPUUCsHYb7k=";
|
||||
sha256 = "sha256-z/SteW3jYR/VR+HffvTetdGs5oz4qWBNkaqLYiP1V8c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,18 +10,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "easytier";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EasyTier";
|
||||
repo = "EasyTier";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-urcwzM5nup3+guvSngw+I2QBjmjSc/WV7BWFpISVDBg=";
|
||||
hash = "sha256-PacIaE1oxnMAh3aS6k4ciuE/85G+JIbFDcge64fyjiE=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
cargoHash = "sha256-rqL8tnLPeXK2BLvSFrzMRvtJAqHgOqNh4fE0w8c0ThU=";
|
||||
cargoHash = "sha256-Q2qxCINePGCbvlLMxg9oVFtBoJtbG+pgpRdoLkvZb+w=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
protobuf
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Emoji on the command line";
|
||||
homepage = "https://github.com/mrowa44/emojify";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ snowflake ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "emojify";
|
||||
};
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fabric-ai";
|
||||
version = "1.4.209";
|
||||
version = "1.4.216";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielmiessler";
|
||||
repo = "fabric";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kRPFTs3w5MhlCax81GrZ82GWLMTDUiyXOI9lSp4Fwkc=";
|
||||
hash = "sha256-OYBgKST8TsDPErZq6ABVQ2Fq9Wl6eixVOmgQlJ8XeWs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GkAehT2oFG8cGe+PkceZios3ZG9S0CZs4L7slX+Dkck=";
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
writeShellApplication,
|
||||
cacert,
|
||||
curl,
|
||||
gnused,
|
||||
jq,
|
||||
nix-prefetch-github,
|
||||
prefetch-npm-deps,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "gemini-cli";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google-gemini";
|
||||
repo = "gemini-cli";
|
||||
# Currently there's no release tag
|
||||
rev = "121bba346411cce23e350b833dc5857ea2239f2f";
|
||||
hash = "sha256-2w28N6Fhm6k3wdTYtKH4uLPBIOdELd/aRFDs8UMWMmU=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-yoUAOo8OwUWG0gyI5AdwfRFzSZvSCd3HYzzpJRvdbiM=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p packages/generated
|
||||
echo "export const GIT_COMMIT_INFO = { commitHash: '${finalAttrs.src.rev}' };" > packages/generated/git-commit.ts
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/lib"
|
||||
|
||||
cp -r node_modules "$out/lib/"
|
||||
|
||||
rm -f "$out/lib/node_modules/@google/gemini-cli"
|
||||
rm -f "$out/lib/node_modules/@google/gemini-cli-core"
|
||||
|
||||
cp -r packages/cli "$out/lib/node_modules/@google/gemini-cli"
|
||||
cp -r packages/core "$out/lib/node_modules/@google/gemini-cli-core"
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
ln -s ../lib/node_modules/@google/gemini-cli/dist/index.js "$out/bin/gemini"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
chmod +x "$out/bin/gemini"
|
||||
'';
|
||||
|
||||
passthru.updateScript = lib.getExe (writeShellApplication {
|
||||
name = "gemini-cli-update-script";
|
||||
runtimeInputs = [
|
||||
cacert
|
||||
curl
|
||||
gnused
|
||||
jq
|
||||
nix-prefetch-github
|
||||
prefetch-npm-deps
|
||||
];
|
||||
text = ''
|
||||
latest_version=$(curl -s "https://raw.githubusercontent.com/google-gemini/gemini-cli/main/package-lock.json" | jq -r '.version')
|
||||
latest_rev=$(curl -s "https://api.github.com/repos/google-gemini/gemini-cli/commits/main" | jq -r '.sha')
|
||||
|
||||
src_hash=$(nix-prefetch-github google-gemini gemini-cli --rev "$latest_rev" | jq -r '.hash')
|
||||
|
||||
temp_dir=$(mktemp -d)
|
||||
curl -s "https://raw.githubusercontent.com/google-gemini/gemini-cli/$latest_rev/package-lock.json" > "$temp_dir/package-lock.json"
|
||||
npm_deps_hash=$(prefetch-npm-deps "$temp_dir/package-lock.json")
|
||||
rm -rf "$temp_dir"
|
||||
|
||||
sed -i "s|version = \".*\";|version = \"$latest_version\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
|
||||
sed -i "s|rev = \".*\";|rev = \"$latest_rev\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
|
||||
sed -i "/src = fetchFromGitHub/,/};/s|hash = \".*\";|hash = \"$src_hash\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
|
||||
sed -i "/npmDeps = fetchNpmDeps/,/};/s|hash = \".*\";|hash = \"$npm_deps_hash\";|" "pkgs/by-name/ge/gemini-cli/package.nix"
|
||||
'';
|
||||
});
|
||||
|
||||
meta = {
|
||||
description = "AI agent that brings the power of Gemini directly into your terminal";
|
||||
homepage = "https://github.com/google-gemini/gemini-cli";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ donteatoreo ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "gemini";
|
||||
};
|
||||
})
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Simple high quality GIF encoding";
|
||||
homepage = "https://github.com/lukechilds/gifgen";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ snowflake ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "gifgen";
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "18.1.0";
|
||||
version = "18.1.1";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
@@ -21,7 +21,7 @@ let
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nttZfGjQKRSYCoMHSljojYLNScyDPHd8ayCuDkvKXpE=";
|
||||
hash = "sha256-R79UV6QIEO/B7xQ3ds4scm7twHmalziksKBJ97tYVJM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BTpcnaHNyLgdAA9KqqA+mBo18fmQ0+OwLGNOPHRJ/IE=";
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "18.1.0";
|
||||
version = "18.1.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HwjbQLEc/GmFxVvyx0UMKKrNoHmfFADblVN/XOAtMZY=";
|
||||
hash = "sha256-tqT+ARebnBhBHzOenkL/o7/tf4/urxKFAOFMwCQSzeA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6ZHKwPhC3N813kiw1NnPOMVc2CBSIClwc4MunDi0gCk=";
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"version": "18.1.0",
|
||||
"repo_hash": "0d7xs0l6nzs1bpr4slycq0agw3kk9k9bw3q0dqqc2knla71i21fd",
|
||||
"version": "18.1.1",
|
||||
"repo_hash": "1agw51d1qvvx6yyzz71sz4mkx04ic8hmql8lggz3x5scnhglnzjq",
|
||||
"yarn_hash": "0c5pp3dpvw0q0nfl6w1lpdmk7dvkfinwb7z7a3vq22wgzca23x2m",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v18.1.0-ee",
|
||||
"rev": "v18.1.1-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "18.1.0",
|
||||
"GITLAB_PAGES_VERSION": "18.1.0",
|
||||
"GITALY_SERVER_VERSION": "18.1.1",
|
||||
"GITLAB_PAGES_VERSION": "18.1.1",
|
||||
"GITLAB_SHELL_VERSION": "14.42.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.6.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.1.0"
|
||||
"GITLAB_WORKHORSE_VERSION": "18.1.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "18.1.0";
|
||||
version = "18.1.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Guile bindings for the aspell library";
|
||||
homepage = "https://github.com/spk121/guile-aspell";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ snowflake ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = guile.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/jomo/imgur-screenshot/";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lw ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "imgur-screenshot";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -42,13 +42,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-graphics-compiler";
|
||||
version = "2.11.7";
|
||||
version = "2.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-graphics-compiler";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bGH+cgWI3bRgOhSBgQUrHPiCQ68EfAxG+iM6vs8VjhU=";
|
||||
hash = "sha256-1no41/YUr63OwPEaFFP/7n5GxfZqprCLk37zq60O2eM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "json-sort-cli";
|
||||
version = "2.0.3";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tillig";
|
||||
repo = "json-sort-cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0NiDrZM00B3GcG+bH40QJZFXBFzY+4r1E1w1NbhiqUE=";
|
||||
hash = "sha256-KJCT1QwjXAmAlsLxAgNV7XXtpSytlCEbPTZYFoEZgww=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-UGy1+AfIWQTCP38E1w7I8PTc7Bsh/2gV5wNmfCvIau8=";
|
||||
npmDepsHash = "sha256-V+uKK3y3ImTHT6HSCmzlQUB+BqGYHyQyIB35uiIRNmg=";
|
||||
dontNpmBuild = true;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -22,7 +22,6 @@ let
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [
|
||||
mjanczyk
|
||||
svsdep
|
||||
mgregoire
|
||||
];
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
{
|
||||
python3Packages,
|
||||
}:
|
||||
python3Packages.toPythonApplication python3Packages.keymap-drawer
|
||||
@@ -3,6 +3,7 @@
|
||||
fetchFromGitHub,
|
||||
git,
|
||||
gitUpdater,
|
||||
fetchpatch,
|
||||
lib,
|
||||
nlohmann_json,
|
||||
pkg-config,
|
||||
@@ -13,7 +14,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lcevcdec";
|
||||
version = "3.3.7";
|
||||
version = "3.3.8";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -25,9 +26,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "v-novaltd";
|
||||
repo = "LCEVCdec";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+ltttvaNGes3V9gAWGSGwn6g/whOhjdv4gCUzeD4cNI=";
|
||||
hash = "sha256-s7gY3l5ML+7T7i6DsstC75XXgxQgTWyITfa+8OhHl+w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/010-lcevcdec-fix-pkgconfig-libs.patch?h=lcevcdec&id=a3470fad7d64dfc9d5ebd7ed0c09cb1fb5e2488f";
|
||||
hash = "sha256-z65W3k2OA/QDX0jJu4nmXtpi8kTcUFN7cK82PsI4jrQ=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace cmake/tools/version_files.py \
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
python3,
|
||||
perlPackages,
|
||||
makeWrapper,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -19,14 +20,14 @@ let
|
||||
perlPackages.PathTools
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ perlPackages.MemoryProcess ];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lcov";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-test-project";
|
||||
repo = "lcov";
|
||||
rev = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-31318or9AQ7iyu9DNQEvf5jaDzrneOOqOXu0HF1eag4=";
|
||||
};
|
||||
|
||||
@@ -42,18 +43,28 @@ stdenv.mkDerivation rec {
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"VERSION=${finalAttrs.version}"
|
||||
"RELEASE=1"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs --build bin/{fix.pl,get_version.sh} tests/*/*
|
||||
patchShebangs --host bin/{gen*,lcov,perl2lcov}
|
||||
makeFlagsArray=(PREFIX=$out LCOV_PERL_PATH=${lib.getExe perl})
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for f in "$out"/bin/{gen*,lcov,perl2lcov}; do
|
||||
for f in "$out"/bin/{gen*,lcov,llvm2lcov,perl2lcov}; do
|
||||
wrapProgram "$f" --set PERL5LIB ${perlPackages.makeFullPerlPath perlDeps}
|
||||
done
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Code coverage tool that enhances GNU gcov";
|
||||
|
||||
@@ -67,9 +78,10 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
homepage = "https://github.com/linux-test-project/lcov";
|
||||
changelog = "https://github.com/linux-test-project/lcov/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
maintainers = with lib.maintainers; [ dezgeg ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -34,7 +34,7 @@ buildGoModule rec {
|
||||
description = "Web service that allows you to share notes anonymously, an alternative to pastebin.com";
|
||||
homepage = "https://git.lcomrade.su/root/lenpaste";
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ vector1dev ];
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "lenpaste";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,13 +22,13 @@ let
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "linux-firmware";
|
||||
version = "20250621"; # not a real tag, but the current stable tag breaks some AMD GPUs entirely
|
||||
version = "20250624"; # not a real tag, but the current stable tag breaks some AMD GPUs entirely
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "kernel-firmware";
|
||||
repo = "linux-firmware";
|
||||
rev = "49c833a10ad96a61a218d28028aed20aeeac124c";
|
||||
hash = "sha256-Pz/k/ol0NRIHv/AdridwoBPDLsd0rfDAj31Paq4mPpU=";
|
||||
rev = "b05fabcd6f2a16d50b5f86c389dde7a33f00bb81";
|
||||
hash = "sha256-AvSsyfKP57Uhb3qMrf6PpNHKbXhD9IvFT1kcz5J7khM=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
glib,
|
||||
gst_all_1,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "livekit-ingress";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "livekit";
|
||||
repo = "ingress";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gt1oIAKEBwQWqDCLSsRgoe7oIk5jDNReN+dFYUNnRUc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fttI+xNzHiDWKGkl20oGJOcWffElmmqNd7gbb5FiQZc=";
|
||||
|
||||
subPackages = [ "cmd/server" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/server $out/bin/ingress
|
||||
wrapProgram $out/bin/ingress --suffix GST_PLUGIN_SYSTEM_PATH_1_0 ":" $GST_PLUGIN_SYSTEM_PATH_1_0
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = with gst_all_1; [
|
||||
glib
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-libav
|
||||
];
|
||||
|
||||
# there are no actual tests, and we don't need to spend
|
||||
# another 5 minutes of cgo to figure that out
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Ingest streams (RTMP/WHIP) or files (HLS, MP4) to LiveKit WebRTC";
|
||||
changelog = "https://github.com/livekit/ingress/releases/tag/${src.tag}";
|
||||
homepage = "https://github.com/livekit/ingress";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ k900 ];
|
||||
mainProgram = "ingress";
|
||||
};
|
||||
}
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mdns-scanner";
|
||||
version = "0.13.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CramBL";
|
||||
repo = "mdns-scanner";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-86GpBjgfBMkqzoWPEbjQM6PvSEb67A8nL7sEtplXoic=";
|
||||
hash = "sha256-15yVQfqzAYBrCzMZJE3IiQG+ZfGMQYltxDGf+pmD8ss=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-z0IHONtU1pgViQZu0Q2fZVjdJ6sSlgnIw83hqWLKfVM=";
|
||||
cargoHash = "sha256-htYBCcK8aVCTmdxMW0QmX+2aS9ZuC7PsuebrWMpUl38=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/CramBL/mdns-scanner";
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
SDL,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mp3blaster";
|
||||
version = "3.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stragulus";
|
||||
repo = "mp3blaster";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Gke6OjcrDlF3CceSVyfu8SGd0004cef8RlZ76Aet/F8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/stragulus/mp3blaster/commit/62168cba5eaba6ffe56943552837cf033cfa96ed.patch";
|
||||
sha256 = "088l27kl1l58lwxfnw5x2n64sdjy925ycphni3icwag7zvpj0xz1";
|
||||
hash = "sha256-4Xcg7/7nKc7iiBZe5otIXjZNjBW9cOs6p6jQQOcRFCE=";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -40,14 +40,15 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
"-Wno-reserved-user-defined-literal"
|
||||
"-Wno-register"
|
||||
]
|
||||
);
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Audio player for the text console";
|
||||
homepage = "http://www.mp3blaster.org/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ earldouglas ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ earldouglas ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -31,13 +31,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird";
|
||||
version = "0.47.1";
|
||||
version = "0.49.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q9+yIq+FNcsZbmJjUjUxOEZn5jvfGfAE6Yt6Cc67rrg=";
|
||||
hash = "sha256-Hv0A9/NTMzRAf9YvYGvRLyy2gdigF9y2NfylE8bLcTw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t/X/muMwHVwg8Or+pFTSEQEsnkKLuApoVUmMhyCImWI=";
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nominatim-ui";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osm-search";
|
||||
repo = "nominatim-ui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TliTWDKdIp7Z0uYw5P65i06NQAUNwNymUsSYrihVZFE=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp --archive dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Debugging user interface for Nominatim geocoder";
|
||||
homepage = "https://github.com/osm-search/nominatim-ui";
|
||||
license = lib.licenses.gpl2;
|
||||
teams = with lib.teams; [
|
||||
geospatial
|
||||
ngi
|
||||
];
|
||||
changelog = "https://github.com/osm-search/nominatim-ui/releases/tag/v${finalAttrs.version}";
|
||||
};
|
||||
})
|
||||
@@ -66,11 +66,11 @@ let
|
||||
|
||||
derivation = stdenv.mkDerivation rec {
|
||||
pname = "onlyoffice-desktopeditors";
|
||||
version = "8.3.1";
|
||||
version = "9.0.0";
|
||||
minor = null;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
|
||||
hash = "sha256-6eoXLOLshHpn3eaEx57ll66nD+gs1LZUET0CSm4od5c=";
|
||||
hash = "sha256-mGjFFuuplGINgjuIEHoO3AO4ppkum1lifj5ukbfWWS8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "openapi-python-client";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "openapi-generators";
|
||||
repo = "openapi-python-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bFGqOrBPoywx/r35zpViAWUGiF1ZL3IG1E3TA+Qa354=";
|
||||
hash = "sha256-8ehqUYYFBkYgXm/fHOf3d6Gpz9zPoPekfdF22FO1TSE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openbao";
|
||||
version = "2.2.2";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openbao";
|
||||
repo = "openbao";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-r/CPxrVPn0s0qWqdsymqZLSEY0JMilPiWfxmOUvYvnM=";
|
||||
hash = "sha256-X0O3JwJS49yReTEIjRfk0GGzgGDUZjNadKMZXUuor/I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-zT/cLL34G93b62VTowwgs8ZZ41wmJ//lzooxVaN7p9Q=";
|
||||
vendorHash = "sha256-uOWLCyLCSGMTjRpPbOWlJJYKbZmkkOWnzr5o3zvRLU0=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
offlineCache = yarn-berry_3.fetchYarnBerryDeps {
|
||||
inherit (finalAttrs) src sourceRoot;
|
||||
hash = "sha256-bQ+ph7CvPtygvCoCMjTMadYLn/ds2ZOGQL29x3hFuLg=";
|
||||
hash = "sha256-/SKQC+i8tgpYNVJIem8XDp+v7olGbRRgW25UhhLpIu8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,19 +4,19 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "picocrypt-cli";
|
||||
version = "2.10";
|
||||
version = "1.48";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Picocrypt";
|
||||
repo = "CLI";
|
||||
rev = version;
|
||||
hash = "sha256-a9fRbI3yv+K44/TIMqZMgZXRKN/Rh2AJyeTDhJynr4M=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-A/04tuDwB2nAGWOWNEPt87lwAR/5Co/IjjV7xIcRxUo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/picocrypt";
|
||||
vendorHash = "sha256-F+t/VL9IzBfz8cfpaw+aEPxTPGUq3SbWbyqPWeLrh6E=";
|
||||
sourceRoot = "${finalAttrs.src.name}/picocrypt";
|
||||
vendorHash = "sha256-iVbfvV3BqK40uU9kQaqgIsHmX8i7w1M1MIxnknDP6AM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -29,7 +29,10 @@ buildGoModule rec {
|
||||
description = "Command-line interface for Picocrypt";
|
||||
homepage = "https://github.com/Picocrypt/CLI";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ arthsmn ];
|
||||
maintainers = with lib.maintainers; [
|
||||
arthsmn
|
||||
ryand56
|
||||
];
|
||||
mainProgram = "picocrypt";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/caverym/proton-caller/releases/tag/${version}";
|
||||
homepage = "https://github.com/caverym/proton-caller";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kho-dialga ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "proton-call";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,14 +21,14 @@ let
|
||||
in
|
||||
py.pkgs.buildPythonApplication rec {
|
||||
pname = "prowler";
|
||||
version = "5.7.4";
|
||||
version = "5.7.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "prowler-cloud";
|
||||
repo = "prowler";
|
||||
tag = version;
|
||||
hash = "sha256-SC3C8JSe0n8aHwP8gelh+tDrLO6HiGN+7/Rcxhwr6Ec=";
|
||||
hash = "sha256-KcHHZPklJZ7o5cs30rL+vGaeST8LUdGfdhG7daZZzX0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -68,9 +68,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
homepage = "https://kannibalox.github.io/pyrosimple/";
|
||||
changelog = "https://github.com/kannibalox/pyrosimple/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
ne9z
|
||||
vamega
|
||||
];
|
||||
maintainers = with lib.maintainers; [ vamega ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = with lib; {
|
||||
description = "Ultimate desktop calculator";
|
||||
homepage = "http://qalculate.github.io";
|
||||
maintainers = with maintainers; [ _4825764518 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2Plus;
|
||||
mainProgram = "qalculate-qt";
|
||||
platforms = platforms.unix;
|
||||
|
||||
@@ -7,21 +7,22 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "responder";
|
||||
version = "3.1.5.0";
|
||||
version = "3.1.6.0";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lgandx";
|
||||
repo = "Responder";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-iFNdGHe31TnYmC931kdO0vbliqhpsht97bDteZi4kdw=";
|
||||
hash = "sha256-2aNJkcdtTpw4OYHSTgJUYsGOsBD1I0ad3cSpVCS9kpo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
dependencies = with python3.pkgs; [
|
||||
aioquic
|
||||
netifaces
|
||||
];
|
||||
|
||||
@@ -48,10 +49,10 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
meta = {
|
||||
description = "LLMNR, NBT-NS and MDNS poisoner, with built-in HTTP/SMB/MSSQL/FTP/LDAP rogue authentication server";
|
||||
mainProgram = "responder";
|
||||
homepage = "https://github.com/lgandx/Responder";
|
||||
changelog = "https://github.com/lgandx/Responder/blob/master/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "responder";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 0eaef67b683683fb423fcb2d5096b3cdf9a4a9cd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
|
||||
Date: Sun, 22 Mar 2020 12:26:10 +0100
|
||||
Subject: [PATCH] Patch plugindir to output
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 50edb74..639ee86 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -50,7 +50,7 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 ])
|
||||
PKG_CHECK_MODULES([cairo], [cairo])
|
||||
PKG_CHECK_MODULES([rofi], [rofi >= 1.5.4])
|
||||
|
||||
-[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`"
|
||||
+[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`"
|
||||
AC_SUBST([rofi_PLUGIN_INSTALL_DIR])
|
||||
|
||||
LT_INIT([disable-static])
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
rofi-unwrapped,
|
||||
libqalculate,
|
||||
@@ -10,24 +9,27 @@
|
||||
cairo,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook3,
|
||||
meson,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rofi-calc";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = "rofi-calc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1Sdi7SN5ZhBJB5qyqDZQC5QcBz0Fydb1az8yDSuTlnE=";
|
||||
sha256 = "sha256-ASZtIcUxaOYYAlINa77R9WgqonHtAR7Fdm9wDrbyRy0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
wrapGAppsHook3
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -37,12 +39,16 @@ stdenv.mkDerivation rec {
|
||||
cairo
|
||||
];
|
||||
|
||||
patches = [
|
||||
./0001-Patch-plugindir-to-output.patch
|
||||
];
|
||||
mesonBuildType = "release";
|
||||
|
||||
postPatch = ''
|
||||
sed "s|qalc_binary = \"qalc\"|qalc_binary = \"${libqalculate}/bin/qalc\"|" -i src/calc.c
|
||||
substituteInPlace src/calc.c --replace-fail \
|
||||
"qalc_binary = \"qalc\"" \
|
||||
"qalc_binary = \"${libqalculate}/bin/qalc\""
|
||||
|
||||
substituteInPlace src/meson.build --replace-fail \
|
||||
"rofi.get_variable('pluginsdir')" \
|
||||
"'$out/lib/rofi'"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -32,7 +32,7 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/semaphoreci/cli";
|
||||
changelog = "https://github.com/semaphoreci/cli/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ liberatys ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -60,7 +60,6 @@ stdenvNoCC.mkDerivation {
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [
|
||||
alexnortung
|
||||
cyewashish
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
|
||||
@@ -43,9 +43,9 @@ let
|
||||
}
|
||||
else if llvmMajor == "15" then
|
||||
rec {
|
||||
version = "15.0.12";
|
||||
version = "15.0.13";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-u3cy8Nk9Dvt5VeSP46glvmSv1sQp+lUl9rY6pPTqtmY=";
|
||||
hash = "sha256-RnGbBHUUGjIBcakQJO4nAm3/oIrQ8nkx+BC8Evw6Jmc=";
|
||||
}
|
||||
else if llvmMajor == "14" then
|
||||
{
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "storj-uplink";
|
||||
version = "1.131.3";
|
||||
version = "1.131.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "storj";
|
||||
repo = "storj";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9ZBe9m6HD9Cz8afyGqPLnKqrA6OPaxB2azUgr9VP5OY=";
|
||||
hash = "sha256-jDZ7Y+3CnuL5vIVns+5PdmMjfqbP0K596HDivu++zyA=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/uplink" ];
|
||||
|
||||
@@ -10,19 +10,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svix-server";
|
||||
version = "1.67.0";
|
||||
version = "1.68.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svix";
|
||||
repo = "svix-webhooks";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-H9SrYWwSwW03LSKzCTVgtgZIM+o6nL3USBmJ61qxFos=";
|
||||
hash = "sha256-AiMaYSLON4H39dUvRyXQDymE/SQ7gK9JrgXBc1Gn7no=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/server";
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-xDSxevVnUPG95djjq//tjYI7WPb6qkXcvVKa6rBIwF0=";
|
||||
cargoHash = "sha256-wNaI5/AtStekJslO8wDl1/PzHaEi02xBEO8IvcqbMZM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tray-tui";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Levizor";
|
||||
repo = "tray-tui";
|
||||
tag = version;
|
||||
hash = "sha256-yCA0qN51xrfhHOL34prn6T4qZ7PsLHX1l2yd4o6oGCo=";
|
||||
hash = "sha256-iZyhcBCOUq2KuQR21sQiwFeEIr7DNBs1fYRu5Nv5+ng=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
|
||||
cargoHash = "sha256-m6m9zZ/H1FpEDTh1M94ZwxLht1Of13xNqM7T3igjc6M=";
|
||||
cargoHash = "sha256-o3FmSNOiCcbLoU6/LtbugalWUm/ME9kG8bzfem3HqWI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Middle mouse button primary X selection/clipboard paste disabler";
|
||||
homepage = "https://github.com/milaq/XMousePasteBlock";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ maintainers.petercommand ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "xmousepasteblock";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thunar-dropbox";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jeinzi";
|
||||
repo = "thunar-dropbox";
|
||||
rev = version;
|
||||
sha256 = "sha256-q7tw/1JgEn9SyjH1KBZl0tintWJjd3ctUs4JUuCWULs=";
|
||||
sha256 = "sha256-uYqO87ftEtnSRn/yMSF1jVGleYXR3hVj2Jb1/kAd64Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -114,15 +114,22 @@ stdenv.mkDerivation rec {
|
||||
cp -r . $appdir
|
||||
chmod -R +w $appdir
|
||||
|
||||
mkdir -p $appdir/node_modules
|
||||
mkdir -p $appdir/node_modules/.bin
|
||||
cp -r ${nodeModules}/* $appdir/node_modules
|
||||
cp -r ${nodeModules}/* $appdir/node_modules/.bin
|
||||
|
||||
cp ${./locate_cache.sh} $appdir/locate_cache.sh
|
||||
chmod +x $appdir/locate_cache.sh
|
||||
|
||||
export EM_CACHE=$out/share/emscripten/cache
|
||||
|
||||
mkdir -p $out/bin
|
||||
for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons emsize; do
|
||||
makeWrapper $appdir/$b $out/bin/$b \
|
||||
--set NODE_PATH ${nodeModules} \
|
||||
--set EM_EXCLUSIVE_CACHE_ACCESS 1 \
|
||||
--set PYTHON ${python3}/bin/python
|
||||
--set PYTHON ${python3}/bin/python \
|
||||
--run "source $appdir/locate_cache.sh"
|
||||
done
|
||||
|
||||
# precompile libc (etc.) in all variants:
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
export EM_CACHE=${EM_CACHE:-"/tmp/$(basename $(realpath $(dirname $(which emcc))/..))_cache"}
|
||||
@@ -1232,7 +1232,8 @@ with self;
|
||||
|
||||
ppx_expect = janePackage {
|
||||
pname = "ppx_expect";
|
||||
hash = "sha256-m4Nr48ZET632I6vw5RjpNA0elW3lpN3aPmfA3RzsEn8=";
|
||||
version = "0.17.2";
|
||||
hash = "sha256-na9n/+shkiHIIUQ2ZitybQ6NNsSS9gWFNAFxij+JNVo=";
|
||||
meta.description = "Cram like framework for OCaml";
|
||||
propagatedBuildInputs = [
|
||||
ppx_here
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildDunePackage,
|
||||
ocaml,
|
||||
fetchFromGitHub,
|
||||
menhir,
|
||||
bos,
|
||||
cmdliner,
|
||||
dolmen_type,
|
||||
fpath,
|
||||
hc,
|
||||
menhirLib,
|
||||
# fix eval on legacy ocaml versions
|
||||
ocaml_intrinsics ? null,
|
||||
patricia-tree,
|
||||
prelude,
|
||||
scfg,
|
||||
yojson,
|
||||
z3,
|
||||
zarith,
|
||||
mdx,
|
||||
ounit2,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "smtml";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "formalsec";
|
||||
repo = "smtml";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-QxVORnu28mcs54ZEPMxI5Bch/+/gkIfn0bTqrnSKUOw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
menhir
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bos
|
||||
cmdliner
|
||||
dolmen_type
|
||||
fpath
|
||||
hc
|
||||
menhirLib
|
||||
ocaml_intrinsics
|
||||
patricia-tree
|
||||
prelude
|
||||
scfg
|
||||
yojson
|
||||
z3
|
||||
zarith
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mdx
|
||||
ounit2
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mdx.bin
|
||||
];
|
||||
|
||||
doCheck = !(lib.versions.majorMinor ocaml.version == "5.0" || stdenv.hostPlatform.isDarwin);
|
||||
|
||||
meta = {
|
||||
description = "SMT solver frontend for OCaml";
|
||||
homepage = "https://formalsec.github.io/smtml/smtml/";
|
||||
downloadPage = "https://github.com/formalsec/smtml";
|
||||
changelog = "https://github.com/formalsec/smtml/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ethancedwards8 ];
|
||||
};
|
||||
}
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioboto3";
|
||||
version = "14.2.0";
|
||||
version = "14.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terrycain";
|
||||
repo = "aioboto3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RzaMsJtGvC6IILgwj09kymw+Hv3gjyBf2PHBzYC9itE=";
|
||||
hash = "sha256-3GdTpbU0uEEzezQPHJTGPB42Qu604eIhcIAP4rZMQiY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomeconnect";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "MartinHjelmare";
|
||||
repo = "aiohomeconnect";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-TEPE9AzChfZSN3kA3fSJy6eh8J+1AUTnO59vywOXlAk=";
|
||||
hash = "sha256-Gi6uSImA3R1/7CYbyzg/0j6z/wVFpuEzJNeTCoglhpY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "airthings-ble";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "vincegio";
|
||||
repo = "airthings-ble";
|
||||
tag = version;
|
||||
hash = "sha256-RKvQ3w3unDk/U6dz3r0Pn3ppVA6ZGxUoyuVk5jbI8jc=";
|
||||
hash = "sha256-eZjMRely3UxcnjPB6DQDBOKdP+2kFCe/5fchiX+rcEM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -24,20 +24,21 @@
|
||||
dirty-equals,
|
||||
nest-asyncio,
|
||||
pytest-asyncio,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
respx,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "anthropic";
|
||||
version = "0.52.2";
|
||||
version = "0.55.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anthropics";
|
||||
repo = "anthropic-sdk-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vCIS2NDsScKESfYFHDTSRLb9ZhUsrEPHyfuubrbc+44=";
|
||||
hash = "sha256-2IdsWNQdp4Cr6xP1MDnj5EN/jyGcxuc5bTKg349DpI8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -69,6 +70,7 @@ buildPythonPackage rec {
|
||||
dirty-equals
|
||||
nest-asyncio
|
||||
pytest-asyncio
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
respx
|
||||
];
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asdf-astropy";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "astropy";
|
||||
repo = "asdf-astropy";
|
||||
tag = version;
|
||||
hash = "sha256-hP77qhNTE89cuz9Z8vWlWYo2En0SV4uoHaBnxQDNEvI=";
|
||||
hash = "sha256-CCLoG3zV34kmdGYN6RLi5u2v0RDvEqVN6VcdrX7L4uY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -4,22 +4,23 @@
|
||||
azure-mgmt-core,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
msrest,
|
||||
isodate,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-databoxedge";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-BAkAYrwejwDC9FMVo7zrD7OzR57BR01xuINC4TSZsIc=";
|
||||
pname = "azure_mgmt_databoxedge";
|
||||
inherit version;
|
||||
hash = "sha256-8Y8GbQJ8maIkmY08R0CBJoIVmr44z1joewl3DKssrMA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -27,7 +28,8 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
msrest
|
||||
isodate
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# no tests in pypi tarball
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cdcs";
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usnistgov";
|
||||
repo = "pycdcs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-u3txoe8ZfofMqhDB1ZhNF0mq9fYgwotRguVUezhDvwk=";
|
||||
hash = "sha256-P6fFL9yqnVbeUNBejnTcFowcf9xZP6XwheHwNUZKKlM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclopts";
|
||||
version = "3.19.0";
|
||||
version = "3.20.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "BrianPugh";
|
||||
repo = "cyclopts";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WqBb4G4tAhgOISRRjauJhIT9imoNiF9pnp9QzY9tVZI=";
|
||||
hash = "sha256-0ANSueh/g2twwxeuu5nTwvWkLAqXWTYZ0vVa6wg2D/w=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -76,6 +76,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://www.etebase.com/";
|
||||
description = "Python client library for Etebase";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ _3699n ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "garth";
|
||||
version = "0.5.16";
|
||||
version = "0.5.17";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5ZmxL5JYHZB5sFrpaCF8vrCo45LAKVYfP/yfilmHprI=";
|
||||
hash = "sha256-SO3pOMOLL9cHd+VccCVTh3XZPBBH9DzHxEgfKgSxCcs=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "requests-oauthlib" ];
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gwcs";
|
||||
version = "0.24.0";
|
||||
version = "0.25.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "spacetelescope";
|
||||
repo = "gwcs";
|
||||
tag = version;
|
||||
hash = "sha256-XxC61AzyZt0lVVwOr2yiN0/ldjcq/ABtzNDSQaGo9as=";
|
||||
hash = "sha256-jGO3/qFNL8aovlU/jXIZpk2GHmwZ+o8tSSqnPHgtFqU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "2025.4.1";
|
||||
version = "2025.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.13";
|
||||
@@ -26,14 +26,14 @@ buildPythonPackage rec {
|
||||
owner = "SukramJ";
|
||||
repo = "hahomematic";
|
||||
tag = version;
|
||||
hash = "sha256-cJpt5OjC2zXsKIxYZ+5TQORDuhLsQ+6MBzXD9ygG5Os=";
|
||||
hash = "sha256-1gZ0TWBFDe+RN5Rb3dUEZyEsy1kyR8Qhlpj9eJRuh60=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools==78.1.0" "setuptools" \
|
||||
--replace-fail "setuptools==80.9.0" "setuptools" \
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "here-routing";
|
||||
version = "1.1.3";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eifinger";
|
||||
repo = "here_routing";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-56Sx8pbfsuCj7mqG15HK3QoGGiQDFFrbkOdNedV+HY4=";
|
||||
hash = "sha256-h3y5hjaSHH6oIfSt5JTt1+pH7mFLOFiq1RuMZ1uYtTE=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "imgw-pib";
|
||||
version = "1.0.10";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bieniu";
|
||||
repo = "imgw-pib";
|
||||
tag = version;
|
||||
hash = "sha256-Jp7ValBP/upUWUIyIHeHd6l3awBdv+Mgf458eUICNko=";
|
||||
hash = "sha256-6vN1f0qHDJZh80IvWhnpGr2Qg/2/jCaCSxOvlVGc3B8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/bieniu/imgw-pib/releases/tag/${version}";
|
||||
changelog = "https://github.com/bieniu/imgw-pib/releases/tag/${src.tag}";
|
||||
description = "Python async wrapper for IMGW-PIB API";
|
||||
homepage = "https://github.com/bieniu/imgw-pib";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user