Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -21,6 +21,7 @@ in {
|
||||
history-service
|
||||
libusermetrics
|
||||
lomiri
|
||||
lomiri-calculator-app
|
||||
lomiri-download-manager
|
||||
lomiri-filemanager-app
|
||||
lomiri-polkit-agent
|
||||
|
||||
@@ -32,9 +32,15 @@ in
|
||||
${escapeShellArgs cfg.extraFlags}
|
||||
'';
|
||||
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DeviceAllow = [ "" ];
|
||||
DynamicUser = true;
|
||||
NoNewPrivileges = true;
|
||||
|
||||
MemoryDenyWriteExecute = true;
|
||||
|
||||
LockPersonality = true;
|
||||
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = "tmpfs";
|
||||
@@ -43,6 +49,8 @@ in
|
||||
PrivateDevices = true;
|
||||
PrivateIPC = true;
|
||||
|
||||
ProcSubset = "pid";
|
||||
|
||||
ProtectHostname = true;
|
||||
ProtectClock = true;
|
||||
ProtectKernelTunables = true;
|
||||
@@ -50,7 +58,10 @@ in
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
|
||||
Restart = "on-failure";
|
||||
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
|
||||
|
||||
@@ -181,15 +181,57 @@ in {
|
||||
-i "${alertmanagerYml}"
|
||||
'';
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
StateDirectory = "alertmanager";
|
||||
DynamicUser = true; # implies PrivateTmp
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
|
||||
WorkingDirectory = "/tmp";
|
||||
ExecStart = "${cfg.package}/bin/alertmanager" +
|
||||
optionalString (length cmdlineArgs != 0) (" \\\n " +
|
||||
concatStringsSep " \\\n " cmdlineArgs);
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
|
||||
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
|
||||
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DeviceAllow = [ "" ];
|
||||
DynamicUser = true;
|
||||
NoNewPrivileges = true;
|
||||
|
||||
MemoryDenyWriteExecute = true;
|
||||
|
||||
LockPersonality = true;
|
||||
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = "tmpfs";
|
||||
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
PrivateIPC = true;
|
||||
|
||||
ProcSubset = "pid";
|
||||
|
||||
ProtectHostname = true;
|
||||
ProtectClock = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
|
||||
Restart = "always";
|
||||
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_NETLINK" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
|
||||
StateDirectory = "alertmanager";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@cpu-emulation"
|
||||
"~@privileged"
|
||||
"~@reboot"
|
||||
"~@setuid"
|
||||
"~@swap"
|
||||
];
|
||||
|
||||
WorkingDirectory = "/tmp";
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
@@ -147,12 +147,52 @@ in {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
DynamicUser = true;
|
||||
ExecStart = "${cfg.package}/bin/pushgateway" +
|
||||
optionalString (length cmdlineArgs != 0) (" \\\n " +
|
||||
concatStringsSep " \\\n " cmdlineArgs);
|
||||
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DeviceAllow = [ "" ];
|
||||
DynamicUser = true;
|
||||
NoNewPrivileges = true;
|
||||
|
||||
MemoryDenyWriteExecute = true;
|
||||
|
||||
LockPersonality = true;
|
||||
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = "tmpfs";
|
||||
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
PrivateIPC = true;
|
||||
|
||||
ProcSubset = "pid";
|
||||
|
||||
ProtectHostname = true;
|
||||
ProtectClock = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
|
||||
Restart = "always";
|
||||
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
|
||||
StateDirectory = if cfg.persistMetrics then cfg.stateDir else null;
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@cpu-emulation"
|
||||
"~@privileged"
|
||||
"~@reboot"
|
||||
"~@setuid"
|
||||
"~@swap"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -101,8 +101,7 @@ in {
|
||||
|
||||
preStart = with cfg.settings; ''
|
||||
if ! test -f ${password-file}; then
|
||||
< /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 > ${password-file}
|
||||
chmod 0600 ${password-file}
|
||||
< /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 | install -m 600 /dev/stdin ${password-file}
|
||||
echo "Initialized ${password-file} from /dev/urandom"
|
||||
fi
|
||||
if [ ! -f ${data-dir}/keys/libp2p.key ]; then
|
||||
|
||||
@@ -524,6 +524,7 @@ in {
|
||||
lxd-image-server = handleTest ./lxd-image-server.nix {};
|
||||
#logstash = handleTest ./logstash.nix {};
|
||||
lomiri = handleTest ./lomiri.nix {};
|
||||
lomiri-calculator-app = runTest ./lomiri-calculator-app.nix;
|
||||
lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
|
||||
lomiri-system-settings = handleTest ./lomiri-system-settings.nix {};
|
||||
lorri = handleTest ./lorri/default.nix {};
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "lomiri-calculator-app-standalone";
|
||||
meta.maintainers = lib.teams.lomiri.members;
|
||||
|
||||
nodes.machine =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
imports = [ ./common/x11.nix ];
|
||||
|
||||
services.xserver.enable = true;
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs.lomiri; [
|
||||
suru-icon-theme
|
||||
lomiri-calculator-app
|
||||
];
|
||||
variables = {
|
||||
UITK_ICON_THEME = "suru";
|
||||
};
|
||||
};
|
||||
|
||||
i18n.supportedLocales = [ "all" ];
|
||||
|
||||
fonts.packages = with pkgs; [
|
||||
# Intended font & helps with OCR
|
||||
ubuntu_font_family
|
||||
];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_x()
|
||||
|
||||
with subtest("lomiri calculator launches"):
|
||||
machine.execute("lomiri-calculator-app >&2 &")
|
||||
machine.wait_for_text("Calculator")
|
||||
machine.screenshot("lomiri-calculator")
|
||||
|
||||
with subtest("lomiri calculator works"):
|
||||
machine.send_key("tab") # Fix focus
|
||||
|
||||
machine.send_chars("22*16\n")
|
||||
machine.wait_for_text("352")
|
||||
machine.screenshot("lomiri-calculator_caninfactdobasicmath")
|
||||
|
||||
machine.succeed("pkill -f lomiri-calculator-app")
|
||||
|
||||
with subtest("lomiri calculator localisation works"):
|
||||
machine.execute("env LANG=de_DE.UTF-8 lomiri-calculator-app >&2 &")
|
||||
machine.wait_for_text("Rechner")
|
||||
machine.screenshot("lomiri-calculator_localised")
|
||||
|
||||
# History of previous run should have loaded
|
||||
with subtest("lomiri calculator history works"):
|
||||
machine.wait_for_text("352")
|
||||
'';
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
import ./make-test-python.nix ({ lib, ... }:
|
||||
{
|
||||
name = "nzbhydra2";
|
||||
meta.maintainers = with lib.maintainers; [ jamiemagee ];
|
||||
meta.maintainers = with lib.maintainers; [ matteopacini ];
|
||||
|
||||
nodes.machine = { pkgs, ... }: { services.nzbhydra2.enable = true; };
|
||||
|
||||
|
||||
@@ -144,5 +144,9 @@ import ../make-test-python.nix ({ lib, pkgs, ... }:
|
||||
logger.wait_until_succeeds(
|
||||
"journalctl -o cat -u alertmanager-webhook-logger.service | grep '\"alertname\":\"InstanceDown\"'"
|
||||
)
|
||||
|
||||
logger.log(logger.succeed("systemd-analyze security alertmanager-webhook-logger.service | grep -v '✓'"))
|
||||
|
||||
alertmanager.log(alertmanager.succeed("systemd-analyze security alertmanager.service | grep -v '✓'"))
|
||||
'';
|
||||
})
|
||||
|
||||
@@ -90,5 +90,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }:
|
||||
"curl -sf 'http://127.0.0.1:9090/api/v1/query?query=absent(some_metric)' | "
|
||||
+ "jq '.data.result[0].value[1]' | grep '\"1\"'"
|
||||
)
|
||||
|
||||
pushgateway.log(pushgateway.succeed("systemd-analyze security pushgateway.service | grep -v '✓'"))
|
||||
'';
|
||||
})
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lite-xl";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lite-xl";
|
||||
repo = "lite-xl";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TqrFI5TFb2hnnlHYUjLDUTDK3/Wgg1gOxIP8owLi/yo=";
|
||||
hash = "sha256-awXcmYAvQUdFUr2vFlnBt8WTLrACREfB7J8HoSyVPTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
@@ -3040,8 +3040,6 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { };
|
||||
|
||||
mhutchie.git-graph = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "git-graph";
|
||||
@@ -5364,6 +5362,7 @@ let
|
||||
jakebecker.elixir-ls = throw "jakebecker.elixir-ls is deprecated in favor of elixir-lsp.vscode-elixir-ls"; # Added 2024-05-29
|
||||
jpoissonnier.vscode-styled-components = throw "jpoissonnier.vscode-styled-components is deprecated in favor of styled-components.vscode-styled-components"; # Added 2024-05-29
|
||||
matklad.rust-analyzer = throw "matklad.rust-analyzer is deprecated in favor of rust-lang.rust-analyzer"; # Added 2024-05-29
|
||||
mgt19937.typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07
|
||||
ms-vscode.go = throw "ms-vscode.go is deprecated in favor of golang.go"; # Added 2024-05-29
|
||||
ms-vscode.PowerShell = throw "ms-vscode.PowerShell is deprecated in favor of super.ms-vscode.powershell"; # Added 2024-05-29
|
||||
rioj7.commandOnAllFiles = throw "rioj7.commandOnAllFiles is deprecated in favor of rioj7.commandonallfiles"; # Added 2024-05-29
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
# Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this extension
|
||||
|
||||
{
|
||||
vscode-utils,
|
||||
lib,
|
||||
jq,
|
||||
moreutils,
|
||||
typst-preview,
|
||||
}:
|
||||
|
||||
vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-preview";
|
||||
publisher = "mgt19937";
|
||||
version = "0.11.7";
|
||||
hash = "sha256-70dVGoSBDKCtvn7xiC/gAh4OQ8nNDiI/M900r2zlOfU=";
|
||||
};
|
||||
|
||||
buildInputs = [ typst-preview ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
moreutils
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Typst Preview is an extension for previewing your Typst files in vscode instantly";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview";
|
||||
homepage = "https://github.com/Enter-tainer/typst-preview-vscode";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
}
|
||||
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
name = "tinymist";
|
||||
publisher = "myriad-dreamin";
|
||||
inherit (tinymist) version;
|
||||
hash = "sha256-rRopyjZsQ3N/qPE/r+0ZLfNqcYYMrcY124H3kSx4loE=";
|
||||
hash = "sha256-e/7HAvaohATDet7ynYc34e5cbOzBL5Rcjvimggs68c4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cobalt";
|
||||
version = "0.19.3";
|
||||
version = "0.19.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cobalt-org";
|
||||
repo = "cobalt.rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aAhceExz5SENL+FhPHyx8HmaNOWjNsynv81Rj2cS5M8=";
|
||||
sha256 = "sha256-a9fo6qSLTVK6vC40nKwrpCvEvw1iIxQFmngkA3ttAdQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vw7fGsTSEVO8s1LzilKJN5lGzOfQcms1h7rnTOyE4Kw=";
|
||||
cargoHash = "sha256-vr4G0L74qzsjpPKteV7wrW+pJGmbUVDLyc9MhSB1HfQ=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubeone";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubermatic";
|
||||
repo = "kubeone";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BYfnHgTiHMmKdW25XymP2nDYQDOEHSIUOjrtwaoc1JU=";
|
||||
hash = "sha256-P/x6HigXnAhpUnycm9B8TO33hdPzREiM8kwL+/GedZY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tAThtZJ5DRzveJRG58VPxJWrZjB+dnXhX/50lZEHUGc=";
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "2.7.3";
|
||||
version = "2.8.0";
|
||||
tags = lib.optionals enableGateway [ "gateway" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kumahq";
|
||||
repo = "kuma";
|
||||
rev = version;
|
||||
hash = "sha256-b3qQ3lFaQvkmP3HYPwQi2TxSeKmWzGbp01OCnjULJ4k=";
|
||||
hash = "sha256-RMgokVN/VTri7LiPwHX/elR2oEal9pzEkzSy0tUJMsU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ne62twZXac5GfQ8JcWElIMqc+Vpvn0Y9XSNgAtF62q0=";
|
||||
vendorHash = "sha256-FEdDOpz6C89OlzU3Pl4Uu6P0WgM4QsuccQ9vAHnb4xI=";
|
||||
|
||||
# no test files
|
||||
doCheck = false;
|
||||
|
||||
@@ -17,16 +17,16 @@ let
|
||||
|
||||
tctl-next = buildGoModule rec {
|
||||
pname = "tctl-next";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2zk+B+GomLZwep5LNRpWJj8JjFC0OxAl1XhAv+8b2kc=";
|
||||
hash = "sha256-bh0UsXA5yHtvP9femOwEzVzmu1VLz2uZwoIHL/kI7kM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NLteuVOswIw2ModdE0Ak4XmApkHLoYDt6SDAZGsgwBk=";
|
||||
vendorHash = "sha256-ziCJG722c32QAh9QmoC2E7TcLiC2InKwfdC9mkanTsU=";
|
||||
|
||||
inherit overrideModAttrs;
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
let
|
||||
pname = "mendeley";
|
||||
version = "2.117.0";
|
||||
version = "2.118.0";
|
||||
|
||||
executableName = "${pname}-reference-manager";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
|
||||
hash = "sha256-1Gwgb0oUtIjZX0f/HJmA5ihwurq9RlpMMLrTaDav0SM=";
|
||||
hash = "sha256-JzA6JmjxqZC2K51NozlYeTmZkzT5OTRF3WVGY4Wrfgo=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qlog";
|
||||
version = "0.36.0";
|
||||
version = "0.37.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foldynl";
|
||||
repo = "QLog";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YbjtN08zEj8rlRDC5tS/JsBOH70DV98wmL6pFQTehgg=";
|
||||
hash = "sha256-OXE+8e8Wr2EETEfdDaI/fb+SSsRhippqPzTXTlwLP4c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib
|
||||
, callPackage
|
||||
, python3
|
||||
, python311
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchpatch2
|
||||
@@ -23,7 +23,7 @@ let
|
||||
inherit version src;
|
||||
};
|
||||
|
||||
python = python3.override {
|
||||
python = python311.override {
|
||||
packageOverrides = self: super: {
|
||||
pydantic = super.pydantic_1;
|
||||
|
||||
@@ -71,6 +71,14 @@ python.pkgs.buildPythonApplication rec {
|
||||
url = "https://github.com/blakeblackshear/frigate/commit/b65656fa8733c1c2f3d944f716d2e9493ae7c99f.patch";
|
||||
hash = "sha256-taPWFV4PldBGUKAwFMKag4W/3TLMSGdKLYG8bj1Y5mU=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
# https://github.com/blakeblackshear/frigate/pull/10097
|
||||
name = "frigate-secrets-permissionerror.patch";
|
||||
url = "https://github.com/blakeblackshear/frigate/commit/a1424bad6c0163e790129ade7a9784514d0bf89d.patch";
|
||||
hash = "sha256-/kIy4aW9o5AKHJQfCDVY46si+DKaUb+CsZsCGIbXvUQ=";
|
||||
})
|
||||
# https://github.com/blakeblackshear/frigate/pull/12324
|
||||
./mpl-3.9.0.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From fba8cff13186bd80ceaa06806392957598139deb Mon Sep 17 00:00:00 2001
|
||||
From: Martin Weinelt <hexa@darmstadt.ccc.de>
|
||||
Date: Sun, 7 Jul 2024 14:23:29 +0200
|
||||
Subject: [PATCH] Fix colormap usage with matplotlib 3.9.0
|
||||
|
||||
The mpl.cm toplevel registration has been removed.
|
||||
|
||||
https://matplotlib.org/stable/api/prev_api_changes/api_changes_3.9.0.html#top-level-cmap-registration-and-access-functions-in-mpl-cm
|
||||
---
|
||||
frigate/config.py | 2 +-
|
||||
frigate/detectors/detector_config.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/frigate/config.py b/frigate/config.py
|
||||
index 2e8b2570..af4f3263 100644
|
||||
--- a/frigate/config.py
|
||||
+++ b/frigate/config.py
|
||||
@@ -807,7 +807,7 @@ class CameraConfig(FrigateBaseModel):
|
||||
def __init__(self, **config):
|
||||
# Set zone colors
|
||||
if "zones" in config:
|
||||
- colors = plt.cm.get_cmap("tab10", len(config["zones"]))
|
||||
+ colors = plt.colormaps["tab10"].resampled(len(config["zones"]))
|
||||
config["zones"] = {
|
||||
name: {**z, "color": tuple(round(255 * c) for c in colors(idx)[:3])}
|
||||
for idx, (name, z) in enumerate(config["zones"].items())
|
||||
diff --git a/frigate/detectors/detector_config.py b/frigate/detectors/detector_config.py
|
||||
index 7fc958a3..b65631eb 100644
|
||||
--- a/frigate/detectors/detector_config.py
|
||||
+++ b/frigate/detectors/detector_config.py
|
||||
@@ -125,7 +125,7 @@ class ModelConfig(BaseModel):
|
||||
|
||||
def create_colormap(self, enabled_labels: set[str]) -> None:
|
||||
"""Get a list of colors for enabled labels."""
|
||||
- cmap = plt.cm.get_cmap("tab10", len(enabled_labels))
|
||||
+ cmap = plt.colormaps["tab10"].resampled(len(enabled_labels))
|
||||
|
||||
for key, val in enumerate(enabled_labels):
|
||||
self._colormap[val] = tuple(int(round(255 * c)) for c in cmap(key)[:3])
|
||||
--
|
||||
2.45.1
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
buildLua rec {
|
||||
pname = "manga-reader";
|
||||
|
||||
version = "0-unstable-2024-03-17";
|
||||
version = "0-unstable-2024-07-05";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dudemanguy";
|
||||
repo = "mpv-manga-reader";
|
||||
rev = "6b65d98be7d20c8e272a4caa6c5018ed3a8bb2b3";
|
||||
hash = "sha256-54n513lpn1KCErXJHqL+GKdDE1P52LolS6xDott/epY=";
|
||||
rev = "fb06931eed4092fa74a98266cd04fa507ea63e13";
|
||||
hash = "sha256-xtzDHv+zW/9LsLWo4Km7OQ05BVJlwqu9461i9ee94lM=";
|
||||
};
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wayland-scanner
|
||||
@@ -33,6 +34,15 @@ stdenv.mkDerivation (self: {
|
||||
hash = "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# TODO: remove on next upgrade
|
||||
(fetchpatch {
|
||||
name = "fix-compilation-pipewire-1.2.0.patch";
|
||||
url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/c5b30938710d6c599f3f5cd99a3ffac35381fb0f.patch";
|
||||
hash = "sha256-f9OgW9tLuGuHXYH6bR1Y+CEuBPHOhRiHfEPebJzlwK8=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ab-av1";
|
||||
version = "0.7.14";
|
||||
version = "0.7.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexheretic";
|
||||
repo = "ab-av1";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cDabGXNzusVnp4exINqUitEL1HnzSgpcRtYXU5pSRhY=";
|
||||
hash = "sha256-s1hE+/fj73xxHqBQ7Q295vYBGzdCeHj0odn+EPFrS6E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sW/673orvK+mIUqTijpNh4YGd9ZrgSveGT6F1O5OYfI=";
|
||||
cargoHash = "sha256-0Fi9b5TQeVHw8MfLdIhLybb4ppRVcPqRQz1oR+AIGY0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "RobWalt";
|
||||
owner = "Aviac";
|
||||
repo = "codeberg-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SUKV7tH7tvSPtlMcRlOgjvAEqPoBi4J41Ak5k4h4Qj0=";
|
||||
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI Tool for Codeberg similar to gh and glab";
|
||||
homepage = "https://codeberg.org/RobWalt/codeberg-cli";
|
||||
homepage = "https://codeberg.org/Aviac/codeberg-cli";
|
||||
license = with licenses; [ agpl3Plus ];
|
||||
maintainers = with maintainers; [ robwalt ];
|
||||
mainProgram = "berg";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "files-cli";
|
||||
version = "2.13.80";
|
||||
version = "2.13.85";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "files-cli";
|
||||
owner = "files-com";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uwWdmDCmFyArvzVFTOfdBqHglsap/wvyOjRq9KLFyOE=";
|
||||
hash = "sha256-rsEromVixVLtBLvhLWQ5ykjHq3/FScPSpuL9FqIOjZ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VCsNI6MnraE9orrHCAVRZg3uYxhicuyBT3+Jp5q8DDc=";
|
||||
vendorHash = "sha256-pobAFcmFsE340+Jboqnd88L3UHEquZ63eWwSXzgOWyc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildDotnetModule rec {
|
||||
pname = "garnet";
|
||||
version = "1.0.13";
|
||||
version = "1.0.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "garnet";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mAZBYVOAbVPKcOpt+vA4uEK+xEx4qXPnAthsPsxiXkw=";
|
||||
hash = "sha256-SpkhOztUh28N853+6BBQnVRBgphxJARLJXQzmXJwPyY=";
|
||||
};
|
||||
|
||||
projectFile = "main/GarnetServer/GarnetServer.csproj";
|
||||
|
||||
@@ -93,8 +93,10 @@ in buildGoModule rec {
|
||||
data-compressed = runCommand "gitea-data-compressed" {
|
||||
nativeBuildInputs = [ brotli xorg.lndir ];
|
||||
} ''
|
||||
mkdir $out
|
||||
lndir ${gitea.data}/ $out/
|
||||
mkdir -p $out/{options,public,templates}
|
||||
lndir ${frontend}/public $out/public
|
||||
lndir ${gitea.data}/options $out/options
|
||||
lndir ${gitea.data}/templates $out/templates
|
||||
|
||||
# Create static gzip and brotli files
|
||||
find -L $out -type f -regextype posix-extended -iregex '.*\.(css|html|js|svg|ttf|txt)' \
|
||||
|
||||
@@ -23,7 +23,6 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
nose
|
||||
];
|
||||
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minetest-mapserver";
|
||||
version = "4.8.0";
|
||||
version = "4.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "mapserver";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MKWC8m+7QN1gq+jmUqsadX+OKRF3/jVdoYTuaODCOtM=";
|
||||
hash = "sha256-3bL23hwJgYMPV2nSSfq9plttcx7UYvhUa6OCbKfBACY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-q8l0wFXsR32dznB0oYiG9K/2+YQx6kOGtSSnznXLr5E=";
|
||||
vendorHash = "sha256-P3+M1ciRmFbOFnjy1+oWPhngPYFe/5o6Cs8pRlYNx2Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Realtime mapserver for minetest";
|
||||
|
||||
@@ -43,10 +43,6 @@ python3.pkgs.buildPythonPackage {
|
||||
(callPackage ./mov-cli-test.nix {})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"httpx"
|
||||
"tldextract"
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "naps2";
|
||||
version = "7.4.2";
|
||||
version = "7.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyanfish";
|
||||
repo = "naps2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1tPPb8bAQSc5FpizWpi7q4alxoA6xfb/QOAaTK2eNc8=";
|
||||
hash = "sha256-/qSfxGHcCSoNp516LFYWgEL4csf8EKgtSffBt1C02uE=";
|
||||
};
|
||||
|
||||
projectFile = "NAPS2.App.Gtk/NAPS2.App.Gtk.csproj";
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
, nix-output-monitor
|
||||
}:
|
||||
let
|
||||
version = "3.5.17";
|
||||
version = "3.5.18";
|
||||
runtimeDeps = [ nvd nix-output-monitor ];
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
|
||||
owner = "viperML";
|
||||
repo = "nh";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o4K6QHBjXrmcYkX9MIw9gZ+DHM3OaEVswswHRX9h8Is=";
|
||||
hash = "sha256-G5iteuo2gobI0Y5jHNEBc6UN9ixjwj6zopPKi7bJBE4=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
|
||||
--prefix PATH : ${lib.makeBinPath runtimeDeps}
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-6Y5vpXEuHZXe9HKk6KomujlibzwtZJbtn6YgOqbmInk=";
|
||||
cargoHash = "sha256-jd8GOuI5E+l3u8klAKdwUdEP9N0Nao6MfTdHkSjym0M=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pietrasanta-traceroute";
|
||||
version = "0.0.5-unstable-2023-11-28";
|
||||
version = "0.0.5-unstable-2024-06-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catchpoint";
|
||||
repo = "Networking.traceroute";
|
||||
rev = "c870c7bd7bafeab815f8564a67a281892c3a6230";
|
||||
hash = "sha256-CKqm8b6qNLEpso25+uTvtiR/hFMKJzuXUZkQ7lWzGd8=";
|
||||
rev = "5b9f9cd2cbd5b8d90442d4ddb71ab788297e2153";
|
||||
hash = "sha256-/WsBh42brVCRP31LnCPS34kRaQKMvP+XEENyD5MjCfw=";
|
||||
};
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
|
||||
mainProgram = "traceroute";
|
||||
maintainers = with maintainers; [ nicoo ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,15 +16,15 @@
|
||||
, xdg-utils
|
||||
}: rustPlatform.buildRustPackage rec {
|
||||
pname = "radicle-node";
|
||||
version = "1.0.0-rc.11";
|
||||
version = "1.0.0-rc.12";
|
||||
env.RADICLE_VERSION = version;
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git";
|
||||
rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}";
|
||||
hash = "sha256-P1Gg2uk87ppco7CAPjEqN0uqgb0K8apOSC7cfdgaT0Y=";
|
||||
hash = "sha256-bXFhufmMgJ+bX4PASIUPmNQ2L5Y8LHJ+pLevpJAYkYc=";
|
||||
};
|
||||
cargoHash = "sha256-M01NjqvMSaa3+YPb4vDtIucBeF5BYx3cpmMoLJOwRsI=";
|
||||
cargoHash = "sha256-CAxy9J5bOPHedf6g7TEfM35F+Batom6g2V3k7CPC8Sk=";
|
||||
|
||||
nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ];
|
||||
nativeCheckInputs = [ git ];
|
||||
@@ -32,7 +32,8 @@
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
doCheck = stdenv.hostPlatform.isLinux;
|
||||
# tests regularly time out on aarch64
|
||||
doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86;
|
||||
|
||||
preCheck = ''
|
||||
export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release
|
||||
@@ -44,6 +45,8 @@
|
||||
"--skip=tests::test_announcement_relay"
|
||||
# https://radicle.zulipchat.com/#narrow/stream/369277-heartwood/topic/Flaky.20tests/near/438352360
|
||||
"--skip=tests::e2e::test_connection_crossing"
|
||||
# https://radicle.zulipchat.com/#narrow/stream/369277-heartwood/topic/Clone.20Partial.20Fail.20Flake
|
||||
"--skip=rad_clone_partial_fail"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@@ -24,8 +24,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
jinja2
|
||||
openai
|
||||
|
||||
@@ -20,10 +20,6 @@ in python3.pkgs.buildPythonApplication {
|
||||
pyproject = true;
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
telethon
|
||||
|
||||
Generated
+12
-12
@@ -3697,7 +3697,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sync-lsp"
|
||||
version = "0.11.13"
|
||||
version = "0.11.14"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
@@ -3836,7 +3836,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tests"
|
||||
version = "0.11.13"
|
||||
version = "0.11.14"
|
||||
dependencies = [
|
||||
"insta",
|
||||
"lsp-server",
|
||||
@@ -3933,7 +3933,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinymist"
|
||||
version = "0.11.13"
|
||||
version = "0.11.14"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@@ -3967,7 +3967,7 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sync-lsp",
|
||||
"tinymist-assets 0.11.12",
|
||||
"tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tinymist-query",
|
||||
"tinymist-render",
|
||||
"tokio",
|
||||
@@ -3994,17 +3994,17 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinymist-assets"
|
||||
version = "0.11.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e51823bcf79f6ae1d0a1eb75c26cd9139cc062b7e2ae4f12077e5fb30b6aafa5"
|
||||
version = "0.11.14"
|
||||
|
||||
[[package]]
|
||||
name = "tinymist-assets"
|
||||
version = "0.11.13"
|
||||
version = "0.11.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e4e5159484d14f149de53df7cf5f04d9cff4a4d414688cc0cc81910162d74892"
|
||||
|
||||
[[package]]
|
||||
name = "tinymist-query"
|
||||
version = "0.11.13"
|
||||
version = "0.11.14"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"biblatex",
|
||||
@@ -4050,7 +4050,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinymist-render"
|
||||
version = "0.11.13"
|
||||
version = "0.11.14"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"log",
|
||||
@@ -4428,7 +4428,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "typst-preview"
|
||||
version = "0.11.13"
|
||||
version = "0.11.14"
|
||||
dependencies = [
|
||||
"await-tree",
|
||||
"clap",
|
||||
@@ -4440,7 +4440,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tinymist-assets 0.11.12",
|
||||
"tinymist-assets 0.11.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"tokio",
|
||||
"tokio-tungstenite",
|
||||
"typst",
|
||||
|
||||
@@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec {
|
||||
pname = "tinymist";
|
||||
# Please update the corresponding vscode extension when updating
|
||||
# this derivation.
|
||||
version = "0.11.13";
|
||||
version = "0.11.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Myriad-Dreamin";
|
||||
repo = "tinymist";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aAeDeW1EiF8NqsIAQ39RaTHq6wC39QeMptvwTJ3/ZWc=";
|
||||
hash = "sha256-6dUI0w9GKubK2hVK8fOkAYoUdEII9umPEZZ6uSh7XjE=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
Generated
-4564
File diff suppressed because it is too large
Load Diff
@@ -1,32 +0,0 @@
|
||||
{
|
||||
"name": "typst-dom",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build && tsc",
|
||||
"preview": "vite preview",
|
||||
"test": "vitest",
|
||||
"coverage": "vitest run --coverage",
|
||||
"link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer",
|
||||
"unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
|
||||
"@myriaddreamin/typst.ts": "0.5.0-rc4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
|
||||
"@myriaddreamin/typst.ts": "0.5.0-rc4",
|
||||
"typescript": "^5.0.2",
|
||||
"vite": "^4.3.9",
|
||||
"vite-plugin-singlefile": "^0.13.5",
|
||||
"vite-plugin-wasm": "^3.2.2",
|
||||
"vitest": "^0.32.2"
|
||||
},
|
||||
"exports": {
|
||||
".": "./src/index.mts",
|
||||
"./*": "./src/*"
|
||||
}
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
{
|
||||
"name": "typst-preview-frontend",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc && vite build",
|
||||
"preview": "vite preview",
|
||||
"test": "vitest",
|
||||
"coverage": "vitest run --coverage",
|
||||
"link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer",
|
||||
"unlink:local": "yarn unlink @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer"
|
||||
},
|
||||
"dependencies": {
|
||||
"@myriaddreamin/typst-ts-renderer": "0.5.0-rc4",
|
||||
"@myriaddreamin/typst.ts": "0.5.0-rc4",
|
||||
"typst-dom": "link:../typst-dom",
|
||||
"rxjs": "^7.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"typescript": "^5.3.3",
|
||||
"vite": "^4.3.9",
|
||||
"vite-plugin-singlefile": "^0.13.5",
|
||||
"vite-plugin-wasm": "^3.2.2",
|
||||
"vitest": "^0.32.2"
|
||||
}
|
||||
}
|
||||
@@ -1,125 +0,0 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, mkYarnPackage
|
||||
, fetchYarnDeps
|
||||
, pkg-config
|
||||
, libgit2
|
||||
, openssl
|
||||
, zlib
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
# Keep the vscode "mgt19937.typst-preview" extension in sync when updating
|
||||
# this package at pkgs/applications/editors/vscode/extensions/default.nix
|
||||
version = "0.11.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Enter-tainer";
|
||||
repo = "typst-preview";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N4PK9RucuOwminikayXq9aqK9l6T6v9a6tcksMllKdM=";
|
||||
fetchSubmodules = true;
|
||||
|
||||
postFetch = ''
|
||||
cd $out
|
||||
substituteInPlace addons/frontend/yarn.lock \
|
||||
--replace-fail '"typst-dom@link:../typst-dom"' '"typst-dom@file:../typst-dom"'
|
||||
'';
|
||||
};
|
||||
|
||||
frontendSrc = "${src}/addons/frontend";
|
||||
domSrc = "${src}/addons/typst-dom";
|
||||
|
||||
typst-dom = mkYarnPackage {
|
||||
inherit version;
|
||||
pname = "typst-dom";
|
||||
src = domSrc;
|
||||
packageJSON = ./dom.json;
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${domSrc}/yarn.lock";
|
||||
hash = "sha256-XAVxUKf2XJCOUkAT+tTefAk8myGismhz1aOHosZA+d4=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
yarn --offline build
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cp -R deps/typst-dom $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doDist = false;
|
||||
};
|
||||
|
||||
frontend = mkYarnPackage {
|
||||
inherit version;
|
||||
pname = "typst-preview-frontend";
|
||||
src = frontendSrc;
|
||||
packageJSON = ./frontend.json;
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${frontendSrc}/yarn.lock";
|
||||
hash = "sha256-jZZG8omzwrustcrdVb42nypu6JKXPW/fJn26NUrc/ZA=";
|
||||
};
|
||||
|
||||
packageResolutions = { inherit typst-dom; };
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
yarn --offline build
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
cp -R deps/typst-preview-frontend/dist $out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doDist = false;
|
||||
};
|
||||
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "typst-preview";
|
||||
inherit version src;
|
||||
|
||||
cargoHash = "sha256-JDUHESH0aFIlXX61IxOXNSaTlFCgo3hFRbfoQWWq6e0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libgit2
|
||||
openssl
|
||||
zlib
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
mkdir -p addons/vscode/out/frontend
|
||||
cp -R ${frontend}/* addons/vscode/out/frontend/
|
||||
cp -R ${frontend}/index.html ./src/index.html
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Typst preview extension for VSCode";
|
||||
homepage = "https://github.com/Enter-tainer/typst-preview/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ berberman ];
|
||||
mainProgram = "typst-preview";
|
||||
};
|
||||
}
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vscode-js-debug";
|
||||
version = "1.90.0";
|
||||
version = "1.91.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "vscode-js-debug";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SmWPKO7CEXaOIkuf9Y+825EfGsIz+rWlnCsh1T2UEF0=";
|
||||
hash = "sha256-3SZIIBHv599qLaW419CA0Nr7F6R7GB9wqUnOqbV4jKc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-DfeaiqKadTnGzOObK01ctlavwqTMa0tqn59sLZMPvUM=";
|
||||
npmDepsHash = "sha256-kZ5wCcmdpYtT6dqtV3i8R9LKFs20sq0rZC1W1w00XJQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
fetchpatch,
|
||||
gitUpdater,
|
||||
nixosTests,
|
||||
cmake,
|
||||
gettext,
|
||||
lomiri-ui-toolkit,
|
||||
pkg-config,
|
||||
qqc2-suru-style,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-calculator-app";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/apps/lomiri-calculator-app";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-NyLEis+rIx2ELUiGrGCeFX/tlt43UgPBkb9aUs1tkgk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when version > 4.0.2
|
||||
(fetchpatch {
|
||||
name = "0001-lomiri-calculator-app-Fix-GNUInstallDirs-variable-concatenations.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/commit/0bd6ef6c3470bcecf90a88e1e5568a5ce5ad6d06.patch";
|
||||
hash = "sha256-2FCLZ/LY3xTPGDmX+M8LiqlbcNQJu5hulkOf+V+3hWY=";
|
||||
})
|
||||
|
||||
# Remove when version > 4.0.2
|
||||
# Must apply separately because merge has hunk with changes to new file before hunk that inits said file
|
||||
(fetchpatch {
|
||||
name = "0002-lomiri-calculator-app-Migrate-to-C++-app.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/commit/035e5b8000ad1c8149a6b024fa8fed2667fbb659.patch";
|
||||
hash = "sha256-2BTFOrH/gjIzXBmnTPMi+mPpUA7e/+6O/E3pdxhjZYQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0003-lomiri-calculator-app-Call-i18n.bindtextdomain.patch";
|
||||
url = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/commit/7cb5e56958e41a8f7a51e00d81d9b2bc24de32b0.patch";
|
||||
hash = "sha256-k/Civ0+SCNDDok9bUdb48FKC+LPlM13ASFP6CbBvBVs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch =
|
||||
# We don't want absolute paths in desktop files
|
||||
''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'ICON ''${LOMIRI-CALCULATOR-APP_DIR}/''${ICON_FILE}' 'ICON ''${APP_HARDCODE}' \
|
||||
--replace-fail 'SPLASH ''${LOMIRI-CALCULATOR-APP_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/''${APP_HARDCODE}.svg'
|
||||
''
|
||||
+ lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'add_subdirectory(tests)' ""
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gettext
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
|
||||
# QML
|
||||
lomiri-ui-toolkit
|
||||
qqc2-suru-style
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "CLICK_MODE" false)
|
||||
(lib.cmakeBool "INSTALL_TESTS" false)
|
||||
];
|
||||
|
||||
# No tests we can actually run (just autopilot)
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash}
|
||||
|
||||
ln -s $out/share/{lomiri-calculator-app,icons/hicolor/scalable/apps}/lomiri-calculator-app.svg
|
||||
ln -s $out/share/{lomiri-calculator-app/lomiri-calculator-app-splash.svg,lomiri-app-launch/splash/lomiri-calculator-app.svg}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.vm = nixosTests.lomiri-calculator-app;
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Powerful and easy to use calculator for Ubuntu Touch, with calculations history and formula validation";
|
||||
homepage = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app";
|
||||
changelog = "https://gitlab.com/ubports/development/apps/lomiri-calculator-app/-/blob/v${finalAttrs.version}/ChangeLog";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "lomiri-calculator-app";
|
||||
maintainers = lib.teams.lomiri.members;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -9,6 +9,7 @@ let
|
||||
in {
|
||||
#### Core Apps
|
||||
lomiri = callPackage ./applications/lomiri { };
|
||||
lomiri-calculator-app = callPackage ./applications/lomiri-calculator-app { };
|
||||
lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { };
|
||||
lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { };
|
||||
lomiri-system-settings-security-privacy = callPackage ./applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix { };
|
||||
|
||||
@@ -1,19 +1,21 @@
|
||||
{ stdenv, fetchFromGitHub, lib
|
||||
, cmake, pkg-config, openjdk
|
||||
, libuuid, python3
|
||||
, silice, yosys, nextpnr, verilator
|
||||
, glfw
|
||||
, yosys, nextpnr, verilator
|
||||
, dfu-util, icestorm, trellis
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "silice";
|
||||
version = "unstable-2022-08-05";
|
||||
version = "0-unstable-2024-06-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sylefeb";
|
||||
repo = pname;
|
||||
rev = "e26662ac757151e5dd8c60c45291b44906b1299f";
|
||||
sha256 = "sha256-Q1JdgDlEErutZh0OfxYy5C4aVijFKlf6Hm5Iv+1jsj4=";
|
||||
repo = "silice";
|
||||
rev = "5ba9ef0d03b3c8d4a43efe10acfb51c97d3679ef";
|
||||
sha256 = "sha256-LrLUaCpwzaxH02TGyEfARIumPi0s2REc1g79fSxJjFc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -21,12 +23,16 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
pkg-config
|
||||
openjdk
|
||||
glfw
|
||||
];
|
||||
buildInputs = [
|
||||
libuuid
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
(python3.withPackages (p: with p; [ edalize ]))
|
||||
(python3.withPackages (p: [
|
||||
p.edalize
|
||||
p.termcolor
|
||||
]))
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -36,13 +42,18 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
make install
|
||||
mkdir -p $out
|
||||
cp -ar ../{bin,frameworks,lib} $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests =
|
||||
let
|
||||
silice = finalAttrs.finalPackage;
|
||||
testProject = project: stdenv.mkDerivation {
|
||||
name = "${silice.name}-test-${project}";
|
||||
nativeBuildInputs = [
|
||||
@@ -54,18 +65,24 @@ stdenv.mkDerivation rec {
|
||||
icestorm
|
||||
trellis
|
||||
];
|
||||
src = "${src}/projects";
|
||||
src = "${silice.src}/projects";
|
||||
sourceRoot = "projects/${project}";
|
||||
buildPhase = ''
|
||||
targets=$(cut -d " " -f 2 configs | tr -d '\r')
|
||||
for target in $targets ; do
|
||||
targets=()
|
||||
for target in $(cat configs | tr -d '\r') ; do
|
||||
[[ $target != Makefile* ]] || continue
|
||||
make $target ARGS="--no_program"
|
||||
targets+=($target)
|
||||
done
|
||||
if test "''${#targets[@]}" -eq 0; then
|
||||
>&2 echo "ERROR: no target found!"
|
||||
false
|
||||
fi
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
for target in $targets ; do
|
||||
cp -r BUILD_$target $out/
|
||||
for target in "''${targets[@]}" ; do
|
||||
[[ $target != Makefile* ]] || continue
|
||||
done
|
||||
'';
|
||||
};
|
||||
@@ -78,10 +95,17 @@ stdenv.mkDerivation rec {
|
||||
pipeline_sort = testProject "pipeline_sort";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Open source language that simplifies prototyping and writing algorithms on FPGA architectures";
|
||||
homepage = "https://github.com/sylefeb/Silice";
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.astro ];
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "silice";
|
||||
maintainers = with lib.maintainers; [
|
||||
astro
|
||||
pbsds
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.20";
|
||||
hash = "sha256-Xexvphx7nEeqHXZma+ZR8mQu0rz2zYY4xX41cc4qrGE=";
|
||||
version = "8.2.21";
|
||||
hash = "sha256-+Ydv59TZbUGs7RmbWKH3rntmVd3JJnMTX+3tf2k5138=";
|
||||
});
|
||||
in
|
||||
base.withExtensions ({ all, ... }: with all; ([
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libfive";
|
||||
version = "0-unstable-2024-03-28";
|
||||
version = "0-unstable-2024-06-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libfive";
|
||||
repo = "libfive";
|
||||
rev = "4c59b11667bbe8be9802f59697fa64bbfe1ea82d";
|
||||
hash = "sha256-scYSprozfC537vAXhMfWswyS3xivpoURWPhplH7yHIg=";
|
||||
rev = "302553e6aa6ca3cb13b2a149f57b6182ce2406dd";
|
||||
hash = "sha256-8J0Pe3lmZCg2YFffmIynxW35w4mHl5cSlLSenm50CWg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ];
|
||||
@@ -96,7 +96,9 @@ stdenv.mkDerivation {
|
||||
"libfive.stdlib"
|
||||
];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
tagFormat = "";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile";
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "python-qt";
|
||||
version = "3.5.2";
|
||||
version = "3.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MeVisLab";
|
||||
repo = "pythonqt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Mpi1pAPS/UuzaBK7I1kI0HlS3dphcKiVXIPuJwdEDXM=";
|
||||
hash = "sha256-uzOSm1Zcm5La0mDAbJko5YtxJ4WesPr9lRas+cwhNH4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
{ lib, fetchurl, buildDunePackage
|
||||
, logs, lwt, mirage-clock, ptime
|
||||
, alcotest
|
||||
, logs, fmt, ptime, mirage-clock, cmdliner
|
||||
, lwt, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-logs";
|
||||
version = "1.3.0";
|
||||
version = "2.1.0";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz";
|
||||
hash = "sha256-c1YQIutqp58TRz+a9Vd/69FCv0jnGRvFnei9BtSbOxA=";
|
||||
hash = "sha256-rorCsgw7QCQmjotr465KShQGWdoUM88djpwgqwBGnLs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ logs lwt mirage-clock ptime ];
|
||||
propagatedBuildInputs = [ logs fmt ptime mirage-clock cmdliner ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest ];
|
||||
checkInputs = [ lwt alcotest ];
|
||||
|
||||
meta = {
|
||||
description = "Reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps";
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
aiofiles,
|
||||
asyncio-mqtt,
|
||||
awesomeversion,
|
||||
buildPythonPackage,
|
||||
click,
|
||||
fetchFromGitHub,
|
||||
marshmallow,
|
||||
poetry-core,
|
||||
pyserial-asyncio,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomysensors";
|
||||
version = "0.3.16";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MartinHjelmare";
|
||||
repo = "aiomysensors";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1BpmjCgKiCZmBpBENlg79+I3UhkIxrgLAUD8ixpGUM8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail " --cov=src --cov-report=term-missing:skip-covered" ""
|
||||
'';
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
aiofiles
|
||||
asyncio-mqtt
|
||||
awesomeversion
|
||||
click
|
||||
marshmallow
|
||||
pyserial-asyncio
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aiomysensors" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to connect to MySensors gateways";
|
||||
homepage = "https://github.com/MartinHjelmare/aiomysensors";
|
||||
changelog = "https://github.com/MartinHjelmare/aiomysensors/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "aiomysensors";
|
||||
};
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
anyio,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
paho-mqtt,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
typing-extensions,
|
||||
wheel,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncio-mqtt";
|
||||
version = "0.16.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sbtinstruments";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-f3JqocjOEwNjo6Uv17ij6oEdrjb6Z2wTzdhdVhx46iM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ paho-mqtt ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
anyio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "asyncio_mqtt" ];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_client_filtered_messages"
|
||||
"test_client_logger"
|
||||
"test_client_max_concurrent_outgoing_calls"
|
||||
"test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls"
|
||||
"test_client_pending_calls_threshold"
|
||||
"test_client_tls_context"
|
||||
"test_client_tls_params"
|
||||
"test_client_unfiltered_messages"
|
||||
"test_client_unsubscribe"
|
||||
"test_client_username_password "
|
||||
"test_client_websockets"
|
||||
"test_client_will"
|
||||
"test_multiple_messages_generators"
|
||||
];
|
||||
|
||||
# newer version are packaged as aiomqtt
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Idomatic asyncio wrapper around paho-mqtt";
|
||||
homepage = "https://github.com/sbtinstruments/asyncio-mqtt";
|
||||
license = licenses.bsd3;
|
||||
changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/v${version}/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
@@ -4,7 +4,6 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
hatchling,
|
||||
hatch-vcs,
|
||||
aiohttp,
|
||||
@@ -130,8 +129,6 @@ buildPythonPackage {
|
||||
hash = "sha256-giZteSikwS9YEcVMPCC9h2khbBgvUPRW1biAyixO13Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"cattrs"
|
||||
"nvidia-ml-py"
|
||||
|
||||
@@ -11,11 +11,12 @@
|
||||
pyarrow,
|
||||
distributed,
|
||||
pytestCheckHook,
|
||||
xarray
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-expr";
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -24,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "dask";
|
||||
repo = "dask-expr";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O0s7jrxjTkIAb6zW+NuG1PPHhRHndcLt11uYNyknO4A=";
|
||||
hash = "sha256-3wQhADDS05soZq+oy75eBXIK0JQhochrRmtIqykuvOA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -49,6 +50,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
distributed
|
||||
pytestCheckHook
|
||||
xarray
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
let
|
||||
self = buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "2024.6.2";
|
||||
version = "2024.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -50,7 +50,7 @@ let
|
||||
owner = "dask";
|
||||
repo = "dask";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5jG9hx1tZkqLwjWF73Fm2oJBuejbq4a7GP9fMd8hRJg=";
|
||||
hash = "sha256-EvDn7i4GOEHYwhptYF+2yKUb3VDWjR7/WCUGKEJi/H4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "distributed";
|
||||
version = "2024.6.2";
|
||||
version = "2024.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
owner = "dask";
|
||||
repo = "distributed";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-GgW9BtTqjac+olAGg+LOO+lTopuUukVUmQ0ZWsMJOc8=";
|
||||
hash = "sha256-Nf/TOLqBaYhezXcBJPMvBwkP+cH5BnN5rxGqLMAb/8U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pdm-backend,
|
||||
pythonRelaxDepsHook,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pytz,
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
poetry-core,
|
||||
pythonRelaxDepsHook,
|
||||
llama-index-agent-openai,
|
||||
llama-index-cli,
|
||||
llama-index-core,
|
||||
@@ -26,10 +25,6 @@ buildPythonPackage {
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"llama-index-core"
|
||||
];
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
isPy3k,
|
||||
pytestCheckHook,
|
||||
mock,
|
||||
six,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "paho-mqtt";
|
||||
version = "1.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse";
|
||||
repo = "paho.mqtt.python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
six
|
||||
] ++ lib.optionals (!isPy3k) [ mock ];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
pythonImportsCheck = [ "paho.mqtt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MQTT version 3.1.1 client class";
|
||||
homepage = "https://eclipse.org/paho";
|
||||
license = licenses.epl10;
|
||||
maintainers = with maintainers; [
|
||||
mog
|
||||
dotlambda
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -2,38 +2,57 @@
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
isPy3k,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
mock,
|
||||
six,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
testing = fetchFromGitHub {
|
||||
owner = "eclipse";
|
||||
repo = "paho.mqtt.testing";
|
||||
rev = "a4dc694010217b291ee78ee13a6d1db812f9babd";
|
||||
hash = "sha256-SQoNdkWMjnasPjpXQF2yV97MUra8gb27pc3rNoA8Rjw=";
|
||||
};
|
||||
in buildPythonPackage rec {
|
||||
pname = "paho-mqtt";
|
||||
version = "1.6.1";
|
||||
format = "setuptools";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eclipse";
|
||||
repo = "paho.mqtt.python";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg=";
|
||||
hash = "sha256-VMq+WTW+njK34QUUTE6fR2j2OmHxVzR0wrC92zYb1rY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
six
|
||||
] ++ lib.optionals (!isPy3k) [ mock ];
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
pythonImportsCheck = [ "paho.mqtt" ];
|
||||
|
||||
preCheck = ''
|
||||
ln -s ${testing} paho.mqtt.testing
|
||||
|
||||
# paho.mqtt not in top-level dir to get caught by this
|
||||
export PYTHONPATH=".:$PYTHONPATH"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "MQTT version 3.1.1 client class";
|
||||
changelog = "https://github.com/eclipse/paho.mqtt.python/blob/${src.rev}/ChangeLog.txt";
|
||||
description = "MQTT version 5.0/3.1.1 client class";
|
||||
homepage = "https://eclipse.org/paho";
|
||||
license = licenses.epl10;
|
||||
license = licenses.epl20;
|
||||
maintainers = with maintainers; [
|
||||
mog
|
||||
dotlambda
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
pkg-config,
|
||||
setuptools,
|
||||
cython,
|
||||
ninja,
|
||||
meson-python,
|
||||
|
||||
AppKit,
|
||||
fontconfig,
|
||||
@@ -21,20 +23,21 @@
|
||||
SDL2_image,
|
||||
SDL2_mixer,
|
||||
SDL2_ttf,
|
||||
numpy,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygame-ce";
|
||||
version = "2.4.1";
|
||||
version = "2.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pygame-community";
|
||||
repo = "pygame-ce";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-4Ky+QEUsQ0odcwEETk0yGECs7CcJQthhavboOnMDvF8=";
|
||||
hash = "sha256-LVwOAp7ss8TPxJhfqGwOfH9EXNoNBGFpU+4tv4ozpvo=";
|
||||
# Unicode file cause different checksums on HFS+ vs. other filesystems
|
||||
postFetch = "rm -rf $out/docs/reST";
|
||||
};
|
||||
@@ -62,6 +65,8 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch =
|
||||
''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail ', "sphinx<=7.2.6"' ""
|
||||
substituteInPlace buildconfig/config_{unix,darwin}.py \
|
||||
--replace-fail 'from distutils' 'from setuptools._distutils'
|
||||
substituteInPlace src_py/sysfont.py \
|
||||
@@ -77,6 +82,8 @@ buildPythonPackage rec {
|
||||
pkg-config
|
||||
cython
|
||||
setuptools
|
||||
ninja
|
||||
meson-python
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -91,6 +98,11 @@ buildPythonPackage rec {
|
||||
SDL2_ttf
|
||||
] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
|
||||
preConfigure = ''
|
||||
${python.pythonOnBuildForHost.interpreter} buildconfig/config.py
|
||||
'';
|
||||
@@ -116,7 +128,22 @@ buildPythonPackage rec {
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pygame" ];
|
||||
pythonImportsCheck = [
|
||||
"pygame"
|
||||
"pygame.camera"
|
||||
"pygame.colordict"
|
||||
"pygame.cursors"
|
||||
"pygame.freetype"
|
||||
"pygame.ftfont"
|
||||
"pygame.locals"
|
||||
"pygame.midi"
|
||||
"pygame.pkgdata"
|
||||
"pygame.sndarray" # requires numpy
|
||||
"pygame.sprite"
|
||||
"pygame.surfarray"
|
||||
"pygame.sysfont"
|
||||
"pygame.version"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pygame Community Edition (CE) - library for multimedia application built on SDL";
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygsl";
|
||||
version = "2.3.4";
|
||||
version = "2.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pygsl";
|
||||
repo = "pygsl";
|
||||
rev = "refs/tags/v.${version}";
|
||||
hash = "sha256-2TalLKDDoJdKGZHr7eNNvVW8fL7wQJjnZv34LJokfow=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7agGgfDUgY6mRry7d38vGGNLJC4dFUniy2M/cnejDDs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
fetchzip,
|
||||
substitute,
|
||||
pythonRelaxDepsHook,
|
||||
pytestCheckHook,
|
||||
|
||||
setuptools,
|
||||
@@ -73,8 +72,6 @@ buildPythonPackage {
|
||||
echo "from .rapidocr_onnxruntime.main import RapidOCR, VisRes" > __init__.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
# Upstream expects the source files to be under rapidocr_onnxruntime/rapidocr_onnxruntime
|
||||
# instead of rapidocr_onnxruntime for the wheel to build correctly.
|
||||
preBuild = ''
|
||||
|
||||
@@ -121,7 +121,10 @@ buildPythonPackage {
|
||||
|
||||
pythonImportsCheck = [ "torch" ];
|
||||
|
||||
passthru.gpuChecks.cudaAvailable = callPackage ./test-cuda.nix { torch = torch-bin; };
|
||||
passthru.tests = callPackage ./tests.nix {
|
||||
torchWithCuda = torch-bin;
|
||||
torchWithRocm = torch-bin;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration";
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
torchWithCuda,
|
||||
torchWithRocm,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
let
|
||||
accelAvailable =
|
||||
{
|
||||
feature,
|
||||
versionAttr,
|
||||
torch,
|
||||
cudaPackages,
|
||||
}:
|
||||
cudaPackages.writeGpuTestPython
|
||||
{
|
||||
inherit feature;
|
||||
libraries = [ torch ];
|
||||
name = "${feature}Available";
|
||||
}
|
||||
''
|
||||
import torch
|
||||
message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}"
|
||||
assert torch.cuda.is_available() and torch.version.${versionAttr}, message
|
||||
print(message)
|
||||
'';
|
||||
in
|
||||
{
|
||||
tester-cudaAvailable = callPackage accelAvailable {
|
||||
feature = "cuda";
|
||||
versionAttr = "cuda";
|
||||
torch = torchWithCuda;
|
||||
};
|
||||
tester-rocmAvailable = callPackage accelAvailable {
|
||||
feature = "rocm";
|
||||
versionAttr = "hip";
|
||||
torch = torchWithRocm;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
cudaPackages,
|
||||
feature,
|
||||
torch,
|
||||
versionAttr,
|
||||
}:
|
||||
|
||||
cudaPackages.writeGpuTestPython
|
||||
{
|
||||
inherit feature;
|
||||
libraries = [ torch ];
|
||||
name = "${feature}Available";
|
||||
}
|
||||
''
|
||||
import torch
|
||||
message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}"
|
||||
assert torch.cuda.is_available() and torch.version.${versionAttr}, message
|
||||
print(message)
|
||||
''
|
||||
@@ -1,3 +1,21 @@
|
||||
{ callPackage }:
|
||||
{
|
||||
callPackage,
|
||||
torchWithCuda,
|
||||
torchWithRocm,
|
||||
}:
|
||||
|
||||
callPackage ./gpu-checks.nix { }
|
||||
{
|
||||
# To perform the runtime check use either
|
||||
# `nix run .#python3Packages.torch.tests.tester-cudaAvailable` (outside the sandbox), or
|
||||
# `nix build .#python3Packages.torch.tests.tester-cudaAvailable.gpuCheck` (in a relaxed sandbox)
|
||||
tester-cudaAvailable = callPackage ./mk-runtime-check.nix {
|
||||
feature = "cuda";
|
||||
versionAttr = "cuda";
|
||||
torch = torchWithCuda;
|
||||
};
|
||||
tester-rocmAvailable = callPackage ./mk-runtime-check.nix {
|
||||
feature = "rocm";
|
||||
versionAttr = "hip";
|
||||
torch = torchWithRocm;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
python-dateutil,
|
||||
pythonAtLeast,
|
||||
pythonOlder,
|
||||
pythonRelaxDepsHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
@@ -28,8 +27,6 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies = [ python-dateutil ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -26,10 +26,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aws-lambda-builders"
|
||||
"aws-sam-translator"
|
||||
|
||||
+25
-25
@@ -119,7 +119,7 @@ dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rustc_version",
|
||||
"syn 2.0.68",
|
||||
"syn 2.0.69",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -130,9 +130,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
|
||||
|
||||
[[package]]
|
||||
name = "els"
|
||||
version = "0.1.52-nightly.0"
|
||||
version = "0.1.52-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1bd0a3c0bfdf681ff58dde3d15efc100f712df1ae1d7d9388cbd8107cb7e3c79"
|
||||
checksum = "9f71553ed89956daa260ebefee8b4724308e8af507b713297aefa9535252048c"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_compiler",
|
||||
@@ -144,9 +144,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "erg_common"
|
||||
version = "0.6.40-nightly.0"
|
||||
version = "0.6.40-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c80f1574b5268d421f2067bdde5776f9363512706d011587432d2a0886eba56"
|
||||
checksum = "891d4800e5dea9c2a52a56ad8af9654c292ad98afbcc3cec0480fea55cc468b0"
|
||||
dependencies = [
|
||||
"backtrace-on-stack-overflow",
|
||||
"erg_proc_macros",
|
||||
@@ -156,9 +156,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "erg_compiler"
|
||||
version = "0.6.40-nightly.0"
|
||||
version = "0.6.40-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1efdec52061fad5d2238053cb15105d125e55cf116863e1b5337b8d286941ae3"
|
||||
checksum = "a90c044a992d23a39eaf65b83485953935496aa1ae0d589b45c1611277d8cb54"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_parser",
|
||||
@@ -166,9 +166,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "erg_parser"
|
||||
version = "0.6.40-nightly.0"
|
||||
version = "0.6.40-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "926d6768a062c5851b20eda7f77aed41e7f326b8589ae4b8703b13c49364eab5"
|
||||
checksum = "fb53c38fdc23f6e643267882c795040fda38da52309296106dba2e9dc544a31e"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_proc_macros",
|
||||
@@ -177,9 +177,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "erg_proc_macros"
|
||||
version = "0.6.40-nightly.0"
|
||||
version = "0.6.40-nightly.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da422e93bd4346cf04fadf410bc6b63881cda0842c1d976ee5a7f2b8ae29927e"
|
||||
checksum = "93643cbe997e214daa35b54d4c948e4f4b1088866ba87004dc787f2e965f0f16"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
@@ -248,7 +248,7 @@ dependencies = [
|
||||
"Inflector",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.68",
|
||||
"syn 2.0.69",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -542,7 +542,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "py2erg"
|
||||
version = "0.0.55"
|
||||
version = "0.0.56"
|
||||
dependencies = [
|
||||
"erg_common",
|
||||
"erg_compiler",
|
||||
@@ -552,7 +552,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pylyzer"
|
||||
version = "0.0.55"
|
||||
version = "0.0.56"
|
||||
dependencies = [
|
||||
"els",
|
||||
"erg_common",
|
||||
@@ -704,22 +704,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.203"
|
||||
version = "1.0.204"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
|
||||
checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.203"
|
||||
version = "1.0.204"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
|
||||
checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.68",
|
||||
"syn 2.0.69",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -741,7 +741,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.68",
|
||||
"syn 2.0.69",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -775,9 +775,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.68"
|
||||
version = "2.0.69"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
|
||||
checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -805,9 +805,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec"
|
||||
version = "1.6.1"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
|
||||
checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22"
|
||||
dependencies = [
|
||||
"tinyvec_macros",
|
||||
]
|
||||
@@ -1030,5 +1030,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.68",
|
||||
"syn 2.0.69",
|
||||
]
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pylyzer";
|
||||
version = "0.0.55";
|
||||
version = "0.0.56";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtshiba";
|
||||
repo = "pylyzer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-19SkaTDZK05o5OTPGe4AAEx3mJHOtCrknlJgrf4+oq0=";
|
||||
hash = "sha256-t/v9Ghnfsnwvo05PnvRInXRCbA0fi9ZQkIrrvtzBSCg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "patchelf";
|
||||
version = "0.18.0-unstable-2024-01-15";
|
||||
version = "0.18.0-unstable-2024-06-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "patchelf";
|
||||
rev = "7c2f768bf9601268a4e71c2ebe91e2011918a70f";
|
||||
sha256 = "sha256-PPXqKY2hJng4DBVE0I4xshv/vGLUskL7jl53roB8UdU=";
|
||||
rev = "a0f54334df36770b335c051e540ba40afcbf8378";
|
||||
sha256 = "sha256-FSoxTcRZMGHNJh8dNtKOkcUtjhmhU6yQXcZZfUPLhQM=";
|
||||
};
|
||||
|
||||
# Drop test that fails on musl (?)
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "python-launcher";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brettcannon";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1r2pmli4jsdjag9zsgd9q1qlj3hxxjj2bni6yybjh1a10fcqxzzv";
|
||||
sha256 = "sha256-wRKTBvLLo0Vvvh1GtF9hOnUHNpOeX950y1U+8JYBGoE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-2lgWybEPi6HEUMYuGDRWMjWoc94CrFHPP5IeKUjj0q4=";
|
||||
cargoHash = "sha256-+FtfL5jAGJrpnZaJDnDMvWC0D3Af0L466v9nqJkb+uA=";
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ let
|
||||
extraOutputsToInstall = [ "lib" "out" ];
|
||||
};
|
||||
|
||||
version = "0.88.0";
|
||||
version = "0.89.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "nwjs";
|
||||
@@ -98,10 +98,10 @@ stdenv.mkDerivation {
|
||||
in fetchurl {
|
||||
url = "https://dl.nwjs.io/v${version}/nwjs-${flavor}v${version}-linux-${bits}.tar.gz";
|
||||
hash = {
|
||||
"sdk-ia32" = "sha256-pk8Fdzw8zBBF4xeU5BlmkF1gbf7HIn8jheSjbdV4hI0=";
|
||||
"sdk-x64" = "sha256-51alZRf/+bpKfVLUQuy1VtLHCgkVuptQaJgupt7zxcU=";
|
||||
"ia32" = "sha256-OLkOJo3xDZ6WKbf6zPeY+KcgzoEjYWMIV7YWWbESjPo=";
|
||||
"x64" = "sha256-KSsaTs0W8m2dI+0ByLqU4H4ai/PXUt6LtroZIBeymgs=";
|
||||
"sdk-ia32" = "sha256-gHZLxZRborfbwmblKQrgr6tf+Rwt1YqxrGELAHPM0so=";
|
||||
"sdk-x64" = "sha256-NOQGS3jEdZumTwCmi0DUtnGlOaSAZi2rGYSLVioJDdg=";
|
||||
"ia32" = "sha256-L3PGK2YZCUo+KfkakL9AjkPcnUWPFOn4S2GePi+rph0=";
|
||||
"x64" = "sha256-epsbDjrpq4K7NnNDAcKoEJMcjfdehU2JjFcmA5exug8=";
|
||||
}."${flavor + bits}";
|
||||
};
|
||||
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, pipenv
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
with python3.pkgs;
|
||||
@@ -24,14 +26,14 @@ let
|
||||
|
||||
in buildPythonApplication rec {
|
||||
pname = "pipenv";
|
||||
version = "2023.10.24";
|
||||
version = "2024.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pypa";
|
||||
repo = "pipenv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-b1EqCrgGygdG08zzastgcYGnXDKoEYNvm5xjDLzlAXo=";
|
||||
hash = "sha256-IyjJrIEcKHm7TpZk26MYI///ZIB/7ploTBzvms1gDmI=";
|
||||
};
|
||||
|
||||
env.LC_ALL = "en_US.UTF-8";
|
||||
@@ -66,14 +68,29 @@ in buildPythonApplication rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_convert_deps_to_pip"
|
||||
# this test wants access to the internet
|
||||
"test_download_file"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# many of these tests want access to the internet
|
||||
"tests/integration"
|
||||
];
|
||||
|
||||
passthru.tests = {
|
||||
verify-venv-patch = runCommand "${pname}-test-verify-venv-patch" {} ''
|
||||
export PIPENV_VENV_IN_PROJECT=1
|
||||
|
||||
# "pipenv install" should be able to create a venv
|
||||
${pipenv}/bin/pipenv install
|
||||
|
||||
# the venv exists
|
||||
[ -d .venv ]
|
||||
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd pipenv \
|
||||
--bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-libp2p-daemon";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libp2p";
|
||||
repo = "go-libp2p-daemon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xKipt+nh7hFJHb9EmI0JZjBTuewfs82vOk1FC97sbAw=";
|
||||
hash = "sha256-UIiP6Tb0ys1slB4YQ2m7KlrHIZDfUaKs4RAyuxWBhhw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-60+JcyVV0uW+T0JZ/keyeYJNWrR3BhLInIgwbpoAe/Q=";
|
||||
@@ -16,9 +16,6 @@ buildGoModule rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
# Won't build with Go >1.20 because of outdated quic-go dependency and interface mismatches on update.
|
||||
# https://github.com/libp2p/go-libp2p-daemon/issues/291
|
||||
broken = true;
|
||||
description = "Libp2p-backed daemon wrapping the functionalities of go-libp2p for use in other languages";
|
||||
homepage = "https://github.com/libp2p/go-libp2p-daemon";
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -39,12 +39,12 @@ let
|
||||
|
||||
in {
|
||||
tomcat9 = common {
|
||||
version = "9.0.88";
|
||||
hash = "sha256-vvgcyqT318ieqG61b2NDxRzXkzdMjswgOLen9eJ9Zig=";
|
||||
version = "9.0.90";
|
||||
hash = "sha256-MYSRxL5DSU5ocrUnfEDKyFBpAddErQnTffYuiFQ/YiM=";
|
||||
};
|
||||
|
||||
tomcat10 = common {
|
||||
version = "10.1.23";
|
||||
hash = "sha256-pVcsnpD/geoWaB35cXa7ap9Texw/vg/7pSl/7lnDmKo=";
|
||||
version = "10.1.25";
|
||||
hash = "sha256-8SQKMrh5xEWkpEGcm23YdYG9uW+KUfewyhk1Fkux6EI=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metabase";
|
||||
version = "0.50.5";
|
||||
version = "0.50.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.metabase.com/v${version}/metabase.jar";
|
||||
hash = "sha256-UfRENrld7uc65xsh9mMh2CuPEspAV3IwsdZXN44ACnM=";
|
||||
hash = "sha256-Z0xvU8ZT9aXe0NKUhh302XrWwROlkIRHWgcjwzLMr8Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -21,16 +21,16 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2024-06-28T09-06-49Z";
|
||||
version = "2024-07-04T14-25-45Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
hash = "sha256-txCLzA65VOjOVD6SExefXKUMbD7WeXT9a9LNwoA4reU=";
|
||||
hash = "sha256-3JwfSiddVzyn8+vaj9bOHs3BHx8Okc/BC8C65ageYNM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KDHmLRmnbfGiS4ZeT4CZlzOkxv9GXyNfFYzSXfylLIg=";
|
||||
vendorHash = "sha256-8sgi21P1dwVfSAH/26NNso7S6RzTOmkNh3cGNYmEhXY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }:
|
||||
buildGoModule rec {
|
||||
pname = "mimir";
|
||||
version = "2.12.0";
|
||||
version = "2.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "${pname}-${version}";
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
hash = "sha256-V+O89hS2UopGLxGkg6W4gW8kj5QRzpwCQtq0QFrOWf0=";
|
||||
hash = "sha256-XBCwc3jpLx8uj+UitFsoIAWVgC/2G8rgjOqrrLLyYdM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -9,15 +9,19 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nzbhydra2";
|
||||
version = "4.7.6";
|
||||
version = "7.2.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip";
|
||||
hash = "sha512-vc+VInEnh00bASxcEwSjJcsa0QJHmtRzSz30uW60wGmA24tlaJYSk42N5KpGFbkQkOkb2ijHmKGxPogSa4izRQ==";
|
||||
url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-generic.zip";
|
||||
hash = "sha256-gGTEOqqnVSgsKvEjd6b5aG8EM2M8u0FdpIebYNQFP50=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [jre makeWrapper unzip];
|
||||
nativeBuildInputs = [
|
||||
jre
|
||||
makeWrapper
|
||||
unzip
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -37,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Usenet meta search";
|
||||
homepage = "https://github.com/theotherp/nzbhydra2";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [jamiemagee];
|
||||
maintainers = with maintainers; [ matteopacini ];
|
||||
platforms = with platforms; linux;
|
||||
mainProgram = "nzbhydra2";
|
||||
};
|
||||
|
||||
@@ -13,13 +13,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-typing-booster";
|
||||
version = "2.25.10";
|
||||
version = "2.25.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-fabian";
|
||||
repo = "ibus-typing-booster";
|
||||
rev = version;
|
||||
hash = "sha256-6kcU6oOH75X/M1+fv3m+r05ffIFYrXrlNl8tB6K+B5I=";
|
||||
hash = "sha256-of8FcuYeLIEQgPmEQt1UqcMT6Bd2l5sCDj0Cia0JbmM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 gobject-introspection ];
|
||||
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Completion input method for faster typing";
|
||||
mainProgram = "emoji-picker";
|
||||
maintainers = with maintainers; [ ncfavier ];
|
||||
platforms = platforms.linux;
|
||||
isIbusEngine = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector-contrib";
|
||||
version = "0.103.0";
|
||||
version = "0.104.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector-contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gunTgELRqPxlywQzI/+0UbXkLeCFAYIf+Mc3vN0Z/6U=";
|
||||
sha256 = "sha256-M0aNobj5h2NcliNDI2TjyV6xcd8m0MK6Cv9bf2d0d9g=";
|
||||
};
|
||||
|
||||
# proxy vendor to avoid hash missmatches between linux and macOS
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-ZIoEeW8/4/SofZV49hDprwNgXG2mNRbRQBqZHmqy1Hk=";
|
||||
vendorHash = "sha256-VTV6xgGWHc+H7eX1q2bYIS+YQxTvErf6+d8PNucUPkw=";
|
||||
|
||||
# there is a nested go.mod
|
||||
sourceRoot = "${src.name}/cmd/otelcontribcol";
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rosenpass";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t5AeJqeV16KCUoBm1GUzj/U6q382CRCR/XG6B2MiBU4=";
|
||||
hash = "sha256-fQIeKGyTkFWUV9M1o256G4U1Os5OlVsRZu+5olEkbD4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-caYJP3SNpZxtV9y3D62CuzJ5RjMoq98D9W0Fms5E3Nc=";
|
||||
cargoHash = "sha256-GyeJCIE60JuZa/NuixDc3gTj9WAOpSReIyVxQqM4tDQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake # for oqs build in the oqs-sys crate
|
||||
|
||||
@@ -17,13 +17,14 @@ python3.pkgs.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"defusedxml"
|
||||
"packaging"
|
||||
"psutil"
|
||||
"python-gnupg"
|
||||
];
|
||||
|
||||
build-system = with python3.pkgs; [ poetry-core ];
|
||||
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
defusedxml
|
||||
deprecated
|
||||
|
||||
@@ -68,11 +68,11 @@ let
|
||||
in
|
||||
pinentryMkDerivation rec {
|
||||
pname = "pinentry-${pinentryExtraPname}";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/pinentry/pinentry-${version}.tar.bz2";
|
||||
hash = "sha256-mzzVIm51l/L97TmaO8ZZkjNRU2VZ6dsIJpgbyjFklN4=";
|
||||
hash = "sha256-vHLuJ8cjkAerGJbDwvrlOwduLJvSSD3CdpoWkCvOjAQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -17,7 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "texpresso";
|
||||
version = "0-unstable-2024-05-23";
|
||||
version = "0-unstable-2024-06-22";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" \
|
||||
--replace-fail "LDCC=g++" "LDCC=${stdenv.cc.targetPrefix}c++"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
@@ -35,12 +41,16 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "let-def";
|
||||
repo = "texpresso";
|
||||
rev = "01cafac1ec6d33d5e169a0202f23a6f565cc55b8";
|
||||
hash = "sha256-uLGanGEUGzxIYFbU3U8LLV3bpn/IN9XltvWCmwSlD7E=";
|
||||
rev = "e1e05f5559751d4b50772cd51d14101be0563ce1";
|
||||
hash = "sha256-av1yadR2giJUxFQuHSXFgTbCNsmccrzKOmLVnAGJt6c=";
|
||||
};
|
||||
|
||||
buildFlags = [ "texpresso" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm0755 -t "$out/bin/" "build/${pname}"
|
||||
@@ -70,5 +80,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Live rendering and error reporting for LaTeX";
|
||||
maintainers = with lib.maintainers; [ nickhu ];
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,8 +6,8 @@ tectonic-unwrapped.override (old: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "let-def";
|
||||
repo = "tectonic";
|
||||
rev = "bc522fabfdd17099deac2e12662b2a0810ceb104";
|
||||
hash = "sha256-0esXnUML6C9DYrpmBBB+ACypLvnLsYE9fuNiiCFfYzw=";
|
||||
rev = "b38cb3b2529bba947d520ac29fbb7873409bd270";
|
||||
hash = "sha256-ap7fEPHsASAphIQkjcvk1CC7egTdxaUh7IpSS5os4W8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
cargoHash = "sha256-62sxvPIiY3len1wsl7QelK3u4ekftIjcTqoIGZMYb5A=";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atomicparsley";
|
||||
version = "20221229.172126.d813aa6";
|
||||
version = "20240608.083822.1ed9031";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-3otyOpDdiltZ0SR1hImfIDBi53PKuAvh93yq1X3Xkmo=";
|
||||
sha256 = "sha256-VhrOMpGNMkNNYjcfCqlHI8gdApWr1ThtcxDwQ6gyV/g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cloud-init";
|
||||
version = "24.1";
|
||||
version = "24.2";
|
||||
pyproject = true;
|
||||
|
||||
namePrefix = "";
|
||||
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "canonical";
|
||||
repo = "cloud-init";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-gcqo8q3BxxqXU7WnoOnTgTJ3QHF9h/p20zTJUhsCL2A=";
|
||||
hash = "sha256-BhTcOeSKZ1XRIx+xJQkqkSw9M8ilr+BRKXDy5MUXB6E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1372,6 +1372,7 @@ mapAliases ({
|
||||
trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10
|
||||
tvbrowser-bin = tvbrowser; # Added 2023-03-02
|
||||
typst-fmt = typstfmt; # Added 2023-07-15
|
||||
typst-preview = throw "The features of this program have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07
|
||||
|
||||
### U ###
|
||||
|
||||
|
||||
@@ -3274,7 +3274,10 @@ with pkgs;
|
||||
|
||||
awscli = callPackage ../tools/admin/awscli { };
|
||||
|
||||
awscli2 = callPackage ../tools/admin/awscli2 { };
|
||||
awscli2 = callPackage ../tools/admin/awscli2 {
|
||||
# change when https://github.com/aws/aws-cli/issues/8342 resolved
|
||||
python3 = python311;
|
||||
};
|
||||
|
||||
okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { };
|
||||
|
||||
@@ -11047,10 +11050,8 @@ with pkgs;
|
||||
nzbget = callPackage ../tools/networking/nzbget { };
|
||||
|
||||
nzbhydra2 = callPackage ../servers/nzbhydra2 {
|
||||
# You need Java (at least 8, at most 15)
|
||||
# https://github.com/theotherp/nzbhydra2/issues/697
|
||||
# https://github.com/theotherp/nzbhydra2/#how-to-run
|
||||
jre = openjdk11;
|
||||
# Requires Java 17, not lower, not higher
|
||||
jre = openjdk17;
|
||||
};
|
||||
|
||||
oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
|
||||
|
||||
@@ -37,6 +37,7 @@ mapAliases ({
|
||||
acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19
|
||||
adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute name: `pkgs.adafruit-nrfutil`."; # Added 2023-11-19
|
||||
aioaladdinconnect = throw "aioaladdinconnect has been removed, as the API is supported was obsoleted on 2024-01-24."; # Added 2024-06-07
|
||||
aiomysensors = throw "aiomysensors has been removed, as it was packaged for Home Assistant, which migrated to pymysensors."; # Added 2024-07-07
|
||||
aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
|
||||
aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27
|
||||
aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05
|
||||
@@ -53,6 +54,7 @@ mapAliases ({
|
||||
APScheduler = apscheduler; # added 2023-02-19
|
||||
async_generator = async-generator; # added 2023-08-08
|
||||
async_stagger = async-stagger; # added 2023-08-08
|
||||
asyncio-mqtt = throw "asyncio-mqtt has been replaced by aiomqtt, which is not API compatible."; # added 2024-07-07
|
||||
asyncio-nats-client = nats-py; # added 2022-02-08
|
||||
atsim_potentials = atsim-potentials; # added 2023-10-08
|
||||
awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13
|
||||
|
||||
@@ -329,8 +329,6 @@ self: super: with self; {
|
||||
|
||||
aiomusiccast = callPackage ../development/python-modules/aiomusiccast { };
|
||||
|
||||
aiomysensors = callPackage ../development/python-modules/aiomysensors { };
|
||||
|
||||
aiomysql = callPackage ../development/python-modules/aiomysql { };
|
||||
|
||||
aionanoleaf = callPackage ../development/python-modules/aionanoleaf { };
|
||||
@@ -889,8 +887,6 @@ self: super: with self; {
|
||||
|
||||
asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { };
|
||||
|
||||
asyncio-mqtt = callPackage ../development/python-modules/asyncio-mqtt { };
|
||||
|
||||
asyncio-rlock = callPackage ../development/python-modules/asyncio-rlock { };
|
||||
|
||||
asyncmy = callPackage ../development/python-modules/asyncmy { };
|
||||
@@ -9555,7 +9551,9 @@ self: super: with self; {
|
||||
|
||||
paginate = callPackage ../development/python-modules/paginate { };
|
||||
|
||||
paho-mqtt = callPackage ../development/python-modules/paho-mqtt { };
|
||||
paho-mqtt_1 = callPackage ../development/python-modules/paho-mqtt/1.nix { };
|
||||
paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { };
|
||||
paho-mqtt = paho-mqtt_1;
|
||||
|
||||
palace = callPackage ../development/python-modules/palace { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user