summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-01-07 21:07:29 +0100
committerGitHub <noreply@github.com>2021-01-07 21:07:29 +0100
commit7a5c1d3cd50d7caeb5611a2db65a8dd90d64904b (patch)
tree931e99be323e2d5c8f4f90df76b92549e573c9cf /pkgs
parente587f393dd07e710d673f69df6928090aeac2e6f (diff)
parent5d815cce8abc0e20ba0455dd0f15080e0c3a302d (diff)
Merge pull request #108474 from erictapen/ghostwriter-2.0.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/ghostwriter/default.nix9
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index 8c1b95a1d26e..aa67124c1146 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "ghostwriter";
- version = "1.8.1";
+ version = "2.0.0-rc3";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
- rev = "v${version}";
- sha256 = "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6";
+ rev = version;
+ sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg=";
};
nativeBuildInputs = [ qmake pkgconfig qttools ];
@@ -20,6 +20,7 @@ mkDerivation rec {
homepage = src.meta.homepage;
license = licenses.gpl3Plus;
platforms = platforms.unix;
- maintainers = with maintainers; [ dotlambda ];
+ maintainers = with maintainers; [ dotlambda erictapen ];
+ broken = stdenv.isDarwin;
};
}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d36be4db11b..fa484c63ba98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21551,7 +21551,7 @@ in
geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { };
- ghostwriter = libsForQt514.callPackage ../applications/editors/ghostwriter { };
+ ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };
gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { };