From 2a1932d602c72e14303a3b54adc00facbe7904a0 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Thu, 15 Sep 2022 20:24:07 -0700
Subject: [PATCH] replace the local makemkv patch with upstream instead

---
 nixpatches/09-makemkv-1.17.1.patch | 29 -----------------------------
 nixpatches/list.nix                |  9 +++++++--
 2 files changed, 7 insertions(+), 31 deletions(-)
 delete mode 100644 nixpatches/09-makemkv-1.17.1.patch

diff --git a/nixpatches/09-makemkv-1.17.1.patch b/nixpatches/09-makemkv-1.17.1.patch
deleted file mode 100644
index 46a46277..00000000
--- a/nixpatches/09-makemkv-1.17.1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
-index 2c15513d4d6..1251a15cf1d 100644
---- a/pkgs/applications/video/makemkv/default.nix
-+++ b/pkgs/applications/video/makemkv/default.nix
-@@ -14,21 +14,21 @@
- }:
- 
- let
--  version = "1.16.7";
-+  version = "1.17.1";
-   # Using two URLs as the first one will break as soon as a new version is released
-   src_bin = fetchurl {
-     urls = [
-       "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
-       "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
-     ];
--    sha256 = "sha256-YjsYW2MmzDZqOMdYlqE0dZ399Qq8hJRQ9BCViNexLHs=";
-+    sha256 = "sha256-B4SQiwf5/Icweg+VgQW34tN/XxDA7xoSgIVOfXwGsfM=";
-   };
-   src_oss = fetchurl {
-     urls = [
-       "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
-       "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
-     ];
--    sha256 = "sha256-TL0PRP/pDg16qsbYi9RYyD0egNDaxuApmR86hiR/Rq8=";
-+    sha256 = "sha256-DVcrG5N9lydct11xoUKz1VVCiuvVOmQWGlAP2nrnZv4=";
-   };
- 
- in mkDerivation {
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 5f1a9a8c..73d101f0 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -18,11 +18,16 @@ fetchpatch: [
 
   # TODO: upstream
   ./07-duplicity-rich-url.patch
+
   # zecwallet-lite: init at 1.7.13
   (fetchpatch {
     url = "https://github.com/NixOS/nixpkgs/pull/180960.diff";
     sha256 = "sha256-HVVj/T3yQtjYBoxXpoPiG9Zar/eik9IoDVDhTOehBdY=";
   })
-  # upstream PR: https://github.com/NixOS/nixpkgs/pull/188342
-  ./09-makemkv-1.17.1.patch
+
+  # makemkv: 1.16.7 -> 1.17.1
+  (fetchpatch {
+    url = "https://github.com/NixOS/nixpkgs/pull/188342.diff";
+    sha256 = "sha256-3M4DpvXf5Us70FX5geE0L1Ns23Iw2NG82YNlwSd+WzI=";
+  })
 ]