Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-11-19 18:06:02 +00:00
committed by GitHub
63 changed files with 704 additions and 190 deletions
+6
View File
@@ -3054,6 +3054,12 @@
githubId = 5409401;
name = "Bradley Cooley";
};
bct = {
email = "bct@diffeq.com";
github = "bct";
githubId = 548;
name = "Brendan Taylor";
};
bcyran = {
email = "bazyli@cyran.dev";
github = "bcyran";
@@ -124,6 +124,9 @@
- [Szurubooru](https://github.com/rr-/szurubooru), an image board engine inspired by services such as Danbooru, dedicated for small and medium communities. Available as [services.szurubooru](#opt-services.szurubooru.enable).
- [LubeLogger](https://lubelogger.com/), a vehicle maintenance and fuel mileage tracker.
Available as [services.lubelogger](#opt-services.lubelogger.enable).
- The [Neat IP Address Planner](https://spritelink.github.io/NIPAP/) (NIPAP) can now be enabled through [services.nipap.enable](#opt-services.nipap.enable).
- [tpm2-totp](https://github.com/tpm2-software/tpm2-totp) can now be used to show a TOTP during boot using Plymouth. Available as [boot.plymouth.tpm2-totp](#opt-boot.plymouth.tpm2-totp.enable).
+1
View File
@@ -1646,6 +1646,7 @@
./services/web-apps/libretranslate.nix
./services/web-apps/limesurvey.nix
./services/web-apps/linkwarden.nix
./services/web-apps/lubelogger.nix
./services/web-apps/mainsail.nix
./services/web-apps/mastodon.nix
./services/web-apps/matomo.nix
@@ -0,0 +1,134 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.lubelogger;
in
{
meta.maintainers = with lib.maintainers; [
bct
lyndeno
];
options = {
services.lubelogger = {
enable = lib.mkEnableOption "LubeLogger, a self-hosted, open-source, web-based vehicle maintenance and fuel milage tracker";
package = lib.mkPackageOption pkgs "lubelogger" { };
dataDir = lib.mkOption {
description = "Path to LubeLogger config and metadata inside of `/var/lib/`.";
default = "lubelogger";
type = lib.types.str;
};
port = lib.mkOption {
description = "The TCP port LubeLogger will listen on.";
default = 5000;
type = lib.types.port;
};
user = lib.mkOption {
description = "User account under which LubeLogger runs.";
default = "lubelogger";
type = lib.types.str;
};
group = lib.mkOption {
description = "Group under which LubeLogger runs.";
default = "lubelogger";
type = lib.types.str;
};
openFirewall = lib.mkOption {
description = "Open ports in the firewall for the LubeLogger web interface.";
default = false;
type = lib.types.bool;
};
settings = lib.mkOption {
type = with lib.types; attrsOf str;
default = { };
example = {
LUBELOGGER_ALLOWED_FILE_EXTENSIONS = "";
LUBELOGGER_LOGO_URL = "";
};
description = ''
Additional configuration for LubeLogger, see <https://docs.lubelogger.com/Environment%20Variables> for supported values.
'';
};
environmentFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/run/secrets/lubelogger";
description = ''
Path to a file containing extra LubeLogger config options in the systemd `EnvironmentFile` format.
Refer to the [documentation] for supported options.
[documentation]: https://docs.lubelogger.com/Advanced/Environment%20Variables
This can be used to pass secrets to LubeLogger without putting them in the Nix store.
For example, to set an SMTP password, point `environmentFile` at a file containing:
```
MailConfig__Password=<pass>
```
'';
};
};
};
config = lib.mkIf cfg.enable {
systemd.services.lubelogger = {
description = "LubeLogger";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
Kestrel__Endpoints__Http__Url = "http://localhost:${toString cfg.port}";
}
// cfg.settings;
serviceConfig = {
Type = "simple";
User = cfg.user;
Group = cfg.group;
StateDirectory = cfg.dataDir;
WorkingDirectory = "/var/lib/${cfg.dataDir}";
ExecStart = lib.getExe cfg.package;
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
Restart = "on-failure";
CapabilityBoundingSet = [ "" ];
DeviceAllow = [ "" ];
PrivateDevices = true;
PrivateTmp = true;
ProtectHome = true;
RestrictAddressFamilies = [
"AF_UNIX"
"AF_INET"
"AF_INET6"
];
RestrictNamespaces = true;
};
};
users.users = lib.mkIf (cfg.user == "lubelogger") {
lubelogger = {
isSystemUser = true;
group = cfg.group;
home = "/var/lib/${cfg.dataDir}";
};
};
users.groups = lib.mkIf (cfg.group == "lubelogger") { lubelogger = { }; };
networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
};
}
+8 -8
View File
@@ -36,20 +36,20 @@ let
hash =
{
x86_64-linux = "sha256-C+VAuyK2/4unyQm6h0lJJnAMFpGZYC3v8qPaeHkL8gE=";
x86_64-darwin = "sha256-DpBTTIrKZdItpBgDp3SA9fL9eVvvp/O1FDsVK93nTPw=";
aarch64-linux = "sha256-o1YyBeQ/ydcd06vxf8sndik4DTqmcgqBSDAuOsMr3WM=";
aarch64-darwin = "sha256-7XO+Y8T85EeGOUy8traWt+MOFhtCmPQp0benY6ZJCS4=";
armv7l-linux = "sha256-FAjeY+D4sRpt4/7U+k5c+JZMRMT6vvkYdUTahiQt/mM=";
x86_64-linux = "sha256-zQ6HHayJy48g/0viZRWm2Ea3Oy50LLkLhSjum68HETk=";
x86_64-darwin = "sha256-nl4Dn1xiXKZbbKfBHx92h4cxlNTQ7ManVg1LyYvd1xQ=";
aarch64-linux = "sha256-Yxr2JgpE6nW1B9iCpu8zDHpKHkDr0yy5gQRjNsq73tc=";
aarch64-darwin = "sha256-iElSgv6jjmKoVZqrZ1ET2EnwyZfiaXkfx9xlSgsUsTc=";
armv7l-linux = "sha256-M0ZkHHnJB/BtRagJjCi3yfhKz8B4v79IYuiaqdmPrkg=";
}
.${system} or throwSystem;
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.106.0";
version = "1.106.1";
# This is used for VS Code - Remote SSH test
rev = "ac4cbdf48759c7d8c3eb91ffe6bb04316e263c57";
rev = "cb1933bbc38d329b3595673a600fab5c7368f0a7";
in
callPackage ./generic.nix {
pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -82,7 +82,7 @@ callPackage ./generic.nix {
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
hash = "sha256-/ZBBSQTj0gr6H4wRLH9r2Qhukua8qeOq1MVlaScy+IE=";
hash = "sha256-HYyzA5qfE7CHFqenBjPCe9QhANP0mOgUoORRm/QvxVk=";
};
stdenv = stdenvNoCC;
};
+5 -2
View File
@@ -112,8 +112,11 @@ rustPlatform.buildRustPackage {
];
in
''
patchelf --set-rpath "${libPath}" "$out/bin/airshipper"
wrapProgram "$out/bin/airshipper" --set VELOREN_PATCHER "${patch}"
# We set LD_LIBRARY_PATH instead of using patchelf in order to propagate the libs
# to both Airshipper itself as well as the binaries downloaded by Airshipper.
wrapProgram "$out/bin/airshipper" \
--set VELOREN_PATCHER "${patch}" \
--prefix LD_LIBRARY_PATH : "${libPath}"
'';
doCheck = false;
+2 -2
View File
@@ -4,7 +4,7 @@
writeShellApplication,
buildFHSEnv,
webkitgtk_4_1,
ffmpeg,
ffmpeg-full,
gtk3,
pango,
atk,
@@ -49,7 +49,7 @@ buildFHSEnv {
custom_lsb_release
webkitgtk_4_1
gtk3
ffmpeg
ffmpeg-full
pango
atk
cairo
+179 -1
View File
@@ -14,6 +14,59 @@
}:
{
acrcssc = mkAzExtension {
pname = "acrcssc";
version = "1.0.0b5";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/acrcssc-1.0.0b5-py3-none-any.whl";
hash = "sha256-Z3wi+/3UK+TUKHE7MCSP/Es8ViGVTrlcafojw2YFRBs=";
description = "Microsoft Azure Container Registry Container Secure Supply Chain (CSSC) Extension";
propagatedBuildInputs = with python3Packages; [
croniter
oras
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
aksarc = mkAzExtension {
pname = "aksarc";
version = "1.5.62";
url = "https://hybridaksstorage.z13.web.core.windows.net/HybridAKS/CLI/aksarc-1.5.62-py3-none-any.whl";
hash = "sha256-PCy4SUbB4Vlj+fIwhufGwMJrrRehQr/W+QxAphTPnEk=";
description = "Microsoft Azure Command-Line Tools HybridContainerService Extension";
propagatedBuildInputs = with python3Packages; [
kubernetes
paramiko
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
alias = mkAzExtension rec {
pname = "alias";
version = "0.5.2";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/alias-${version}-py2.py3-none-any.whl";
hash = "sha256-BfgtdQJueA0nvTShvlf07A9CVQDYq07n6S/uB7lE2jM=";
description = "Support for command aliases";
propagatedBuildInputs = with python3Packages; [
jinja2
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
aosm = mkAzExtension rec {
pname = "aosm";
version = "2.0.0b2";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/aosm-${version}-py2.py3-none-any.whl";
hash = "sha256-nK752/alBu0JYax8B+sp6oByPISqYGIgL6KFX5AIJmk=";
description = "Microsoft Azure Command-Line Tools Aosm Extension";
propagatedBuildInputs = with python3Packages; [
genson
jinja2
oras
ruamel-yaml
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
application-insights = mkAzExtension rec {
pname = "application-insights";
version = "2.0.0b1";
@@ -24,6 +77,51 @@
meta.maintainers = with lib.maintainers; [ andreasvoss ];
};
arcappliance = mkAzExtension {
pname = "arcappliance";
version = "1.6.0";
url = "https://arcplatformcliextprod.z13.web.core.windows.net/arcappliance-1.6.0-py2.py3-none-any.whl";
hash = "sha256-1VTKp4R6ohI4C9QsZgAabJJMnkTycEQF7DDshw/7Qkw=";
description = "Microsoft Azure Command-Line Tools Arcappliance Extension";
propagatedBuildInputs = with python3Packages; [
jsonschema
kubernetes
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
arcdata = mkAzExtension {
pname = "arcdata";
version = "1.5.25";
url = "https://azurearcdatacli.z13.web.core.windows.net/arcdata-1.5.25-py2.py3-none-any.whl";
hash = "sha256-/ejgjd/O37GtS6/+gzsscImoLllaDYCl2LS8m+pulTw=";
description = "Tools for managing ArcData";
propagatedBuildInputs = with python3Packages; [
jinja2
jsonpatch
jsonpath-ng
jsonschema
kubernetes
ndjson
pem
pydash
regex
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
attestation = mkAzExtension {
pname = "attestation";
version = "1.0.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/attestation-1.0.0-py3-none-any.whl";
hash = "sha256-5YJ3wpIhTjsKHmbeXFI0De3yX1x8NWRgsgJZ1frO70Y=";
description = "Microsoft Azure Command-Line Tools AttestationManagementClient Extension";
propagatedBuildInputs = with python3Packages; [
pyjwt
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
azure-devops = mkAzExtension rec {
pname = "azure-devops";
version = "1.0.2";
@@ -61,6 +159,18 @@
meta.maintainers = with lib.maintainers; [ mikut ];
};
cloud-service = mkAzExtension {
pname = "cloud-service";
version = "1.0.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/cloud_service-1.0.1-py3-none-any.whl";
hash = "sha256-9rLYCn6rO6vTGFdBtGfgHQwceKbtf/t48DG4dQBzc+Q=";
description = "Microsoft Azure Command-Line Tools ComputeManagementClient Extension";
propagatedBuildInputs = with python3Packages; [
azure-mgmt-compute
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
confcom = mkAzExtension rec {
pname = "confcom";
version = "1.2.6";
@@ -78,7 +188,26 @@
postInstall = ''
chmod +x $out/${python3.sitePackages}/azext_confcom/bin/genpolicy-linux
'';
meta.maintainers = with lib.maintainers; [ miampf ];
meta = {
maintainers = with lib.maintainers; [ miampf ];
platforms = lib.platforms.linux; # confcom is linux only
};
};
connectedk8s = mkAzExtension rec {
pname = "connectedk8s";
version = "1.9.3";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedk8s-${version}-py2.py3-none-any.whl";
hash = "sha256-4OuN92PXzIWgOWhWu/S4ofQ4AbITH6XSG1soUOljY+8=";
description = "Microsoft Azure Command-Line Tools Connectedk8s Extension";
propagatedBuildInputs = with python3Packages; [
azure-graphrbac
azure-mgmt-hybridcompute
kubernetes
pycryptodome
pyyaml
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
containerapp = mkAzExtension rec {
@@ -108,6 +237,31 @@
meta.maintainers = [ ];
};
interactive = mkAzExtension {
pname = "interactive";
version = "1.0.0b1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/interactive-1.0.0b1-py2.py3-none-any.whl";
hash = "sha256-COvHDhvsigEEMYlMQ2hHFKzjX7WwdkwfT9id6z+Sj7w=";
description = "Microsoft Azure Command-Line Interactive Shell";
propagatedBuildInputs = with python3Packages; [
prompt-toolkit
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
k8s-configuration = mkAzExtension rec {
pname = "k8s-configuration";
version = "2.2.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_configuration-${version}-py3-none-any.whl";
hash = "sha256-aRdNy3aH+xfLNK7asYqok9aw6RedEcAQqOUKxtIwRwg=";
description = "Microsoft Azure Command-Line Tools K8s-configuration Extension";
propagatedBuildInputs = with python3Packages; [
pycryptodome
pyyaml
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
rdbms-connect = mkAzExtension rec {
pname = "rdbms-connect";
version = "1.0.7";
@@ -125,6 +279,18 @@
meta.maintainers = with lib.maintainers; [ obreitwi ];
};
serial-console = mkAzExtension {
pname = "serial-console";
version = "1.0.0b2";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/serial_console-1.0.0b2-py3-none-any.whl";
hash = "sha256-Weu4BEdq/0dvi07682UfYL8FzAd3cKZUGVJLTzJ27JM=";
description = "Microsoft Azure Command-Line Tools for Serial Console Extension";
propagatedBuildInputs = with python3Packages; [
websocket-client
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
ssh = mkAzExtension rec {
pname = "ssh";
version = "2.0.6";
@@ -160,6 +326,18 @@
propagatedBuildInputs = with python3Packages; [ opencensus ];
meta.maintainers = [ ];
};
webpubsub = mkAzExtension {
pname = "webpubsub";
version = "1.7.2";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/webpubsub-1.7.2-py3-none-any.whl";
hash = "sha256-axtA9vXM1WmzXTj7rbA6Tlrx7kpx2Z6c3NYtwUiv2UI=";
description = "Microsoft Azure Command-Line Tools Webpubsub Extension";
propagatedBuildInputs = with python3Packages; [
websockets
];
meta.maintainers = with lib.maintainers; [ techknowlogick ];
};
}
// lib.optionalAttrs config.allowAliases {
# Removed extensions
+4 -4
View File
@@ -8,13 +8,13 @@
}:
buildGoModule rec {
pname = "beszel";
version = "0.14.1";
version = "0.15.4";
src = fetchFromGitHub {
owner = "henrygd";
repo = "beszel";
tag = "v${version}";
hash = "sha256-IQ39OtYG2VDyHIPFRR0VNK56czGlJly66Bwb/NYIBxY=";
hash = "sha256-sIABMb8geSaVYdpaWmtlDgfEVPtX9wb5gZOK6+apGAU=";
};
webui = buildNpmPackage {
@@ -48,10 +48,10 @@ buildGoModule rec {
sourceRoot = "${src.name}/internal/site";
npmDepsHash = "sha256-Wtq/pesnovOyAnFta/wI+j8rml8XWORvOLz/Q82sy8g=";
npmDepsHash = "sha256-87Kf0i1idmg4jK31SZBoz/p4/oxqB0aGhEvYzA9GRnQ=";
};
vendorHash = "sha256-IfwgL4Ms5Uho1l0yGCyumbr1N/SN+j5HaFl4hACkTsQ=";
vendorHash = "sha256-MP06kn8iFpz9AOv3LQqSGGSe4c7JvP/Kp4Nmsuga99o=";
preBuild = ''
mkdir -p internal/site/dist
+3 -3
View File
@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "biome";
version = "2.3.5";
version = "2.3.6";
src = fetchFromGitHub {
owner = "biomejs";
repo = "biome";
rev = "@biomejs/biome@${finalAttrs.version}";
hash = "sha256-5zOWYDhabTlhYn+hwFFH1JCMpcFbIFwBMMpnjDT6nls=";
hash = "sha256-wi0dkD9AlMYyGS/y96FMCOJKjRuo0b4pHpva+R1W3Yg=";
};
cargoHash = "sha256-TXqV3gcQ294VGpJl61qeEzqCOwqwiRHL9VdwjM+Sreo=";
cargoHash = "sha256-GCwJdO43Q5cRw3w1omuIpSxvINN51dJez7Jq4/FQF+A=";
nativeBuildInputs = [ pkg-config ];
+3 -3
View File
@@ -9,20 +9,20 @@
}:
let
version = "2025.11";
version = "2025.11.1";
product =
if proEdition then
{
productName = "pro";
productDesktop = "Burp Suite Professional Edition";
hash = "sha256-/LudYYETnUT7Ynqw3HO822hdMUoz3mrTPae7ZO8SMyE=";
hash = "sha256-vtei5zzfbsfO3W6IIs15y4Ef+mLK9BlaNl+4wT8wEmw=";
}
else
{
productName = "community";
productDesktop = "Burp Suite Community Edition";
hash = "sha256-x4q5QkBIBFqG8Bjx5NuschNB4dX/8t2vCHNVRDa0kQQ=";
hash = "sha256-WzURPRMr8EgBMqxp9w10gHDEyqAVcejUif0TKdxDZr4=";
};
src = fetchurl {
@@ -21,6 +21,10 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-deczbMPeJsnmXbVB60stKhJJZRIIwjY5vExS3x3b6aU=";
# Test suite is broken since rustc 1.90, see:
# https://github.com/CycloneDX/cyclonedx-rust-cargo/issues/807
doCheck = false;
nativeBuildInputs = [
pkg-config
];
+2 -2
View File
@@ -10,7 +10,7 @@
libepoxy,
libadwaita,
meson,
mpv,
mpv-unwrapped,
ninja,
nix-update-script,
pkg-config,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
libGL
libadwaita
libepoxy
mpv
mpv-unwrapped
];
postPatch = ''
+10
View File
@@ -3,6 +3,7 @@
fetchFromGitHub,
nix-update-script,
rustPlatform,
versionCheckHook,
}:
rustPlatform.buildRustPackage (finalAttrs: {
@@ -19,11 +20,20 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildAndTestSubdir = "crates/codebook-lsp";
cargoHash = "sha256-HAJglGtOy+OMZoB50Uz5vrf8IXqBKMMO/Hr9Lcry2+Q=";
CARGO_PROFILE_RELEASE_LTO = "fat";
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
# Integration tests require internet access for dictionaries
doCheck = false;
passthru.updateScript = nix-update-script { };
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgramArg = "--version";
meta = {
description = "Unholy spellchecker for code";
homepage = "https://github.com/blopker/codebook";
@@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "copilot-language-server";
version = "1.394.0";
version = "1.397.0";
src = fetchzip {
url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
hash = "sha256-HHm+J+XFmOkDJOffzpRhyPREGBusjgtcUt/E29roSNE=";
hash = "sha256-LeQP2Ula7gPqis7DeaQGDAN2wtQT9ryZhIDYUBEPreo=";
stripRoot = false;
};
+11
View File
@@ -33,6 +33,17 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
wrapProgram $out/bin/cowsay \
--suffix COWPATH : $out/share/cowsay/cows
# Replace the cowthink symlink with a Perl wrapper that sets $0 correctly
# This is necessary because exec -a doesn't work for Perl scripts
rm $out/bin/cowthink
cat > $out/bin/cowthink << EOF
#!/usr/bin/env perl
\$0 = "cowthink";
\$ENV{COWPATH} = "\$ENV{COWPATH}" . (\$ENV{COWPATH} ? ":" : "") . "$out/share/cowsay/cows";
do "$out/bin/.cowsay-wrapped";
EOF
chmod +x $out/bin/cowthink
'';
passthru = {
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "crush";
version = "0.13.5";
version = "0.18.3";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "crush";
tag = "v${finalAttrs.version}";
hash = "sha256-MKX26HptDwlwWvmP+9FDlFJzly5xKA0mNVsbeHi1zhg=";
hash = "sha256-BTD+03LG+Y7pMw9P2nB52qtLK0QSQEurbTr+2vT0QmM=";
};
vendorHash = "sha256-OiNmZKg+NN7Aoeao8L72Dvgz0moeaZGQ7KVJdvuWagY=";
vendorHash = "sha256-6/DvpfhW1Lk3SP7umOxeWBJhUtX1ay7pkG5Ys8M9xM4=";
ldflags = [
"-s"
+2 -2
View File
@@ -10,14 +10,14 @@
python3Packages.buildPythonApplication rec {
pname = "github-backup";
version = "0.51.0";
version = "0.51.3";
pyproject = true;
src = fetchFromGitHub {
owner = "josegonzalez";
repo = "python-github-backup";
tag = version;
hash = "sha256-XqQw2Qu5b5Gdna8krwvkYsTPbM5p1gUBV2P7JLypqVU=";
hash = "sha256-iaonBBOHu/12vzVhFnGznTKhMUy9JJc/+dTJhsSjvMo=";
};
build-system = with python3Packages; [
+8 -4
View File
@@ -3,7 +3,7 @@
fetchFromGitLab,
lib,
nix-update-script,
testers,
versionCheckHook,
}:
buildGoModule (finalAttrs: {
@@ -21,15 +21,19 @@ buildGoModule (finalAttrs: {
vendorHash = "sha256-fnaOgc8RPDQnxTWOLQx1kw0+qj1iaff+UkjnoJYdEG4=";
passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
};
updateScript = nix-update-script { };
};
nativeInstallCheckInputs = [
versionCheckHook
];
doInstallCheck = true;
versionCheckProgramArg = "--version";
meta = {
description = "Tool to send messages or files to an XMPP contact or MUC";
homepage = "https://salsa.debian.org/mdosch/go-sendxmpp";
changelog = "https://salsa.debian.org/mdosch/go-sendxmpp/-/releases/v${finalAttrs.version}";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [
jpds
@@ -28,12 +28,12 @@
stdenv.mkDerivation rec {
pname = "gpu-screen-recorder";
version = "5.8.1";
version = "5.9.0";
src = fetchgit {
url = "https://repo.dec05eba.com/${pname}";
tag = version;
hash = "sha256-VAb7YAPZVe23qqoGgY8wPR+PwPHuWUmlcixoLOW/H5A=";
hash = "sha256-VftfK6emngCl64Gom/+nwu3gVL3ptzR/J0E0RjW9L9M=";
};
nativeBuildInputs = [
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
broken = stdenv.hostPlatform.isDarwin;
homepage = "https://csl.name/jp2a/";
homepage = "https://github.com/Talinx/jp2a";
description = "Small utility that converts JPG images to ASCII";
license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.FlorianFranzen ];
@@ -4,15 +4,15 @@
lib,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "libreelec-dvb-firmware";
version = "1.5.0";
src = fetchFromGitHub {
repo = "dvb-firmware";
owner = "LibreElec";
rev = version;
sha256 = "sha256-uEobcv5kqGxIOfSVVKH+iT7DHPF13OFiRF7c1GIUqtU=";
repo = "dvb-firmware";
tag = finalAttrs.version;
hash = "sha256-uEobcv5kqGxIOfSVVKH+iT7DHPF13OFiRF7c1GIUqtU=";
};
installPhase = ''
@@ -25,11 +25,12 @@ stdenvNoCC.mkDerivation rec {
runHook postInstall
'';
meta = with lib; {
meta = {
description = "DVB firmware from LibreELEC";
homepage = "https://github.com/LibreELEC/dvb-firmware";
license = licenses.unfreeRedistributableFirmware;
maintainers = with maintainers; [ kittywitch ];
platforms = platforms.linux;
license = lib.licenses.unfreeRedistributableFirmware;
maintainers = with lib.maintainers; [ kittywitch ];
platforms = lib.platforms.linux;
sourceProvenance = with lib.sourceTypes; [ binaryFirmware ];
};
}
})
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule (finalAttrs: {
pname = "okteto";
version = "3.13.1";
version = "3.13.2";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
tag = finalAttrs.version;
hash = "sha256-Z++IClBMuzhoI3rJZsBAqllsXbbqOK+JQLQJkLl67qg=";
hash = "sha256-UEnviH+DX9DxgVXsi/hutw97TOvEz2zr2cI9y47+9z8=";
};
vendorHash = "sha256-/gB/7NCzoZhaKUIkPaABGrKNoruHuAwTIcH75SBBAMg=";
vendorHash = "sha256-8pfrp7eOsgpCB44TQXn98G8+5WSn4EnuGKt6JUajAQ8=";
postPatch = ''
# Disable some tests that need file system & network access.
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.27.0";
version = "3.28.0";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
tag = "v${version}";
hash = "sha256-dVYxq/ojE3nPxdkQEXocJJKNXeaaS+Sdq+CO8j5M5jM=";
hash = "sha256-94N5pOj73HERGqTt6o6MweW9W5bL2W7CBrUa7jQt7fM=";
};
vendorHash = "sha256-JnvP0PUOYNJLBpY9BWlC6cJ+Sor2gxDgSKJ8KnUctWc=";
vendorHash = "sha256-3cjohavZfK4hoOMPVLvzwp4ORQ00baqtFUhFyA7Z8OM=";
subPackages = [ "cmd/ooniprobe" ];
+18 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "prek";
version = "0.2.11";
version = "0.2.17";
src = fetchFromGitHub {
owner = "j178";
repo = "prek";
tag = "v${finalAttrs.version}";
hash = "sha256-wzbvofNOAtqbjO5//ECu1FeZrS0FyDvFZPKxC0fOJnE=";
sha256 = "sha256-7GTp1UBAnxLVEQFTQbBxGiKSvZwEVVMA7oa3Iz5Ifzk=";
};
cargoHash = "sha256-KVGdAPyUlPCgcx1DpZbfNRNmALdJvzOcsv3WQy3Q7OI=";
cargoHash = "sha256-i09ZcG3xUt+qFZge/8MiZ5yKxIeBd3l0BYlY5OFf3l8=";
preBuild = ''
version312_str=$(${python312}/bin/python -c 'import sys; print(sys.version_info[:3])')
@@ -66,6 +66,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
"script"
"check_useless_excludes_remote"
"run_worktree"
"try_repo_relative_path"
"languages::tests::test_native_tls"
# "meta_hooks"
"reuse_env"
"docker::docker"
@@ -86,6 +88,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
"python::can_not_download"
"python::hook_stderr"
"python::language_version"
"ruby::additional_gem_dependencies"
"ruby::environment_isolation"
"ruby::gemspec_workflow"
"ruby::language_version_default"
"ruby::local_hook_with_gemspec"
"ruby::native_gem_dependency"
"ruby::native_gem_dependency"
"ruby::process_files"
"ruby::specific_ruby_available"
"ruby::specific_ruby_unavailable"
"ruby::system_ruby"
# can't checkout pre-commit-hooks
"cjk_hook_name"
"fail_fast"
@@ -116,6 +129,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
"no_commit_to_branch_hook"
"no_commit_to_branch_hook_with_custom_branches"
"no_commit_to_branch_hook_with_patterns"
"check_executables_have_shebangs_various_cases"
"check_executables_have_shebangs_hook"
# does not properly use TMP
"hook_impl"
# problems with environment
+10 -10
View File
@@ -1,14 +1,14 @@
{
version = "1.76.0";
version = "1.77.0";
hashes = {
linux-aarch_64 = "sha256-Omkq1WIhrUuppemKB8qR5nZsk7BH1oZTxEaMTMyuihQ=";
linux-ppcle_64 = "sha256-QG6tupI8BuXIr6dBH/FuKfHmuvgDdXhT929HvK/hS3o=";
linux-s390_64 = "sha256-8WfqHgzSUFsDt5iql1AtWJlGKgZ3I+N/bsAeKS6N5vI=";
linux-x86_32 = "sha256-LIArnJ6aQEH/0Tg9LgwgD/JUxDrLExJEuiK9cQWk+V0=";
linux-x86_64 = "sha256-AZJthJEssAc6vZsxBGdUFtMPKxdXN2tSb6Dfu5QnIhg=";
osx-aarch_64 = "sha256-gQDGfR6lR/w03WONsgh2khNJ35nEJgj9/c8c7xXB1v8=";
osx-x86_64 = "sha256-gQDGfR6lR/w03WONsgh2khNJ35nEJgj9/c8c7xXB1v8=";
windows-x86_32 = "sha256-VtOwQ+PJxsEGEGAzjSFJTcu9W4FiPXmfRqpJQeOAgRU=";
windows-x86_64 = "sha256-RAIkIzJRMqK+MkYHsS0QIwt7mFtAevciyreogPRVdA4=";
linux-aarch_64 = "sha256-2sY1n35HOW4jwGk48GQOHDmh2bd9V9GFT/UylKBIel0=";
linux-ppcle_64 = "sha256-hYxdveN3RpUNLv4g3BMO4CAeYpV13hGmZEdS///yfE4=";
linux-s390_64 = "sha256-7cnA9dXZTiYEhR6PwsBmRZ0UDmKrxoeGZqVjHUHKxQQ=";
linux-x86_32 = "sha256-QVc2ANzOqoyLOAy1r+daY9OmbXrF1ebmB/oNS+gj70Q=";
linux-x86_64 = "sha256-b+H3Llnxl0Cb7/TNolyay/noKrexz7IMGFvC5hlWwo4=";
osx-aarch_64 = "sha256-5H2txiDsG21tpFB9meM7tKGw+IZzBC8IoBlPScxckhQ=";
osx-x86_64 = "sha256-5H2txiDsG21tpFB9meM7tKGw+IZzBC8IoBlPScxckhQ=";
windows-x86_32 = "sha256-YkUchHqd20lmICFIEdPv+pHpSx1D89im1BOTureQIco=";
windows-x86_64 = "sha256-35/e+ampAdMFI/xFh3dDD2cR0qzvNAsJBjn6ui1J2hE=";
};
}
+2 -2
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "rime-wanxiang";
version = "13.2.4";
version = "13.3.13";
src = fetchFromGitHub {
owner = "amzxyz";
repo = "rime_wanxiang";
tag = "v" + finalAttrs.version;
hash = "sha256-kr9Gr6GBWy/SJtjHqdATbcZAF4Gt3bbkI956NQCAwCc=";
hash = "sha256-XAhltyqzs+yLx7HWFQdb7veuD2LYFh4xb18V6N+e474=";
};
installPhase = ''
+3 -3
View File
@@ -26,14 +26,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "s7";
version = "11.7-unstable-2025-11-12";
version = "11.7-unstable-2025-11-18";
src = fetchFromGitLab {
domain = "cm-gitlab.stanford.edu";
owner = "bil";
repo = "s7";
rev = "5de700554e7aeeb538605874e0c292babe702736";
hash = "sha256-PFdIdSKzWKyiLV1oo1t8JaCsyNOOXFqA62s7tZNSpdI=";
rev = "25525633c61f6dc9b71a15a2ffad01c860757cfb";
hash = "sha256-SaMViWdYGG5wtIHqmZTPAaAl6p2e5qBR6Zz4eXS5O7Y=";
};
buildInputs =
+11 -7
View File
@@ -18,17 +18,18 @@
judy,
prometheus-cpp,
libz,
gtest,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "saunafs";
version = "5.1.2";
version = "5.3.0";
src = fetchFromGitHub {
owner = "leil-io";
repo = "saunafs";
rev = "v${finalAttrs.version}";
hash = "sha256-56PlUeXHqNhKYokKWqLCeaP3FZBdefhQFQQoP8YytQQ=";
hash = "sha256-pT12m50q6unqx9IzRHRs8WE7ygVJW8bi0IKUHu8bGCs=";
};
patches = [
@@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
judy
prometheus-cpp
libz
gtest
];
cmakeFlags = [
@@ -68,11 +70,13 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "ENABLE_JEMALLOC" true)
];
postInstall = lib.optionalString (!stdenv.hostPlatform.isStatic) ''
rm $out/lib/*.a
ln -s $out/bin/sfsmount $out/bin/mount.saunafs
'';
postInstall =
lib.optionalString (!stdenv.hostPlatform.isStatic) ''
rm $out/lib/*.a
''
+ ''
ln -s $out/bin/sfsmount $out/bin/mount.saunafs
'';
passthru.tests = nixosTests.saunafs;
+3 -3
View File
@@ -22,13 +22,13 @@
stdenv.mkDerivation {
pname = "slade";
version = "3.2.8-unstable-2025-11-10";
version = "3.2.9-unstable-2025-11-19";
src = fetchFromGitHub {
owner = "sirjuddington";
repo = "SLADE";
rev = "ce9593a6c15656394249b52d2a6224a7a86c5a5a";
hash = "sha256-1xp9BzCrUvifzb5ouU3Jdwe0SRDWo+A4p0YlcqT62Y0=";
rev = "47ffdea512d61ea7c628ba14759757975b87fd09";
hash = "sha256-N6y5aqZ9V9+hxzFNzJCsGSWWzrCTIcppFy7Qb63Y/7I=";
};
nativeBuildInputs = [
+4 -2
View File
@@ -8,6 +8,7 @@
gdk-pixbuf,
libappindicator,
librsvg,
upower,
udevCheckHook,
acl,
}:
@@ -17,14 +18,14 @@
# instead of adding this to `services.udev.packages` on NixOS,
python3Packages.buildPythonApplication rec {
pname = "solaar";
version = "1.1.14";
version = "1.1.16";
format = "setuptools";
src = fetchFromGitHub {
owner = "pwr-Solaar";
repo = "Solaar";
tag = version;
hash = "sha256-cAM4h0OOXxItSf0Gb9PfHn385FXMKwvIUuYTrjgABwA=";
hash = "sha256-PhZoDRsckJXk2t2qR8O3ZGGeMUhmliqSpibfQDO7BeA=";
};
outputs = [
@@ -42,6 +43,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
libappindicator
librsvg
upower
];
propagatedBuildInputs = with python3Packages; [
+7 -7
View File
@@ -10,18 +10,18 @@
testers,
}:
ocamlPackages.buildDunePackage rec {
ocamlPackages.buildDunePackage (finalAttrs: {
pname = "soupault";
version = "5.1.0";
version = "5.2.0";
minimalOCamlVersion = "4.13";
minimalOCamlVersion = "5.3";
src = fetchzip {
urls = [
"https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz"
"https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz"
"https://github.com/PataphysicalSociety/soupault/archive/${finalAttrs.version}.tar.gz"
"https://codeberg.org/PataphysicalSociety/soupault/archive/${finalAttrs.version}.tar.gz"
];
hash = "sha256-yAkJgNwF763b2DFGA+4Ve+jafFxZbFDm3QxisDD6gYo=";
hash = "sha256-BuQ2yQzf6PpK6HUfuHDscgKkOBttCrs0zTh37hMUR6E=";
};
nativeBuildInputs = [
@@ -71,4 +71,4 @@ ocamlPackages.buildDunePackage rec {
maintainers = with lib.maintainers; [ toastal ];
mainProgram = "soupault";
};
}
})
+3 -3
View File
@@ -19,13 +19,13 @@
}:
rustPlatform.buildRustPackage {
pname = "steel";
version = "0-unstable-2025-11-12";
version = "0-unstable-2025-11-15";
src = fetchFromGitHub {
owner = "mattwparas";
repo = "steel";
rev = "8bc2c6aba8d8047415b33a1a3fe4244a74ede2b8";
hash = "sha256-9P0cvQddgDMfZNp44l72YHu4PdsVULVCqJGR0zMawCU=";
rev = "90aa39eb0df033a6eeb579d553debc0fc48ef7ee";
hash = "sha256-7N3LBnDm7qIDR8zBDS0FY6UVp88L/mh8umT/YTTh7HA=";
};
cargoHash = "sha256-bXAgp83U48GsTAuki3tsoOK7X+UepKJIlS0bL5qMc8I=";
+4 -4
View File
@@ -17,10 +17,10 @@
let
mvnDepsHashes = {
"x86_64-linux" = "sha256-OTd51n6SSlFziqvvHmfyMAyQRwIzsHxFGuJ62zlX1Ec=";
"aarch64-linux" = "sha256-tPaGLqm0jgEoz0BD/C6AG9xupovQvib/v0kB/jjqwB8=";
"x86_64-darwin" = "sha256-Rs7nTiGazUW8oJJr6fbJKelzFqd2n278sJYoMy2/0N4=";
"aarch64-darwin" = "sha256-gnP+G33LPRMQ6HRzeZ8cEV9oSohrlPcMwlBB4rvH7+E=";
"x86_64-linux" = "sha256-ZlGOxVXU63AKzfWeOLGPa2l8v+Rv8Bzr4H/Er62cxk8=";
"aarch64-linux" = "sha256-CrOYBEnp8cVpdF2PrpGQjmdYH8ZKupm9Jf1LVyNoObk=";
"x86_64-darwin" = "sha256-D1QkCTYep9RbNUaZPrnbgkR94cvQkX3xxxUxwyLIqx8=";
"aarch64-darwin" = "sha256-zvvko6wSJoc2cgMLl7XVmypq0vVTirrIpJiEdypPlrU=";
};
knownMvnDepsHash =
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "trickest-cli";
version = "2.1.6";
version = "2.1.7";
src = fetchFromGitHub {
owner = "trickest";
repo = "trickest-cli";
tag = "v${version}";
hash = "sha256-oeFGpojxGCIPiVWNVOMO+/GIQn5qsAdJLZQun+/r3/M=";
hash = "sha256-LDroWDGTYUFtkZkooWCEL59f+iu8izUcSyqr3Jzch7o=";
};
vendorHash = "sha256-Ae0fNzYOAeCMrNFVhw4VvG/BkOMcguIMiBvLGt7wxEo=";
+3 -3
View File
@@ -20,18 +20,18 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vicinae";
version = "0.16.5";
version = "0.16.8";
src = fetchFromGitHub {
owner = "vicinaehq";
repo = "vicinae";
tag = "v${finalAttrs.version}";
hash = "sha256-smhbchRZmp7DwRLGA3QoI12kQuMVaxiNkhzfC+n19+4=";
hash = "sha256-TAKv3dmc8DSlVp0LXQeLgrgfLTbQ/saQelenFUp9sP0=";
};
apiDeps = fetchNpmDeps {
src = "${finalAttrs.src}/typescript/api";
hash = "sha256-VrtxQG1wQGcRHbJWPPt6aS7x1hAHc4Z1+0l+cKv3YdI=";
hash = "sha256-4OgVCnw5th2TcXszVY5G9ENr3/Y/eR2Kd45DbUhQRNk=";
};
extensionManagerDeps = fetchNpmDeps {
+2 -2
View File
@@ -13,13 +13,13 @@
buildGoModule (finalAttrs: {
pname = "VictoriaMetrics";
version = "1.129.1";
version = "1.130.0";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaMetrics";
tag = "v${finalAttrs.version}";
hash = "sha256-LLiiA+A3s3WcJcwyqRYKFn+VwaEbbufiawZsyG+ibGU=";
hash = "sha256-upviz4MDwEXzIs21mPwa5TgKywfXiRcsZfdF/d3w/Ao=";
};
vendorHash = null;
+4 -4
View File
@@ -11,16 +11,16 @@
# error tls.ConnectionState: struct field count mismatch: 17 vs 16
buildGo124Module (finalAttrs: {
pname = "warp-plus";
version = "1.2.6-unstable-2025-10-28";
version = "1.2.6-unstable-2025-11-17";
src = fetchFromGitHub {
owner = "bepass-org";
repo = "warp-plus";
rev = "3653f7519d2a08a36222accff6899522bb8b03d0";
hash = "sha256-T0YTxQ7iciv5i7lw+bU00B6iYquzBwzYkAlOGZiKeWc=";
rev = "f70ea7e4f193717c73f9a4357cbc98d6944b36bb";
hash = "sha256-5H0iF+dc+3qQrFCPiaBxHMSoHsmciKvwX1SJX7TMjeE=";
};
vendorHash = "sha256-GmxiQk50iQoH2J/qUVvl9RBz6aIQp8RURqTzrl6NdCY=";
vendorHash = "sha256-FqyNjnCoeOCraVv9WhQIw+PxrJVfOu2dAnINi++nsW4=";
ldflags = [
"-s"
+3 -3
View File
@@ -6,13 +6,13 @@
}:
python3.pkgs.buildPythonApplication {
pname = "yaookctl";
version = "0-unstable-2025-11-06";
version = "0-unstable-2025-11-18";
src = fetchFromGitLab {
owner = "yaook";
repo = "yaookctl";
rev = "8a4bd469e9731cccd4dc3de37f28d37247c0355c";
hash = "sha256-aOZ4iXGgZyTphYvS90mcqENSOMv7L5L1BkwtorR0648=";
rev = "cc339565b136ec9bad36f9eb3dc1b3da728cc0ec";
hash = "sha256-9UCF1qo6OOfOBoWqsQMxlHZNJD7OQnSFONJ+cXT0LUs=";
};
pyproject = true;
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
version = "8.0.0";
version = "8.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "calendar";
rev = version;
sha256 = "sha256-gBQfrRSaw3TKcsSAQh/hcTpBoEQstGdLbppoZ1/Z1q8=";
tag = version;
hash = "sha256-kkdz82eCc9dKemUtCaz9OUObeICU5W1Ino4JNUvmhAw=";
};
nativeBuildInputs = [
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "elementary-feedback";
version = "8.0.1";
version = "8.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "feedback";
rev = version;
sha256 = "sha256-D0x0jKYEB6Bo8ETgVCjgdOItc+VJYlrr8N9lI/Z3eXU=";
tag = version;
hash = "sha256-FvlSfcP/Qdo9zBFm2XiEqaxYGILe4BCNPyCELS43pew=";
};
patches = [
@@ -1,20 +1,12 @@
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 14b0701..13638a5 100644
index 8f407bf..32db5fb 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -82,6 +82,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
@@ -124,6 +124,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
AppStream.PoolFlags.LOAD_FLATPAK |
AppStream.PoolFlags.RESOLVE_ADDONS
);
+ appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO);
#else
appstream_pool.clear_metadata_locations ();
// flatpak's appstream files exists only inside they sandbox
@@ -89,6 +90,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
foreach (var app in app_entries) {
appstream_pool.add_metadata_location (appdata_dir.printf (app));
}
+ appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/");
#endif
try {
appstream_pool.load_async.begin (null, (obj, res) => {
try {
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "sideload";
version = "6.3.0";
version = "6.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "sideload";
rev = version;
sha256 = "sha256-2tYdcHx77XN2iu2PKXAKwOtb4TOFt3Igv17w2zIxqT4=";
tag = version;
hash = "sha256-mFaMKY4SdnSdRsHy5vIbJFdMx2FGxYCWmSAWkb99yUI=";
};
nativeBuildInputs = [
@@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
version = "8.2.1";
version = "8.2.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "switchboard-plug-about";
rev = version;
sha256 = "sha256-H4BDLP3yzQi+ougpvBvnv1R1TImzUjSOVDGbOqw9hvg=";
repo = "settings-system";
tag = version;
hash = "sha256-SPFCBsk4tVR+5Q6uuDG/fTIn+4TXdeAobfQxkmxMiW0=";
};
nativeBuildInputs = [
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Switchboard About Plug";
homepage = "https://github.com/elementary/switchboard-plug-about";
homepage = "https://github.com/elementary/settings-system";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-mouse-touchpad";
version = "8.0.2";
version = "8.0.3";
src = fetchFromGitHub {
owner = "elementary";
repo = "switchboard-plug-mouse-touchpad";
rev = version;
sha256 = "sha256-332y3D3T90G6bDVacRm3a1p4mLK3vsW8sBvre5lW/mk=";
repo = "settings-mouse-touchpad";
tag = version;
hash = "sha256-Txm6iVwhuqfLrmAVgXeNB0p6PVEenvSSHurMrXoeHoY=";
};
patches = [
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Switchboard Mouse & Touchpad Plug";
homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad";
homepage = "https://github.com/elementary/settings-mouse-touchpad";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-notifications";
version = "8.0.0";
version = "8.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "switchboard-plug-notifications";
rev = version;
sha256 = "sha256-53rpnp1RWdPofY00XWKiz8WDPC7RNMaGQFHBDzjsIt4=";
repo = "settings-notifications";
tag = version;
hash = "sha256-MYvSru/78jMhc1Rk8YuztajEdmRRssCFN7IMUHWzW78=";
};
nativeBuildInputs = [
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Switchboard Notifications Plug";
homepage = "https://github.com/elementary/switchboard-plug-notifications";
homepage = "https://github.com/elementary/settings-notifications";
license = licenses.gpl2Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
version = "8.2.0";
version = "8.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "settings-desktop";
rev = version;
sha256 = "sha256-TYwiL6+VjfSDiFAlMe482gB8a/OtCYHl5r8gh9Hcvfg=";
tag = version;
hash = "sha256-8NPMZfOQIZtMiGrsFXYPOwNbPU+d9CgPBsT36VJsvHw=";
};
nativeBuildInputs = [
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-printers";
version = "8.0.1";
version = "8.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "switchboard-plug-printers";
rev = version;
sha256 = "sha256-1znz8B4CGQGDiJC4Mt61XAh9wWAV8J0+K3AIpFcffXQ=";
repo = "settings-printers";
tag = version;
hash = "sha256-oqdmARZamTbMwpKKmyVZflYLCd0Qf5iE5lHSMfdPGA8=";
};
nativeBuildInputs = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Switchboard Printers Plug";
homepage = "https://github.com/elementary/switchboard-plug-printers";
homepage = "https://github.com/elementary/settings-printers";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
@@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-security-privacy";
version = "8.0.1";
version = "8.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "switchboard-plug-security-privacy";
rev = version;
sha256 = "sha256-k6dSiiBqqbhH7rmhpBu83LX8at/qJ4gkrg4Xc+VbkIE=";
repo = "settings-security-privacy";
tag = version;
hash = "sha256-OlLeeS0b4IMCvOMyHlIRaQl11ivn4Y2+vYdXOzIlvaw=";
};
nativeBuildInputs = [
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Switchboard Security & Privacy Plug";
homepage = "https://github.com/elementary/switchboard-plug-security-privacy";
homepage = "https://github.com/elementary/settings-security-privacy";
license = licenses.gpl3Plus;
platforms = platforms.linux;
teams = [ teams.pantheon ];
@@ -17,13 +17,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "qodeassist-plugin";
version = "0.8.1";
version = "0.8.3";
src = fetchFromGitHub {
owner = "Palm1r";
repo = "QodeAssist";
tag = "v${finalAttrs.version}";
hash = "sha256-TofKw8zUkp7Er6Dn9PKvLpJxvq19+WDKb6rFuZm/sVw=";
hash = "sha256-xSa+d+tm++rXkn//i4s5ibKd9fcfje3lXSbhr4JMcDE=";
};
dontWrapQtApps = true;
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aesedb";
version = "0.1.7";
version = "0.1.8";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "skelsec";
repo = "aesedb";
tag = version;
hash = "sha256-jT5Aru/BqvJf4HpD418+GrkZ0/g2XcTV3oWSOmo0Sbw=";
hash = "sha256-YoeqxYkohAR6RaQYDXt7T00LCQDSb/o/ddxYRDGP/2s=";
};
nativeBuildInputs = [ setuptools ];
@@ -0,0 +1,48 @@
{
lib,
azure-common,
azure-mgmt-core,
buildPythonPackage,
fetchPypi,
isodate,
pythonOlder,
setuptools,
typing-extensions,
}:
buildPythonPackage rec {
pname = "azure-mgmt-dashboard";
version = "1.1.0";
format = "wheel";
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "azure_mgmt_dashboard";
inherit version;
format = "wheel";
python = "py3";
dist = "py3";
hash = "sha256-WoZW5p30f0mrmMyhD68nxqlGrTtUU93V167B8wZitdA=";
};
propagatedBuildInputs = [
azure-common
azure-mgmt-core
isodate
typing-extensions
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.dashboard" ];
meta = with lib; {
description = "Microsoft Azure Dashboard Management Client Library for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/dashboard/azure-mgmt-dashboard/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ techknowlogick ];
};
}
@@ -0,0 +1,48 @@
{
lib,
azure-common,
azure-mgmt-core,
buildPythonPackage,
fetchPypi,
isodate,
pythonOlder,
setuptools,
typing-extensions,
}:
buildPythonPackage rec {
pname = "azure-mgmt-hybridcompute";
version = "9.1.0b2";
format = "wheel";
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "azure_mgmt_hybridcompute";
inherit version;
format = "wheel";
python = "py3";
dist = "py3";
hash = "sha256-bKv4A6PjN6fMpyso0JqewADcKGOK1wXlULtkZpzrilY=";
};
propagatedBuildInputs = [
azure-common
azure-mgmt-core
isodate
typing-extensions
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.hybridcompute" ];
meta = with lib; {
description = "Microsoft Azure Hybrid Compute Management Client Library for Python";
homepage = "https://github.com/Azure/azure-sdk-for-python";
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/hybridcompute/azure-mgmt-hybridcompute/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ techknowlogick ];
};
}
@@ -0,0 +1,21 @@
From 59b84698b142f5a0998ee9e395df717a1b77e9b2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 21:57:06 +0100
Subject: [PATCH] Add build-system section
---
pyproject.toml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pyproject.toml b/pyproject.toml
index bcb1e65e3..00dc374fe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,3 +28,7 @@ black = "^24.4"
[tool.black]
line-length=120
+
+[build-system]
+requires = ["poetry_core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
@@ -0,0 +1,28 @@
From 4ecaacf3fa93720a13cc06732d427415ae66d48f Mon Sep 17 00:00:00 2001
From: Nick Bathum <nickbathum@gmail.com>
Date: Fri, 14 Mar 2025 20:36:49 -0400
Subject: [PATCH] Fix packaging: Ensure resources are included in both sdist
and wheel
Poetry's `include` directive defaults to only including files in the sdist.
See https://github.com/python-poetry/poetry-core/pull/773
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index 0262552..c7deb2d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ authors = ["mingrammer <mingrammer@gmail.com>"]
readme = "README.md"
homepage = "https://diagrams.mingrammer.com"
repository = "https://github.com/mingrammer/diagrams"
-include = ["resources/**/*"]
+include = [{ path = "resources/**/*", format = ["sdist", "wheel"] }]
[tool.poetry.scripts]
diagrams="diagrams.cli:main"
--
2.47.2
@@ -29,11 +29,9 @@ buildPythonPackage rec {
patches = [
# Add build-system, https://github.com/mingrammer/diagrams/pull/1089
(fetchpatch {
name = "add-build-system.patch";
url = "https://github.com/mingrammer/diagrams/commit/59b84698b142f5a0998ee9e395df717a1b77e9b2.patch";
hash = "sha256-/zV5X4qgHJs+KO9gHyu6LqQ3hB8Zx+BzOFo7K1vQK78=";
})
./0001-Add-build-system-section.patch
# Fix poetry include, https://github.com/mingrammer/diagrams/pull/1128
./0002-Fix-packaging-Ensure-resources-are-included.patch
./remove-black-requirement.patch
];
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "fast-array-utils";
version = "1.3";
version = "1.3.1";
pyproject = true;
src = fetchFromGitHub {
owner = "scverse";
repo = "fast-array-utils";
tag = "v${version}";
hash = "sha256-cU5kBOgjinsievGtnl52RQ39txHuXG5n7YeKGF/9O0Q=";
hash = "sha256-FUzCdDFDqP+izlSWruWzslfPayzRN7MFx1LOikyMDss=";
};
# hatch-min-requirements tries to talk to PyPI by default. See https://github.com/tlambert03/hatch-min-requirements?tab=readme-ov-file#environment-variables.
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "locust";
version = "2.42.1";
version = "2.42.2";
pyproject = true;
src = fetchFromGitHub {
owner = "locustio";
repo = "locust";
tag = version;
hash = "sha256-yyG4HVti0BAcGWQHID799YfkCEIBmpTkUUm8QzXMivc=";
hash = "sha256-Myek56kHUX0rFNJcEhfMTSE7xwYhm4AmogxIcUNzrR0=";
};
postPatch = ''
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pymitsubishi";
version = "0.4.1";
version = "0.4.2";
pyproject = true;
src = fetchFromGitHub {
owner = "pymitsubishi";
repo = "pymitsubishi";
tag = "v${version}";
hash = "sha256-Uh3hlgXYgGDZDpEJInLX323fftVciwh9fLEKF2Kozq0=";
hash = "sha256-QjHMIzl2VV1S8tNWsFLgLDNX6/0wN9FeIJIo5KgkDVE=";
};
build-system = [ setuptools ];
@@ -42,14 +42,14 @@
buildPythonPackage rec {
pname = "python-lsp-server";
version = "1.13.1";
version = "1.13.2";
pyproject = true;
src = fetchFromGitHub {
owner = "python-lsp";
repo = "python-lsp-server";
tag = "v${version}";
hash = "sha256-wxouTbqkieH3fxnXY0PIKDtDV97AbGWujisS2JmjBkE=";
hash = "sha256-uW4q/uwEkKASZBPQ994s5+t5Urg7/nZIaIv4hqyIffM=";
};
pythonRelaxDeps = [
@@ -114,7 +114,6 @@ buildPythonPackage rec {
writableTmpDirAsHomeHook
]
++ optional-dependencies.all;
versionCheckProgram = "${placeholder "out"}/bin/pylsp";
versionCheckProgramArg = "--version";
disabledTests = [
@@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "python-roborock";
version = "3.7.0";
version = "3.8.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Python-roborock";
repo = "python-roborock";
tag = "v${version}";
hash = "sha256-KgrpfcGaq84VWlcGvKMjJfz4bEkC9l1waj1ZucQa7DA=";
hash = "sha256-Ts1X07eTv4KXv344F3fGazHlDx6XXGQfdmxb+gd/0qc=";
};
pythonRelaxDeps = [ "pycryptodome" ];
@@ -4,24 +4,24 @@
fetchFromGitHub,
pycryptodome,
pycryptodomex,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "unicrypto";
version = "0.0.11";
format = "setuptools";
disabled = pythonOlder "3.7";
version = "0.0.12";
pyproject = true;
src = fetchFromGitHub {
owner = "skelsec";
repo = "unicrypto";
tag = version;
hash = "sha256-quMh4yQSqbwZwWTJYxW/4F0k2c2nh82FEiNCSeQzhvo=";
hash = "sha256-RYwovFMalBNDPDEVjQ/8/N7DkOMiyeEQ5ESdgCK8RW8=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
pycryptodome
pycryptodomex
];
@@ -34,8 +34,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Unified interface for cryptographic libraries";
homepage = "https://github.com/skelsec/unicrypto";
changelog = "https://github.com/skelsec/unicrypto/releases/tag/${version}";
license = with licenses; [ mit ];
changelog = "https://github.com/skelsec/unicrypto/releases/tag/${src.tag}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
+4
View File
@@ -1409,6 +1409,8 @@ self: super: with self; {
azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { };
azure-mgmt-dashboard = callPackage ../development/python-modules/azure-mgmt-dashboard { };
azure-mgmt-databoxedge = callPackage ../development/python-modules/azure-mgmt-databoxedge { };
azure-mgmt-databricks = callPackage ../development/python-modules/azure-mgmt-databricks { };
@@ -1449,6 +1451,8 @@ self: super: with self; {
azure-mgmt-hdinsight = callPackage ../development/python-modules/azure-mgmt-hdinsight { };
azure-mgmt-hybridcompute = callPackage ../development/python-modules/azure-mgmt-hybridcompute { };
azure-mgmt-imagebuilder = callPackage ../development/python-modules/azure-mgmt-imagebuilder { };
azure-mgmt-iotcentral = callPackage ../development/python-modules/azure-mgmt-iotcentral { };