Unverified Commit c6a3c278 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

stellarsolver: switch to qt6, by-name path, add myself to maintainers; kstars:... 

stellarsolver: switch to qt6, by-name path, add myself to maintainers; kstars: switch to qt6, by-name path, add myself to maintainers, 3.7.4 -> 3.7.5 (#373694)
parents 3a7002a4 635f5af9

pkgs/applications/science/astronomy/kstars/default.nix→pkgs/by-name/ks/kstars/package.nix

+40 −51
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  extra-cmake-modules,

  fetchurl,

  fetchFromGitLab,

  fetchpatch,

  kconfig,

  kdoctools,

  kguiaddons,

  ki18n,

  kinit,

  kiconthemes,

  kio,

  knewstuff,

  kplotting,

  kwidgetsaddons,

  kxmlgui,

  knotifyconfig,

  qtx11extras,

  qtwebsockets,

  qtkeychain,

  qtdatavis3d,

  wrapQtAppsHook,

  breeze-icons,

  libsecret,

  eigen,

  zlib,

  cfitsio,

  cmake,

  curl,

  eigen,

  gsl,

  indi-full,

  xplanet,

  kdePackages,

  libnova,

  libraw,

  gsl,

  wcslib,

  stellarsolver,

  libsecret,

  libxisf,

  curl,

  opencv,

  stellarsolver,

  wcslib,

  xplanet,

  zlib,

}:



let
@@ -69,54 +53,58 @@ in 


stdenv.mkDerivation (finalAttrs: {

  pname = "kstars";

  version = "3.7.4";

  version = "3.7.5";



  src = fetchurl {

    url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";

    hash = "sha256-WdVsPCwDQWW/NIRehuqk5f8rgtucAbGLSbmwZLMLiHM=";

    hash = "sha256-L9hyVfdgFlFfM6MyjR4bUa86FHPbVg7xBWPY8YSHUXw=";

  };



  nativeBuildInputs = [

  nativeBuildInputs = with kdePackages; [

    extra-cmake-modules

    kdoctools

    wrapQtAppsHook

    cmake

  ];

  buildInputs = [

  buildInputs = with kdePackages; [

    breeze-icons

    cfitsio

    curl

    eigen'

    gsl

    indi-full

    kconfig

    kdoctools

    kguiaddons

    ki18n

    kinit

    kiconthemes

    kio

    knewstuff

    knotifyconfig

    kplotting

    kwidgetsaddons

    kxmlgui

    knotifyconfig

    qtx11extras

    qtwebsockets

    qtkeychain

    qtdatavis3d

    breeze-icons

    libsecret

    eigen'

    zlib

    cfitsio

    indi-full

    xplanet

    libnova

    libraw

    gsl

    wcslib

    stellarsolver

    libsecret

    libxisf

    curl

    opencv

    qtdatavis3d

    qtkeychain

    qtsvg

    qtwayland

    qtwebsockets

    stellarsolver

    wcslib

    xplanet

    zlib

  ];



  cmakeFlags = [

    "-DINDI_PREFIX=${indi-full}"

    "-DXPLANET_PREFIX=${xplanet}"

  cmakeFlags = with lib.strings; [

    (cmakeBool "BUILD_QT5" false)

    (cmakeFeature "INDI_PREFIX" "${indi-full}")

    (cmakeFeature "XPLANET_PREFIX" "${xplanet}")

    (cmakeFeature "DATA_INSTALL_DIR" "$out/share/kstars/")

  ];



  meta = with lib; {
@@ -133,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: { 
    maintainers = with maintainers; [

      timput

      hjones2199

      returntoreality

    ];

  };

})

pkgs/development/libraries/science/astronomy/stellarsolver/default.nix→pkgs/by-name/st/stellarsolver/package.nix

+15 −10
Original line number Diff line number Diff line 
{

  lib,

  mkDerivation,

  stdenv,

  fetchFromGitHub,

  cmake,

  qtbase,

  qt6,

  cfitsio,

  gsl,

  wcslib,

  withTester ? false,

}:



mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "stellarsolver";

  version = "2.6";



  src = fetchFromGitHub {

    owner = "rlancaste";

    repo = pname;

    rev = version;

    repo = finalAttrs.pname;

    rev = finalAttrs.version;

    sha256 = "sha256-6WDiHaBhi9POtXynGU/eTeuqZSK81JJeuZv4SxOeVoE=";

  };



  nativeBuildInputs = [ cmake ];



  dontWrapQtApps = true;



  buildInputs = [

    qtbase

    qt6.qtbase

    cfitsio

    gsl

    wcslib

  ];



  cmakeFlags = [

    "-DBUILD_TESTER=${if withTester then "on" else "off"}"

    (lib.strings.cmakeBool "BUILD_TESTER" withTester)

    (lib.strings.cmakeBool "USE_QT5" false)

  ];



  meta = with lib; {

    homepage = "https://github.com/rlancaste/stellarsolver";

    description = "Astrometric plate solving library";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ hjones2199 ];

    maintainers = with maintainers; [

      hjones2199

      returntoreality

    ];

    platforms = platforms.unix;

  };

}
 
})

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -3868,8 +3868,6 @@ with pkgs; 














  ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { };



























  kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { };



























  ligo =















    let ocaml_p = ocaml-ng.ocamlPackages_4_14.overrideScope (self: super: {















      zarith = super.zarith.override { version = "1.13"; };










@@ -17280,8 +17278,6 @@ with pkgs;



























  stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { };



























  stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { };



























  tulip = libsForQt5.callPackage ../applications/science/misc/tulip { };





























  vite = libsForQt5.callPackage ../applications/science/misc/vite { };