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: b1f802994e58
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0a33e1e49f37
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 9, 2020

  1. tbe: fix build

    @7c6f434c
    7c6f434c committed May 9, 2020
    Copy the full SHA
    33932b6 View commit details

  2. Merge pull request #87358 from 7c6f434c/fix-tbe 

    tbe: fix build
    @7c6f434c
    7c6f434c authored May 9, 2020
    Copy the full SHA
    0a33e1e View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/games/the-butterfly-effect/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
4 changes: 2 additions & 2 deletions pkgs/games/the-butterfly-effect/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, qt5, box2d, which, cmake, gettext }:
{ stdenv, mkDerivation, fetchgit, qt5, box2d, which, cmake, gettext }:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "tbe";
version = "0.9.3.1";

2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -23925,7 +23925,7 @@ in
lua = lua5_1;
};

tbe = callPackage ../games/the-butterfly-effect { };
tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };

teetertorture = callPackage ../games/teetertorture { };