Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-03-24 06:05:57 +00:00 committed by GitHub
commit 1fef6e73b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 5557 additions and 35 deletions

View file

@ -3,12 +3,12 @@
mkDerivation rec {
pname = "jamulus";
version = "3.6.2";
version = "3.7.0";
src = fetchFromGitHub {
owner = "corrados";
repo = "jamulus";
rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-b187Q8KXcU32C2hGFqs6R2CqWgmieq6ewQDx+elEgP4=";
sha256 = "sha256-8zCPT0jo4ExgmZWxGinumv3JauH4csM9DtuHmOiJQAM=";
};
nativeBuildInputs = [ pkg-config qmake ];

View file

@ -7,10 +7,10 @@ in {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
version = "0.0.13";
version = "0.0.14";
src = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
sha256 = "0d5z6cbj9dg3hjw84pyg75f8dwdvi2mqxb9ic8dfqzk064ssiv7y";
sha256 = "1rq490fdl5pinhxk8lkfcfmfq7apj79jzf3m14yql1rc9gpilrf2";
};
};
ptb = callPackage ./base.nix rec {

View file

@ -10,6 +10,7 @@
, gtk3
, glib
, libnotify
, libpst
, gspell
, evolution-data-server
, libgdata
@ -80,6 +81,7 @@ stdenv.mkDerivation rec {
libgweather
libical
libnotify
libpst
librsvg
libsecret
nspr
@ -99,7 +101,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_AUTOAR=OFF"
"-DENABLE_LIBCRYPTUI=OFF"
"-DENABLE_PST_IMPORT=OFF"
"-DENABLE_YTNEF=OFF"
"-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin"
"-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn"

View file

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hts";
namespace = "pvr.hts";
version = "8.2.2";
version = "8.2.4";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q";
sha256 = "sha256-05RSB4ZwwZSzY2b1/MRw6zzl/HhMbeVhCVCOj3gSTWA=";
};
meta = with lib; {

View file

@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
version = "1.071";
version = "1.077";
in
fetchzip {
name = "recursive-${version}";
@ -14,7 +14,7 @@ fetchzip {
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
'';
sha256 = "0db410vcvgawb89f11l2v7w3b7l70wzlwwv8df3vnangl3mdv13z";
sha256 = "sha256-deztulQ33TIMevEQOP5OS8tmf6UjXT8IiVpRjkdismY=";
meta = with lib; {
homepage = "https://recursive.design/";

View file

@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
version = "1.36.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
version = "1.36.4"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z";
sha256 = "1zxvdg5vgjgkq5wmzwbxj2zydaj90ja074axs26yzd9x08j0bjxz";
fetchSubmodules = true;
};
patches = [

View file

@ -1,5 +1,15 @@
{ lib, stdenv, fetchurl, autoreconfHook, boost, libgsf,
pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }:
{ lib
, stdenv
, fetchurl
, autoreconfHook
, pkg-config
, bzip2
, doxygen
, gettext
, imagemagick
, libgsf
, xmlto
}:
stdenv.mkDerivation rec {
name = "libpst-0.6.75";
@ -9,14 +19,24 @@ stdenv.mkDerivation rec {
sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
nativeBuildInputs = [
autoreconfHook
pkg-config
doxygen
gettext
xmlto
];
buildInputs = [
boost libgsf bzip2
xmlto gettext imagemagick doxygen
bzip2
imagemagick
libgsf
];
configureFlags = [
"--enable-python=no"
"--disable-static"
"--enable-libpst-shared"
];
doCheck = true;
@ -24,8 +44,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.five-ten-sg.com/libpst/";
description = "A library to read PST (MS Outlook Personal Folders) files";
license = licenses.gpl2;
maintainers = [maintainers.tohl];
license = licenses.gpl2Plus;
maintainers = [ maintainers.tohl ];
platforms = platforms.unix;
};
}

View file

@ -12,11 +12,11 @@
stdenv.mkDerivation (rec {
pname = "talloc";
version = "2.3.1";
version = "2.3.2";
src = fetchurl {
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g";
sha256 = "sha256-J6A++Z44TXeRJN91XesinNF2H5Reym0gDoz9m/Upe9c=";
};
nativeBuildInputs = [

View file

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "PlexAPI";
version = "4.4.1";
version = "4.5.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "11zarqnrpis6xpsjdvfl3pczv1l9rzbgkawkv2lhfvzlnc00d7df";
sha256 = "sha256-MjV1JUHrIHTu3UHy4HnMtTEjSCx3U9kMgUkbCJOAZr0=";
};
propagatedBuildInputs = [

View file

@ -1,31 +1,50 @@
{ buildPythonPackage,
fetchFromGitHub,
isPy27,
lib,
opuslib,
protobuf,
{ buildPythonPackage
, fetchFromGitHub
, fetchpatch
, isPy27
, lib
, opuslib
, protobuf
, pytestCheckHook
, pycrypto
}:
buildPythonPackage rec {
pname = "pymumble";
version = "0.3.1";
version = "1.6";
disabled = isPy27;
src = fetchFromGitHub {
owner = "azlux";
repo = "pymumble";
rev = "1dd6d6d4df2fdef33202f17e2acf3ba9678a5737";
sha256 = "1r1sch8xrpbzffsb72lhp5xjr3ac3xb599n44vsfmaam3xklz6vz";
rev = version;
sha256 = "04nc66d554a98mbmdgzgsg6ncaz0jsn4zdr3mr14w6wnhrxpjkrs";
};
patches = [
# Compatibility with pycryptodome (which is what our pycrypto really is)
# See https://github.com/azlux/pymumble/pull/99
(fetchpatch {
url = "https://github.com/azlux/pymumble/pull/99/commits/b85548a0e1deaac820954b1c0b308af214311a14.patch";
sha256 = "0w9dpc87rny6vmhi634pih1p97b67jm26qajscpa9wp6nphdlxlj";
})
];
postPatch = ''
# Changes all `library==x.y.z` statements to just `library`
# So that we aren't constrained to a specific version
sed -i 's/\(.*\)==.*/\1/' requirements.txt
'';
propagatedBuildInputs = [ opuslib protobuf ];
checkInputs = [ pytestCheckHook pycrypto ];
pythonImportsCheck = [ "pymumble_py3" ];
meta = with lib; {
description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot.";
homepage = "https://github.com/azlux/pymumble";
license = licenses.gpl3;
maintainers = with maintainers; [ thelegy ];
license = licenses.gpl3Only;
maintainers = with maintainers; [ thelegy infinisil ];
};
}

View file

@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, appdirs, requests }:
buildPythonPackage rec {
pname = "pyradios";
version = "0.0.22";
src = fetchPypi {
inherit pname version;
sha256 = "1bgfb8vz7jybswss16pdzns0qpqfrwa9f2g8qrh1r4mig4xh2dmi";
};
propagatedBuildInputs = [
appdirs
requests
];
doCheck = false;
meta = with lib; {
description = "Python client for the https://api.radio-browser.info";
homepage = "https://github.com/andreztz/pyradios";
license = licenses.mit;
maintainers = with maintainers; [ infinisil ];
};
}

View file

@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "vultr";
version = "2.0.2";
version = "2.0.3";
goPackagePath = "github.com/JamesClonk/vultr";
src = fetchFromGitHub {
owner = "JamesClonk";
repo = "vultr";
rev = "v${version}";
sha256 = "0br8nxi9syraarp4hzav9a3p4zxhyi45cq5dsclzxi3fga2l6mqg";
sha256 = "sha256-kyB6gUbc32NsSDqDy1zVT4HXn0pWxHdBOEBOSaI0Xro=";
};
meta = {

View file

@ -3046,6 +3046,18 @@ let
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
};
nvim-colorizer-lua = buildVimPluginFrom2Nix {
pname = "nvim-colorizer-lua";
version = "2020-06-11";
src = fetchFromGitHub {
owner = "norcalli";
repo = "nvim-colorizer.lua";
rev = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6";
sha256 = "0gvqdfkqf6k9q46r0vcc3nqa6w45gsvp8j4kya1bvi24vhifg2p9";
};
meta.homepage = "https://github.com/norcalli/nvim-colorizer.lua/";
};
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
version = "2021-03-23";

View file

@ -419,6 +419,7 @@ nishigori/increment-activator
nixprime/cpsm
NLKNguyen/papercolor-theme
noc7c9/vim-iced-coffee-script
norcalli/nvim-colorizer.lua
norcalli/nvim-terminal.lua
norcalli/snippets.nvim
npxbr/glow.nvim

View file

@ -0,0 +1,150 @@
{ pkgs
, lib
, stdenv
, fetchFromGitHub
, python3Packages
, ffmpeg
, makeWrapper
# For the update script
, coreutils
, nix-prefetch-git
, jq
, nodePackages
}:
let
nodejs = pkgs.nodejs-12_x;
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
botamusiqueNodePackages = import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
};
srcJson = lib.importJSON ./src.json;
src = fetchFromGitHub {
owner = "azlux";
repo = "botamusique";
inherit (srcJson) rev sha256;
};
nodeDependencies = (botamusiqueNodePackages.shell.override (old: {
src = src + "/web";
})).nodeDependencies;
# Python needed to instantiate the html templates
buildPython = python3Packages.python.withPackages (ps: [ ps.jinja2 ]);
in
stdenv.mkDerivation rec {
pname = "botamusique";
version = "unstable-${lib.substring 0 10 srcJson.date}";
inherit src;
patches = [
# botamusique by default resolves relative state paths by first checking
# whether it exists in the working directory, then falls back to using the
# installation directory. With Nix however, the installation directory is
# not writable, so that won't work. So we change this so that it uses
# relative paths unconditionally, whether they exist or not.
./unconditional-relative-state-paths.patch
# We can't update the package at runtime with NixOS, so this patch makes
# the !update command mention that
./no-runtime-update.patch
];
postPatch = ''
# However, the function that's patched above is also used for
# configuration.default.ini, which is in the installation directory
# after all. So we need to counter-patch it here so it can find it absolutely
substituteInPlace mumbleBot.py \
--replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini"
'';
nativeBuildInputs = [
python3Packages.wrapPython
nodejs
makeWrapper
];
pythonPath = with python3Packages; [
pymumble
packaging
magic
requests
youtube-dl
flask
mutagen
pillow
pyradios
];
buildPhase = ''
runHook preBuild
# Generates artifacts in ./static
(
cd web
ln -s ${nodeDependencies}/lib/node_modules ./node_modules
export PATH="${nodeDependencies}/bin:$PATH"
npm run build
)
# Fills out http templates
${buildPython}/bin/python scripts/translate_templates.py --lang-dir lang/ --template-dir templates/
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share $out/bin
cp -r . $out/share/botamusique
chmod +x $out/share/botamusique/mumbleBot.py
wrapPythonProgramsIn $out/share/botamusique "$out $pythonPath"
# Convenience binary and wrap with ffmpeg dependency
makeWrapper $out/share/botamusique/mumbleBot.py $out/bin/botamusique \
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
runHook postInstall
'';
passthru.updateScript = pkgs.writeShellScript "botamusique-updater" ''
export PATH=${lib.makeBinPath [ coreutils nix-prefetch-git jq nodePackages.node2nix ]}
nix-prefetch-git https://github.com/azlux/botamusique > ${toString ./src.json}
path=$(jq '.path' -r < ${toString ./src.json})
tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' exit
# botamusique doesn't have a version in its package.json
# But that's needed for node2nix
jq < "$path"/web/package.json > "$tmp/package.json" \
--arg version "0.0.0" \
'.version |= $version'
node2nix \
--input "$tmp"/package.json \
--lock "$path"/web/package-lock.json \
--no-copy-node-env \
--development \
--composition /dev/null \
--output ${toString ./node-packages.nix}
'';
meta = with lib; {
description = "Bot to play youtube / soundcloud / radio / local music on Mumble";
homepage = "https://github.com/azlux/botamusique";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ infinisil ];
};
}

View file

@ -0,0 +1,12 @@
diff --git a/util.py b/util.py
index bfec1ed..5147757 100644
--- a/util.py
+++ b/util.py
@@ -132,6 +132,7 @@ def check_update(current_version):
def update(current_version):
+ return "Can't update Nix installation at runtime"
global log
target = var.config.get('bot', 'target_version')

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,10 @@
{
"url": "https://github.com/azlux/botamusique",
"rev": "df38c7dbd6d59c6790cf2364d1f344b7f6f72107",
"date": "2021-03-13T15:44:40+08:00",
"path": "/nix/store/30ds4gp7aldj9rqix1xf7j2ps5blrx8w-botamusique",
"sha256": "06xw1pif145zcm9z8l9kzl8ayl7vy5ywr0m3a5yswybcp2fzj087",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

View file

@ -0,0 +1,22 @@
diff --git a/util.py b/util.py
index bfec1ed..0546772 100644
--- a/util.py
+++ b/util.py
@@ -22,16 +22,7 @@ log = logging.getLogger("bot")
def solve_filepath(path):
- if not path:
- return ''
-
- if path[0] == '/':
- return path
- elif os.path.exists(path):
- return path
- else:
- mydir = os.path.dirname(os.path.realpath(__file__))
- return mydir + '/' + path
+ return path
def get_recursive_file_list_sorted(path):

View file

@ -1161,6 +1161,8 @@ in
bonfire = callPackage ../tools/misc/bonfire { };
botamusique = callPackage ../tools/audio/botamusique { };
boulder = callPackage ../tools/admin/boulder { };
btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };

View file

@ -6162,6 +6162,8 @@ in {
pyrad = callPackage ../development/python-modules/pyrad { };
pyradios = callPackage ../development/python-modules/pyradios { };
py-radix = callPackage ../development/python-modules/py-radix { };
pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { };