Unverified Commit 4cf6be0b authored by Bjørn Forsman's avatar Bjørn Forsman Committed by GitHub
Browse files

flightgear: 2024.1.1 -> 2024.1.3 ; simgear: 2024.1.1 -> 2024.1.3 (#473497)

parents e0848e60 81cbc50e

pkgs/by-name/fl/flightgear/package.nix

+10 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
}:



let

  version = "2024.1.1";

  version = "2024.1.3";

  data = stdenv.mkDerivation rec {

    pname = "flightgear-data";

    inherit version;
@@ -41,8 +41,8 @@ let 
    src = fetchFromGitLab {

      owner = "flightgear";

      repo = "fgdata";

      tag = "v${version}";

      hash = "sha256-PdqsIZw9mSrvnqqB/fVFjWPW9njhXLWR/2LQCMoBLQI=";

      tag = "${version}";

      hash = "sha256-LNHO/W8p4b8fYcehdfVecldKQ9uJp1zlg60xdgDC45c=";

    };



    dontUnpack = true;
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitLab {

    owner = "flightgear";

    repo = "flightgear";

    tag = "v${version}";

    hash = "sha256-h4N18VAbJGQSBKA+eEQxej5e5MEwAcZpvH+dpTypM+k=";

    tag = "${version}";

    hash = "sha256-m4bbWwMXwKJrMkb6svGrIZhcsPghrTMgFs8JCx3Wn/A=";

  };



  nativeBuildInputs = [
@@ -104,6 +104,11 @@ stdenv.mkDerivation rec { 


  qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ];



  postInstall = ''

    # Remove redundant AppImage artifacts

    rm -rf "$out/appdir"

  '';



  meta = {

    description = "Flight simulator";

    maintainers = with lib.maintainers; [ raskin ];

pkgs/by-name/si/simgear/package.nix

+6 −3
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ 
  apr,

  xz,

  curl,

  c-ares,

}:

let

  version = "2024.1.1";

  version = "2024.1.3";

in

stdenv.mkDerivation rec {

  pname = "simgear";
@@ -36,8 +37,8 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitLab {

    owner = "flightgear";

    repo = "simgear";

    tag = "v${version}";

    hash = "sha256-hOA/q/cTsqRy82rTAXRxyHBDdw93TW9UL+K5Jq5b/08=";

    tag = "${version}";

    hash = "sha256-1zbw/lIjTbVwhxHPvXRlxPmYJeWmKvPE/RDrTL0PXb4=";

  };



  nativeBuildInputs = [ cmake ];
@@ -66,6 +67,8 @@ stdenv.mkDerivation rec { 
    xz

  ];



  propagatedBuildInputs = [ c-ares ];



  meta = {

    description = "Simulation construction toolkit";

    homepage = "https://wiki.flightgear.org/SimGear";