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

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-08-02 06:03:39 +00:00 committed by GitHub
parent abbdf9574b e90ec145d2
commit 18fd910d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/trezor/default.nix
View File

@ -24,13 +24,13 @@
buildPythonPackage rec {
pname = "trezor";
version = "0.12.2";
version = "0.12.3";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0r0j0y0ii62ppawc8qqjyaq0fkmmb0zk1xb3f9navxp556w2dljv";
sha256 = "02c39c333435b8f6dc62cc79bb5bf35fc7f0eb144a1a748be3b7c065ee3e85ae";
};
nativeBuildInputs = [ installShellFiles ];

16
pkgs/development/tools/build-managers/mill/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
version = "0.9.6";
version = "0.9.9";
src = fetchurl {
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}";
sha256 = "sha256-cAhcTmSPkV5z5ryuCNrpxy9/1iWvvminiVYul9c/DwM=";
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
sha256 = "sha256-HIT7bxMEz7jpSsYvohN9+zYuyCf/ARE7hd48YMTo9/4=";
};
nativeBuildInputs = [ makeWrapper ];
@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
dontConfigure = true;
dontBuild = true;
# this is mostly downloading a pre-built artifact
preferLocal = true;
installPhase = ''
runHook preInstall
install -Dm555 "$src" "$out/bin/.mill-wrapped"
@ -25,6 +28,13 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
doInstallCheck = true;
# The default release is a script which will do an impure download
# just ensure that the application can run without network
installCheckPhase = ''
$out/bin/mill --help > /dev/null
'';
meta = with lib; {
homepage = "https://www.lihaoyi.com/mill";
license = licenses.mit;

4
pkgs/tools/misc/grub/2.0x.nix
View File

@ -39,7 +39,7 @@ let
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
version = "2.06-rc1";
version = "2.06";
in (
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.savannah.gnu.org/grub.git";
rev = "${pname}-${version}";
sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa";
sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f";
};
patches = [