Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-11-10 10:11:08 +01:00
64 changed files with 848 additions and 327 deletions
+8 -8
View File
@@ -105,8 +105,8 @@ in rec {
asterisk = asterisk_18;
asterisk_13 = common {
version = "13.37.0";
sha256 = "09wc6cqh4f15wm62drzdppwvh7nwgnbwapvz1kgb0qdgixsshn3v";
version = "13.37.1";
sha256 = "1zc3104zw4y7i8bhhgrgy3snq0zr1904p64ykfc3ldh4xyfy3ld6";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
@@ -114,8 +114,8 @@ in rec {
};
asterisk_16 = common {
version = "16.14.0";
sha256 = "1y120p4jlhg4iwihdxlk64y3y3n8w7y785lwqxsyqg6zviz0ghx6";
version = "16.14.1";
sha256 = "1lhh3npyy8hvy29jwjgapnxfjv1ahp2qdi4iq1d6a61ffhd20vfs";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
@@ -123,8 +123,8 @@ in rec {
};
asterisk_17 = common {
version = "17.8.0";
sha256 = "0xhwh8s8n8xg43gcdkqjj484assva7lm5ah1b306a5nf6j8p9bjy";
version = "17.8.1";
sha256 = "0m7gw01kpvsc0f9lb1hiq5b4g1fdh4gdfyxlqxp6m37vgxh2a48p";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
@@ -132,8 +132,8 @@ in rec {
};
asterisk_18 = common {
version = "18.0.0";
sha256 = "174zasx8d7ragy2fz4vwc4pbra9wl471mnisz1z0a3b2qsbh4y4v";
version = "18.0.1";
sha256 = "1kyly10pk7bpfqg3mjbvb8p795fnj9lvd29yp2xsxwgsqi1dn9p8";
externals = {
"externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;
"addons/mp3" = mp3-202;
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "promscale";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "timescale";
repo = pname;
rev = version;
sha256 = "sha256:00mhkp3nf6h2zsvmmwyza1lahvmm05isfi7rqkx24c0dmkmif3x9";
sha256 = "sha256-Yl61hX4YBddw0euTwheMIOy08jgS47rAU0cKyXiz9s4=";
};
vendorSha256 = "sha256:1ilciwf08678sciwwrjalwvcs5bp7x254nxc3nhdf88cf0bp2nxi";
+10 -6
View File
@@ -1,18 +1,22 @@
{ stdenv, buildGoPackage, fetchFromGitHub, trezor-udev-rules }:
{ stdenv
, buildGoModule
, fetchFromGitHub
, trezor-udev-rules
}:
buildGoPackage rec {
buildGoModule rec {
pname = "trezord-go";
version = "2.0.29";
goPackagePath = "github.com/trezor/trezord-go";
version = "2.0.30";
src = fetchFromGitHub {
owner = "trezor";
repo = "trezord-go";
rev = "v${version}";
sha256 = "1ks1fa0027s3xp0z6qp0dxmayvrb4dwwscfhbx7da0khp153f2cp";
sha256 = "1hzvk0wfgg7b4wpqjk3738yqxlv3pj5i7zxwm0jady2h97hmrqrr";
};
vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61";
propagatedBuildInputs = [ trezor-udev-rules ];
meta = with stdenv.lib; {