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

Commits on Apr 4, 2018

  1. xmlrpc-c: enable darwin build 

    (cherry picked from commit eb6a85e)
    @marsam @Mic92
    marsam authored and Mic92 committed Apr 4, 2018
    Copy the full SHA
    1a7464e View commit details

  2. libtorrent: enable darwin build 

    (cherry picked from commit 88bb014)
    @marsam @Mic92
    marsam authored and Mic92 committed Apr 4, 2018
    Copy the full SHA
    e8982eb View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/development/libraries/xmlrpc-c/default.nix
  2. +1 −1 pkgs/tools/networking/p2p/libtorrent/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/libraries/xmlrpc-c/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
# <xmlrpc-c>/doc/COPYING also lists "Expat license",
# "ABYSS Web Server License" and "Python 1.5.2 License"
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/networking/p2p/libtorrent/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = "http://rtorrent.net/downloads/";
description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";

platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ ebzzry codyopel ];
};
}