public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtools: 4.0.20 -> 4.0.21

Browse Source 
* 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
This commit is contained in:
Will Dietz 2018-11-24 15:34:57 -06:00 committed by Renaud
parent 11e2f31532
commit 51b526d86e
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/filesystems/mtools/default.nix
View File

@ -1,17 +1,14 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mtools-4.0.20"; name = "mtools-4.0.21";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/mtools/${name}.tar.bz2"; url = "mirror://gnu/mtools/${name}.tar.bz2";
sha256 = "1vcahr9s6zv1hnrx2bgjnzcas2y951q90r1jvvv4q9v5kwfd6qb0"; sha256 = "1kybydx74qgbwpnjvjn49msf8zipchl43d4cq8zzwcyvfkdzw7h2";
}; };
# Prevents errors such as "mainloop.c:89:15: error: expected ')'" patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
# 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;
# fails to find X on darwin # fails to find X on darwin
configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x"; configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";
@ -19,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
meta = with stdenv.lib; { 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"; description = "Utilities to access MS-DOS disks";
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.gpl3; license = licenses.gpl3;

11
pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch
View File

@ -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;