gildas: 20180901_a -> 20181001_a (#47657)
- Update gildas to the latest version - Remove a patch that has been applied upstream
This commit is contained in:
parent
ee3c0cf534
commit
34ac35dfc6
@ -7,8 +7,8 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
srcVersion = "sep18a";
|
||||
version = "20180901_a";
|
||||
srcVersion = "oct18a";
|
||||
version = "20181001_a";
|
||||
name = "gildas-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
# source code of the previous release to a different directory
|
||||
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"
|
||||
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
|
||||
sha256 = "c9110636431a94e5b1ff5af876c25ad0a991cf62b94d4c42ce07b048eb93d956";
|
||||
sha256 = "091941a74kaw3xqsmqda7bj972cafi8ppj2c5xq0mca2c075dyfx";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ];
|
||||
|
||||
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ];
|
||||
patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
|
||||
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff -ruN gildas-src-aug18a/kernel/etc/Makefile gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile
|
||||
--- gildas-src-aug18a/kernel/etc/Makefile 2016-09-09 09:39:37.000000000 +0200
|
||||
+++ gildas-src-aug18a.gag-font-bin-rule/kernel/etc/Makefile 2018-09-04 12:03:11.000000000 +0200
|
||||
@@ -29,7 +29,8 @@
|
||||
|
||||
SEDEXE=sed -e 's?source tree?executable tree?g'
|
||||
|
||||
-$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey
|
||||
+$(datadir)/gag-font.bin: hershey-font.dat $(bindir)/hershey \
|
||||
+ $(gagintdir)/etc/gag.dico.gbl $(gagintdir)/etc/gag.dico.lcl
|
||||
ifeq ($(GAG_ENV_KIND)-$(GAG_TARGET_KIND),cygwin-mingw)
|
||||
$(bindir)/hershey `cygpath -w $(datadir)`/gag-font.bin
|
||||
else
|
Loading…
Reference in New Issue
Block a user