Merge branch 'master' into staging-next

This commit is contained in:
Michael Daniels
2026-10-10 21:03:12 -04:00
23 changed files with 228 additions and 88 deletions

View File

@@ -1,3 +1,4 @@
# Perl {#setup-hook-perl}
Adds the `lib/site_perl` subdirectory of each build input to the `PERL5LIB` environment variable. For instance, if `buildInputs` contains Perl, then the `lib/site_perl` subdirectory of each input is added to the `PERL5LIB` environment variable.
Adds the `lib/perl5/site_perl` subdirectory of each build input to the `PERL5LIB` environment variable.
The hook applies when `perl` is in `buildInputs`.

View File

@@ -1,5 +1,14 @@
# `xfce4-dev-tools` {#xfce4-dev-tools}
This setup hook attempts to run `xdt-autogen` in `xdtAutogenPhase`, which is part of `preConfigurePhases`.
This setup hook adds an `xdtAutogenPhase` that runs `xdt-autogen` before configure.
[]{#dontUseXdtAutogenPhase} This behavior can be disabled by setting `dontUseXdtAutogenPhase` to `true`.
Use this hook for Xfce packages that need `xdt-autogen` before configure.
Add `xfce4-dev-tools` to `nativeBuildInputs` to enable the phase.
```nix
{
nativeBuildInputs = [ xfce4-dev-tools ];
}
```
[]{#dontUseXdtAutogenPhase} Disable this behavior by setting `dontUseXdtAutogenPhase` to `true`.

View File

@@ -401,6 +401,11 @@
github = "a-camarillo";
githubId = 58638902;
};
a-hassanin = {
github = "a-hassanin";
name = "Ahmed Hassanin";
githubId = 112945643;
};
a-jay98 = {
email = "ali@jamadi.me";
github = "A-jay98";

View File

@@ -76,7 +76,7 @@ in
{
options = {
services.netdata = {
enable = lib.mkEnableOption "netdata";
enable = lib.mkEnableOption "Netdata";
package = lib.mkPackageOption pkgs "netdata" { };
@@ -180,7 +180,7 @@ in
config = lib.mkOption {
type = lib.types.attrsOf lib.types.attrs;
default = { };
description = "netdata.conf configuration as nix attributes. cannot be combined with configText.";
description = "Configuration for `netdata.conf` as Nix attributes, cannot be combined with `configText`.";
example = lib.literalExpression ''
global = {
"debug log" = "syslog";
@@ -194,13 +194,15 @@ in
type = lib.types.attrsOf lib.types.path;
default = { };
description = ''
Complete netdata config directory except netdata.conf.
Complete netdata config directory except `netdata.conf`.
The default configuration is merged with changes
defined in this option.
Each top-level attribute denotes a path in the configuration
directory as in environment.etc.
directory as in `environment.etc`.
Its value is the absolute path and must be readable by netdata.
Cannot be combined with configText.
Cannot be combined with `configText`.
'';
example = lib.literalExpression ''
"health_alarm_notify.conf" = pkgs.writeText "health_alarm_notify.conf" '''

View File

@@ -199,13 +199,15 @@ in
type = path;
default = "/etc/hosts.hfaxd";
description = ''
The {file}`hosts.hfaxd`
file entry in the spooling area
The {file}`hosts.hfaxd` file entry in the spooling area
will be symlinked to the location given here.
This file must exist and be
readable only by the `uucp` user.
This file must exist and be readable only by the `uucp` user.
See {manpage}`hosts.hfaxd(5)` for details.
This configuration permits access for all users:
The example shown below permits access for all users.
Note that host-based access can be controlled with
{option}`config.systemd.sockets.hylafax-hfaxd.listenStreams`;
by default, only `127.0.0.1` is permitted to connect.
```
environment.etc."hosts.hfaxd" = {
mode = "0600";
@@ -213,9 +215,6 @@ in
text = ".*";
};
```
Note that host-based access can be controlled with
{option}`config.systemd.sockets.hylafax-hfaxd.listenStreams`;
by default, only 127.0.0.1 is permitted to connect.
'';
};
@@ -306,7 +305,7 @@ in
default = null;
example = "daily";
description = ''
purging old files from the spooling area with
Purges old files from the spooling area with
{file}`faxcron` with the given frequency
(see {manpage}`systemd.time(7)`)
'';
@@ -346,7 +345,7 @@ in
default = null;
example = "daily";
description = ''
Purge old files from the spooling area with
Purges old files from the spooling area with
{file}`faxcron` with the given frequency
(see {manpage}`systemd.time(7)`).
'';

View File

@@ -39,7 +39,10 @@ buildGoModule (finalAttrs: {
homepage = "https://bosh.io";
changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${finalAttrs.version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ris ];
maintainers = with lib.maintainers; [
ris
a-hassanin
];
mainProgram = "bosh";
};
})

View File

@@ -3,6 +3,7 @@
stdenv,
buildGo127Module,
fetchFromGitHub,
git,
installShellFiles,
nix-update-script,
writableTmpDirAsHomeHook,
@@ -11,16 +12,16 @@
buildGo127Module (finalAttrs: {
pname = "crush";
version = "0.96.1";
version = "0.98.1";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "crush";
tag = "v${finalAttrs.version}";
hash = "sha256-iaZ0rw9585iLVj+HSWCiQnaj2XZ+eYr6zprpUs/47z0=";
hash = "sha256-sz/jlpWH43pgUqKDzaRVKJPK2u7smJLoL2eNrGkXtOY=";
};
vendorHash = "sha256-ADDHgngAChNch8Sp6Zltw52eSlk7swEQG+R4fCxDbY8=";
vendorHash = "sha256-yEV/cBQ2XsmbsYrSWiyEj/dznzSVrpY9QHXMpuw2lpc=";
ldflags = [
"-s"
@@ -46,7 +47,10 @@ buildGo127Module (finalAttrs: {
__darwinAllowLocalNetworking = true;
nativeCheckInputs = [ writableTmpDirAsHomeHook ];
nativeCheckInputs = [
git
writableTmpDirAsHomeHook
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;

View File

@@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc";
mainProgram = "DSView";
mainDarwinApp = "DSView.app";
homepage = "https://www.dreamsourcelab.com/";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix;

View File

@@ -8,17 +8,17 @@
buildGoModule (finalAttrs: {
pname = "forgejo-mcp";
version = "3.0.1";
version = "3.2.0";
# Plain git fetch: upstream's Forgejo instance has source-archive
# downloads disabled, so fetchFromForgejo (tarball-based) cannot be used.
src = fetchgit {
url = "https://git.b4mad.industries/agentic-forges/forgejo-mcp.git";
tag = "v${finalAttrs.version}";
hash = "sha256-Cq99Bj9I9oXM00fL9IBGq/EKj7Jv/fODffohR8APeik=";
hash = "sha256-dZ7k2c0abejHuwdRkXcOMKCnDeY193PYkIg0LVzbvII=";
};
vendorHash = "sha256-Za1lwQQr+qeMIokRLSn2ywRg+5GxMS4KEg+99P1YHy0=";
vendorHash = "sha256-3RFWaohlUd6RpU531/DQH5wgVtjOi/Lh19Hyget7Bhw=";
ldflags = [
"-s"
@@ -40,7 +40,10 @@ buildGoModule (finalAttrs: {
homepage = "https://git.b4mad.industries/agentic-forges/forgejo-mcp";
changelog = "https://git.b4mad.industries/agentic-forges/forgejo-mcp/src/tag/${finalAttrs.src.tag}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ malik ];
maintainers = with lib.maintainers; [
malik
byteflavour
];
mainProgram = "forgejo-mcp";
};
})

View File

@@ -45,6 +45,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
platforms = lib.platforms.darwin;
mainProgram = "kitty";
mainDarwinApp = "kitty.app";
maintainers = with lib.maintainers; [ carlossless ];
};
})

View File

@@ -0,0 +1,65 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1944f4564..f360948c1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@
add_library(${PROJECT_NAME} lzf_c.c lzf_d.c lzf.h lzfP.h)
target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
set_target_properties(${PROJECT_NAME} PROPERTIES
VERSION ${API_VERSION}
@@ -57,7 +57,7 @@
add_library(embed INTERFACE)
target_include_directories(embed INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
target_sources(embed INTERFACE
$<BUILD_INTERFACE:lzf_c.c> $<BUILD_INTERFACE:lzf_d.c>
@@ -95,3 +95,21 @@
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
)
+
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+
+check_include_file(getopt.h HAVE_GETOPT_H)
+check_function_exists(getopt_long HAVE_GETOPT_LONG)
+
+configure_file(config.h.cmake.in config.h)
+
+add_executable(lzf-bin lzf.c)
+set_target_properties(lzf-bin PROPERTIES OUTPUT_NAME lzf)
+target_include_directories(lzf-bin PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
+target_link_libraries(lzf-bin PRIVATE liblzf)
+
+install(
+ TARGETS lzf-bin
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
diff --git a/config.h.cmake.in b/config.h.cmake.in
new file mode 100644
index 0000000000..854a88f142
--- /dev/null
+++ b/config.h.cmake.in
@@ -0,0 +1,2 @@
+#cmakedefine HAVE_GETOPT_H 1
+#cmakedefine HAVE_GETOPT_LONG 1
diff --git a/liblzf.pc.in b/liblzf.pc.in
index 1da19e3eeb..619287c82f 100644
--- a/liblzf.pc.in
+++ b/liblzf.pc.in
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@PROJECT_NAME@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Name: @PROJECT_NAME@
Description: A very small data compression library

View File

@@ -1,4 +1,4 @@
#include "lzf.h"
#include <liblzf/lzf.h>
#include <stdio.h>
#include <string.h>

View File

@@ -2,76 +2,98 @@
lib,
stdenv,
fetchDebianPatch,
fetchpatch,
fetchurl,
pkg-config,
testers,
validatePkgConfig,
autoconf,
automake,
libtool,
cmake,
pkg-config,
}:
let
debianRevision = toString 4;
in
stdenv.mkDerivation (finalAttrs: {
pname = "liblzf";
version = "3.6";
__structuredAttrs = true;
strictDeps = true;
src = fetchurl {
url = "https://dist.schmorp.de/liblzf/liblzf-${finalAttrs.version}.tar.gz";
hash = "sha256-nF3gH3ucyuQMP2GdJqer7JmGwGw20mDBec7dBLiftGo=";
};
outputs = [
"out"
"bin"
"dev"
];
prePatch =
let
debianBaseUrl = "https://sources.debian.org/data/main/libl/liblzf/${finalAttrs.version}-${debianRevision}/debian";
debianCmakeLists = fetchurl {
url = "${debianBaseUrl}/extras/CMakeLists.txt";
hash = "sha256-QlgWq7xLhgvhBvtZ1e2ngMTpA/Dp6USdVgN+RfgO5x4=";
};
debianCmakeConfig = fetchurl {
url = "${debianBaseUrl}/extras/liblzf-config.cmake.in";
hash = "sha256-WvQ+QAFGxaPCz80ne3OA4L5cc/vUp5iMQe/2wGfoTMw=";
};
debianPkgConfig = fetchurl {
url = "${debianBaseUrl}/extras/liblzf.pc.in";
hash = "sha256-0KBA1duW420/DgaXQiyNlKBkQpVBH6LPucf11e4b8go=";
};
in
''
cp --no-preserve=mode ${debianCmakeLists} CMakeLists.txt
cp --no-preserve=mode ${debianCmakeConfig} liblzf-config.cmake.in
cp --no-preserve=mode ${debianPkgConfig} liblzf.pc.in
'';
patches = [
(fetchDebianPatch {
inherit (finalAttrs) pname version;
debianRevision = "4";
inherit debianRevision;
patch = "0001-Make-sure-that-the-library-is-linked-with-C-symbols.patch";
hash = "sha256-Rgfp/TysRcEJaogOo/Xno+G4HZzj9Loa69DL43Bp1Ok=";
})
(
let
name = "liblzf-3.6-autoconf-20140314.patch";
in
fetchpatch {
inherit name;
url = "https://src.fedoraproject.org/rpms/liblzf/raw/53da654eead51a24ac81a28e1b1c531eb1afab28/f/${name}";
hash = "sha256-rkhI8w0HV3fGiDfHiXBzrnxqGDE/Yo5ntePrsscMiyg=";
}
)
./cmake.patch
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
];
nativeBuildInputs = [
autoconf
automake
libtool
cmake
pkg-config
validatePkgConfig
];
preConfigure = ''
sh ./bootstrap.sh
'';
postInstall = ''
pushd $out/bin
ln -s lzf unlzf
popd
ln -s lzf $bin/bin/unlzf
ln -s liblzf/lzf.h $dev/include/lzf.h
'';
outputs = [
"out"
"dev"
];
passthru.tests = {
cmakeConfigTest = testers.hasCmakeConfigModules {
package = finalAttrs.finalPackage;
moduleNames = [ "liblzf" ];
};
pkgConfigTest = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
version = "${finalAttrs.version}.0";
versionCheck = true;
};
exeTest = testers.runCommand {
name = "${finalAttrs.pname}-exe-test";
buildInputs = [ finalAttrs.finalPackage ];
buildInputs = [ finalAttrs.finalPackage.bin ];
script = ''
lzf -h 2> /dev/null
@@ -89,8 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
exit 1
fi
echo "Decompressed output matches test string (lzf & unlzf)"
touch $out
'';
};
@@ -101,16 +121,20 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
finalAttrs.finalPackage.dev
finalAttrs.finalPackage
];
# tests both the library and pkg-config file
script = ''
$CC -g ${./lib_test.c} -o lib_test \
substitute ${./lib_test.c} lib_test.c \
--replace-fail '#include <liblzf/lzf.h>' '#include <lzf.h>'
$CC -g lib_test.c -o lib_test \
$(pkg-config --cflags --libs liblzf)
./lib_test >/dev/null
echo "Built and tested file linked against liblzf using pkg-config"
$CC -g ${./lib_test.c} -o lib_test-namespaced \
$(pkg-config --cflags --libs liblzf)
./lib_test-namespaced >/dev/null
touch $out
'';
};

View File

@@ -5,7 +5,7 @@
cmake,
pkg-config,
gtest,
boost,
boost190,
wt,
taglib,
libconfig,
@@ -20,15 +20,18 @@
onnxruntime,
}:
let
boost = boost190;
in
stdenv.mkDerivation (finalAttrs: {
pname = "lms";
version = "3.80.0";
version = "3.81.0";
src = fetchFromGitHub {
owner = "epoupon";
repo = "lms";
rev = "v${finalAttrs.version}";
hash = "sha256-TXtSsQ6qsZd5WpW9d9o/ELcvkGEMj9Sih376AoyyaFA=";
hash = "sha256-wyMTnTlKMS4N3zTY4C574BTB88nRugsi21QWjDeLZrg=";
};
strictDeps = true;
@@ -52,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
xxhash
pugixml
onnxruntime
ffmpeg
];
postPatch = ''
@@ -59,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
'';
postInstall = ''
substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${lib.getExe ffmpeg}"
substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources"
substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms" "$out/share/lms"
substituteInPlace $out/share/lms/default.service --replace-fail "/usr/bin/lms" "$out/bin/lms"

View File

@@ -9,17 +9,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "mountpoint-s3";
version = "1.22.3";
version = "1.24.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "mountpoint-s3";
tag = "v${finalAttrs.version}";
hash = "sha256-22tx8ozXkzBNAflDPc7cdfUh9TWD6aB/Fe/z/dPZ694=";
hash = "sha256-UDL1y7xmVhv/KlWiDOdvRahUF831kXGBIOcSmDRJCGs=";
fetchSubmodules = true;
};
cargoHash = "sha256-SSSXqgJ3OERCVw81iXqXRRpVXgdwhlefHhI/qvQyl4g=";
cargoHash = "sha256-N2Rf6ikEBSsTQBsb5xGPWj0ElHjKnCx5FSd85DLqKM4=";
# thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
# cargo metadata failure: error: none of the selected packages contains these features: libfuse3
@@ -42,6 +42,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
checkFlags = [
"--skip=io::tls::test::build_tls_connection_options"
"--skip=s3::client::tests::tls_connection_options_wiring"
"--skip=s3::config::tests::test_read_part_size_exceeds_budget_default_clamps"
"--skip=mountpoint-s3-client/src/lib.rs"
#thread 's3_crt_client::tests::test_expected_bucket_owner' panicked at mountpoint-s3-client/src/s3_crt_client.rs:1123:47:
#Create test client: ProviderFailure(Error(1173, "aws-c-io: AWS_IO_TLS_ERROR_DEFAULT_TRUST_STORE_NOT_FOUND, Default TLS trust store not found on this system. Trusted CA certificates must be installed, or \"override default trust store\" must be used while creating the TLS context."))
#

View File

@@ -32,7 +32,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "omp";
version = "18.8.7";
version = "18.8.9";
strictDeps = true;
__structuredAttrs = true;
@@ -41,12 +41,12 @@ stdenv.mkDerivation (finalAttrs: {
owner = "can1357";
repo = "oh-my-pi";
tag = "v${finalAttrs.version}";
hash = "sha256-nWuBvVNeJW9rgrSMhx5JP4CjFFJnfuMzjOlaGDCPVUU=";
hash = "sha256-t3OZP4E0mWFJU0RW3OMcGU2G52p5uasQdVPhITHnZec=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-wfGvns/9Supk3QUuVfchUy7talfwhJswbLd8LWoZMXU=";
hash = "sha256-fiKnCLgcEPZ+WtMD6oBNJfzXHW28y/NN7KOo9oIKMWE=";
};
postPatch = ''

View File

@@ -72,6 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ carlossless ];
mainProgram = "packetry";
mainDarwinApp = "Packetry.app";
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
})

View File

@@ -112,6 +112,7 @@ stdenv.mkDerivation {
homepage = "https://www.ngscopeclient.org/";
license = lib.licenses.bsd3;
mainProgram = "ngscopeclient";
mainDarwinApp = "ngscopeclient.app";
maintainers = with lib.maintainers; [
bgamari
carlossless

View File

@@ -98,6 +98,10 @@ python3Packages.buildPythonApplication rec {
meta = {
description = "Container-based approach to boot a full Android system on a regular GNU/Linux system";
longDescription = ''
A container-based approach to boot a full Android system on regular GNU/Linux systems running Wayland based desktop environments.
To install on NixOS, please use the option `virtualisation.waydroid.enable = true`.
'';
mainProgram = "waydroid";
homepage = "https://github.com/waydroid/waydroid";
license = lib.licenses.gpl3Only;

View File

@@ -19,20 +19,20 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wealthfolio";
version = "3.8.0";
version = "3.9.1";
src = fetchFromGitHub {
owner = "wealthfolio";
repo = "wealthfolio";
rev = "v${finalAttrs.version}";
hash = "sha256-5CqLHnwBzqA+yf/sQM2ie3xuO+5aM5EDA0bhZ6r1VIM=";
hash = "sha256-ozdNgUytQMWzPf7N+8x2boNC/GgxMmzGzAnioGW20VA=";
};
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) src pname version;
pnpm = pnpm_10;
fetcherVersion = 4;
hash = "sha256-I9s1hFNb7oHYH5OhKmtMbMsmQZXE6ovpupusN6M1YKc=";
hash = "sha256-j9rqB5RYpoyQP58erDE5r1Kx7Aq9vOQbiOTBzGVoe9k=";
};
cargoRoot = ".";
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
src
cargoRoot
;
hash = "sha256-PFMmpQhQubMzomvLWMJZrriH9emwEzO/rTFCovzFt6w=";
hash = "sha256-skElXNXFcTwPv+rLKY90He8XLZfVrOJ8jYC4kL2vj9c=";
};
nativeBuildInputs = [
@@ -66,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
webkitgtk_4_1
];
env.OPENSSL_NO_VENDOR = "1";
postPatch = ''
jq \
'.plugins.updater.endpoints = [ ]

View File

@@ -18,7 +18,7 @@
buildPythonPackage (finalAttrs: {
pname = "aiounifi";
version = "96";
version = "97";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
owner = "Kane610";
repo = "aiounifi";
tag = "v${finalAttrs.version}";
hash = "sha256-tDob4Hq78tfVoOZ89cdjmTW34Of0r6Y9c9GtFSCKXqw=";
hash = "sha256-dOY+Tps7l/9TybTOzff4DpaA1BvSMYAXDMCySDtX038=";
};
postPatch = ''
@@ -54,6 +54,8 @@ buildPythonPackage (finalAttrs: {
trustme
];
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [ "aiounifi" ];
meta = {

View File

@@ -25,6 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
};
sourceRoot = "${finalAttrs.src.name}/projects/rocm-smi-lib";
__structuredAttrs = true;
strictDeps = true;
propagatedBuildInputs = [
libdrm
];
@@ -38,10 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
# Manually define CMAKE_INSTALL_<DIR>
# See: https://github.com/NixOS/nixpkgs/pull/197838
"-DCMAKE_INSTALL_BINDIR=bin"
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DCMAKE_INSTALL_LIBEXECDIR=libexec"
"-DCMAKE_INSTALL_INCLUDEDIR=include"
(lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
(lib.cmakeFeature "CMAKE_INSTALL_LIBEXECDIR" "libexec")
(lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
];
postInstall =
@@ -65,7 +68,9 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "System management interface for AMD GPUs supported by ROCm";
homepage = "https://github.com/ROCm/rocm-systems/tree/develop/projects/rocm-smi-lib";
changelog = "https://github.com/ROCm/rocm-systems/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
mainProgram = "rocm-smi";
maintainers = with lib.maintainers; [ lovesegfault ];
teams = [ lib.teams.rocm ];
platforms = [ "x86_64-linux" ];

View File

@@ -204,7 +204,7 @@ let
--add-needed ${libtheora}/lib/libtheora.so \
$out/bin/xonotic-sdl
'';
meta.platforms = lib.platforms.linux;
meta.mainProgram = "xonotic-${
if withSDL then
"sdl"