From d562b79b09a452b54eabffbf7db1c39680cb0e1c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 04:50:48 +0000 Subject: [PATCH 1/5] ameba: 0.14.2 -> 0.14.3 --- pkgs/development/tools/ameba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 9a8cc799bf2..24760051b28 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "sha256-wtUWmvAm7iTiP8eYgPiRasYjzeCIJCQd3D+8f1kMONA="; + sha256 = "sha256-oZdaHV+vnYUiCXNMrSuHvZzDYDgFZsoD715DE3tJ2bE="; }; meta = with lib; { From ea1a726b9c1ca621b9a7c378f5a8cc8fe08aceab Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Wed, 21 Apr 2021 15:56:48 +0300 Subject: [PATCH 2/5] alertmanager-bot: pass version and revision variables The bot outputs its own version/revision in the log during startup and also in a response to the `/status` command. So make sure both version and revision are set. --- pkgs/servers/monitoring/alertmanager-bot/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix index 1eaaf01578f..9fb364de191 100644 --- a/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -17,6 +17,12 @@ buildGoModule rec { sed "s;/templates/default.tmpl;$out/share&;" -i cmd/alertmanager-bot/main.go ''; + preBuild = '' + export buildFlagsArray=( + "-ldflags=-s -w -X main.Version=v${version} -X main.Revision=${src.rev}" + ) + ''; + postInstall = '' install -Dm644 -t $out/share/templates $src/default.tmpl ''; From 68c34de775c6025d01acfb783bb0f583de5fc522 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 21:52:07 +0000 Subject: [PATCH 3/5] dnsproxy: 0.37.1 -> 0.37.2 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 4c784d00542..a6e767c6bf6 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.1"; + version = "0.37.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zenVgWVzKnq9WzJFC6vpE5Gwbv3lJC7aIe3xBQGeWr8="; + sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI="; }; vendorSha256 = null; From ede6c0961e096d519b02121569493a7054b3eb6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 00:59:23 +0000 Subject: [PATCH 4/5] gxkb: 0.9.0 -> 0.9.1 --- pkgs/applications/misc/gxkb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix index 8f6284c7d60..ea1f6b9715f 100644 --- a/pkgs/applications/misc/gxkb/default.nix +++ b/pkgs/applications/misc/gxkb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gxkb"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "zen-tools"; repo = "gxkb"; rev = "v${version}"; - sha256 = "1fmppvpfz8rip71agsc464fdz423qw0xy8i3pcic14cy5gcwh069"; + sha256 = "sha256-pRVzhNoTMtiwqaxCGVImbvdRmLbZ2bst1IdMA2IKpYc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From dc9694c78eb30084be5e7607f68704987c12f6e7 Mon Sep 17 00:00:00 2001 From: brano543 Date: Fri, 1 Jan 2021 21:42:07 +0100 Subject: [PATCH 5/5] openssl: correct cross compile for mingw --- .../development/libraries/openssl/default.nix | 8 ++++--- pkgs/top-level/all-packages.nix | 21 +++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index f6d45f66b1a..13cac47793e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,7 +6,7 @@ # Used to avoid cross compiling perl, for example, in darwin bootstrap tools. # This will cause c_rehash to refer to perl via the environment, but otherwise # will produce a perfectly functional openssl binary and library. -, withPerl ? true +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform }: assert ( @@ -42,8 +42,10 @@ let substituteInPlace "$a" \ --replace /bin/rm rm done - '' + optionalString (versionAtLeast version "1.1.1") '' - substituteInPlace config --replace '/usr/bin/env' '${coreutils}/bin/env' + '' + # config is a configure script which is not installed. + + optionalString (versionAtLeast version "1.1.1") '' + substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env' '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) '' substituteInPlace crypto/async/arch/async_posix.h \ --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d6636416ee..e94824531fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -465,16 +465,18 @@ in perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { fetchurl = stdenv.fetchurlBoot; - coreutils = buildPackages.coreutils.override { - fetchurl = stdenv.fetchurlBoot; + buildPackages = { + coreutils = buildPackages.coreutils.override { + fetchurl = stdenv.fetchurlBoot; + inherit perl; + xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; + gmp = null; + aclSupport = false; + attrSupport = false; + }; inherit perl; - xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; - gmp = null; - aclSupport = false; - attrSupport = false; }; inherit perl; - buildPackages = { inherit perl; }; }; libssh2 = buildPackages.libssh2.override { fetchurl = stdenv.fetchurlBoot; @@ -16901,10 +16903,7 @@ in wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = - if stdenv.hostPlatform.isMinGW # Work around broken cross build - then openssl_1_0_2 - else openssl_1_1; + openssl = openssl_1_1; inherit (callPackages ../development/libraries/openssl { }) openssl_1_0_2