diff options
| author | Sébastien Maret <sebastien.maret@univ-grenoble-alpes.fr> | 2023-02-14 10:44:51 +0100 |
|---|---|---|
| committer | Sébastien Maret <sebastien.maret@univ-grenoble-alpes.fr> | 2023-02-14 10:44:51 +0100 |
| commit | 9a5dbeaee1be86bb3b8af8ceea60ad3d5de030bf (patch) | |
| tree | 006774d3d4288f3ec82d65d1a7774d27d9b2817e | |
| parent | cc443761cbe4abfb6b0808c48de99622ffab0f14 (diff) | |
| download | nixpkgs-9a5dbeaee1be86bb3b8af8ceea60ad3d5de030bf.tar nixpkgs-9a5dbeaee1be86bb3b8af8ceea60ad3d5de030bf.tar.gz nixpkgs-9a5dbeaee1be86bb3b8af8ceea60ad3d5de030bf.tar.bz2 nixpkgs-9a5dbeaee1be86bb3b8af8ceea60ad3d5de030bf.tar.lz nixpkgs-9a5dbeaee1be86bb3b8af8ceea60ad3d5de030bf.tar.xz nixpkgs-9a5dbeaee1be86bb3b8af8ceea60ad3d5de030bf.tar.zst nixpkgs-9a5dbeaee1be86bb3b8af8ceea60ad3d5de030bf.zip | |
gildas: 20221001_b -> 20230201_a
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/science/astronomy/gildas/python-ldflags.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 703416f074a..50eee7d3aa3 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 = "oct22b"; - version = "20221001_b"; + srcVersion = "feb23a"; + version = "20230201_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 = "sha256-MGfU2gzBbJ8ITpU7OiwCaHbi8s9Y6gvcAvSUuEZjfqk="; + sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); - patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./python-ldflags.patch ]; + patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ]; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; diff --git a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch b/pkgs/applications/science/astronomy/gildas/python-ldflags.patch deleted file mode 100644 index 3bbcb9f36e9..00000000000 --- a/pkgs/applications/science/astronomy/gildas/python-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN gildas-src-oct22b/admin/python-config-ldflags.py gildas-src-oct22b.patched/admin/python-config-ldflags.py ---- gildas-src-oct22b/admin/python-config-ldflags.py 2022-10-03 14:16:33.000000000 +0200 -+++ gildas-src-oct22b.patched/admin/python-config-ldflags.py 2022-10-19 22:03:53.000000000 +0200 -@@ -32,7 +32,7 @@ - libs.insert(0, '-L' + getvar('LIBDIR')) - - # Framework (specific for Mac) --if not getvar('PYTHONFRAMEWORK'): -- libs.extend(getvar('LINKFORSHARED').split()) -+#if not getvar('PYTHONFRAMEWORK'): -+# libs.extend(getvar('LINKFORSHARED').split()) - - print(' '.join(libs)) |