Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-05-22 06:01:27 +00:00 committed by GitHub
commit deef19c9a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 47 additions and 167 deletions

View File

@ -13,7 +13,7 @@
# To not have to set the option in every repository it is needed in,
# save the following script in your path with the name "git-bblame"
# now you can run
# $ git bblame $FILE
# $ git blame $FILE
# to use the .git-blame-ignore-revs file if it is present.
#
# #!/usr/bin/env bash

View File

@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "amberol";
version = "0.6.1";
version = "0.6.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
hash = "sha256-mbRBLhnALPFoHwvx05o0lH5Ld4BN+hPY2OyajgTFsek=";
hash = "sha256-cY4VZRtmDrIgjHa5pMOVO+lpPU+VHhLonpwTxKn834M=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-/5AHwbolEWsj3ChLFJxQaccfookEGvSSkehw0THYnSE=";
hash = "sha256-z3R2UG31s7lV6c+dNChMvzimXfPbxDvuOL+Nduxwawg=";
};
postPatch = ''

View File

@ -1,18 +1,18 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
{ lib, buildGoModule, fetchFromGitHub, testVersion, lndconnect }:
buildGoModule rec {
pname = "lndconnect";
version = "0.2.0";
goPackagePath = "github.com/LN-Zap/lndconnect";
version = "0.2.1";
src = fetchFromGitHub {
owner = "LN-Zap";
repo = pname;
rev = "v${version}";
sha256 = "0zp23vp4i4csc6x1b6z39rqcmknxd508x6clr8ckdj2fwjwkyf5a";
sha256 = "sha256-cuZkVeFUQq7+kQo/YjXCMPANUL5QooAWgegcoWo3M0c=";
};
goDeps = ./deps.nix;
vendorSha256 = "sha256-iE0nht3PH2R9pTyyrySk759untC7snGt3wTXk4/pjrU=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Generate QRCode to connect apps to lnd Resources";
@ -22,4 +22,3 @@ buildGoPackage rec {
platforms = platforms.linux;
};
}

View File

@ -1,129 +0,0 @@
[
{
goPackagePath = "github.com/Baozisoftware/qrcode-terminal-go";
fetch = {
type = "git";
url = "https://github.com/Baozisoftware/qrcode-terminal-go";
rev = "c0650d8dff0f053901ff16185217b950d5e7743c";
sha256 = "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b";
};
}
{
goPackagePath = "github.com/btcsuite/btcd";
fetch = {
type = "git";
url = "https://github.com/btcsuite/btcd";
rev = "e9a51e8dcd673c563a549676ebd4384b0318a9b7";
sha256 = "053pdhhycls7cpygg4rhc0y2p937ni4cgxylgxd1zpwffqdjsxrs";
};
}
{
goPackagePath = "github.com/btcsuite/btclog";
fetch = {
type = "git";
url = "https://github.com/btcsuite/btclog";
rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a";
sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk";
};
}
{
goPackagePath = "github.com/btcsuite/btcutil";
fetch = {
type = "git";
url = "https://github.com/btcsuite/btcutil";
rev = "063c4115b3a9a7201e82447875383890698abcb6";
sha256 = "12dpy5ipmd751xb71hcmrl9xyl89r5rflnrvypnz1irairfqwjwm";
};
}
{
goPackagePath = "github.com/glendc/go-external-ip";
fetch = {
type = "git";
url = "https://github.com/glendc/go-external-ip";
rev = "c872357d968e33d5d9c47ea2c603f3b411150ecc";
sha256 = "1h9cdhab4fapa2p1r8sgl1pxv4qi1zskw8x0pj93a81y03zzr2l1";
};
}
{
goPackagePath = "github.com/jessevdk/go-flags";
fetch = {
type = "git";
url = "https://github.com/jessevdk/go-flags";
rev = "c17162fe8fd74f119ff938c5c67af63e3bac5ded";
sha256 = "0byp3f79b0399n7g6nm59afb6gj9cknfqgfqadvpppv7lvnd34jf";
};
}
{
goPackagePath = "github.com/lightningnetwork/lnd";
fetch = {
type = "git";
url = "https://github.com/lightningnetwork/lnd";
rev = "fd962d322ae2a913cc357dbb63382f22a9a0a6ce";
sha256 = "0yj2vqb9qg5v0rbchkpwhhw51rp31z76zchhhbc837sz8l8lryra";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "f6c00982823144337e56cdb71c712eaac151d29c";
sha256 = "08y5c01bvyqxraj3wc0di80gbp87178rsshb74x0p3m7wwfv82l3";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "cb30d6282491c185f77d9bec5d25de1bb61a06bc";
sha256 = "0v59mv94acd2m72q8adhigxkx1vn38l5h0d8hp0nxga2v9f3v8kd";
};
}
{
goPackagePath = "github.com/miekg/dns";
fetch = {
type = "git";
url = "https://github.com/miekg/dns";
rev = "7a5f1127f7f4e461b7400d6a9df1bc523e7448fd";
sha256 = "1xwg6zwlxwkm1x121b3idir76h7wr9wmcdmg4vgj9hma903s63md";
};
}
{
goPackagePath = "github.com/skip2/go-qrcode";
fetch = {
type = "git";
url = "https://github.com/skip2/go-qrcode";
rev = "da1b6568686e89143e94f980a98bc2dbd5537f13";
sha256 = "0pghd6y2x8a5fqy4rjn4d8j5jcslb236naycdza5an7vyvinsgs9";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a";
sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "05aa5d4ee32165add31ddef9d5d3946713e5dc5e";
sha256 = "1v532mdb32h2gan6lc9ssya2v1lk6nzyzqvxn5nkbxij9x4v1jkl";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "9d91bd62050c7b3011b7df0d2a4daa0042684420";
sha256 = "0d2jjd7r0zwakd1d2g2qm59w6jc6sgg0sal5gc626i8nn9adj2jg";
};
}
]

View File

@ -1,29 +1,28 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage {
buildGoModule rec {
pname = "autospotting";
version = "unstable-2018-11-17";
goPackagePath = "github.com/AutoSpotting/AutoSpotting";
version = "unstable-2022-02-17";
src = fetchFromGitHub {
owner = "AutoSpotting";
owner = "cloudutil";
repo = "AutoSpotting";
rev = "122ab8f292a2f718dd85e79ec22acd455122907e";
sha256 = "0p48lgig9kblxvgq1kggczkn4qdbx6ciq9c8x0179i80vl4jf7v6";
rev = "f295a1f86c4a21144fc7fe28a69da5668fb7ad0c";
sha256 = "sha256-n5R5RM2fv3JWqtbSsyb7GWS4032dkgcihAKbpjB/5PM=";
};
# patching path where repository used to exist
postPatch = ''
sed -i "s+github.com/cristim/autospotting/core+github.com/AutoSpotting/AutoSpotting/core+" autospotting.go
'';
vendorSha256 = "sha256-w7OHGZ7zntu8ZlI5gA19Iq7TKR23BQk9KpkUO+njL9Q=";
excludedPackages = [ "scripts" ];
ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://github.com/AutoSpotting/AutoSpotting";
description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes";
license = licenses.free;
maintainers = [ maintainers.costrouc ];
homepage = "https://github.com/cloudutil/AutoSpotting";
license = licenses.osl3;
maintainers = with maintainers; [ costrouc ];
mainProgram = "AutoSpotting";
platforms = platforms.unix;
};
}

View File

@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib bzip2 xz ];
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: foomatic_rip-options.o:/build/foomatic-filters-4.0.17/options.c:49: multiple definition of `cupsfilter';
# foomatic_rip-foomaticrip.o:/build/foomatic-filters-4.0.17/foomaticrip.c:158: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
installPhase = ''
install -vD bin/freebayes bin/bamleftalign scripts/* -t $out/bin
'';

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl }:
{ lib, clangStdenv, fetchurl }:
stdenv.mkDerivation rec {
clangStdenv.mkDerivation rec {
pname = "zchaff";
version = "2004.5.13";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
patches = [ ./sat_solver.patch ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ];
makeFlags = [ "CC=${clangStdenv.cc.targetPrefix}c++" ];
installPhase= ''
runHook preInstall
install -Dm755 -t $out/bin zchaff

View File

@ -22,13 +22,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
version = "2022.Q2.1";
version = "2022.Q2.2";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
sha256 = "MJTpPzmIcTf4/RNte1oDYmn6/wLUJrHM2igrGgXIVqI=";
sha256 = "4LV6g2snT1usY+Ic9Hb/IwXAJQ97I9DigZCah6mwewA=";
};
buildInputs = [

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.77.0";
version = "1.77.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ike3yO93q/bna/cnHv1sg+gR7iS9cVmNzLViBsfFdVs=";
sha256 = "sha256-S0HXIjZI48A+tMv+gT8UfYqmCI4NOwWAFykfhW73WPc=";
};
vendorSha256 = null;
@ -17,8 +17,13 @@ buildGoModule rec {
# main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package
# github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web
#
# This appears to be some of test server for development purposes only.
# This appears to be some kind of test server for development purposes only.
rm -f app/vmui/packages/vmui/web/{go.mod,main.go}
# Increase timeouts in tests to prevent failure on heavily loaded builders
substituteInPlace lib/storage/storage_test.go \
--replace "time.After(10 " "time.After(120 " \
--replace "time.After(30 " "time.After(120 "
'';
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];

View File

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
platforms = postgresql.meta.platforms;
maintainers = [ maintainers.marsam ];
broken = versionOlder postgresql.version "10";
broken = versions.major postgresql.version != "11";
};
}

View File

@ -11,11 +11,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "212";
version = "213";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-Kr8OHArnLR9AwN/s5QUSzX/puINkK1eu869OaFz3nlw=";
sha256 = "sha256-l2kdV1QUGsS3D6Y/b485iDmQcBNIzaBywxhqfRDINX8=";
};
outputs = [ "out" "man" ];