replace the local makemkv patch with upstream instead
This commit is contained in:
parent
a6fd6a0a6d
commit
2a1932d602
|
@ -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 {
|
|
|
@ -18,11 +18,16 @@ fetchpatch: [
|
||||||
|
|
||||||
# TODO: upstream
|
# TODO: upstream
|
||||||
./07-duplicity-rich-url.patch
|
./07-duplicity-rich-url.patch
|
||||||
|
|
||||||
# zecwallet-lite: init at 1.7.13
|
# zecwallet-lite: init at 1.7.13
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/NixOS/nixpkgs/pull/180960.diff";
|
url = "https://github.com/NixOS/nixpkgs/pull/180960.diff";
|
||||||
sha256 = "sha256-HVVj/T3yQtjYBoxXpoPiG9Zar/eik9IoDVDhTOehBdY=";
|
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=";
|
||||||
|
})
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user