Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 40705f124bcb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2bb504e1f5cc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 17, 2020

  1. simgear: 2020.1.3 -> 2020.3.4

    @wucke13 @veprbl
    wucke13 authored and veprbl committed Dec 17, 2020
    Copy the full SHA
    c54358f View commit details

  2. flightgear: 2020.1.3 -> 2020.3.4

    @wucke13 @veprbl
    wucke13 authored and veprbl committed Dec 17, 2020
    Copy the full SHA
    2bb504e View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/development/libraries/simgear/default.nix
  2. +3 −3 pkgs/games/flightgear/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/simgear/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, curl
}:
let
version = "2020.1.3";
version = "2020.3.4";
shortVersion = builtins.substring 0 6 version;
in
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "1l8kiicm0klbx0b05994vqd8a8wj7k0djbbg41a6i3q5d17jrnk6";
sha256 = "1laa8dllpvf2z0cjxx22ravdf1d7a18bm708gd2ny35fhjfibm0h";
};

nativeBuildInputs = [ cmake ];
6 changes: 3 additions & 3 deletions pkgs/games/flightgear/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@
}:

let
version = "2020.1.2";
version = "2020.3.4";
shortVersion = builtins.substring 0 6 version;
data = stdenv.mkDerivation rec {
pname = "flightgear-data";
inherit version;

src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
sha256 = "0ldsjb54k8nb99h6n4f4x20nawd2pa0a8skkwkrgckdpmdv0zwyk";
sha256 = "1cqikbqvidfaynml9bhqfr9yw5ga35gpqrbz62z94a1skdijkpkg";
};

phases = [ "installPhase" ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2";
sha256 = "1770kgwa7z70sx6da9x1q9cszpd3ywz6nn8jrb6xv8ldjqcpqpvb";
sha256 = "02d9h10p8hyn0a25csragj6pbwmrir1z8zb92023s9vi21j7bwy8";
};

# Of all the files in the source and data archives, there doesn't seem to be