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

Commits on Apr 23, 2019

  1. pythonPackages.macfsevents: init at 0.8.1

    @marsam
    marsam committed Apr 23, 2019
    Copy the full SHA
    2e333e8 View commit details

  2. doit: fix darwin build

    @marsam
    marsam committed Apr 23, 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
    9c4d8bc View commit details

  3. Merge pull request #60086 from marsam/python-doit-fix-darwin 

    doit: fix darwin build
    @pSub
    pSub authored Apr 23, 2019
    Copy the full SHA
    3e1ee42 View commit details
Showing with 31 additions and 1 deletion.
  1. +24 −0 pkgs/development/python-modules/macfsevents/default.nix
  2. +3 −1 pkgs/development/tools/build-managers/doit/default.nix
  3. +4 −0 pkgs/top-level/python-packages.nix
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/macfsevents/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi, CoreFoundation, CoreServices }:

buildPythonPackage rec {
pname = "MacFSEvents";
version = "0.8.1";

src = fetchPypi {
inherit pname version;
sha256 = "1324b66b356051de662ba87d84f73ada062acd42b047ed1246e60a449f833e10";
};

buildInputs = [ CoreFoundation CoreServices ];

# Some tests fail under nix build directory
doCheck = false;

meta = with lib; {
homepage = https://github.com/malthe/macfsevents;
description = "Thread-based interface to file system observation primitives";
license = licenses.bsd2;
maintainers = [ maintainers.marsam ];
platforms = platforms.darwin;
};
}
4 changes: 3 additions & 1 deletion pkgs/development/tools/build-managers/doit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,9 @@ in python3Packages.buildPythonApplication {

buildInputs = with python3Packages; [ mock pytest ];

propagatedBuildInputs = with python3Packages; [ cloudpickle pyinotify ];
propagatedBuildInputs = with python3Packages; [ cloudpickle ]
++ stdenv.lib.optional stdenv.isLinux pyinotify
++ stdenv.lib.optional stdenv.isDarwin macfsevents;

# Tests fail due to mysterious gdbm.open() resource temporarily
# unavailable errors.
4 changes: 4 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3136,6 +3136,10 @@ in {

Mako = callPackage ../development/python-modules/Mako { };

macfsevents = callPackage ../development/python-modules/macfsevents {
inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices;
};

manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {};
marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {};
mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {};