From 9d4fc88fbfe9efa8872c3c7ab9c80dade4da5fd5 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 31 Oct 2017 23:52:15 +0100
Subject: [PATCH] python-pycdio: 0.20 -> 0.21

---
 .../pycdio/add-cdtext-toc.patch               | 52 -------------------
 pkgs/top-level/python-packages.nix            |  6 +--
 2 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pycdio/add-cdtext-toc.patch

diff --git a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch b/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch
deleted file mode 100644
index 4e36612d80d0..000000000000
--- a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Nurp pycdio-0.20-orig/test/cdtext.toc pycdio-0.20/test/cdtext.toc
---- pycdio-0.20-orig/test/cdtext.toc	1970-01-01 01:00:00.000000000 +0100
-+++ pycdio-0.20/test/cdtext.toc	2014-11-06 23:36:12.520708320 +0100
-@@ -0,0 +1,48 @@
-+CD_DA
-+
-+// global CD-TEXT data
-+
-+CD_TEXT {
-+
-+  // Mapping from language number (0..7) used in 'LANGUAGE' statements 
-+  // to language code.
-+///  LANGUAGE_MAP {
-+///    0 : EN  // 9 is the code for ENGLISH,
-+///            // I don't know any other language code, yet
-+///  }
-+
-+  // Language number should always start with 0
-+  LANGUAGE 0 {
-+    // Required fields - at least all CD-TEXT CDs I've seen so far have them.
-+    TITLE "CD Title"
-+    PERFORMER "Performer"
-+    DISC_ID "XY12345"
-+    UPC_EAN "" // usually empty
-+
-+    // Further possible items, all of them are optional
-+    ARRANGER ""
-+    SONGWRITER ""
-+    MESSAGE "" 
-+    GENRE "" // I'm not sure if this should be really ascii data
-+  }
-+}
-+
-+
-+TRACK AUDIO
-+// track specific CD-TEXT data
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    // if an item is defined for one track it should be defined for all tracks
-+    TITLE "Track Title"
-+
-+    PERFORMER "Performer"
-+    ISRC "US-XX1-98-01234"
-+
-+    ARRANGER ""
-+    SONGWRITER ""
-+    MESSAGE "" 
-+  }
-+}
-+
-+SILENCE 1:0:0
-+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0777e894e716..60d5f9577e47 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15926,12 +15926,12 @@ in {
 
 
   pycdio = buildPythonPackage rec {
-    name = "pycdio-0.20";
+    name = "pycdio-0.21";
     disabled = !isPy27;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pycdio/${name}.tar.gz";
-      sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14";
+      sha256 = "1bkcmg838l2yffsw5lln93ap5f8ks3vmqwg02mygmdmay647rc3v";
     };
 
     prePatch = ''
@@ -15946,8 +15946,6 @@ in {
     buildInputs = [ self.setuptools self.nose pkgs.swig pkgs.libcdio ]
       ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv;
 
-    patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ];
-
     # Run tests using nosetests but first need to install the binaries
     # to the root source directory where they can be found.
     checkPhase = ''