nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

gildas: 20180801_a -> 20180901_a (#46159)

Browse Source 
* gildas: 20180801_a -> 20180801_b

  - Update gildas
  - Remove a patch that has been applied upstream

* gildas: 20180801_b -> 20180901_a
This commit is contained in:
Sebastien Maret 2018-09-25 16:18:53 +02:00 committed by xeji
parent b97ebadd02
commit 1e67ff3f05
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/astronomy/gildas/default.nix
View File

@ -7,8 +7,8 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
srcVersion = "aug18a"; srcVersion = "sep18a";
version = "20180801_a"; version = "20180901_a";
name = "gildas-${version}"; name = "gildas-${version}";
src = fetchurl { src = fetchurl {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory # source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz" 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" ]; "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ];
sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1"; sha256 = "c9110636431a94e5b1ff5af876c25ad0a991cf62b94d4c42ce07b048eb93d956";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; 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"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";

13
pkgs/applications/science/astronomy/gildas/return-error-code.patch
View File

@ -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