Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e56fe0ec151a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3461eacc9ea4
Choose a head ref
  • 5 commits
  • 4 files changed
  • 4 contributors

Commits on May 9, 2020

  1. tbe: fix build 

    (cherry picked from commit 33932b6)
    @7c6f434c
    7c6f434c committed May 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c04f447 View commit details

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

    tbe: fix build [20.03]
    @7c6f434c
    7c6f434c authored May 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    742ff3f View commit details

  3. ceph: 14.2.8 -> 14.2.9 

    (cherry picked from commit 8a4fcfd)
Backport of #86798
    @r-ryantm @bjornfor
    r-ryantm authored and bjornfor committed May 9, 2020
    Copy the full SHA
    59cd521 View commit details

  4. tor: fix cross compiling 

    (cherry picked from commit 8aab081)
    @sorki
    sorki committed May 9, 2020
    Copy the full SHA
    5c844fc View commit details

  5. Merge pull request #87389 from sorki/tor_cc_backport 

    [20.03] tor: fix cross compiling
    @joachifm
    joachifm authored May 9, 2020
    Copy the full SHA
    3461eac View commit details
Showing with 9 additions and 5 deletions.
  1. +2 −2 pkgs/games/the-butterfly-effect/default.nix
  2. +2 −2 pkgs/tools/filesystems/ceph/default.nix
  3. +4 −0 pkgs/tools/security/tor/default.nix
  4. +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";

4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/ceph/default.nix
View file
Original file line number Diff line number Diff line change
@@ -93,15 +93,15 @@ let
]);
sitePackages = ceph-python-env.python.sitePackages;

version = "14.2.8";
version = "14.2.9";
in rec {
ceph = stdenv.mkDerivation {
pname = "ceph";
inherit version;

src = fetchurl {
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki";
sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il";
};

patches = [
4 changes: 4 additions & 0 deletions pkgs/tools/security/tor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {

patches = [ ./disable-monotonic-timer-tests.patch ];

# cross compiles correctly but needs the following
configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"--disable-tool-name-check";

NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";

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

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

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