Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 079b01dbd7f9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 350aea893293
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Nov 19, 2018

  1. mtools: 4.0.19 -> 4.0.20 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mtools/versions
    @r-ryantm
    r-ryantm committed Nov 19, 2018
    Copy the full SHA
    4f99f26 View commit details

  2. mtools: fix darwin build

    @Mic92
    Mic92 committed Nov 19, 2018
    Copy the full SHA
    47a239a View commit details

  3. Merge pull request #50681 from r-ryantm/auto-update/mtools 

    mtools: 4.0.19 -> 4.0.20
    @Mic92
    Mic92 authored Nov 19, 2018
    Copy the full SHA
    350aea8 View commit details
Showing with 15 additions and 3 deletions.
  1. +4 −3 pkgs/tools/filesystems/mtools/default.nix
  2. +11 −0 pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch
7 changes: 4 additions & 3 deletions pkgs/tools/filesystems/mtools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "mtools-4.0.19";
name = "mtools-4.0.20";

src = fetchurl {
url = "mirror://gnu/mtools/${name}.tar.bz2";
sha256 = "1pqhv5l4fqj1d3698vajkccz65xqxs3991wpylbw7hm1kqcrgh8v";
sha256 = "1vcahr9s6zv1hnrx2bgjnzcas2y951q90r1jvvv4q9v5kwfd6qb0";
};

# 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 = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
patches = [ ./fix-dos_to_wchar-declaration.patch ] ++
stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;

# fails to find X on darwin
configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";
11 changes: 11 additions & 0 deletions pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- 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;