Merge master into staging-next
This commit is contained in:
@@ -56,7 +56,7 @@ in
|
||||
}
|
||||
// (optionalAttrs cfg.coturn.enable rec {
|
||||
turnDomain = cfg.domain;
|
||||
turnPort = config.services.coturn.tls-listening-port;
|
||||
turnPort = config.services.coturn.listening-port;
|
||||
# We cannot merge a list of attrsets so we have to redefine the whole list
|
||||
settings = {
|
||||
TURNConfig.Turns = mkDefault [
|
||||
|
||||
@@ -210,6 +210,7 @@ in
|
||||
ln -sfT "${cfg.package}/plugins" "${cfg.dataDir}/plugins"
|
||||
ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
|
||||
ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules
|
||||
ln -sfT ${cfg.package}/agent ${cfg.dataDir}/agent
|
||||
|
||||
# opensearch needs to create the opensearch.keystore in the config directory
|
||||
# so this directory needs to be writable.
|
||||
|
||||
+456
-20
@@ -1,30 +1,466 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
# Helper to get a node's auto-assigned primary IPv4 address.
|
||||
nodeIP = name: config.nodes.${name}.networking.primaryIPAddress;
|
||||
nodeIPv6 = name: config.nodes.${name}.networking.primaryIPv6Address;
|
||||
|
||||
# Generate all keys (both relay identity and authority) for a
|
||||
# directory authority in a single derivation.
|
||||
#
|
||||
# tor --list-fingerprint generates the relay RSA/ed25519 identity
|
||||
# keys and writes the fingerprint file. tor-gencert then generates
|
||||
# the authority identity key, signing key, and certificate.
|
||||
mkDAKeys =
|
||||
name:
|
||||
pkgs.runCommand "tor-da-keys-${name}"
|
||||
{
|
||||
nativeBuildInputs = [ pkgs.tor ];
|
||||
}
|
||||
''
|
||||
DATADIR=$(mktemp -d)
|
||||
mkdir -p "$DATADIR/keys"
|
||||
|
||||
# Generate relay identity keys.
|
||||
tor --list-fingerprint \
|
||||
--DataDirectory "$DATADIR" \
|
||||
--ORPort 9001 \
|
||||
--Nickname "${name}" \
|
||||
--SocksPort 0 \
|
||||
>/dev/null 2>&1
|
||||
|
||||
# Generate authority keys in the keys directory
|
||||
(
|
||||
cd "$DATADIR/keys"
|
||||
echo "" | tor-gencert --create-identity-key -m 24 \
|
||||
-a ${nodeIP name}:80 \
|
||||
--passphrase-fd 0 \
|
||||
>/dev/null 2>&1
|
||||
)
|
||||
|
||||
# Prepare output: keys in a subdirectory, fingerprints as plain files
|
||||
mkdir -p $out/keys
|
||||
cp "$DATADIR/keys/"* $out/keys/
|
||||
|
||||
# Extract relay fingerprint
|
||||
# fingerprint file format: "Nickname XXXX XXXX XXXX XXXX ..."
|
||||
cut -d' ' -f2- "$DATADIR/fingerprint" | tr -d ' \n' > $out/relay-fingerprint
|
||||
|
||||
# Extract v3ident from authority certificate
|
||||
# certificate format: "fingerprint ABCDEF1234..."
|
||||
grep "^fingerprint " $out/keys/authority_certificate \
|
||||
| awk '{print $2}' | tr -d '\n' > $out/v3ident
|
||||
|
||||
# Extract ed25519 identity
|
||||
tail -c 32 "$DATADIR/keys/ed25519_master_id_public_key" \
|
||||
| base64 -w0 | tr -d '=' > $out/ed25519-identity
|
||||
'';
|
||||
|
||||
# Node name lists - used to generate keys, node configs, and DA vote targets
|
||||
daNames = [
|
||||
"da1"
|
||||
"da2"
|
||||
"da3"
|
||||
];
|
||||
relayNames = [
|
||||
"relay1"
|
||||
"relay2"
|
||||
"relay3"
|
||||
"relay4"
|
||||
"relay5"
|
||||
];
|
||||
exitNames = [
|
||||
"exit1"
|
||||
"exit2"
|
||||
"exit3"
|
||||
];
|
||||
|
||||
# Relays that receive the Guard flag. DAs are excluded here (they only
|
||||
# do directory serving and voting) and exits are excluded so Guard
|
||||
# and Exit remain distinct roles.
|
||||
guardNames = relayNames;
|
||||
|
||||
# Pre-generate keys for all directory authorities
|
||||
daKeysets = lib.genAttrs daNames mkDAKeys;
|
||||
|
||||
# Read a fingerprint text file from a derivation output
|
||||
readFP = keys: file: builtins.readFile "${keys}/${file}";
|
||||
|
||||
# Build DirAuthority lines from the pre-generated keys.
|
||||
# Format: nickname orport=PORT v3ident=V3IDENT ip:dirport RELAY_FINGERPRINT
|
||||
dirAuthorityLines = lib.mapAttrsToList (
|
||||
name: keys:
|
||||
"${name} orport=9001 ipv6=[${nodeIPv6 name}]:9001 v3ident=${readFP keys "v3ident"} ${nodeIP name}:80 ${readFP keys "relay-fingerprint"}"
|
||||
) daKeysets;
|
||||
|
||||
# Tor settings shared by all node types
|
||||
commonTorSettings = {
|
||||
TestingTorNetwork = true;
|
||||
AssumeReachable = true;
|
||||
AssumeReachableIPv6 = true;
|
||||
ControlPort = 9051;
|
||||
CookieAuthentication = true;
|
||||
DirAuthority = dirAuthorityLines;
|
||||
};
|
||||
|
||||
# Tor settings shared by non-DA nodes (relays and exits)
|
||||
nonDATorSettings =
|
||||
name:
|
||||
commonTorSettings
|
||||
// {
|
||||
Address = nodeIP name;
|
||||
Nickname = name;
|
||||
ContactInfo = "${name} <${name} AT localhost>";
|
||||
DirPort = 9030;
|
||||
ORPort = [
|
||||
9001
|
||||
{
|
||||
addr = "[${nodeIPv6 name}]";
|
||||
port = 9001;
|
||||
}
|
||||
];
|
||||
SocksPort = 0;
|
||||
PublishServerDescriptor = "1";
|
||||
PathsNeededToBuildCircuits = "0.25";
|
||||
};
|
||||
|
||||
# Build a directory authority node configuration
|
||||
mkDANode = name: {
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
80
|
||||
9001
|
||||
];
|
||||
|
||||
systemd.services.tor = {
|
||||
after = [ "network-online.target" ];
|
||||
requires = [ "network-online.target" ];
|
||||
};
|
||||
|
||||
# Deploy pre-generated relay and authority keys before Tor starts.
|
||||
# This ensures the relay fingerprint matches what's in DirAuthority lines.
|
||||
system.activationScripts.tor-keys = lib.stringAfter [ "users" "groups" ] ''
|
||||
mkdir -p /var/lib/tor/keys
|
||||
cp ${daKeysets.${name}}/keys/* /var/lib/tor/keys/
|
||||
touch /var/lib/tor/sr-state
|
||||
chown -R tor:tor /var/lib/tor
|
||||
chmod 700 /var/lib/tor /var/lib/tor/keys
|
||||
chmod 600 /var/lib/tor/keys/*
|
||||
'';
|
||||
|
||||
services.tor = {
|
||||
enable = true;
|
||||
relay.enable = true;
|
||||
relay.role = "relay";
|
||||
settings = commonTorSettings // {
|
||||
AuthoritativeDirectory = true;
|
||||
V3AuthoritativeDirectory = true;
|
||||
Address = nodeIP name;
|
||||
Nickname = name;
|
||||
ContactInfo = "${name} <${name} AT localhost>";
|
||||
DirPort = 80;
|
||||
ORPort = [
|
||||
9001
|
||||
{
|
||||
addr = "[${nodeIPv6 name}]";
|
||||
port = 9001;
|
||||
}
|
||||
];
|
||||
SocksPort = 0;
|
||||
# Only assign circuit-selection flags to non-DA relays (makes DAs only
|
||||
# do directory serving).
|
||||
TestingDirAuthVoteExit = lib.concatStringsSep "," exitNames;
|
||||
TestingDirAuthVoteGuard = lib.concatStringsSep "," guardNames;
|
||||
TestingDirAuthVoteHSDir = lib.concatStringsSep "," (relayNames ++ exitNames);
|
||||
TestingMinExitFlagThreshold = 0;
|
||||
V3AuthNIntervalsValid = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Build a relay node configuration
|
||||
mkRelayNode = name: {
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
9001
|
||||
9030
|
||||
];
|
||||
|
||||
services.tor = {
|
||||
enable = true;
|
||||
relay.enable = true;
|
||||
relay.role = "relay";
|
||||
settings = nonDATorSettings name;
|
||||
};
|
||||
};
|
||||
|
||||
# Build an exit node configuration.
|
||||
mkExitNode = name: {
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
9001
|
||||
9030
|
||||
];
|
||||
|
||||
services.tor = {
|
||||
enable = true;
|
||||
relay.enable = true;
|
||||
relay.role = "exit";
|
||||
settings = nonDATorSettings name // {
|
||||
# relay.role = "exit" prevents the NixOS module from force-setting
|
||||
# ExitPolicy to "reject *:*", but the option's default is still "reject
|
||||
# *:*". We must explicitly set a permissive ExitPolicy for the exit to
|
||||
# be usable.
|
||||
ExitRelay = true;
|
||||
ExitPolicy = [ "accept *:*" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
hiddenServiceResponse = "Hello from the hidden service";
|
||||
|
||||
# Hidden service node: Caddy serves a static page, Tor exposes it as an onion service
|
||||
mkHiddenServiceNode = {
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
virtualHosts."http://:8080" = {
|
||||
extraConfig = ''
|
||||
respond "${hiddenServiceResponse}"
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
services.tor = {
|
||||
enable = true;
|
||||
relay.onionServices.web = {
|
||||
map = [
|
||||
{
|
||||
port = 80;
|
||||
target = {
|
||||
addr = "127.0.0.1";
|
||||
port = 8080;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
settings = commonTorSettings // {
|
||||
SocksPort = 0;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Client node: uses Tor SOCKS proxy to access onion services
|
||||
mkClientNode = {
|
||||
environment.systemPackages = [ pkgs.curl ];
|
||||
|
||||
services.tor = {
|
||||
enable = true;
|
||||
client.enable = true;
|
||||
settings = commonTorSettings;
|
||||
};
|
||||
};
|
||||
|
||||
clearnetResponse = "Hello from the clearnet";
|
||||
|
||||
# Clearnet webserver to test exit node traffic
|
||||
mkWebServerNode = {
|
||||
networking.firewall.allowedTCPPorts = [ 80 ];
|
||||
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
virtualHosts."http://:80" = {
|
||||
extraConfig = ''
|
||||
respond "${clearnetResponse}"
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Arti configuration
|
||||
artiConfig = (pkgs.formats.toml { }).generate "arti.toml" {
|
||||
proxy.socks_listen = 9150;
|
||||
|
||||
storage = {
|
||||
cache_dir = "/var/cache/arti";
|
||||
state_dir = "/var/lib/arti";
|
||||
port_info_file = "/var/lib/arti/public/port_info.json";
|
||||
permissions.dangerously_trust_everyone = true;
|
||||
};
|
||||
|
||||
address_filter.allow_local_addrs = true;
|
||||
|
||||
# Disable subnet restrictions since all nodes are on the same network
|
||||
path_rules = {
|
||||
ipv4_subnet_family_prefix = 33;
|
||||
ipv6_subnet_family_prefix = 129;
|
||||
};
|
||||
|
||||
# Disable vanguards - the small test network doesn't have enough relay
|
||||
# diversity for arti to satisfy vanguard selection requirements
|
||||
vanguards.mode = "disabled";
|
||||
|
||||
# Override Tor consensus parameters for the small test network.
|
||||
# Arti's guard sampling defaults are configured for the real Tor
|
||||
# network.
|
||||
override_net_params = {
|
||||
guard-max-sample-size = 4;
|
||||
guard-min-filtered-sample-size = 2;
|
||||
guard-n-primary-guards-to-use = 2;
|
||||
};
|
||||
|
||||
tor_network = {
|
||||
authorities = {
|
||||
v3idents = lib.mapAttrsToList (_: keys: readFP keys "v3ident") daKeysets;
|
||||
uploads = lib.mapAttrsToList (name: _: [
|
||||
"${nodeIP name}:80"
|
||||
"[${nodeIPv6 name}]:80"
|
||||
]) daKeysets;
|
||||
downloads = lib.mapAttrsToList (name: _: [
|
||||
"${nodeIP name}:80"
|
||||
"[${nodeIPv6 name}]:80"
|
||||
]) daKeysets;
|
||||
votes = lib.mapAttrsToList (name: _: [
|
||||
"${nodeIP name}:80"
|
||||
"[${nodeIPv6 name}]:80"
|
||||
]) daKeysets;
|
||||
};
|
||||
fallback_caches = lib.mapAttrsToList (name: keys: {
|
||||
rsa_identity = readFP keys "relay-fingerprint";
|
||||
ed_identity = readFP keys "ed25519-identity";
|
||||
orports = [
|
||||
"${nodeIP name}:9001"
|
||||
"[${nodeIPv6 name}]:9001"
|
||||
];
|
||||
}) daKeysets;
|
||||
};
|
||||
};
|
||||
|
||||
# Arti client node
|
||||
mkArtiClientNode = {
|
||||
environment.systemPackages = [ pkgs.curl ];
|
||||
|
||||
systemd.services.arti = {
|
||||
description = "Arti Tor Client";
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe pkgs.arti} proxy -c ${artiConfig}";
|
||||
DynamicUser = true;
|
||||
StateDirectory = "arti";
|
||||
CacheDirectory = "arti";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "tor";
|
||||
meta.maintainers = [ ];
|
||||
meta.maintainers = with lib.maintainers; [ jpds ];
|
||||
|
||||
nodes.client =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
boot.kernelParams = [
|
||||
"audit=0"
|
||||
"apparmor=0"
|
||||
"quiet"
|
||||
];
|
||||
networking.firewall.enable = false;
|
||||
networking.useDHCP = false;
|
||||
|
||||
environment.systemPackages = [ pkgs.netcat ];
|
||||
services.tor.enable = true;
|
||||
services.tor.client.enable = true;
|
||||
services.tor.settings.ControlPort = 9051;
|
||||
nodes =
|
||||
lib.genAttrs daNames mkDANode
|
||||
// lib.genAttrs relayNames mkRelayNode
|
||||
// lib.genAttrs exitNames mkExitNode
|
||||
// {
|
||||
hiddenservice = mkHiddenServiceNode;
|
||||
webserver = mkWebServerNode;
|
||||
client = mkClientNode;
|
||||
articlient = mkArtiClientNode;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
client.wait_for_unit("tor.service")
|
||||
client.wait_for_open_port(9051)
|
||||
assert "514 Authentication required." in client.succeed(
|
||||
# Start directory authorities and wait for consensus
|
||||
for machine in da1, da2, da3:
|
||||
machine.start()
|
||||
machine.wait_for_unit("tor.service")
|
||||
machine.wait_for_open_port(9051)
|
||||
|
||||
for machine in da1, da2, da3:
|
||||
machine.wait_until_succeeds(
|
||||
"journalctl -o cat -u tor.service | grep 'Scheduling voting'"
|
||||
)
|
||||
machine.wait_until_succeeds(
|
||||
"journalctl -o cat -u tor.service | grep 'Consensus computed; uploading signature(s)'"
|
||||
)
|
||||
|
||||
# Start relays and exits
|
||||
for machine in relay1, relay2, relay3, relay4, relay5, exit1, exit2, exit3:
|
||||
machine.start()
|
||||
machine.wait_for_unit("tor.service")
|
||||
machine.wait_for_open_port(9051)
|
||||
|
||||
# Wait for all DAs to fully bootstrap
|
||||
for machine in da1, da2, da3:
|
||||
machine.wait_until_succeeds(
|
||||
"journalctl -o cat -u tor.service | grep 'Bootstrapped 100%'"
|
||||
)
|
||||
|
||||
# Wait for relays and exits to self-test and bootstrap
|
||||
for machine in relay1, relay2, relay3, relay4, relay5, exit1, exit2, exit3:
|
||||
machine.wait_until_succeeds(
|
||||
"journalctl -o cat -u tor.service | grep 'Self-testing indicates your ORPort .* is reachable'"
|
||||
)
|
||||
machine.wait_until_succeeds(
|
||||
"journalctl -o cat -u tor.service | grep 'Bootstrapped 100%'"
|
||||
)
|
||||
|
||||
# Verify the Tor control port is functional
|
||||
assert "514 Authentication required." in da1.succeed(
|
||||
"echo GETINFO version | nc 127.0.0.1 9051"
|
||||
)
|
||||
|
||||
# Start hidden service and clearnet webserver - then web client
|
||||
hiddenservice.start()
|
||||
hiddenservice.wait_for_unit("caddy.service")
|
||||
hiddenservice.wait_for_unit("tor.service")
|
||||
|
||||
webserver.start()
|
||||
webserver.wait_for_unit("caddy.service")
|
||||
webserver.wait_for_open_port(80)
|
||||
|
||||
client.start()
|
||||
client.wait_for_unit("tor.service")
|
||||
|
||||
# Wait for the hidden service to generate its .onion hostname
|
||||
hiddenservice.wait_until_succeeds(
|
||||
"test -f /var/lib/tor/onion/web/hostname"
|
||||
)
|
||||
onion_addr = hiddenservice.succeed("cat /var/lib/tor/onion/web/hostname").strip()
|
||||
|
||||
# Wait for the client to bootstrap
|
||||
client.wait_until_succeeds(
|
||||
"journalctl -o cat -u tor.service | grep 'Bootstrapped 100%'"
|
||||
)
|
||||
|
||||
# Access the hidden service from the client via Tor SOCKS proxy
|
||||
client.wait_until_succeeds(
|
||||
f"curl --max-time 60 --socks5-hostname 127.0.0.1:9050 http://{onion_addr} | grep '${hiddenServiceResponse}'"
|
||||
)
|
||||
|
||||
# Access the clearnet webserver through the Tor exit node
|
||||
webserver_ip = "${nodeIP "webserver"}"
|
||||
client.wait_until_succeeds(
|
||||
f"curl --max-time 60 --socks5-hostname 127.0.0.1:9050 http://{webserver_ip} | grep '${clearnetResponse}'"
|
||||
)
|
||||
|
||||
articlient.start()
|
||||
articlient.wait_for_unit("arti.service")
|
||||
articlient.wait_for_open_port(9150)
|
||||
|
||||
# Access the hidden service from the client via arti
|
||||
# Onion service access is not tested with arti. The HS client
|
||||
# doesn't work reliably on small private networks.
|
||||
# articlient.wait_until_succeeds(
|
||||
# f"curl --max-time 60 --socks5-hostname 127.0.0.1:9150 http://{onion_addr} | grep '${hiddenServiceResponse}'"
|
||||
# )
|
||||
|
||||
# Access the clearnet webserver through the Tor exit node with arti
|
||||
articlient.wait_until_succeeds(
|
||||
f"curl --max-time 60 --socks5-hostname 127.0.0.1:9150 http://{webserver_ip} | grep '${clearnetResponse}'"
|
||||
)
|
||||
|
||||
da1.log(da1.succeed("systemd-analyze security tor.service | grep -v '✓'"))
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
vimUtils.buildVimPlugin {
|
||||
pname = "zig.vim";
|
||||
version = "0-unstable-2026-02-27";
|
||||
version = "0-unstable-2026-03-09";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "ziglang";
|
||||
repo = "zig.vim";
|
||||
rev = "366ef4855d22fd1377b81c382542466475b73a01";
|
||||
hash = "sha256-bo6/lvDx8JCttwTVw1eAImF/b5Aa0ekDN5H6WI0TAdo=";
|
||||
rev = "9e76c2843f6292dc9c804996d78244fe1028891a";
|
||||
hash = "sha256-eWQqr/LopjzFJhZC3mHdUrWVDcLPHDHkxcuhrJMaY3w=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
|
||||
@@ -4232,8 +4232,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "signageos-vscode-sops";
|
||||
publisher = "signageos";
|
||||
version = "0.9.3";
|
||||
hash = "sha256-fOSLlszr6yLkRC9gy+MCnL+Y/1TXrmVWAWavpvXHj4U=";
|
||||
version = "0.9.4";
|
||||
hash = "sha256-SH+hmxFQAXcL0MP9WToGmvdBjn/l2TWxF/YL30FwXes=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/signageos.signageos-vscode-sops/changelog";
|
||||
@@ -4772,8 +4772,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "emacs-mcx";
|
||||
publisher = "tuttieee";
|
||||
version = "0.109.2";
|
||||
hash = "sha256-rrTM/xzp8IoQRtUrg8rsP6gUPwUeZ6TMz1Sc7QyA5r0=";
|
||||
version = "0.110.2";
|
||||
hash = "sha256-E2L95LQw/Oku8cJMpKVeY6VOhZzIkSkZI4+ozmFqyg4=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
|
||||
|
||||
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "basedpyright";
|
||||
publisher = "detachhead";
|
||||
version = "1.38.4";
|
||||
hash = "sha256-05Pu65luhtoYQscIXfO7lXdJCbadRerSY2xFjTji/W4=";
|
||||
version = "1.39.0";
|
||||
hash = "sha256-DCLDw+rwhHrVN3m+D4VOCcVWNv9fG4sONiNylbWgPPE=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/detachhead/basedpyright/releases";
|
||||
|
||||
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "github";
|
||||
name = "copilot-chat";
|
||||
version = "0.42.0";
|
||||
hash = "sha256-iKDRDqQ8qJe2c4SQJBiJLCEtmVmcci6753+I7uH7YVk=";
|
||||
version = "0.42.3";
|
||||
hash = "sha256-bkVfwPFQSuTMcIEoEa/M91foSZC+0H4ESFXFwDDDhbc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -13,7 +13,7 @@ let
|
||||
buildVscodeLanguagePack =
|
||||
{
|
||||
language,
|
||||
version ? "1.110.2026033112",
|
||||
version ? "1.110.2026040813",
|
||||
hash,
|
||||
}:
|
||||
buildVscodeMarketplaceExtension {
|
||||
@@ -41,71 +41,71 @@ in
|
||||
# French
|
||||
vscode-language-pack-fr = buildVscodeLanguagePack {
|
||||
language = "fr";
|
||||
hash = "sha256-ctn6bY2zJVz6XfhI37NOdf12RiKsS/Pa2IYFBMD06fs=";
|
||||
hash = "sha256-/34hQYL82oNV4AK+X9Qhc49y11U7QjBtQZkxX2DJCv0=";
|
||||
};
|
||||
# Italian
|
||||
vscode-language-pack-it = buildVscodeLanguagePack {
|
||||
language = "it";
|
||||
hash = "sha256-ZZgTzQa0oTS7HFzYuJXncG97tPUovKr8BEh4ZgGwmWY=";
|
||||
hash = "sha256-igknYIMrlTf6dzPRCWeE2IQ8s7SsD4AFN/oPPISv5Vk=";
|
||||
};
|
||||
# German
|
||||
vscode-language-pack-de = buildVscodeLanguagePack {
|
||||
language = "de";
|
||||
hash = "sha256-8qCjGIArVSfy/kwv00aLPniBREVW+cNAUbged10VQQs=";
|
||||
hash = "sha256-ovzQBQfdPQoVVgKl47qnucUQfhBBDCbbGwKlI86gR10=";
|
||||
};
|
||||
# Spanish
|
||||
vscode-language-pack-es = buildVscodeLanguagePack {
|
||||
language = "es";
|
||||
hash = "sha256-9F4JEp0qVu1rsrJ01QMuhZPgMxybH/J5ENh2riDAe2c=";
|
||||
hash = "sha256-tn1irueWoqGidrxOv49IP0pdUPjk1mPvFppe2RHEs3E=";
|
||||
};
|
||||
# Russian
|
||||
vscode-language-pack-ru = buildVscodeLanguagePack {
|
||||
language = "ru";
|
||||
hash = "sha256-1xRKJLuKjxYQ2D20K9QaQQQjmd8oHFmWVIe0OdeEfG8=";
|
||||
hash = "sha256-3RMlWPzjHAYJsiulQOMqIZ0/u2hqxF+gZ9vVZVvPJWE=";
|
||||
};
|
||||
# Chinese (Simplified)
|
||||
vscode-language-pack-zh-hans = buildVscodeLanguagePack {
|
||||
language = "zh-hans";
|
||||
hash = "sha256-VxM+Jjch/hVO80boUCU1iYkYoToTtUewHcIuJhQGkZA=";
|
||||
hash = "sha256-5ig0jME4lljWRKL3j64RobHW98IdjzrF/cZEEkpjMZo=";
|
||||
};
|
||||
# Chinese (Traditional)
|
||||
vscode-language-pack-zh-hant = buildVscodeLanguagePack {
|
||||
language = "zh-hant";
|
||||
hash = "sha256-ADR/ouefp5HnBwmGV0UBNAklgHg5mXNcBfX+VbJed74=";
|
||||
hash = "sha256-gV/Z1br8I+fp+/4ALQQt75sNYJGK+opvUHpkYHwV2Xc=";
|
||||
};
|
||||
# Japanese
|
||||
vscode-language-pack-ja = buildVscodeLanguagePack {
|
||||
language = "ja";
|
||||
hash = "sha256-hSilIspgNnJ05qgZk7uWvr8y4BAAPK/82j+dwshsGVc=";
|
||||
hash = "sha256-UilZzzy8DjhXQP6jrkndNBZFqUeX2zLVy05nOIDViKk=";
|
||||
};
|
||||
# Korean
|
||||
vscode-language-pack-ko = buildVscodeLanguagePack {
|
||||
language = "ko";
|
||||
hash = "sha256-A2gGsrno76caJvZguMsjE2xa6AzOfCz1Ge3fbh7yZWw=";
|
||||
hash = "sha256-Z4a01eQD1bgQnlf0174DozkKqo5TeVR6J8sgnMPGmMg=";
|
||||
};
|
||||
# Czech
|
||||
vscode-language-pack-cs = buildVscodeLanguagePack {
|
||||
language = "cs";
|
||||
hash = "sha256-t70KwNkxiXFSw0NdiOGH6tjmeRP/RYinK/YxwLGfSw8=";
|
||||
hash = "sha256-CCqtlFQrlgRN8ds/pqMFP6S5Ks+ZpGu3iUfchSFX1mA=";
|
||||
};
|
||||
# Portuguese (Brazil)
|
||||
vscode-language-pack-pt-br = buildVscodeLanguagePack {
|
||||
language = "pt-BR";
|
||||
hash = "sha256-wOjewAGd1BCkrOQuhcWRbMm7YsRJGjac2+w5+fjWhBM=";
|
||||
hash = "sha256-Yi2W8bdieyNxJfGy3XNafB5DX27VujSz8Dp8BMyBi1w=";
|
||||
};
|
||||
# Turkish
|
||||
vscode-language-pack-tr = buildVscodeLanguagePack {
|
||||
language = "tr";
|
||||
hash = "sha256-X7A8MWlBzijd+1Z6POBSRef5BgeI9qfSy576dx3yfII=";
|
||||
hash = "sha256-lKHTQryxzSgW7S3QVXHCr7DvFihD+vr2lOwiWk1klVQ=";
|
||||
};
|
||||
# Polish
|
||||
vscode-language-pack-pl = buildVscodeLanguagePack {
|
||||
language = "pl";
|
||||
hash = "sha256-bJc428MT8HyEUltmCFZEliSSPOE5TpHsaVKL1qukbVk=";
|
||||
hash = "sha256-l2PBwwGS+HFswTF4gbS++AREmTMzzbiZtHzzvX900yc=";
|
||||
};
|
||||
# Pseudo Language
|
||||
vscode-language-pack-qps-ploc = buildVscodeLanguagePack {
|
||||
language = "qps-ploc";
|
||||
hash = "sha256-XVT+ssMh4SD+O93oDYbkLh4b8VPYA/9HOAKQURrLUuQ=";
|
||||
hash = "sha256-9/SDMQ9v0zZq1fveWDx6TI/28o9NDzN0YI/tOcC7dks=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-4w/A3C9WWfKbZF3LnaLR9aZ78hvU+lrEXS8nnMbgzeA=";
|
||||
hash = "sha256-xsenzYvX6uAMK91K9fjhRAhYvxSobq4N1yBsksh4bkM=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-+2+geG0UcCf7L+SbgKGjMkmctH+3q7nLsZFsb/BrhF0=";
|
||||
hash = "sha256-3f7Sw47uHigXD1sUE8LWfrfAmXCFRoSuYru106jv2Bk=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-QUopKDFQxWinvtkCkmRSCG2TpopGRRD8dXyfC3iww6Y=";
|
||||
hash = "sha256-pjqEVhqUsAPkfLOdIMoJooAabIfNG3vUSzMuNZtBS24=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-7ZglgfAbjdCS8R9MhX8qB7P4aCVDy76qFmQ7klzGbjg=";
|
||||
hash = "sha256-jPvkC5ZmA8LToXIZvkY1iMbEWnJGWQMT74RZ+PS3ZBg=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "visualjj";
|
||||
publisher = "visualjj";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
{
|
||||
traefik-crd = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.201+up39.0.2.tgz";
|
||||
sha256 = "0r43kny2kkrlxjniivnivzbqqbiri08cg9qjrl6mx9rjzsxfxqwg";
|
||||
};
|
||||
traefik = {
|
||||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.201+up39.0.2.tgz";
|
||||
sha256 = "1ci2wns11ibgwf7x4j90vcbrsf63rrz1slsm63iayvkdq3r3ri04";
|
||||
};
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
{
|
||||
"airgap-images-amd64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
|
||||
"sha256": "a73742d5f26b000c61eb1ada896950ca2168a0957c52d6fc8e13676244120ac1"
|
||||
},
|
||||
"airgap-images-amd64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
|
||||
"sha256": "789c04f62ccb1b5adace8b5876e49dba0be739657e1324d1d9542a70c61971b0"
|
||||
},
|
||||
"airgap-images-arm-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm.tar.gz",
|
||||
"sha256": "56e2336781b1ef115d91276aa07cdceacaa38f9aa6209aa3fff9c8f74530d8a4"
|
||||
},
|
||||
"airgap-images-arm-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm.tar.zst",
|
||||
"sha256": "fcbb9b0b725b313ecfe077303e012ab6b88be446bbba1bf61f601a7ad90cffdb"
|
||||
},
|
||||
"airgap-images-arm64-tar-gz": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
|
||||
"sha256": "e9b3da2b855eb188eb170940f5e5bad79e04aafc7dff10317b30a4b2884f792c"
|
||||
},
|
||||
"airgap-images-arm64-tar-zst": {
|
||||
"url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
|
||||
"sha256": "c5799a879b68adc996e9a09158d8ea7f04b46bff5241e9641c404809e687d29e"
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
k3sVersion = "1.32.13+k3s1";
|
||||
k3sCommit = "bf43a24f544763b0f3ef2d2da0beeea1cf357a35";
|
||||
k3sRepoSha256 = "1c7022il1gsxcyn575pl15l75nwidmm1d08kvb9ckvrv6abc98m6";
|
||||
k3sVendorHash = "sha256-42+SVIwUiZPCQ+gbk8ytGBzUrAWV1J9l9rEwCiEE+kE=";
|
||||
chartVersions = import ./chart-versions.nix;
|
||||
imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
|
||||
k3sRootVersion = "0.15.0";
|
||||
k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
|
||||
k3sCNIVersion = "1.9.0-k3s1";
|
||||
k3sCNISha256 = "0naqf3jkxz3rd9ljd40wbm8walgi2bx6d1l9wr6mcvrgj7d5g28c";
|
||||
containerdVersion = "2.1.5-k3s1.32";
|
||||
containerdSha256 = "1fzld9q0ycfg9b3054qg70mif1p6i7xqikcbabrmxapk81fy83kn";
|
||||
containerdPackage = "github.com/k3s-io/containerd/v2";
|
||||
criCtlVersion = "1.31.0-k3s2";
|
||||
flannelVersion = "v0.28.0";
|
||||
flannelPluginVersion = "v1.9.0-flannel1";
|
||||
kubeRouterVersion = "v2.6.3-k3s1";
|
||||
criDockerdVersion = "v0.3.19-k3s2.32";
|
||||
helmJobVersion = "v0.9.14-build20260210";
|
||||
}
|
||||
@@ -12,8 +12,6 @@ let
|
||||
extraArgs = removeAttrs args [ "callPackage" ];
|
||||
in
|
||||
{
|
||||
k3s_1_32 = common (import ./1_32/versions.nix) extraArgs;
|
||||
|
||||
k3s_1_33 = common (import ./1_33/versions.nix) extraArgs;
|
||||
|
||||
k3s_1_34 = (common (import ./1_34/versions.nix) extraArgs).overrideAttrs {
|
||||
|
||||
@@ -63,14 +63,14 @@
|
||||
"vendorHash": "sha256-kg6RylB2sW5XLWxJLmIDq3h54rzQoCKrxVu7L76lvCE="
|
||||
},
|
||||
"argoproj-labs_argocd": {
|
||||
"hash": "sha256-Nj7czoKDRDk4i75T7M990EBQr0yOU1Zwc0nU2wQ6YoY=",
|
||||
"hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=",
|
||||
"homepage": "https://registry.terraform.io/providers/argoproj-labs/argocd",
|
||||
"owner": "argoproj-labs",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-argocd",
|
||||
"rev": "v7.15.1",
|
||||
"rev": "v7.15.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-CO09y7rdbY27VFX85pV2ocnO0rvhGJg3hXfLWaF+HTI="
|
||||
"vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw="
|
||||
},
|
||||
"auth0_auth0": {
|
||||
"hash": "sha256-1gtBZPyzYk3UqLrRKHeyLt/2KPPP6QlJYo042XNDWkY=",
|
||||
@@ -1418,13 +1418,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"vancluever_acme": {
|
||||
"hash": "sha256-V/dkcnlqYyAdDAWpMp2ib0mlnDb1A6YlJHQhKyjKBo4=",
|
||||
"hash": "sha256-aUfIrYKuNsZEv/YKqpHwb5E/aLS9EPc01bkli+Wa6Ek=",
|
||||
"homepage": "https://registry.terraform.io/providers/vancluever/acme",
|
||||
"owner": "vancluever",
|
||||
"repo": "terraform-provider-acme",
|
||||
"rev": "v2.46.0",
|
||||
"rev": "v2.46.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-JayuT74/oNcmwtq/VePYRRQ5iyc2HfunDWYOVJsLTrE="
|
||||
"vendorHash": "sha256-E7ym1msahCoJw3Dxn4ex/1yQqodi/RCaO4cLRNpFbcM="
|
||||
},
|
||||
"venafi_venafi": {
|
||||
"hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "algia";
|
||||
version = "0.0.107";
|
||||
version = "0.0.111";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "algia";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-23h2sVwOhKXnpYBq1jZbbC275dzc6HnqUpB/1wbrpw4=";
|
||||
hash = "sha256-Jih/KR3m2Qjn8ZizaoVakbrIXiqSSL/FxZgBYegXzaU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU=";
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aonsoku";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "victoralvesf";
|
||||
repo = "aonsoku";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jpBO5MqOc18KGncpOWB/3IjCgkWb2zFfNxTpkcayZwo=";
|
||||
hash = "sha256-Rbte0qYcZQ70E6ib8rj0YsNP5SMNO8eC3MEvWcT7N08=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm_9;
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-B5bEAj6Ii/c7ZZobQmc8nHFbpBX9n/eYwRZ7lsLs3fk=";
|
||||
hash = "sha256-oBwqYOx2KEtF0qdMKEIgdArZ4xs/AyeOqFoU4nHl3xY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
openssl,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
@@ -67,6 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
inherit (nixosTests) tor;
|
||||
updateScript = nix-update-script { extraArgs = [ "--version-regex=^arti-v(.*)$" ]; };
|
||||
};
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "asccli";
|
||||
version = "1.0.1";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rudrankriyam";
|
||||
repo = "App-Store-Connect-CLI";
|
||||
tag = "${finalAttrs.version}";
|
||||
hash = "sha256-e2USts+HC3skFvexeKhKSJT0KxHlB5LFr54lqGjhZqM=";
|
||||
hash = "sha256-fO4U5no+o5h8dNO5aQQWJtOcRGBDF+JZ2C0g0YLlJuc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-712Q7KiFQyTDjX4Srhukv3eQ84MRjnQxrpgBfqK2xa4=";
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "audiness";
|
||||
version = "0.5.0";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audiusGmbH";
|
||||
repo = "audiness";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+5NDea4p/JWEk305EhAtab3to36a74KR50eosw6c5qI=";
|
||||
hash = "sha256-row372NA8/DJbI6WJyGmKrlfuCsxUa5inhMljRzShT8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -29,12 +29,17 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
validators
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "audiness" ];
|
||||
|
||||
meta = {
|
||||
description = "CLI tool to interact with Nessus";
|
||||
homepage = "https://github.com/audiusGmbH/audiness";
|
||||
changelog = "https://github.com/audiusGmbH/audiness/releases/tag/${finalAttrs.version}";
|
||||
homepage = "https://github.com/audius/audiness";
|
||||
changelog = "https://github.com/audius/audiness/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "audiness";
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "buildah";
|
||||
version = "1.43.0";
|
||||
version = "1.43.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "buildah";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SihJXPnUrOe4TxbbnQOhXoZlbQZfLy0YGMV32CtojV8=";
|
||||
hash = "sha256-Xshe0EvsGhtP8ffoo6yV9iY9YZy1krJjnVUmYouSpAM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -1,46 +1,46 @@
|
||||
{
|
||||
"version": "2.1.92",
|
||||
"buildDate": "2026-04-03T23:31:32Z",
|
||||
"version": "2.1.97",
|
||||
"buildDate": "2026-04-08T20:52:51Z",
|
||||
"platforms": {
|
||||
"darwin-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "6d1b9657727dce81332b3cda11bfe0a8c83e2392e3c062a31022e10b0e71cdd1",
|
||||
"size": 198736976
|
||||
"checksum": "9104eba60ca82c590ababc5eee0d01f2dc5440d7cf2d668e4c48d6485e41cfeb",
|
||||
"size": 199579088
|
||||
},
|
||||
"darwin-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "d422b5cc974b3bc4b28f698144fd0316f3e17774babe0bc1eb76c2bb0858d0aa",
|
||||
"size": 200226896
|
||||
"checksum": "d6e6ee329dbf1cd0222cd710039086aab9621bc85d65d314adee421446dda08c",
|
||||
"size": 201052496
|
||||
},
|
||||
"linux-arm64": {
|
||||
"binary": "claude",
|
||||
"checksum": "08deb3d56477496eb92e624f492e25b123f4527dd5674f71afff58a48eccd953",
|
||||
"size": 231082560
|
||||
"checksum": "85167cb721655fdd90b002012a28eca273c89dc2fd709be49afe2a7724c365a0",
|
||||
"size": 231868992
|
||||
},
|
||||
"linux-x64": {
|
||||
"binary": "claude",
|
||||
"checksum": "e22324514967ff2d5e9f91f0ee37e4675bf8b6dfec27fafb19cb25cc5b23fcaf",
|
||||
"size": 230787712
|
||||
"checksum": "0d43fcd11d29206563eeef3a1f787f0615c21cd703cc91f3a180915fd5797ef6",
|
||||
"size": 231615104
|
||||
},
|
||||
"linux-arm64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "d0163f8857511b8f9dad7de1f072de2ca8c4e881d006b3b43525af3534050ae3",
|
||||
"size": 224201152
|
||||
"checksum": "b0cfda67d7dbfadb37c0f2f8714a2694958f988e29785d5bcf00d6f3968ab611",
|
||||
"size": 224987584
|
||||
},
|
||||
"linux-x64-musl": {
|
||||
"binary": "claude",
|
||||
"checksum": "e0f4a300ff9d0d9cb9c3ee37c706a9db239e3bbce96118245196ae6bc1b0492e",
|
||||
"size": 225102272
|
||||
"checksum": "ab1e66323397e1687ca6a074d471af44ba3cee7ac839632e6b3dbf55dfa75f0d",
|
||||
"size": 225929664
|
||||
},
|
||||
"win32-x64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "ebd9007c464d912593418f133a61d9f24866428530a81e88e910a24823066415",
|
||||
"size": 240482464
|
||||
"checksum": "b678e7827fdcfcd9ac9b0eb7c7b1dda4f06b7ecbff4fd89c7fd22be3578f79ea",
|
||||
"size": 241307296
|
||||
},
|
||||
"win32-arm64": {
|
||||
"binary": "claude.exe",
|
||||
"checksum": "c258bce79aefac609f909e5abde92d1653bcef47d3577656d299d1d56f1604bb",
|
||||
"size": 237192864
|
||||
"checksum": "78db7edd6de917d733bdcb55560d0f8f7543666254ea3a66b05053a45c549f3b",
|
||||
"size": 238017696
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,17 +6,18 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "cups-printers";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audiusGmbH";
|
||||
repo = "cups-printers";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HTR9t9ElQmCzJfdWyu+JQ8xBfDNpXl8XtNsJxGSfBXk=";
|
||||
hash = "sha256-Fne7V9dEZwdV6OsQPg2gzrz/wloAOOuwlx3CqXOyWBc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"rich"
|
||||
"typer"
|
||||
"validators"
|
||||
];
|
||||
@@ -25,6 +26,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
pycups
|
||||
rich
|
||||
typer
|
||||
validators
|
||||
];
|
||||
@@ -36,8 +38,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Tool for interacting with a CUPS server";
|
||||
homepage = "https://github.com/audiusGmbH/cups-printers";
|
||||
changelog = "https://github.com/audiusGmbH/cups-printers/blob/${finalAttrs.version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/audius/cups-printers";
|
||||
changelog = "https://github.com/audius/cups-printers/blob/${finalAttrs.src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "cups-printers";
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "18.10.1";
|
||||
version = "18.10.3";
|
||||
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-s9nDqhtNmLpUHRJ+jJvu9WikPbQLUwEum6TGV3PvG8Y=";
|
||||
hash = "sha256-edILaF/dW7yOm5W9nV9d7Cj4+W9kshagkOb/2mfIOtQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W7ZI8IOaW/88zWrVymDkRQqzk+aLgvdO+rPycK70Bb0=";
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-pages";
|
||||
version = "18.10.1";
|
||||
version = "18.10.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-B/6BJaH2xge9/3HrI0yMIMtw4TeC+/bNqLFmKbZ2Ubw=";
|
||||
hash = "sha256-TsImrWD6cLvVoasatQpWVFCAuQw3/38EfFC+igikhVo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EaTYw8ydHMA3Rmr8YJvUxWBIkPhyKLc8zNUsJRTlMmE=";
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
"version": "18.10.1",
|
||||
"repo_hash": "sha256-z4MRfgqGOBxAE4EzqhIKosMLOZXDuiH88wSxkwUpV5E=",
|
||||
"version": "18.10.3",
|
||||
"repo_hash": "sha256-x8nmMKbL8hnmQfIrnAhbQHu6Mg2PnjMJeRXUBiI7QFA=",
|
||||
"yarn_hash": "sha256-tWpPN//SdgnRONVa1ykagVHCNs7TCboTnQLQ5Sx0DQs=",
|
||||
"frontend_islands_yarn_hash": "sha256-OkCoiyL9FFJcWcNUbeRSBGGSauYIm7l+yxNfA0CsNEQ=",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v18.10.1-ee",
|
||||
"rev": "v18.10.3-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "18.10.1",
|
||||
"GITLAB_KAS_VERSION": "18.10.1",
|
||||
"GITLAB_PAGES_VERSION": "18.10.1",
|
||||
"GITALY_SERVER_VERSION": "18.10.3",
|
||||
"GITLAB_KAS_VERSION": "18.10.3",
|
||||
"GITLAB_PAGES_VERSION": "18.10.3",
|
||||
"GITLAB_SHELL_VERSION": "14.47.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.1",
|
||||
"GITLAB_WORKHORSE_VERSION": "18.10.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "18.10.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "18.10.1";
|
||||
version = "18.10.3";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
||||
@@ -1051,11 +1051,11 @@ GEM
|
||||
nokogiri (>= 1.0, < 2.0)
|
||||
htmlbeautifier (1.4.2)
|
||||
htmlentities (4.3.4)
|
||||
http (5.1.1)
|
||||
http (5.3.1)
|
||||
addressable (~> 2.8)
|
||||
http-cookie (~> 1.0)
|
||||
http-form_data (~> 2.2)
|
||||
llhttp-ffi (~> 0.4.0)
|
||||
llhttp-ffi (~> 0.5.0)
|
||||
http-accept (1.7.0)
|
||||
http-cookie (1.0.5)
|
||||
domain_name (~> 0.5)
|
||||
@@ -1171,7 +1171,7 @@ GEM
|
||||
listen (3.9.0)
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
llhttp-ffi (0.4.0)
|
||||
llhttp-ffi (0.5.1)
|
||||
ffi-compiler (~> 1.0)
|
||||
rake (~> 13.0)
|
||||
locale (2.1.4)
|
||||
|
||||
@@ -4309,14 +4309,19 @@ src: {
|
||||
"http-form_data"
|
||||
"llhttp-ffi"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
groups = [
|
||||
"default"
|
||||
"development"
|
||||
"monorepo"
|
||||
"test"
|
||||
];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw";
|
||||
sha256 = "0z8x4c2bcg05x7ffrjy47cwarfqzlg8kcfxchk5jcfdyx7c04265";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.1.1";
|
||||
version = "5.3.1";
|
||||
};
|
||||
http-accept = {
|
||||
groups = [ "default" ];
|
||||
@@ -4948,14 +4953,19 @@ src: {
|
||||
"ffi-compiler"
|
||||
"rake"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
groups = [
|
||||
"default"
|
||||
"development"
|
||||
"monorepo"
|
||||
"test"
|
||||
];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5";
|
||||
sha256 = "1g57iw0l3y7x50132x6a1jyssxa6pw7srh69g0d6j7ri37yaf9cs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.0";
|
||||
version = "0.5.1";
|
||||
};
|
||||
locale = {
|
||||
groups = [
|
||||
|
||||
@@ -1,14 +1,17 @@
|
||||
From c5fe9a321d83fc70cf30ef999c24377869cedbd8 Mon Sep 17 00:00:00 2001
|
||||
From: SomeoneSerge <else@someonex.net>
|
||||
From 85c36c4a692a229b7ce688ba92fa2bdd5b9d6877 Mon Sep 17 00:00:00 2001
|
||||
From: Else Someone <else@someonex.net>
|
||||
Date: Thu, 27 Jun 2024 11:15:38 +0000
|
||||
Subject: [PATCH] imgui: allow installing into split outputs
|
||||
|
||||
Change install(... DESTINATION include) to
|
||||
install(... DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}.
|
||||
Use $<INSTALL_INTERFACE:...> where appropriate.
|
||||
---
|
||||
ports/imgui/CMakeLists.txt | 74 +++++++++++++++++++++++---------------
|
||||
1 file changed, 45 insertions(+), 29 deletions(-)
|
||||
ports/imgui/CMakeLists.txt | 78 +++++++++++++++++++++++---------------
|
||||
1 file changed, 47 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt
|
||||
index 1502a5aff2..be05d29f4f 100644
|
||||
index 03eefb8b8f..1b3fa8b285 100644
|
||||
--- a/ports/imgui/CMakeLists.txt
|
||||
+++ b/ports/imgui/CMakeLists.txt
|
||||
@@ -8,13 +8,15 @@ if(APPLE)
|
||||
@@ -28,7 +31,7 @@ index 1502a5aff2..be05d29f4f 100644
|
||||
)
|
||||
|
||||
target_sources(
|
||||
@@ -154,18 +156,32 @@ list(REMOVE_DUPLICATES BINDINGS_SOURCES)
|
||||
@@ -174,18 +176,32 @@ list(REMOVE_DUPLICATES BINDINGS_SOURCES)
|
||||
install(
|
||||
TARGETS ${PROJECT_NAME}
|
||||
EXPORT ${PROJECT_NAME}_target
|
||||
@@ -67,7 +70,7 @@ index 1502a5aff2..be05d29f4f 100644
|
||||
)
|
||||
endforeach()
|
||||
|
||||
@@ -178,47 +194,47 @@ if(NOT IMGUI_SKIP_HEADERS)
|
||||
@@ -198,47 +214,47 @@ if(NOT IMGUI_SKIP_HEADERS)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/imstb_rectpack.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/imstb_truetype.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.h
|
||||
@@ -126,7 +129,7 @@ index 1502a5aff2..be05d29f4f 100644
|
||||
endif()
|
||||
|
||||
if(IMGUI_BUILD_OPENGL3_BINDING)
|
||||
@@ -227,16 +243,16 @@ if(NOT IMGUI_SKIP_HEADERS)
|
||||
@@ -247,16 +263,16 @@ if(NOT IMGUI_SKIP_HEADERS)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3_loader.h
|
||||
DESTINATION
|
||||
@@ -146,7 +149,7 @@ index 1502a5aff2..be05d29f4f 100644
|
||||
endif()
|
||||
|
||||
if(IMGUI_BUILD_SDLGPU3_BINDING)
|
||||
@@ -245,24 +261,24 @@ if(NOT IMGUI_SKIP_HEADERS)
|
||||
@@ -265,28 +281,28 @@ if(NOT IMGUI_SKIP_HEADERS)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlgpu3.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlgpu3_shaders.h
|
||||
DESTINATION
|
||||
@@ -170,13 +173,25 @@ index 1502a5aff2..be05d29f4f 100644
|
||||
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_win32.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
endif()
|
||||
|
||||
if(IMGUI_BUILD_WEBGPU_BINDING)
|
||||
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_wgpu.h DESTINATION include)
|
||||
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_wgpu.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
endif()
|
||||
|
||||
if(IMGUI_FREETYPE)
|
||||
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION include)
|
||||
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
endif()
|
||||
|
||||
if(IMGUI_TEST_ENGINE)
|
||||
@@ -285,13 +301,13 @@ if(NOT IMGUI_SKIP_HEADERS)
|
||||
@@ -303,19 +319,19 @@ if(NOT IMGUI_SKIP_HEADERS)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/test-engine/imgui_te_ui.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/test-engine/imgui_te_utils.h
|
||||
DESTINATION
|
||||
- include
|
||||
+ ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
include(CMakePackageConfigHelpers)
|
||||
@@ -194,5 +209,5 @@ index 1502a5aff2..be05d29f4f 100644
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
|
||||
)
|
||||
--
|
||||
2.47.2
|
||||
2.53.0
|
||||
|
||||
|
||||
@@ -46,7 +46,12 @@ stdenv.mkDerivation {
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) ];
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
|
||||
(lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "implot";
|
||||
version = "0.16";
|
||||
version = "0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epezent";
|
||||
repo = "implot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/wkVsgz3wiUVZBCgRl2iDD6GWb+AoHN+u0aeqHHgem0=";
|
||||
hash = "sha256-HNzNRHPLr352EDkAci4nx5qQnPI308rGH8yHkF+n5OY=";
|
||||
};
|
||||
|
||||
cmakeRules = "${vcpkg.src}/ports/implot";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "jj-pre-push";
|
||||
version = "0.3.4";
|
||||
version = "0.3.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acarapetis";
|
||||
repo = "jj-pre-push";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sj1JM2gcwTRMeEXSozI73LCwxSf69t4u/SmovV7Cyeg=";
|
||||
hash = "sha256-T9IKPFGswwrszGkBCIz8et2vTgRpQ2l6ta2UfojGj7A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "kin-openapi";
|
||||
version = "0.134.0";
|
||||
vendorHash = "sha256-+PE/OyZ9Y4uZV4AmzATasrFseQF3UrWQT0bKoxm3uXM=";
|
||||
version = "0.135.0";
|
||||
vendorHash = "sha256-Tf/F7L2F3nhyf6WYsc1FFsBEcMwFHfqkNBlRfcnVRO8=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getkin";
|
||||
repo = "kin-openapi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MJ6oG2CU8jzPk394iJqCZPmm3LCbF6Nz112/fJ65c5w=";
|
||||
hash = "sha256-Hg8FK11Q3dRcuKGCBsXkoBaHXpSGQLKM6PnKEir0kBI=";
|
||||
};
|
||||
|
||||
checkFlags =
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "librelane";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librelane";
|
||||
repo = "librelane";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-NrfZm7GlFxIEIqaPB2SubKMV7DdqYzRtdRfIePMqwgM=";
|
||||
hash = "sha256-JxWuaOBhkjjw4sp7l++QF+0EzGIhPAOaJcKwwmdTg+w=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -15,16 +15,16 @@ in
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mattermost-desktop";
|
||||
version = "6.1.0";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattermost";
|
||||
repo = "desktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5sVYDnz5RPkHfCpA3I1+Lm7z7YLa3fOFYOTEI6Sbxz8=";
|
||||
hash = "sha256-NSTOmrHq1igcO9Wm6PYKHXpVfidLitUaCFou0d6+E2g=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-YdpF/wuH2H+ouBDzCUcTQWLB8s8wa9L12UiGj4MnurQ=";
|
||||
npmDepsHash = "sha256-Er3D7wQMhdEXwR7ISk/OUa7Zu9TkAZj1xCQ5jWcRXgc=";
|
||||
npmBuildScript = "build-prod";
|
||||
makeCacheWritable = true;
|
||||
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mcp-nixos";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utensils";
|
||||
repo = "mcp-nixos";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ogAug05ChGLSJ+KvmP5xXreDhkLHau15Wnp0ry7Ck88=";
|
||||
hash = "sha256-A7KhRVOqLmtta507DPZoKbO8D1AlMMDWLMfHEBhEAxY=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.hatchling ];
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "miniserve";
|
||||
version = "0.33.0";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = "miniserve";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2uXZ2ItqgesAgm9/DDbFW3WKQ/VZfvTR2lQY6Gq9ohw=";
|
||||
hash = "sha256-ae2Y51GuFjC65n2JYIPB1D029Zfhy7OvgZeQy+Syzqw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xCdugvSw9IR9EDp/8ZxgqnFwTYHnF0o+ldk1AlSSzSc=";
|
||||
cargoHash = "sha256-KwkmkbQ1E2LJeif7iQmb7pFjZtXhu7BU+YutGb5UmY4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
gtest,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
@@ -12,34 +11,28 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nbytes";
|
||||
version = "0.1.3";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodejs";
|
||||
repo = "nbytes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-10l/YrvZPwEdEh/Q170WhZUQzdFEpjy7zeKKzYfyoYc=";
|
||||
hash = "sha256-etCRWjak7tKL6dKlQR7SD6HXx/mn/8gnR4l+CAjoQgA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use `gtest` from Nixpkgs to allow an offline build
|
||||
./use-nix-googletest.patch
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
validatePkgConfig
|
||||
];
|
||||
buildInputs = [
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
(lib.cmakeBool "NBYTES_ENABLE_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f2efa3c..3f363dd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -11,15 +11,9 @@ endif()
|
||||
option(NBYTES_DEVELOPMENT_CHECKS "Enable development checks" OFF)
|
||||
|
||||
include(GNUInstallDirs)
|
||||
-include(FetchContent)
|
||||
|
||||
-FetchContent_Declare(
|
||||
- googletest
|
||||
- URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
|
||||
-)
|
||||
-# For Windows: Prevent overriding the parent project's compiler/linker settings
|
||||
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
||||
-FetchContent_MakeAvailable(googletest)
|
||||
+# Use find_package to use the gtest package provided by Nix
|
||||
+find_package(GTest REQUIRED)
|
||||
|
||||
add_subdirectory(src)
|
||||
enable_testing()
|
||||
@@ -67,16 +67,16 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "netbird-${componentName}";
|
||||
version = "0.67.3";
|
||||
version = "0.68.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = "netbird";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bt6NMyRxzzzAnMh0V62cu9+eg/jvV0RRwGqHJm32eZw=";
|
||||
hash = "sha256-2/TnyN/CGIRlXEH2KxYaEJL7Q7dm3mRe3/00gYxCebg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tsAbNuSqH8NjI6VWDXJ/9u3JKkBAnhjcEdeDXT2Bbv8=";
|
||||
vendorHash = "sha256-NUdMiTPXgKb6vxF5odJ0MBBwatqA2SlN+0KR2Z8HoWM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
|
||||
|
||||
|
||||
@@ -48,13 +48,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nezha";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "nezha";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZqDqua76y9b2bqcb8kVzZHqQzBAuhoxWT4yEj95wvyk=";
|
||||
hash = "sha256-QFNv1O0XYkH+OwrUbkmeuLKTSsumo+1uvunDn8LbTho=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opensearch";
|
||||
version = "2.19.2";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz";
|
||||
hash = "sha256-EaOx8vs3y00ln7rUiaCGoD+HhiQY4bhQAzu18VfaTYw=";
|
||||
hash = "sha256-0d6TQU1LTE983CsYbaK4fNuC86VAx23XD2xR6y2NuHw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
cp -R bin config lib modules plugins $out
|
||||
cp -R bin config lib modules plugins agent $out
|
||||
|
||||
substituteInPlace $out/bin/opensearch \
|
||||
--replace 'bin/opensearch-keystore' "$out/bin/opensearch-keystore"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'oxidized', '0.35.0'
|
||||
gem 'oxidized', '0.36.0'
|
||||
gem 'oxidized-web', '0.18.1'
|
||||
gem 'oxidized-script', '0.7.0'
|
||||
gem 'psych', '~> 5.0'
|
||||
gem 'net-scp', '~> 4.1'
|
||||
|
||||
@@ -31,21 +31,20 @@ GEM
|
||||
net-ssh (7.3.0)
|
||||
net-telnet (0.2.0)
|
||||
nio4r (2.7.4)
|
||||
oxidized (0.35.0)
|
||||
oxidized (0.36.0)
|
||||
asetus (~> 0.4)
|
||||
bcrypt_pbkdf (~> 1.0)
|
||||
ed25519 (~> 1.2)
|
||||
net-ftp (~> 0.2)
|
||||
net-http-digest_auth (~> 1.4)
|
||||
net-scp (~> 4.1)
|
||||
net-ssh (~> 7.3)
|
||||
net-telnet (~> 0.2)
|
||||
psych (~> 5.0)
|
||||
rugged (~> 1.6)
|
||||
semantic_logger (~> 4.17.0)
|
||||
semantic_logger (~> 4.17)
|
||||
slop (~> 4.6)
|
||||
syslog (~> 0.3.0)
|
||||
syslog_protocol (~> 0.9.2)
|
||||
syslog (~> 0.3)
|
||||
syslog_protocol (~> 0.9)
|
||||
oxidized-script (0.7.0)
|
||||
oxidized (~> 0.29)
|
||||
slop (~> 4.6)
|
||||
@@ -105,7 +104,8 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
oxidized (= 0.35.0)
|
||||
net-scp (~> 4.1)
|
||||
oxidized (= 0.36.0)
|
||||
oxidized-script (= 0.7.0)
|
||||
oxidized-web (= 0.18.1)
|
||||
psych (~> 5.0)
|
||||
|
||||
@@ -229,7 +229,6 @@
|
||||
"ed25519"
|
||||
"net-ftp"
|
||||
"net-http-digest_auth"
|
||||
"net-scp"
|
||||
"net-ssh"
|
||||
"net-telnet"
|
||||
"psych"
|
||||
@@ -243,10 +242,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1s7v9w357bc5xb89an4kclqmfjv2j6p9gnvsf7s2mnrgg482j76v";
|
||||
sha256 = "0g2a60bwpjidwkksai6l2ndnq3qbvqj33jv53c800m7m4hgr5r0n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
};
|
||||
oxidized-script = {
|
||||
dependencies = [
|
||||
|
||||
@@ -28,13 +28,13 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "perses";
|
||||
version = "0.53.0";
|
||||
version = "0.53.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "perses";
|
||||
repo = "perses";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lr4+0MEKXOdPTsD28hu55o8SAspKbr2791dQAXhdxtA=";
|
||||
hash = "sha256-Oxq+zweg1mpgxKXWBwnsanD66TcD+kOkt3WCTU2FqnQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -53,7 +53,7 @@ buildGoModule (finalAttrs: {
|
||||
inherit (finalAttrs) version src;
|
||||
pname = "${finalAttrs.pname}-ui";
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
|
||||
hash = "sha256-ObQvOZ2IvU/6lfozPweVu46nohKXT0YzZeTyd0VK7GM=";
|
||||
hash = "sha256-yhqpwxWhnYBewDsYYP5R1n45dDTz6Wz3IJri77FBdO8=";
|
||||
};
|
||||
|
||||
npmRoot = "ui";
|
||||
@@ -63,7 +63,7 @@ buildGoModule (finalAttrs: {
|
||||
preBuild = null;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KV0zXXzMBgsMZ543+fLXeGvYtugq5PtYJXSQgqrtbMI=";
|
||||
vendorHash = "sha256-dAvDBJGpY4Dlx4D9hR6VSUt+ppJLJPNNu5smsyutSC8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -2,123 +2,123 @@
|
||||
# Do not edit this file manually.
|
||||
{
|
||||
"BarChart" = {
|
||||
version = "0.11.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/barchart/v0.11.0/BarChart-0.11.0.tar.gz";
|
||||
hash = "sha256-ppx0NLiyDV+IqvVXqwinIKuOfieUPmZFPxmjFiKGEnw=";
|
||||
version = "0.11.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/barchart/v0.11.1/BarChart-0.11.1.tar.gz";
|
||||
hash = "sha256-z18hd8Hme9Y3eNBMX1cuZr0Ux8sZhDYGJ1ZrHFgiDi0=";
|
||||
};
|
||||
"ClickHouse" = {
|
||||
version = "0.5.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/clickhouse/v0.5.0/ClickHouse-0.5.0.tar.gz";
|
||||
hash = "sha256-cMVRAZL7stuSlk1yIuy5KIo7TbVovTy6501Geb3Ujdk=";
|
||||
version = "0.5.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/clickhouse/v0.5.1/ClickHouse-0.5.1.tar.gz";
|
||||
hash = "sha256-iqzWqU8Lovqkie9cM4NZRg0fzWaQP+cqREY8Mz9S5lg=";
|
||||
};
|
||||
"DatasourceVariable" = {
|
||||
version = "0.5.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/datasourcevariable/v0.5.0/DatasourceVariable-0.5.0.tar.gz";
|
||||
hash = "sha256-Eek0TvPXoYDciuBhJ7i69V/kDY2ksEYdHD6VG0J/sjY=";
|
||||
version = "0.5.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/datasourcevariable/v0.5.1/DatasourceVariable-0.5.1.tar.gz";
|
||||
hash = "sha256-OWhRD1SlGto52z6W1LEoGSSlx5LmsgALsDSaLO+6NJk=";
|
||||
};
|
||||
"FlameChart" = {
|
||||
version = "0.5.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/flamechart/v0.5.0/FlameChart-0.5.0.tar.gz";
|
||||
hash = "sha256-hvYYBhFHxIx4D/gbj3KvxL/2tloyG+Dxvk/3fBqGfkE=";
|
||||
version = "0.5.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/flamechart/v0.5.1/FlameChart-0.5.1.tar.gz";
|
||||
hash = "sha256-ajBGNPDAAslLSyUtGxCMdPFGPvtCsoEgDQdn61J0cRM=";
|
||||
};
|
||||
"GaugeChart" = {
|
||||
version = "0.12.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.12.0/GaugeChart-0.12.0.tar.gz";
|
||||
hash = "sha256-n0BE3B9L1b4l1B+AlN6GJtBu2NN7WovkAcrY9OMSM3Q=";
|
||||
version = "0.12.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/gaugechart/v0.12.1/GaugeChart-0.12.1.tar.gz";
|
||||
hash = "sha256-TrgaLLMASL+j2aU+vSKQT0eYiUwsYO4ayBO2ia+qAZ8=";
|
||||
};
|
||||
"HistogramChart" = {
|
||||
version = "0.11.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/histogramchart/v0.11.0/HistogramChart-0.11.0.tar.gz";
|
||||
hash = "sha256-1V8jK5dwNyCqV5M/FEg4vy7acGi5i9oy8rb1drhWMxY=";
|
||||
version = "0.11.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/histogramchart/v0.11.1/HistogramChart-0.11.1.tar.gz";
|
||||
hash = "sha256-FZpzmig3wO2sbPLpPzD46S6nikUUYEiIG2z2QLQVYTI=";
|
||||
};
|
||||
"HeatMapChart" = {
|
||||
version = "0.4.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/heatmapchart/v0.4.0/HeatMapChart-0.4.0.tar.gz";
|
||||
hash = "sha256-fV4HNpOYLa20Q1eSqOQgpSM5/sSGcq1llkM3Mc8OlNg=";
|
||||
version = "0.4.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/heatmapchart/v0.4.1/HeatMapChart-0.4.1.tar.gz";
|
||||
hash = "sha256-AlCGUsVhxMepNpgaqR9B253DGXHhNVVRbLgVNridK4w=";
|
||||
};
|
||||
"LogsTable" = {
|
||||
version = "0.2.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/logstable/v0.2.0/LogsTable-0.2.0.tar.gz";
|
||||
hash = "sha256-XBa9NJna2F8EDP2zbZVltYwtb1S/og/aRYlNVIBvi00=";
|
||||
version = "0.2.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/logstable/v0.2.1/LogsTable-0.2.1.tar.gz";
|
||||
hash = "sha256-uJQXIeg2TYK42csV/Gco0lxdhKyB1URJYcrWmd5Jl/4=";
|
||||
};
|
||||
"Loki" = {
|
||||
version = "0.5.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/loki/v0.5.0/Loki-0.5.0.tar.gz";
|
||||
hash = "sha256-REGbrfNSfvLJjb2MIqhRC8Ks2nIDW1ojSdShq6X99NA=";
|
||||
version = "0.5.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/loki/v0.5.1/Loki-0.5.1.tar.gz";
|
||||
hash = "sha256-YI2O6Dr+wZ9zVvZTGaErwkssMaYbuH9BqfiHAf2s8Jg=";
|
||||
};
|
||||
"Markdown" = {
|
||||
version = "0.11.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/markdown/v0.11.0/Markdown-0.11.0.tar.gz";
|
||||
hash = "sha256-RRwPBfFTR4Ne8hUm6xfYGoIt7Lm3/KOdkYbpR7SEb/8=";
|
||||
version = "0.11.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/markdown/v0.11.1/Markdown-0.11.1.tar.gz";
|
||||
hash = "sha256-hXX/44SzKJhOYWeN3XpaboAW3MeFFpQtogYmU8VJhXo=";
|
||||
};
|
||||
"PieChart" = {
|
||||
version = "0.13.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/piechart/v0.13.0/PieChart-0.13.0.tar.gz";
|
||||
hash = "sha256-zoZaC9LEPeC/XEJ63bdmp3IXC+qO/1RKj5kBvJhwXFY=";
|
||||
version = "0.13.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/piechart/v0.13.1/PieChart-0.13.1.tar.gz";
|
||||
hash = "sha256-VbHfcUfUDB+qZ4Zm5XchLnGy5QIPd50b8gO05cYLf2g=";
|
||||
};
|
||||
"Prometheus" = {
|
||||
version = "0.57.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/prometheus/v0.57.0/Prometheus-0.57.0.tar.gz";
|
||||
hash = "sha256-ZekIhw/1w1utArGWT5P2SXjjMDTssduDip3O4IXdA2g=";
|
||||
version = "0.57.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/prometheus/v0.57.1/Prometheus-0.57.1.tar.gz";
|
||||
hash = "sha256-h48uCoyxtoLb6XpIgbAq+wmls1ukxuedE8ZU51ilAMc=";
|
||||
};
|
||||
"Pyroscope" = {
|
||||
version = "0.5.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/pyroscope/v0.5.0/Pyroscope-0.5.0.tar.gz";
|
||||
hash = "sha256-ZFh6lpI493+UPTjT5cdrGhSUq0l6x28Jyc0sSO/JqJk=";
|
||||
version = "0.5.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/pyroscope/v0.5.1/Pyroscope-0.5.1.tar.gz";
|
||||
hash = "sha256-GSAGmMQRy7mRZs5G6EopvjONof+nvn7BQSN2U9ZiBdg=";
|
||||
};
|
||||
"ScatterChart" = {
|
||||
version = "0.10.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.10.0/ScatterChart-0.10.0.tar.gz";
|
||||
hash = "sha256-pkeTDz5yDIy/pID5+VtASRfAX/jGsEReehCHD9svckM=";
|
||||
version = "0.10.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/scatterchart/v0.10.1/ScatterChart-0.10.1.tar.gz";
|
||||
hash = "sha256-CRgW2TeX0M/RqHnGwtMBu9OgUfjDLQCWT6ZA4M9PovI=";
|
||||
};
|
||||
"StatChart" = {
|
||||
version = "0.12.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/statchart/v0.12.0/StatChart-0.12.0.tar.gz";
|
||||
hash = "sha256-wVmi2wuE4JgQSKv/cwdXLOIaqFU1VjwatdmRyzvYGxY=";
|
||||
version = "0.12.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/statchart/v0.12.1/StatChart-0.12.1.tar.gz";
|
||||
hash = "sha256-/f9P4kU8Qjl4U3RCFEjxKx39h97XNZXZh21wxTLjgCY=";
|
||||
};
|
||||
"StaticListVariable" = {
|
||||
version = "0.8.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.8.0/StaticListVariable-0.8.0.tar.gz";
|
||||
hash = "sha256-DpU919lPJlMXae9XLq1/FL5uOUzu+I2B5H0SvyxxGNY=";
|
||||
version = "0.8.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/staticlistvariable/v0.8.1/StaticListVariable-0.8.1.tar.gz";
|
||||
hash = "sha256-jmZhHyy3pHzTE8rXr/7bSW18RWUaQbQr0uGKVL5E9Vk=";
|
||||
};
|
||||
"StatusHistoryChart" = {
|
||||
version = "0.12.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.12.0/StatusHistoryChart-0.12.0.tar.gz";
|
||||
hash = "sha256-U966A9swak+3DKK2WayWZTY9wqJ5tZfP4049vNf90d0=";
|
||||
version = "0.12.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/statushistorychart/v0.12.1/StatusHistoryChart-0.12.1.tar.gz";
|
||||
hash = "sha256-A/q5nURlLx/ansZ1q7d9aviHpH0OXP/KGwOove+OMH0=";
|
||||
};
|
||||
"Table" = {
|
||||
version = "0.11.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/table/v0.11.0/Table-0.11.0.tar.gz";
|
||||
hash = "sha256-5YujehfKuLFiiqRr0I1YcSln1eYN5a/rv1dGHiEIHZg=";
|
||||
version = "0.11.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/table/v0.11.1/Table-0.11.1.tar.gz";
|
||||
hash = "sha256-b0q2GEKFIosKL3OPiOO/ZXW+1JVinni34MlvFkMpe3o=";
|
||||
};
|
||||
"Tempo" = {
|
||||
version = "0.57.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/tempo/v0.57.0/Tempo-0.57.0.tar.gz";
|
||||
hash = "sha256-u2ZqmtxgGdsO2JzdaSBZ4llme1dnX9L3M3rPN4BmF90=";
|
||||
version = "0.57.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/tempo/v0.57.1/Tempo-0.57.1.tar.gz";
|
||||
hash = "sha256-QqVf1kIK8a9fsmFmZ+9LJIeq8CV/5Hc93F6gVACsq40=";
|
||||
};
|
||||
"TimeSeriesChart" = {
|
||||
version = "0.12.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.12.0/TimeSeriesChart-0.12.0.tar.gz";
|
||||
hash = "sha256-VwiwQRs0S5uLutVQ+2NeouUoZcGKFLu9O2p+hdfH9co=";
|
||||
version = "0.12.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/timeserieschart/v0.12.1/TimeSeriesChart-0.12.1.tar.gz";
|
||||
hash = "sha256-1oof/taprYKIduHb5lG72OlCu5LPL7c63l42KwSpIwM=";
|
||||
};
|
||||
"TimeSeriesTable" = {
|
||||
version = "0.11.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.11.0/TimeSeriesTable-0.11.0.tar.gz";
|
||||
hash = "sha256-7tBQpgATLQUup63qmkagZ3/MKPI1lSQD8mHI5OCZgTE=";
|
||||
version = "0.11.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/timeseriestable/v0.11.1/TimeSeriesTable-0.11.1.tar.gz";
|
||||
hash = "sha256-t2QDT20Fma7Qkka/nx6PROgQKCj0adMuy+70JwCTNXA=";
|
||||
};
|
||||
"TraceTable" = {
|
||||
version = "0.10.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/tracetable/v0.10.0/TraceTable-0.10.0.tar.gz";
|
||||
hash = "sha256-R2TVLKh1L+wKXX4qo/DiF+zlKIUMugmclBZ9D4j3tdc=";
|
||||
version = "0.10.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/tracetable/v0.10.1/TraceTable-0.10.1.tar.gz";
|
||||
hash = "sha256-oOJu0YDWl5v1cWNWj+583901hYnZGoSJHjjpQ400iKg=";
|
||||
};
|
||||
"TracingGanttChart" = {
|
||||
version = "0.12.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.12.0/TracingGanttChart-0.12.0.tar.gz";
|
||||
hash = "sha256-BE61Am6ZQeUpi4T9VLiurO4y0q4auJ/HZESxeZ03abA=";
|
||||
version = "0.12.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/tracingganttchart/v0.12.1/TracingGanttChart-0.12.1.tar.gz";
|
||||
hash = "sha256-AnI8TitOtkE4Lhu2w2C5E3D1w9pdgrZaaQ8FVMO8UOE=";
|
||||
};
|
||||
"VictoriaLogs" = {
|
||||
version = "0.3.0";
|
||||
url = "https://github.com/perses/plugins/releases/download/victorialogs/v0.3.0/VictoriaLogs-0.3.0.tar.gz";
|
||||
hash = "sha256-Jzaihrolx17qZwfc1pDZYYJ2c46PNjfogwkKZM0sinY=";
|
||||
version = "0.3.1";
|
||||
url = "https://github.com/perses/plugins/releases/download/victorialogs/v0.3.1/VictoriaLogs-0.3.1.tar.gz";
|
||||
hash = "sha256-vCV06freSYzSHvObNNBk4gHMnX+O4IIKYY0UNOQdVRU=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "route-graph";
|
||||
version = "0.2.2";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audiusGmbH";
|
||||
owner = "audius";
|
||||
repo = "route-graph";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-HmfmUeT5vt0yWVs7GhIPVt4NZtTfe7HYPLRqfQE/tZM=";
|
||||
hash = "sha256-aLTzej4YtKkQE5q8LKxIBe+aqrjwrG+2pbonzlWhLvU=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -22,9 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
"typing-extensions"
|
||||
];
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
graphviz
|
||||
@@ -35,17 +33,17 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
typing-extensions
|
||||
]);
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"route_graph"
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "route_graph" ];
|
||||
|
||||
meta = {
|
||||
description = "CLI tool for creating graphs of routes";
|
||||
homepage = "https://github.com/audiusGmbH/route-graph";
|
||||
changelog = "https://github.com/audiusGmbH/route-graph/releases/tag/${finalAttrs.version}";
|
||||
homepage = "https://github.com/audius/route-graph";
|
||||
changelog = "https://github.com/audius/route-graph/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "route-graph";
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rtk";
|
||||
version = "0.34.3";
|
||||
version = "0.35.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtk-ai";
|
||||
repo = "rtk";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SQJhPit7efAjBezCNHtn5iZEEly6eApxsO9jGHLrKlg=";
|
||||
hash = "sha256-7DAL4dsnq2ZWmkyoI+BeN21ouK0VyLvSxOCt5hPWCl4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cargoHash = "sha256-WpSwEx/pkGTIlDv1cTFtTcTC3YgddMYVbOLlqKYeDK0=";
|
||||
cargoHash = "sha256-r/PCA15MsmERCq3z8nObxdbX3KijsrInxsgJ6aqRVc4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "snmpen";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabaff";
|
||||
repo = "snmpen";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-PH1kUnDOiiE7ouEkhd1+TuIBziB2uxCVnmiEkCgQma0=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ hatchling ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
humanize
|
||||
pysnmp
|
||||
rich
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "snmpen" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "SNMP Enumeration tool";
|
||||
homepage = "https://github.com/fabaff/snmpen";
|
||||
changelog = "https://github.com/fabaff/snmpen/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "snmpen";
|
||||
};
|
||||
})
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "snowflake";
|
||||
version = "2.12.1";
|
||||
version = "2.13.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.torproject.org";
|
||||
@@ -14,10 +14,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "anti-censorship/pluggable-transports";
|
||||
repo = "snowflake";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-3aXO6AvOHPX8QCXK5dFx3QVxQ7BNAi4DJAZ63BMOI1g=";
|
||||
sha256 = "sha256-XbBlUEkv0ptrb+X+oPDRCvy6HE6XHgSSLwFTXw071pU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-X7SfTTxUL/4f2OndF8gnhz5JVpqGzeGLctiOFx5pJPI=";
|
||||
vendorHash = "sha256-bhv7soUyZnIG+AS1mMH38GZEG74tDk/ap7cQr6k4Pzs=";
|
||||
|
||||
meta = {
|
||||
description = "System to defeat internet censorship";
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "snx-rs";
|
||||
version = "5.2.3";
|
||||
version = "5.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ancwrd1";
|
||||
repo = "snx-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GeEUOgFEYBzTsORUSxI/fU5sn7RlRWetf2sNHkt9VsY=";
|
||||
hash = "sha256-Jqj2cux11V0l0YRZY2O19PzduvcxB1Ze186jG5Vo+Gs=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
cargoHash = "sha256-2BXJSlVSQVhxc/bxY0ycd/g8ZZ+Ye5gMuM4Sh5W0jyI=";
|
||||
cargoHash = "sha256-XY4kZ1HBwHpb8hHtt0bay80Jc3d3zyAoKQv3m0n1AL4=";
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
|
||||
|
||||
@@ -22,10 +22,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "17z0flj504z9d5hmzmd8g2gmaiz1a3yndvkxmbz6qrkvjzr2pnxa";
|
||||
sha256 = "12xv89kmr6l6mflzqddk0zsmbbsr53mv9dz6z91sdcb3ifjd3881";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
actionmailbox = {
|
||||
dependencies = [
|
||||
@@ -40,10 +40,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "03yqbiiz9z1nqy4n7rhjpavn20lx5rvjbq0sl0dkvdiga15662zd";
|
||||
sha256 = "0m00a0sqf68rllzmsfkb02cqy4vi5q2lrrmgld1i5pf31iyahl96";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
actionmailer = {
|
||||
dependencies = [
|
||||
@@ -58,10 +58,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0jyyfp786csg4hmsxfywi8131p1pk51jzi8i9d9zn2lzw7c714iv";
|
||||
sha256 = "0qc5ycibnxricdlgmrihds0hqjli5hhksbv947nqbsfg8b4gl63r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = [
|
||||
@@ -84,10 +84,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1nyd4f58r11b0x5gsjlnyk2k9y2kd0zhv8szf82g9j1j5xccfr03";
|
||||
sha256 = "0dabvb49acbwvy91587cbn36ghv3bsyl14a9aq4ll4nxfn4qdpn9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
actiontext = {
|
||||
dependencies = [
|
||||
@@ -102,10 +102,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0h13x9y767i9nan09jyhiw32s1gmdmcb4mjld1jvhadcd019gcs0";
|
||||
sha256 = "1q8jm23v29zv055wpgyrwzb008bvqbm4x8bb64l0f8r6ccywxwqj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
actionview = {
|
||||
dependencies = [
|
||||
@@ -124,10 +124,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0j0n38p02s73r9a8fg615z8m78n9agpf9d9b0v7i97m5wwgc9lsv";
|
||||
sha256 = "04ql6lpvdmrl5169y166pfr9w53c6f40jkgmn4ljgkzh7pkaj3vd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
activejob = {
|
||||
dependencies = [
|
||||
@@ -138,10 +138,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1knc9xwfnyqcxqzfsfix210ai2yhw9ps7j19aq5bk30n1rfsij6b";
|
||||
sha256 = "047asb83p78zh93v0q1svrfl6da3aqqbjlkwd2jap172pz1ybard";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
activemodel = {
|
||||
dependencies = [ "activesupport" ];
|
||||
@@ -149,10 +149,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1z8dff84qgqinhwsj0i91r674vvg412kg72162zv216i7jn4yklg";
|
||||
sha256 = "1hjv2kmv7i0jk8zkng3pxa1kdd90qpgr3v60qvs764yw8qyq35n7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = [
|
||||
@@ -164,10 +164,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0cmz9k27zy0746zpljg28ir4857df9r3nza4c1acmrcr2wbjr8xx";
|
||||
sha256 = "1ri9l5v4601bxwrkl105k1ccxxg2wpvg6x94rwqr834irnv63cl9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
activerecord-import = {
|
||||
dependencies = [ "activerecord" ];
|
||||
@@ -209,10 +209,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0hx0chzrszc3kbjn8psagxaaas4ns5479kr0kxkc36685yb15ws7";
|
||||
sha256 = "1wrxnj6rqzp7n80f0cfrdalz7b2md6sqqmx8lrgd3klaiwzqm295";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = [
|
||||
@@ -238,10 +238,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0np97w7kc9dx7kx092nzhy3g6qxmqivcsfnzlzjzmd9kfxn3ljl9";
|
||||
sha256 = "08ybmp63qrfaxq7bv7mvb4xvfb4fcylw2a0szankzkrpdbzi7wip";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
acts_as_list = {
|
||||
dependencies = [
|
||||
@@ -1588,10 +1588,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0r77iy9q5mvsplla88mgvxi27xjbll6svynikbr53mdfa32mdzzc";
|
||||
sha256 = "1xfr3686v5brfwhpz7cjj638rxzac5z0jh7cxay184jd9dwgngdn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.12.1";
|
||||
version = "2.12.2";
|
||||
};
|
||||
icalendar-recurrence = {
|
||||
dependencies = [
|
||||
@@ -1716,10 +1716,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy";
|
||||
sha256 = "1kw39sqnr0lprwsd2h0zx1ic96skhqf88i14xv7c8drcicqvvqg7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.18.1";
|
||||
version = "2.19.2";
|
||||
};
|
||||
json-jwt = {
|
||||
dependencies = [
|
||||
@@ -3010,10 +3010,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1nv2g40b3hks0gqp7pbapj26cxz78z73dl1mq7azkhrd5nir8i1n";
|
||||
sha256 = "1rjvzpnl0js6axlygij5a5c6cwmraxvv6z6c2px95qlbjj80zd2c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
rails-controller-testing = {
|
||||
dependencies = [
|
||||
@@ -3092,10 +3092,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0iybsmr8yv8gg6a4cikmh0394sk707qr7h85vny4mazzvi9xh0w2";
|
||||
sha256 = "1md96yl05v436jkgz9725cax9hf61sv74267cg7yidwnl3lwd65d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.0.4";
|
||||
version = "8.0.5";
|
||||
};
|
||||
rainbow = {
|
||||
groups = [
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
let
|
||||
pname = "zammad";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
|
||||
src = applyPatches {
|
||||
src = fetchFromGitHub (lib.importJSON ./source.json);
|
||||
@@ -32,9 +32,9 @@ let
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|ruby '3.2.[0-9]\+'|ruby '${ruby.version}'|" Gemfile
|
||||
sed -i -e "s|ruby 3.2.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock
|
||||
sed -i -e "s|3.2.[0-9]\+|${ruby.version}|" .ruby-version
|
||||
sed -i -e "s|ruby '3.4.[0-9]\+'|ruby '${ruby.version}'|" Gemfile
|
||||
sed -i -e "s|ruby 3.4.[0-9]\+p[0-9]\+|ruby ${ruby.version}|" Gemfile.lock
|
||||
sed -i -e "s|3.4.[0-9]\+|${ruby.version}|" .ruby-version
|
||||
${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json
|
||||
'';
|
||||
};
|
||||
@@ -87,7 +87,7 @@ stdenvNoCC.mkDerivation {
|
||||
pnpm = pnpm_10;
|
||||
|
||||
fetcherVersion = 3;
|
||||
hash = "sha256-oqVlhOzkqv+2mj/nDUR/PBXkRy5O7gtx2msEchGywfo=";
|
||||
hash = "sha256-BhkKCo9fVkG7G2er/NVyEP17T8P1rLqCQdJlcjHsSxQ=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"owner": "zammad",
|
||||
"repo": "zammad",
|
||||
"rev": "f3228274c4feefac470d7efad12f240debd678bc",
|
||||
"hash": "sha256-rMb8/owMhcxzFwN5yZ0t3ABtfPTrUd5CzDm1QwQOvek=",
|
||||
"rev": "6a5ac49588022c610896a50516dc5876ac1f24b9",
|
||||
"hash": "sha256-E2hDdl32C4dQOZqnbAOsJ12zJsC9bJ9qFPadm4rEeKA=",
|
||||
"fetchSubmodules": true
|
||||
}
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.230.1";
|
||||
version = "0.231.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -124,7 +124,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J+WnR0xGMWS5m8FWQfTwRCZckxt2Y5kQy06TvpYZks4=";
|
||||
hash = "sha256-DTJ8+L5JzW0sN7G2ZibeTsPmqOBMw/8IoJ6ZDUU9HWQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -150,7 +150,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-EbRLFIKpPnfyGeh7jHVDilez++4elZ1rz2iO3U9XOpQ=";
|
||||
cargoHash = "sha256-vFBkjos+Wa0E1li8t4ZCVnRq7q5XSQQe2fx0QqgaCiM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -94,7 +94,7 @@ lib.makeScope newScope (
|
||||
inherit outputs;
|
||||
};
|
||||
|
||||
host-artifacts = self.callPackage ./host-artifacts.nix { };
|
||||
host-artifacts = self.callPackage ./host-artifacts.nix { inherit (stdenv) hostPlatform; };
|
||||
|
||||
all-artifacts = self.callPackage ./all-artifacts.nix { };
|
||||
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
wayland-scanner,
|
||||
qtbase,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wlr-protocols,
|
||||
pixman,
|
||||
libgbm,
|
||||
vulkan-loader,
|
||||
libinput,
|
||||
libxcb-errors,
|
||||
libxdmcp,
|
||||
seatd,
|
||||
wlroots,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qwlroots";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vioken";
|
||||
repo = "qwlroots";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ZyG0JGUlz/ubtwN5wYtC8qeYsPur+0kTkD7iIjHX7KU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlr-protocols
|
||||
pixman
|
||||
libgbm
|
||||
vulkan-loader
|
||||
libinput
|
||||
libxdmcp
|
||||
libxcb-errors
|
||||
seatd
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
wlroots
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "PREFER_QT_5" (lib.versionOlder qtbase.version "6"))
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = {
|
||||
description = "Qt and QML bindings for wlroots";
|
||||
homepage = "https://github.com/vioken/qwlroots";
|
||||
license = with lib.licenses; [
|
||||
gpl3Only
|
||||
lgpl3Only
|
||||
asl20
|
||||
];
|
||||
platforms = wlroots.meta.platforms;
|
||||
maintainers = with lib.maintainers; [ wineee ];
|
||||
};
|
||||
})
|
||||
@@ -1,74 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wayland-scanner,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtdeclarative,
|
||||
qwlroots,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wlr-protocols,
|
||||
pixman,
|
||||
libdrm,
|
||||
libinput,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "waylib";
|
||||
version = "0.6.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vioken";
|
||||
repo = "waylib";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Yp7j1L+b41pmLWhxYN4M9W8OjXA31za3Ufp/iE3U/vM=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [
|
||||
# To find wayland-scanner
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qwlroots
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlr-protocols
|
||||
pixman
|
||||
libdrm
|
||||
libinput
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Wrapper for wlroots based on Qt";
|
||||
homepage = "https://github.com/vioken/waylib";
|
||||
license = with lib.licenses; [
|
||||
gpl3Only
|
||||
lgpl3Only
|
||||
asl20
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ wineee ];
|
||||
};
|
||||
})
|
||||
@@ -358,13 +358,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.42.85";
|
||||
version = "1.42.86";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-3q9StRpmCWMXABLMa38bIgAI5sWf6oTjX79UOfE2Ddc=";
|
||||
hash = "sha256-hfwSM39wUj4l8wiFuA/u7PhiOXerpT92cr03pWdHGKM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202604071";
|
||||
version = "0.1.202604091";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-jlzyncEWMY/XqoYkIAGwy+zv5gmHj+mBpMuRCApvakA=";
|
||||
hash = "sha256-KcXJmV+5aeOhIxN3xvjZPFQSDTMxeFPYq/1IErnV1t0=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "memray";
|
||||
version = "1.19.2";
|
||||
version = "1.19.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloomberg";
|
||||
repo = "memray";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-z9/6BKVhaaZwu/MvIXI4LsgVO73zVaiCYGJekzWW1mk=";
|
||||
hash = "sha256-A9XbVpuW/MlMNdFq5bbpg90GFh5c1aEWQOvGAOXyUgc=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -155,8 +155,8 @@ in
|
||||
"sha256-BJ5MKA8jpafHN014Y+pLo1IKcVq1PAfufGlCFwEGSKk=";
|
||||
|
||||
mypy-boto3-backup =
|
||||
buildMypyBoto3Package "backup" "1.42.73"
|
||||
"sha256-rL2H5FRbjO5aDNqBabi8TROtC3NPOx9Zkzcjh5jwkeA=";
|
||||
buildMypyBoto3Package "backup" "1.42.86"
|
||||
"sha256-qPxL3n/CZGpncMBs1nIOmZPsQP5wAF3bE8kH+zGvkZo=";
|
||||
|
||||
mypy-boto3-backup-gateway =
|
||||
buildMypyBoto3Package "backup-gateway" "1.42.58"
|
||||
@@ -423,8 +423,8 @@ in
|
||||
"sha256-lELlqGCIpJDadB4McePclQ56IyVBo7s9B05mBI3vWdY=";
|
||||
|
||||
mypy-boto3-drs =
|
||||
buildMypyBoto3Package "drs" "1.42.3"
|
||||
"sha256-31X59K6RtNoN/iIqZMkpoH1z55k69wteY/Mw2va4txI=";
|
||||
buildMypyBoto3Package "drs" "1.42.86"
|
||||
"sha256-Gs2IKLV8vnT9M1fT2v16WlgjjfgAUfeGh9DubBwjtBk=";
|
||||
|
||||
mypy-boto3-ds =
|
||||
buildMypyBoto3Package "ds" "1.42.3"
|
||||
@@ -451,8 +451,8 @@ in
|
||||
"sha256-qe5aitxIPiQA2Et/+MtGVsnmWvk45Rg04/U/kR+tmK0=";
|
||||
|
||||
mypy-boto3-ecr =
|
||||
buildMypyBoto3Package "ecr" "1.42.67"
|
||||
"sha256-fZ0qmXfIwP+rAs5MmfwRuSGY8C0KNYBu45ScOdlZvRg=";
|
||||
buildMypyBoto3Package "ecr" "1.42.86"
|
||||
"sha256-TWtQ8YpclFCeRdqngLdHi3KZT+Q6V3IP9zKgm+m3Yy0=";
|
||||
|
||||
mypy-boto3-ecr-public =
|
||||
buildMypyBoto3Package "ecr-public" "1.42.3"
|
||||
@@ -698,8 +698,8 @@ in
|
||||
"sha256-TzudGWLWWzTRWZb3585Tkar1iXmt5TtFNox+DJzvhS4=";
|
||||
|
||||
mypy-boto3-ivs-realtime =
|
||||
buildMypyBoto3Package "ivs-realtime" "1.42.68"
|
||||
"sha256-Q+++H+qR9OKMnbyZVL06+uDV9KuPuEabZDVXcrkAozM=";
|
||||
buildMypyBoto3Package "ivs-realtime" "1.42.86"
|
||||
"sha256-0O6dAerORo30pB6IRlfyUjSHBaAgQ+JeND63vWcswoM=";
|
||||
|
||||
mypy-boto3-ivschat =
|
||||
buildMypyBoto3Package "ivschat" "1.42.3"
|
||||
@@ -862,8 +862,8 @@ in
|
||||
"sha256-+Dgo1XpVUPmmUntpzFlPDeym6xUxRiXZki1j5ieS3CU=";
|
||||
|
||||
mypy-boto3-medialive =
|
||||
buildMypyBoto3Package "medialive" "1.42.83"
|
||||
"sha256-FmfFTQiciHHNheumvBOAXoBYVNfMp8owUndvr7n1JHs=";
|
||||
buildMypyBoto3Package "medialive" "1.42.86"
|
||||
"sha256-udG3y+0adjMbsHjwb2rI84KzPH5FDDoJsIwcjXeTuPc=";
|
||||
|
||||
mypy-boto3-mediapackage =
|
||||
buildMypyBoto3Package "mediapackage" "1.42.3"
|
||||
@@ -990,8 +990,8 @@ in
|
||||
"sha256-+t1Mh2gV7wu5YAFzp0jABFUC6/8P/FHMnBCHilIFXac=";
|
||||
|
||||
mypy-boto3-outposts =
|
||||
buildMypyBoto3Package "outposts" "1.42.85"
|
||||
"sha256-SB07dOhPo1fFcd+9N9al/tYG1GV8NQcwz8W4d61i65c=";
|
||||
buildMypyBoto3Package "outposts" "1.42.86"
|
||||
"sha256-roB4+wKTlaxt7vX5x77mhQoJVn4AyziwaiVCxlG3BDI=";
|
||||
|
||||
mypy-boto3-panorama =
|
||||
buildMypyBoto3Package "panorama" "1.42.3"
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
django,
|
||||
fetchFromGitHub,
|
||||
netaddr,
|
||||
netbox,
|
||||
numpy,
|
||||
requests,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netbox-interface-synchronization";
|
||||
version = "4.1.7";
|
||||
@@ -24,6 +27,8 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
django
|
||||
netaddr
|
||||
requests
|
||||
numpy
|
||||
];
|
||||
|
||||
# netbox is required for the pythonImportsCheck; plugin does not provide unit tests
|
||||
|
||||
@@ -8,21 +8,19 @@
|
||||
poetry-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "netbox-plugin-prometheus-sd";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FlxPeters";
|
||||
repo = "netbox-plugin-prometheus-sd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-L5kJnaY9gKpsWAgwkjVRQQauL2qViinqk7rHLXTVzT4=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2SVfWkw6/AkDihWp9chU8rTqLiSn9ax4uLaK1xydfGM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'version = "0.0.0"' 'version = "${version}"'
|
||||
substituteInPlace netbox_prometheus_sd/__init__.py \
|
||||
--replace-fail "from extras.plugins import PluginConfig" "from netbox.plugins import PluginConfig"
|
||||
'';
|
||||
@@ -45,8 +43,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Netbox plugin to provide Netbox entires to Prometheus HTTP service discovery";
|
||||
homepage = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd";
|
||||
changelog = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd/releases/tag/${src.tag}";
|
||||
changelog = "https://github.com/FlxPeters/netbox-plugin-prometheus-sd/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ xanderio ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pybotvac";
|
||||
version = "0.0.28";
|
||||
version = "0.0.29";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XIGG8HmjI3dSq42co2e05xHIYjIM39qVanMJLDqWFCg=";
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-9mapPFzdAAzHJFuFaxiyGh0utznzTSXzRa6AZRj/Oq8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -34,8 +34,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python module for interacting with Neato Botvac Connected vacuum robots";
|
||||
homepage = "https://github.com/stianaske/pybotvac";
|
||||
changelog = "https://github.com/stianaske/pybotvac/releases/tag/v${version}";
|
||||
changelog = "https://github.com/stianaske/pybotvac/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "requests-ratelimiter";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JWCook";
|
||||
repo = "requests-ratelimiter";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6Uw6JPArOzKD7va6mthumCDW/G0Yn/C1d+1VflrJ/JY=";
|
||||
hash = "sha256-73/B9PlkZOm51srTzDFP+VXxlE77Ge5Mt5iY5fVagkk=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rich-click";
|
||||
version = "1.9.5";
|
||||
version = "1.9.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ewels";
|
||||
repo = "rich-click";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-VSaPSC49icIB4z3ZPHtedh2gXkYBIODrG362T++i0Eo=";
|
||||
hash = "sha256-HT82Dk3dYNMVU4lKJodKtn2KfEH7HUAORpa2RKSmg68=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.72";
|
||||
version = "3.1.73";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Et9Tkyh7IIC8Z6P3OF/aQMIl3p2UNNoHbjMlrYGtpMw=";
|
||||
hash = "sha256-VYjJLaFVGgIV35naRZaFhTSf8Z3AjCmPTkcxJdshSyY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -57,7 +57,7 @@ let
|
||||
}
|
||||
.${buildPlatform.system};
|
||||
|
||||
sources = (import ./sources.nix).${arch}.linux.mescc;
|
||||
sources = (lib.importJSON ./sources.json).${arch}.linux.mescc;
|
||||
|
||||
inherit (sources)
|
||||
libc_mini_SOURCES
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bash coreutils gnutar
|
||||
#!nix-shell -i bash -p bash coreutils gnutar jq
|
||||
|
||||
# Generate a sources.nix for a version of GNU mes. Creates lists of source files
|
||||
# Generate a sources.json for a version of GNU mes. Creates lists of source files
|
||||
# from build-aux/configure-lib.sh.
|
||||
#
|
||||
# You may point this tool at a manually downloaded tarball, but more ideal is
|
||||
# using the source tarball from Nixpkgs. For example:
|
||||
#
|
||||
# MES_TARBALL="$(nix-build --no-link -A minimal-bootstrap.mes.src ../../../../..)"
|
||||
# ./gen-sources.sh "$MES_TARBALL" > ./new-sources.nix
|
||||
# ./gen-sources.sh "$MES_TARBALL" > ./new-sources.json
|
||||
|
||||
set -eu
|
||||
|
||||
@@ -18,10 +18,12 @@ KERNELS="linux"
|
||||
COMPILERS="mescc gcc"
|
||||
|
||||
|
||||
format() {
|
||||
echo "["
|
||||
echo $* | xargs printf ' "%s"\n'
|
||||
echo " ]"
|
||||
to_json_array() {
|
||||
if [ $# -eq 0 ]; then
|
||||
echo '[]'
|
||||
else
|
||||
printf '%s\n' "$@" | jq --raw-input --null-input '[inputs]'
|
||||
fi
|
||||
}
|
||||
|
||||
gen_sources() {
|
||||
@@ -34,17 +36,24 @@ gen_sources() {
|
||||
# Populate source file lists
|
||||
source $CONFIGURE_LIB_SH
|
||||
|
||||
cat <<EOF
|
||||
$mes_cpu.$mes_kernel.$compiler = {
|
||||
libc_mini_SOURCES = $(format $libc_mini_SOURCES);
|
||||
libmescc_SOURCES = $(format $libmescc_SOURCES);
|
||||
libtcc1_SOURCES = $(format $libtcc1_SOURCES);
|
||||
libc_SOURCES = $(format $libc_SOURCES);
|
||||
libc_tcc_SOURCES = $(format $libc_tcc_SOURCES);
|
||||
libc_gnu_SOURCES = $(format $libc_gnu_SOURCES);
|
||||
mes_SOURCES = $(format $mes_SOURCES);
|
||||
};
|
||||
EOF
|
||||
jq --null-input \
|
||||
--arg key "$mes_cpu.$mes_kernel.$compiler" \
|
||||
--argjson libc_mini_SOURCES "$(to_json_array $libc_mini_SOURCES)" \
|
||||
--argjson libmescc_SOURCES "$(to_json_array $libmescc_SOURCES)" \
|
||||
--argjson libtcc1_SOURCES "$(to_json_array $libtcc1_SOURCES)" \
|
||||
--argjson libc_SOURCES "$(to_json_array $libc_SOURCES)" \
|
||||
--argjson libc_tcc_SOURCES "$(to_json_array $libc_tcc_SOURCES)" \
|
||||
--argjson libc_gnu_SOURCES "$(to_json_array $libc_gnu_SOURCES)" \
|
||||
--argjson mes_SOURCES "$(to_json_array $mes_SOURCES)" \
|
||||
'{($key): {
|
||||
libc_mini_SOURCES: $libc_mini_SOURCES,
|
||||
libmescc_SOURCES: $libmescc_SOURCES,
|
||||
libtcc1_SOURCES: $libtcc1_SOURCES,
|
||||
libc_SOURCES: $libc_SOURCES,
|
||||
libc_tcc_SOURCES: $libc_tcc_SOURCES,
|
||||
libc_gnu_SOURCES: $libc_gnu_SOURCES,
|
||||
mes_SOURCES: $mes_SOURCES
|
||||
}}'
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +62,7 @@ if [ ! -f $MES_TARBALL ]; then
|
||||
echo "Provide path to mes-x.x.x.tar.gz as first argument" >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "Generating sources.nix from $MES_TARBALL" >&2
|
||||
echo "Generating sources.json from $MES_TARBALL" >&2
|
||||
|
||||
TMP=$(mktemp -d)
|
||||
cd $TMP
|
||||
@@ -75,20 +84,14 @@ chmod +x config.sh
|
||||
|
||||
echo "Configuring with $CONFIGURE_LIB_SH" >&2
|
||||
|
||||
cat <<EOF
|
||||
# This file is generated by ./gen-sources.sh.
|
||||
# Do not edit!
|
||||
{
|
||||
EOF
|
||||
|
||||
RESULT='{}'
|
||||
for arch in $ARCHS; do
|
||||
for kernel in $KERNELS; do
|
||||
for compiler in $COMPILERS; do
|
||||
gen_sources $arch $kernel $compiler
|
||||
PART=$(gen_sources $arch $kernel $compiler)
|
||||
RESULT=$(jq --null-input --argjson a "$RESULT" --argjson b "$PART" '$a * $b')
|
||||
done
|
||||
done
|
||||
done
|
||||
|
||||
cat <<EOF
|
||||
}
|
||||
EOF
|
||||
echo "$RESULT" | jq --sort-keys .
|
||||
|
||||
@@ -18,7 +18,7 @@ let
|
||||
}
|
||||
.${buildPlatform.system};
|
||||
|
||||
sources = (import ./sources.nix).${arch}.linux.gcc;
|
||||
sources = (lib.importJSON ./sources.json).${arch}.linux.gcc;
|
||||
inherit (sources) libtcc1_SOURCES libc_gnu_SOURCES;
|
||||
|
||||
# Concatenate all source files into a convenient bundle
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -8,13 +8,13 @@
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "wills106";
|
||||
domain = "solax_modbus";
|
||||
version = "2026.03.4";
|
||||
version = "2026.04.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wills106";
|
||||
repo = "homeassistant-solax-modbus";
|
||||
tag = version;
|
||||
hash = "sha256-bgXpwY2kWwOAQCE2BioOmhkWVXBSX4cXL71kkB7EomE=";
|
||||
hash = "sha256-9T7rfFyNehd6dGNYJdXSXOcvUp87WEyvJQwr6yyeBRo=";
|
||||
};
|
||||
|
||||
dependencies = [ pymodbus ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildFishPlugin rec {
|
||||
pname = "forgit";
|
||||
version = "26.04.0";
|
||||
version = "26.04.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = version;
|
||||
hash = "sha256-H5Vuf+VIrurs9lwad/K4klElXvM1kg6LEjm/wgv1/z8=";
|
||||
hash = "sha256-/tG//6s0km8IUJXI4f++/UUCTAOYTDE/C5bbkHFhdNY=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -977,6 +977,7 @@ mapAliases {
|
||||
julia_19-bin = throw "Julia 1.9 has reached its end of life and 'julia_19-bin' has been removed. Please use a supported version."; # Added 2025-10-29
|
||||
k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
|
||||
k3s_1_31 = throw "'k3s_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08
|
||||
k3s_1_32 = throw "'k3s_1_32' has been removed from nixpkgs as it has reached end of life"; # Added 2026-03-31
|
||||
kak-lsp = throw "'kak-lsp' has been renamed to/replaced by 'kakoune-lsp'"; # Converted to throw 2025-10-27
|
||||
kanidm = throw "'kanidm' alias has been removed. You must use a versioned package, e.g. 'kanidm_1_x'."; # Added 2026-01-29
|
||||
kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
|
||||
|
||||
@@ -9878,7 +9878,6 @@ with pkgs;
|
||||
jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
|
||||
|
||||
inherit (callPackage ../applications/networking/cluster/k3s { })
|
||||
k3s_1_32
|
||||
k3s_1_33
|
||||
k3s_1_34
|
||||
k3s_1_35
|
||||
|
||||
@@ -126,10 +126,6 @@ makeScopeWithSplicing' {
|
||||
|
||||
qtspell = callPackage ../development/libraries/qtspell { };
|
||||
|
||||
qwlroots = callPackage ../development/libraries/qwlroots {
|
||||
wlroots = pkgs.wlroots_0_18;
|
||||
};
|
||||
|
||||
qwt = callPackage ../development/libraries/qwt/default.nix { };
|
||||
|
||||
qxlsx = callPackage ../development/libraries/qxlsx { };
|
||||
@@ -157,9 +153,17 @@ makeScopeWithSplicing' {
|
||||
|
||||
timed = callPackage ../applications/system/timed { };
|
||||
|
||||
waylib = callPackage ../development/libraries/waylib { };
|
||||
|
||||
wayqt = callPackage ../development/libraries/wayqt { };
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
qwlroots = throw ''
|
||||
'qt6Packages.qwlroots' has been removed because it has been merged into treeland upstream.
|
||||
The upstream no longer provides it as a standalone development library.
|
||||
''; # Added 2025-02-07
|
||||
waylib = throw ''
|
||||
'qt6Packages.waylib' has been removed because it has been merged into treeland upstream.
|
||||
The upstream no longer provides it as a standalone development library.
|
||||
''; # Added 2025-02-07
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user