dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-27 06:05:54 +00:00 committed by GitHub
commit 92003c2ff7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/gxkb/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gxkb"; pname = "gxkb";
version = "0.9.0"; version = "0.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zen-tools"; owner = "zen-tools";
repo = "gxkb"; repo = "gxkb";
rev = "v${version}"; rev = "v${version}";
sha256 = "1fmppvpfz8rip71agsc464fdz423qw0xy8i3pcic14cy5gcwh069"; sha256 = "sha256-pRVzhNoTMtiwqaxCGVImbvdRmLbZ2bst1IdMA2IKpYc=";
}; };
nativeBuildInputs = [ pkg-config autoreconfHook ]; nativeBuildInputs = [ pkg-config autoreconfHook ];

8
pkgs/development/libraries/openssl/default.nix
View File

@ -6,7 +6,7 @@
# Used to avoid cross compiling perl, for example, in darwin bootstrap tools. # 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 # This will cause c_rehash to refer to perl via the environment, but otherwise
# will produce a perfectly functional openssl binary and library. # will produce a perfectly functional openssl binary and library.
, withPerl ? true , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
}: }:
assert ( assert (
@ -42,8 +42,10 @@ let
substituteInPlace "$a" \ substituteInPlace "$a" \
--replace /bin/rm rm --replace /bin/rm rm
done 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) '' '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
substituteInPlace crypto/async/arch/async_posix.h \ substituteInPlace crypto/async/arch/async_posix.h \
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \

4
pkgs/development/tools/ameba/default.nix
View File

@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec { crystal.buildCrystalPackage rec {
pname = "ameba"; pname = "ameba";
version = "0.14.2"; version = "0.14.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crystal-ameba"; owner = "crystal-ameba";
repo = "ameba"; repo = "ameba";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-wtUWmvAm7iTiP8eYgPiRasYjzeCIJCQd3D+8f1kMONA="; sha256 = "sha256-oZdaHV+vnYUiCXNMrSuHvZzDYDgFZsoD715DE3tJ2bE=";
}; };
meta = with lib; { meta = with lib; {

6
pkgs/servers/monitoring/alertmanager-bot/default.nix
View File

@ -17,6 +17,12 @@ buildGoModule rec {
sed "s;/templates/default.tmpl;$out/share&;" -i cmd/alertmanager-bot/main.go 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 = '' postInstall = ''
install -Dm644 -t $out/share/templates $src/default.tmpl install -Dm644 -t $out/share/templates $src/default.tmpl
''; '';

4
pkgs/tools/networking/dnsproxy/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "dnsproxy"; pname = "dnsproxy";
version = "0.37.1"; version = "0.37.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "AdguardTeam"; owner = "AdguardTeam";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zenVgWVzKnq9WzJFC6vpE5Gwbv3lJC7aIe3xBQGeWr8="; sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI=";
}; };
vendorSha256 = null; vendorSha256 = null;

9
pkgs/top-level/all-packages.nix
View File

@ -465,6 +465,7 @@ in
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override { openssl = buildPackages.openssl.override {
fetchurl = stdenv.fetchurlBoot; fetchurl = stdenv.fetchurlBoot;
buildPackages = {
coreutils = buildPackages.coreutils.override { coreutils = buildPackages.coreutils.override {
fetchurl = stdenv.fetchurlBoot; fetchurl = stdenv.fetchurlBoot;
inherit perl; inherit perl;
@ -474,7 +475,8 @@ in
attrSupport = false; attrSupport = false;
}; };
inherit perl; inherit perl;
buildPackages = { inherit perl; }; };
inherit perl;
}; };
libssh2 = buildPackages.libssh2.override { libssh2 = buildPackages.libssh2.override {
fetchurl = stdenv.fetchurlBoot; fetchurl = stdenv.fetchurlBoot;
@ -16913,10 +16915,7 @@ in
wolfssl = callPackage ../development/libraries/wolfssl { }; wolfssl = callPackage ../development/libraries/wolfssl { };
openssl = openssl = openssl_1_1;
if stdenv.hostPlatform.isMinGW # Work around broken cross build
then openssl_1_0_2
else openssl_1_1;
inherit (callPackages ../development/libraries/openssl { }) inherit (callPackages ../development/libraries/openssl { })
openssl_1_0_2 openssl_1_0_2