diff --git a/third_party/nixpkgs/patches/pr155145.patch b/third_party/nixpkgs/patches/pr155145.patch new file mode 100644 index 0000000000..8c5510fc8f --- /dev/null +++ b/third_party/nixpkgs/patches/pr155145.patch @@ -0,0 +1,68 @@ +From 686db3dcd31bab3451a7f83b2d23b14ce2e02028 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= +Date: Tue, 11 Jan 2022 20:22:46 +0000 +Subject: [PATCH] python2Packages.pyyaml: init at 5.4.1.1 + +--- + pkgs/development/python-modules/pyyaml/5.nix | 38 ++++++++++++++++++++ + pkgs/top-level/python2-packages.nix | 2 ++ + 2 files changed, 40 insertions(+) + create mode 100644 pkgs/development/python-modules/pyyaml/5.nix + +diff --git a/pkgs/development/python-modules/pyyaml/5.nix b/pkgs/development/python-modules/pyyaml/5.nix +new file mode 100644 +index 0000000000000..3edfae90e668b +--- /dev/null ++++ b/pkgs/development/python-modules/pyyaml/5.nix +@@ -0,0 +1,38 @@ ++{ lib ++, buildPythonPackage ++, fetchFromGitHub ++, cython ++, libyaml ++, isPy27 ++, python ++}: ++ ++buildPythonPackage rec { ++ pname = "PyYAML"; ++ version = "5.4.1.1"; ++ ++ src = fetchFromGitHub { ++ owner = "yaml"; ++ repo = "pyyaml"; ++ rev = version; ++ sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8"; ++ }; ++ ++ nativeBuildInputs = [ cython ]; ++ ++ buildInputs = [ libyaml ]; ++ ++ checkPhase = '' ++ runHook preCheck ++ PYTHONPATH=""tests/lib":$PYTHONPATH" ${python.interpreter} -m test_all ++ runHook postCheck ++ ''; ++ ++ pythonImportsCheck = [ "yaml" ]; ++ ++ meta = with lib; { ++ description = "The next generation YAML parser and emitter for Python"; ++ homepage = "https://github.com/yaml/pyyaml"; ++ license = licenses.mit; ++ }; ++} +diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix +index 01f77c482d1bf..b7d9d4e95a458 100644 +--- a/pkgs/top-level/python2-packages.nix ++++ b/pkgs/top-level/python2-packages.nix +@@ -122,6 +122,8 @@ with self; with super; { + + pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; + ++ pyyaml = callPackage ../development/python-modules/pyyaml/5.nix { }; ++ + qpid-python = callPackage ../development/python-modules/qpid-python { }; + + recoll = disabled super.recoll; diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index f2cc68009d..b0d24d4826 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,3 +1,4 @@ pomerium-fix.patch pomerium-fix2.patch nvidia-sideband-socket.patch +pr155145.patch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml/5.nix new file mode 100644 index 0000000000..3edfae90e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml/5.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, libyaml +, isPy27 +, python +}: + +buildPythonPackage rec { + pname = "PyYAML"; + version = "5.4.1.1"; + + src = fetchFromGitHub { + owner = "yaml"; + repo = "pyyaml"; + rev = version; + sha256 = "1v386gzdvsjg0mgix6v03rd0cgs9dl81qvn3m547849jm8r41dx8"; + }; + + nativeBuildInputs = [ cython ]; + + buildInputs = [ libyaml ]; + + checkPhase = '' + runHook preCheck + PYTHONPATH=""tests/lib":$PYTHONPATH" ${python.interpreter} -m test_all + runHook postCheck + ''; + + pythonImportsCheck = [ "yaml" ]; + + meta = with lib; { + description = "The next generation YAML parser and emitter for Python"; + homepage = "https://github.com/yaml/pyyaml"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix index 01f77c482d..b7d9d4e95a 100644 --- a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix @@ -122,6 +122,8 @@ with self; with super; { pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; + pyyaml = callPackage ../development/python-modules/pyyaml/5.nix { }; + qpid-python = callPackage ../development/python-modules/qpid-python { }; recoll = disabled super.recoll;