public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-17 06:22:23 +00:00
committed by GitHub
parent d8e62d8e41 e906410c9a
commit 3ff6965554
154 changed files with 1062 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/gerbera/default.nix
+82 -46
View File
@@ -1,66 +1,102 @@
{ lib, stdenv, fetchFromGitHub
, cmake, pkg-config
# required
, libupnp, libuuid, pugixml, libiconv, sqlite, zlib, spdlog, fmt
# options
, enableDuktape ? true, duktape
, enableCurl ? true, curl
, enableTaglib ? true, taglib
, enableLibmagic ? true, file
, enableLibmatroska ? true, libmatroska, libebml
, enableAvcodec ? false, ffmpeg
, enableLibexif ? true, libexif
, enableExiv2 ? false, exiv2
, enableFFmpegThumbnailer ? false, ffmpegthumbnailer
, enableInotifyTools ? true, inotify-tools
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
# required
, fmt
, libiconv
, libupnp
, libuuid
, pugixml
, spdlog
, sqlite
, zlib
# options
, enableMysql ? false
, libmysqlclient
, enableDuktape ? true
, duktape
, enableCurl ? true
, curl
, enableTaglib ? true
, taglib
, enableLibmagic ? true
, file
, enableLibmatroska ? true
, libmatroska
, libebml
, enableAvcodec ? false
, ffmpeg
, enableLibexif ? true
, libexif
, enableExiv2 ? false
, exiv2
, enableFFmpegThumbnailer ? false
, ffmpegthumbnailer
, enableInotifyTools ? true
, inotify-tools
}:
with lib;
let
optionOnOff = option: if option then "on" else "off";
in stdenv.mkDerivation rec {
libupnp' = libupnp.overrideAttrs (super: rec {
cmakeFlags = super.cmakeFlags or [ ] ++ [
"-Dblocking_tcp_connections=OFF"
"-Dreuseaddr=ON"
];
});
options = [
{ name = "AVCODEC"; enable = enableAvcodec; packages = [ ffmpeg ]; }
{ name = "CURL"; enable = enableCurl; packages = [ curl ]; }
{ name = "EXIF"; enable = enableLibexif; packages = [ libexif ]; }
{ name = "EXIV2"; enable = enableExiv2; packages = [ exiv2 ]; }
{ name = "FFMPEGTHUMBNAILER"; enable = enableFFmpegThumbnailer; packages = [ ffmpegthumbnailer ]; }
{ name = "INOTIFY"; enable = enableInotifyTools; packages = [ inotify-tools ]; }
{ name = "JS"; enable = enableDuktape; packages = [ duktape ]; }
{ name = "MAGIC"; enable = enableLibmagic; packages = [ file ]; }
{ name = "MATROSKA"; enable = enableLibmatroska; packages = [ libmatroska libebml ]; }
{ name = "MYSQL"; enable = enableMysql; packages = [ libmysqlclient ]; }
{ name = "TAGLIB"; enable = enableTaglib; packages = [ taglib ]; }
];
inherit (lib) flatten optionals;
in
stdenv.mkDerivation rec {
pname = "gerbera";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
repo = "gerbera";
owner = "gerbera";
rev = "v${version}";
sha256 = "sha256-i33pAgSOjVOoj0qGBnb8hpRMqgTCBTQmKTuZ9AkvoPg=";
sha256 = "sha256-bJIT/qQOKTy2l0wsumlGNvaGqzb2mK0hHKG0S6mEG3o=";
};
postPatch = lib.optionalString enableMysql ''
substituteInPlace cmake/FindMySQL.cmake \
--replace /usr/include/mysql ${lib.getDev libmysqlclient}/include/mariadb \
--replace /usr/lib/mysql ${lib.getLib libmysqlclient}/lib/mariadb
'';
cmakeFlags = [
"-DWITH_JS=${optionOnOff enableDuktape}"
"-DWITH_CURL=${optionOnOff enableCurl}"
"-DWITH_TAGLIB=${optionOnOff enableTaglib}"
"-DWITH_MAGIC=${optionOnOff enableLibmagic}"
"-DWITH_MATROSKA=${optionOnOff enableLibmatroska}"
"-DWITH_AVCODEC=${optionOnOff enableAvcodec}"
"-DWITH_EXIF=${optionOnOff enableLibexif}"
"-DWITH_EXIV2=${optionOnOff enableExiv2}"
"-DWITH_FFMPEGTHUMBNAILER=${optionOnOff enableFFmpegThumbnailer}"
"-DWITH_INOTIFY=${optionOnOff enableInotifyTools}"
# systemd service will be generated alongside the service
"-DWITH_SYSTEMD=OFF"
];
] ++ map (e: "-DWITH_${e.name}=${if e.enable then "ON" else "OFF"}") options;
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
libupnp libuuid pugixml libiconv sqlite zlib fmt.dev
fmt
libiconv
libupnp'
libuuid
pugixml
spdlog
]
++ optionals enableDuktape [ duktape ]
++ optionals enableCurl [ curl ]
++ optionals enableTaglib [ taglib ]
++ optionals enableLibmagic [ file ]
++ optionals enableLibmatroska [ libmatroska libebml ]
++ optionals enableAvcodec [ ffmpeg.dev ]
++ optionals enableLibexif [ libexif ]
++ optionals enableExiv2 [ exiv2 ]
++ optionals enableInotifyTools [ inotify-tools ]
++ optionals enableFFmpegThumbnailer [ ffmpegthumbnailer ];
sqlite
zlib
] ++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options));
meta = with lib; {
homepage = "https://docs.gerbera.io/";
@@ -70,8 +106,8 @@ in stdenv.mkDerivation rec {
It allows to stream your digital media through your home network and consume it on all kinds
of UPnP supporting devices.
'';
license = licenses.gpl2;
maintainers = [ maintainers.ardumont ];
license = licenses.gpl2Only;
maintainers = with maintainers; [ ardumont ];
platforms = platforms.linux;
};
}
pkgs/servers/home-assistant/component-packages.nix
+1 -1
View File
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.5.3";
version = "2021.5.4";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
pkgs/servers/home-assistant/default.nix
+6 -2
View File
@@ -114,7 +114,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.5.3";
hassVersion = "2021.5.4";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -133,7 +133,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "1zc21d70n24sk8y42xq3gzisj44kn6w6fhgqrcani470hhph24ba";
sha256 = "1jxbxzhcnvxf6qkik2qmpdml41q6hlkazjqaxygyw7pyj094fp8v";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@@ -425,6 +425,8 @@ in with py.pkgs; buildPythonApplication rec {
"--only-rerun RuntimeError"
# assign tests grouped by file to workers
"--dist loadfile"
# enable full variable printing on error
"--showlocals"
# tests are located in tests/
"tests"
# screenlogic/test_config_flow.py: Tries to send out UDP broadcasts
@@ -455,6 +457,8 @@ in with py.pkgs; buildPythonApplication rec {
"test_check_package_version_does_not_match"
# homeassistant/util/thread.py:51: SystemError
"test_executor_shutdown_can_interrupt_threads"
# {'theme_color': '#03A9F4'} != {'theme_color': 'blue'}
"test_webhook_handle_get_config"
];
preCheck = ''
pkgs/servers/http/jboss/default.nix
+1 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, unzip, jdk }:
{ lib, stdenv, fetchurl, jdk }:
stdenv.mkDerivation {
name = "jboss-as-7.1.1.Final";
@@ -7,8 +7,6 @@ stdenv.mkDerivation {
sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8";
};
nativeBuildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = ''
pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
+2 -2
View File
@@ -3,8 +3,8 @@ let
src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-appservice-slack";
rev = "1.7.0";
sha256 = "sha256-0BcnG/DGvc3uh/eP0KIB5gPSpXNPlaAl78D4bVCnLHg=";
rev = "1.8.0";
sha256 = "sha256-FA6SMivMnloeZmnUhGx6N+ZLDTZFO3y17xJYclkp5w0=";
};
nodePackages = import ./node-composition.nix {
pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
+3 -3
View File
@@ -1,9 +1,9 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
# Download package.json and package-lock.json from the v1.7.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package.json -o package.json
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package-lock.json -o package-lock.json
# Download package.json and package-lock.json from the v1.8.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package.json -o package.json
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package-lock.json -o package-lock.json
node2nix \
--nodejs-12 \
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
Generated
+557 -597
View File
File diff suppressed because it is too large Load Diff
pkgs/servers/nas/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ in stdenv.mkDerivation {
description = "A network transparent, client/server audio transport system";
homepage = "http://radscan.com/nas.html";
license = licenses.mit;
maintainers = [ maintainers.gnidorah ];
maintainers = [ ];
platforms = platforms.linux;
};
}
pkgs/servers/web-apps/galene/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "galene";
version = "0.3.3";
version = "0.3.4";
src = fetchFromGitHub {
owner = "jech";
repo = "galene";
rev = "galene-${version}";
sha256 = "sha256-8CgNMI7zOeDxrnmQNDM61Bgpw+N0sc7HR9c+YsQTO5I=";
sha256 = "sha256-yb+gEex4WEvIAEMuSTkw25rsBTL9tlfhf9qQtISWUd0=";
};
vendorSha256 = "sha256-qOHuZGMr0CPwy/DuuWYCDSe24Y6ivg1uQJGXCuKGV/M=";
vendorSha256 = "sha256-Vm7tTTQJyZZVbORl5ziy4GJ34kHh5dh0ojX/ZuTpshA=";
outputs = [ "out" "static" ];