diff options
| author | Sebastien Maret <sebastien.maret@icloud.com> | 2018-09-25 16:18:53 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-25 16:18:53 +0200 |
| commit | 1e67ff3f05547655291a79e3262309a7b38e1543 (patch) | |
| tree | 064e94c3d1161d5238312e11fab6ead9c2e63e24 /pkgs/applications/science/astronomy | |
| parent | b97ebadd02df4932cbbffd06c443ee569ce01798 (diff) | |
| download | nixlib-1e67ff3f05547655291a79e3262309a7b38e1543.tar nixlib-1e67ff3f05547655291a79e3262309a7b38e1543.tar.gz nixlib-1e67ff3f05547655291a79e3262309a7b38e1543.tar.bz2 nixlib-1e67ff3f05547655291a79e3262309a7b38e1543.tar.lz nixlib-1e67ff3f05547655291a79e3262309a7b38e1543.tar.xz nixlib-1e67ff3f05547655291a79e3262309a7b38e1543.tar.zst nixlib-1e67ff3f05547655291a79e3262309a7b38e1543.zip | |
gildas: 20180801_a -> 20180901_a (#46159)
* gildas: 20180801_a -> 20180801_b - Update gildas - Remove a patch that has been applied upstream * gildas: 20180801_b -> 20180901_a
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/return-error-code.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 82575d9c6ff0..4de4752aefc1 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 = "aug18a"; - version = "20180801_a"; + srcVersion = "sep18a"; + version = "20180901_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 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1"; + sha256 = "c9110636431a94e5b1ff5af876c25ad0a991cf62b94d4c42ce07b048eb93d956"; }; enableParallelBuilding = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; - patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ]; + patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./gag-font-bin-rule.patch ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; diff --git a/pkgs/applications/science/astronomy/gildas/return-error-code.patch b/pkgs/applications/science/astronomy/gildas/return-error-code.patch deleted file mode 100644 index f0bd7da9354e..000000000000 --- a/pkgs/applications/science/astronomy/gildas/return-error-code.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --new-file -r -u gildas-src-dec17a.orig/admin/gildas-env.sh gildas-src-dec17a/admin/gildas-env.sh ---- gildas-src-dec17a.orig/admin/gildas-env.sh 2017-10-24 11:39:18.000000000 +0200 -+++ gildas-src-dec17a/admin/gildas-env.sh 2017-12-01 11:17:32.051953670 +0100 -@@ -1010,6 +1010,9 @@ - gagenv_message "$gagenv_errors error(s) and $gagenv_warnings warning(s) detected" - if [ $gagenv_errors -ne 0 ]; then - gagenv_message "GILDAS will not compile" -+ gagenv_clean -+ echo -+ \return 1 - elif [ $gagenv_warnings -ne 0 ]; then - gagenv_message "GILDAS will compile with some optional features disabled" - else |