From 58e59742c8fae1f483729251dee8b882949c6ddc Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 6 Apr 2022 19:42:58 -0300 Subject: [PATCH 1/4] shellhub-agent: 0.9.0 -> 0.9.1 Signed-off-by: Otavio Salvador --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index d698601cb190..7384f7c350a5 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "A1634b3uxlILMpx/9jpCIApqAqofvD4ZPasVKL29Gtc="; + sha256 = "E1TX3GBVKn0tXloNhyiXOtDwSlO7mwXJ6zaOSHKZEFc="; }; modRoot = "./agent"; - vendorSha256 = "sha256-LxJtLQr8djoRGznT5hL2agTgtZY6pFS8Zo0BwHDmugc="; + vendorSha256 = "sha256-sPb49tRUHhwow7+IKiN33sgWYAa3lTpOD1vh8e5Wy68="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From 4623d107eb0b340ecbf93c73737d00ed0403c0ee Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 6 Apr 2022 22:01:40 +0800 Subject: [PATCH 2/4] tinyemu: set CC and STRIP in makeFlags --- pkgs/applications/emulators/tinyemu/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/tinyemu/default.nix b/pkgs/applications/emulators/tinyemu/default.nix index c32fd24fe477..ca3f8acd88ca 100644 --- a/pkgs/applications/emulators/tinyemu/default.nix +++ b/pkgs/applications/emulators/tinyemu/default.nix @@ -21,7 +21,12 @@ stdenv.mkDerivation rec { openssl ]; - makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; + makeFlags = [ + "CC:=$(CC)" + "STRIP:=$(STRIP)" + "DESTDIR=$(out)" + "bindir=/bin" + ]; preInstall = '' mkdir -p "$out/bin" From 9258267684e33d1b295959f78f4c5b3a90640a30 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 7 Apr 2022 15:33:50 -0300 Subject: [PATCH 3/4] nfpm: enable tests --- pkgs/tools/package-management/nfpm/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index b180de2bed48..1a9013b456d6 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "sha256-guJgLjmB29sOLIzs2+gKNp0WTWC3zS9Sb5DD5IistKY="; - doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { From eb499e5ab6872620751b98d90490e10551dc74be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Apr 2022 21:08:21 +0000 Subject: [PATCH 4/4] gpsprune: 21.1 -> 21.2 --- pkgs/applications/misc/gpsprune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 1c898fa343ce..48708bc057c7 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "21.1"; + version = "21.2"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-WyI9IKzUmKGiqiYs6SSuGhVUdO2UCsPSSL/IjPLykiM="; + sha256 = "sha256-QgbLbpqlC2sITbPK4ZcaovmycwhWtnu06x8F0grpECc="; }; dontUnpack = true;