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: 11e2f31532e7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 51b526d86e35
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 24, 2018

  1. 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
    @dtzWill @c0bw3b
    dtzWill authored and c0bw3b committed Nov 24, 2018
    Copy the full SHA
    51b526d View commit details
Showing with 4 additions and 18 deletions.
  1. +4 −7 pkgs/tools/filesystems/mtools/default.nix
  2. +0 −11 pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch
11 changes: 4 additions & 7 deletions pkgs/tools/filesystems/mtools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
{ 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";

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;
11 changes: 0 additions & 11 deletions pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch
View file

This file was deleted.