diff options
Diffstat (limited to 'pkgs/applications/version-management')
4 files changed, 79 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 16f87df678c..a7ca5c4eaa6 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-P9fbkJSXRYZdVD1EKWWs0FKs8aQdPqHWESUqjsGgyPU="; + sha256 = "sha256-6ur1ZIJRghkZk5tLMJUmKn+XfjVGFE0MRSQ/Uz+Eans="; }; - vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0="; + vendorSha256 = "sha256-JJNyzMYAQT/pS1+eGYQsUpxDiwa6DP7JWhIBuTtnOiE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3dd241840c7..531d5a547e6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1sw6b1jaddacfm4kvvhgxn743khmsi1c4b4f5mgvm3rabv0h473h"; + sha256 = "0mq6hmb3wvj0ash27h4zyl46l3fikpf0mv3ng330lcy6v7bhy5b8"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix new file mode 100644 index 00000000000..650ec73619a --- /dev/null +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, wrapGAppsHook +, gnome +, libsecret +, git +, curl +, nss +, nspr +, xorg +, libdrm +, alsa-lib +, cups +, mesa +, systemd +}: + +stdenv.mkDerivation rec { + pname = "github-desktop"; + version = "2.9.0"; + + src = fetchurl { + url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux4/GitHubDesktop-linux-${version}-linux4.deb"; + sha256 = "sha256-kyzvvzSCfo6uaTA0Z1yqAUjr4A5p3OuIpaVQv64WW7M"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + gnome.gnome-keyring + xorg.libXdamage + xorg.libX11 + libsecret + git + curl + nss + nspr + libdrm + alsa-lib + cups + mesa + ]; + + unpackPhase = '' + mkdir -p $TMP/${pname} $out/{opt,bin} + cp $src $TMP/${pname}.deb + ar vx ${pname}.deb + tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/${pname}/ + ''; + + installPhase = '' + cp -R $TMP/${pname}/usr/share $out/ + cp -R $TMP/${pname}/usr/lib/${pname}/* $out/opt/ + ln -sf $out/opt/${pname} $out/bin/${pname} + ''; + + runtimeDependencies = [ + (lib.getLib systemd) + ]; + + meta = with lib; { + description = "GUI for managing Git and GitHub."; + homepage = "https://desktop.github.com/"; + license = licenses.mit; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 06a4b2c98a6..5e556b40a89 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests checkInputs = [ pytest pytest-flake8 git ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ipython nbformat ]; src = fetchPypi { |