3p/nixpkgs: remove included PRs
This commit is contained in:
parent
4cb23072fc
commit
afb2fed74a
3 changed files with 0 additions and 127 deletions
57
third_party/nixpkgs/patches/pr154966.patch
vendored
57
third_party/nixpkgs/patches/pr154966.patch
vendored
|
|
@ -1,57 +0,0 @@
|
||||||
From 8c30650658e26faba9dee6e46caf5e387ba22286 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Fabian Affolter <mail@fabian-affolter.ch>
|
|
||||||
Date: Fri, 14 Jan 2022 01:17:59 +0100
|
|
||||||
Subject: [PATCH] home-assistant: add new overrides
|
|
||||||
|
|
||||||
---
|
|
||||||
pkgs/servers/home-assistant/default.nix | 30 +++++++++++++++++++++++++
|
|
||||||
1 file changed, 30 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
|
|
||||||
index f175802acf42a..1556ffbd9cc78 100644
|
|
||||||
--- a/pkgs/servers/home-assistant/default.nix
|
|
||||||
+++ b/pkgs/servers/home-assistant/default.nix
|
|
||||||
@@ -232,6 +232,33 @@ let
|
|
||||||
});
|
|
||||||
})
|
|
||||||
|
|
||||||
+ # Remove as soon the dependency is updated and pytest-httpx > 0.15
|
|
||||||
+ (self: super: {
|
|
||||||
+ luftdaten = super.luftdaten.overridePythonAttrs (oldAttrs: rec {
|
|
||||||
+ version = "0.7.1";
|
|
||||||
+ src = fetchFromGitHub {
|
|
||||||
+ owner = "home-assistant-ecosystem";
|
|
||||||
+ repo = "python-luftdaten";
|
|
||||||
+ rev = version;
|
|
||||||
+ sha256 = "sha256-76Y5TJet0WtzYXuK8Og0rmpsUIlXK7b37oesh+MliU8=";
|
|
||||||
+ };
|
|
||||||
+ });
|
|
||||||
+ })
|
|
||||||
+
|
|
||||||
+ # Remove as soon the dependency is updated and pytest-httpx > 0.15
|
|
||||||
+ (self: super: {
|
|
||||||
+ pyrmvtransport = super.pyrmvtransport.overridePythonAttrs (oldAttrs: rec {
|
|
||||||
+ version = "0.3.3";
|
|
||||||
+ src = fetchFromGitHub {
|
|
||||||
+ owner = "cgtobi";
|
|
||||||
+ repo = "pyrmvtransport";
|
|
||||||
+ rev = "v${version}";
|
|
||||||
+ sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40=";
|
|
||||||
+ };
|
|
||||||
+ doCheck = false;
|
|
||||||
+ });
|
|
||||||
+ })
|
|
||||||
+
|
|
||||||
# home-assistant-frontend does not exist in python3.pkgs
|
|
||||||
(self: super: {
|
|
||||||
home-assistant-frontend = self.callPackage ./frontend.nix { };
|
|
||||||
@@ -986,6 +1013,9 @@ in with py.pkgs; buildPythonApplication rec {
|
|
||||||
# august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' / assert 'off' == 'on'
|
|
||||||
"test_lock_update_via_pubnub"
|
|
||||||
"test_door_sense_update_via_pubnub"
|
|
||||||
+ # Tests are flaky
|
|
||||||
+ "test_config_platform_valid"
|
|
||||||
+ "test_hls_stream"
|
|
||||||
];
|
|
||||||
|
|
||||||
preCheck = ''
|
|
||||||
68
third_party/nixpkgs/patches/pr155145.patch
vendored
68
third_party/nixpkgs/patches/pr155145.patch
vendored
|
|
@ -1,68 +0,0 @@
|
||||||
From 686db3dcd31bab3451a7f83b2d23b14ce2e02028 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
|
|
||||||
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;
|
|
||||||
2
third_party/nixpkgs/patches/series
vendored
2
third_party/nixpkgs/patches/series
vendored
|
|
@ -1,5 +1,3 @@
|
||||||
pomerium-fix.patch
|
pomerium-fix.patch
|
||||||
pomerium-fix2.patch
|
pomerium-fix2.patch
|
||||||
nvidia-sideband-socket.patch
|
nvidia-sideband-socket.patch
|
||||||
pr155145.patch
|
|
||||||
pr154966.patch
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue