diff options
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 18 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix index e5e41ac7232af..8ada5cc42f54e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix @@ -1,11 +1,19 @@ -{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, botocore, pytest, mock -, flake8, tox, awscli }: +{ lib, fetchFromGitHub, python3Packages, awscli }: + +with python3Packages; buildPythonApplication rec { pname = "git-remote-codecommit"; version = "1.15.1"; disabled = !isPy3k; + # The check dependency awscli has some overrides + # which yield a different botocore. + # This results in a duplicate version during installation + # of the wheel, even though it does not matter + # because it is only a test dependency. + catchConflicts = false; + src = fetchFromGitHub { owner = "aws"; repo = pname; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 3c576f6a26ef5..d75337631a8b7 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.29.3"; + version = "2.29.4"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-hZoiljARTEhsuaM7QEFl+XqLq4RksLfxDpht5V1aC2M="; + sha256 = "sha256-oUPY10B6JHixdfgi5BHzrg9nZ1DlFUhQyuXJj2fCSM4="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index bda8bb2c066a6..b70fe634cb1ee 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.76"; + version = "0.77"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-05VUIHUqXnES4CmgopzQ2LQ0uldSffsGF5ExedEO+yA="; + sha256 = "sha256-/O9u7Ei6f0rGr7LRWcG9FUQd7Z+qpq2/6H01jNR1C7o="; }; nativeBuildInputs = [ pkg-config bison ]; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 932f4847c2815..dab74a8ec5cb1 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { --prefix JRE_HOME : ${jre} \ --prefix JAVA_HOME : ${jre} \ --prefix SMARTGITHG_JAVA_HOME : ${jre} \ - ) \ + ) + # add missing shebang for start script + sed -i $out/bin/smartgit \ + -e '1i#!/bin/bash' ''; installPhase = '' |