diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-09 18:01:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-09 18:01:15 +0000 |
commit | e88cc8f10e8913185830cce6d5895aae508498d1 (patch) | |
tree | b21ddf8445bd256993d97c3b26e965aca4057340 /pkgs/data/documentation | |
parent | 20d94e414f823937b7886e50d98b75d40a20c316 (diff) | |
parent | 02c3ec8b381c6ddf9c559c50bf6ae5964521f9e0 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/data/documentation')
-rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 3a8b7122c7ff2..27988d5ee565b 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -17,15 +17,17 @@ let isQt5 = lib.versions.major qtbase.version == "5"; -in stdenv.mkDerivation rec { + +in +stdenv.mkDerivation rec { pname = "zeal"; - version = "0.6.20221022"; + version = "0.6.1.20230320"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "7ea03e4bb9754020e902a2989f56f4bc42b85c82"; - sha256 = "sha256-BozRLlws56i9P7Qtc5qPZWgJR5yhYqnLQsEdsymt5us="; + rev = "a617ae5e06b95cec99bae058650e55b98613916d"; + hash = "sha256-WL2uqA0sZ5Q3lZIA9vkLVyfec/jBkfGcWb6XQ7AuM94="; }; # we only need this if we are using a version that hasn't been released. We @@ -39,16 +41,15 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ]; - buildInputs = - [ - qtbase - qtimageformats - qtwebengine - libarchive - libXdmcp - libpthreadstubs - xcbutilkeysyms - ] ++ lib.optionals isQt5 [ qtx11extras ]; + buildInputs = [ + qtbase + qtimageformats + qtwebengine + libarchive + libXdmcp + libpthreadstubs + xcbutilkeysyms + ] ++ lib.optionals isQt5 [ qtx11extras ]; meta = with lib; { description = "A simple offline API documentation browser"; |