BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-07-30 00:01:44 +00:00 committed by GitHub
commit fc9d4b88d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 166 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
maintainers/team-list.nix
View file

@ -162,6 +162,7 @@ with lib.maintainers; {
ralith
mjlbach
dandellion
sumnerevans
];
scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
};

12
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View file

@ -39,10 +39,10 @@
elpaBuild {
pname = "ada-mode";
ename = "ada-mode";
version = "7.1.4";
version = "7.1.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ada-mode-7.1.4.tar";
sha256 = "13zcs7kn7rca82c80qshbdpmmmgkf5phr88hf7p5nwxqhkazy9cd";
url = "https://elpa.gnu.org/packages/ada-mode-7.1.5.tar";
sha256 = "037v25mqpg1n52hz89b49vf9zw68fmc0m7l6c1f8vnbw3dibyk8d";
};
packageRequires = [ emacs uniquify-files wisi ];
meta = {
@ -4224,10 +4224,10 @@
elpaBuild {
pname = "wisi";
ename = "wisi";
version = "3.1.3";
version = "3.1.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/wisi-3.1.3.tar";
sha256 = "0cbjcm35lp164wd06mn3clikga07qxfsfnkvadswsapsd0cn2b4k";
url = "https://elpa.gnu.org/packages/wisi-3.1.4.tar";
sha256 = "1j35ln5x3dgypq3hn6xcdpg6vp6yjj6avcjakc2r6wx19vxixciw";
};
packageRequires = [ emacs seq ];
meta = {

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View file

@ -31,9 +31,9 @@
}
},
"dev": {
"version": "93.0.4577.15",
"sha256": "07gbpa1z6cnbmv8008y92ldg53w48rjx0slvgsrw4gk9cnvmnpz0",
"sha256bin64": "0sb3m2mbq6g3mnps7g6xziziwv6sng34410ww5jyx82mw0q0sxig",
"version": "93.0.4577.18",
"sha256": "1h1ppyizj5vbnrv11iy9vlcpcv8mgb9r8m2zmz6vp7q1ch6w0w4x",
"sha256bin64": "14cw0k4gsilybg7gbbbmck62i0prq5rm6hwqalmmmiqcldrw05mq",
"deps": {
"gn": {
"version": "2021-07-08",

4
pkgs/development/python-modules/dotmap/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "dotmap";
version = "1.3.23";
version = "1.3.24";
src = fetchPypi {
inherit pname version;
sha256 = "0hy88kzzb7zhxfr7iyvl6rhmvz02538pbna7zypaard4a88bbbka";
sha256 = "1mvkhkrhzzzng17j2yvwp4x1hj8wls3qw5lngqs777a2qc1mhg0r";
};
checkInputs = [

17
pkgs/development/tools/libsigrok/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
, libserialport, librevisa, doxygen, glibmm
, libserialport, librevisa, doxygen, glibmm, python3
, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
}:
@ -17,10 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libzip glib libusb1 libftdi1 check libserialport
librevisa doxygen glibmm
];
nativeBuildInputs = [ doxygen pkg-config python3 ];
buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa glibmm ];
strictDeps = true;
@ -29,11 +27,18 @@ stdenv.mkDerivation rec {
tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/"
'';
doInstallCheck = true;
installCheckPhase = ''
# assert that c++ bindings are included
[[ -f $out/include/libsigrokcxx/libsigrokcxx.hpp ]] \
|| { echo 'C++ bindings were not generated; check configure output'; false; }
'';
meta = with lib; {
description = "Core library of the sigrok signal analysis software suite";
homepage = "https://sigrok.org/";
license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ];
maintainers = with maintainers; [ bjornfor ];
};
}

4
pkgs/development/web/nodejs/v12.nix
View file

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "12.22.3";
sha256 = "143ihn30jd08nk19saxn6qp3ldc9yvy8w338i4cg9256wgx120im";
version = "12.22.4";
sha256 = "0k6dwkhpmjcdb71zd92a5v0l82rsk06p57iyjby84lhy2fmlxka4";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

4
pkgs/development/web/nodejs/v14.nix
View file

@ -7,7 +7,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "14.17.3";
sha256 = "0j3zd5vavsapqs9h682mr8r5i7xp47n0w4vjvm8rw3rn3dg4p2sb";
version = "14.17.4";
sha256 = "0b6gadc53r07gx6qr6281ifr5m9bgprmfdqyz9zh5j7qhkkz8yxf";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

4
pkgs/misc/vim-plugins/vim-plugin-names
View file

@ -494,9 +494,9 @@ nvim-telescope/telescope-symbols.nvim
nvim-telescope/telescope-z.nvim@main
nvim-telescope/telescope.nvim
nvim-treesitter/completion-treesitter
nvim-treesitter/nvim-treesitter
nvim-treesitter/nvim-treesitter@0.5-compat
nvim-treesitter/nvim-treesitter-refactor
nvim-treesitter/nvim-treesitter-textobjects
nvim-treesitter/nvim-treesitter-textobjects@0.5-compat
nvim-treesitter/playground
oberblastmeister/termwrapper.nvim
ocaml/vim-ocaml

4
pkgs/servers/matrix-synapse/default.nix
View file

@ -12,11 +12,11 @@ let
in
buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.38.1";
version = "1.39.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-bGKGzhuDjKaNbjXSwvidk9SrRmJsLQyLe5jps4DXN+s=";
sha256 = "sha256-dErfNHDUo0yGLbrRQdwbNkMVfnMfbrO3f7bsRwgRQMM=";
};
patches = [

6
pkgs/servers/roon-bridge/default.nix
View file

@ -10,15 +10,15 @@
stdenv.mkDerivation rec {
pname = "roon-bridge";
version = "1.8-795";
version = "1.8-814";
# N.B. The URL is unstable. I've asked for them to provide a stable URL but
# they have ignored me. If this package fails to build for you, you may need
# to update the version and sha256.
# c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129
src = fetchurl {
url = "https://web.archive.org/web/20210610172810/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2";
sha256 = "sha256-ahdy0/TBOyMfCt4VTkcDTZGAFmwQJT2KvZuMtFcAY3w=";
url = "https://web.archive.org/web/20210729154257/http://download.roonlabs.com/builds/RoonBridge_linuxx64.tar.bz2";
sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A=";
};
buildInputs = [

6
pkgs/servers/roon-server/default.nix
View file

@ -11,15 +11,15 @@
, zlib
}: stdenv.mkDerivation rec {
pname = "roon-server";
version = "1.8-806";
version = "1.8-814";
# N.B. The URL is unstable. I've asked for them to provide a stable URL but
# they have ignored me. If this package fails to build for you, you may need
# to update the version and sha256.
# c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129
src = fetchurl {
url = "https://web.archive.org/web/20210707070319/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2";
sha256 = "sha256-TRgsHR71wNz2MoH+RZrIaWEzQSAbo+q8ICKfmmCFy5Y=";
url = "https://web.archive.org/web/20210729154130/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2";
sha256 = "sha256-GbWcgNq+dmzoHNFZyB/QFCvJ7Hh48v8IuGS4WMNlKgI=";
};
buildInputs = [

1
pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
View file

@ -3,6 +3,7 @@ let
callPackage = newScope args;
in
{
discourse-calendar = callPackage ./discourse-calendar {};
discourse-canned-replies = callPackage ./discourse-canned-replies {};
discourse-github = callPackage ./discourse-github {};
discourse-math = callPackage ./discourse-math {};

5
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile Normal file
View file

@ -0,0 +1,5 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem 'rrule', '0.4.2', require: false

27
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock Normal file
View file

@ -0,0 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
concurrent-ruby (1.1.9)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
minitest (5.14.4)
rrule (0.4.2)
activesupport (>= 4.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
zeitwerk (2.4.2)
PLATFORMS
x86_64-linux
DEPENDENCIES
rrule (= 0.4.2)
BUNDLED WITH
2.2.20

18
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ lib, mkDiscoursePlugin, fetchFromGitHub }:
mkDiscoursePlugin {
name = "discourse-calendar";
bundlerEnvArgs.gemdir = ./.;
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-calendar";
rev = "567712d8c02640574fbab081eb54b2f26349c88d";
sha256 = "sha256-r6rfbi/ScbM+SiAjeijXmr5R9wpJxzxGl52X5oV++5w=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-calendar";
maintainers = with maintainers; [ ryantm ];
license = licenses.mit;
description = "Adds the ability to create a dynamic calendar in the first post of a topic";
};
}

76
pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix Normal file
View file

@ -0,0 +1,76 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk";
type = "gem";
};
version = "6.1.4";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
type = "gem";
};
version = "1.1.9";
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
type = "gem";
};
version = "1.8.10";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
type = "gem";
};
version = "5.14.4";
};
rrule = {
dependencies = ["activesupport"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w338b7dgvd144fl5b8xy2lfc6zgbcjac7b4z158jc8h070yzc9v";
type = "gem";
};
version = "0.4.2";
};
tzinfo = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
type = "gem";
};
version = "2.0.4";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
type = "gem";
};
version = "2.4.2";
};
}

4
pkgs/tools/networking/isync/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "isync";
version = "1.4.2";
version = "1.4.3";
src = fetchurl {
url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
sha256 = "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r";
sha256 = "024p3glj4p7fhrssw5sr55arls9zna1igxxrspxlfd6sbds21ixl";
};
nativeBuildInputs = [ pkg-config perl ];