From 0eb5186106788909d672dfec8d4dfa8c286c114b Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Tue, 30 Mar 2021 15:53:26 -0500 Subject: [PATCH 1/4] treewide: move astro libraries into pkgs/development/libraries/science/astronomy --- .../cfitsio/darwin-rpath-universal.patch | 0 .../{ => science/astronomy}/cfitsio/default.nix | 0 .../{ => science/astronomy}/indilib/default.nix | 0 .../astronomy}/indilib/indi-3rdparty.nix | 0 .../{ => science/astronomy}/indilib/indi-full.nix | 0 .../astronomy}/indilib/indi-with-drivers.nix | 0 .../{ => science/astronomy}/libnova/default.nix | 0 .../astronomy}/stellarsolver/default.nix | 0 .../{ => science/astronomy}/wcslib/default.nix | 0 pkgs/top-level/all-packages.nix | 14 +++++++------- 10 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/libraries/{ => science/astronomy}/cfitsio/darwin-rpath-universal.patch (100%) rename pkgs/development/libraries/{ => science/astronomy}/cfitsio/default.nix (100%) rename pkgs/development/libraries/{ => science/astronomy}/indilib/default.nix (100%) rename pkgs/development/libraries/{ => science/astronomy}/indilib/indi-3rdparty.nix (100%) rename pkgs/development/libraries/{ => science/astronomy}/indilib/indi-full.nix (100%) rename pkgs/development/libraries/{ => science/astronomy}/indilib/indi-with-drivers.nix (100%) rename pkgs/development/libraries/{ => science/astronomy}/libnova/default.nix (100%) rename pkgs/development/libraries/{ => science/astronomy}/stellarsolver/default.nix (100%) rename pkgs/development/libraries/{ => science/astronomy}/wcslib/default.nix (100%) diff --git a/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch b/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch similarity index 100% rename from pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch rename to pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix similarity index 100% rename from pkgs/development/libraries/cfitsio/default.nix rename to pkgs/development/libraries/science/astronomy/cfitsio/default.nix diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix similarity index 100% rename from pkgs/development/libraries/indilib/default.nix rename to pkgs/development/libraries/science/astronomy/indilib/default.nix diff --git a/pkgs/development/libraries/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix similarity index 100% rename from pkgs/development/libraries/indilib/indi-3rdparty.nix rename to pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix diff --git a/pkgs/development/libraries/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix similarity index 100% rename from pkgs/development/libraries/indilib/indi-full.nix rename to pkgs/development/libraries/science/astronomy/indilib/indi-full.nix diff --git a/pkgs/development/libraries/indilib/indi-with-drivers.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix similarity index 100% rename from pkgs/development/libraries/indilib/indi-with-drivers.nix rename to pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/science/astronomy/libnova/default.nix similarity index 100% rename from pkgs/development/libraries/libnova/default.nix rename to pkgs/development/libraries/science/astronomy/libnova/default.nix diff --git a/pkgs/development/libraries/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix similarity index 100% rename from pkgs/development/libraries/stellarsolver/default.nix rename to pkgs/development/libraries/science/astronomy/stellarsolver/default.nix diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix similarity index 100% rename from pkgs/development/libraries/wcslib/default.nix rename to pkgs/development/libraries/science/astronomy/wcslib/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ac76781243f..fb2616f7dffa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14084,7 +14084,7 @@ in fstrm = callPackage ../development/libraries/fstrm { }; - cfitsio = callPackage ../development/libraries/cfitsio { }; + cfitsio = callPackage ../development/libraries/science/astronomy/cfitsio { }; fontconfig = callPackage ../development/libraries/fontconfig { }; @@ -14782,9 +14782,9 @@ in indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { }; indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { }; - indilib = callPackage ../development/libraries/indilib { }; - indi-3rdparty = callPackage ../development/libraries/indilib/indi-3rdparty.nix { }; - indi-full = callPackage ../development/libraries/indilib/indi-full.nix { }; + indilib = callPackage ../development/libraries/science/astronomy/indilib { }; + indi-3rdparty = callPackage ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { }; + indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; inih = callPackage ../development/libraries/inih { }; @@ -15743,7 +15743,7 @@ in libnih = callPackage ../development/libraries/libnih { }; - libnova = callPackage ../development/libraries/libnova { }; + libnova = callPackage ../development/libraries/science/astronomy/libnova { }; libnxml = callPackage ../development/libraries/libnxml { }; @@ -17618,7 +17618,7 @@ in waylandpp = callPackage ../development/libraries/waylandpp { }; - wcslib = callPackage ../development/libraries/wcslib { }; + wcslib = callPackage ../development/libraries/science/astronomy/wcslib { }; webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; @@ -29036,7 +29036,7 @@ in stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; - stellarsolver = libsForQt5.callPackage ../development/libraries/stellarsolver { }; + stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { }; astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; From ac3de55e62d86ba893edbf0548c489d5a79f31f2 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Tue, 30 Mar 2021 23:27:59 -0500 Subject: [PATCH 2/4] wcslib: adopt package --- .../science/astronomy/wcslib/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix index c12118a99de4..20cb277773f8 100644 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -1,8 +1,8 @@ -{ fetchurl, lib, stdenv, flex }: +{ lib, stdenv, fetchurl, flex }: stdenv.mkDerivation rec { - version = "7.3.1"; pname = "wcslib"; + version = "7.3.1"; buildInputs = [ flex ]; @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { - description = "World Coordinate System Library for Astronomy"; + meta = with lib; { homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; - - longDescription = ''Library for world coordinate systems for - spherical geometries and their conversion to image coordinate - systems. This is the standard library for this purpose in - astronomy.''; - - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.unix; + description = "World Coordinate System Library for Astronomy"; + longDescription = '' + Library for world coordinate systems for spherical geometries + and their conversion to image coordinate systems. This is the + standard library for this purpose in astronomy. + ''; + maintainers = with maintainers; [ hjones2199 ]; + license = licenses.lgpl3Plus; + platforms = platforms.unix; }; } From 41785b591cf911627b2904af891f10e39d923ae6 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Tue, 30 Mar 2021 23:33:20 -0500 Subject: [PATCH 3/4] wcslib: 7.3.1 -> 7.5 --- .../libraries/science/astronomy/wcslib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix index 20cb277773f8..b16ba1117f4e 100644 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.3.1"; - - buildInputs = [ flex ]; + version = "7.5"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 ="0p0bp3jll9v2094a8908vk82m7j7qkjqzkngm1r9qj1v6l6j5z6c"; + sha256 = "1536gmcpm6pckn9xrb6j8s4pm1vryjhzvhfaj9wx3jwxcpbdy0dw"; }; + buildInputs = [ flex ]; + prePatch = '' substituteInPlace GNUmakefile --replace 2775 0775 substituteInPlace C/GNUmakefile --replace 2775 0775 @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; - description = "World Coordinate System Library for Astronomy"; + description = "World Coordinate System library for astronomy"; longDescription = '' Library for world coordinate systems for spherical geometries and their conversion to image coordinate systems. This is the From e22c73504e9165ec64b5407aed89ac50e5dd4f78 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Wed, 31 Mar 2021 00:06:45 -0500 Subject: [PATCH 4/4] indilib: inherit meta information from base library in symlink env --- .../libraries/science/astronomy/indilib/indi-with-drivers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix index b34abfd95c1f..27ac86ddbadf 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix @@ -6,4 +6,5 @@ buildEnv { indilib ] ++ extraDrivers; + inherit (indilib) meta; }