Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -41,10 +41,6 @@ jobs:
|
||||
run:
|
||||
runs-on: ubuntu-slim
|
||||
if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
|
||||
env:
|
||||
# TODO: Remove after 2026-03-04, when Node 24 becomes the default.
|
||||
# https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
|
||||
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
||||
with:
|
||||
|
||||
@@ -1598,6 +1598,12 @@
|
||||
githubId = 153175;
|
||||
name = "Andrew Marshall";
|
||||
};
|
||||
ambiso = {
|
||||
email = "ambisotopy@gmail.com";
|
||||
github = "ambiso";
|
||||
githubId = 3750466;
|
||||
name = "Robin Leander Schröder";
|
||||
};
|
||||
ambossmann = {
|
||||
email = "timogottszky+git@gmail.com";
|
||||
github = "Ambossmann";
|
||||
@@ -13266,12 +13272,6 @@
|
||||
githubId = 879272;
|
||||
name = "Julio Merino";
|
||||
};
|
||||
jn-sena = {
|
||||
email = "jn-sena@proton.me";
|
||||
github = "jn-sena";
|
||||
githubId = 45771313;
|
||||
name = "Sena";
|
||||
};
|
||||
jnsgruk = {
|
||||
email = "jon@sgrs.uk";
|
||||
github = "jnsgruk";
|
||||
|
||||
@@ -2306,6 +2306,9 @@
|
||||
"test-opt-meta.hydraPlatforms": [
|
||||
"index.html#test-opt-meta.hydraPlatforms"
|
||||
],
|
||||
"test-opt-meta.teams": [
|
||||
"index.html#test-opt-meta.teams"
|
||||
],
|
||||
"test-opt-meta.timeout": [
|
||||
"index.html#test-opt-meta.timeout"
|
||||
],
|
||||
|
||||
@@ -1,6 +1,20 @@
|
||||
{ lib, ... }:
|
||||
{ lib, options, ... }:
|
||||
let
|
||||
inherit (lib) types mkOption literalMD;
|
||||
|
||||
# Approximate position of meta.teams / meta.maintainers in nixos tests.
|
||||
# Right now this assumes only one such position and ignores other definitions.
|
||||
# FIXME allow having multiple `maintainersPosition` et al..
|
||||
getPosition =
|
||||
definitionsWithLocations:
|
||||
if definitionsWithLocations == [ ] then
|
||||
null
|
||||
else
|
||||
{
|
||||
file = (lib.head definitionsWithLocations).file;
|
||||
column = 0;
|
||||
line = 1;
|
||||
};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
@@ -12,7 +26,7 @@ in
|
||||
'';
|
||||
apply = lib.filterAttrs (k: v: v != null);
|
||||
type = types.submodule (
|
||||
{ config, ... }:
|
||||
{ options, config, ... }:
|
||||
{
|
||||
options = {
|
||||
maintainers = mkOption {
|
||||
@@ -22,6 +36,25 @@ in
|
||||
The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test.
|
||||
'';
|
||||
};
|
||||
maintainersPosition = mkOption {
|
||||
internal = true;
|
||||
readOnly = true;
|
||||
type = types.nullOr types.attrs;
|
||||
default = getPosition options.maintainers.definitionsWithLocations;
|
||||
};
|
||||
teams = mkOption {
|
||||
type = types.listOf types.raw;
|
||||
default = [ ];
|
||||
description = ''
|
||||
The [list of maintainer-teams](https://nixos.org/manual/nixpkgs/stable/#var-meta-teams) for this test.
|
||||
'';
|
||||
};
|
||||
teamsPosition = mkOption {
|
||||
internal = true;
|
||||
readOnly = true;
|
||||
type = types.nullOr types.attrs;
|
||||
default = getPosition options.teams.definitionsWithLocations;
|
||||
};
|
||||
timeout = mkOption {
|
||||
type = types.nullOr types.int;
|
||||
default = 3600; # 1 hour
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
}:
|
||||
let
|
||||
cfg = config.security.account-utils;
|
||||
format = pkgs.formats.ini { };
|
||||
in
|
||||
{
|
||||
options.security.account-utils = {
|
||||
@@ -25,6 +26,16 @@ in
|
||||
:::
|
||||
'';
|
||||
};
|
||||
pwaccessd.settings = lib.mkOption {
|
||||
description = ''
|
||||
Options for pwaccessd.
|
||||
See {manpage}`pwaccessd.conf(5)` for available options.
|
||||
'';
|
||||
type = lib.types.submodule {
|
||||
freeformType = format.type;
|
||||
};
|
||||
default = { };
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
@@ -44,6 +55,8 @@ in
|
||||
};
|
||||
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
environment.etc."account-utils/pwaccessd.conf".source =
|
||||
format.generate "pwaccessd.conf" cfg.pwaccessd.settings;
|
||||
|
||||
security.pam.services = {
|
||||
pwupd-passwd = { };
|
||||
|
||||
@@ -5,13 +5,19 @@
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.tetrd;
|
||||
in
|
||||
{
|
||||
options.services.tetrd.enable = lib.mkEnableOption "tetrd";
|
||||
options.services.tetrd = {
|
||||
enable = lib.mkEnableOption "tetrd";
|
||||
package = lib.mkPackageOption pkgs "tetrd" { };
|
||||
};
|
||||
|
||||
config = lib.mkIf config.services.tetrd.enable {
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment = {
|
||||
systemPackages = [ pkgs.tetrd ];
|
||||
etc."resolv.conf".source = "/etc/tetrd/resolv.conf";
|
||||
systemPackages = [ cfg.package ];
|
||||
# etc."resolv.conf".source = "/etc/tetrd/resolv.conf"; # Disabled overwriting of resolve.conf since otherwise tetrd disables your dns when its not connected to a device.
|
||||
};
|
||||
|
||||
# Our resolv.conf will override resolvconf's version.
|
||||
@@ -21,11 +27,11 @@
|
||||
tmpfiles.rules = [ "f /etc/tetrd/resolv.conf - - -" ];
|
||||
|
||||
services.tetrd = {
|
||||
description = pkgs.tetrd.meta.description;
|
||||
description = cfg.package.meta.description;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.tetrd}/opt/Tetrd/bin/tetrd";
|
||||
ExecStart = "${cfg.package}/opt/Tetrd/bin/tetrd";
|
||||
Restart = "always";
|
||||
RuntimeDirectory = "tetrd";
|
||||
RootDirectory = "/run/tetrd";
|
||||
|
||||
@@ -60,7 +60,7 @@ in
|
||||
services.nginx = lib.mkIf cfg.nginx.enable {
|
||||
enable = lib.mkDefault true;
|
||||
virtualHosts."${cfg.domain}" = lib.mkMerge [
|
||||
cfg.nginx.virtualHost
|
||||
(lib.mapAttrsRecursive (_: lib.mkDefault) cfg.nginx.virtualHost)
|
||||
{
|
||||
root = lib.mkForce "${cfg.package}";
|
||||
|
||||
@@ -82,7 +82,7 @@ in
|
||||
services.caddy = lib.mkIf cfg.caddy.enable {
|
||||
enable = lib.mkDefault true;
|
||||
virtualHosts."${cfg.domain}" = lib.mkMerge [
|
||||
cfg.caddy.virtualHost
|
||||
(lib.mapAttrsRecursive (_: lib.mkDefault) cfg.caddy.virtualHost)
|
||||
{
|
||||
hostName = lib.mkForce cfg.domain;
|
||||
extraConfig = ''
|
||||
|
||||
@@ -10,16 +10,23 @@ with lib;
|
||||
let
|
||||
cfg = config.services.flarum;
|
||||
|
||||
# Only placeholders reach the world-readable Nix store; the install
|
||||
# script substitutes the real secrets at runtime.
|
||||
flarumInstallConfig = pkgs.writeText "config.json" (
|
||||
builtins.toJSON {
|
||||
debug = false;
|
||||
offline = false;
|
||||
|
||||
baseUrl = cfg.baseUrl;
|
||||
databaseConfiguration = cfg.database;
|
||||
databaseConfiguration =
|
||||
cfg.database
|
||||
// optionalAttrs (cfg.databasePasswordFile != null) {
|
||||
password = "@databasePassword@";
|
||||
};
|
||||
adminUser = {
|
||||
username = cfg.adminUser;
|
||||
password = cfg.initialAdminPassword;
|
||||
password =
|
||||
if cfg.initialAdminPasswordFile != null then "@adminPassword@" else cfg.initialAdminPassword;
|
||||
email = cfg.adminEmail;
|
||||
};
|
||||
settings = {
|
||||
@@ -69,7 +76,26 @@ in
|
||||
initialAdminPassword = mkOption {
|
||||
type = types.str;
|
||||
default = "flarum";
|
||||
description = "Initial password for the adminUser";
|
||||
description = ''
|
||||
Initial password for the adminUser.
|
||||
|
||||
WARNING: This is stored world-readable in the Nix store.
|
||||
Use {option}`initialAdminPasswordFile` instead.
|
||||
'';
|
||||
};
|
||||
|
||||
initialAdminPasswordFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/run/secrets/flarum-admin-password";
|
||||
description = ''
|
||||
File containing the initial password for adminUser.
|
||||
Must be readable by the flarum user.
|
||||
Takes precedence over {option}`initialAdminPassword`.
|
||||
|
||||
The password must not contain `"` or `\` characters, as it is
|
||||
substituted into a JSON installation config verbatim.
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
@@ -98,7 +124,12 @@ in
|
||||
bool
|
||||
int
|
||||
]);
|
||||
description = "MySQL database parameters";
|
||||
description = ''
|
||||
MySQL database parameters.
|
||||
|
||||
WARNING: A `password` set here is stored world-readable in the
|
||||
Nix store. Use {option}`databasePasswordFile` instead.
|
||||
'';
|
||||
default = {
|
||||
# the database driver; i.e. MySQL; MariaDB...
|
||||
driver = "mysql";
|
||||
@@ -118,6 +149,20 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
databasePasswordFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
example = "/run/secrets/flarum-db-password";
|
||||
description = ''
|
||||
File containing the database password.
|
||||
Must be readable by the flarum user.
|
||||
Takes precedence over `database.password`.
|
||||
|
||||
The password must not contain `"` or `\` characters, as it is
|
||||
substituted into a JSON installation config verbatim.
|
||||
'';
|
||||
};
|
||||
|
||||
createDatabaseLocally = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
@@ -210,6 +255,8 @@ in
|
||||
Type = "oneshot";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
# The secret-filled install config is staged in /tmp
|
||||
PrivateTmp = true;
|
||||
};
|
||||
path = [ config.services.phpfpm.phpPackage ];
|
||||
script = ''
|
||||
@@ -222,7 +269,18 @@ in
|
||||
''
|
||||
+ optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") ''
|
||||
if [ ! -f config.php ]; then
|
||||
php flarum install --file=${flarumInstallConfig}
|
||||
install -m 0600 ${flarumInstallConfig} /tmp/flarum-install.json
|
||||
${optionalString (cfg.initialAdminPasswordFile != null) ''
|
||||
${pkgs.replace-secret}/bin/replace-secret '@adminPassword@' \
|
||||
${escapeShellArg cfg.initialAdminPasswordFile} /tmp/flarum-install.json
|
||||
''}
|
||||
${optionalString (cfg.databasePasswordFile != null) ''
|
||||
${pkgs.replace-secret}/bin/replace-secret '@databasePassword@' \
|
||||
${escapeShellArg cfg.databasePasswordFile} /tmp/flarum-install.json
|
||||
''}
|
||||
php flarum install --file=/tmp/flarum-install.json
|
||||
# config.php contains the database password; stateDir is world-readable
|
||||
chmod 600 config.php
|
||||
fi
|
||||
''
|
||||
+ ''
|
||||
|
||||
@@ -448,8 +448,8 @@ in
|
||||
'';
|
||||
|
||||
# https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes
|
||||
boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000;
|
||||
boot.kernel.sysctl."net.core.wmem_max" = mkDefault 2500000;
|
||||
boot.kernel.sysctl."net.core.rmem_max" = mkDefault 7500000;
|
||||
boot.kernel.sysctl."net.core.wmem_max" = mkDefault 7500000;
|
||||
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.services.caddy = {
|
||||
|
||||
+24
-3
@@ -10,7 +10,7 @@
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
# Flarum installs and migrates the database on first boot and runs a
|
||||
# MariaDB server alongside PHP-FPM and nginx, so give the VM some headroom.
|
||||
@@ -28,8 +28,11 @@
|
||||
|
||||
adminUser = "admin";
|
||||
adminEmail = "admin@example.com";
|
||||
# Flarum rejects admin passwords shorter than 8 characters.
|
||||
initialAdminPassword = "flarum-admin-password";
|
||||
# The trailing newline matches how secret managers typically write files.
|
||||
initialAdminPasswordFile = "${pkgs.writeText "admin-pass" "flarum-admin-password\n"}";
|
||||
# MariaDB authenticates via unix socket and never checks this password;
|
||||
# setting it still exercises the substitution path.
|
||||
databasePasswordFile = "${pkgs.writeText "db-pass" "flarum-db-password\n"}";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -48,5 +51,23 @@
|
||||
|
||||
# The admin API endpoint should respond, confirming the app booted cleanly.
|
||||
machine.succeed("curl -sf http://localhost/api -o /dev/null")
|
||||
|
||||
# Only the placeholders may appear in the install config in the Nix store.
|
||||
machine.succeed("grep -q '@adminPassword@' /nix/store/*-config.json")
|
||||
machine.succeed("grep -q '@databasePassword@' /nix/store/*-config.json")
|
||||
machine.fail("grep -qe 'flarum-admin-password' -e 'flarum-db-password' /nix/store/*-config.json")
|
||||
|
||||
# A successful login proves the admin password was substituted intact.
|
||||
machine.succeed(
|
||||
"curl -sf http://localhost/api/token "
|
||||
+ "-H 'Content-Type: application/json' "
|
||||
+ "-d '{\"identification\": \"admin\", \"password\": \"flarum-admin-password\"}' "
|
||||
+ "| grep -F token"
|
||||
)
|
||||
|
||||
# The database password must arrive intact in config.php, which must
|
||||
# not be world-readable.
|
||||
machine.succeed("grep -q 'flarum-db-password' /var/lib/flarum/config.php")
|
||||
machine.succeed("[ $(stat -c %a /var/lib/flarum/config.php) = 600 ]")
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -11,7 +11,12 @@
|
||||
{
|
||||
security.enableWrappers = false;
|
||||
systemd.settings.Manager.NoNewPrivileges = true;
|
||||
security.account-utils.enable = true;
|
||||
security.account-utils = {
|
||||
enable = true;
|
||||
pwaccessd.settings = {
|
||||
ExpiredCheck.SpMin = true;
|
||||
};
|
||||
};
|
||||
users.mutableUsers = true;
|
||||
security.account-utils.extraArgs = [
|
||||
"-v"
|
||||
@@ -46,6 +51,9 @@
|
||||
print(f"passwd path is: {passwd_path}")
|
||||
assert "account-utils" in passwd_path
|
||||
|
||||
with subtest("config file exists"):
|
||||
machine.succeed("ls /etc/account-utils/pwaccessd.conf")
|
||||
|
||||
with subtest("create user"):
|
||||
machine.succeed("useradd -m alice")
|
||||
machine.succeed("(echo foobar; echo foobar) | passwd alice")
|
||||
|
||||
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "material-icon-theme";
|
||||
publisher = "PKief";
|
||||
version = "5.36.1";
|
||||
hash = "sha256-1yxTjIsyj8o97VlvDlWqPCNIxd6XgbjpqF5qNbVtEwg=";
|
||||
version = "5.37.0";
|
||||
hash = "sha256-remt7+OQnOqSrtUoUN3QCXXR3Bti/lWIMfb7i4j3w84=";
|
||||
};
|
||||
meta = {
|
||||
description = "Material Design Icons for Visual Studio Code";
|
||||
|
||||
@@ -119,13 +119,13 @@
|
||||
"vendorHash": "sha256-kvHI8cd/rl9kVKKzSwjrC0+Qikz3w2P9jgLvYa+T2DE="
|
||||
},
|
||||
"brightbox_brightbox": {
|
||||
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
|
||||
"hash": "sha256-bvwdtiwzXElhsXLmftXZQ567ExcC0E0L/5OeqIdp1SQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/brightbox/brightbox",
|
||||
"owner": "brightbox",
|
||||
"repo": "terraform-provider-brightbox",
|
||||
"rev": "v3.4.3",
|
||||
"rev": "v3.4.4",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
|
||||
"vendorHash": "sha256-TLNHhSyMw0rKFtd9EChg7zSGoxe57rh36nAPqu1j8w8="
|
||||
},
|
||||
"buildkite_buildkite": {
|
||||
"hash": "sha256-egeZCTQFyhKG0giyjNK9C/W+OGMOGv2l+65Vg3iTi2A=",
|
||||
@@ -589,13 +589,13 @@
|
||||
"vendorHash": "sha256-moP2fqZnj8J6IFAhb0n6pikVYVg2Is22xd/xuuJ+zIQ="
|
||||
},
|
||||
"hashicorp_google-beta": {
|
||||
"hash": "sha256-pEdNv1MViCsCb3wFoDghCeQ5q2FErtGrQL9noL5B11g=",
|
||||
"hash": "sha256-wf+pFYuDMqlFYvaTKTpgaeSSBoLgQlUAarobUAotLMo=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v7.39.0",
|
||||
"rev": "v7.40.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-u4zldvOO/TtNHC8B+c63DWMbk7iEix+S+y/RLExchI8="
|
||||
"vendorHash": "sha256-7f0HZQXVsIq7m8CUApTnHIroOjKwT1GaP+GjCf4C6n0="
|
||||
},
|
||||
"hashicorp_helm": {
|
||||
"hash": "sha256-Dw6khnp0pronRKbBv2gx8ygtVvRV9uQIHCXj2BblZ6k=",
|
||||
@@ -1274,11 +1274,11 @@
|
||||
"vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
|
||||
},
|
||||
"sumologic_sumologic": {
|
||||
"hash": "sha256-MraUjj18ooGYfOnsEJ0oCPIFQITagNRGMeAqZqEQWU4=",
|
||||
"hash": "sha256-h4ipmgcEK8Cv9/gQwdOtQqbhfXO/QXJsrHHV6O1HtL8=",
|
||||
"homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
|
||||
"owner": "SumoLogic",
|
||||
"repo": "terraform-provider-sumologic",
|
||||
"rev": "v3.2.9",
|
||||
"rev": "v3.2.10",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-nbiLH+J051XxTx+z8xGrp/DPYB7g9S4clFSWcZUKnAg="
|
||||
},
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "addchain";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mmcloughlin";
|
||||
repo = "addchain";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = false;
|
||||
hash = "sha256-msuZgNYqN1QldrbXJJ4BFXYhUsllAPt8W0KRrr8p6TM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qxlVGkbm95WFmH0+48XRXwrF7HRUWFxYHFzmFOaj4GA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/mmcloughlin/addchain/meta.buildversion=${version}"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/addchain" ];
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "addchain generates short addition chains for exponents of cryptographic interest with results rivaling the best hand-optimized chains";
|
||||
homepage = "https://github.com/mmcloughlin/addchain";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
ambiso
|
||||
];
|
||||
mainProgram = "addchain";
|
||||
};
|
||||
}
|
||||
@@ -105,7 +105,6 @@ buildGoModule (finalAttrs: {
|
||||
changelog = "https://github.com/Aylur/ags/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
PerchunPak
|
||||
johnrtitor
|
||||
];
|
||||
mainProgram = "ags";
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "air-formatter";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "posit-dev";
|
||||
repo = "air";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-u0icSo6aW6tLgY57RPAoVte5Awn16FLIvZEeeYNr5fk=";
|
||||
hash = "sha256-BWtQLgNFf/kULGvet33k3T1k2oL1hbDn2VPCj0JxrX4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-51xkTVs6j7n0os5wHWxpFC/uLHm3tz+SiWUHsd+bNRw=";
|
||||
cargoHash = "sha256-xcNVioDbejCLrWMaUA06r9GK5KEIPq6w0W7G7290kOU=";
|
||||
|
||||
useNextest = true;
|
||||
|
||||
|
||||
@@ -143,6 +143,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
substituteInPlace scripts/generate-protos.sh \
|
||||
--replace-fail "/usr/bin/env" "${coreutils}/bin/env"
|
||||
|
||||
substituteInPlace package.json \
|
||||
--replace-fail \
|
||||
'"build:nmh": "go build -o dist/nativeMessagingHost ./go/nativeMessagingHost.go"' \
|
||||
'"build:nmh": "go build -trimpath -ldflags=-buildid= -o dist/nativeMessagingHost ./go/nativeMessagingHost.go"'
|
||||
|
||||
cp -r ${anytype-heart}/lib dist/
|
||||
cp -r ${anytype-heart}/bin/anytypeHelper dist/
|
||||
|
||||
@@ -168,7 +173,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
# remove unnecessary files
|
||||
preInstall = ''
|
||||
chmod u+w -R dist node_modules
|
||||
find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +
|
||||
find dist node_modules -type f \( -name '*.ts' -o -name '*.map' \) -delete
|
||||
rm -f node_modules/keytar/build/{Makefile,binding.Makefile,config.gypi,keytar.target.mk}
|
||||
rm -rf node_modules/keytar/build/Release/{.deps,obj.target}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -32,17 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
# Remove chown commands and setuid bit
|
||||
substituteInPlace Makefile.in \
|
||||
--replace ' -o root ' ' ' \
|
||||
--replace ' -g root ' ' ' \
|
||||
--replace ' -o $(DAEMON_USERNAME) ' ' ' \
|
||||
--replace ' -o $(DAEMON_GROUPNAME) ' ' ' \
|
||||
--replace ' -g $(DAEMON_GROUPNAME) ' ' ' \
|
||||
--replace '$(DESTDIR)$(etcdir)' "$out/etc" \
|
||||
--replace '$(DESTDIR)$(ATJOB_DIR)' "$out/var/spool/atjobs" \
|
||||
--replace '$(DESTDIR)$(ATSPOOL_DIR)' "$out/var/spool/atspool" \
|
||||
--replace '$(DESTDIR)$(LFILE)' "$out/var/spool/atjobs/.SEQ" \
|
||||
--replace 'chown' '# skip chown' \
|
||||
--replace '6755' '0755'
|
||||
--replace-fail ' -o root ' ' ' \
|
||||
--replace-fail ' -g root ' ' ' \
|
||||
--replace-fail ' -o $(DAEMON_USERNAME) ' ' ' \
|
||||
--replace-fail ' -g $(DAEMON_GROUPNAME) ' ' ' \
|
||||
--replace-fail '$(DESTDIR)$(etcdir)' "$out/etc" \
|
||||
--replace-fail '$(DESTDIR)$(ATJOB_DIR)' "$out/var/spool/atjobs" \
|
||||
--replace-fail '$(DESTDIR)$(ATSPOOL_DIR)' "$out/var/spool/atspool" \
|
||||
--replace-fail '$(DESTDIR)$(LFILE)' "$out/var/spool/atjobs/.SEQ" \
|
||||
--replace-fail 'chown' '# skip chown' \
|
||||
--replace-fail '6755' '0755'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export SENDMAIL=${sendmailPath}
|
||||
# Purity: force atd.pid to be placed in /var/run regardless of
|
||||
# whether it exists now.
|
||||
substituteInPlace ./configure --replace "test -d /var/run" "true"
|
||||
substituteInPlace ./configure --replace-fail "test -d /var/run" "true"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -10,17 +10,17 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "aws-vault";
|
||||
version = "7.12.4";
|
||||
version = "7.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ByteNess";
|
||||
repo = "aws-vault";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0jPtqViGD0Xfn0yn2Buh4LwVAiSn7YvDMpNZYirHUmk=";
|
||||
hash = "sha256-afmApbIydrouoXmu3inLE9EvwFqOJxVkNcVSDjZUcXY=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-pqD3j1I0zENctgM2lBaYiU3DRCqeq9XIX3jWB2p139I=";
|
||||
vendorHash = "sha256-I+yKJO+MOCd+wZn4uQt+Xg18b/PWYPm6qxzGEOsCACo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cargo-seek";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tareqimbasher";
|
||||
repo = "cargo-seek";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SDVAi4h+/ebGX+8M66Oyd0LfQn+J7/QhDW97ZBdoN14=";
|
||||
hash = "sha256-WL1S2oU3/T9pEI4rgzT2dJ/ZTiwS/BgraW1MmZ5MQl0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DyXRbtvCJte7mCQKusipeikr981vMHPEVYcGSwVI5Kg=";
|
||||
cargoHash = "sha256-cXZvuMcNGNWU61ll2dAFxPKWujJNzXpC8aP5vxDONkY=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
homepage = "https://github.com/tareqimbasher/cargo-seek";
|
||||
changelog = "https://github.com/tareqimbasher/cargo-seek/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ yvnth ];
|
||||
mainProgram = "cargo-seek";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -165,8 +165,17 @@ llvmStdenv.mkDerivation (finalAttrs: {
|
||||
gitHash = rev;
|
||||
in
|
||||
''
|
||||
cat <<'EOF' > cmake/autogenerated_versions.txt
|
||||
SET(VERSION_REVISION 0)
|
||||
# Preserve VERSION_REVISION from the source tree, like ClickHouse CI
|
||||
# does. It identifies the server release line to clients (exposed via
|
||||
# the revision() SQL function)
|
||||
versionRevision=$(sed -n 's/^SET(VERSION_REVISION \([0-9]\{1,\}\))$/\1/p' cmake/autogenerated_versions.txt)
|
||||
if [[ -z "$versionRevision" ]]; then
|
||||
echo "Could not extract VERSION_REVISION from cmake/autogenerated_versions.txt" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cat <<EOF > cmake/autogenerated_versions.txt
|
||||
SET(VERSION_REVISION $versionRevision)
|
||||
SET(VERSION_MAJOR ${major})
|
||||
SET(VERSION_MINOR ${minor})
|
||||
SET(VERSION_PATCH ${patch})
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ctypes.sh";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "taviso";
|
||||
repo = "ctypes.sh";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4";
|
||||
sha256 = "sha256-ZYsjySJaxyLAiyGaNwngA7ef6vA+fUTCh9hi5g55v+g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
in
|
||||
buildDartApplication rec {
|
||||
pname = "dart-sass";
|
||||
version = "1.101.0";
|
||||
version = "1.101.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
repo = "dart-sass";
|
||||
tag = version;
|
||||
hash = "sha256-hs028qXBzRGrh9xZAQGaFw7iXtkQm9fixMuBohupjrI=";
|
||||
hash = "sha256-7q42Dv1HUWxeXa4j306ssKJrBsPKAFezqntx4mZXgw0=";
|
||||
};
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
@@ -4,21 +4,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc",
|
||||
"sha256": "1b0e6a07425a3e460666e88bf1c949ccc7bb0116ad562ce94a1eca60fe820725",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "96.0.0"
|
||||
"version": "103.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0",
|
||||
"sha256": "61c04d0c1bfed555c681ea079519933f071a5a026578ff73c4ff0df2d3462e5e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "10.2.0"
|
||||
"version": "13.3.0"
|
||||
},
|
||||
"archive": {
|
||||
"dependency": "direct dev",
|
||||
@@ -94,11 +94,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "cli_pkg",
|
||||
"sha256": "8343ec3b11f163ab105687d6bad5432ef49b95d15137ec44a28c8cef918b5150",
|
||||
"sha256": "1b3915a8924e8a495ec24b8ee076c182211d0bd563699a2c8ed9af33bf296af8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.15.1"
|
||||
"version": "2.15.2"
|
||||
},
|
||||
"cli_repl": {
|
||||
"dependency": "direct main",
|
||||
@@ -114,11 +114,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "cli_util",
|
||||
"sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
|
||||
"sha256": "5909d2c6b66817222779e1eedc19e0e28b76d1df7bd9856a4792ccb9881df358",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.4.2"
|
||||
"version": "0.5.1"
|
||||
},
|
||||
"collection": {
|
||||
"dependency": "direct main",
|
||||
@@ -184,21 +184,21 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dart_style",
|
||||
"sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
|
||||
"sha256": "3f88fc9c96c568d631356507355a2d1e983ee000c9ac008bdcb39b5bf53ce777",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.7"
|
||||
"version": "3.1.12"
|
||||
},
|
||||
"dartdoc": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "dartdoc",
|
||||
"sha256": "c60c01dc5aeb095a3b7b875150fe0e50b46330aec5d3417e7bae235ccd8a00ab",
|
||||
"sha256": "deb9e1d80cd0fd66139c5690315a5004150fd5c85a16d97459360531aa9e3702",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "9.0.4"
|
||||
"version": "9.0.8"
|
||||
},
|
||||
"ffi": {
|
||||
"dependency": "transitive",
|
||||
@@ -254,11 +254,11 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "grinder",
|
||||
"sha256": "e1996e485d2b56bb164a8585679758d488fbf567273f51c432c8733fee1f6188",
|
||||
"sha256": "8c65fc6c0c0748c2d9080c1fb603d7a9640bf5a5eda29f35099bd351cc45093f",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.9.5"
|
||||
"version": "0.10.0"
|
||||
},
|
||||
"html": {
|
||||
"dependency": "transitive",
|
||||
@@ -374,11 +374,11 @@
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d",
|
||||
"sha256": "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.18.3"
|
||||
"version": "1.19.0"
|
||||
},
|
||||
"mime": {
|
||||
"dependency": "transitive",
|
||||
@@ -674,31 +674,31 @@
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "test",
|
||||
"sha256": "ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f",
|
||||
"sha256": "0d5ba5602ec3baa28c8ce365e1efc5575969c765f45c554a3e167dc7945b9c30",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.31.1"
|
||||
"version": "1.31.2"
|
||||
},
|
||||
"test_api": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11",
|
||||
"sha256": "475610b2aa23c19687cce2961e44b0cc57cafe220f67c2b80201231b2a07fbe7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.12"
|
||||
"version": "0.7.13"
|
||||
},
|
||||
"test_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_core",
|
||||
"sha256": "d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5",
|
||||
"sha256": "a39c204a4fc7a7ccb04a2b985e359fda3cc37e45e0b8ac61c3fb1a05aa832132",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.18"
|
||||
"version": "0.6.19"
|
||||
},
|
||||
"test_descriptor": {
|
||||
"dependency": "direct dev",
|
||||
@@ -804,11 +804,11 @@
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "xml",
|
||||
"sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
|
||||
"sha256": "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.6.1"
|
||||
"version": "7.0.1"
|
||||
},
|
||||
"yaml": {
|
||||
"dependency": "direct dev",
|
||||
@@ -822,6 +822,6 @@
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.10.0 <4.0.0"
|
||||
"dart": ">=3.11.0 <4.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "diff-so-fancy";
|
||||
version = "1.4.10";
|
||||
version = "1.4.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "so-fancy";
|
||||
repo = "diff-so-fancy";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-mEVRwkfVK/qmOeU37hSxmO2t0z0TY4MWOjkt6hICQQ4=";
|
||||
sha256 = "sha256-5laSG8UWsCXAK+Woiz1Opy3VViboCI7J2AsqoDiuq7k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule {
|
||||
pname = "drone-runner-exec";
|
||||
version = "unstable-2020-04-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drone-runners";
|
||||
repo = "drone-runner-exec";
|
||||
rev = "c0a612ef2bdfdc6d261dfbbbb005c887a0c3668d";
|
||||
sha256 = "sha256-0UIJwpC5Y2TQqyZf6C6neICYBZdLQBWAZ8/K1l6KVRs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ypYuQKxRhRQGX1HtaWt6F6BD9vBpD8AJwx/4esLrJsw=";
|
||||
|
||||
meta = {
|
||||
description = "Drone pipeline runner that executes builds directly on the host machine";
|
||||
homepage = "https://github.com/drone-runners/drone-runner-exec";
|
||||
# https://polyformproject.org/licenses/small-business/1.0.0/
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ mic92 ];
|
||||
mainProgram = "drone-runner-exec";
|
||||
};
|
||||
}
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "drone-runner-ssh";
|
||||
version = "unstable-2022-12-22";
|
||||
version = "1.0.1-unstable-2022-12-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drone-runners";
|
||||
|
||||
@@ -18,13 +18,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dropbear";
|
||||
version = "2026.92";
|
||||
version = "2026.93";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mkj";
|
||||
repo = "dropbear";
|
||||
tag = "DROPBEAR_${finalAttrs.version}";
|
||||
hash = "sha256-xXjKWj6tMW/Qlq4DttxKAqOwsER2QEeb1Qw3Gllu2QQ=";
|
||||
hash = "sha256-Xs5LTVaNdfRKx0cFTQknaHXka6QhxBS2JNTQ8RoHG80=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,29 +1,26 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch2,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation {
|
||||
pname = "dtach";
|
||||
version = "0.9";
|
||||
version = "0.9-unstable-2025-06-20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/dtach/dtach/${finalAttrs.version}/dtach-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j";
|
||||
src = fetchFromGitHub {
|
||||
owner = "crigler";
|
||||
repo = "dtach";
|
||||
rev = "b027c27b2439081064d07a86883c8e0b20a183c9";
|
||||
hash = "sha256-ilxBbrqwGe+jpFbQ93nfyp3HuDY0D7NgIXkIkw9YXkI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/crigler/dtach/commit/6d80909a8c0fd19717010a3c76fec560f988ca48.patch?full_index=1";
|
||||
hash = "sha256-v3vToJdSwihiPCSjXjEJghiaynHPTEql3F7URXRjCbM=";
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp dtach $out/bin/dtach
|
||||
runHook preInstall
|
||||
|
||||
install -D dtach $out/bin/dtach
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
@@ -40,9 +37,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
license = lib.licenses.gpl2Plus;
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ ];
|
||||
maintainers = [ lib.maintainers.jmbaur ];
|
||||
mainProgram = "dtach";
|
||||
};
|
||||
})
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation {
|
||||
description = "Everforest colour palette for GTK";
|
||||
homepage = "https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ jn-sena ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "fcitx5-pinyin-moegirl";
|
||||
version = "20260712";
|
||||
version = "20260713";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict";
|
||||
hash = "sha256-fCzh9pn+HWL60IvpPieaaZ+JjQZ1bbfYIyLEHDITK4U=";
|
||||
hash = "sha256-ZmpTcolKTjJBino+zkVK6hBv/+yllAiBiR6Jy4SBdVs=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fluux-messenger";
|
||||
version = "0.17.1";
|
||||
version = "0.17.2";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
@@ -27,16 +27,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "processone";
|
||||
repo = "fluux-messenger";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aT7X11BOmksEcCLk5hkokfLx7Q8Jk2zTWskoN8aZha0=";
|
||||
hash = "sha256-APdzwVnDOGnngZJ3LjQMk2Y6KRbGqXaaFEb+NzhfkIo=";
|
||||
};
|
||||
|
||||
cargoRoot = "apps/fluux/src-tauri";
|
||||
cargoHash = "sha256-fEHe7enJzdEauou1xWfM94WHL1uAP1sfY2JN1ZmZmEE=";
|
||||
cargoHash = "sha256-pjx4tP89aRx1/m5eYjI2DPhTtSuMnFudongEFhiaigE=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-4Op4jykCtc9oFBIn8vOUqxGr7/OloIhPD1JT+q4dX7Y=";
|
||||
hash = "sha256-rV5Q8WKcSmL1JSubFefsytOd3qiB5OandcwfZw9DJgE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fuc";
|
||||
version = "3.1.7";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SUPERCILEX";
|
||||
repo = "fuc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LtS2+iqu4+z6K/PZeggLdo4S/F+5AtV5j9Q6hDAcEiQ=";
|
||||
hash = "sha256-EzT8Rq0vqcHiW6W0yLSzlWNEZzaKXvOL3o9WUj648gU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SSJg/Ns64+NgqrB4mJ5/xa40tZfGZ2VGdvNP7SSKv0E=";
|
||||
cargoHash = "sha256-sZGAQ+9u/2PpHkp5BcrrTU+48s6PT42+eEs/Cn0RsKk=";
|
||||
|
||||
env.RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fzf-make";
|
||||
version = "0.69.0";
|
||||
version = "0.70.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyu08";
|
||||
repo = "fzf-make";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ezE7plWdPqfENprOWhl5YQnoXk9khXsDtsYf6Lifk3w=";
|
||||
hash = "sha256-LRLwHCHsXW0SZ8X+7719vaCBQDx9fjiMvF2oma8u41w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-uF+oV0ZvGsRy20DkNrVowyb+RoYVtYN4R/gOZ6WzHQw=";
|
||||
cargoHash = "sha256-bNp4P/Hag4br28rrfeNIUFQqKNKa/Gin79gQR6sg8W8=";
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
|
||||
@@ -179,11 +179,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "150.0.7871.128";
|
||||
version = "150.0.7871.181";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-g+1ZyFh467j6U5FevnBmyvxY0cBMHJVElIbm+dmaHvs=";
|
||||
hash = "sha256-/sUJBfexI1pECXeoM0duAWKHT1ynnlBs30C3GvZNkvQ=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -289,11 +289,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "150.0.7871.129";
|
||||
version = "150.0.7871.182";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/ggb3e3myl2poiiaqd2bbvqlrqa_150.0.7871.129/GoogleChrome-150.0.7871.129.dmg";
|
||||
hash = "sha256-ym9rF6yrGMSibQDM4gKlAbOsIHnV1tPxyNq9KNLnR0I=";
|
||||
url = "http://dl.google.com/release2/chrome/mb6usb7722qbv5pqtlgpq72utm_150.0.7871.182/GoogleChrome-150.0.7871.182.dmg";
|
||||
hash = "sha256-eNrCQqKqd+6cuvGDbQ0VM5JpolHusOZou2elsAh0TD4=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gvm-libs";
|
||||
version = "23.8.0";
|
||||
version = "23.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "gvm-libs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+fd/f5bYjKaeDGj0cpe4vNqm6TvIcWxJ3pfy90oQkbI=";
|
||||
hash = "sha256-oGV4Brb+LgxiflzAvv7HqQ0p9+Whe2J6du9wBKAkr5Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,7 +2,9 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fuse,
|
||||
fuse3,
|
||||
macfuse-stubs,
|
||||
pkg-config,
|
||||
ncurses,
|
||||
python3,
|
||||
nix-update-script,
|
||||
@@ -17,10 +19,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-La6rzBOfyBIXDn78vXb8GUt8jgQkzsqM38kRZ7t3Fp0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
fuse
|
||||
ncurses
|
||||
python3
|
||||
(if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3)
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libuvc";
|
||||
version = "unstable-2020-11-29";
|
||||
version = "0.0.7-unstable-2024-03-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libuvc";
|
||||
repo = "libuvc";
|
||||
rev = "5cddef71b17d41f7e98875a840c50d9704c3d2b2";
|
||||
sha256 = "0kranb0x1k5qad8rwxnn1w9963sbfj2cfzdgpfmlivb04544m2j7";
|
||||
rev = "047920bcdfb1dac42424c90de5cc77dfc9fba04d";
|
||||
hash = "sha256-Ds4N9ezdO44eBszushQVvK0SUVDwxGkUty386VGqbT0=";
|
||||
};
|
||||
|
||||
# Upstream doesn't yet support CMake 4, remove once fixed
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "lstr";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bgreenwell";
|
||||
repo = "lstr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-lJ6BSvlJiyZUOoz0QuahIgZ6GZ9NDcmvvQ7MEd9c/7U=";
|
||||
hash = "sha256-uDwf6+By4z1TTkuyg0g5J8zzkM/UCsBMLAF9WfSEreE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-pRPcJwdhrQ+P70zaiuPCAI53lW+zEulqSrK5w8SCraQ=";
|
||||
cargoHash = "sha256-CGdQmjgOvcLAE88nocn/iA4qfS98CEsseoNn/0udd0s=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "melonds";
|
||||
version = "1.1-unstable-2026-06-07";
|
||||
version = "1.1-unstable-2026-07-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melonDS-emu";
|
||||
repo = "melonDS";
|
||||
rev = "10a173b5536fc75cd93f8a3868349dad963542ef";
|
||||
hash = "sha256-YsVCU40BZgYoxyuscbD0Ab613eUIgYlXJkm0KJQg+yY=";
|
||||
rev = "82fdbc78483f43b310e920e21acc47787cb43564";
|
||||
hash = "sha256-2T8qzsqbULFw7jsNk0pTpLMIyS1XVnA5ojel8BmTPMw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -45,7 +45,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "murmure";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "Kieirra";
|
||||
repo = "murmure";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zJ9OvpAfREyDWDISKYKCUyQSWdkQlVrSzX+wvwKk6Yk=";
|
||||
hash = "sha256-YTfpIkGHD6GPEfuTV1AahC08y4hJ6GSWQ+9C/6bTsJU=";
|
||||
};
|
||||
|
||||
# The libappindicator_sys crate loads these libraries at runtime
|
||||
@@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargoRoot = "src-tauri";
|
||||
buildAndTestSubdir = finalAttrs.cargoRoot;
|
||||
|
||||
cargoHash = "sha256-wV0drkKgn58Yxjy+Mv2QLTQXTDwWk6/uEfk76HaMuow=";
|
||||
cargoHash = "sha256-6G/ZHGjjv1U5MNLo+LAwXoM/nN2aCPOaSTJer7dUv9w=";
|
||||
|
||||
env.OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.46";
|
||||
version = "1.52";
|
||||
pname = "mxt-app";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "atmel-maxtouch";
|
||||
repo = "mxt-app";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-SeP48xdZ43dL28tg7mo8SmObUt3R+8oyETst6yKkhnU=";
|
||||
sha256 = "sha256-CW2iWkYuI0joTQJXt271XLO70Qq/Yg8eX9f56XnJht8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nerva";
|
||||
version = "1.40.2";
|
||||
version = "1.42.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praetorian-inc";
|
||||
repo = "nerva";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-znkY0R3g8ueazxx+ljCAdsBMkY1FmKn8R9GLYYIY2cA=";
|
||||
hash = "sha256-TNl+/ikQWsS4hBU5m+zkfVg+KF5YwsZ6Ge3YNarbvmE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8=";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "nixpkgs-hammering";
|
||||
version = "0-unstable-2026-04-21";
|
||||
version = "0-unstable-2026-07-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtojnar";
|
||||
repo = "nixpkgs-hammering";
|
||||
rev = "0ca8e718c6809e0c2b640b954bfe000b915634dc";
|
||||
hash = "sha256-j/jqwdM466jE2Rf6aW3DfI6wQa44eN8W8/ii1aX8HDs=";
|
||||
rev = "d131eb5c4d92c9b12001f8ff6ee79fcad4dc4f32";
|
||||
hash = "sha256-rzmyA5s+7vlDazKCJSVy3bJH0ql/ekc7B2zsG+8YXLk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Lmj9XWUUavlmZn/IK+CcXQhKUYfz3dKF6S2U3BMhoIc=";
|
||||
cargoHash = "sha256-0xk/HIK9urjhjotQaNzEJ5CRj50jZlsNOsTCHbfCdy8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
postInstall = ''
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "obs-cmd";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grigio";
|
||||
repo = "obs-cmd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-8lCqUN5FacDARZylR+s74l/mSP3Jy0GT5u03/WrUALM=";
|
||||
hash = "sha256-yIS9P2ljyiT8tiJmieQXWQcSkKmP7p0/XErujQRxDCE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Fyyr2oMHsIb9/jiqnzb94H5eknoy/WmwU7sL1cOxuPQ=";
|
||||
cargoHash = "sha256-jEGgTyqGprvtDkoWc5qihdeN91/4is3i7JBeqlm9KDw=";
|
||||
|
||||
meta = {
|
||||
description = "Minimal CLI to control OBS Studio via obs-websocket";
|
||||
|
||||
@@ -5,17 +5,18 @@
|
||||
fish,
|
||||
runtimeShell,
|
||||
replaceVars,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "oh-my-fish";
|
||||
version = "unstable-2022-03-27";
|
||||
version = "8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oh-my-fish";
|
||||
repo = "oh-my-fish";
|
||||
rev = "d428b723c8c18fef3b2a00b8b8b731177f483ad8";
|
||||
hash = "sha256-msItKEPe7uSUpDAfCfdYZjt5NyfM3KtOrLUTO9NGqlg=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2IDXRQUMuPHKHYsB+2kNWBc2WxgA6732oJbrPDjRdp0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/oh-my-fish/oh-my-fish";
|
||||
description = "Fish Shell Framework";
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "omnictl";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "omni";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xL1kZafjDQ9UkaBBs9n2u5t8jcL3CONv41hg3oA8x7s=";
|
||||
hash = "sha256-k2z0QBkMJkLFtrr9ckWyS1a4jzGYkikREf8+aaMW3d0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-D88+xYpZgawfMLa7qJOL+5MAtSswat4ITY7sjCrJMVg=";
|
||||
vendorHash = "sha256-ja+j9KSeNEHVTBjgSWYRMuB1qqbp8g3e32rDzlyzO1E=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
openttd.overrideAttrs (oldAttrs: rec {
|
||||
pname = "openttd-jgrpp";
|
||||
version = "0.72.4";
|
||||
version = "0.73.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JGRennison";
|
||||
repo = "OpenTTD-patches";
|
||||
rev = "jgrpp-${version}";
|
||||
hash = "sha256-qiTKoaCUdcm7dJKfxwTtYU8f5C8RYxj7XZL/TtOygtg=";
|
||||
hash = "sha256-eFUKJSpHLhyGXvKo/uSB01+5nGv5Y7yUTIU3U81Qx5U=";
|
||||
};
|
||||
patches = [ ];
|
||||
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "playball";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paaatrick";
|
||||
repo = "playball";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ldxYKLRtdNKU1xORT5HxgEMiMajUY7OwnkQ+jlsOIxY=";
|
||||
hash = "sha256-kahotL2cF2j8DHB1HkSyKwcmOUMcoDO/yS9DXwGcZc0=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9sbTK7nV8m4uaUZy6DL/0r+JUlBoTkIpgYy7sacf130=";
|
||||
npmDepsHash = "sha256-joHk2xYSoipxd4IVgiwinYMacw8jlvtn4K03J8AdzY0=";
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
buildGoModule,
|
||||
installShellFiles,
|
||||
fetchFromGitHub,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
@@ -40,6 +42,13 @@ buildGoModule (finalAttrs: {
|
||||
--zsh <($out/bin/pop completion zsh)
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Send emails from your terminal";
|
||||
homepage = "https://github.com/charmbracelet/pop";
|
||||
|
||||
@@ -59,7 +59,6 @@ let
|
||||
Crafter
|
||||
evanjs
|
||||
johnrichardrinehart
|
||||
tricktron
|
||||
];
|
||||
platforms = [
|
||||
"aarch64-darwin"
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "postfix_exporter";
|
||||
version = "0.20.0";
|
||||
version = "0.20.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Hsn723";
|
||||
repo = "postfix_exporter";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-tW86lnSLQdyZwvRiqTU1oExZ/zDIrZUraeoAOjs35yY=";
|
||||
sha256 = "sha256-LCjTw5nL8xP6ODwVJxj4Zg99CiFvqbzjb931fmhtk0M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T8fTvrpBKm+wDqf+iBeBJh9H1HEebAf0lOnnuF0W5fI=";
|
||||
vendorHash = "sha256-6lqUygsV1pPGKN9SOZIouPVSZWuSOlPhqFbm16HfzGk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prow";
|
||||
version = "0-unstable-2026-07-09";
|
||||
rev = "bcf4297e528a75b2aa580c5dce3e7b97e38f4553";
|
||||
version = "0-unstable-2026-07-14";
|
||||
rev = "0633879af8026d056e1a5dbe1e29f5a98f6acec3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "prow";
|
||||
hash = "sha256-pPmkWcnEPWyWWCIlujvDvoAlZ67SrM1X8lP/WJFomyI=";
|
||||
hash = "sha256-tpIxZSqftGgA501zh4MyjTrBUvLOaLjkBO8nK/IDwhU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iLJ2atYyHNMvflyuETpPnuhKD293k25vfZQU68Y7oN8=";
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "rime-moegirl";
|
||||
version = "20260712";
|
||||
version = "20260713";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml";
|
||||
hash = "sha256-d4I2xyyWh9vry7vMkE1E19G55w/uenqbTspymdy0dqw=";
|
||||
hash = "sha256-Fca5vWdmqaRnP6id4TqVGFsTxnynAoQTMgAWntF5eY0=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -50,15 +50,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
file="$(mktemp)"
|
||||
echo "abc\nbcd\ncde" > "$file"
|
||||
${rg} -N 'bcd' "$file"
|
||||
${rg} -N 'cd' "$file"
|
||||
''
|
||||
+ lib.optionalString withPCRE2 ''
|
||||
echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)'
|
||||
'';
|
||||
installCheckPhase = lib.optionalString canRunRg (
|
||||
''
|
||||
file="$(mktemp)"
|
||||
echo "abc\nbcd\ncde" > "$file"
|
||||
${rg} -N 'bcd' "$file"
|
||||
${rg} -N 'cd' "$file"
|
||||
''
|
||||
+ lib.optionalString withPCRE2 ''
|
||||
echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)'
|
||||
''
|
||||
);
|
||||
|
||||
meta = {
|
||||
description = "Utility that combines the usability of The Silver Searcher with the raw speed of grep";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rmtfs";
|
||||
version = "1.1.1";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-msm";
|
||||
repo = "rmtfs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ehd8SbKNOpyVoF9oc7e5uYmJOHI+Q6woLyvwO8hhKEc=";
|
||||
hash = "sha256-j92qz4x5KTYXjcvFGPp4YbmcM0pz2pUlV2tCsT8FV0I=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "samrewritten";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PaulCombal";
|
||||
repo = "SamRewritten";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WYwuYNbapD0cIifQALtfgMNqXs5KMvaCsQqUdifJwf8=";
|
||||
hash = "sha256-sSZC7yN/WuMYkdcPmHyvasaWRFzppSxmlS1bYLZGvyM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dh4WPk6rU/HsUVJTMrMPsqKXpOmb/0LUAsGTbmdI6Ts=";
|
||||
cargoHash = "sha256-YKiICPP6z9lZWqdoPOYRq+0mmz7jY3/eJd7XzN8Vmnk=";
|
||||
|
||||
# Tests require network access and a running Steam client. Skipping.
|
||||
doCheck = false;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
wrapGAppsHook3,
|
||||
@@ -20,14 +21,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "sc-controller";
|
||||
version = "0.5.5";
|
||||
version = "0.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "C0rn3j";
|
||||
repo = "sc-controller";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IQxHa0bR8FWad9v5DfvXHskwayCgzbJm5ekzf1sjfiQ=";
|
||||
hash = "sha256-jQcp3c3S6G6GrU6j0m5Re9S28eLGJxmvD81dOuHFCz8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -92,6 +93,11 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
)
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# Fix for tests not finding native libraries
|
||||
ln -s build/lib.*/*.so -t .
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "search-vulns";
|
||||
version = "1.2.1";
|
||||
version = "1.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ra1nb0rn";
|
||||
repo = "search_vulns";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-w4kK0/bAbWPHK6Nllhb8vCReJwiBUL6EpX/Cnt3aplg=";
|
||||
hash = "sha256-YSnBM0nTjQSNh7eDqAeu58J1DuyG7tRjOX+6zlUVH+I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20260712";
|
||||
version = "20260718";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = "signalbackup-tools";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-X4I7eFUXty9LNI2nNyVUZXYhKQds+elor/Zs5FSg2iE=";
|
||||
hash = "sha256-C/yAq2i8r9gk0LCOi6kaM/kusklu/jeJ61H45PnSWQY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "zed";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "authzed";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rlTcC2+faNZKvzouGC9nJBBCsDabxozTE/SFbf8YKQ8=";
|
||||
hash = "sha256-wwD/PCnhCFzhq/Oe9+qU+w/ZlloZbezjOtBKMQkxI9E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/nnPVy+pjcgkgJW8630IycmGF4Qq4I01htEDlsWvZbM=";
|
||||
vendorHash = "sha256-swlwje4XCzhRojPOaW28MDEaZQIvXGUoH7qjyz5+tUo=";
|
||||
|
||||
ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" ];
|
||||
|
||||
|
||||
@@ -49,16 +49,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "spotify-player";
|
||||
version = "0.24.0";
|
||||
version = "0.24.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aome510";
|
||||
repo = "spotify-player";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SxzQdQOg+KS6jXJNifVkehR91g6gTHBYgyxfXx9WWI8=";
|
||||
hash = "sha256-+GADmRl4XMwV8TfYZjEeyKDDfda3bDPzeerhYryX6vA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TmGdJXKOsTL9HVyEEe3PtiLMSDJV/TRokRBVAUdHL7I=";
|
||||
cargoHash = "sha256-CSZ5sZ+d7Jhi43ipaWXKupYPFgWCbCx4RMTQN8emu9o=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sshocker";
|
||||
version = "0.3.9";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lima-vm";
|
||||
repo = "sshocker";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7s5jPMt6q7RUXxwA7rwVXhWGRrwfMc/EcEQxicwEHjs=";
|
||||
hash = "sha256-VFUPRGC6NkBd75X21uAlqDMAYU4Tyo/RFgBsc5D4LMk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FGaZTE8CCZ16ozsZr5MUFNkEy8+nkBYXH55n5TJG4Bg=";
|
||||
vendorHash = "sha256-75eziqi+lgKAA4MTBqVEdf4PEn5J8kk480xsa/2XtqQ=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
||||
@@ -21,15 +21,16 @@
|
||||
libappindicator,
|
||||
udev,
|
||||
libgbm,
|
||||
libGL,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tetrd";
|
||||
version = "1.0.4";
|
||||
version = "1.3.1-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20211130190525/https://download.tetrd.app/files/tetrd.linux_amd64.pkg.tar.xz";
|
||||
sha256 = "1bxp7rg2dm9nnvkgg48xd156d0jgdf35flaw0bwzkkh3zz9ysry2";
|
||||
url = "https://web.archive.org/web/20260108185127/https://download.tetrd.app/files/tetrd.linux_amd64.pkg.tar.xz";
|
||||
sha256 = "0mpixs20jrxkbxvd7nl0p664jgqfp3m6qf7kmsj7frkhky697fbm";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libGL
|
||||
c-ares
|
||||
ffmpeg
|
||||
libevent
|
||||
@@ -71,6 +73,9 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram $out/opt/Tetrd/tetrd \
|
||||
--prefix LD_LIBRARY_PATH ":" ${lib.makeLibraryPath buildInputs}
|
||||
|
||||
mkdir $out/bin
|
||||
ln -s $out/opt/Tetrd/tetrd $out/bin/tetrd
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@@ -84,5 +89,6 @@ stdenv.mkDerivation rec {
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "tetrd";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGo126Module (finalAttrs: {
|
||||
pname = "thruster";
|
||||
version = "0.1.22";
|
||||
version = "0.1.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "basecamp";
|
||||
repo = "thruster";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d+zdzzT+47y9WOFARlQ/wCrc9tnyS/4HsE0a6aQl/KA=";
|
||||
hash = "sha256-R7JutM3tWkkkRsxxNgHIoz7VdYIfXNTmmvhSh8YHFuM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-veXgGs6+TauExVAaNnkIZwylQWZ4um3rrG8of/dYCv0=";
|
||||
vendorHash = "sha256-V9KAr+/r5SGNSBamD3U7bvBiiXn5GTmopSxiNmFL6lQ=";
|
||||
|
||||
subPackages = [ "cmd/thrust" ];
|
||||
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "tiddit";
|
||||
version = "3.9.5";
|
||||
version = "3.9.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SciLifeLab";
|
||||
repo = "TIDDIT";
|
||||
tag = "TIDDIT-${finalAttrs.version}";
|
||||
hash = "sha256-6uJZzetqRS0czX4qjjPgiSaPun7BkrPYllDdFWNK84k=";
|
||||
hash = "sha256-B3vUxLEnOdX733iGOfMmueVaSEqMmlp6fN4M8oElNNQ=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "todoist-cli";
|
||||
version = "1.76.1";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Doist";
|
||||
repo = "todoist-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3glrAc2yZJqP8gd28m5cjVPR+t7hM17etsxQWOs4J8k=";
|
||||
sha256 = "sha256-5+FxpTQmxeoNF/lTjKvFxP1T7HYt7YaUflTvw0GcOac=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-q50gIxHYdwW7cUO6FaUr3em1NX6kNw/+T8T+QLaB6Wk=";
|
||||
npmDepsHash = "sha256-IVabpRYKMI6ST/TumG7pMwDoUMIJBlhjUm35Eo7mSlE=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tombi";
|
||||
version = "1.2.2";
|
||||
version = "1.2.4";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "tombi-toml";
|
||||
repo = "tombi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-F7YQy+p0nsC4rKBs8CUG39FrK7fI8JE71YhHV6RaFZg=";
|
||||
hash = "sha256-XusEBLWK9yd1FLlfPY+lNPeBN1Q50RV5wrTMz+C6TZ8=";
|
||||
};
|
||||
|
||||
# Tests relies on the presence of network
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tpm2-tools";
|
||||
version = "5.7";
|
||||
version = "5.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tpm2-software/tpm2-tools/releases/download/${finalAttrs.version}/tpm2-tools-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-OBDTa1B5JW9PL3zlUuIiE9Q7EDHBMVON+KLbw8VwmDo=";
|
||||
sha256 = "sha256-HLcxhcroFLThXHwtCyJkLWQPr0h3X0FWof2S7fhL73M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "unpoller";
|
||||
version = "3.3.1";
|
||||
version = "3.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unpoller";
|
||||
repo = "unpoller";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-MivEuI/XjRDlX+VjSAMLjRl0WlRVnhP18qVujbvwjeQ=";
|
||||
hash = "sha256-VWu2n5J7ZLC2PzHXFDum0HFAwq5MDczT0dzUxRBSN5A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3DBUrKTvwRqaNuYtBlP5DlF1SNmU+ZNeH7ATVQjgLsA=";
|
||||
vendorHash = "sha256-QBvdR7pLKqeiZLIIxgTbAkyGLLR0nrK/NU9wSmyU5zU=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "upscaler";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
|
||||
pyproject = false; # meson instead of pyproject
|
||||
|
||||
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
owner = "World";
|
||||
repo = "Upscaler";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-h+m5YOnsWFmQH0FxYrGbUzGMr38HhnkHegJl4daRXAs=";
|
||||
hash = "sha256-yhGRKPqkuM2iCnA90bXaEaB+RZGAw15fNSm208zQrGE=";
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
}:
|
||||
let
|
||||
pname = "winbox";
|
||||
version = "4.2";
|
||||
version = "4.3";
|
||||
|
||||
metaCommon = {
|
||||
description = "Graphical configuration utility for RouterOS-based devices";
|
||||
@@ -23,13 +23,13 @@ let
|
||||
x86_64-zip = callPackage ./build-from-zip.nix {
|
||||
inherit pname version metaCommon;
|
||||
|
||||
hash = "sha256-htyVwuCsCRwvAwsdnbz+Z3E9Tk6kH8U0faGDo9CvyVo=";
|
||||
hash = "sha256-VzYArCTfOKegbqQxixJ1QkfuxLVMbJCwpXEA1nZ4ekw=";
|
||||
};
|
||||
|
||||
x86_64-dmg = callPackage ./build-from-dmg.nix {
|
||||
inherit pname version metaCommon;
|
||||
|
||||
hash = "sha256-rEBdkLh9+7gzdlQ4uI/SdCAWwWnG2tBQPWTdGcETfsI=";
|
||||
hash = "sha256-VoHQPjITOFiz3FQceMG644yzNVtf2YMmrHJeC9i6tXA=";
|
||||
};
|
||||
in
|
||||
(if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yascreen";
|
||||
version = "2.11";
|
||||
version = "2.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbonev";
|
||||
repo = "yascreen";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SkJPq1xeC2XU8zP9uPdXECotgvG4siKvvHfi7z0APio=";
|
||||
hash = "sha256-641H0uR2rR9vVe7WF2bSzFs+6HXlPHWgD0jKH9MofqU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go-md2man ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zapret";
|
||||
version = "72.12";
|
||||
version = "72.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bol-van";
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UWkLi/wWihtdLyk77cQ90xZ31vho1PjPfFQ6bQWrIUs=";
|
||||
hash = "sha256-jwhGhxqIhJfkmjT3Zzsy4injQWqSVRet8fZr9VA04sQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -65,7 +65,6 @@ let
|
||||
meta = {
|
||||
homepage = "https://aylur.github.io/astal/guide/libraries/${website-path}";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [ PerchunPak ];
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
|
||||
@@ -7,15 +7,15 @@ let
|
||||
originalDrv = fetchFromGitHub {
|
||||
owner = "Aylur";
|
||||
repo = "astal";
|
||||
rev = "04454c22094401cc8e682cfe1f8ecc3194cac5f9";
|
||||
hash = "sha256-bXd034/ARs18ZQ7hWUAw9NwyfBmcKQws8DQHzwYp6jM=";
|
||||
rev = "fd94e333c8bd45557291c805f1df79d5f787d590";
|
||||
hash = "sha256-flVUft590tsDX9z97O4DzVFg6zvOOmGeYhPeDdaP1DI=";
|
||||
};
|
||||
in
|
||||
originalDrv.overrideAttrs (
|
||||
final: prev: {
|
||||
name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
|
||||
pname = "astal-source";
|
||||
version = "0-unstable-2026-07-03";
|
||||
version = "0-unstable-2026-07-19";
|
||||
|
||||
meta = prev.meta // {
|
||||
description = "Building blocks for creating custom desktop shells (source)";
|
||||
|
||||
@@ -2,57 +2,63 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
|
||||
# dependencies
|
||||
numkong,
|
||||
numpy,
|
||||
opencv-python,
|
||||
simsimd,
|
||||
stringzilla,
|
||||
|
||||
# tests
|
||||
hypothesis,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "albucore";
|
||||
version = "0.0.24";
|
||||
version = "0.2.4";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "albumentations-team";
|
||||
repo = "albucore";
|
||||
tag = version;
|
||||
hash = "sha256-frVMPW3au/6vPRY89GIt7chCPkUMl13DpPqCPqIjz/o=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-gI6q9ODkc2JoDfV8RA2NzwbC9A6QyZFa7C24prqMydU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail \
|
||||
'from pkg_resources import DistributionNotFound, get_distribution' \
|
||||
'from importlib.metadata import PackageNotFoundError as DistributionNotFound, distribution as get_distribution'
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [ "opencv-python" ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numkong
|
||||
numpy
|
||||
opencv-python
|
||||
simsimd
|
||||
stringzilla
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "albucore" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# albumentations doesn't support newer versions of albucore
|
||||
# and has been archived upstream in favor of relicensed `albumentationsx`
|
||||
passthru.skipBulkUpdate = true;
|
||||
disabledTests = [
|
||||
# Flaky on some CPUs:
|
||||
# AssertionError: Not equal to tolerance rtol=1e-05, atol=1e-05
|
||||
"test_normalize_consistency_across_shapes"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations";
|
||||
homepage = "https://github.com/albumentations-team/albucore";
|
||||
changelog = "https://github.com/albumentations-team/albucore/releases/tag/${version}";
|
||||
changelog = "https://github.com/albumentations-team/albucore/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ bcdarwin ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,103 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
albucore,
|
||||
numpy,
|
||||
opencv-python,
|
||||
pydantic,
|
||||
pyyaml,
|
||||
scipy,
|
||||
|
||||
# optional dependencies
|
||||
huggingface-hub,
|
||||
pillow,
|
||||
torch,
|
||||
|
||||
# tests
|
||||
deepdiff,
|
||||
pytestCheckHook,
|
||||
pytest-mock,
|
||||
scikit-image,
|
||||
scikit-learn,
|
||||
torchvision,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "albumentations";
|
||||
version = "2.0.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "albumentations-team";
|
||||
repo = "albumentations";
|
||||
tag = version;
|
||||
hash = "sha256-8vUipdkIelRtKwMw63oUBDN/GUI0gegMGQaqDyXAOTQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./dont-check-for-updates.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail \
|
||||
'from pkg_resources import DistributionNotFound, get_distribution' \
|
||||
'from importlib.metadata import PackageNotFoundError as DistributionNotFound, distribution as get_distribution'
|
||||
substituteInPlace tests/test_blur.py \
|
||||
--replace-fail \
|
||||
'(ImageFilter.GaussianBlur(radius=sigma))' \
|
||||
'(ImageFilter.GaussianBlur(radius=float(sigma)))'
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [ "opencv-python" ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
albucore
|
||||
numpy
|
||||
opencv-python
|
||||
pydantic
|
||||
pyyaml
|
||||
scipy
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
hub = [ huggingface-hub ];
|
||||
pytorch = [ torch ];
|
||||
text = [ pillow ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
deepdiff
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
scikit-image
|
||||
scikit-learn
|
||||
torch
|
||||
torchvision
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_pca_inverse_transform"
|
||||
# these tests hang
|
||||
"test_keypoint_remap_methods"
|
||||
"test_multiprocessing_support"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "albumentations" ];
|
||||
|
||||
meta = {
|
||||
description = "Fast image augmentation library and easy to use wrapper around other libraries";
|
||||
homepage = "https://github.com/albumentations-team/albumentations";
|
||||
changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/albumentations/__init__.py b/albumentations/__init__.py
|
||||
index 44ee9b9..ea3bc50 100644
|
||||
--- a/albumentations/__init__.py
|
||||
+++ b/albumentations/__init__.py
|
||||
@@ -22,7 +22,3 @@ from .core.transforms_interface import *
|
||||
|
||||
with suppress(ImportError):
|
||||
from .pytorch import *
|
||||
-
|
||||
-# Perform the version check after all other initializations
|
||||
-if os.getenv("NO_ALBUMENTATIONS_UPDATE", "").lower() not in {"true", "1"}:
|
||||
- check_for_updates()
|
||||
@@ -0,0 +1,133 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
|
||||
# dependencies
|
||||
albucore,
|
||||
numpy,
|
||||
pydantic,
|
||||
pyyaml,
|
||||
scipy,
|
||||
typing-extensions,
|
||||
|
||||
# optional-dependencies
|
||||
opencv-contrib-python,
|
||||
opencv-python,
|
||||
opencv-python-headless,
|
||||
huggingface-hub,
|
||||
pillow,
|
||||
torch,
|
||||
pyvips,
|
||||
|
||||
# tests
|
||||
deepdiff,
|
||||
defusedxml,
|
||||
gitMinimal,
|
||||
hypothesis,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
scikit-image,
|
||||
scikit-learn,
|
||||
torchvision,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "albumentationsx";
|
||||
version = "2.3.3";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "albumentations-team";
|
||||
repo = "AlbumentationsX";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-exCQwduQM29K5Omb48KYIqm2D4yfOKFFEr37zhIvACY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
albucore
|
||||
numpy
|
||||
pydantic
|
||||
pyyaml
|
||||
scipy
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
contrib = [
|
||||
opencv-contrib-python
|
||||
];
|
||||
contrib-headless = [
|
||||
# opencv-contrib-python-headless
|
||||
];
|
||||
gui = [
|
||||
opencv-python
|
||||
];
|
||||
headless = [
|
||||
opencv-python-headless
|
||||
];
|
||||
hub = [
|
||||
huggingface-hub
|
||||
];
|
||||
pillow = [
|
||||
pillow
|
||||
];
|
||||
pytorch = [
|
||||
torch
|
||||
];
|
||||
pyvips = [
|
||||
pyvips
|
||||
];
|
||||
text = [
|
||||
pillow
|
||||
];
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "albumentations" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
deepdiff
|
||||
defusedxml
|
||||
gitMinimal
|
||||
hypothesis
|
||||
pillow
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
scikit-image
|
||||
scikit-learn
|
||||
torch
|
||||
torchvision
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# ImportError: cannot import name 'benchmark_coverage' from 'tools'
|
||||
"test_direct_script_ignores_unrelated_tools_package"
|
||||
|
||||
# AssertionError: Arrays are not almost equal to 6 decimals
|
||||
"test_pca_inverse_transform"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Infinite recursion with albu-spec
|
||||
"tests/test_type_consistency.py"
|
||||
|
||||
# Requires unfree google-docstring-parser
|
||||
"tests/test_docstrings.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Python library for image augmentation";
|
||||
homepage = "https://github.com/albumentations-team/AlbumentationsX";
|
||||
changelog = "https://github.com/albumentations-team/AlbumentationsX/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
})
|
||||
@@ -11,6 +11,8 @@
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -38,6 +40,8 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
pythonImportsCheck = [ "awkward_cpp" ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "CPU kernels and compiled extensions for Awkward Array";
|
||||
homepage = "https://github.com/scikit-hep/awkward";
|
||||
|
||||
@@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "compreffor" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/googlefonts/compreffor/releases/tag/${version}";
|
||||
changelog = "https://github.com/googlefonts/compreffor/releases/tag/v${version}";
|
||||
description = "CFF table subroutinizer for FontTools";
|
||||
mainProgram = "compreffor";
|
||||
homepage = "https://github.com/googlefonts/compreffor";
|
||||
|
||||
@@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "CSS Selectors for Python";
|
||||
homepage = "https://cssselect.readthedocs.io/";
|
||||
changelog = "https://github.com/scrapy/cssselect/v${version}//CHANGES";
|
||||
changelog = "https://github.com/scrapy/cssselect/blob/v${version}/CHANGES";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -59,7 +59,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Plugin enabling dbt to operate on a BigQuery database";
|
||||
homepage = "https://github.com/dbt-labs/dbt-bigquery";
|
||||
changelog = "https://github.com/dbt-labs/dbt-bigquery/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/dbt-labs/dbt-bigquery/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Plugin enabling dbt to work with Amazon Redshift";
|
||||
homepage = "https://github.com/dbt-labs/dbt-redshift";
|
||||
changelog = "https://github.com/dbt-labs/dbt-redshift/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/dbt-labs/dbt-redshift/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,14 +19,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "electrum-ecc";
|
||||
version = "0.0.6";
|
||||
version = "0.0.7";
|
||||
pyproject = true;
|
||||
build-system = [ setuptools ];
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "electrum_ecc";
|
||||
inherit version;
|
||||
hash = "sha256-Y2DHH7CLUdgKRV6TjxJrpMeQvnS6ImRh1U16OqaJC4k=";
|
||||
hash = "sha256-7UE04dv/D9gwInZMasyXoCzeNRKSfXxB9NSLmgbpH7I=";
|
||||
};
|
||||
|
||||
env = {
|
||||
|
||||
@@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Find a website's favicon";
|
||||
homepage = "https://github.com/scottwernervt/favicon";
|
||||
changelog = "https://github.com/scottwernervt/favicon/blob/${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/scottwernervt/favicon/blob/v${version}/CHANGELOG.rst";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Universal feed parser";
|
||||
homepage = "https://github.com/kurtmckee/feedparser";
|
||||
changelog = "https://feedparser.readthedocs.io/en/latest/changelog.html";
|
||||
changelog = "https://feedparser.readthedocs.io/en/latest/changelog";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -46,7 +46,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/maxcountryman/flask-login/blob/${version}/CHANGES.md";
|
||||
changelog = "https://github.com/maxcountryman/flask-login/blob/${src.rev}/CHANGES.md";
|
||||
description = "User session management for Flask";
|
||||
homepage = "https://github.com/maxcountryman/flask-login";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -58,7 +58,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Flask extension that provides integration with MongoEngine and WTF model forms";
|
||||
homepage = "https://github.com/mongoengine/flask-mongoengine";
|
||||
changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}";
|
||||
changelog = "https://github.com/MongoEngine/flask-mongoengine/blob/${src.rev}/docs/changelog.rst";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -63,8 +63,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "BigQuery Storage API API client library";
|
||||
homepage = "https://github.com/googleapis/python-bigquery-storage";
|
||||
changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md";
|
||||
homepage = "https://docs.cloud.google.com/bigquery/docs/reference/storage";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-storage-v${version}/packages/google-cloud-bigquery-storage/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
mainProgram = "fixup_bigquery_storage_v1_keywords.py";
|
||||
|
||||
@@ -71,8 +71,8 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
description = "Google Cloud Datastore API client library";
|
||||
homepage = "https://github.com/googleapis/python-datastore";
|
||||
changelog = "https://github.com/googleapis/python-datastore/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
homepage = "https://cloud.google.com/datastore";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datastore-v${finalAttrs.version}/packages/google-cloud-datastore/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -46,8 +46,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Google Cloud DNS API client library";
|
||||
homepage = "https://github.com/googleapis/python-dns";
|
||||
changelog = "https://github.com/googleapis/python-dns/blob/v${version}/CHANGELOG.md";
|
||||
homepage = "https://cloud.google.com/dns";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dns-v${version}/packages/google-cloud-dns/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
# Python bits:
|
||||
buildPythonPackage,
|
||||
setuptools,
|
||||
pytest,
|
||||
responses,
|
||||
docopt,
|
||||
flask,
|
||||
@@ -14,6 +13,8 @@
|
||||
pygments,
|
||||
requests,
|
||||
tabulate,
|
||||
addBinToPathHook,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
@@ -41,11 +42,6 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
responses
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
docopt
|
||||
flask
|
||||
@@ -56,13 +52,16 @@ buildPythonPackage (finalAttrs: {
|
||||
tabulate
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
export PATH="$PATH:$out/bin"
|
||||
py.test -xm "not assumption"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "grip" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
responses
|
||||
pytestCheckHook
|
||||
addBinToPathHook
|
||||
];
|
||||
|
||||
enabledTestMarks = [ "not assumption" ];
|
||||
|
||||
meta = {
|
||||
description = "Preview GitHub Markdown files like Readme locally before committing them";
|
||||
mainProgram = "grip";
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "guntamatic";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JensTimmerman";
|
||||
repo = "guntamatic";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OQpbBdTxbKd2A9AWJOLmoKNmPx3ZXTWqLgwTndDWMuw=";
|
||||
hash = "sha256-cm3aFIRnWFKgkaEYDQCGSREZRmGhv0ltKMpkWHu+ugI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Hatch build-hook to compile Babel *.po files to *.mo files at build time";
|
||||
homepage = "https://github.com/NiklasRosenstein/hatch-babel";
|
||||
changelog = "https://github.com/NiklasRosenstein/hatch-babel/blob/${src.tag}/.changelog/${src.tag}.toml";
|
||||
# changelog = "https://github.com/NiklasRosenstein/hatch-babel/blob/${src.tag}/.changelog/${src.tag}.toml";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -31,7 +31,6 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/repo-helper/hatch-requirements-txt/releases/tag/${version}";
|
||||
description = "Hatchling plugin to read project dependencies from requirements.txt";
|
||||
homepage = "https://github.com/repo-helper/hatch-requirements-txt";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -68,7 +68,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API";
|
||||
homepage = "https://github.com/scikit-learn-contrib/hdbscan";
|
||||
changelog = "https://github.com/scikit-learn-contrib/hdbscan/releases/tag/release-${src.tag}";
|
||||
changelog = "https://github.com/scikit-learn-contrib/hdbscan/releases/tag/release-${version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202607201";
|
||||
version = "0.1.202607211";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YmWkOspunMtdWMl5MvESUpWE1yRVl+eKpiTwC9LvBZ0=";
|
||||
hash = "sha256-G6Yum+tZ49Lw44z+fPkFrSLY1JrWReTewx8QSlet6zA=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -1,36 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
albumentations,
|
||||
buildPythonPackage,
|
||||
cython,
|
||||
fetchPypi,
|
||||
insightface,
|
||||
matplotlib,
|
||||
|
||||
# build-system
|
||||
cython,
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
mxnet,
|
||||
numpy,
|
||||
onnx,
|
||||
onnxruntime,
|
||||
opencv-python,
|
||||
requests,
|
||||
scikit-image,
|
||||
scipy,
|
||||
tqdm,
|
||||
|
||||
# optional-dependencies
|
||||
# gui:
|
||||
pillow,
|
||||
pyside6,
|
||||
reportlab,
|
||||
requests,
|
||||
setuptools,
|
||||
scipy,
|
||||
scikit-image,
|
||||
scikit-learn,
|
||||
# face3d
|
||||
albumentationsx,
|
||||
matplotlib,
|
||||
|
||||
insightface,
|
||||
testers,
|
||||
tqdm,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "insightface";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
# No tags on GitHub
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-J68kiRu7pHDLNXOzZqD8yomJ/IUDyfjygejLpv1xYHU=";
|
||||
};
|
||||
|
||||
@@ -59,16 +70,21 @@ buildPythonPackage rec {
|
||||
scikit-learn
|
||||
];
|
||||
face3d = [
|
||||
albumentations
|
||||
albumentationsx
|
||||
matplotlib
|
||||
];
|
||||
};
|
||||
|
||||
# aarch64-linux tries to get cpu information from /sys, which isn't available
|
||||
# inside the nix build sandbox.
|
||||
dontUsePythonImportsCheck = stdenv.buildPlatform.system == "aarch64-linux";
|
||||
pythonImportsCheck = [
|
||||
"insightface"
|
||||
"insightface.app"
|
||||
"insightface.data"
|
||||
];
|
||||
|
||||
passthru.tests = lib.optionalAttrs (stdenv.buildPlatform.system != "aarch64-linux") {
|
||||
# No tests in the Pypi archive
|
||||
doCheck = false;
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion {
|
||||
package = insightface;
|
||||
command = "insightface-cli --help";
|
||||
@@ -78,14 +94,6 @@ buildPythonPackage rec {
|
||||
};
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
"insightface"
|
||||
"insightface.app"
|
||||
"insightface.data"
|
||||
];
|
||||
|
||||
doCheck = false; # Upstream has no tests
|
||||
|
||||
meta = {
|
||||
description = "State-of-the-art 2D and 3D Face Analysis Project";
|
||||
mainProgram = "insightface-cli";
|
||||
@@ -93,4 +101,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ oddlama ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user