Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-24 12:11:57 +00:00
committed by GitHub
30 changed files with 264 additions and 255 deletions
+30
View File
@@ -0,0 +1,30 @@
{ lib
, python3
, git
, git-lfs
}:
python3.pkgs.buildPythonApplication rec {
pname = "github-backup";
version = "0.39.0";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "71829df4bdbe5bd55c324a97008405a6b4c6113edb1a2a6a8b73a7059fe64a47";
};
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ git git-lfs ])
];
# has no unit tests
doCheck = false;
meta = with lib; {
description = "Backup a github user or organization";
homepage = "https://github.com/josegonzalez/python-github-backup";
changelog = "https://github.com/josegonzalez/python-github-backup/blob/${version}/CHANGES.rst";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }:
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_78 }:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
make PREFIX="$out" install
for fn in plow{del,down,list,mod,probe,up}; do
wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_38 ]}"
wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_78 ]}"
done
'';
+3 -3
View File
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.50.0";
version = "0.51.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
sha256 = "1bnnqrxsmp3z2qksd8h4lfbq4kxxy1cg4yynadz66lxyzabv2v21";
sha256 = "1bmnwvjhw2ba7yqn9if83d57b8qbrbqgy2br8q2drz4ylk0gjirg";
};
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
done
'';
cargoSha256 = "0plk47i2xrn3x5yr3gw3pq74maqf4krb8d6i4sf8gil4mnpcgxir";
cargoSha256 = "1d4ca8yzx437x53i7z2kddv9db89zy6ywbgl6y1cwwd6wscbrxcq";
preCheck = ''
HOME=$TMPDIR