From 91583234636bdea204b12339945e138cbc0fabf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Sun, 24 May 2026 22:23:18 -0400 Subject: [PATCH 1/7] simgear: 2024.1.5 -> 2024.1.6-rc1 --- pkgs/by-name/si/simgear/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix index c7c0682e52fb..3ad9309f076f 100644 --- a/pkgs/by-name/si/simgear/package.nix +++ b/pkgs/by-name/si/simgear/package.nix @@ -27,18 +27,16 @@ curl, c-ares, }: -let - version = "2024.1.5"; -in + stdenv.mkDerivation (finalAttrs: { pname = "simgear"; - inherit version; + version = "2024.1.6-rc1"; src = fetchFromGitLab { owner = "flightgear"; repo = "simgear"; tag = finalAttrs.version; - hash = "sha256-WONlVdfDWIcoj/UfcFA4Vw5edlgr0vlT/fjIPDti7fk="; + hash = "sha256-uj8yVJNjAsrO0ydL5xMVtRRqx+5mXZ60qrPW2BAHl0g="; }; nativeBuildInputs = [ cmake ]; From 6e04754089b41362e8a527a1f2fa0a37fadd5213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Sun, 24 May 2026 22:28:12 -0400 Subject: [PATCH 2/7] flightgear: port to finalattrs, move data into passthru --- pkgs/by-name/fl/flightgear/package.nix | 53 +++++++++++++------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index 514705cf3d3a..8c4d603e457a 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -35,36 +35,16 @@ }: let - version = "2024.1.5"; - data = stdenv.mkDerivation rec { - pname = "flightgear-data"; - inherit version; - - src = fetchFromGitLab { - owner = "flightgear"; - repo = "fgdata"; - tag = version; - hash = "sha256-8B5wSYjkWuPEySpqBiprZ+jrHy01HA9+iX70wNAn81s="; - }; - - dontUnpack = true; - - installPhase = '' - mkdir -p "$out/share/FlightGear" - cp ${src}/* -a "$out/share/FlightGear/" - ''; - }; openscenegraph = callPackage ./openscenegraph-flightgear.nix { }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "flightgear"; - # inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src` - inherit version data; + version = "2024.1.5"; src = fetchFromGitLab { owner = "flightgear"; repo = "flightgear"; - tag = version; + tag = finalAttrs.version; hash = "sha256-sORiO0SDChIVWIhGKelm7IE/cZ40gMqlZ1OoZZna7kI="; }; @@ -111,7 +91,7 @@ stdenv.mkDerivation rec { lib.cmakeFeature "CMAKE_OSX_DEPLOYMENT_TARGET" "11.0" ); - qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ]; + qtWrapperArgs = [ "--set FG_ROOT ${finalAttrs.passthru.data}/share/FlightGear" ]; postInstall = '' # Remove redundant AppImage artifacts @@ -127,7 +107,28 @@ stdenv.mkDerivation rec { ln -s "$out/Applications/FlightGear.app/Contents/MacOS/FlightGear" "$out/bin/fgfs" ''; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + + data = stdenv.mkDerivation { + pname = "flightgear-data"; + inherit (finalAttrs) version; + + src = fetchFromGitLab { + owner = "flightgear"; + repo = "fgdata"; + tag = finalAttrs.version; + hash = "sha256-8B5wSYjkWuPEySpqBiprZ+jrHy01HA9+iX70wNAn81s="; + }; + + dontUnpack = true; + + installPhase = '' + mkdir -p "$out/share/FlightGear" + cp -a "$src"/* "$out/share/FlightGear/" + ''; + }; + }; meta = { description = "Flight simulator"; @@ -140,4 +141,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; mainProgram = "fgfs"; }; -} +}) From f5aefc46e4e18490c14dbc058cc136d5a98803ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Sun, 24 May 2026 22:28:27 -0400 Subject: [PATCH 3/7] flightgear: 2024.1.5 -> 2024.1.6-rc1 --- pkgs/by-name/fl/flightgear/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index 8c4d603e457a..b1b0dafc4637 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "flightgear"; - version = "2024.1.5"; + version = "2024.1.6-rc1"; src = fetchFromGitLab { owner = "flightgear"; repo = "flightgear"; tag = finalAttrs.version; - hash = "sha256-sORiO0SDChIVWIhGKelm7IE/cZ40gMqlZ1OoZZna7kI="; + hash = "sha256-YYWDLCZ+2g4sWrSZJ+EvFCPH/IIYWD0wKzcslqw9VSs="; }; nativeBuildInputs = [ @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "flightgear"; repo = "fgdata"; tag = finalAttrs.version; - hash = "sha256-8B5wSYjkWuPEySpqBiprZ+jrHy01HA9+iX70wNAn81s="; + hash = "sha256-B7WCEMrHtSW4Yk2HM+ZjgKt5GeQrSmvxKITqAYXKSuw="; }; dontUnpack = true; From 4412f59e4adbdfdfe1d851a3caecb788e3598132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Sun, 24 May 2026 22:28:33 -0400 Subject: [PATCH 4/7] flightgear: add maintainer --- pkgs/by-name/fl/flightgear/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index b1b0dafc4637..76cfc89b9f53 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ raskin kirillrdy + philocalyst ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; hydraPlatforms = [ ]; # disabled from hydra because it's so big From 248c01ba5cfff958e61f0da7ad4dfaf8d1282e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Sun, 24 May 2026 22:28:40 -0400 Subject: [PATCH 5/7] flightgear: expand meta --- pkgs/by-name/fl/flightgear/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index 76cfc89b9f53..cec1a8b4e162 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -131,7 +131,9 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Flight simulator"; + description = "A free and highly sophisticated flight simulator"; + homepage = "https://www.flightgear.org/"; + changelog = "https://www.flightgear.org/download/releases/2024-1-5"; # TODO: Use finalattrs when back on stable tracking maintainers = with lib.maintainers; [ raskin kirillrdy From 296d2c9a75a823effefee74947bf00ed7376aa4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Sun, 24 May 2026 22:29:00 -0400 Subject: [PATCH 6/7] openscenegraph-flightgear: update rev --- pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix index 7cbbb965b2de..b8f3579f758f 100644 --- a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix +++ b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix @@ -32,9 +32,8 @@ stdenv.mkDerivation { src = fetchFromGitLab { owner = "flightgear"; repo = "openscenegraph"; - # release/2024-build as of 2025-08-08 - rev = "a4ea8ec535cc969e31e2026b13be147dcb978689"; - sha256 = "sha256-wnxm4G40j2e6Paqx0vfAR4s4L7esfCHcgxUJWNxk1SM="; + rev = "b5895abe0d94a57839929d38b5681dc8e796a8a0"; + hash = "sha256-FaTn+QZa1qAU9DNhBjQvBLu/Z9q2liatBbsxY8a0hUI="; }; nativeBuildInputs = [ From e054533024ca8c4b0353d16328671dd320620192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?= =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?= =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= Date: Sun, 24 May 2026 22:29:09 -0400 Subject: [PATCH 7/7] openscenegraph-flightgear: expand meta --- .../fl/flightgear/openscenegraph-flightgear.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix index b8f3579f758f..655fa0ed57d9 100644 --- a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix +++ b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix @@ -83,13 +83,19 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isDarwin (lib.cmakeFeature "OSG_WINDOWING_SYSTEM" "Cocoa"); meta = { - description = "3D graphics toolkit"; - homepage = "http://www.openscenegraph.org/"; + description = "3D graphics toolkit (FlightGear fork)"; + homepage = "https://gitlab.com/flightgear/openscenegraph"; + changelog = "https://gitlab.com/flightgear/openscenegraph/-/commits/release/2024-build"; maintainers = with lib.maintainers; [ aanderse raskin ]; platforms = with lib.platforms; linux ++ darwin; - license = "OpenSceneGraph Public License - free LGPL-based license"; + + # This is a fork of openscenegraph, mirrored licenses + license = with lib.licenses; [ + lgpl21Only + wxWindowsException31 + ]; }; }