Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitqlient: init at 1.1.0 #86706

Closed
wants to merge 1 commit into from
Closed

Conversation

colemickens
Copy link
Member

@colemickens colemickens commented May 4, 2020

Motivation for this change

Fixes: #86702.

Seems to build, launch, run okay. Going to test for a bit, maybe wait for the actual 1.1.0 release and then mark this as not-Draft.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

, qtbase, qmake
}:

with stdenv.lib;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this line

mv $out/homeless-shelter/GitQlient/bin $out/bin
'';

meta = {
Copy link
Member

@prusnak prusnak May 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
meta = {
meta = with lib; {

@@ -3693,6 +3693,8 @@ in

gitaly = callPackage ../applications/version-management/gitlab/gitaly { };

gitqlient = qt5.callPackage ../applications/version-management/gitqlient { };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems it is much more common to use

Suggested change
gitqlient = qt5.callPackage ../applications/version-management/gitqlient { };
gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };

Comment on lines +19 to +20
buildInputs = [ qtbase ];
nativeBuildInputs = [ qmake ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if these 2 lines are required when you use libsForQt5 in all-packages.nix.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first one is not needed, but the second one is required.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As of 1.3.0, qtwebengine is required.


meta = {
homepage = "https://github.com/francescmm/GitQlient";
description = "GitQlient: Multi-platform Git client written with Qt";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
description = "GitQlient: Multi-platform Git client written with Qt";
description = "Multi-platform Git client written with Qt";

@colemickens colemickens force-pushed the gitqlient branch 4 times, most recently from 1eb4758 to f2ea8cc Compare June 29, 2020 06:31
@colemickens colemickens changed the title gitqlient: init at 1.1.0-beta gitqlient: init at 1.1.0 Jul 6, 2020
@stale
Copy link

stale bot commented Jan 3, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 3, 2021
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 17, 2021
@@ -0,0 +1,34 @@
{ stdenv, mkDerivation, fetchFromGitHub
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{ stdenv, mkDerivation, fetchFromGitHub
{ lib, mkDerivation, fetchFromGitHub

@sikmir
Copy link
Member

sikmir commented Mar 13, 2021

1.3.0 is out.

meta = {
homepage = "https://github.com/francescmm/GitQlient";
description = "GitQlient: Multi-platform Git client written with Qt";
license = licenses.lgpl2;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
license = licenses.lgpl2;
license = licenses.lgpl2Plus;

repo = "GitQlient";
rev = "v${version}";
sha256 = "048mmwx0nv7sb2cpwl1h8wqb4q7dcnkrrmhvq08yznylgdcgkgs1";
fetchSubmodules = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is not submodules, at least now.

@@ -0,0 +1,34 @@
{ stdenv, mkDerivation, fetchFromGitHub
, qtbase, qmake
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
, qtbase, qmake
, qtwebengine, qmake


mkDerivation rec {
pname = "GitQlient";
version = "1.1.0";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
version = "1.1.0";
version = "1.3.0";

Comment on lines +15 to +16
sha256 = "048mmwx0nv7sb2cpwl1h8wqb4q7dcnkrrmhvq08yznylgdcgkgs1";
fetchSubmodules = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
sha256 = "048mmwx0nv7sb2cpwl1h8wqb4q7dcnkrrmhvq08yznylgdcgkgs1";
fetchSubmodules = true;
sha256 = "1j3mlf1yqfnm509pjvhfba754algrj94m15fxx61xkqdwkp611wz";

fetchSubmodules = true;
};

buildInputs = [ qtbase ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
buildInputs = [ qtbase ];
buildInputs = [ qtwebengine ];

Comment on lines +21 to +25
installFlags = [ "INSTALL_ROOT=$(out)" ];

postInstall = ''
mv $out/homeless-shelter/GitQlient/bin $out/bin
'';
Copy link
Member

@sikmir sikmir Mar 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
installFlags = [ "INSTALL_ROOT=$(out)" ];
postInstall = ''
mv $out/homeless-shelter/GitQlient/bin $out/bin
'';
qmakeFlags = [ "GitQlient.pro" ];

homepage = "https://github.com/francescmm/GitQlient";
description = "GitQlient: Multi-platform Git client written with Qt";
license = licenses.lgpl2;
platforms = platforms.linux;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
platforms = platforms.linux;
platforms = platforms.unix;

It works on darwin with the following change:

  installPhase = lib.optionalString stdenv.isDarwin ''
    mkdir -p $out/Applications
    mv gitqlient.app $out/Applications
    wrapQtApp $out/Applications/gitqlient.app/Contents/MacOS/gitqlient
  '';

@sikmir
Copy link
Member

sikmir commented Mar 13, 2021

@colemickens Could you please update and undraft PR?

@stale
Copy link

stale bot commented Sep 10, 2021

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Sep 10, 2021
@colemickens
Copy link
Member Author

Abandoning this. There's lots of changes requested, I'm more likely to use git-ui in the terminal anyway. Closing for hygiene, but I'd be happy to test/review if someone wants to pick this up.

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 10, 2022
@romildo romildo mentioned this pull request Mar 10, 2022
13 tasks
@colemickens colemickens deleted the gitqlient branch December 30, 2022 01:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

request: GitQlient
4 participants