public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91793 from turion/91787_flightgear 

flightgear: 2019.1.1 -> 2020.1.3, simgear: 2020.1.{1 -> 3}
This commit is contained in:
Michael Raskin 2020-07-01 14:37:37 +00:00 committed by GitHub
parent ec5ef6bd2b 637fa6901f
commit be977642da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/simgear/default.nix
View File

@ -4,7 +4,7 @@
, curl , curl
}: }:
let let
version = "2020.1.1"; version = "2020.1.3";
shortVersion = builtins.substring 0 6 version; shortVersion = builtins.substring 0 6 version;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "1z52r28xg05q6hdlh4szzfjlpgkvbdyn2dpaji9b57y58ccrqsfh"; sha256 = "1l8kiicm0klbx0b05994vqd8a8wj7k0djbbg41a6i3q5d17jrnk6";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

8
pkgs/games/flightgear/default.nix
View File

@ -6,15 +6,15 @@
}: }:
let let
version = "2019.1.1"; version = "2020.1.2";
shortVersion = builtins.substring 0 6 version; shortVersion = builtins.substring 0 6 version;
data = stdenv.mkDerivation rec { data = stdenv.mkDerivation rec {
pname = "flightgear-base"; pname = "flightgear-data";
inherit version; inherit version;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
sha256 = "14zm0hzshbca4ych72631hpc4pw2w24zib62ri3lwm8nz6j63qhf"; sha256 = "0ldsjb54k8nb99h6n4f4x20nawd2pa0a8skkwkrgckdpmdv0zwyk";
}; };
phases = [ "installPhase" ]; phases = [ "installPhase" ];
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "189wal08p9lrz757pmazxnf85sfymsqrm3nfvdad95pfp6bg7pyi"; sha256 = "1770kgwa7z70sx6da9x1q9cszpd3ywz6nn8jrb6xv8ldjqcpqpvb";
}; };
# Of all the files in the source and data archives, there doesn't seem to be # Of all the files in the source and data archives, there doesn't seem to be