diff options
| author | Sebastien Maret <sebastien.maret@icloud.com> | 2018-10-02 10:49:33 +0000 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-10-02 12:49:33 +0200 |
| commit | 34ac35dfc68abcdc2ce08c724f0ce32031403b77 (patch) | |
| tree | 857fd9cafa02004cf686f6db4b7c4f0404d7d029 /pkgs/applications/science/astronomy | |
| parent | ee3c0cf534ff175758dd8781f54cf5ae9be20644 (diff) | |
| download | nixlib-34ac35dfc68abcdc2ce08c724f0ce32031403b77.tar nixlib-34ac35dfc68abcdc2ce08c724f0ce32031403b77.tar.gz nixlib-34ac35dfc68abcdc2ce08c724f0ce32031403b77.tar.bz2 nixlib-34ac35dfc68abcdc2ce08c724f0ce32031403b77.tar.lz nixlib-34ac35dfc68abcdc2ce08c724f0ce32031403b77.tar.xz nixlib-34ac35dfc68abcdc2ce08c724f0ce32031403b77.tar.zst nixlib-34ac35dfc68abcdc2ce08c724f0ce32031403b77.zip | |
gildas: 20180901_a -> 20181001_a (#47657)
- Update gildas to the latest version - Remove a patch that has been applied upstream
Diffstat (limited to 'pkgs/applications/science/astronomy')
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch | 13 |
2 files changed, 4 insertions, 17 deletions
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 4de4752aefc1..dcb76320a9b5 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -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"; diff --git a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch b/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch deleted file mode 100644 index 61ddc37c7fd4..000000000000 --- a/pkgs/applications/science/astronomy/gildas/gag-font-bin-rule.patch +++ /dev/null @@ -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 |