fix nodePackages references in prometheus-actual-exporter

This commit is contained in:
Noah Masur
2026-05-16 08:39:01 -04:00
parent 1a7633fe8c
commit 15f70dce2c
6 changed files with 85 additions and 67 deletions

View File

@@ -2,7 +2,12 @@
"permissions": {
"allow": [
"WebFetch(domain:github.com)",
"WebFetch(domain:raw.githubusercontent.com)"
"WebFetch(domain:raw.githubusercontent.com)",
"Bash(gh run *)",
"Bash(jj status *)",
"Bash(jj new *)",
"Bash(jj describe *)",
"Bash(nix flake *)"
]
}
}

View File

@@ -21,6 +21,9 @@ let
# [ package1.drv package2.drv ]
(builtins.map (name: prev.callPackage name { }))
# Filter out packages that return null (e.g. platform-specific packages)
(builtins.filter (v: v != null))
# Convert the list to an attrset
# { package1 = package1.drv, package2 = package2.drv }
listToAttrsByPnameOrName

View File

@@ -1,6 +1,9 @@
# Fix: Volnoti error: 'volnoti' has been removed due to lack of maintenance upstream.
{ pkgs, lib, ... }:
if !pkgs.stdenv.isLinux then
null
else
pkgs.stdenv.mkDerivation {
pname = "volnoti";
version = "2013-09-23";

View File

@@ -3,7 +3,8 @@
fetchFromGitHub,
nodejs_20,
buildNpmPackage,
nodePackages,
typescript,
node-gyp,
python3,
gcc,
gnumake,
@@ -30,9 +31,9 @@ buildNpmPackage (finalAttrs: rec {
nativeBuildInputs = [
nodejs_20
nodePackages.typescript
typescript
python3
nodePackages.node-gyp
node-gyp
gcc
gnumake
];
@@ -53,8 +54,8 @@ buildNpmPackage (finalAttrs: rec {
# export npm_config_build_from_source=true
# export npm_config_unsafe_perm=true
# export BINARY_SITE=none
# export PATH=${nodePackages.node-gyp}/bin:$PATH
# export npm_config_node_gyp=${nodePackages.node-gyp}/bin/node-gyp
# export PATH=${node-gyp}/bin:$PATH
# export npm_config_node_gyp=${node-gyp}/bin/node-gyp
# npm rebuild better-sqlite3 --build-from-source --verbose
@@ -74,8 +75,8 @@ buildNpmPackage (finalAttrs: rec {
export npm_config_build_from_source=true
export npm_config_unsafe_perm=true
export BINARY_SITE=none
export PATH=${nodePackages.node-gyp}/bin:$PATH
export npm_config_node_gyp=${nodePackages.node-gyp}/bin/node-gyp
export PATH=${node-gyp}/bin:$PATH
export npm_config_node_gyp=${node-gyp}/bin/node-gyp
sed -i '/"install"/d' node_modules/better-sqlite3/package.json
rm -f node_modules/better-sqlite3/build/Release/better_sqlite3.node || true

View File

@@ -1,10 +1,14 @@
{
lib,
stdenv,
buildDotnetModule,
fetchFromGitHub,
dotnetCorePackages,
}:
if !stdenv.isLinux then
null
else
buildDotnetModule rec {
pname = "slsk-batchdl";
version = "2.4.7";
@@ -22,7 +26,6 @@ buildDotnetModule rec {
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
# Patch the project file to use .NET 8
postPatch = ''
substituteInPlace slsk-batchdl/slsk-batchdl.csproj \
--replace-fail "net6.0" "net8.0"

View File

@@ -1,8 +1,11 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
# Inspired by https://github.com/cleverca22/nix-tests/blob/master/kexec/justdoit.nix
# This script will partition and format drives; use at your own risk!
if !pkgs.stdenv.isLinux then
null
else
pkgs.writeShellScriptBin "installer" ''
set -e