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
gitqlient: init at 1.1.0 #86706
Conversation
, qtbase, qmake | ||
}: | ||
|
||
with stdenv.lib; |
There was a problem hiding this comment.
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 = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
meta = { | |
meta = with lib; { |
@@ -3693,6 +3693,8 @@ in | |||
|
|||
gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; | |||
|
|||
gitqlient = qt5.callPackage ../applications/version-management/gitqlient { }; |
There was a problem hiding this comment.
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
gitqlient = qt5.callPackage ../applications/version-management/gitqlient { }; | |
gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; |
buildInputs = [ qtbase ]; | ||
nativeBuildInputs = [ qmake ]; |
There was a problem hiding this comment.
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
.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
description = "GitQlient: Multi-platform Git client written with Qt"; | |
description = "Multi-platform Git client written with Qt"; |
1eb4758
to
f2ea8cc
Compare
I marked this as stale due to inactivity. → More info |
@@ -0,0 +1,34 @@ | |||
{ stdenv, mkDerivation, fetchFromGitHub |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
{ stdenv, mkDerivation, fetchFromGitHub | |
{ lib, mkDerivation, fetchFromGitHub |
1.3.0 is out. |
meta = { | ||
homepage = "https://github.com/francescmm/GitQlient"; | ||
description = "GitQlient: Multi-platform Git client written with Qt"; | ||
license = licenses.lgpl2; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
license = licenses.lgpl2; | |
license = licenses.lgpl2Plus; |
repo = "GitQlient"; | ||
rev = "v${version}"; | ||
sha256 = "048mmwx0nv7sb2cpwl1h8wqb4q7dcnkrrmhvq08yznylgdcgkgs1"; | ||
fetchSubmodules = true; |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
, qtbase, qmake | |
, qtwebengine, qmake |
|
||
mkDerivation rec { | ||
pname = "GitQlient"; | ||
version = "1.1.0"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
version = "1.1.0"; | |
version = "1.3.0"; |
sha256 = "048mmwx0nv7sb2cpwl1h8wqb4q7dcnkrrmhvq08yznylgdcgkgs1"; | ||
fetchSubmodules = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sha256 = "048mmwx0nv7sb2cpwl1h8wqb4q7dcnkrrmhvq08yznylgdcgkgs1"; | |
fetchSubmodules = true; | |
sha256 = "1j3mlf1yqfnm509pjvhfba754algrj94m15fxx61xkqdwkp611wz"; |
fetchSubmodules = true; | ||
}; | ||
|
||
buildInputs = [ qtbase ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
buildInputs = [ qtbase ]; | |
buildInputs = [ qtwebengine ]; |
installFlags = [ "INSTALL_ROOT=$(out)" ]; | ||
|
||
postInstall = '' | ||
mv $out/homeless-shelter/GitQlient/bin $out/bin | ||
''; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
'';
@colemickens Could you please update and undraft PR? |
I marked this as stale due to inactivity. → More info |
Abandoning this. There's lots of changes requested, I'm more likely to use |
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
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)