diff options
| author | Peter Simons <simons@cryp.to> | 2016-08-29 16:55:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 16:55:06 +0200 |
| commit | 67c57a9ce53f1f488ab0fc355a4452feeb9c5a67 (patch) | |
| tree | 5b903e3170afbbb9c76b4f194d1b8de888424598 /pkgs | |
| parent | 486c2048590899403b4cd3089f11056268c814f4 (diff) | |
| parent | 70ed0fd3dec4f3fb074f995cb7d495406162216d (diff) | |
| download | nixpkgs-67c57a9ce53f1f488ab0fc355a4452feeb9c5a67.tar nixpkgs-67c57a9ce53f1f488ab0fc355a4452feeb9c5a67.tar.gz nixpkgs-67c57a9ce53f1f488ab0fc355a4452feeb9c5a67.tar.bz2 nixpkgs-67c57a9ce53f1f488ab0fc355a4452feeb9c5a67.tar.lz nixpkgs-67c57a9ce53f1f488ab0fc355a4452feeb9c5a67.tar.xz nixpkgs-67c57a9ce53f1f488ab0fc355a4452feeb9c5a67.tar.zst nixpkgs-67c57a9ce53f1f488ab0fc355a4452feeb9c5a67.zip | |
Merge pull request #18016 from Profpatsch/spy-patch
haskellPackages.spy: fix for new fsnotify version
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/patches/spy.patch | 26 |
2 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b84307a9dbf..9fa66338d8c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -998,4 +998,7 @@ self: super: { ''; }); + # https://bitbucket.org/ssaasen/spy/pull-requests/3/fsnotify-dropped-system-filepath + spy = appendPatch super.spy ./patches/spy.patch; + } diff --git a/pkgs/development/haskell-modules/patches/spy.patch b/pkgs/development/haskell-modules/patches/spy.patch new file mode 100644 index 00000000000..4c4e1844361 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/spy.patch @@ -0,0 +1,26 @@ +diff --git a/src/Spy/Watcher.hs b/src/Spy/Watcher.hs + index 8512613..4df67d4 100644 +--- a/src/Spy/Watcher.hs ++++ b/src/Spy/Watcher.hs +@@ -50,7 +50,7 @@ plainFormat = Plain + spy :: Spy -> IO b -> IO () + spy config after = withManager $ \wm -> + runIndefinitely +- (watchTree wm (decodeString $ dir config) ++ (watchTree wm (dir config) + (not . skipEvent config . eventPath) + (handleEvent config)) + (const after) +@@ -106,9 +106,9 @@ eventTime (Modified _ t) = t + eventTime (Removed _ t) = t + + eventPath :: Event -> FilePath +-eventPath (Added fp _) = encodeString fp +-eventPath (Modified fp _) = encodeString fp +-eventPath (Removed fp _) = encodeString fp ++eventPath (Added fp _) = fp ++eventPath (Modified fp _) = fp ++eventPath (Removed fp _) = fp + + eventType :: Event -> FilePath + eventType (Added _ _) = "Added" |