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

Commits on Jun 17, 2019

  1. fswatch: Enable FSEvents API on Darwin 

    On Darwin we can benefit from FSEvents API (that fswatch supports) in order to
have better monitoring of file system changes.
    @knl
    knl committed Jun 17, 2019
    Copy the full SHA
    a0bbe1a View commit details

Commits on Jun 18, 2019

  1. Merge pull request #63333 from knl/enable-fsevents-api-for-fswatch 

    fswatch: Enable FSEvents API on Darwin
    @basvandijk
    basvandijk authored Jun 18, 2019
    Copy the full SHA
    ad96121 View commit details
Showing with 5 additions and 2 deletions.
  1. +2 −1 pkgs/development/tools/misc/fswatch/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
3 changes: 2 additions & 1 deletion pkgs/development/tools/misc/fswatch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, libtool
, makeWrapper
, texinfo
, CoreServices
}:

stdenv.mkDerivation rec {
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "1d1fvm36qgh6a5j9v24wai61d297pvzxr14jngjlhh4i474ff21i";
};

nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
buildInputs = [ gettext libtool makeWrapper texinfo ];

meta = with stdenv.lib; {
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -9188,7 +9188,9 @@ in

fsatrace = callPackage ../development/tools/misc/fsatrace { };

fswatch = callPackage ../development/tools/misc/fswatch { };
fswatch = callPackage ../development/tools/misc/fswatch {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};

funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };