Commit 198e3588 authored by Conroy Cheers's avatar Conroy Cheers
Browse files

fan2go: 0.10.0 -> 0.11.1

parent ef9b1505
Loading
Loading
Loading
Loading
+0 −18
Original line number Diff line number Diff line
diff --git a/Makefile b/Makefile
index c92df71..724911a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,12 @@ DATE       ?= $(shell date -u -d @${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:%M:%SZ")
 VERSION    ?= 0.10.0
 
 test:   ## Run all tests
-	@go clean --testcache && go test -v ./...
+	@go clean --testcache && go test -ldflags -extldflags=-Wl,-z,lazy -v ./...
 
 build:  ## Builds the CLI
 	@go build ${GO_FLAGS} \
 	-ldflags "-w -s \
+	-extldflags=-Wl,-z,lazy \
 	-X ${NAME}/cmd/global.Version=${VERSION} \
 	-X ${PACKAGE}/cmd/global.Version=${VERSION} \
 	-X ${NAME}/cmd/global.Commit=${GIT_REV} \
+15 −6
Original line number Diff line number Diff line
{
  config,
  buildGoModule,
  fetchFromGitHub,
  lib,
  lm_sensors,
  autoAddDriverRunpath,
  enableNVML ? config.cudaSupport,
}:

buildGoModule rec {
  pname = "fan2go";
  version = "0.10.0";
  version = "0.11.1";

  src = fetchFromGitHub {
    owner = "markusressel";
    repo = "fan2go";
    tag = version;
    hash = "sha256-mLypuOGjYrXFf3BGCDggEDk1+PVx2CgsxAjZQ7uiSW0=";
    hash = "sha256-CHBJhG10RD5rQW1SFk7ffV9M4t6LtJR6xQrw47KQzC0=";
    leaveDotGit = true;
    postFetch = ''
      cd $out
@@ -22,11 +25,13 @@ buildGoModule rec {
    '';
  };

  vendorHash = "sha256-IJJTolpOtstVov8MNel6EOJqv1oCkTOTiPyW42ElQjc=";
  vendorHash = "sha256-BSZwvD9psXtSmoUPBxMVuvbcpqDSpFEKVskJo05e4fo=";

  buildInputs = [ lm_sensors ];
  nativeBuildInputs = lib.optionals enableNVML [
    autoAddDriverRunpath
  ];

  patches = [ ./lazy-binding.patch ];
  buildInputs = [ lm_sensors ];

  postConfigure = ''
    substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \
@@ -41,7 +46,7 @@ buildGoModule rec {
  buildPhase = ''
    runHook preBuild

    make build GIT_REV="$(cat GIT_REV)"
    make build${lib.optionalString (!enableNVML) "-no-nvml"} GIT_REV="$(cat GIT_REV)"

    dir="$GOPATH/bin"
    mkdir -p "$dir"
@@ -50,6 +55,10 @@ buildGoModule rec {
    runHook postBuild
  '';

  postFixup = lib.optionalString enableNVML ''
    patchelf --add-needed libnvidia-ml.so "$out/bin/fan2go"
  '';

  checkPhase = ''
    runHook preCheck
    make test