Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-14 00:58:11 +00:00
committed by GitHub
89 changed files with 2361 additions and 2905 deletions
+3 -3
View File
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "bat";
version = "0.18.0";
version = "0.18.1";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
sha256 = "113i11sgna82i4c4zk66qmbypmnmzh0lzp4kkgqnxxcdvyj00rb8";
sha256 = "sha256-kyl+clL/4uxVaDH/9zPDGQTir4/JVgtHo9kNQ31gXTo=";
};
cargoSha256 = "12z7y303fmga91daf2w356qiqdqa7b8dz6nrrpnjdf0slyz0w3x4";
cargoSha256 = "sha256-j9HbOXiwN4CWv9wMBrNxY3jehh+KRkXlwmDqChNy1Dk=";
nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];
+5 -4
View File
@@ -1,14 +1,15 @@
{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome
{ lib, stdenv, fetchurl, intltool, gettext, coreutils, gnused, gnome
, gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2
, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll
}:
stdenv.mkDerivation rec {
name = "gparted-1.2.0";
pname = "gparted";
version = "1.3.0";
src = fetchurl {
url = "mirror://sourceforge/gparted/${name}.tar.gz";
sha256 = "sha256-bJBxXSVNen7AIIspAHtkFg3Z+330xKp/jsLJ0jEUxxk=";
url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz";
sha256 = "sha256-jcGAJF3Z6kXm4vS8aVEvGH4Ivn95nJioJaCwTBYcvSo=";
};
# Tries to run `pkexec --version` to get version.
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "6.9.0";
version = "6.9.1";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FW0vGwMHUgFSMggZoT+koSkub4xSKeQ+PNlvFjGIy7o=";
sha256 = "sha256-FaN1/S/VzHnaQp+UOmvNGaWDEFijVEI7GWkAmnln3jE=";
};
cargoSha256 = "sha256-+JNQITHP5rwbfavBeb4/IUo5FThhKcKDRwGeT5m6k5k=";
cargoSha256 = "sha256-Vq2gorQJbLfxKWKbYYOVaHPN0uITbGs1CgkwBtPwSrk=";
buildInputs = lib.optional stdenv.isDarwin Foundation;