flightgear: 2020.3.19 -> 2024.1.1 (#386331)

authored by 7c6f434c and committed by GitHub f5a7af83 c8d916bc

+22 -17
+7 -6
pkgs/by-name/si/simgear/package.nix
··· 1 { 2 lib, 3 stdenv, 4 - fetchurl, 5 plib, 6 libglut, 7 xorgproto, ··· 27 curl, 28 }: 29 let 30 - version = "2020.3.19"; 31 - shortVersion = builtins.substring 0 6 version; 32 in 33 stdenv.mkDerivation rec { 34 pname = "simgear"; 35 inherit version; 36 37 - src = fetchurl { 38 - url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; 39 - sha256 = "sha256-O5N8W5RCJHjl15EUvc1seOQ6Cm/7qXVEqG1EHD+ejDo="; 40 }; 41 42 nativeBuildInputs = [ cmake ];
··· 1 { 2 lib, 3 stdenv, 4 + fetchFromGitLab, 5 plib, 6 libglut, 7 xorgproto, ··· 27 curl, 28 }: 29 let 30 + version = "2024.1.1"; 31 in 32 stdenv.mkDerivation rec { 33 pname = "simgear"; 34 inherit version; 35 36 + src = fetchFromGitLab { 37 + owner = "flightgear"; 38 + repo = "simgear"; 39 + tag = "v${version}"; 40 + hash = "sha256-hOA/q/cTsqRy82rTAXRxyHBDdw93TW9UL+K5Jq5b/08="; 41 }; 42 43 nativeBuildInputs = [ cmake ];
+15 -11
pkgs/games/flightgear/default.nix
··· 1 { 2 lib, 3 stdenv, 4 - fetchurl, 5 wrapQtAppsHook, 6 libglut, 7 freealut, ··· 28 udev, 29 fltk13, 30 apr, 31 - makeDesktopItem, 32 qtbase, 33 qtdeclarative, 34 glew, 35 curl, 36 }: 37 38 let 39 - version = "2020.3.19"; 40 - shortVersion = builtins.substring 0 6 version; 41 data = stdenv.mkDerivation rec { 42 pname = "flightgear-data"; 43 inherit version; 44 45 - src = fetchurl { 46 - url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz"; 47 - sha256 = "sha256-863EnNBU+rYTdxHwMV6HbBu99lO6H3mKGuyumm6YR5U="; 48 }; 49 50 dontUnpack = true; 51 52 installPhase = '' 53 mkdir -p "$out/share/FlightGear" 54 - tar xf "${src}" -C "$out/share/FlightGear/" --strip-components=1 55 ''; 56 }; 57 in ··· 60 # inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src` 61 inherit version data; 62 63 - src = fetchurl { 64 - url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; 65 - sha256 = "sha256-Fn0I3pzA9yIYs3myPNflbH9u4Y19VZUS2lGjvWfzjm4="; 66 }; 67 68 nativeBuildInputs = [ ··· 95 fltk13 96 apr 97 qtbase 98 glew 99 qtdeclarative 100 curl
··· 1 { 2 lib, 3 stdenv, 4 + fetchFromGitLab, 5 wrapQtAppsHook, 6 libglut, 7 freealut, ··· 28 udev, 29 fltk13, 30 apr, 31 qtbase, 32 + qtquickcontrols2, 33 qtdeclarative, 34 glew, 35 curl, 36 }: 37 38 let 39 + version = "2024.1.1"; 40 data = stdenv.mkDerivation rec { 41 pname = "flightgear-data"; 42 inherit version; 43 44 + src = fetchFromGitLab { 45 + owner = "flightgear"; 46 + repo = "fgdata"; 47 + tag = "v${version}"; 48 + hash = "sha256-PdqsIZw9mSrvnqqB/fVFjWPW9njhXLWR/2LQCMoBLQI="; 49 }; 50 51 dontUnpack = true; 52 53 installPhase = '' 54 mkdir -p "$out/share/FlightGear" 55 + cp ${src}/* -a "$out/share/FlightGear/" 56 ''; 57 }; 58 in ··· 61 # inheriting data for `nix-prefetch-url -A pkgs.flightgear.data.src` 62 inherit version data; 63 64 + src = fetchFromGitLab { 65 + owner = "flightgear"; 66 + repo = "flightgear"; 67 + tag = "v${version}"; 68 + hash = "sha256-h4N18VAbJGQSBKA+eEQxej5e5MEwAcZpvH+dpTypM+k="; 69 }; 70 71 nativeBuildInputs = [ ··· 98 fltk13 99 apr 100 qtbase 101 + qtquickcontrols2 102 glew 103 qtdeclarative 104 curl