1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 11:32:03 +00:00

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-03-15 06:18:54 +00:00 committed by GitHub
commit d529ebd48c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 122 additions and 92 deletions

View file

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, fetchFromGitLab
, cairo
, dbus
@ -7,17 +8,17 @@
, glib
, gtk3
, libhandy_0
, libsass
, meson
, ninja
, pango
, pkg-config
, python3
, rustc
, rustPlatform
, wrapGAppsHook
}:
rustPlatform.buildRustPackage rec {
stdenv.mkDerivation rec {
pname = "contrast";
version = "0.0.3";
@ -30,7 +31,11 @@ rustPlatform.buildRustPackage rec {
sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy";
};
cargoSha256 = "0vi8nv4hkhsgqgz36xacwkk5cxirg6li44nbmk3x7vx7c64hzybq";
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-ePkPiWGn79PHrMsSEql5OXZW5uRMdTP+w0/DCcm2KG4=";
};
nativeBuildInputs = [
desktop-file-utils
@ -39,6 +44,9 @@ rustPlatform.buildRustPackage rec {
ninja
pkg-config
python3
rustPlatform.rust.cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
wrapGAppsHook
glib # for glib-compile-resources
];
@ -49,6 +57,7 @@ rustPlatform.buildRustPackage rec {
glib
gtk3
libhandy_0
libsass
pango
];
@ -56,12 +65,6 @@ rustPlatform.buildRustPackage rec {
patchShebangs build-aux/meson_post_install.py
'';
# Don't use buildRustPackage phases, only use it for rust deps setup
configurePhase = null;
buildPhase = null;
checkPhase = null;
installPhase = null;
meta = with lib; {
description = "Checks whether the contrast between two colors meet the WCAG requirements";
homepage = "https://gitlab.gnome.org/World/design/contrast";

View file

@ -1,11 +1,10 @@
{ lib
{ stdenv
, lib
, rustPlatform
, fetchFromGitLab
, meson
, ninja
, gettext
, cargo
, rustc
, python3
, pkg-config
, glib
@ -18,9 +17,9 @@
, wrapGAppsHook
}:
rustPlatform.buildRustPackage rec {
version = "0.4.8";
stdenv.mkDerivation rec {
pname = "gnome-podcasts";
version = "0.4.8";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
@ -30,16 +29,21 @@ rustPlatform.buildRustPackage rec {
sha256 = "0y2332zjq7vf1v38wzwz98fs19vpzy9kl7y0xbdzqr303l59hjb1";
};
cargoSha256 = "1jbii9k4bkrivdk1ffr6556q1sgk9j4jbzwnn8vbxmksyl1x328q";
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-GInRA/V61r42spb/JYlM8+mATSkmOxdm2zHPRWaKcck=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
cargo
rustc
python3
rustPlatform.rust.cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
wrapGAppsHook
glib
];
@ -57,12 +61,6 @@ rustPlatform.buildRustPackage rec {
gst_all_1.gst-plugins-good
];
# use Meson/Ninja phases
configurePhase = null;
buildPhase = null;
checkPhase = null;
installPhase = null;
# tests require network
doCheck = false;
@ -74,7 +72,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Listen to your favorite podcasts";
homepage = "https://wiki.gnome.org/Apps/Podcasts";
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.unix;
};

View file

@ -1,10 +1,11 @@
{ lib
{ stdenv
, lib
, fetchFromGitLab
, cargo
, dbus
, desktop-file-utils
, gdk-pixbuf
, gettext
, gitMinimal
, glib
, gst_all_1
, gtk3
@ -14,13 +15,12 @@
, openssl
, pkg-config
, python3
, rustc
, rustPlatform
, sqlite
, wrapGAppsHook
}:
rustPlatform.buildRustPackage rec {
stdenv.mkDerivation rec {
pname = "shortwave";
version = "1.1.1";
@ -32,18 +32,24 @@ rustPlatform.buildRustPackage rec {
sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld";
};
cargoSha256 = "181699rlpr5dszc18wg0kbss3gfskxaz9lpxpgsc4yfb6ip89qnk";
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-0+KEbjTLecL0u/3S9FWf2r2h9ZrgcRTY163kS3NKJqA=";
};
nativeBuildInputs = [
cargo
desktop-file-utils
gettext
gitMinimal
glib # for glib-compile-schemas
meson
ninja
pkg-config
python3
rustc
rustPlatform.rust.cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
wrapGAppsHook
];
@ -62,12 +68,6 @@ rustPlatform.buildRustPackage rec {
gst-plugins-bad
]);
# Don't use buildRustPackage phases, only use it for rust deps setup
configurePhase = null;
buildPhase = null;
checkPhase = null;
installPhase = null;
postPatch = ''
patchShebangs build-aux/meson/postinstall.py
'';

View file

@ -13,14 +13,14 @@ let
pythonPackages = python3Packages;
in
mkDerivation rec {
version = "1.11";
version = "1.12";
pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
sha256 = "01r4fq03fpyhwvn47wx3dw29vcadcd0qml00h36q38cq3pi9x42j";
sha256 = "4k0WsTsz4WwPZC8Dj85l2ntJOZkLgmBBOJcX9Bb4U7I=";
};
buildInputs = [

View file

@ -1,12 +1,9 @@
{ lib, stdenv
, fetchFromGitLab
, nix-update-script
, fetchpatch
, meson
, ninja
, gettext
, cargo
, rustc
, python3
, rustPlatform
, pkg-config
@ -24,7 +21,7 @@
, wrapGAppsHook
}:
rustPlatform.buildRustPackage rec {
stdenv.mkDerivation rec {
pname = "fractal";
version = "4.4.0";
@ -36,16 +33,21 @@ rustPlatform.buildRustPackage rec {
sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw=";
};
cargoSha256 = "xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-xim5sOzeXJjRXbTOg2Gk/LHU0LioiyMK5nSr1LwMPjc=";
};
nativeBuildInputs = [
cargo
gettext
meson
ninja
pkg-config
python3
rustc
rustPlatform.rust.cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
wrapGAppsHook
glib
];
@ -76,12 +78,6 @@ rustPlatform.buildRustPackage rec {
patchShebangs scripts/meson_post_install.py scripts/test.sh
'';
# Don't use buildRustPackage phases, only use it for rust deps setup
configurePhase = null;
buildPhase = null;
checkPhase = null;
installPhase = null;
passthru = {
updateScript = nix-update-script {
attrPath = pname;
@ -91,7 +87,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3;
license = licenses.gpl3Plus;
broken = stdenv.isDarwin;
maintainers = with maintainers; [ dtzWill worldofpeace ];
};

View file

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "teams";
version = "1.3.00.30857";
version = "1.4.00.4855";
src = fetchurl {
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
sha256 = "06r48h1fr2si2g5ng8hsnbcmr70iapnafj21v5bzrzzrigzb2n2h";
sha256 = "1g0lsydz4l536qf890drdz6g86xb0sm3326hz3ymj9pi8vvbs7d9";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];
@ -38,9 +38,13 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg-utils}/bin")
gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox)
gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox)
'';
installPhase = ''
runHook preInstall
mkdir -p $out/{opt,bin}
mv share/teams $out/opt/
@ -54,6 +58,8 @@ stdenv.mkDerivation rec {
# Work-around screen sharing bug
# https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html
rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay
runHook postInstall
'';
dontAutoPatchelf = true;

View file

@ -1,26 +1,53 @@
{ lib, mkDerivation, fetchurl, qmake, qtscript }:
{ lib
, stdenv
, fetchurl
, qmake
, qtscript
, wrapQtAppsHook
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "smplayer";
version = "20.6.0";
version = "21.1.0";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0c59gfgm2ya8yb2nx7gy1zc0nrr4206213xy86y7jw0bk9mmjxmy";
hash = "sha256-Y0uq32XoQ8fpIJDScRfA7p3RYd6x1PWZSsYyAYYKf/c=";
};
nativeBuildInputs = [ qmake wrapQtAppsHook ];
buildInputs = [ qtscript ];
nativeBuildInputs = [ qmake ];
dontUseQmakeConfigure = true;
makeFlags = [ "PREFIX=${placeholder "out"}" ];
makeFlags = [
"PREFIX=${placeholder "out"}"
];
meta = {
description = "A complete front-end for MPlayer";
longDescription = "Either mplayer or mpv should also be installed for smplayer to play medias";
meta = with lib; {
homepage = "https://www.smplayer.info";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
description = "A complete front-end for MPlayer";
longDescription = ''
SMPlayer is a free media player for Windows and Linux with built-in codecs
that can play virtually all video and audio formats. It doesn't need any
external codecs. Just install SMPlayer and you'll be able to play all
formats without the hassle to find and install codec packs.
One of the most interesting features of SMPlayer: it remembers the
settings of all files you play. So you start to watch a movie but you have
to leave... don't worry, when you open that movie again it will be resumed
at the same point you left it, and with the same settings: audio track,
subtitles, volume...
SMPlayer is a graphical user interface (GUI) for the award-winning
MPlayer, which is capable of playing almost all known video and audio
formats. But apart from providing access for the most common and useful
options of MPlayer, SMPlayer adds other interesting features like the
possibility to play Youtube videos or download subtitles.
'';
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.linux;
};
}
# TODO [ AndersonTorres ]: some form of wrapping mplayer/mpv around it

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "redkite";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "iurie-sw";
repo = pname;
rev = "v${version}";
sha256 = "16j9zp5i7svq3g38rfb6h257qfgnd2brrxi7cjd2pdax9xxwj40y";
sha256 = "sha256-bf8kz9RyhDDuUHKiKvLiQLBIEXbIyoy3yuKfSpSYYv0=";
};
nativeBuildInputs = [ cmake ];

View file

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-eventgrid";
version = "2.0.0";
version = "4.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "bdaeead61458e90f3e36e30692689da9f9f67bbef075a526f446c2d0228b0cd1";
sha256 = "a8b1d4aa9386efa923bad1a07da9f9098facd3b654d036a900a54de77d06eabe";
};
propagatedBuildInputs = [

View file

@ -10,14 +10,14 @@
}:
buildPythonPackage rec {
version = "17.1.0";
version = "18.0.0";
pname = "azure-mgmt-network";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "f47852836a5960447ab534784a9285696969f007744ba030828da2eab92621ab";
sha256 = "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a";
};
propagatedBuildInputs = [

View file

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "2.1.0";
version = "2.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696";
sha256 = "874defad583e90e55a3e83aff27eb5fe108d9197d839cd45f3eacf2395881806";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];

View file

@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "2.10.0";
version = "2.11.0";
src = fetchPypi {
inherit pname version;
sha256 = "fac9adb1394d948e259fba1df4e86a6c34cfccaf19af7bdbdf9640cf6e313a71";
sha256 = "d8f8464188e3eb03925a4f4acbf4e8fbfbde84a06145bd8a52c6b736113713ae";
};
propagatedBuildInputs = [

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-dataproc";
version = "2.2.0";
version = "2.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "07rv2kgbaqkbd71k5i2zn9kcxasfzkkyai8jnbszhkf92k0lmi41";
sha256 = "09e53889a60d84a71c505fe77174d242f00f28f989977aea91f6005cadfa466b";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];

View file

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
version = "1.0.0";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "07zvagy9hwaccwvg1xad5nkalgkria0maa5yxiwqf1yk9f7gbyq1";
sha256 = "c993129ecb1db6ab9b49cacfa11f368f30c7d897640c56f52558edf542c08ade";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
version = "2.0.0";
version = "2.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1f67mr473vzv0qgjm4hycfnrjgiqrsv47vqrynwjy9yrca2130y7";
sha256 = "957f436986275dcc82483906b424dcabe8d1f8c08ae5c9677bf7547a314b0a59";
};
propagatedBuildInputs = [ google-api-core libcst proto-plus ];

View file

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "howdoi";
version = "2.0.12";
version = "2.0.14";
src = fetchPypi {
inherit pname version;
sha256 = "bab3eab349ec0b534cf1b05a563d45e4d301b914c53a7f2c3446fdcc60497c93";
sha256 = "9416be3c8a319fc0764a743a2ad05fa374876dab71dbe15ce86c3a05ece44a0a";
};
postPatch = ''

View file

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "kaggle";
version = "1.5.10";
version = "1.5.12";
src = fetchPypi {
inherit pname version;
sha256 = "05a2a3d4adeebc8a465d037999ba8db2cb471a24b41d623d4bcb80aac02ddbc9";
sha256 = "b4d87d107bff743aaa805c2b382c3661c4c175cdb159656d4972be2a9cef42cb";
};
# The version bounds in the setup.py file are unnecessarily restrictive.

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "k6";
version = "0.30.0";
version = "0.31.0";
goPackagePath = "github.com/loadimpact/k6";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "loadimpact";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eUvkW6IBmUp4/zYNlQKrNrxMszdzU8v6tCc2o4DN1As=";
sha256 = "sha256-UAVbYN4uDUMqUspycEZ2VGHzxFD7IlIW6m91U8ccZXw=";
};
subPackages = [ "./" ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "cassowary";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "rogerwelin";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IaS2QU9DBupv06AMzJXBM2iZkNVw31Pt1bOMQNBEiq0=";
sha256 = "sha256-rQNrxAKf2huY9I6iqdf1iYxgXaQI0LG1Lkrnv1OuJsg=";
};
vendorSha256 = "sha256-RuwrnuTNfiYpIuohw7OQv95hjOAeWCMuajsZVUUDxBQ=";
vendorSha256 = "sha256-hGpiL88x2roFEjJJM4CKyt3k66VK1pEnpOwvhDPDp6M=";
doCheck = false;