diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-06 00:02:21 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-06 00:02:21 +0000 |
commit | c90f3611dc081347f996b5021d6751c9e3981cf1 (patch) | |
tree | 98d0c81e63993078baa6db793707ca007a18cfb7 /pkgs/misc | |
parent | f1403dc228559405f6a6533c1fbec56c5336b389 (diff) | |
parent | 97bd658852ce0efbdc4d9ca84ad466a4cbfb1cf4 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/moonfire-nvr/Cargo.lock | 108 | ||||
-rw-r--r-- | pkgs/misc/moonfire-nvr/default.nix | 11 |
2 files changed, 19 insertions, 100 deletions
diff --git a/pkgs/misc/moonfire-nvr/Cargo.lock b/pkgs/misc/moonfire-nvr/Cargo.lock index 926b5734eb778..b7ff7fc7d46fe 100644 --- a/pkgs/misc/moonfire-nvr/Cargo.lock +++ b/pkgs/misc/moonfire-nvr/Cargo.lock @@ -3,15 +3,6 @@ version = 3 [[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -78,21 +69,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -235,6 +211,11 @@ dependencies = [ ] [[package]] +name = "coded" +version = "0.2.0-pre" +source = "git+https://github.com/scottlamb/coded?rev=2c97994974a73243d5dd12134831814f42cdb0e8#2c97994974a73243d5dd12134831814f42cdb0e8" + +[[package]] name = "constant_time_eq" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -479,28 +460,6 @@ dependencies = [ ] [[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "synstructure", -] - -[[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -523,9 +482,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -663,12 +622,6 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" - -[[package]] name = "h2" version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1060,9 +1013,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1084,10 +1037,12 @@ name = "moonfire-base" version = "0.0.1" dependencies = [ "chrono", - "failure", + "coded", "futures", "libc", + "nix", "nom", + "rusqlite", "serde", "serde_json", "slab", @@ -1100,14 +1055,13 @@ dependencies = [ [[package]] name = "moonfire-db" -version = "0.7.6" +version = "0.7.7" dependencies = [ "base64", "blake3", "byteorder", "cstr", "diff", - "failure", "fnv", "futures", "h264-reader", @@ -1138,7 +1092,7 @@ dependencies = [ [[package]] name = "moonfire-nvr" -version = "0.7.6" +version = "0.7.7" dependencies = [ "base64", "blake3", @@ -1147,7 +1101,6 @@ dependencies = [ "bytes", "chrono", "cursive", - "failure", "fnv", "futures", "h264-reader", @@ -1361,15 +1314,6 @@ dependencies = [ ] [[package]] -name = "object" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d864c91689fdc196779b98dba0aceac6118594c2df6ee5d943eb6a8df4d107a" -dependencies = [ - "memchr", -] - -[[package]] name = "odds" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1765,12 +1709,6 @@ dependencies = [ ] [[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] name = "rustix" version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2002,18 +1940,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" [[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", - "unicode-xid", -] - -[[package]] name = "tempfile" version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2395,12 +2321,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] name = "untrusted" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/misc/moonfire-nvr/default.nix b/pkgs/misc/moonfire-nvr/default.nix index 00aaacb108dfb..27b7ae7766db6 100644 --- a/pkgs/misc/moonfire-nvr/default.nix +++ b/pkgs/misc/moonfire-nvr/default.nix @@ -7,30 +7,29 @@ , sqlite , testers , moonfire-nvr -, breakpointHook }: let pname = "moonfire-nvr"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "scottlamb"; repo = "moonfire-nvr"; rev = "v${version}"; - hash = "sha256-hPgS4Y/dD6G8lqfsJz3aeeed6P+ngJpBOng88xUc55Q="; + hash = "sha256-+7VahlS+NgaO2knP+xqdlZnNEfjz8yyF/VmjWf77KXI="; }; ui = buildNpmPackage { inherit version src; pname = "${pname}-ui"; sourceRoot = "source/ui"; npmDepsHash = "sha256-IpZWgMo6Y3vRn9h495ifMB3tQxobLeTLC0xXS1vrKLA="; - installPhase = " + installPhase = '' runHook preInstall cp -r build $out runHook postInstall - "; + ''; }; in rustPlatform.buildRustPackage { inherit pname version src; @@ -40,6 +39,7 @@ in rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "coded-0.2.0-pre" = "sha256-ICDvLFCsiPCzAzf3nrRhH/McNPVQz1+uVOmj6Uc5teg="; "hashlink-0.8.1" = "sha256-h7DEapTVy0SSTaOV9rCkdH3em4A9+PS0k1QQh1+0P4c="; "mp4-0.9.2" = "sha256-mJZJDzD8Ep9c+4QusyBtRoqAArHK9SLdFxG1AR7JydE="; }; @@ -47,7 +47,6 @@ in rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config - breakpointHook ]; buildInputs = [ |