diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-06-23 13:28:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-23 13:28:46 +0200 |
| commit | 552c48b3378ab4b10091ac9ba72489750d60afa1 (patch) | |
| tree | 05b1cb35182dca08ca998c6a3441b3479b5ebca7 | |
| parent | 926d977aea34a96a74282e5556c25e54bdc58aaf (diff) | |
| parent | adaaa3f49cb0efa9d4a76bb8d8cbaead50606eb6 (diff) | |
| download | nixpkgs-552c48b3378ab4b10091ac9ba72489750d60afa1.tar nixpkgs-552c48b3378ab4b10091ac9ba72489750d60afa1.tar.gz nixpkgs-552c48b3378ab4b10091ac9ba72489750d60afa1.tar.bz2 nixpkgs-552c48b3378ab4b10091ac9ba72489750d60afa1.tar.lz nixpkgs-552c48b3378ab4b10091ac9ba72489750d60afa1.tar.xz nixpkgs-552c48b3378ab4b10091ac9ba72489750d60afa1.tar.zst nixpkgs-552c48b3378ab4b10091ac9ba72489750d60afa1.zip | |
Merge pull request #178638 from SuperSandro2000/pyld
python310Packages.pyld: normalise attr
| -rw-r--r-- | pkgs/development/python-modules/pyld/default.nix (renamed from pkgs/development/python-modules/PyLD/default.nix) | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/pyld/default.nix index 5a4741a730a..464065cbc17 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/pyld/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, requests, gnugrep }: +{ lib, buildPythonPackage, fetchFromGitHub, python, requests }: let @@ -38,7 +38,7 @@ buildPythonPackage rec { ok_min=401 if ! ${python.interpreter} tests/runtests.py -d ${json-ld}/test-suite 2>&1 | tee test.out; then - ok_count=$(${gnugrep}/bin/grep -F '... ok' test.out | wc -l) + ok_count=$(grep -F '... ok' test.out | wc -l) if [[ $ok_count -lt $ok_min ]]; then echo "Less than $ok_min tests passed ($ok_count). Failing the build." exit 1 diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 04f93fd015e..8fd557ce60a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -117,6 +117,7 @@ mapAliases ({ pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 + PyLD = pyld; # added 2022-06-22 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pyreadability = readability-lxml; # added 2022-05-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8970a1324ac..88f9286b1e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7552,7 +7552,7 @@ in { pylaunches = callPackage ../development/python-modules/pylaunches { }; - PyLD = callPackage ../development/python-modules/PyLD { }; + pyld = callPackage ../development/python-modules/pyld { }; pylev = callPackage ../development/python-modules/pylev { }; |