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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-04-03 06:05:27 +00:00 committed by GitHub
commit 470f04796a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 219 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maintainers/maintainer-list.nix
View File

@ -984,6 +984,16 @@
githubId = 12128029;
name = "babariviere";
};
babbaj = {
name = "babbaj";
email = "babbaj45@gmail.com";
github = "babbaj";
githubId = 12820770;
keys = [{
longkeyid = "rsa4096/0xF044309848A07CAC";
fingerprint = "6FBC A462 4EAF C69C A7C4 98C1 F044 3098 48A0 7CAC";
}];
};
bachp = {
email = "pascal.bach@nextrem.ch";
github = "bachp";

43
pkgs/applications/audio/oxefmsynth/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, lib, fetchFromGitHub, unzip, fetchzip, libX11 }:
let
vst-sdk = stdenv.mkDerivation rec {
name = "vstsdk3610_11_06_2018_build_37";
src = fetchzip {
url = "https://web.archive.org/web/20181016150224if_/https://download.steinberg.net/sdk_downloads/${name}.zip";
sha256 = "0da16iwac590wphz2sm5afrfj42jrsnkr1bxcy93lj7a369ildkj";
};
installPhase = "cp -r . $out";
};
in stdenv.mkDerivation rec {
pname = "oxefmsynth";
version = "1.3.5";
src = fetchFromGitHub {
owner = "oxesoft";
repo = pname;
rev = "v${version}";
sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ];
buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ];
buildInputs = [ libX11 ];
installPhase = ''
mkdir -p $out/lib/lxvst
install -Dm644 oxevst64.so -t $out/lib/lxvst
'';
meta = with lib; {
homepage = "https://github.com/oxesoft/oxefmsynth";
description = "An open source VST 2.4 instrument plugin";
maintainers = [ maintainers.hirenashah ];
platforms = [ "x86_64-linux" ];
license = licenses.gpl3Only;
};
}

34
pkgs/applications/misc/writefreely/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib, buildGoModule, fetchFromGitHub, go-bindata }:
buildGoModule rec {
pname = "writefreely";
version = "0.12.0";
src = fetchFromGitHub {
owner = "writeas";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6LpRfDu3xvE1eIRLfZliKnzsrrG5pjjf2ydxn9HQJJU=";
};
vendorSha256 = "sha256-U17AkMJQr/OIMED0i2ThcNVw3+aOvRLbpLNP/wEv6k8=";
nativeBuildInputs = [ go-bindata ];
preBuild = ''
make assets
export buildFlagsArray=(
"-ldflags=-s -w -X github.com/writeas/writefreely.softwareVer=${version}"
"-tags='sqlite'"
)
'';
subPackages = [ "cmd/writefreely" ];
meta = with lib; {
description = "Build a digital writing community";
homepage = "https://github.com/writeas/writefreely";
license = licenses.agpl3Only;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

23
pkgs/applications/networking/feedreaders/rss2email/default.nix
View File

@ -1,32 +1,19 @@
{ pythonPackages, fetchurl, fetchpatch, lib, nixosTests }:
{ pythonPackages, fetchurl, lib, nixosTests }:
with pythonPackages;
buildPythonApplication rec {
pname = "rss2email";
version = "3.12.2";
version = "3.13";
propagatedBuildInputs = [ feedparser html2text ];
checkInputs = [ beautifulsoup4 ];
src = fetchurl {
url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz";
sha256 = "12w6x80wsw6xm17fxyymnl45aavsagg932zw621wcjz154vjghjr";
sha256 = "09vp2y0ibv20y9yysniv6njzigif4h74pkj31l2a8xw5g19gclna";
};
patches = [
(fetchpatch {
name = "rss2email-feedparser6.patch";
url = "https://github.com/rss2email/rss2email/pull/149/commits/338343c92f956c31ff5249ef4bcf7aeea81f687e.patch";
sha256 = "0h8b3g9332vdrkqbh6lp00k97asrhmlxi13zghrgc78ia13czy3z";
})
(fetchpatch {
name = "rss2email-feedparser6-test.patch";
url = "https://github.com/rss2email/rss2email/pull/149/commits/8c99651eced3f29f05ba2c0ca02abb8bb9a18967.patch";
sha256 = "1scljak6xyqxlilg3j39v4qm9a9jks1bnvnrh62hyf3g53yw2xlg";
})
];
outputs = [ "out" "man" "doc" ];
postPatch = ''
@ -45,8 +32,10 @@ buildPythonApplication rec {
cp AUTHORS COPYING CHANGELOG README.rst $doc/share/doc/rss2email/
'';
postCheck = ''
checkPhase = ''
runHook preCheck
env PATH=$out/bin:$PATH python ./test/test.py
runHook postCheck
'';
meta = with lib; {

5
pkgs/applications/networking/remote/vmware-horizon-client/default.nix
View File

@ -3,6 +3,7 @@
, at-spi2-atk
, atk
, buildFHSUserEnv
, cairo
, dbus
, fetchurl
, fontconfig
@ -67,6 +68,9 @@ let
# This libjpeg library interferes with Chromium, so we will be using ours instead.
rm $out/lib/vmware/libjpeg.*
# This library causes the program to core-dump occasionally. Use ours instead.
rm $out/lib/vmware/view/crtbora/libcairo.*
# Force the default GTK theme (Adwaita) because Horizon is prone to
# UI usability issues when using non-default themes, such as Adwaita-dark.
makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \
@ -84,6 +88,7 @@ let
targetPkgs = pkgs: [
at-spi2-atk
atk
cairo
dbus
fontconfig
freetype

6
pkgs/applications/networking/sync/rclone/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "rclone";
version = "1.54.1";
version = "1.55.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-DexqYAkGmgROnYpknnuWc3Q//IMOTSxgrr1w/TrueH4=";
sha256 = "01pvcns3n735s848wc11q40pkkv646gn3cxkma866k44a9c2wirl";
};
vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M=";
vendorSha256 = "05f9nx5sa35q2szfkmnkhvqli8jlqja8ghiwyxk7cvgjl7fgd6zk";
subPackages = [ "." ];

8
pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix
View File

@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "inputstream-adaptive";
namespace = "inputstream.adaptive";
version = "2.6.7";
version = "2.6.8";
src = fetchFromGitHub {
owner = "peak3d";
owner = "xbmc";
repo = "inputstream.adaptive";
rev = "${version}-${rel}";
sha256 = "1pwqmbr78wp12jn6rwv63npdfc456adwz0amlxf6gvgg43li6p7s";
sha256 = "0m2d5r0f82qv4kqmq5yxzpi1awkjir2b2s2mfwkjn8p55r7gzp7c";
};
extraBuildInputs = [ expat ];
@ -20,7 +20,7 @@ buildKodiBinaryAddon rec {
'';
meta = with lib; {
homepage = "https://github.com/peak3d/inputstream.adaptive";
homepage = "https://github.com/xbmc/inputstream.adaptive";
description = "Kodi inputstream addon for several manifest types";
platforms = platforms.all;
license = licenses.gpl2Only;

4
pkgs/applications/video/kodi-packages/netflix/default.nix
View File

@ -3,13 +3,13 @@
buildKodiAddon rec {
pname = "netflix";
namespace = "plugin.video.netflix";
version = "1.14.1";
version = "1.15.0";
src = fetchFromGitHub {
owner = "CastagnaIT";
repo = namespace;
rev = "v${version}";
sha256 = "0vv3234gg4brp0gvrsl4vdskmpfbyk4z7cjmmj31zn4m8j33japn";
sha256 = "1jibzzm8viqpanby6lqxpb95gw5hw3lfsw4jasjskiinbf8n469k";
};
propagatedBuildInputs = [

3
pkgs/development/python-modules/acme/default.nix
View File

@ -10,7 +10,6 @@
, requests-toolbelt
, six
, werkzeug
, mock
, ndg-httpsclient
}:
@ -21,7 +20,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
cryptography pyasn1 pyopenssl pyRFC3339 pytz requests requests-toolbelt six
werkzeug mock ndg-httpsclient josepy
werkzeug ndg-httpsclient josepy
];
# does not contain any tests

17
pkgs/development/python-modules/certbot/default.nix
View File

@ -3,19 +3,19 @@
, python, runCommand
, fetchFromGitHub
, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface
, dialog, mock, gnureadline
, pytest_xdist, pytest, pytestCheckHook, dateutil
, dialog, gnureadline
, pytest_xdist, pytestCheckHook, dateutil
}:
buildPythonPackage rec {
pname = "certbot";
version = "1.12.0";
version = "1.13.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-lMQkVc2UzC5GqEy88rcaJ74CaT3+YWveNDCXql/McRM=";
sha256 = "1cwhhybj2fjalhhyd184ndn3bid3qib1yy5a93m146cqqgwpw4j6";
};
sourceRoot = "source/${pname}";
@ -37,16 +37,19 @@ buildPythonPackage rec {
zope_interface
];
buildInputs = [ dialog mock gnureadline ];
buildInputs = [ dialog gnureadline ];
checkInputs = [
dateutil
pytest
pytestCheckHook
pytest_xdist
];
pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ];
pytestFlagsArray = [
"-o cache_dir=$(mktemp -d)"
# See https://github.com/certbot/certbot/issues/8746
"-W ignore::ResourceWarning"
];
doCheck = true;

2
pkgs/tools/admin/simp_le/default.nix
View File

@ -22,6 +22,8 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ];
checkInputs = with python3Packages; [ mock ];
meta = with lib; {
homepage = "https://github.com/zenhack/simp_le";
description = "Simple Let's Encrypt client";

41
pkgs/tools/audio/acousticbrainz-client/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib, fetchFromGitHub, python3Packages, essentia-extractor }:
python3Packages.buildPythonApplication rec {
pname = "acousticbrainz-client";
version = "0.1";
src = fetchFromGitHub {
owner = "MTG";
repo = "acousticbrainz-client";
rev = version;
sha256 = "1g1nxh58939vysfxplrgdz366dlqnic05pkzbqh75m79brg4yrv1";
};
propagatedBuildInputs = [ essentia-extractor python3Packages.requests ];
postPatch = ''
# The installer needs the streaming_extractor_music binary in the source directoy,
# so we provide a symlink to it.
ln -s ${essentia-extractor}/bin/streaming_extractor_music streaming_extractor_music
'';
postInstall = ''
# The installer includes a copy of the streaming_extractor_music binary (not a symlink),
# which we don't need, because the wrapper adds essentia-extractor/binary to PATH.
rm $out/bin/streaming_extractor_music
'';
# Tests seem to be broken, but the tool works
doCheck = false;
pythonImportsCheck = [ "abz" ];
meta = with lib; {
description = "A client to upload data to an AcousticBrainz server";
license = licenses.gpl3Plus;
homepage = "https://github.com/MTG/acousticbrainz-client";
# essentia-extractor is only available for those platforms
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ eduardosm ];
};
}

24
pkgs/tools/audio/isrcsubmit/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "isrcsubmit";
version = "2.1.0";
src = fetchFromGitHub {
owner = "JonnyJD";
repo = "musicbrainz-isrcsubmit";
rev = "v${version}";
sha256 = "1lqs4jl2xv1zxmf0xsihk9rxzx2awq87g51vd7y3cq1vhj1icxqa";
};
propagatedBuildInputs = with python3Packages; [ musicbrainzngs discid ];
meta = with lib; {
# drutil is required on Darwin, which does not seem to be available in nixpkgs
broken = stdenv.isDarwin;
description = "Script to submit ISRCs from disc to MusicBrainz";
license = licenses.gpl3Plus;
homepage = "http://jonnyjd.github.io/musicbrainz-isrcsubmit/";
maintainers = with maintainers; [ eduardosm ];
};
}

24
pkgs/tools/backup/gamerbackup/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub, lepton }:
buildGoModule {
pname = "gb-backup";
version = "unstable-2021-03-06";
src = fetchFromGitHub {
owner = "leijurv";
repo = "gb";
rev = "5a94e60148628fc7796d15c53d0ed87184322053";
sha256 = "07skhwnxvm6yngb2665gkh5qbiyp7hb7av8dkckzypmd4k8z93cm";
};
vendorSha256 = "0m2aa6p04b4fs7zncar1mlykc94pp527phv71cdsbx58jgsm1jnx";
buildInputs = [ lepton ];
meta = with lib; {
description = "Gamer Backup, a super opinionated cloud backup system";
license = licenses.agpl3Only;
maintainers = with maintainers; [ babbaj ];
platforms = platforms.linux;
};
}

10
pkgs/top-level/all-packages.nix
View File

@ -670,6 +670,8 @@ in
acme-sh = callPackage ../tools/admin/acme.sh { };
acousticbrainz-client = callPackage ../tools/audio/acousticbrainz-client { };
acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
ffmpeg = ffmpeg_2;
};
@ -905,6 +907,8 @@ in
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation;
};
writefreely = callPackage ../applications/misc/writefreely { };
x3270 = callPackage ../applications/terminal-emulators/x3270 { };
xterm = callPackage ../applications/terminal-emulators/xterm { };
@ -2469,6 +2473,8 @@ in
g2o = libsForQt5.callPackage ../development/libraries/g2o { };
gb-backup = callPackage ../tools/backup/gamerbackup { };
gbsplay = callPackage ../applications/audio/gbsplay { };
gdrivefs = python27Packages.gdrivefs;
@ -5587,6 +5593,8 @@ in
ispike = callPackage ../development/libraries/science/robotics/ispike { };
isrcsubmit = callPackage ../tools/audio/isrcsubmit { };
isync = callPackage ../tools/networking/isync {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -7158,6 +7166,8 @@ in
owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { };
oxefmsynth = callPackage ../applications/audio/oxefmsynth { };
oxidized = callPackage ../tools/admin/oxidized { };
oxipng = callPackage ../tools/graphics/oxipng { };