diff options
author | Chris Ostrouchov <chris.ostrouchov@gmail.com> | 2018-10-15 15:20:29 -0400 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 07:46:55 +0200 |
commit | 63a0e8613a507a24694ae23df698c6b5c148484d (patch) | |
tree | e270a0e25252c0c89327f919b87b8f7a9e1c8a41 | |
parent | f379425159ee4fd1aa01a6451be9f2f13858bf60 (diff) | |
download | nixlib-63a0e8613a507a24694ae23df698c6b5c148484d.tar nixlib-63a0e8613a507a24694ae23df698c6b5c148484d.tar.gz nixlib-63a0e8613a507a24694ae23df698c6b5c148484d.tar.bz2 nixlib-63a0e8613a507a24694ae23df698c6b5c148484d.tar.lz nixlib-63a0e8613a507a24694ae23df698c6b5c148484d.tar.xz nixlib-63a0e8613a507a24694ae23df698c6b5c148484d.tar.zst nixlib-63a0e8613a507a24694ae23df698c6b5c148484d.zip |
pythonPackages.editorconfig: refactor move to python-modules
-rw-r--r-- | pkgs/development/python-modules/editorconfig/default.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 25 |
2 files changed, 32 insertions, 24 deletions
diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix new file mode 100644 index 000000000000..82338bbcc8fa --- /dev/null +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchgit +, cmake +}: + +buildPythonPackage rec { + pname = "EditorConfig"; + version = "0.12.0"; + + # fetchgit used to ensure test submodule is available + src = fetchgit { + url = "https://github.com/editorconfig/editorconfig-core-py"; + rev = "refs/tags/v${version}"; + sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl"; + }; + + buildInputs = [ cmake ]; + checkPhase = '' + cmake . + # utf_8_char fails with python3 + ctest -E "utf_8_char" . + ''; + + meta = with stdenv.lib; { + homepage = https://editorconfig.org; + description = "EditorConfig File Locator and Interpreter for Python"; + license = licenses.psfl; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b5605b3cf79..e32e89fe7589 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1712,30 +1712,7 @@ in { pythonPackages = self; })); - EditorConfig = buildPythonPackage rec { - name = "EditorConfig-${version}"; - version = "0.12.0"; - - # fetchgit used to ensure test submodule is available - src = pkgs.fetchgit { - url = "https://github.com/editorconfig/editorconfig-core-py"; - rev = "refs/tags/v${version}"; - sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl"; - }; - - buildInputs = [ pkgs.cmake ]; - checkPhase = '' - cmake . - # utf_8_char fails with python3 - ctest -E "utf_8_char" . - ''; - - meta = { - homepage = https://editorconfig.org; - description = "EditorConfig File Locator and Interpreter for Python"; - license = stdenv.lib.licenses.psfl; - }; - }; + EditorConfig = callPackage ../development/python-modules/editorconfig { }; edward = callPackage ../development/python-modules/edward { }; |