Merge staging-next into staging

main
github-actions[bot] 2 years ago committed by GitHub
commit 108fc5c1e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
  2. 4
      pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix
  3. 3
      pkgs/development/tools/tradcpp/default.nix
  4. 4
      pkgs/tools/audio/liquidsoap/full.nix

@ -14,17 +14,17 @@
let
pname = "mattermost-desktop";
version = "5.0.3";
version = "5.1.0";
srcs = {
"x86_64-linux" = {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
hash = "sha256-KLSWJpNSMGmfugbkFIJLDnxcZtrtBZOGjLlR+kAoMTA=";
hash = "sha256-KmtQUqg2ODbZ6zJjsnwlvB+vhR1xbK2X9qqmZpyTR78=";
};
"i686-linux" = {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";
hash = "sha256-4ofjOsfGbgO1PSqQpigNp90JsvlGP1kGexVAR/h3/88=";
hash = "sha256-X8Zrthw1hZOqmcYidt72l2vonh31iiA3EDGmCQr7e4c=";
};
};

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "insteon-frontend-home-assistant";
version = "0.1.0";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "70ee413cae8717416f5add1be7647158d8ff4303942dafccac0792ef44336cdf";
sha256 = "sha256-s0MjB1dTsUy1cAMWo/0r+wTiO6/h0aOiPQ3d+1pHsyM=";
};
# upstream has no tests

@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc";
};
strictDeps = true;
# tradcpp only comes with BSD-make Makefile; the patch adds configure support
buildInputs = [ autoconf ];
nativeBuildInputs = [ autoconf ];
preConfigure = "autoconf";
patches = [
./tradcpp-configure.patch

@ -7,14 +7,14 @@
let
pname = "liquidsoap";
version = "2.0.5";
version = "2.0.6";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-+BHRAnO2sKK504EhXc6LPabnOzcOAAHmtmqVNQ8OeZU=";
sha256 = "sha256-1wD9BApbDA/ovzZoniay+jciP/V2C8EoGQehd5N8PPQ=";
};
postFixup = ''

Loading…
Cancel
Save