diff options
| author | Peter Hoeg <peter@hoeg.com> | 2017-12-11 08:05:54 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2017-12-11 08:06:01 +0800 |
| commit | 7d9ecef47af7284e237e474b5f95f1b74beee19e (patch) | |
| tree | 8ed4167b2334006d9a029dc70cb1a0a579586fed /pkgs/data/documentation | |
| parent | 4561d6ca9faaeeec17bb38e80569ab85f4bf9539 (diff) | |
| download | nixpkgs-7d9ecef47af7284e237e474b5f95f1b74beee19e.tar nixpkgs-7d9ecef47af7284e237e474b5f95f1b74beee19e.tar.gz nixpkgs-7d9ecef47af7284e237e474b5f95f1b74beee19e.tar.bz2 nixpkgs-7d9ecef47af7284e237e474b5f95f1b74beee19e.tar.lz nixpkgs-7d9ecef47af7284e237e474b5f95f1b74beee19e.tar.xz nixpkgs-7d9ecef47af7284e237e474b5f95f1b74beee19e.tar.zst nixpkgs-7d9ecef47af7284e237e474b5f95f1b74beee19e.zip | |
zeal: 0.4.0 -> 0.5.0
Diffstat (limited to 'pkgs/data/documentation')
| -rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/documentation/zeal/remove_ads.patch | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index a1e90244f80..1951429fa90 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "zeal-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; rev = "v${version}"; - sha256 = "1mfcw843g4slr79bvidb5s88m7a3swr9by6srdn233b88j8mqwzl"; + sha256 = "14gm9n2zmqgig4nz5i3089dhn0a7c175g1szr0zg9yzr9j2hk0mr"; }; # while ads can be disabled from the user settings, by default they are not so @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; homepage = http://zealdocs.org/; license = licenses.gpl3; - maintainers = with maintainers; [ skeidel ]; + maintainers = with maintainers; [ skeidel peterhoeg ]; platforms = platforms.linux; }; } diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/pkgs/data/documentation/zeal/remove_ads.patch index 7f163376865..1c0b3c081f1 100644 --- a/pkgs/data/documentation/zeal/remove_ads.patch +++ b/pkgs/data/documentation/zeal/remove_ads.patch @@ -1,13 +1,16 @@ diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html -index afe9e2a..490a0fb 100644 +index 22e6278..ec09771 100644 --- a/src/app/resources/browser/welcome.html +++ b/src/app/resources/browser/welcome.html -@@ -34,9 +34,6 @@ +@@ -35,12 +35,6 @@ <div class="hero-foot"> <div class="container"> <div class="content has-text-centered"> -- <div id="carbon" class="box"> -- <script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=zealdocsforwindowsorg" id="_carbonads_js"></script> +- <div id="carboncontainer"> +- <div id="carbon" class="box"> +- <script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=zealdocsforwindowsorg" +- onerror="document.getElementById('carboncontainer').style.display = 'none';" id="_carbonads_js"></script> +- </div> - </div> <p> <a class="icon" href="https://github.com/zealdocs/zeal"> |