Merge staging-next into staging
This commit is contained in:
@@ -10851,6 +10851,12 @@
|
||||
githubId = 2090758;
|
||||
keys = [ { fingerprint = "24F4 1925 28C4 8797 E539 F247 DB2D 93D1 BFAA A6EA"; } ];
|
||||
};
|
||||
hythera = {
|
||||
name = "Hythera";
|
||||
github = "Hythera";
|
||||
githubId = 87016780;
|
||||
matrix = "@hythera:matrix.org";
|
||||
};
|
||||
hyzual = {
|
||||
email = "hyzual@gmail.com";
|
||||
github = "Hyzual";
|
||||
@@ -18068,7 +18074,7 @@
|
||||
mynacol = {
|
||||
github = "Mynacol";
|
||||
githubId = 26695166;
|
||||
name = "Paul Prechtel";
|
||||
name = "Mynacol";
|
||||
};
|
||||
myrl = {
|
||||
email = "myrl.0xf@gmail.com";
|
||||
|
||||
@@ -17,7 +17,6 @@ in
|
||||
{
|
||||
options.services.reaction = {
|
||||
enable = mkEnableOption "enable reaction";
|
||||
|
||||
package = mkPackageOption pkgs "reaction" { };
|
||||
|
||||
settings = mkOption {
|
||||
@@ -102,8 +101,14 @@ in
|
||||
{
|
||||
# allows reading journal logs of processess
|
||||
users.users.reaction.extraGroups = [ "systemd-journal" ];
|
||||
|
||||
# allows modifying ip firewall rules
|
||||
systemd.services.reaction.AmbientCapabilities = [ "CAP_NET_ADMIN" ];
|
||||
systemd.services.reaction.unitConfig.ConditionCapability = "CAP_NET_ADMIN";
|
||||
systemd.services.reaction.serviceConfig = {
|
||||
CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
|
||||
AmbientCapabilities = [ "CAP_NET_ADMIN" ];
|
||||
};
|
||||
|
||||
# optional, if more control over ssh logs is needed
|
||||
services.openssh.settings.LogLevel = lib.mkDefault "VERBOSE";
|
||||
}
|
||||
@@ -117,19 +122,14 @@ in
|
||||
cfg = config.services.reaction;
|
||||
|
||||
generatedSettings = settingsFormat.generate "reaction.yml" cfg.settings;
|
||||
namedGeneratedSettings = lib.optional (cfg.settings != { }) {
|
||||
name = "reaction.yml";
|
||||
path = generatedSettings;
|
||||
};
|
||||
|
||||
# SAFETY: We can discard the dependencies of "file" in the name attribute because we keep them in the path attribute
|
||||
# See https://nix.dev/manual/nix/2.32/language/string-context
|
||||
namedSettingsFiles = builtins.map (file: {
|
||||
name = builtins.unsafeDiscardStringContext (builtins.baseNameOf file);
|
||||
path = file;
|
||||
}) cfg.settingsFiles;
|
||||
|
||||
settingsDir = pkgs.linkFarm "reaction.d" (namedSettingsFiles ++ namedGeneratedSettings);
|
||||
settingsDir = pkgs.runCommand "reaction-settings-dir" { } ''
|
||||
mkdir -p $out
|
||||
${lib.concatMapStringsSep "\n" (file: ''
|
||||
filename=$(basename "${file}")
|
||||
ln -s "${file}" "$out/$filename"
|
||||
'') cfg.settingsFiles}
|
||||
ln -s ${generatedSettings} $out/reaction.yml
|
||||
'';
|
||||
in
|
||||
lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
@@ -157,18 +157,12 @@ in
|
||||
''
|
||||
);
|
||||
|
||||
# Easier to debug conf when we have direct access to it,
|
||||
# rather than having to look for it in the systemd service file.
|
||||
environment.etc."reaction".source = settingsDir;
|
||||
|
||||
systemd.services.reaction = {
|
||||
enable = true;
|
||||
description = "Scan logs and take action";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
partOf = lib.optionals cfg.stopForFirewall [ "firewall.service" ];
|
||||
path = [ pkgs.iptables ];
|
||||
unitConfig.ConditionCapability = "CAP_NET_ADMIN";
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = if (!cfg.runAsRoot) then "reaction" else "root";
|
||||
@@ -177,11 +171,29 @@ in
|
||||
lib.optionalString (cfg.loglevel != null) " -l ${cfg.loglevel}"
|
||||
}
|
||||
'';
|
||||
StateDirectory = "reaction";
|
||||
RuntimeDirectory = "reaction";
|
||||
WorkingDirectory = "/var/lib/reaction";
|
||||
|
||||
CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
|
||||
NoNewPrivileges = true;
|
||||
|
||||
RuntimeDirectory = "reaction";
|
||||
RuntimeDirectoryMode = "0750";
|
||||
WorkingDirectory = "%S/reaction";
|
||||
StateDirectory = "reaction";
|
||||
StateDirectoryMode = "0750";
|
||||
LogsDirectory = "reaction";
|
||||
LogsDirectoryMode = "0750";
|
||||
UMask = 0077;
|
||||
|
||||
RemoveIPC = true;
|
||||
PrivateTmp = true;
|
||||
ProtectHome = true;
|
||||
ProtectClock = true;
|
||||
PrivateDevices = true;
|
||||
ProtectHostname = true;
|
||||
ProtectSystem = "strict";
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectKernelLogs = true;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -24,44 +24,44 @@
|
||||
testScript = # py
|
||||
''
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
# Verify both services start successfully
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
machine.wait_for_unit("firewall.service")
|
||||
machine.wait_for_unit("reaction.service")
|
||||
|
||||
# Check reaction chain exists in iptables
|
||||
output = machine.succeed("iptables -w -L -n")
|
||||
assert "reaction" in output, "reaction chain not found in iptables"
|
||||
def check_reaction_in_iptables(context = ""):
|
||||
with subtest("check reaction chain exists"):
|
||||
machine.sleep(3)
|
||||
output = machine.succeed("iptables -nvL")
|
||||
assert "reaction" in output, f"error: reaction chain missing in iptables, {context}"
|
||||
|
||||
# Reload firewall and verify there's no issues due to reaction chain
|
||||
machine.succeed("systemctl reload firewall")
|
||||
output = machine.succeed("journalctl -u reaction.service -u firewall.service --no-pager")
|
||||
assert "ERROR" not in output, "firewall reload failed due to reaction"
|
||||
check_reaction_in_iptables()
|
||||
|
||||
# Verify reaction chain still exists after reload
|
||||
output = machine.succeed("iptables -w -L -n")
|
||||
assert "reaction" in output, "reaction chain missing after firewall reload"
|
||||
with subtest("reload firewall"):
|
||||
machine.succeed("systemctl reload firewall")
|
||||
output = machine.succeed("journalctl -u firewall.service --no-pager")
|
||||
assert "ERROR" not in output, "firewall reload failed due to reaction"
|
||||
|
||||
# Restart firewall and verify reaction restarts as well
|
||||
machine.succeed("systemctl restart firewall")
|
||||
output = machine.succeed("journalctl -u reaction.service -u firewall.service --no-pager")
|
||||
assert "INFO stop command" in output and "INFO start command" in output, "reaction did not restart when firewall was restarted"
|
||||
check_reaction_in_iptables(context="after firewall reload")
|
||||
|
||||
output = machine.succeed("iptables -w -L -n")
|
||||
assert "reaction" in output, "reaction chain missing after firewall restart"
|
||||
with subtest("restart firewall"):
|
||||
machine.succeed("systemctl restart firewall")
|
||||
output = machine.succeed("journalctl -u reaction.service --no-pager")
|
||||
assert "INFO stop command" in output and "INFO start command" in output, "reaction did not restart when firewall was restarted"
|
||||
|
||||
# Stop reaction manually and verify chains are cleaned up
|
||||
machine.succeed("systemctl stop reaction")
|
||||
output = machine.succeed("iptables -w -L -n || true")
|
||||
assert "reaction" not in output, "reaction chain still exists after stop"
|
||||
check_reaction_in_iptables(context="after firewall restart")
|
||||
|
||||
# Start reaction again and verify it works
|
||||
machine.succeed("systemctl start reaction")
|
||||
machine.wait_for_unit("reaction.service")
|
||||
with subtest("stop reaction manually and verify chains are cleaned up"):
|
||||
machine.succeed("systemctl stop reaction")
|
||||
machine.sleep(3)
|
||||
output = machine.succeed("iptables -nvL")
|
||||
assert "reaction" not in output, "reaction chain still exists after the service was stopped"
|
||||
|
||||
output = machine.succeed("iptables -w -L -n")
|
||||
assert "reaction" in output, "reaction chain not recreated"
|
||||
with subtest("start reaction again and verify it works"):
|
||||
machine.succeed("systemctl start reaction")
|
||||
machine.wait_for_unit("reaction.service")
|
||||
|
||||
check_reaction_in_iptables()
|
||||
'';
|
||||
|
||||
# Debug interactively with:
|
||||
|
||||
@@ -10,18 +10,22 @@
|
||||
services.reaction = {
|
||||
enable = true;
|
||||
stopForFirewall = false;
|
||||
settingsFiles = [
|
||||
"${pkgs.reaction}/share/examples/example.jsonnet"
|
||||
# "${pkgs.reaction}/share/examples/example.yml" # can't specify both because conflicts
|
||||
];
|
||||
# example.jsonnet/example.yml can be copied and modified from ${pkgs.reaction}/share/examples
|
||||
settingsFiles = [ "${pkgs.reaction}/share/examples/example.jsonnet" ];
|
||||
runAsRoot = false;
|
||||
};
|
||||
services.openssh.enable = true;
|
||||
# If not running as root you need to give the reaction user and service the proper permissions
|
||||
|
||||
# required to access journal of sshd.service as runAsRoot = false
|
||||
# allows reading journal logs of processess
|
||||
users.users.reaction.extraGroups = [ "systemd-journal" ];
|
||||
# required for allowing reaction to modifiy firewall rules
|
||||
systemd.services.reaction.serviceConfig.AmbientCapabilities = [ "CAP_NET_ADMIN" ];
|
||||
|
||||
# allows modifying ip firewall rules
|
||||
systemd.services.reaction.unitConfig.ConditionCapability = "CAP_NET_ADMIN";
|
||||
systemd.services.reaction.serviceConfig = {
|
||||
CapabilityBoundingSet = [ "CAP_NET_ADMIN" ];
|
||||
AmbientCapabilities = [ "CAP_NET_ADMIN" ];
|
||||
};
|
||||
|
||||
users.users.nixos.isNormalUser = true; # neeeded to establish a ssh connection, by default root login is succeeding without any password
|
||||
};
|
||||
@@ -42,7 +46,6 @@
|
||||
server.wait_for_unit("multi-user.target")
|
||||
server.wait_for_unit("reaction")
|
||||
server.wait_for_unit("sshd")
|
||||
client.wait_for_unit("multi-user.target")
|
||||
|
||||
client_addr = "${(lib.head nodes.client.networking.interfaces.eth1.ipv4.addresses).address}"
|
||||
server_addr = "${(lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address}"
|
||||
|
||||
@@ -318,13 +318,13 @@
|
||||
"vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
|
||||
},
|
||||
"dnsimple_dnsimple": {
|
||||
"hash": "sha256-Zx4M0TKamyfm5Z5EAtiHWQQTNX/VT0EkAaHM7x/2SGk=",
|
||||
"hash": "sha256-zPvHTSmptdm5w28rpgmwrYBIo+0Y077wZ+FNKbKHaT4=",
|
||||
"homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple",
|
||||
"owner": "dnsimple",
|
||||
"repo": "terraform-provider-dnsimple",
|
||||
"rev": "v1.10.0",
|
||||
"rev": "v2.0.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-M6Z/wMOKhQncuHAhkSPfWT77b14lIZ/sVQT7DmM60FI="
|
||||
"vendorHash": "sha256-DRMbcAR+DDrxrg1jNgnoWUg+OjlKm7wkqgIN6Hhkp3U="
|
||||
},
|
||||
"dnsmadeeasy_dme": {
|
||||
"hash": "sha256-JH9YcM9Fvd1x0BJpLUZCm6a9hZZxySrkFVLP89FO3fU=",
|
||||
@@ -714,13 +714,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ibm-cloud_ibm": {
|
||||
"hash": "sha256-S1Azsq42GEqgpqVB3Wpi6EJAL8x+s+i+oTJFPQCVfeI=",
|
||||
"hash": "sha256-xiiQKp4ZBLAR1OM31D8UWJbaZ2SkzrBIr3uW3N3iSZg=",
|
||||
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
|
||||
"owner": "IBM-Cloud",
|
||||
"repo": "terraform-provider-ibm",
|
||||
"rev": "v1.86.0",
|
||||
"rev": "v1.86.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-IDv2L1fFqhbThc3kO6UNM+6hRJ+DZkT7voc/m3c5BCA="
|
||||
"vendorHash": "sha256-vHgeVhZV9JLH2vXwFUO0N8xp8BLBPk7ypK+kkWwtbTk="
|
||||
},
|
||||
"icinga_icinga2": {
|
||||
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
|
||||
@@ -1174,13 +1174,13 @@
|
||||
"vendorHash": "sha256-f3b4NULINH8XworCn46fiz4GmBM31ROdAJy1j4GKkx4="
|
||||
},
|
||||
"scaleway_scaleway": {
|
||||
"hash": "sha256-V0mR72RJa+DgWZxnvSCWI6HwZpqewbHT5FKLdSiwGw4=",
|
||||
"hash": "sha256-LR1e8gAF8htYpxfj/m/Ge266sFRFc8tijaE/9uKYYBw=",
|
||||
"homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
|
||||
"owner": "scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.64.0",
|
||||
"rev": "v2.65.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-Z9EKIWBkmKptQMJFRh5SK2hhKwh5z5Lij0ZwXChOarY="
|
||||
"vendorHash": "sha256-HWAaBgKD/viiFaxvyHE4BuWdsY0tCSQFaf8YJq4PS/0="
|
||||
},
|
||||
"scottwinkler_shell": {
|
||||
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
|
||||
|
||||
@@ -194,8 +194,8 @@ rec {
|
||||
mkTerraform = attrs: pluggable (generic attrs);
|
||||
|
||||
terraform_1 = mkTerraform {
|
||||
version = "1.14.2";
|
||||
hash = "sha256-gYJW31cDsfs/SLBE9InZP1ghG6gbat2pkrmHLIAZVDY=";
|
||||
version = "1.14.3";
|
||||
hash = "sha256-QPVKWtpm67z13hmPgM/YXm+CBOqiI8qZwttx2h6LboU=";
|
||||
vendorHash = "sha256-NDtBLa8vokrSRDCNX10lQyfMDzTrodoEj5zbDanL4bk=";
|
||||
patches = [ ./provider-path-0_15.patch ];
|
||||
passthru = {
|
||||
|
||||
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
|
||||
|
||||
# Use only versions specified in anytype-ts middleware.version file:
|
||||
# https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
|
||||
version = "0.44.5";
|
||||
version = "0.46.3";
|
||||
|
||||
# Update only together with 'anytype' package.
|
||||
# nixpkgs-update: no auto update
|
||||
@@ -34,10 +34,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-heart";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wSZcDcGPKbtUWf7hYXiQrS8a4sgnbItW7bu4hxQ2yFM=";
|
||||
hash = "sha256-g3YAi7T6E0o2xjCpmnwmKUugEKyziJIYRaPU4dQH9xw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T7CPD6mbxkN1x53oe9jsS2XMqluqWv8VPPd1pnXZvlc=";
|
||||
vendorHash = "sha256-s/otpfRwXFUOek8oVr5eUcKH4Vwd5BbtB0GH+hjzjwI=";
|
||||
|
||||
subPackages = [ "cmd/grpcserver" ];
|
||||
tags = [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
pkg-config,
|
||||
anytype-heart,
|
||||
libsecret,
|
||||
electron_37,
|
||||
electron,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
commandLineArgs ? "",
|
||||
@@ -14,23 +14,23 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "anytype";
|
||||
version = "0.50.5";
|
||||
version = "0.52.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "anytype-ts";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HLYYuMtgvF0UHHnThEWSpLIZEvLxNrOtkoXEhSAT24A=";
|
||||
hash = "sha256-4R0ROpMH49BrUcjd9Xcgs7wRo1flMg7kEsZS51uL5nE=";
|
||||
};
|
||||
|
||||
locales = fetchFromGitHub {
|
||||
owner = "anyproto";
|
||||
repo = "l10n-anytype-ts";
|
||||
rev = "aaa83aae39a7dbf59c3c8580be4700edf7481893";
|
||||
hash = "sha256-MOR7peovTYYQR96lOoxyETY0aOH6KcB9vXCqpXKxI/4=";
|
||||
rev = "910cbb5b05cc390e53205fe275768166c946c041";
|
||||
hash = "sha256-H6f/3paRKJd/GdZBJt0IHLbaGbbXpsbqjvDPu628JGE=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ohlHY7zw+GyaNuwI2t7dQj1bQkXH//LiyiHyi2B+/9I=";
|
||||
npmDepsHash = "sha256-k6iAWWbLmKSoqvWFyd//zlNy/LrdD77qlngL9QeP+nw=";
|
||||
|
||||
env = {
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
@@ -44,7 +44,7 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
npmFlags = [
|
||||
# keytar needs to be built against electron's ABI
|
||||
"--nodedir=${electron_37.headers}"
|
||||
"--nodedir=${electron.headers}"
|
||||
];
|
||||
|
||||
patches = [
|
||||
@@ -87,7 +87,7 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
cp LICENSE.md $out/share
|
||||
|
||||
makeWrapper '${lib.getExe electron_37}' $out/bin/anytype \
|
||||
makeWrapper '${lib.getExe electron}' $out/bin/anytype \
|
||||
--set-default ELECTRON_IS_DEV 0 \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--add-flags $out/lib/anytype/ \
|
||||
|
||||
@@ -431,6 +431,11 @@ stdenv.mkDerivation rec {
|
||||
sedVerbose $wrapper \
|
||||
-e "s,/usr/bin/xcrun install_name_tool,${cctools}/bin/install_name_tool,g"
|
||||
done
|
||||
|
||||
# set --macos_sdk_version to make utimensat visible:
|
||||
sedVerbose compile.sh \
|
||||
-e "/bazel_build /a\ --macos_sdk_version=${stdenv.hostPlatform.darwinMinVersion} \\\\" \
|
||||
|
||||
'';
|
||||
|
||||
genericPatches = ''
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "blackmagic-desktop-video";
|
||||
version = "15.3";
|
||||
version = "15.3.1";
|
||||
|
||||
buildInputs = [
|
||||
autoPatchelfHook
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
{
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-QcM/FTEYkG1Zteb2TNysQjP/mNS1B2Wa8rqkJ70m24s=";
|
||||
outputHash = "sha256-4Y7bmN08fZ9hRsyFKP4cfGb4fggLY9bdm32+UTIGiTs=";
|
||||
|
||||
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-desktop";
|
||||
version = "6.6.0";
|
||||
version = "6.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-desktop";
|
||||
tag = version;
|
||||
hash = "sha256-9qgt+E5qbzq+x9fJKkoSBFgA96HBDLysQvg6b04WbMU=";
|
||||
hash = "sha256-vBRaUXsPAPOpMEs2pl6AaaKIMeeXB0UdCb1hzYd43KY=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-screensaver";
|
||||
version = "6.6.0";
|
||||
version = "6.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon-screensaver";
|
||||
tag = version;
|
||||
hash = "sha256-Jo9GRsiPvqGZ2ITaewV5H4VMc5EotTTXIaqzXwDA+Z4=";
|
||||
hash = "sha256-NK33cIrcTicLs59eJ550FghjuWS93yD642ObAS55Dtk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -74,13 +74,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon";
|
||||
version = "6.6.0";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "cinnamon";
|
||||
tag = version;
|
||||
hash = "sha256-DiAc1Ng03xzNYYpf79g9p338syPScKftmviNw6Y5i5o=";
|
||||
hash = "sha256-evjXa42mo7wkLh5HDax+2Tsc/x/oG3tPHU1tczoxmJU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
|
||||
buildGraalvmNativeImage (finalAttrs: {
|
||||
pname = "clojure-lsp";
|
||||
version = "2025.08.25-14.21.46";
|
||||
version = "2025.11.28-12.47.43";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${finalAttrs.version}/clojure-lsp-standalone.jar";
|
||||
hash = "sha256-J89RHgxLJHSRQfbSLT0MhX7kDMsZEWjK8RGGIyx6dik=";
|
||||
hash = "sha256-An7sTudpP2Ct32sYShNhgRsHgJJIN9H+sR5MlQ8i+7o=";
|
||||
};
|
||||
|
||||
extraNativeImageBuildArgs = [
|
||||
|
||||
@@ -1,40 +1,40 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.7)
|
||||
base64
|
||||
nkf
|
||||
rexml
|
||||
CFPropertyList (3.0.8)
|
||||
abbrev (0.1.2)
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
addressable (2.8.8)
|
||||
public_suffix (>= 2.0.2, < 8.0)
|
||||
artifactory (3.0.17)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.3.2)
|
||||
aws-partitions (1.1106.0)
|
||||
aws-sdk-core (3.224.0)
|
||||
aws-eventstream (1.4.0)
|
||||
aws-partitions (1.1194.0)
|
||||
aws-sdk-core (3.239.2)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.992.0)
|
||||
aws-sigv4 (~> 1.9)
|
||||
base64
|
||||
bigdecimal
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
logger
|
||||
aws-sdk-kms (1.101.0)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sdk-kms (1.118.0)
|
||||
aws-sdk-core (~> 3, >= 3.239.1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sdk-s3 (1.186.1)
|
||||
aws-sdk-core (~> 3, >= 3.216.0)
|
||||
aws-sdk-s3 (1.206.0)
|
||||
aws-sdk-core (~> 3, >= 3.234.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.5)
|
||||
aws-sigv4 (1.11.0)
|
||||
aws-sigv4 (1.12.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
base64 (0.2.0)
|
||||
bigdecimal (3.3.1)
|
||||
claide (1.1.0)
|
||||
colored (1.2)
|
||||
colored2 (3.1.2)
|
||||
commander (4.6.0)
|
||||
highline (~> 2.0.0)
|
||||
csv (3.3.5)
|
||||
declarative (0.0.20)
|
||||
digest-crc (0.7.0)
|
||||
rake (>= 12.0.0, < 14.0.0)
|
||||
@@ -54,14 +54,14 @@ GEM
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-cookie_jar (0.0.7)
|
||||
faraday-cookie_jar (0.0.8)
|
||||
faraday (>= 0.8.0)
|
||||
http-cookie (~> 1.0.0)
|
||||
http-cookie (>= 1.0.0)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-em_synchrony (1.0.1)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.1.0)
|
||||
faraday-multipart (1.1.1)
|
||||
multipart-post (~> 2.0)
|
||||
faraday-net_http (1.0.2)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
@@ -71,15 +71,18 @@ GEM
|
||||
faraday_middleware (1.2.1)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.4.0)
|
||||
fastlane (2.227.2)
|
||||
fastlane (2.229.1)
|
||||
CFPropertyList (>= 2.3, < 4.0.0)
|
||||
abbrev (~> 0.1.2)
|
||||
addressable (>= 2.8, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
aws-sdk-s3 (~> 1.0)
|
||||
babosa (>= 1.0.3, < 2.0.0)
|
||||
base64 (~> 0.2.0)
|
||||
bundler (>= 1.12.0, < 3.0.0)
|
||||
colored (~> 1.2)
|
||||
commander (~> 4.6)
|
||||
csv (~> 3.3)
|
||||
dotenv (>= 2.1.1, < 3.0.0)
|
||||
emoji_regex (>= 0.1, < 4.0)
|
||||
excon (>= 0.71.0, < 1.0.0)
|
||||
@@ -99,7 +102,9 @@ GEM
|
||||
jwt (>= 2.1.0, < 3)
|
||||
mini_magick (>= 4.9.4, < 5.0.0)
|
||||
multipart-post (>= 2.0.0, < 3.0.0)
|
||||
mutex_m (~> 0.3.0)
|
||||
naturally (~> 2.2)
|
||||
nkf (~> 0.2.0)
|
||||
optparse (>= 0.1.1, < 1.0.0)
|
||||
plist (>= 3.1.0, < 4.0.0)
|
||||
rubyzip (>= 2.0.0, < 3.0.0)
|
||||
@@ -158,37 +163,37 @@ GEM
|
||||
httpclient (2.9.0)
|
||||
mutex_m
|
||||
jmespath (1.6.2)
|
||||
json (2.12.1)
|
||||
jwt (2.10.1)
|
||||
json (2.18.0)
|
||||
jwt (2.10.2)
|
||||
base64
|
||||
logger (1.7.0)
|
||||
mini_magick (4.13.2)
|
||||
mini_mime (1.1.5)
|
||||
multi_json (1.15.0)
|
||||
multi_json (1.18.0)
|
||||
multipart-post (2.4.1)
|
||||
mutex_m (0.3.0)
|
||||
nanaimo (0.4.0)
|
||||
naturally (2.2.1)
|
||||
naturally (2.3.0)
|
||||
nkf (0.2.0)
|
||||
optparse (0.6.0)
|
||||
optparse (0.8.1)
|
||||
os (1.1.4)
|
||||
plist (3.7.2)
|
||||
public_suffix (6.0.2)
|
||||
rake (13.2.1)
|
||||
public_suffix (7.0.0)
|
||||
rake (13.3.1)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.1.2)
|
||||
rexml (3.4.1)
|
||||
rexml (3.4.4)
|
||||
rouge (3.28.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyzip (2.4.1)
|
||||
security (0.1.5)
|
||||
signet (0.20.0)
|
||||
signet (0.21.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.5, < 3.a)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
jwt (>= 1.5, < 4.0)
|
||||
multi_json (~> 1.10)
|
||||
simctl (1.6.10)
|
||||
CFPropertyList
|
||||
@@ -225,4 +230,4 @@ DEPENDENCIES
|
||||
fastlane
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.6
|
||||
2.7.2
|
||||
|
||||
@@ -15,10 +15,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
|
||||
sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.7";
|
||||
version = "2.8.8";
|
||||
};
|
||||
artifactory = {
|
||||
groups = [ "default" ];
|
||||
@@ -45,20 +45,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y";
|
||||
sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
};
|
||||
aws-partitions = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "12svi07s5hss8wq9xpaxwy1ibl64bd00hsn12v810wvz19fw823l";
|
||||
sha256 = "04887dhff1nw3pwrfxmqwl0mwd1dzmxfdvjgn6f6n9pl6mbwdinw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1106.0";
|
||||
version = "1.1194.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
dependencies = [
|
||||
@@ -66,6 +66,7 @@
|
||||
"aws-partitions"
|
||||
"aws-sigv4"
|
||||
"base64"
|
||||
"bigdecimal"
|
||||
"jmespath"
|
||||
"logger"
|
||||
];
|
||||
@@ -73,10 +74,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1b0pi1iibp644dn78g53s7hs7gcxghfa7h8rz3lvz8ivykisl5y6";
|
||||
sha256 = "0fgjki9wja72m5ip1dq5zx8msn1sdw9qid4z7wd0dnqbxr2ii056";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.224.0";
|
||||
version = "3.239.2";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
dependencies = [
|
||||
@@ -87,10 +88,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1mv8jc8sbvim2m3y3zxm8z4i5sh4x9ds7y9h5z04qfg7kjvbbn24";
|
||||
sha256 = "1gbgf7xgg2hrrc51g3mpf0isba801w0r0z45mjnh45agdmcm3iy9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.101.0";
|
||||
version = "1.118.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
dependencies = [
|
||||
@@ -102,10 +103,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "00sq22mfibxq3rjy9c4vj1s8yjszv8988di7z7rs8v62my53nw2v";
|
||||
sha256 = "1v9as5bvkxk5nqfbchram8v7rsimnpp0v8wxcp20bwdw3dlf9yc5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.186.1";
|
||||
version = "1.206.0";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
dependencies = [ "aws-eventstream" ];
|
||||
@@ -113,10 +114,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h";
|
||||
sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.0";
|
||||
version = "1.12.1";
|
||||
};
|
||||
babosa = {
|
||||
groups = [ "default" ];
|
||||
@@ -138,20 +139,25 @@
|
||||
};
|
||||
version = "0.2.0";
|
||||
};
|
||||
CFPropertyList = {
|
||||
dependencies = [
|
||||
"base64"
|
||||
"nkf"
|
||||
"rexml"
|
||||
];
|
||||
bigdecimal = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4";
|
||||
sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.7";
|
||||
version = "3.3.1";
|
||||
};
|
||||
CFPropertyList = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0qa226xndfs9r6c7qj7zs6yhzrcbmicvvxsjn9x3svakh3cx169c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.8";
|
||||
};
|
||||
claide = {
|
||||
groups = [ "default" ];
|
||||
@@ -194,6 +200,16 @@
|
||||
};
|
||||
version = "4.6.0";
|
||||
};
|
||||
csv = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.5";
|
||||
};
|
||||
declarative = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
@@ -287,10 +303,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk";
|
||||
sha256 = "1fwx5720g33w3zycyq636m4fbn5fd94fxk4g0b3n7k7q4dc60h01";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
};
|
||||
faraday-em_http = {
|
||||
groups = [ "default" ];
|
||||
@@ -307,10 +323,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
|
||||
sha256 = "0l0pz1wk2mk6p6hbfd86jfad59jyk201y1db379qhc2lrxfy8g5z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
};
|
||||
faraday-excon = {
|
||||
groups = [ "default" ];
|
||||
@@ -338,10 +354,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0l87r9jg06nsh24gwwd1jdnxb1zq89ffybnxab0dd90nfcf0ysw5";
|
||||
sha256 = "00w9imp55hi81q0wsgwak90ldkk7gbyb8nzmmv8hy0s907s8z8bp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = [ "default" ];
|
||||
@@ -417,12 +433,15 @@
|
||||
fastlane = {
|
||||
dependencies = [
|
||||
"CFPropertyList"
|
||||
"abbrev"
|
||||
"addressable"
|
||||
"artifactory"
|
||||
"aws-sdk-s3"
|
||||
"babosa"
|
||||
"base64"
|
||||
"colored"
|
||||
"commander"
|
||||
"csv"
|
||||
"dotenv"
|
||||
"emoji_regex"
|
||||
"excon"
|
||||
@@ -442,7 +461,9 @@
|
||||
"jwt"
|
||||
"mini_magick"
|
||||
"multipart-post"
|
||||
"mutex_m"
|
||||
"naturally"
|
||||
"nkf"
|
||||
"optparse"
|
||||
"plist"
|
||||
"rubyzip"
|
||||
@@ -461,10 +482,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1dw9smmpzhlca2zzp2pgmr2slhwnz8926s5rnjfjrclilz33p22z";
|
||||
sha256 = "08q875hq41yvw44n55lsjz41pfawys85c4ws9swg5jwx7hf8rv3z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.227.2";
|
||||
version = "2.229.1";
|
||||
};
|
||||
fastlane-sirp = {
|
||||
dependencies = [ "sysrandom" ];
|
||||
@@ -668,10 +689,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0fr0dxwn5a7z5m3i16v66pc35wmwc6mgj9f8dg7ch2bwq42y73zw";
|
||||
sha256 = "01fmiz052cvnxgdnhb3qwcy88xbv7l3liz0fkvs5qgqqwjp0c1di";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.12.1";
|
||||
version = "2.18.0";
|
||||
};
|
||||
jwt = {
|
||||
dependencies = [ "base64" ];
|
||||
@@ -679,10 +700,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6";
|
||||
sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
};
|
||||
logger = {
|
||||
groups = [ "default" ];
|
||||
@@ -719,10 +740,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
|
||||
sha256 = "0vsrfm36zlg7jbrd1fjbr8kmdvr8bfayrw0hdlza75987vvhrxr3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.0";
|
||||
version = "1.18.0";
|
||||
};
|
||||
multipart-post = {
|
||||
groups = [ "default" ];
|
||||
@@ -759,10 +780,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59";
|
||||
sha256 = "00cy2wg40rsasnbl0cjcj3jcghq068v445rh90q63rn2fv7j76a5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
};
|
||||
nkf = {
|
||||
groups = [ "default" ];
|
||||
@@ -779,10 +800,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1306kdvq0xr333xma4452zvvvw6mx7fw20fwi6508i6dq5lh9s95";
|
||||
sha256 = "06mx0g76bqwyrv8hxdikhyziyq8x8j8rk9l0y3scyz4hac6s3gj2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.0";
|
||||
version = "0.8.1";
|
||||
};
|
||||
os = {
|
||||
groups = [ "default" ];
|
||||
@@ -809,20 +830,20 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
|
||||
sha256 = "15dhl6k4gbax0xz8frfs4nsb6lg5zgax9vkr1pqzjmhfxddhn2gp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.2";
|
||||
version = "7.0.0";
|
||||
};
|
||||
rake = {
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
|
||||
sha256 = "175iisqb211n0qbfyqd8jz2g01q6xj038zjf4q0nm8k6kz88k7lc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "13.2.1";
|
||||
version = "13.3.1";
|
||||
};
|
||||
representable = {
|
||||
dependencies = [
|
||||
@@ -854,10 +875,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7";
|
||||
sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.1";
|
||||
version = "3.4.4";
|
||||
};
|
||||
rouge = {
|
||||
groups = [ "default" ];
|
||||
@@ -910,10 +931,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "18s7xiclzajp9w9cmq8k28iy5ig1zpx1zv1mrm416cb2c0m0wrmw";
|
||||
sha256 = "0nydm087m5c3j85gvzvz30w1qb9pl2lzpznw746jha29ybxyj5yn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
};
|
||||
simctl = {
|
||||
dependencies = [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "gate";
|
||||
version = "0.61.0";
|
||||
version = "0.62.0";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
@@ -15,7 +15,7 @@ buildGoModule {
|
||||
owner = "minekube";
|
||||
repo = "gate";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HCxsydmCjhbL2hiZ4EEjsODXKWoAv2Azi/HvUU6aOIg=";
|
||||
hash = "sha256-8zvHC6Ghf2IziCLYTxGe/z3u6li37EBOb5AK2gGhoUQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-f7SkECS80Lwkd0xSzHq+x05ZBjBYKXsA4rPidyIAYak=";
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goa";
|
||||
version = "3.23.2";
|
||||
version = "3.23.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goadesign";
|
||||
repo = "goa";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8AcpYTc909MyQYJBArHypMOefNcj1DaJcM2w4NpmcLI=";
|
||||
hash = "sha256-7+hOXJU2a39ytn08FlR/YAhOnAmVL5JxdcvF1AlOxHk=";
|
||||
};
|
||||
vendorHash = "sha256-2H5VtNZiOnx1gFSVaBu7q4HTeLhBbIDK01fixBB66M4=";
|
||||
vendorHash = "sha256-VSjiEgkjLMFRThNI4G7O91wpF8CYaIVYOrtE49S/o3w=";
|
||||
|
||||
subPackages = [ "cmd/goa" ];
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "greenmask";
|
||||
version = "0.2.14";
|
||||
version = "0.2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GreenmaskIO";
|
||||
repo = "greenmask";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AHZJWYHfUKYNXPP6vFIM5tdr5aQ8q2pkqB/M1lhxUic=";
|
||||
hash = "sha256-/At0boolTyge4VNy1EDpK09Yo7hLAdq6SvCbyBTKGbw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t2U65GAGBGdMRXPTkCQCuXfLuqohA6erTlvAN/xx/ek=";
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "lctime";
|
||||
version = "0.0.26";
|
||||
version = "0.0.27";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitea {
|
||||
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "librecell";
|
||||
repo = "lctime";
|
||||
tag = version;
|
||||
hash = "sha256-oNmeV8r1dtO2y27jAJnlx4mKGjhzL07ad2yBdOLwgF0=";
|
||||
hash = "sha256-KKZhsKNTr+J5+rLUdlwGMsUCa6NYY1X9yaujPe1c0Do=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@@ -30,7 +30,6 @@ python3Packages.buildPythonApplication rec {
|
||||
joblib
|
||||
klayout
|
||||
liberty-parser
|
||||
matplotlib
|
||||
networkx
|
||||
numpy
|
||||
pyspice
|
||||
@@ -38,6 +37,8 @@ python3Packages.buildPythonApplication rec {
|
||||
sympy
|
||||
];
|
||||
|
||||
optional-dependencies.debug = with python3Packages; [ matplotlib ];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
ngspice
|
||||
|
||||
@@ -55,6 +55,7 @@ mkDerivation rec {
|
||||
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
"CROSS_PREFIX=${stdenv.cc.targetPrefix}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
source 'https://rubygems.org'
|
||||
gem 'maid', '~> 0.10.0'
|
||||
gem 'maid', '~> 0.11.2'
|
||||
gem 'rake'
|
||||
|
||||
@@ -21,7 +21,7 @@ GEM
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
logger (1.7.0)
|
||||
maid (0.10.0)
|
||||
maid (0.11.2)
|
||||
deprecated (~> 3.0.0)
|
||||
dimensions (>= 1.0.0, < 2.0)
|
||||
escape (>= 0.0.1, < 0.1.0)
|
||||
@@ -31,7 +31,7 @@ GEM
|
||||
mime-types (~> 3.0, < 4.0)
|
||||
rubyzip (~> 2.3.2)
|
||||
rufus-scheduler (~> 3.8.2)
|
||||
thor (~> 1.2.1)
|
||||
thor (~> 1.4.0)
|
||||
xdg (~> 2.2.3)
|
||||
mime-types (3.7.0)
|
||||
logger
|
||||
@@ -45,7 +45,7 @@ GEM
|
||||
rubyzip (2.3.2)
|
||||
rufus-scheduler (3.8.2)
|
||||
fugit (~> 1.1, >= 1.1.6)
|
||||
thor (1.2.2)
|
||||
thor (1.4.0)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
xdg (2.2.5)
|
||||
@@ -54,8 +54,8 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
maid (~> 0.10.0)
|
||||
maid (~> 0.11.2)
|
||||
rake
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.6
|
||||
2.7.2
|
||||
|
||||
@@ -160,10 +160,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0v1lhwgxyli10rinw6h33ikhskx9j3b20h7plrx8c69z05sfsdd9";
|
||||
sha256 = "154rhbdplhrirxpli2jwwsmzcrk8vj51cn6zh8r7lp97vlrkybgp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.0";
|
||||
version = "0.11.2";
|
||||
};
|
||||
mime-types = {
|
||||
dependencies = [
|
||||
@@ -256,10 +256,10 @@
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg";
|
||||
sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.2";
|
||||
version = "1.4.0";
|
||||
};
|
||||
tzinfo = {
|
||||
dependencies = [ "concurrent-ruby" ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdbook-toc";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badboy";
|
||||
repo = "mdbook-toc";
|
||||
tag = version;
|
||||
sha256 = "sha256-FPbZH8cEYQ9wbSm6jA5/uiX8Wgx/FyuIJ/gPgSKUhBA=";
|
||||
sha256 = "sha256-gzwsPRhsAQTraiK/N5dKEj8NTpV/mYmECpS4KVl4Ql8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-haHJkyYAc4+ODJNEWiXzbl1xbJ7pyrtnPX/+ubjvX44=";
|
||||
cargoHash = "sha256-+YvEptJlNjomIsyS7cNImwYa1SxawY05e5vq9VmrktA=";
|
||||
|
||||
meta = {
|
||||
description = "Preprocessor for mdbook to add inline Table of Contents support";
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mint-l-theme";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "mint-l-theme";
|
||||
rev = version;
|
||||
hash = "sha256-RdcojX+8SQDJ9LPb81iMzdoCZBpoypf/+aQcgotnVGE=";
|
||||
hash = "sha256-jrNVeeqOBDf77Lz68qyjHllA4C3PQRySYQH7Sva2UHU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "mint-themes";
|
||||
version = "2.3.4";
|
||||
version = "2.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "mint-themes";
|
||||
rev = version;
|
||||
hash = "sha256-A4k9iy0d9pGPSYa4m3tAv2GKhFuJPrQODbv+LcP/YXU=";
|
||||
hash = "sha256-folnnA4By1Dd1amriGiTl5mOxpcnaFjdp/UsjacE8GA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
cinnamon-desktop,
|
||||
xapp,
|
||||
xapp-symbolic-icons,
|
||||
xdg-user-dirs,
|
||||
libexif,
|
||||
json-glib,
|
||||
exempi,
|
||||
@@ -36,13 +37,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nemo";
|
||||
version = "6.6.1";
|
||||
version = "6.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "nemo";
|
||||
rev = version;
|
||||
hash = "sha256-oJvGuPm6FOknSe+5TDLNf0eoE3xC+i78SkYdJUBY4PU=";
|
||||
hash = "sha256-5jgD2C71sQkqnAGsnsjK8W9qaLtNtGeYLXsV2+7u2jU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -95,13 +96,19 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : ${
|
||||
--prefix XDG_DATA_DIRS : "${
|
||||
lib.makeSearchPath "share" [
|
||||
# For non-fd.o icons.
|
||||
xapp
|
||||
xapp-symbolic-icons
|
||||
]
|
||||
}
|
||||
}"
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
# For xdg-user-dirs-update.
|
||||
xdg-user-dirs
|
||||
]
|
||||
}"
|
||||
)
|
||||
'';
|
||||
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}";
|
||||
pname = "NetworkManager-l2tp";
|
||||
version = "1.20.20";
|
||||
version = "1.20.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nm-l2tp";
|
||||
repo = "network-manager-l2tp";
|
||||
rev = version;
|
||||
hash = "sha256-AmbDWBCUG9fvqA6iJopYtbitdRwv2faWvIeKN90p234=";
|
||||
hash = "sha256-TuYLNjogR3psb1B9zonHzRQext0ROS4ueD2WcWkseJk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
|
||||
index bb58d13..c1046f8 100644
|
||||
--- a/src-tauri/tauri.conf.json
|
||||
+++ b/src-tauri/tauri.conf.json
|
||||
@@ -100,7 +100,7 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
- "active": true,
|
||||
+ "active": false,
|
||||
"targets": ["app", "dmg", "deb", "appimage", "nsis"],
|
||||
"icon": [
|
||||
"icons/32x32.png",
|
||||
@@ -109,7 +109,7 @@
|
||||
"icons/icon.icns",
|
||||
"icons/icon.ico"
|
||||
],
|
||||
- "createUpdaterArtifacts": true,
|
||||
+ "createUpdaterArtifacts": false,
|
||||
"fileAssociations": [
|
||||
{
|
||||
"ext": ["noriskpack"],
|
||||
@@ -0,0 +1,34 @@
|
||||
diff --git a/src-tauri/src/minecraft/downloads/java_download.rs b/src-tauri/src/minecraft/downloads/java_download.rs
|
||||
index 25ab9b2..d1af896 100644
|
||||
--- a/src-tauri/src/minecraft/downloads/java_download.rs
|
||||
+++ b/src-tauri/src/minecraft/downloads/java_download.rs
|
||||
@@ -9,6 +9,7 @@ use flate2::read::GzDecoder;
|
||||
use futures::future::try_join_all;
|
||||
use log::{debug, error, info};
|
||||
use reqwest;
|
||||
+use std::env;
|
||||
use std::fs::File;
|
||||
use std::io::Cursor;
|
||||
use std::path::PathBuf;
|
||||
@@ -526,6 +527,21 @@ impl JavaDownloadService {
|
||||
],
|
||||
};
|
||||
|
||||
+ let target = format!("openjdk-{}", version);
|
||||
+ match env::var_os("PATH") {
|
||||
+ Some(paths) => {
|
||||
+ for path in env::split_paths(&paths) {
|
||||
+ if let Some(path_str) = path.to_str() {
|
||||
+ if path_str.contains(&target) {
|
||||
+ debug!("Found Java binary at: {:?}", path);
|
||||
+ return Ok(path)
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ none => debug!("PATH is not defined"),
|
||||
+ }
|
||||
+
|
||||
// Try all possible paths
|
||||
for java_binary in java_binary_paths {
|
||||
debug!("Checking for Java binary at: {:?}", java_binary);
|
||||
@@ -0,0 +1,92 @@
|
||||
{
|
||||
cargo-tauri,
|
||||
desktop-file-utils,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
glib,
|
||||
gtk3,
|
||||
libayatana-appindicator,
|
||||
lib,
|
||||
nix-update-script,
|
||||
nodejs,
|
||||
openssl,
|
||||
pkg-config,
|
||||
rustPlatform,
|
||||
webkitgtk_4_1,
|
||||
yarnConfigHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "noriskclient-launcher-unwrapped";
|
||||
version = "0.6.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NoRiskClient";
|
||||
repo = "noriskclient-launcher";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9UUNIS8r/695maQ2j2+Wj2L5qy55Wfs/MNhKJnwC6GI=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-IWgP4VEyEBNsxALKGMpk8WZCIc76qcEu5K+kYqsdYkQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# The tauri.conf.json is configured to build multiple apps. We don't want that here.
|
||||
./disable-bundling.patch
|
||||
|
||||
# Make the launcher find java from PATH, instead of downloading its own, which is not going to work on NixOS.
|
||||
./java-from-path.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
|
||||
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-heSUEW7r9Lt26Fu68Jo/7BHW6Qmp8GrRSavukCS+ySk=";
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
desktop-file-utils
|
||||
nodejs
|
||||
pkg-config
|
||||
yarnConfigHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libayatana-appindicator
|
||||
openssl
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
desktop-file-edit \
|
||||
--set-name "NoRiskClient Launcher" \
|
||||
--set-comment "Launcher for NoRiskClient" \
|
||||
--set-key="Categories" --set-value="Game" \
|
||||
--set-key="Keywords" --set-value="nrc;minecraft;mc;" \
|
||||
$out/share/applications/NoRisk\ Launcher.desktop
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Minecraft Launcher for NoRisk Client";
|
||||
homepage = "https://norisk.gg";
|
||||
license = lib.licenses.gpl3Only;
|
||||
longDescription = ''
|
||||
An easy way to launch the NoRisk Client, create modpacks,
|
||||
manage content for Minecraft, and much more - written in tauri.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ hythera ];
|
||||
mainProgram = "noriskclient-launcher-v3";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,101 @@
|
||||
{
|
||||
addDriverRunpath,
|
||||
alsa-lib,
|
||||
flite,
|
||||
glib,
|
||||
glib-networking,
|
||||
gsettings-desktop-schemas,
|
||||
jdk17,
|
||||
jdk21,
|
||||
jdk8,
|
||||
jdks ? [
|
||||
jdk8
|
||||
jdk17
|
||||
jdk21
|
||||
],
|
||||
lib,
|
||||
libGL,
|
||||
libjack2,
|
||||
libpulseaudio,
|
||||
libX11,
|
||||
libXcursor,
|
||||
libXext,
|
||||
libXrandr,
|
||||
libXxf86vm,
|
||||
noriskclient-launcher-unwrapped,
|
||||
pipewire,
|
||||
stdenv,
|
||||
symlinkJoin,
|
||||
udev,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
symlinkJoin {
|
||||
pname = "noriskclient-launcher";
|
||||
inherit (noriskclient-launcher-unwrapped) version;
|
||||
|
||||
paths = [ noriskclient-launcher-unwrapped ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
glib
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib-networking
|
||||
gsettings-desktop-schemas
|
||||
];
|
||||
|
||||
runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (
|
||||
lib.makeLibraryPath [
|
||||
addDriverRunpath.driverLink
|
||||
|
||||
# glfw
|
||||
libGL
|
||||
libX11
|
||||
libXcursor
|
||||
libXext
|
||||
libXrandr
|
||||
libXxf86vm
|
||||
|
||||
# narrator support
|
||||
flite
|
||||
|
||||
# openal
|
||||
alsa-lib
|
||||
libjack2
|
||||
libpulseaudio
|
||||
pipewire
|
||||
|
||||
# oshi
|
||||
udev
|
||||
]
|
||||
);
|
||||
|
||||
postBuild = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : ${lib.makeSearchPath "bin/java" jdks}
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
--set LD_LIBRARY_PATH $runtimeDependencies
|
||||
''}
|
||||
)
|
||||
|
||||
glibPostInstallHook
|
||||
gappsWrapperArgsHook
|
||||
wrapGAppsHook
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (noriskclient-launcher-unwrapped.meta)
|
||||
description
|
||||
homepage
|
||||
license
|
||||
longDescription
|
||||
maintainers
|
||||
mainProgram
|
||||
platforms
|
||||
;
|
||||
};
|
||||
}
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "penelope";
|
||||
version = "0.14.8";
|
||||
version = "0.14.14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brightio";
|
||||
repo = "penelope";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-m4EYP1lKte8r9Xa/xAuv6aiwMNha+B8HXUCizH0JgmI=";
|
||||
hash = "sha256-rSZkktq/XtlDV/bHC7ad4uhOzT3cnCxrHX7NH1t9cO0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -143,6 +143,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
"lua::remote_hook"
|
||||
# error message differs
|
||||
"run_in_non_git_repo"
|
||||
# depends on locale
|
||||
"init_nonexistent_repo"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
rainfrog,
|
||||
}:
|
||||
let
|
||||
version = "0.3.10";
|
||||
version = "0.3.11";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit version;
|
||||
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "achristmascarl";
|
||||
repo = "rainfrog";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Up/ZjIppQ3EYceSzY8DBV3lK8fd+sylm2Jl7lvO4VdY=";
|
||||
hash = "sha256-NzXVC2frFcExZZEdzIzy6VUPwzd2Xa/xoCPSAaKBHsg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-PzBvshoVxa4FaSygDPTR0+EuzfmQBkdb64jOWOpAgYY=";
|
||||
cargoHash = "sha256-ZKobMGiBWzj7YQiXfdtja+BN+skjj5wBERHUMYz4H44=";
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
|
||||
@@ -174,6 +174,10 @@ buildDotnetModule rec {
|
||||
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
mv $out/bin/Renode $out/bin/renode
|
||||
'';
|
||||
|
||||
executables = [ "Renode" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
buildNpmPackage,
|
||||
copyDesktopItems,
|
||||
electron,
|
||||
electron_37,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
makeDesktopItem,
|
||||
@@ -11,16 +11,18 @@
|
||||
rsync,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
let
|
||||
electron = electron_37;
|
||||
in
|
||||
buildNpmPackage rec {
|
||||
pname = "super-productivity";
|
||||
version = "16.5.0";
|
||||
version = "16.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johannesjo";
|
||||
repo = "super-productivity";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FBquRpn+g5wOwvM62MqL7RZ41LXer0CskVN5+5mD9kM=";
|
||||
hash = "sha256-0V68wkkuyOFcv4Wl2Kqk4Soa/nOB7CizelYyI0TKU+8=";
|
||||
|
||||
postFetch = ''
|
||||
find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
|
||||
@@ -63,7 +65,7 @@ buildNpmPackage rec {
|
||||
dontInstall = true;
|
||||
|
||||
outputHashMode = "recursive";
|
||||
hash = "sha256-r0xlODXi4+C+Aat3e3goMIBvBordes/KVlsBG696ZWs=";
|
||||
hash = "sha256-gsGzwwzt54Ww9CyHaHVAM4v1mHM2vQePw5vM8x1EGao=";
|
||||
}
|
||||
);
|
||||
|
||||
@@ -168,6 +170,7 @@ buildNpmPackage rec {
|
||||
maintainers = with lib.maintainers; [
|
||||
offline
|
||||
pineapplehunter
|
||||
tebriel
|
||||
];
|
||||
mainProgram = "super-productivity";
|
||||
};
|
||||
|
||||
@@ -99,6 +99,9 @@ stdenv.mkDerivation rec {
|
||||
sed -i 's/^\(calcnewt\$(EXEEXT):\).*/\1/g' timidity/Makefile
|
||||
'';
|
||||
|
||||
# Fix build with gcc15
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu17";
|
||||
|
||||
# the instruments could be compressed (?)
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/timidity/;
|
||||
|
||||
@@ -26,16 +26,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "vector";
|
||||
version = "0.51.1";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vectordotdev";
|
||||
repo = "vector";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-EjG8FFz4PDAgCPTkHAxJieW+t6RAPx3MTSku8QGXjYg=";
|
||||
hash = "sha256-jwEJ+myovZYcohvxH1VvvOW8xok3HSLvhtMsLC2M3KY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-17hmdom7ZZQQ4vYte3IKZnqlLEv7D7LY6tyWqdeuUHk=";
|
||||
cargoHash = "sha256-EfgDL5asygFqr8pVcTR9BsYU3fcG28xhrCn5nCkVfcA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "volanta";
|
||||
version = "1.14.3";
|
||||
build = "4881d864";
|
||||
version = "1.15.0";
|
||||
build = "1240645b";
|
||||
src = fetchurl {
|
||||
url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage";
|
||||
hash = "sha256-Rn/0GQSUbp7sG0EG9LlBLgaBRR+vP+C1TVpGnsi8QpY=";
|
||||
hash = "sha256-6QF9o5BFeGZBjpusFMYrWlnYhAdItfxg+gS0Xf2q7io=";
|
||||
};
|
||||
appImageContents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "watchgha";
|
||||
version = "2.4.2";
|
||||
version = "2.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "watchgha";
|
||||
hash = "sha256-RtmCC+twOk+viWY7WTbTzuxHTM3MOww+sRuEvlemCcI=";
|
||||
hash = "sha256-jjQk/X9kd8qhqgvivSIsvg0BOp6zh6yqpPiAS6ak/Ps=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -30,14 +30,14 @@ let
|
||||
# https://dldir1.qq.com/weixin/mac/mac-release.xml
|
||||
any-darwin =
|
||||
let
|
||||
version = "4.1.5.26-32281";
|
||||
version = "4.1.6.11-33044";
|
||||
version' = lib.replaceString "-" "_" version;
|
||||
in
|
||||
{
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
|
||||
hash = "sha256-hiq6L51w0ToQrmB0Lq3HrcMdwrPpVIy+ePMP899JRfg=";
|
||||
hash = "sha256-A9K5NvBaQev0PXPlwbGmS6nMhbDNI5S+NMhYHaLhcLo=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zap";
|
||||
version = "2.16.1";
|
||||
version = "2.17.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zaproxy/zaproxy/releases/download/v${finalAttrs.version}/ZAP_${finalAttrs.version}_Linux.tar.gz";
|
||||
hash = "sha256-Wy64MZsIUSGm6K1Q1p1n2++MhnFm9xqTe/yIjSR6KsE=";
|
||||
hash = "sha256-7+eZqqNifbaDtD8AycIQrqC3XADMjwoPBDTRK7Pd3lo=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zwave-js-ui";
|
||||
version = "11.8.2";
|
||||
version = "11.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zwave-js";
|
||||
repo = "zwave-js-ui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-OXvdj8DzaVK+5YmFh56FToB43OOOh7+7JZvmW7IQkKE=";
|
||||
hash = "sha256-rUrpmjmcVfWY4Z6d7MvLKTxaog3NH5ieEbxVvma2ALI=";
|
||||
};
|
||||
npmDepsHash = "sha256-388Iu0rDFNIk3FUy2/TySejgR6sFWc/9BP19KEmfQKk=";
|
||||
npmDepsHash = "sha256-Q7FjXLMl14caowfofShhm5It7cCMxI255ahXebsG8u0=";
|
||||
|
||||
passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
diff --git a/rpython/translator/platform/darwin.py b/rpython/translator/platform/darwin.py
|
||||
index 8c824a8459..f407fb6c07 100644
|
||||
--- a/rpython/translator/platform/darwin.py
|
||||
+++ b/rpython/translator/platform/darwin.py
|
||||
@@ -26,12 +26,12 @@ class Darwin(posix.BasePosix):
|
||||
standalone_only = ('-mdynamic-no-pic',)
|
||||
shared_only = ()
|
||||
|
||||
- link_flags = (DARWIN_VERSION_MIN,)
|
||||
+ link_flags = ()
|
||||
cflags = ('-O3',
|
||||
'-fomit-frame-pointer',
|
||||
# The parser turns 'const char *const *includes' into 'const const char **includes'
|
||||
'-Wno-duplicate-decl-specifier',
|
||||
- DARWIN_VERSION_MIN,)
|
||||
+ )
|
||||
|
||||
so_ext = 'dylib'
|
||||
DEFAULT_CC = 'clang'
|
||||
@@ -171,6 +171,11 @@ stdenv.mkDerivation rec {
|
||||
inherit (sqlite) out dev;
|
||||
libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
})
|
||||
|
||||
# PyPy sets an explicit minimum SDK version for darwin that is much older
|
||||
# than what we default to on nixpkgs.
|
||||
# Simply removing the explicit flag makes it use our default instead.
|
||||
./darwin_version_min.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
buildDunePackage,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
dune-configurator,
|
||||
ppxlib,
|
||||
}:
|
||||
@@ -10,11 +10,11 @@ buildDunePackage (finalAttrs: {
|
||||
pname = "extunix";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ygrek";
|
||||
repo = "extunix";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7wJDGv19etkDHRwwQ+WONtJswxNMjr2Q2Vhis4WgFek=";
|
||||
minimalOCamlVersion = "5.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ygrek/extunix/releases/download/v${finalAttrs.version}/extunix-${finalAttrs.version}.tbz";
|
||||
hash = "sha256-kzTIkjFiI+aK73lcpystQp1O7Apkf0GLA142oFPRSX0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "beautifulsoup4";
|
||||
version = "4.13.4";
|
||||
version = "4.14.3";
|
||||
pyproject = true;
|
||||
|
||||
outputs = [
|
||||
@@ -45,15 +45,15 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-27PE4c6uau/r2vJCMkcmDNBiQwpBDjjGbyuqUKhDcZU=";
|
||||
hash = "sha256-YpKxxRhtNWu6Zp759/BRdXCZVlrZraXdYwvZ3l+n+4Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# backport test fix for behavior changes in libxml 2.14.3
|
||||
# Fix tests with python 3.13.10 / 3.14.1
|
||||
(fetchpatch {
|
||||
url = "https://git.launchpad.net/beautifulsoup/patch/?id=53d328406ec8c37c0edbd00ace3782be63e2e7e5";
|
||||
url = "https://git.launchpad.net/beautifulsoup/patch/?id=55f655ffb7ef03bdd1df0f013743831fe54e3c7a";
|
||||
excludes = [ "CHANGELOG" ];
|
||||
hash = "sha256-RtavbpnfT6x0A8L3tAvCXwKUpty1ASPGJKdks7evBr8=";
|
||||
hash = "sha256-DJl1pey0NdJH+SyBH9+y6gwUvQCmou0D9xcRAEV8OBw=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-pydantic";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgebv";
|
||||
repo = "drf-pydantic";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RvDTequtxHyCsXV8IpNWdYNzdjkKEr8aAyS3ZFZTW1A=";
|
||||
hash = "sha256-/dMhKlAMAh63JlhanfSfe15ECMZvtnd1huD8L3Xo2AQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
streamlit,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "extra-streamlit-components";
|
||||
version = "0.1.81";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "extra_streamlit_components";
|
||||
inherit version;
|
||||
hash = "sha256-65vre6z+iz0jjxiIohx4rGz6VpNBvkhLygjD6gsV8g0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ streamlit ];
|
||||
|
||||
pythonImportsCheck = [ "extra_streamlit_components" ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Additional components for streamlit";
|
||||
homepage = "https://pypi.org/project/extra-streamlit-components/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.8.17";
|
||||
version = "1.9.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastai";
|
||||
repo = "fastcore";
|
||||
tag = version;
|
||||
hash = "sha256-RugbfTqgoM+GWswxjYL3vpLdEifGCDaUI7McfQ/mpZ8=";
|
||||
hash = "sha256-78zqQ8M0XZ6QcaH+6gw4IJDLk9d1WxjPiCr6puY/srM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202512161";
|
||||
version = "0.1.202512171";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-i8eNsCX56h0PrJm3Qd4TzSPAVoK5Un0W5AH2eMOXH68=";
|
||||
hash = "sha256-VQ97KOd05h1CYTSi554jVrKPtiDN6IAqnq86qHvULdI=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ihm";
|
||||
version = "2.7";
|
||||
version = "2.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihmwg";
|
||||
repo = "python-ihm";
|
||||
tag = version;
|
||||
hash = "sha256-ZMHVYuNcUjhMKJUr5bCIELO6F0CNi0ESfbsBm5vOiA4=";
|
||||
hash = "sha256-sT2wZRKyW+N0gd6xwOAEXImMnWKWq8h9UX1b3qkDLGQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ swig ];
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "millheater";
|
||||
version = "0.14.1";
|
||||
version = "0.15.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pymill";
|
||||
tag = version;
|
||||
hash = "sha256-CDPk3AiLFNOovjNi4fDy91BBcxpbyFV9FCN1uU5bxbc=";
|
||||
hash = "sha256-7Jqk5WarCA/YBpmFuF4/dbWpQHtKKRH8hYRT2FXn2n8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -6,24 +6,21 @@
|
||||
fetchPypi,
|
||||
importlib-metadata,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypoolstation";
|
||||
version = "0.5.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
version = "0.5.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hSlEChNjoDToA0tgWQiusBEpL08SMuOeHRr9W7Qgh/U=";
|
||||
hash = "sha256-GIRx66esht82tKBJDhCDrwPkxsdBPi1w9tSQ7itF0qQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
backoff
|
||||
importlib-metadata
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
requests,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qnap-qsw";
|
||||
version = "0.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Noltari";
|
||||
repo = "python-qnap-qsw";
|
||||
rev = version;
|
||||
sha256 = "WP1bGt7aAtSVFOMJgPXKqVSbi5zj9K7qoIVrYCrPGqk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "qnap_qsw" ];
|
||||
|
||||
meta = {
|
||||
description = "Python library to interact with the QNAP QSW API";
|
||||
homepage = "https://github.com/Noltari/python-qnap-qsw";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
streamlit,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlit-avatar";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "streamlit_avatar";
|
||||
inherit version;
|
||||
hash = "sha256-AjiTvYDbWpI9OX/GTSfHqXIQfaTwvqD+uZoy+TY/JpE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ streamlit ];
|
||||
|
||||
pythonImportsCheck = [ "streamlit_avatar" ];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Component to display avatar icon in Streamlit";
|
||||
homepage = "https://pypi.org/project/streamlit-avatar/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
packaging,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
streamlit,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlit-notify";
|
||||
version = "0.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgarrett-scripps";
|
||||
repo = "Streamlit_Notify";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MI+8fh7aKk7kOVxq3677cVWsiMmE0NSXWukN+Bc0noM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
packaging
|
||||
streamlit
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "streamlit_notify" ];
|
||||
|
||||
meta = {
|
||||
description = "Queues and displays Streamlit Status Elements notifications";
|
||||
homepage = "https://github.com/pgarrett-scripps/Streamlit_Notify";
|
||||
changelog = "https://github.com/pgarrett-scripps/Streamlit_Notify/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.12";
|
||||
version = "3.1.13";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = version;
|
||||
hash = "sha256-rLAsDXmQ4gmGJctfcOhp+0u6dd6f+u6dTuAGH28QJs8=";
|
||||
hash = "sha256-FGRoef5KloVuBlgBF2t4fyo1+cP5865oOrBZRoy2kQg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchurl,
|
||||
sphinx,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tracing";
|
||||
version = "0.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_${version}.orig.tar.gz";
|
||||
sha256 = "1l4ybj5rvrrcxf8csyq7qx52izybd502pmx70zxp46gxqm60d2l0";
|
||||
};
|
||||
|
||||
buildInputs = [ sphinx ];
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
homepage = "https://liw.fi/tracing/";
|
||||
description = "Python debug logging helper";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
@@ -364,8 +364,8 @@ rec {
|
||||
# https://docs.gradle.org/current/userguide/compatibility.html
|
||||
|
||||
gradle_9 = mkGradle {
|
||||
version = "9.1.0";
|
||||
hash = "sha256-oX3dhaJran9d23H/iwX8UQTAICxuZHgkKXkMkzaGyAY=";
|
||||
version = "9.2.1";
|
||||
hash = "sha256-cvRMn468sa9Dg49F7lxKqcVESJizRoqz9K97YHbFvD8=";
|
||||
defaultJava = jdk21;
|
||||
};
|
||||
gradle_8 = mkGradle {
|
||||
|
||||
@@ -25,8 +25,8 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "24.11.1";
|
||||
sha256 = "ea4da35f1c9ca376ec6837e1e30cee30d491847fe152a3f0378dc1156d954bbd";
|
||||
version = "24.12.0";
|
||||
sha256 = "6d3e891a016b90f6c6a19ea5cbc9c90c57eef9198670ba93f04fa82af02574ae";
|
||||
patches =
|
||||
(
|
||||
if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
grafanaPlugin {
|
||||
pname = "victoriametrics-logs-datasource";
|
||||
version = "0.22.3";
|
||||
zipHash = "sha256-j4cH6b3nZcl9rWrUXBox/EaEm8V7KHXvFAOMRw+9fzU=";
|
||||
version = "0.22.4";
|
||||
zipHash = "sha256-xDq8p86N2tgzFaNoE5/r4hgFc560bVl7VWGGL2teHuA=";
|
||||
meta = {
|
||||
description = "Grafana datasource for VictoriaLogs";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -38,14 +38,14 @@ let
|
||||
in
|
||||
(buildPythonApplication rec {
|
||||
pname = "input-remapper";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sezanzeb";
|
||||
repo = "input-remapper";
|
||||
tag = version;
|
||||
hash = "sha256-GMKcs2UK1yegGT/TBsLGgTBJROQ38M6WwnLbJIuAZwg=";
|
||||
hash = "sha256-MZO40Y8ym/lwHB8PETdtByAJb/UMMM6pRAAgAYao8UI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -35648,15 +35648,15 @@ with self;
|
||||
|
||||
TextBibTeX = buildPerlModule {
|
||||
pname = "Text-BibTeX";
|
||||
version = "0.89";
|
||||
version = "0.91";
|
||||
buildInputs = [
|
||||
CaptureTiny
|
||||
ConfigAutoConf
|
||||
ExtUtilsLibBuilder
|
||||
];
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.89.tar.gz";
|
||||
hash = "sha256-iKeOvwiOx1AvQBxaKxOMhiz1RYU0t3MiO786r0EiQZY=";
|
||||
url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.91.tar.gz";
|
||||
hash = "sha256-PwETz4/nHcdIRjbcjipYFjfsvMgtC+KbvUbQvz+M2zc=";
|
||||
};
|
||||
# libbtparse.so: cannot open shared object file
|
||||
patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ];
|
||||
@@ -37048,6 +37048,7 @@ with self;
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=implicit-int"
|
||||
"-Wno-error=incompatible-pointer-types"
|
||||
"-std=gnu17"
|
||||
];
|
||||
};
|
||||
doCheck = false; # Expects working X11.
|
||||
@@ -39069,11 +39070,12 @@ with self;
|
||||
|
||||
YAMLSyck = buildPerlPackage {
|
||||
pname = "YAML-Syck";
|
||||
version = "1.34";
|
||||
version = "1.36";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.34.tar.gz";
|
||||
hash = "sha256-zJFWzK69p5jr/i8xthnoBld/hg7RcEJi8X/608bjQVk=";
|
||||
url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.36.tar.gz";
|
||||
hash = "sha256-Tc2dmzsM48ZaL/K5tMb/+LZJ/fJDv9fhiJVDvs25GlI=";
|
||||
};
|
||||
env.NIX_CFLAGS_COMPILE = "-std=gnu11";
|
||||
meta = {
|
||||
description = "Fast, lightweight YAML loader and dumper";
|
||||
homepage = "https://github.com/toddr/YAML-Syck";
|
||||
|
||||
@@ -405,6 +405,7 @@ mapAliases {
|
||||
qiskit-ibmq-provider = throw "qiskit-imbq-provider has been removed, since it was deprecated upstream"; # added 2025-09-13
|
||||
qiskit-ignis = throw "qiskit-ignis has been removed, since it was deprecated upstream"; # added 2025-09-13
|
||||
qiskit-terra = throw "qiskit-terra has been removed, since it was deprecated upstream."; # added 2025-09-13
|
||||
qnap-qsw = throw "'qnap-qsw' has been replaced by 'aioqsw'"; # added 2025-12-17
|
||||
Quandl = throw "'Quandl' has been renamed to/replaced by 'quandl'"; # Converted to throw 2025-10-29
|
||||
querystring_parser = throw "'querystring_parser' has been renamed to/replaced by 'querystring-parser'"; # Converted to throw 2025-10-29
|
||||
radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02
|
||||
@@ -480,6 +481,7 @@ mapAliases {
|
||||
tikzplotlib = throw "tikzplotlib was removed because it is incompatible with recent versions of matplotlib and webcolors"; # added 2025-11-11
|
||||
torchtnt-nightly = throw "'torchtnt-nightly' was only needed as a test dependency for 'torcheval', but these tests are no longer run"; # added 2025-11-12
|
||||
torrent_parser = throw "'torrent_parser' has been renamed to/replaced by 'torrent-parser'"; # Converted to throw 2025-10-29
|
||||
tracing = throw "'tracing' has been removed because its source code has been removed"; # Added 2025-12-17
|
||||
treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
|
||||
treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
|
||||
trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-29
|
||||
|
||||
@@ -5107,6 +5107,10 @@ self: super: with self; {
|
||||
|
||||
extension-helpers = callPackage ../development/python-modules/extension-helpers { };
|
||||
|
||||
extra-streamlit-components =
|
||||
callPackage ../development/python-modules/extra-streamlit-components
|
||||
{ };
|
||||
|
||||
extract-msg = callPackage ../development/python-modules/extract-msg { };
|
||||
|
||||
extractcode = callPackage ../development/python-modules/extractcode { };
|
||||
@@ -15941,8 +15945,6 @@ self: super: with self; {
|
||||
|
||||
qiskit-optimization = callPackage ../development/python-modules/qiskit-optimization { };
|
||||
|
||||
qnap-qsw = callPackage ../development/python-modules/qnap-qsw { };
|
||||
|
||||
qnapstats = callPackage ../development/python-modules/qnapstats { };
|
||||
|
||||
qpageview = callPackage ../development/python-modules/qpageview { };
|
||||
@@ -18180,8 +18182,12 @@ self: super: with self; {
|
||||
|
||||
streamlit = callPackage ../development/python-modules/streamlit { };
|
||||
|
||||
streamlit-avatar = callPackage ../development/python-modules/streamlit-avatar { };
|
||||
|
||||
streamlit-folium = callPackage ../development/python-modules/streamlit-folium { };
|
||||
|
||||
streamlit-notify = callPackage ../development/python-modules/streamlit-notify { };
|
||||
|
||||
streamz = callPackage ../development/python-modules/streamz { };
|
||||
|
||||
strenum = callPackage ../development/python-modules/strenum { };
|
||||
@@ -19079,8 +19085,6 @@ self: super: with self; {
|
||||
|
||||
tracerite = callPackage ../development/python-modules/tracerite { };
|
||||
|
||||
tracing = callPackage ../development/python-modules/tracing { };
|
||||
|
||||
trackpy = callPackage ../development/python-modules/trackpy { };
|
||||
|
||||
trafilatura = callPackage ../development/python-modules/trafilatura { };
|
||||
|
||||
Reference in New Issue
Block a user