diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-05 00:38:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 00:38:01 +0000 |
| commit | 4763e8b8fd805f63a707257b3c0bd6a1af90d7d8 (patch) | |
| tree | 6af77cd9c5d31ee5fb58281c11690b5e43032e07 /pkgs/applications | |
| parent | cb36dd7449c2cd8ed0d9c9946a3ffe0460a742b1 (diff) | |
| parent | 0cc6e0a4106f3fc1cc0b765ab0f17b697c3d910d (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/audio/mympd/default.nix | 53 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.json | 18 |
2 files changed, 62 insertions, 9 deletions
diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix new file mode 100644 index 000000000000..5c8c5e7c7bff --- /dev/null +++ b/pkgs/applications/audio/mympd/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, mpd_clientlib +, openssl +, lua5_3 +, libid3tag +, flac +, mongoose +}: + +stdenv.mkDerivation rec { + pname = "mympd"; + version = "6.8.1"; + + src = fetchFromGitHub { + owner = "jcorporation"; + repo = "myMPD"; + rev = "v${version}"; + sha256 = "dIGg2mLxN6XBDH3GFXtF7nB9a/zf/qMlPCvIulFRXn8="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + buildInputs = [ + mpd_clientlib + openssl + lua5_3 + libid3tag + flac + ]; + + cmakeFlags = [ + "-DENABLE_LUA=ON" + # Otherwise, it tries to parse $out/etc/mympd.conf on startup. + "-DCMAKE_INSTALL_SYSCONFDIR=/etc" + # similarly here + "-DCMAKE_INSTALL_LOCALSTATEDIR=/var/lib/mympd" + ]; + # See https://github.com/jcorporation/myMPD/issues/315 + hardeningDisable = [ "strictoverflow" ]; + + meta = { + homepage = "https://jcorporation.github.io/mympd"; + description = "A standalone and mobile friendly web mpd client with a tiny footprint and advanced features"; + maintainers = [ stdenv.lib.maintainers.doronbehar ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3832f8c032b3..6343dd4b2468 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,22 +18,22 @@ } }, "beta": { - "version": "87.0.4280.66", - "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19", - "sha256bin64": "15n01jia8sxv3a7vfbla40rq45x54pyksg0kg14bm0br6m3n65pz", + "version": "88.0.4324.27", + "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc", + "sha256bin64": "0qf2j1j3p94s724rwh8fydpjn88cs9yxxhjf5axvqwi7q3h35cfx", "deps": { "gn": { - "version": "2020-09-09", + "version": "2020-11-05", "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", + "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" } } }, "dev": { - "version": "88.0.4324.27", - "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc", - "sha256bin64": "0ax27j42167yyx90h5k6ra898kn626w5cvgmafm3al9kyfsx36m4", + "version": "89.0.4343.0", + "sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa", + "sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d", "deps": { "gn": { "version": "2020-11-05", |