From b4599987e3ce5a3a83e1f6720f741ed359752603 Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr>
Date: Mon, 13 Aug 2018 15:17:15 +0200
Subject: [PATCH] gildas: 20180701_a -> 20180801_a

---
 .../science/astronomy/gildas/default.nix        | 10 +++++-----
 .../science/astronomy/gildas/mod.patch          | 17 -----------------
 2 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/applications/science/astronomy/gildas/mod.patch

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 7ede379fb499..ee19077065e0 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,13 +7,13 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "jul18a";
-  version = "20180701_a";
+  srcVersion = "aug18a";
+  version = "20180801_a";
   name = "gildas-${version}";
 
   src = fetchurl {
-    url = "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz";
-    sha256 = "0kl3zf6b1kv8hgsfrarsnm2gnrdax3vi8f856249y4nxsa7lbv2i";
+    url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz";
+    sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1";
   };
 
   enableParallelBuilding = true;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
 
-  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./mod.patch ./aarch64.patch ];
+  patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ];
 
   configurePhase=''
     substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out
diff --git a/pkgs/applications/science/astronomy/gildas/mod.patch b/pkgs/applications/science/astronomy/gildas/mod.patch
deleted file mode 100644
index c917b4674f13..000000000000
--- a/pkgs/applications/science/astronomy/gildas/mod.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ruN gildas-src-jul18a/admin/Makefile.build gildas-src-jul18a.mod/admin/Makefile.build
---- gildas-src-jul18a/admin/Makefile.build	2018-06-14 14:36:54.000000000 +0200
-+++ gildas-src-jul18a.mod/admin/Makefile.build	2018-07-06 13:31:46.000000000 +0200
-@@ -291,6 +291,13 @@
- 	win-$(LIB_IDENTITY)-und.def -o $@ $(FLDLIBS) $(LIB_DEPENDS) $(ADD_LIBS) $(SYS_LIBS))
- endif
- 
-+# Dummy rules for modules just so that make consider the module a
-+# valid dependency when first parsing the makefiles. This rule should
-+# never be applied as the modules are a by-product of the compilation
-+# of the object
-+$(builddir)/%.mod:
-+	echo "dummy" > /dev/null
-+
- # Fortran executables
- $(bindir)/% : $(builddir)/%.o | $(bindir)
- 	$(FC) $(ALL_FLDFLAGS) $< $(OBJECTS) -o $@ \