Merge branch 'staging/nixpkgs-2022-10-05'
This commit is contained in:
commit
d840f947b3
18
flake.lock
18
flake.lock
|
@ -39,11 +39,11 @@
|
|||
"mobile-nixos": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1664761265,
|
||||
"narHash": "sha256-2noCNHb6oqvrWIEx6xG50E4hjmenxMnMTtfneRvGRTI=",
|
||||
"lastModified": 1664852186,
|
||||
"narHash": "sha256-t0FhmTf3qRs8ScR8H9Rq7FAxptNELLSpxZG2ALL1HnE=",
|
||||
"owner": "nixos",
|
||||
"repo": "mobile-nixos",
|
||||
"rev": "efa5b5fae930370753d2e09361b38d10f0e0a00d",
|
||||
"rev": "ca872f1a617674c4045e880aab8a45037e73700b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -54,11 +54,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1664687381,
|
||||
"narHash": "sha256-9czSuDzS+OGGwq2kC4KXBLXWfYaup+oLB+AA1Md25U4=",
|
||||
"lastModified": 1664989420,
|
||||
"narHash": "sha256-Q8IxomUjjmewsoJgO3htkXLfCckQ7HkDJ/ZhdYVf/fA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "59d2991d4256cdca1c0cda45d876c80a0fe45c31",
|
||||
"rev": "37bd39839acf99c5b738319f42478296f827f274",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -85,11 +85,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1664594436,
|
||||
"narHash": "sha256-YHowMADGzdi7fKnGlg47qe0PIljq+11VqLarmXDuKxQ=",
|
||||
"lastModified": 1664883812,
|
||||
"narHash": "sha256-wqBAcVRBxls2nVaNeQaOy9SRg/bvEUiD26TQDprIg8U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9cac45850280978a21a3eb67b15a18f34cbffa2d",
|
||||
"rev": "fe76645aaf2fac3baaa2813fd0089930689c53b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
|
||||
index 46ea57c6193..8f2768fac74 100644
|
||||
--- a/pkgs/applications/misc/electrum/default.nix
|
||||
+++ b/pkgs/applications/misc/electrum/default.nix
|
||||
@@ -111,6 +111,11 @@ python3.pkgs.buildPythonApplication {
|
||||
wrapQtApp $out/bin/electrum
|
||||
'';
|
||||
|
||||
+ postPatch = ''
|
||||
+ substituteInPlace contrib/requirements/requirements.txt \
|
||||
+ --replace "protobuf>=3.12,<4" "protobuf>=3.12"
|
||||
+ '';
|
||||
+
|
||||
checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ];
|
||||
|
||||
pytestFlagsArray = [ "electrum/tests" ];
|
|
@ -30,13 +30,6 @@ fetchpatch: [
|
|||
sha256 = "sha256-1O9vC/r3jpvGhHGp7d2r3oL7C8kFX2Ph214JV0vWZA0=";
|
||||
})
|
||||
|
||||
# phosh: 0.21.0 -> 0.21.1
|
||||
(fetchpatch {
|
||||
# url = "https://git.uninsane.org/colin/nixpkgs/commit/0b81457690fce39b14c5d3463af0d6331b73b850.diff";
|
||||
url = "https://github.com/NixOS/nixpkgs/pull/193700.diff";
|
||||
sha256 = "sha256-GtpYSii1c/Kw1NEQ4sVR1nO/kvSa/CSIxuXxL00oBGw=";
|
||||
})
|
||||
|
||||
# phosh-mobile-settings: init at 0.21.1
|
||||
(fetchpatch {
|
||||
url = "http://git.uninsane.org/colin/nixpkgs/commit/0c1a7e8504291eb0076bbee3f8ebf693f4641112.diff";
|
||||
|
@ -44,13 +37,10 @@ fetchpatch: [
|
|||
sha256 = "sha256-OczjlQcG7sTM/V9Y9VL/qdwaWPKfjAJsh3czqqhRQig=";
|
||||
})
|
||||
|
||||
# fix electrum build: https://github.com/NixOS/nixpkgs/issues/193997
|
||||
# ./11-electrum-protobuf-fix.patch
|
||||
# alternative fix
|
||||
# electrum: make compatible with protobuf 4+ (fixes electrum build)
|
||||
# both of these fail on aarch64, unclear exactly why.
|
||||
# home-assistant: 2022.9.7 -> 2022.10.0
|
||||
# fixes sublime-music build by fixing its dataclasses-json dep
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NixOS/nixpkgs/pull/194112.diff";
|
||||
sha256 = "sha256-Nmvu1U5HBT0YQ5aTE2gf0aaglq/1WpgacCbpqP7F+Qc=";
|
||||
url = "https://github.com/NixOS/nixpkgs/pull/194640.diff";
|
||||
sha256 = "sha256-ptfo/XoS6bqiQsAXQ7KEif5rQwY43MXVViwiIuzD35I=";
|
||||
})
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue
Block a user