Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b50855dc353c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f985fb8222b6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 28, 2019

  1. Copy the full SHA
    62347b2 View commit details

Commits on Mar 6, 2019

  1. Merge pull request #56532 from dtzWill/update/davmail-5.2.0

    davmail: 4.8.6 -> 5.2.0
    dguibert authored Mar 6, 2019
    Copy the full SHA
    f985fb8 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/applications/networking/davmail/default.nix
9 changes: 5 additions & 4 deletions pkgs/applications/networking/davmail/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper, unzip }:

stdenv.mkDerivation rec {
name = "davmail-4.8.6";
pname = "davmail";
version = "5.2.0";
src = fetchurl {
url = "mirror://sourceforge/davmail/4.8.6/davmail-4.8.6-2600.zip";
sha256 = "1wk4jxb46qlyipxj57flqadgm4mih243rhqq9sp9m5pifjqrw9dp";
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-2961.zip";
sha256 = "0jw6sjg7k7zg8ab0srz6cjjj5hnw5ppxx1w35sw055dlg54fh2m5";
};

sourceRoot = ".";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/share/davmail
cp -vR ./* $out/share/davmail
makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \
makeWrapper $out/share/davmail/davmail $out/bin/davmail \
--prefix PATH : ${jre}/bin \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
'';