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: 41164d94ab4a
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: fa4759862e42
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Apr 4, 2018

  1. lightstep-tracer-cpp: mark as broken 

    needs an update + https://github.com/opentracing/opentracing-cpp

(cherry picked from commit eea21b2)
    @Mic92
    Mic92 committed Apr 4, 2018
    Copy the full SHA
    dabd73a View commit details

  2. xburst-tools: Fix build 

    (cherry picked from commit 4645b12)
    @infinisil @Mic92
    infinisil authored and Mic92 committed Apr 4, 2018
    Copy the full SHA
    ac6a68d View commit details

  3. transmission: settings doc location changed 

    (cherry picked from commit 172ca58)
    @nyanloutre @Mic92
    nyanloutre authored and Mic92 committed Apr 4, 2018
    Copy the full SHA
    fa47598 View commit details
4 changes: 2 additions & 2 deletions nixos/modules/services/torrent/transmission.nix
View file
Original file line number Diff line number Diff line change
@@ -59,8 +59,8 @@ in
time the service starts). String values must be quoted, integer and
boolean values must not.
See https://trac.transmissionbt.com/wiki/EditConfigFiles for
documentation.
See https://github.com/transmission/transmission/wiki/Editing-Configuration-Files
for documentation.
'';
};

1 change: 1 addition & 0 deletions pkgs/development/libraries/lightstep-tracer-cpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
broken = true; # 2018-02-16
};
}
2 changes: 2 additions & 0 deletions pkgs/tools/misc/xburst-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,8 @@ stdenv.mkDerivation {
"--enable-firmware CROSS_COMPILE=${crossPrefix}-"
else "";

hardeningDisable = [ "pic" "stackprotector" ];

# Not to strip cross build binaries (this is for the gcc-cross-wrapper)
dontCrossStrip = true;