From c2ecc9ca644291b8bba54df3170a3344dcb88fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Wed, 3 Mar 2021 11:38:24 +0100 Subject: [PATCH 01/14] isrcsubmit: init at 2.1.0 --- pkgs/tools/audio/isrcsubmit/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/audio/isrcsubmit/default.nix diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/tools/audio/isrcsubmit/default.nix new file mode 100644 index 00000000000..457ca2b0d1c --- /dev/null +++ b/pkgs/tools/audio/isrcsubmit/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 509fcfbdbc2..a90eb2e0d92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5402,6 +5402,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; }; From 865d2d604ffb5b512f27c5bee12a9c68029e1b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 29 Mar 2021 18:47:49 +0200 Subject: [PATCH 02/14] writefreely: init at 0.12.0 --- .../applications/misc/writefreely/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/misc/writefreely/default.nix diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix new file mode 100644 index 00000000000..5f38d405cb8 --- /dev/null +++ b/pkgs/applications/misc/writefreely/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1738dd97ba..3195ba5831e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -889,6 +889,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 { }; From 063074d82477c124dcf9402f0d7c5319fd6d76d1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 31 Mar 2021 04:20:00 +0000 Subject: [PATCH 03/14] rclone: 1.54.1 -> 1.55.0 --- pkgs/applications/networking/sync/rclone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 58f9745454a..cde73fcc7ce 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -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 = [ "." ]; From af57dd5747e1a758a0f4583ed342d584029ffd84 Mon Sep 17 00:00:00 2001 From: Babbaj Date: Fri, 2 Apr 2021 13:30:52 -0400 Subject: [PATCH 04/14] gb-backup: init at 2021-03-06 --- pkgs/tools/backup/gamerbackup/default.nix | 24 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/backup/gamerbackup/default.nix diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/tools/backup/gamerbackup/default.nix new file mode 100644 index 00000000000..f236a80547c --- /dev/null +++ b/pkgs/tools/backup/gamerbackup/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11e63f5b3c0..00c4da51cd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2439,6 +2439,8 @@ in g2o = libsForQt5.callPackage ../development/libraries/g2o { }; + gb-backup = callPackage ../tools/backup/gamerbackup { }; + gbsplay = callPackage ../applications/audio/gbsplay { }; gdrivefs = python27Packages.gdrivefs; From 181ade78c2d8bfa3e763b1c2c47c08abdb2e428e Mon Sep 17 00:00:00 2001 From: Babbaj Date: Fri, 2 Apr 2021 13:31:21 -0400 Subject: [PATCH 05/14] maintainers: add babbaj --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2c7c2c3bdad..55fd2be37a0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -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"; From b052255e34daa19901a2f746d0cf11d1105565da Mon Sep 17 00:00:00 2001 From: Hiren Shah Date: Sat, 9 Jan 2021 14:15:39 +0000 Subject: [PATCH 06/14] oxefmsynth: init at 1.3.5 --- .../applications/audio/oxefmsynth/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/audio/oxefmsynth/default.nix diff --git a/pkgs/applications/audio/oxefmsynth/default.nix b/pkgs/applications/audio/oxefmsynth/default.nix new file mode 100644 index 00000000000..427029f3c86 --- /dev/null +++ b/pkgs/applications/audio/oxefmsynth/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c740d0e156b..589e5161e52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7137,6 +7137,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 { }; From 594399e51a94884a82f3c482c9ab7a044d956c3f Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Fri, 26 Mar 2021 19:12:32 -0400 Subject: [PATCH 07/14] python3Packages.certbot: 1.12.0 -> 1.13.0 --- .../python-modules/certbot/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 129ef932bdc..7ae6a3fa0b8 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -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; From d869ed778e9a4164746fb927fbb905b8fd10b523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Apr 2021 23:53:01 +0200 Subject: [PATCH 08/14] python3Packages.acme: remove mock from propagatedBuildInputs --- pkgs/development/python-modules/acme/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index e63a26e5f74..97e725bb711 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -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 From b9c178aa6d899eaa35b919295816d7d5b3c6cdc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 2 Apr 2021 23:51:23 +0200 Subject: [PATCH 09/14] simp_le: add mock to checkInputs --- pkgs/tools/admin/simp_le/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 5bfc00ac000..393d9d145c2 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -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"; From 9131779490b81e6c81af178a7c367357b05a6dcb Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Fri, 2 Apr 2021 19:46:12 -0400 Subject: [PATCH 10/14] vmware-horizon-client: use pkgs.cairo instead of bundled version --- .../networking/remote/vmware-horizon-client/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index f52373f2624..48ea229c244 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -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 From 6444c4420cd1b95b7d88368d2d160355d7bc4acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 3 Apr 2021 02:27:46 +0200 Subject: [PATCH 11/14] rss2email: 3.12.1 -> 3.13 (#118371) --- .../feedreaders/rss2email/default.nix | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 23b79dccd6d..9ecadd56f15 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -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; { From ada287e34bb334f4dd82cb9466e60fb694d4e813 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 2 Apr 2021 21:22:18 -0400 Subject: [PATCH 12/14] kodi.packages.netflix: 1.14.1 -> 1.15.0 --- pkgs/applications/video/kodi-packages/netflix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix index e187fad9737..e258270dad6 100644 --- a/pkgs/applications/video/kodi-packages/netflix/default.nix +++ b/pkgs/applications/video/kodi-packages/netflix/default.nix @@ -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 = [ From 226a0ef401e43740730ea71bbf22b7ae69fef9cd Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 2 Apr 2021 21:26:38 -0400 Subject: [PATCH 13/14] kodi.packages.inputstream-adaptive: 2.6.7 -> 2.6.8 --- .../video/kodi-packages/inputstream-adaptive/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index 136efe8a243..00e58ece075 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -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; From 142418d94118ea7431f9d8ea4116f3be1845adfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sat, 3 Apr 2021 04:40:29 +0200 Subject: [PATCH 14/14] acousticbrainz-client: init at 0.1 (#115780) Co-authored-by: Sandro --- .../audio/acousticbrainz-client/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/audio/acousticbrainz-client/default.nix diff --git a/pkgs/tools/audio/acousticbrainz-client/default.nix b/pkgs/tools/audio/acousticbrainz-client/default.nix new file mode 100644 index 00000000000..a08710fe121 --- /dev/null +++ b/pkgs/tools/audio/acousticbrainz-client/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 620b22db4cc..533a133d4ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };