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: ea7c049d54dc
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: 4557b9f1f50a
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on Aug 8, 2019

  1. ctrtool: 0.15 -> 0.16

    @marius851000
    marius851000 committed Aug 8, 2019
    Copy the full SHA
    4b594c3 View commit details

Commits on Aug 10, 2019

  1. busybox: apply clang-cross patch when host is different than build sy… 

    …stem.

It looks like the original comparrision was incorrect:
host platform - system on which the binary will run
target platform - system for which compiler generates code
                  (used with compilers)
build platform - system on which the build is invoked

see: https://nixos.org/nixpkgs/manual/#sec-cross-platform-parameters

This change allows to cross compile busybox on OS X
    @takeda
    takeda committed Aug 10, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7e7e26e View commit details

  2. Merge pull request #66079 from marius851000/ctrtool-update 

    ctrtool: 0.15 -> 0.16
    @aanderse
    aanderse authored Aug 10, 2019
    Copy the full SHA
    0f91a1f View commit details

Commits on Aug 11, 2019

  1. Merge pull request #66419 from takeda/busybox 

    busybox: apply clang-cross patch when host is different than build system.
    @matthewbauer
    matthewbauer authored Aug 11, 2019
    Copy the full SHA
    4557b9f View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 pkgs/os-specific/linux/busybox/default.nix
  2. +4 −4 pkgs/tools/archivers/ctrtool/default.nix
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/busybox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {

patches = [
./busybox-in-store.patch
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.targetPlatform) ./clang-cross.patch;
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;

postPatch = "patchShebangs .";

8 changes: 4 additions & 4 deletions pkgs/tools/archivers/ctrtool/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "ctrtool";
version = "0.15";
version = "0.16";

src = fetchFromGitHub {
owner = "profi200";
owner = "jakcron";
repo = "Project_CTR";
rev = version;
sha256 = "1l6z05x18s1crvb283yvynlwsrpa1pdx1nbijp99plw06p88h4va";
rev = "v${version}";
sha256 = "1n3j3fd1bqd39v5bdl9mhq4qdrcl1k4ib1yzl3qfckaz3y8bkrap";
};

sourceRoot = "source/ctrtool";