From 8ca353fbacfb006c3bb51bcb920d7c0cdcd25ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Fri, 16 Sep 2022 14:40:02 +0200 Subject: [PATCH 1/3] gildas: 20211101_a -> 20220601_a This update fixes the build on darwin. --- pkgs/applications/science/astronomy/gildas/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 1c0b1eeefe69..683601ccabcd 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 = "nov21a"; - version = "20211101_a"; + srcVersion = "jun22a"; + version = "20220601_a"; pname = "gildas"; 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.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "0fb6iqwh4hm7v7sib7sx98vxdavn3d6q2gq6y6vxg2z29g31f8g2"; + sha256 = "sha256-RsU8vGBLbCLfQ0c2hMKpa3n05TYuR8HvHT0GaJBmiBQ="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { ''; meta = { - broken = stdenv.isDarwin; description = "Radioastronomy data analysis software"; longDescription = '' GILDAS is a collection of state-of-the-art software From 7808276611de4dbfe66873d6b4285b878916a13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Wed, 12 Oct 2022 16:42:29 +0200 Subject: [PATCH 2/3] gildas: 20220601_a -> 20221001_b --- pkgs/applications/science/astronomy/gildas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 683601ccabcd..82efb5086446 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 = "jun22a"; - version = "20220601_a"; + srcVersion = "oct22b"; + version = "20221001_b"; pname = "gildas"; 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.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-RsU8vGBLbCLfQ0c2hMKpa3n05TYuR8HvHT0GaJBmiBQ="; + sha256 = "sha256-MGfU2gzBbJ8ITpU7OiwCaHbi8s9Y6gvcAvSUuEZjfqk="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; From a332c25bb366021d0db9c047497e3fbb79231158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Thu, 13 Oct 2022 15:45:20 +0200 Subject: [PATCH 3/3] gildas: mark as broken on aarch64-darwin --- pkgs/applications/science/astronomy/gildas/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 82efb5086446..0a98c1b7a03b 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { license = lib.licenses.free; maintainers = [ lib.maintainers.bzizou lib.maintainers.smaret ]; platforms = lib.platforms.all; + broken = stdenv.isDarwin && stdenv.isAarch64; }; }