summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLancelot SIX <lsix+github@lancelotsix.com>2019-12-25 20:50:28 +0100
committerAlyssa Ross <hi@alyssa.is>2019-12-25 19:50:28 +0000
commit241e1fd9d0104fa2cea25739810ec58ab8ffd820 (patch)
treeeae67d0cc8c8b0288d2ca2e35cebd02cb2b58b80 /pkgs
parentf8dec92f0456adc32f12121963d6fc794c82e771 (diff)
downloadnixpkgs-241e1fd9d0104fa2cea25739810ec58ab8ffd820.tar
nixpkgs-241e1fd9d0104fa2cea25739810ec58ab8ffd820.tar.gz
nixpkgs-241e1fd9d0104fa2cea25739810ec58ab8ffd820.tar.bz2
nixpkgs-241e1fd9d0104fa2cea25739810ec58ab8ffd820.tar.lz
nixpkgs-241e1fd9d0104fa2cea25739810ec58ab8ffd820.tar.xz
nixpkgs-241e1fd9d0104fa2cea25739810ec58ab8ffd820.tar.zst
nixpkgs-241e1fd9d0104fa2cea25739810ec58ab8ffd820.zip
nano: 4.6 -> 4.7
See https://lists.gnu.org/archive/html/info-gnu/2019-12/msg00005.html
for release information.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/nano/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 7b2992201fc..4197792d736 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "nano";
-  version = "4.6";
+  version = "4.7";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    sha256 = "1s98jsvkfar6qmd5n5l1n1k59623dnc93ciyvlhxjkvpad0kmb4v";
+    sha256 = "1x9nqy2kgaz6087p63i71gdjsqbdc9jjpx1ymlyclfakvsby3h2q";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
@@ -38,15 +38,6 @@ in stdenv.mkDerivation rec {
     (stdenv.lib.enableFeature enableTiny "tiny")
   ];
 
-    patches = [
-      (fetchurl {
-        # fix compilation on macOS, where 'st_mtim' is unknown
-        # upstream patch not in 4.6
-        url = "https://git.savannah.gnu.org/cgit/nano.git/patch/?id=f516cddce749c3bf938271ef3182b9169ac8cbcc";
-        sha256 = "0gqymvr5vxxypr7y3sm252rsi4gjqp597l01x0lkxyvxsn45a4sx";
-      })
-  ];
-
   postInstall = ''
     cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/
   '';