commit 156775a8df5805f7f508a0666b32e2664fa1c1b9
parent 2f47d331160d04429b804427accf85515a1c7933
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Wed, 19 Feb 2025 00:37:57 +0400
Up
Diffstat:
12 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/pkgs/darwin/finch/default.nix b/pkgs/darwin/finch/default.nix
@@ -3,6 +3,7 @@
stdenv,
buildGoModule,
fetchFromGitHub,
+ writableTmpDirAsHomeHook,
}:
buildGoModule rec {
@@ -23,9 +24,7 @@ buildGoModule rec {
ldflags = [ "-X github.com/runfinch/finch/pkg/version.Version=${version}" ];
- preCheck = ''
- export HOME=$TMPDIR
- '';
+ nativeCheckInputs = [ writableTmpDirAsHomeHook ];
checkFlags = [ "-skip=TestVersionAction_run" ];
diff --git a/pkgs/darwin/pinentry-touchid/default.nix b/pkgs/darwin/pinentry-touchid/default.nix
@@ -4,6 +4,7 @@
buildGoModule,
fetchFromGitHub,
darwin,
+ writableTmpDirAsHomeHook,
}:
buildGoModule rec {
@@ -21,11 +22,9 @@ buildGoModule rec {
subPackages = [ "." ];
- buildInputs = [ darwin.apple_sdk.frameworks.LocalAuthentication ];
+ nativeBuildInputs = [ writableTmpDirAsHomeHook ];
- preBuild = ''
- export HOME=$TMPDIR
- '';
+ buildInputs = [ darwin.apple_sdk.frameworks.LocalAuthentication ];
doCheck = false;
diff --git a/pkgs/darwin/zed/default.nix b/pkgs/darwin/zed/default.nix
@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "zed";
- version = "0.174.1-pre";
+ version = "0.174.3-pre";
src = fetchurl {
url = "https://zed.dev/api/releases/stable/${finalAttrs.version}/Zed-x86_64.dmg";
- hash = "sha256-SyHRJjB7TDpcbM1bT6cAqz5lQuOBcgX35gmcbHw1NgU=";
+ hash = "sha256-xYvo5eh1h1/q7r3YDUNROq5cW8asaHdd2XgJdo+uY24=";
};
sourceRoot = ".";
diff --git a/pkgs/data/maps/slazav/fi.nix b/pkgs/data/maps/slazav/fi.nix
@@ -10,6 +10,7 @@
mapsoft2,
netpbm,
sqlite,
+ writableTmpDirAsHomeHook,
zip,
}:
@@ -39,13 +40,10 @@ stdenv.mkDerivation {
mapsoft2
netpbm
sqlite
+ writableTmpDirAsHomeHook
zip
];
- preBuild = ''
- export HOME=$TMPDIR
- '';
-
buildFlags = [ "out" ];
installPhase = ''
diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix
@@ -13,6 +13,7 @@
netpbm,
sqlite,
unstableGitUpdater,
+ writableTmpDirAsHomeHook,
zip,
}:
@@ -44,11 +45,11 @@ stdenv.mkDerivation {
mapsoft2
netpbm
sqlite
+ writableTmpDirAsHomeHook
zip
];
preBuild = ''
- export HOME=$TMPDIR
make -C pics
'';
diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix
@@ -13,6 +13,7 @@
netpbm,
sqlite,
unstableGitUpdater,
+ writableTmpDirAsHomeHook,
zip,
}:
@@ -39,11 +40,11 @@ stdenv.mkDerivation {
mapsoft2
netpbm
sqlite
+ writableTmpDirAsHomeHook
zip
];
preBuild = ''
- export HOME=$TMPDIR
make -C pics
'';
diff --git a/pkgs/gemini/agunua/default.nix b/pkgs/gemini/agunua/default.nix
@@ -24,10 +24,6 @@ python3Packages.buildPythonApplication rec {
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
- preCheck = ''
- export HOME=$TMPDIR
- '';
-
disabledTestPaths = [
"tests/test_egsam.py"
"tests/test_full.py"
diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix
@@ -19,14 +19,12 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
- zig_0_11
+ zig_0_11.hook
scdoc
installShellFiles
];
- buildPhase = ''
- export HOME=$TMPDIR
- zig build -Doptimize=ReleaseSmall -Dcpu=baseline
+ postBuild = ''
scdoc < doc/gmi2html.scdoc > doc/gmi2html.1
'';
@@ -36,8 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
sh tests/test.sh
'';
- installPhase = ''
- zig build --prefix $out install
+ postInstall = ''
installManPage doc/gmi2html.1
'';
diff --git a/pkgs/misc/mitzasql/default.nix b/pkgs/misc/mitzasql/default.nix
@@ -22,10 +22,6 @@ python3Packages.buildPythonApplication rec {
urwid
];
- preBuild = ''
- export HOME=$TMPDIR
- '';
-
doCheck = false; # MySQL server required
meta = {
diff --git a/pkgs/misc/modbus_sim_cli/default.nix b/pkgs/misc/modbus_sim_cli/default.nix
@@ -3,6 +3,7 @@
python3Packages,
fetchFromGitHub,
modbus_tk,
+ writableTmpDirAsHomeHook,
}:
python3Packages.buildPythonApplication {
@@ -22,6 +23,8 @@ python3Packages.buildPythonApplication {
--replace-fail "yaml.load(conffile.read())" "yaml.safe_load(conffile)"
'';
+ nativeBuildInputs = [ writableTmpDirAsHomeHook ];
+
dependencies = with python3Packages; [
coloredlogs
modbus_tk
@@ -32,10 +35,6 @@ python3Packages.buildPythonApplication {
find modbus_sim -name "*.py" | xargs 2to3 -w
'';
- preBuild = ''
- export HOME=$TMPDIR
- '';
-
meta = {
description = "Modbus simulation command line version";
homepage = "https://github.com/dhoomakethu/modbus_sim_cli";
diff --git a/pkgs/mqtt/emitter/default.nix b/pkgs/mqtt/emitter/default.nix
@@ -2,6 +2,7 @@
lib,
buildGoModule,
fetchFromGitHub,
+ writableTmpDirAsHomeHook,
}:
buildGoModule rec {
@@ -17,18 +18,17 @@ buildGoModule rec {
vendorHash = "sha256-6K9KAvb+05nn2pFuVDiQ9IHZWpm+q01su6pl7CxXxBY=";
- preCheck = ''
- export HOME=$TMPDIR
- '';
+ nativeCheckInputs = [ writableTmpDirAsHomeHook ];
- doCheck = false;
+ doCheck = true;
- checkFlags = [ "-skip=TestStatsd_Configure" ];
+ __darwinAllowLocalNetworking = true;
meta = {
description = "High performance, distributed and low latency publish-subscribe platform";
homepage = "https://emitter.io/";
license = lib.licenses.agpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
+ mainProgram = "emitter";
};
}
diff --git a/pkgs/osm/cykhash/default.nix b/pkgs/osm/cykhash/default.nix
@@ -24,10 +24,6 @@ python3Packages.buildPythonPackage {
doCheck = false;
- preCheck = ''
- export HOME=$TMPDIR
- '';
-
pytestFlagsArray = [ "tests/unit_tests" ];
meta = {
