diff options
| author | Will Dietz <github@wdtz.org> | 2018-11-24 15:34:57 -0600 |
|---|---|---|
| committer | Renaud <c0bw3b@users.noreply.github.com> | 2018-11-24 22:34:57 +0100 |
| commit | 51b526d86e350b4f8086c5f61a2f1bf2ba8b087e (patch) | |
| tree | 1cea41d069af76b58eeeb43091e004c15fe023c6 | |
| parent | 11e2f31532e754256b1a6fa021364a7329d8635c (diff) | |
| download | nixpkgs-51b526d86e350b4f8086c5f61a2f1bf2ba8b087e.tar nixpkgs-51b526d86e350b4f8086c5f61a2f1bf2ba8b087e.tar.gz nixpkgs-51b526d86e350b4f8086c5f61a2f1bf2ba8b087e.tar.bz2 nixpkgs-51b526d86e350b4f8086c5f61a2f1bf2ba8b087e.tar.lz nixpkgs-51b526d86e350b4f8086c5f61a2f1bf2ba8b087e.tar.xz nixpkgs-51b526d86e350b4f8086c5f61a2f1bf2ba8b087e.tar.zst nixpkgs-51b526d86e350b4f8086c5f61a2f1bf2ba8b087e.zip | |
mtools: 4.0.20 -> 4.0.21
* mtools: 4.0.20 -> 4.0.21 (#50993) https://lists.gnu.org/archive/html/info-mtools/2018-11/msg00009.html * mtools: homepage is https-capable
| -rw-r--r-- | pkgs/tools/filesystems/mtools/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 1cbe48ecee5..de9d1a16fdb 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,17 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.20"; + name = "mtools-4.0.21"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "1vcahr9s6zv1hnrx2bgjnzcas2y951q90r1jvvv4q9v5kwfd6qb0"; + sha256 = "1kybydx74qgbwpnjvjn49msf8zipchl43d4cq8zzwcyvfkdzw7h2"; }; - # Prevents errors such as "mainloop.c:89:15: error: expected ')'" - # Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html - patches = [ ./fix-dos_to_wchar-declaration.patch ] ++ - stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; + patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; # fails to find X on darwin configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x"; @@ -19,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://www.gnu.org/software/mtools/; + homepage = https://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch b/pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch deleted file mode 100644 index 576a14b1cb4..00000000000 --- a/pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mtools-4.0.20.org/charsetConv.c 2018-11-19 10:16:14.183820865 +0000 -+++ mtools-4.0.20/charsetConv.c 2018-11-19 10:15:39.808451465 +0000 -@@ -266,7 +266,7 @@ - free(cp); - } - --int dos_to_wchar(doscp_t *cp, char *dos, wchar_t *wchar, size_t len) -+int dos_to_wchar(doscp_t *cp, const char *dos, wchar_t *wchar, size_t len) - { - int i; - |