diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 79ee45b4c1c4f..18abd5b64c99c 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "merkaartor"; - version = "unstable-2019-11-12"; + version = "unstable-2020-07-07"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; - rev = "29b3388680a03f1daac0037a2b504ea710da879a"; - sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz"; + rev = "0db9132ef4d1ee7910d45c3c00302440297c4603"; + sha256 = "sha256-Y2pZby/iN4uFv9zh5x9frOqkrGydi3X6i9peEop0C8k="; }; nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "OpenStreetMap editor"; homepage = "http://merkaartor.be/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ erictapen ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c11c82800f73d..b54d5e1f9b0c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22953,8 +22953,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - # Needs qtwebkit which is broken on qt5.15 - merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };