mpd: 0.9.19 -> 0.20

Add support for no-minor-version (cherry picked from commit 5ebee16) manual merge fixes
NixOS · Jan 7, 2017 · 555f6f6 · 555f6f6
1 parent ecaaea6
commit 555f6f6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
@@ -29,14 +29,14 @@
 let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
-  major = "0.19";
-  minor = "15";
+  major = "0.20";
+  minor = "";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-${major}.${minor}";
+  name = "mpd-${major}${if minor == "" then "" else "." + minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
-    sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c";
+    sha256 = "068nxsfkp2ppcjh3fmcbapkiwnjpvkii73bfydpw4bf2yphdvsa8";
   };
 
   patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch;