diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-09 18:41:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-09 18:41:27 +0000 |
| commit | fcbe48c79793e614092ba278e05d5594995a88e3 (patch) | |
| tree | 91c9cc085dbd2354fc4bb59c9b3e6a1a00313639 /pkgs/applications/version-management | |
| parent | 8ae8602bf7529fddeab29867329c21af96600a68 (diff) | |
| parent | 9d358f1f7cb833d60dacf8b52a516ec2a753c533 (diff) | |
| download | nixpkgs-fcbe48c79793e614092ba278e05d5594995a88e3.tar nixpkgs-fcbe48c79793e614092ba278e05d5594995a88e3.tar.gz nixpkgs-fcbe48c79793e614092ba278e05d5594995a88e3.tar.bz2 nixpkgs-fcbe48c79793e614092ba278e05d5594995a88e3.tar.lz nixpkgs-fcbe48c79793e614092ba278e05d5594995a88e3.tar.xz nixpkgs-fcbe48c79793e614092ba278e05d5594995a88e3.tar.zst nixpkgs-fcbe48c79793e614092ba278e05d5594995a88e3.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-repo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/sparkleshare/default.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 56e4f30d927..e6f6e69fcaa 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.11"; + version = "2.11.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-eb35yNsE0F+xPA1j7Czag1aOZO4cr6OeRsBlCrQwCRk="; + sha256 = "sha256-6XsjxTYmjr/3smwwS7c+Mq1sqfgKAhWzHOY8TWlIKHU="; }; patches = [ ./import-ssl-module.patch ]; diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix index 6f639ecd77f..a7d1f86652c 100644 --- a/pkgs/applications/version-management/sparkleshare/default.nix +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -1,5 +1,6 @@ { appindicator-sharp, + bash, coreutils, fetchFromGitHub, git, @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { --set PATH ${symlinkJoin { name = "mono-path"; paths = [ + bash coreutils git git-lfs |