From 784740aee0657a556f44fc465405a4f28401ffe0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 21 Jan 2020 18:13:53 +0300 Subject: [PATCH 1/3] mc: 4.8.23 -> 4.8.24 --- pkgs/tools/misc/mc/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 168afc7efedd..42e155fcaf29 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -19,13 +19,23 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.23"; + version = "4.8.24"; src = fetchurl { - url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx"; + url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; + sha256 = "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5"; }; + preConfigure = '' + for f in \ + ./configure \ + ./config/ltmain.sh \ + ./m4/libtool.m4 \ + ; do + substituteInPlace $f --replace /usr/bin/file ${file}/bin/file + done + ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ @@ -58,8 +68,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File Manager and User Shell for the GNU Project"; - downloadPage = "http://www.midnight-commander.org/downloads/"; - homepage = "http://www.midnight-commander.org"; + downloadPage = "https://www.midnight-commander.org/downloads/"; + homepage = https://www.midnight-commander.org; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; From 841b89cac85398ca49591bc7d7bc21655a8aaf83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 14 Mar 2020 07:28:34 +0000 Subject: [PATCH 2/3] mc: add autoreconfHook instead of /usr/bin/file patch The error is still there but harmless. It should be rather fixed in autoconf than in every package that uses autotools. --- pkgs/tools/misc/mc/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 42e155fcaf29..60bc153c83f8 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -15,6 +15,7 @@ , libssh2 , openssl , coreutils +, autoreconfHook }: stdenv.mkDerivation rec { @@ -26,17 +27,7 @@ stdenv.mkDerivation rec { sha256 = "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5"; }; - preConfigure = '' - for f in \ - ./configure \ - ./config/ltmain.sh \ - ./m4/libtool.m4 \ - ; do - substituteInPlace $f --replace /usr/bin/file ${file}/bin/file - done - ''; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ file From 0ad2243c663fbd9b4482e47d4575b0cfaa5e6536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 14 Mar 2020 07:31:07 +0000 Subject: [PATCH 3/3] mc: quote urls --- pkgs/tools/misc/mc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 60bc153c83f8..07c5f9b35174 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -60,11 +60,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File Manager and User Shell for the GNU Project"; downloadPage = "https://www.midnight-commander.org/downloads/"; - homepage = https://www.midnight-commander.org; + homepage = "https://www.midnight-commander.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; - repositories.git = git://github.com/MidnightCommander/mc.git; + repositories.git = "https://github.com/MidnightCommander/mc.git"; updateWalker = true; }; }