From f07e8881cd3058a97bccf33d36c83b0be949c4a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 10 Apr 2024 00:31:28 +0000 Subject: [PATCH 01/10] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'dream2nix': 'github:nix-community/dream2nix/262198033e23e9ee832f0cc8133d38f07598f555' (2023-12-13) → 'github:nix-community/dream2nix/400032c6303f82b07a09c9784ab5569a51544987' (2024-04-09) • Updated input 'flake-utils': 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/886c9aee6ca9324e127f9c2c4e6f68c2641c8256' (2023-12-18) → 'github:NixOS/nixpkgs/a76c4553d7e741e17f289224eda135423de0491d' (2024-04-09) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/cbdf3e5bb205ff2ca165fe661fbd6d885cbd0106' (2024-02-26) → 'github:oxalica/rust-overlay/e7354bb9e5f68b2074e272fd5f5ac3f4848860ba' (2024-04-09) • Updated input 'sops-nix': 'github:Mic92/sops-nix/e19071f9958c8da4f4347d3d78790d97e98ba22f' (2023-12-02) → 'github:Mic92/sops-nix/538c114cfdf1f0458f507087b1dcf018ce1c0c4c' (2024-04-08) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/dfb95385d21475da10b63da74ae96d89ab352431' (2023-11-25) → 'github:NixOS/nixpkgs/e38d7cb66ea4f7a0eb6681920615dfcc30fc2920' (2024-04-06) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/e82f32aa7f06bbbd56d7b12186d555223dc399d1' (2023-11-12) → 'github:numtide/treefmt-nix/49dc4a92b02b8e68798abd99184f228243b6e3ac' (2024-04-01) --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 167c45cf..8784ec69 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1702457430, - "narHash": "sha256-8NQiXtYCOiC7XFayy6GPGDudCBrPROry3mfWjpdVj5g=", + "lastModified": 1712643040, + "narHash": "sha256-4vkxrZnHulJ8r6lewSr7oHjy0le66CxBRSgGr8WR3qg=", "owner": "nix-community", "repo": "dream2nix", - "rev": "262198033e23e9ee832f0cc8133d38f07598f555", + "rev": "400032c6303f82b07a09c9784ab5569a51544987", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702900294, - "narHash": "sha256-pt7sSoJYNw3n8YtXw0Z/Nnr6/PfY2YrjDvqboErXnRM=", + "lastModified": 1712666087, + "narHash": "sha256-WwjUkWsjlU8iUImbivlYxNyMB1L5YVqE8QotQdL9jWc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "886c9aee6ca9324e127f9c2c4e6f68c2641c8256", + "rev": "a76c4553d7e741e17f289224eda135423de0491d", "type": "github" }, "original": { @@ -60,16 +60,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700905716, - "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", + "lastModified": 1712437997, + "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfb95385d21475da10b63da74ae96d89ab352431", + "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -134,11 +134,11 @@ ] }, "locked": { - "lastModified": 1708913568, - "narHash": "sha256-76PGANC2ADf0h7fe0w2nWpfdGN+bemFs2rvW2EdU/ZY=", + "lastModified": 1712628742, + "narHash": "sha256-FIAlt8mbPUs8jRuh6xpFtYzDsyHzmiLNPcen8HwvD00=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cbdf3e5bb205ff2ca165fe661fbd6d885cbd0106", + "rev": "e7354bb9e5f68b2074e272fd5f5ac3f4848860ba", "type": "github" }, "original": { @@ -177,11 +177,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1701518298, - "narHash": "sha256-5t8yqKe0oVusV4xgfA+wW58hQJXFMmq0mmaR1gKES+Y=", + "lastModified": 1712617241, + "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e19071f9958c8da4f4347d3d78790d97e98ba22f", + "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1699786194, - "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", + "lastModified": 1711963903, + "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", + "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", "type": "github" }, "original": { From 0b42af23b94fb2ce0a2f92997db91e765f0245f1 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Fri, 12 Apr 2024 13:26:53 +0200 Subject: [PATCH 02/10] pretalx: Rename module avoiding nixpkgs clash Also remove deprecated configurion while at it, see ngi-nix/ngipkgs#126 --- configs/pretalx/mysql.nix | 8 ++++---- configs/pretalx/postgresql.nix | 8 ++++---- configs/pretalx/pretalx.nix | 2 +- modules/pretalx.nix | 6 +++--- tests/pretalx/default.nix | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configs/pretalx/mysql.nix b/configs/pretalx/mysql.nix index 76c8fee7..49369f3b 100644 --- a/configs/pretalx/mysql.nix +++ b/configs/pretalx/mysql.nix @@ -4,7 +4,7 @@ ... }: { services = { - pretalx.database = { + ngi-pretalx.database = { backend = "mysql"; host = "/var/run/mysqld/mysqld.sock"; }; @@ -14,11 +14,11 @@ package = pkgs.mysql; ensureUsers = [ { - name = config.services.pretalx.database.user; - ensurePermissions."${config.services.pretalx.database.name}.*" = "ALL PRIVILEGES"; + name = config.services.ngi-pretalx.database.user; + ensurePermissions."${config.services.ngi-pretalx.database.name}.*" = "ALL PRIVILEGES"; } ]; - ensureDatabases = [config.services.pretalx.database.name]; + ensureDatabases = [config.services.ngi-pretalx.database.name]; }; }; } diff --git a/configs/pretalx/postgresql.nix b/configs/pretalx/postgresql.nix index f7c14524..3d6e0cb3 100644 --- a/configs/pretalx/postgresql.nix +++ b/configs/pretalx/postgresql.nix @@ -1,17 +1,17 @@ {config, ...}: { services = { - pretalx.database.backend = "postgresql"; + ngi-pretalx.database.backend = "postgresql"; postgresql = { enable = true; authentication = "local all all trust"; ensureUsers = [ { - name = config.services.pretalx.database.user; - ensurePermissions."DATABASE \"${config.services.pretalx.database.name}\"" = "ALL PRIVILEGES"; + name = config.services.ngi-pretalx.database.user; + ensureDBOwnership = true; } ]; - ensureDatabases = [config.services.pretalx.database.name]; + ensureDatabases = [config.services.ngi-pretalx.database.name]; }; }; } diff --git a/configs/pretalx/pretalx.nix b/configs/pretalx/pretalx.nix index 0fb2dcce..48a8f290 100644 --- a/configs/pretalx/pretalx.nix +++ b/configs/pretalx/pretalx.nix @@ -31,7 +31,7 @@ }; services = { - pretalx = { + ngi-pretalx = { enable = true; package = pkgs.pretalx-full; nginx = { diff --git a/modules/pretalx.nix b/modules/pretalx.nix index 0d10ce56..98abf2c7 100644 --- a/modules/pretalx.nix +++ b/modules/pretalx.nix @@ -31,8 +31,8 @@ filterAttrsRecursive ; - cfg = config.services.pretalx; - opt = options.services.pretalx; + cfg = config.services.ngi-pretalx; + opt = options.services.ngi-pretalx; gunicorn = pkgs.python3Packages.gunicorn; libDir = "/var/lib/pretalx"; gunicornSocketPath = "/var/run/pretalx.sock"; @@ -56,7 +56,7 @@ secretRecommendation = "Consider using a secret managing scheme such as `agenix` or `sops-nix` to generate this file."; in { - options.services.pretalx = with types; { + options.services.ngi-pretalx = with types; { enable = mkEnableOption "Enable pretalx server."; package = mkPackageOption pkgs "pretalx" {}; diff --git a/tests/pretalx/default.nix b/tests/pretalx/default.nix index 7cd3b470..12ab503d 100644 --- a/tests/pretalx/default.nix +++ b/tests/pretalx/default.nix @@ -32,7 +32,7 @@ in { defaultSopsFile = ./sops/pretalx.yaml; }; - services.pretalx.site.url = mkForce "http://localhost:8000"; + services.ngi-pretalx.site.url = mkForce "http://localhost:8000"; # Use kmscon # to provide a slightly nicer console, and while we're at it, From 043bbdca27aba622e79fef3bbc3aaea0a42ec608 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Fri, 12 Apr 2024 13:24:50 +0200 Subject: [PATCH 03/10] kikit: Fix --- pkgs/by-name/kikit/package.nix | 12 +-- pkgs/by-name/kikit/shapely/default.nix | 78 ------------------- .../by-name/kikit/shapely/library-paths.patch | 31 -------- pkgs/by-name/pcbnew-transition/package.nix | 48 ------------ 4 files changed, 6 insertions(+), 163 deletions(-) delete mode 100644 pkgs/by-name/kikit/shapely/default.nix delete mode 100644 pkgs/by-name/kikit/shapely/library-paths.patch delete mode 100644 pkgs/by-name/pcbnew-transition/package.nix diff --git a/pkgs/by-name/kikit/package.nix b/pkgs/by-name/kikit/package.nix index 3456079a..b0de3c8b 100644 --- a/pkgs/by-name/kikit/package.nix +++ b/pkgs/by-name/kikit/package.nix @@ -1,8 +1,8 @@ { lib, - pcbnew-transition, pybars3, python3, + openscad, fetchFromGitHub, bats, callPackage, @@ -15,12 +15,11 @@ properCaseName = "KiKit"; - shapely = callPackage ./shapely {}; solidpython = callPackage ./solidpython {}; in python3.pkgs.buildPythonPackage rec { pname = toLower properCaseName; - version = "1.3.0"; + version = "1.5.1"; format = "setuptools"; disabled = python3.pythonOlder "3.7"; @@ -29,7 +28,7 @@ in owner = "yaqwsx"; repo = properCaseName; rev = "v${version}"; - hash = "sha256-kDTPk/R3eZtm4DjoUV4tSQzjGQ9k8MKQedX4oUXYzeo="; + hash = "sha256-iehA6FthNTJq+lDTL4eSUIIlYDJj86LMOyv/L2/ybyc="; }; propagatedBuildInputs = with python3.pkgs; @@ -41,13 +40,14 @@ in commentjson # https://github.com/yaqwsx/KiKit/issues/575 wxPython_4_2 + shapely + pcbnew-transition ] ++ [ - pcbnew-transition - shapely pybars3 # https://github.com/yaqwsx/KiKit/issues/576 solidpython + openscad ]; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/kikit/shapely/default.nix b/pkgs/by-name/kikit/shapely/default.nix deleted file mode 100644 index 3e9c9322..00000000 --- a/pkgs/by-name/kikit/shapely/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - pkgs, - lib, - stdenv, - fetchPypi, - substituteAll, - python3, -}: let - inherit - (lib) - optionals - licenses - maintainers - optionalString - ; -in - python3.pkgs.buildPythonPackage rec { - pname = "Shapely"; - version = "1.8.4"; - disabled = python3.pkgs.pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; - }; - - nativeBuildInputs = with pkgs; [ - pkgs.geos # for geos-config - python3.pkgs.cython - ]; - - propagatedBuildInputs = with python3.pkgs; [ - numpy - ]; - - checkInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - # Environment variable used in shapely/_buildcfg.py - GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - - patches = [ - # Patch to search form GOES .so/.dylib files in a Nix-aware way - (substituteAll { - src = ./library-paths.patch; - libgeos_c = GEOS_LIBRARY_PATH; - libc = optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; - }) - ]; - - preCheck = '' - rm -r shapely # prevent import of local shapely - ''; - - disabledTests = optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # FIXME(lf-): these logging tests are broken, which is definitely our - # fault. I've tried figuring out the cause and failed. - # - # It is apparently some sandbox or no-sandbox related thing on macOS only - # though. - "test_error_handler_exception" - "test_error_handler" - "test_info_handler" - ]; - - pythonImportsCheck = ["shapely"]; - - # There seems to be a regression on shapely's tests. However, kikit's tests keep passing! - doCheck = false; - - meta = { - description = "Geometric objects, predicates, and operations"; - homepage = "https://pypi.python.org/pypi/Shapely/"; - license = with licenses; [bsd3]; - maintainers = with maintainers; [knedlsepp]; - }; - } diff --git a/pkgs/by-name/kikit/shapely/library-paths.patch b/pkgs/by-name/kikit/shapely/library-paths.patch deleted file mode 100644 index d095eada..00000000 --- a/pkgs/by-name/kikit/shapely/library-paths.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/shapely/geos.py b/shapely/geos.py -index 88c5f53..1ccd6e4 100644 ---- a/shapely/geos.py -+++ b/shapely/geos.py -@@ -96,6 +96,7 @@ if sys.platform.startswith('linux'): - alt_paths = [ - 'libgeos_c.so.1', - 'libgeos_c.so', -+ '@libgeos_c@', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -@@ -160,6 +161,7 @@ elif sys.platform == 'darwin': - "/usr/local/lib/libgeos_c.dylib", - # homebrew Apple Silicon - "/opt/homebrew/lib/libgeos_c.dylib", -+ "@libgeos_c@", - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -diff --git a/tests/test_dlls.py b/tests/test_dlls.py -index c71da8e..c36262c 100644 ---- a/tests/test_dlls.py -+++ b/tests/test_dlls.py -@@ -18,4 +18,5 @@ class LoadingTestCase(unittest.TestCase): - '/opt/homebrew/lib/libgeos_c.dylib', # homebrew (macOS) - os.path.join(sys.prefix, "lib", "libgeos_c.so"), # anaconda (Linux) - 'libgeos_c.so.1', -- 'libgeos_c.so']) -+ 'libgeos_c.so', -+ '@libgeos_c@']) diff --git a/pkgs/by-name/pcbnew-transition/package.nix b/pkgs/by-name/pcbnew-transition/package.nix deleted file mode 100644 index 5273adb6..00000000 --- a/pkgs/by-name/pcbnew-transition/package.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - python3, - fetchPypi, - lib, -}: let - inherit - (lib) - licenses - ; - - inherit - (python3.pkgs) - buildPythonPackage - ; - - properCaseName = "pcbnewTransition"; -in - buildPythonPackage rec { - pname = properCaseName; - version = "0.3.4"; - format = "setuptools"; - - disabled = python3.pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-3CJUG1kd63Lg0r9HpJRIvttHS5s2EuZRoxeXrqsJ/kQ="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - kicad - ]; - - nativeBuildInputs = with python3.pkgs; [ - versioneer - ]; - - pythonImportsCheck = [ - properCaseName - ]; - - meta = { - description = "Library that allows you to support both, KiCAD 5 and KiCAD 6 in your plugins"; - homepage = "https://github.com/yaqwsx/pcbnewTransition"; - changelog = "https://github.com/yaqwsx/pcbnewTransition/releases/tag/v${version}"; - license = licenses.mit; - }; - } From b93a5a2f844dc2e5d3eaa279caa4360fab50f7e8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:50:18 +0200 Subject: [PATCH 04/10] steamworks: fix build with gcc13 --- pkgs/by-name/steamworks/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/steamworks/package.nix b/pkgs/by-name/steamworks/package.nix index c512da98..8140b98f 100644 --- a/pkgs/by-name/steamworks/package.nix +++ b/pkgs/by-name/steamworks/package.nix @@ -29,6 +29,11 @@ in hash = "sha256-hD1nTyv/t7MQdopqivfSE0o4Qk1ymG8zQVg56lY+t9o="; }; + # src/common/logger.h:254:63: error: 'uint8_t' does not name a type + postPatch = '' + sed -i "38i #include " src/common/logger.h + ''; + nativeBuildInputs = [cmake arpa2cm arpa2common]; buildInputs = [ From 00fd9536d4e5a2b9fc1a17788e5196befe7ff43d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:05:20 +0200 Subject: [PATCH 05/10] wireguard-rs: fix build with rust_1_76 --- pkgs/by-name/wireguard-rs/Cargo.lock | 1455 +++++++++++++++++++++++++ pkgs/by-name/wireguard-rs/package.nix | 6 +- 2 files changed, 1460 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/wireguard-rs/Cargo.lock diff --git a/pkgs/by-name/wireguard-rs/Cargo.lock b/pkgs/by-name/wireguard-rs/Cargo.lock new file mode 100644 index 00000000..8941561c --- /dev/null +++ b/pkgs/by-name/wireguard-rs/Cargo.lock @@ -0,0 +1,1455 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "arraydeque" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ffd3d69bd89910509a5d31d1f1353f38ccffdd116dd0099bbd6627f7bd8ad8" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "blake2" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +dependencies = [ + "crypto-mac 0.8.0", + "digest", + "opaque-debug", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cc" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chacha20" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed8738f14471a99f0e316c327e68fc82a3611cc2895fcb604b89eedaf8f39d95" +dependencies = [ + "cipher", + "zeroize", +] + +[[package]] +name = "chacha20poly1305" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1fc18e6d90c40164bf6c317476f2a98f04661e310e79830366b7e914c58a8e" +dependencies = [ + "aead", + "chacha20", + "cipher", + "poly1305", + "zeroize", +] + +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] + +[[package]] +name = "clear_on_drop" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38508a63f4979f0048febc9966fadbd48e5dab31fd0ec6a3f151bbf4a74f7423" +dependencies = [ + "cc", +] + +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + +[[package]] +name = "cpuprofiler" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f8479dbcfd2bbaa0c0c26779b913052b375981cdf533091f2127ea3d42e52b" +dependencies = [ + "error-chain", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crypto-mac" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "crypto-mac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "curve25519-dalek" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +dependencies = [ + "byteorder", + "digest", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if 1.0.0", + "num_cpus", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "atty", + "humantime", + "log 0.4.21", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "backtrace", + "version_check", +] + +[[package]] +name = "fastrand" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags 1.3.2", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hjul" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b543d59589bf4d94a3dd2294162b5eeafc969962a675d544e597b03233869180" +dependencies = [ + "mio", + "mio-extras", + "spin 0.5.2", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac 0.10.1", + "digest", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ip_network_table-deps-treebitmap" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" + +[[package]] +name = "ipnetwork" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c3eaab3ac0ede60ffa41add21970a7df7d91772c03383aac6c2c3d53cc716b" +dependencies = [ + "serde", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ + "log 0.4.21", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log 0.4.21", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log 0.4.21", + "mio", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "net2" +version = "0.2.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "pnet" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b657d5b9a98a2c81b82549922b8b15984e49f8120cd130b11a09f81b9b55d633" +dependencies = [ + "ipnetwork", + "pnet_base", + "pnet_datalink", + "pnet_packet", + "pnet_sys", + "pnet_transport", +] + +[[package]] +name = "pnet_base" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4688aa497ef62129f302a5800ebde67825f8ff129f43690ca84099f6620bed" + +[[package]] +name = "pnet_datalink" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59001c9c4d9d23bf2f61afaaf134a766fd6932ba2557c606b9112157053b9ac7" +dependencies = [ + "ipnetwork", + "libc", + "pnet_base", + "pnet_sys", + "winapi 0.3.9", +] + +[[package]] +name = "pnet_macros" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d894a90dbdbe976e624453fc31b1912f658083778329442dda1cca94f76a3e76" +dependencies = [ + "regex", + "syntex", + "syntex_syntax", +] + +[[package]] +name = "pnet_macros_support" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b99269a458570bc06a9132254349f6543d9abc92e88b68d8de934aac9481f6c" +dependencies = [ + "pnet_base", +] + +[[package]] +name = "pnet_packet" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33f8238f4eb897a55ca06510cd71afb5b5ca7b4ff2d7188f1ca855fc1710133e" +dependencies = [ + "glob", + "pnet_base", + "pnet_macros", + "pnet_macros_support", + "syntex", +] + +[[package]] +name = "pnet_sys" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7589e4c4e7ed72a3ffdff8a65d3bea84e8c3a23e19d0a10e8f45efdf632fff15" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "pnet_transport" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "326abdfd2e70e8e943bd58087b59686de170cac050a3b19c9fcc84db01690af5" +dependencies = [ + "libc", + "pnet_base", + "pnet_packet", + "pnet_sys", +] + +[[package]] +name = "poly1305" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8" +dependencies = [ + "cpuid-bool", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proptest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "byteorder", + "lazy_static", + "num-traits", + "quick-error", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.6.29", + "rusty-fork", + "tempfile", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rand_xorshift" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" +dependencies = [ + "rand_core", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.3", +] + +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-serialize" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" + +[[package]] +name = "rustix" +version = "0.38.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13287b4da9d1207a4f4929ac390916d64eacfe236a487e9a9f5b3be392be5162" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[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.109", + "unicode-xid 0.2.4", +] + +[[package]] +name = "syntex" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a30b08a6b383a22e5f6edc127d169670d48f905bb00ca79a00ea3e442ebe317" +dependencies = [ + "syntex_errors", + "syntex_syntax", +] + +[[package]] +name = "syntex_errors" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c48f32867b6114449155b2a82114b86d4b09e1bddb21c47ff104ab9172b646" +dependencies = [ + "libc", + "log 0.3.9", + "rustc-serialize", + "syntex_pos", + "term", + "unicode-xid 0.0.3", +] + +[[package]] +name = "syntex_pos" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fd49988e52451813c61fecbe9abb5cfd4e1b7bb6cdbb980a6fbcbab859171a6" +dependencies = [ + "rustc-serialize", +] + +[[package]] +name = "syntex_syntax" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7628a0506e8f9666fdabb5f265d0059b059edac9a3f810bda077abb5d826bd8d" +dependencies = [ + "bitflags 0.5.0", + "libc", + "log 0.3.9", + "rustc-serialize", + "syntex_errors", + "syntex_pos", + "term", + "unicode-xid 0.0.3", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "rustix", + "windows-sys", +] + +[[package]] +name = "term" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" +dependencies = [ + "kernel32-sys", + "winapi 0.2.8", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-xid" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "universal-hash" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log 0.4.21", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.58", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "wireguard-rs" +version = "0.1.4" +dependencies = [ + "aead", + "arraydeque", + "blake2", + "byteorder", + "chacha20poly1305", + "clear_on_drop", + "cpuprofiler", + "crossbeam-channel", + "dashmap", + "digest", + "env_logger", + "generic-array", + "hex", + "hjul", + "hmac", + "ip_network_table-deps-treebitmap", + "libc", + "log 0.4.21", + "num_cpus", + "parking_lot", + "pnet", + "proptest", + "rand", + "rand_chacha", + "rand_core", + "ring", + "spin 0.7.1", + "subtle", + "x25519-dalek", + "zerocopy", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "x25519-dalek" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" +dependencies = [ + "curve25519-dalek", + "rand_core", + "zeroize", +] + +[[package]] +name = "zerocopy" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da091bab2bd35db397c46f5b81748b56f28f8fda837087fab9b6b07b6d66e3f1" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d498dbd1fd7beb83c86709ae1c33ca50942889473473d287d56ce4770a18edfb" +dependencies = [ + "proc-macro2", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] diff --git a/pkgs/by-name/wireguard-rs/package.nix b/pkgs/by-name/wireguard-rs/package.nix index 2c6b074d..336e5abe 100644 --- a/pkgs/by-name/wireguard-rs/package.nix +++ b/pkgs/by-name/wireguard-rs/package.nix @@ -18,7 +18,11 @@ in hash = "sha256-UlT0c0J4oY+E1UM2ElueHECjrxErIBERwiF1huLvtds="; }; - cargoSha256 = "sha256-zYcIGTExDcDnRvwTcBRaJGxkiFpft/RelEd4quP9RrA="; + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; meta = { homepage = "https://git.zx2c4.com/wireguard-rs"; From 0d561814e30e567fc75501642c789b25316791fa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:11:06 +0200 Subject: [PATCH 06/10] pretalx: override from upstream --- pkgs/by-name/pretalx-frontend/package.nix | 20 --- pkgs/default.nix | 2 - pkgs/pretalx/default.nix | 193 +--------------------- pkgs/pretalx/frontend.nix | 41 ----- 4 files changed, 9 insertions(+), 247 deletions(-) delete mode 100644 pkgs/by-name/pretalx-frontend/package.nix delete mode 100644 pkgs/pretalx/frontend.nix diff --git a/pkgs/by-name/pretalx-frontend/package.nix b/pkgs/by-name/pretalx-frontend/package.nix deleted file mode 100644 index 65cc7cca..00000000 --- a/pkgs/by-name/pretalx-frontend/package.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - buildNpmPackage, - pretalx, -}: -buildNpmPackage { - inherit (pretalx) version src meta; - pname = "pretalx-frontend"; - - sourceRoot = "source/src/pretalx/frontend/schedule-editor"; - - npmDepsHash = "sha256-4cnBHZ8WpHgp/bbsYYbdtrhuD6ffUAZq9ZjoLpWGfRg="; - - buildPhase = '' - runHook preBuild - - npm run build - - runHook postBuild - ''; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index c5b3eaae..fe446c7a 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,8 +13,6 @@ #liberaforms = callPackage ./pkgs/liberaforms {}; #liberaforms-env = callPackage ./pkgs/liberaforms/env.nix {}; - pretalx = callPackage ./pretalx {}; - pretalx-frontend = callPackage ./pretalx/frontend.nix {}; pretalx-full = callPackage ./pretalx { withPlugins = [ pretalx-downstream diff --git a/pkgs/pretalx/default.nix b/pkgs/pretalx/default.nix index 6641b6e9..e7fa8da0 100644 --- a/pkgs/pretalx/default.nix +++ b/pkgs/pretalx/default.nix @@ -1,189 +1,14 @@ { - lib, - gettext, - python3, - fetchFromGitHub, - fetchPypi, - nixosTests, pretalx, - pretalx-frontend, - nodejs, withPlugins ? [], -}: let - inherit - (builtins) - attrValues - ; - - inherit - (lib) - flatten - licenses - maintainers - ; - - python = python3.override { - packageOverrides = self: super: { - django-formtools = super.django-formtools.overridePythonAttrs rec { - version = "2.3"; - src = fetchPypi { - inherit version; - pname = "django-formtools"; - hash = "sha256-lmO27KZHd7aNbUFC762Fl/6aaFkkZzslqoodz/TbAMM="; - }; +}: +pretalx.overrideAttrs ( + finalAttrs: previousAttrs: { + propagatedBuildInputs = previousAttrs.propagatedBuildInputs ++ withPlugins; + passthru = + previousAttrs.passthru + // { + PYTHONPATH = "${pretalx.python.pkgs.makePythonPath finalAttrs.propagatedBuildInputs}:${pretalx.outPath}/${pretalx.python.sitePackages}"; }; - }; - }; -in - python.pkgs.buildPythonApplication rec { - pname = "pretalx"; - version = "2023.1.3"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - hash = "sha256-YxmkjfftNrInIcSkK21wJXiEU6hbdDa1Od8p+HiLprs="; - }; - - outputs = ["out" "static"]; - - nativeBuildInputs = [ - gettext - nodejs - pretalx-frontend - ]; - - propagatedBuildInputs = with python.pkgs; - [ - beautifulsoup4 - bleach - celery - css-inline - csscompressor - cssutils - defusedcsv - django - django-bootstrap4 - django-compressor - django-context-decorator - django-countries - django-csp - django-filter - django-formset-js-improved - django-formtools - django-hierarkey - django-i18nfield - django-libsass - django-scopes - djangorestframework - inlinestyler - libsass - markdown - pillow - publicsuffixlist - python-dateutil - pytz - qrcode - reportlab - requests - rules - urlman - vobject - whitenoise - zxcvbn - ] - ++ withPlugins; - - passthru.optional-dependencies = with python.pkgs; { - mysql = [mysqlclient]; - postgres = [psycopg2]; - redis = [redis]; - }; - - postPatch = '' - substituteInPlace src/pretalx/common/management/commands/rebuild.py --replace \ - 'subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env)' '#' - ''; - - postBuild = '' - rm -r ./src/pretalx/frontend/schedule-editor - ln -s ${pretalx-frontend}/lib/node_modules/@pretalx/schedule-editor ./src/pretalx/frontend/schedule-editor - - PYTHONPATH=$PYTHONPATH:./src python -m pretalx rebuild - ''; - - postInstall = '' - mkdir -p $out/bin - cp ./src/manage.py $out/bin/pretalx - - # The processed source files are in the static output, - # except for fonts, which are duplicated. - # See - # for more details. - find $out/${python.sitePackages}/pretalx/static \ - -mindepth 1 \ - -not -path "$out/${python.sitePackages}/pretalx/static/fonts*" \ - -delete - - mkdir -p $static - - # Copy generated static files into dedicated output. - cp -r ./src/static.dist/** $static/ - - # Copy frontend files. - cp -r ${pretalx-frontend}/lib/node_modules/@pretalx/schedule-editor/dist/* $static - ''; - - nativeCheckInputs = with python.pkgs; - [ - faker - freezegun - pytest-cov - pytest-django - pytest-mock - pytest-xdist - pytestCheckHook - responses - ] - ++ flatten (attrValues passthru.optional-dependencies); - - doCheck = true; - - preCheck = '' - export PRETALX_CONFIG_FILE="$src/src/tests/ci_sqlite.cfg" - cd src - ''; - - disabledTests = [ - # AssertionError: assert 'https://localhost' == None - "test_change_custom_domain[http://localhost-None]" - # npm run i18n:extract - "test_common_custom_makemessages_does_not_blow_up" - # Expected to perform X queries or less but Y were done - "test_schedule_export_public" - "test_schedule_frab_json_export" - "test_schedule_frab_xml_export" - ]; - - passthru = { - inherit python; - PYTHONPATH = "${python.pkgs.makePythonPath propagatedBuildInputs}:${pretalx.outPath}/${python.sitePackages}"; - - tests.pretalx = nixosTests.pretalx; - }; - - meta = { - description = "Conference planning tool: CfP, scheduling, speaker management"; - homepage = "https://github.com/pretalx/pretalx"; - license = licenses.asl20; - maintainers = with maintainers; - [ - andresnav - imincik - lorenzleutgeb - ] - ++ (with (import ../../maintainers/maintainers-list.nix); [augustebaum kubaneko]); - }; } +) diff --git a/pkgs/pretalx/frontend.nix b/pkgs/pretalx/frontend.nix deleted file mode 100644 index be17217b..00000000 --- a/pkgs/pretalx/frontend.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildNpmPackage, -}: let - inherit - (lib) - licenses - maintainers - ; -in - buildNpmPackage rec { - pname = "pretalx-frontend"; - version = "2023.1.0"; - - src = fetchFromGitHub { - owner = "pretalx"; - repo = "pretalx"; - rev = "v${version}"; - hash = "sha256-Few4Ojd2i0ELKWPJfkmfd3HeKFx/QK+aP5hYAHDdHeE="; - }; - - sourceRoot = "source/src/pretalx/frontend/schedule-editor"; - - npmDepsHash = "sha256-4cnBHZ8WpHgp/bbsYYbdtrhuD6ffUAZq9ZjoLpWGfRg="; - - buildPhase = '' - runHook preBuild - - npm run build - - runHook postBuild - ''; - - meta = { - description = "Conference planning tool: CfP, scheduling, speaker management"; - homepage = "https://github.com/pretalx/pretalx"; - license = licenses.asl20; - maintainers = with maintainers; [hexa]; - }; - } From 4476a4da73e548011076e91457f288f71319f3c3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:25:30 +0200 Subject: [PATCH 07/10] pretalx: restore main program to pretalx --- pkgs/pretalx/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/pretalx/default.nix b/pkgs/pretalx/default.nix index e7fa8da0..8b195d80 100644 --- a/pkgs/pretalx/default.nix +++ b/pkgs/pretalx/default.nix @@ -5,10 +5,20 @@ pretalx.overrideAttrs ( finalAttrs: previousAttrs: { propagatedBuildInputs = previousAttrs.propagatedBuildInputs ++ withPlugins; + postInstall = + previousAttrs.postInstall + + '' + cp $out/bin/${previousAttrs.meta.mainProgram} $out/bin/${finalAttrs.meta.mainProgram} + ''; passthru = previousAttrs.passthru // { PYTHONPATH = "${pretalx.python.pkgs.makePythonPath finalAttrs.propagatedBuildInputs}:${pretalx.outPath}/${pretalx.python.sitePackages}"; }; + meta = + previousAttrs.meta + // { + mainProgram = "pretalx"; + }; } ) From 50fe2ab65c9bdcd60dc0422d559b041f8026e428 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Fri, 12 Apr 2024 16:21:15 +0200 Subject: [PATCH 08/10] Revert "pretalx: restore main program to pretalx" This reverts commit 4476a4da73e548011076e91457f288f71319f3c3. --- pkgs/pretalx/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/pretalx/default.nix b/pkgs/pretalx/default.nix index 8b195d80..e7fa8da0 100644 --- a/pkgs/pretalx/default.nix +++ b/pkgs/pretalx/default.nix @@ -5,20 +5,10 @@ pretalx.overrideAttrs ( finalAttrs: previousAttrs: { propagatedBuildInputs = previousAttrs.propagatedBuildInputs ++ withPlugins; - postInstall = - previousAttrs.postInstall - + '' - cp $out/bin/${previousAttrs.meta.mainProgram} $out/bin/${finalAttrs.meta.mainProgram} - ''; passthru = previousAttrs.passthru // { PYTHONPATH = "${pretalx.python.pkgs.makePythonPath finalAttrs.propagatedBuildInputs}:${pretalx.outPath}/${pretalx.python.sitePackages}"; }; - meta = - previousAttrs.meta - // { - mainProgram = "pretalx"; - }; } ) From 394496f23bdbe5c21f591e3a0b4646963d3f09f2 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Fri, 12 Apr 2024 16:30:50 +0200 Subject: [PATCH 09/10] pretalx: Flexibly handle mainProgram --- modules/pretalx.nix | 14 +++++++++----- tests/pretalx/default.nix | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules/pretalx.nix b/modules/pretalx.nix index 98abf2c7..893e0117 100644 --- a/modules/pretalx.nix +++ b/modules/pretalx.nix @@ -27,6 +27,7 @@ optional escapeShellArgs generators + getExe filterAttrs filterAttrsRecursive ; @@ -48,10 +49,13 @@ pretalxWrapped = pkgs.runCommand "pretalx-wrapper" - {nativeBuildInputs = [pkgs.makeWrapper pkgs.python3Packages.wrapPython];} + { + nativeBuildInputs = [pkgs.makeWrapper pkgs.python3Packages.wrapPython]; + meta.mainProgram = cfg.package.meta.mainProgram; + } '' - makeWrapper ${cfg.package}/bin/pretalx \ - $out/bin/pretalx --prefix PYTHONPATH : "${PYTHONPATH}" + makeWrapper ${getExe cfg.package} \ + $out/bin/${cfg.package.meta.mainProgram} --prefix PYTHONPATH : "${PYTHONPATH}" ''; secretRecommendation = "Consider using a secret managing scheme such as `agenix` or `sops-nix` to generate this file."; @@ -496,7 +500,7 @@ in { }; script = '' ${exportPasswordEnv} - ${pretalxWrapped}/bin/pretalx ${command} + ${getExe pretalxWrapped} ${command} ''; }; in { @@ -526,7 +530,7 @@ in { script = '' ${exportPasswordEnv} export DJANGO_SUPERUSER_PASSWORD=$(cat ${cfg.init.admin.passwordFile}) - ${pretalxWrapped}/bin/pretalx init --noinput + ${getExe pretalxWrapped} init --noinput touch ${libDir}/init-will-not-run-again-if-this-file-exists ''; requires = ["pretalx-migrate.service"]; diff --git a/tests/pretalx/default.nix b/tests/pretalx/default.nix index 12ab503d..dc0b1ddb 100644 --- a/tests/pretalx/default.nix +++ b/tests/pretalx/default.nix @@ -64,10 +64,10 @@ in { server.wait_for_unit("pretalx-web.service") server.wait_until_succeeds("curl --fail --connect-timeout 2 localhost", timeout=60) - server.execute("pretalx create_test_event") + server.execute("${nodes.server.services.ngi-pretalx.package.meta.mainProgram} create_test_event") # NOTE: "democon" is the slug of the event created by - # `pretalx create_test_event`. + # `pretalx-manage create_test_event`. server.succeed("curl --fail --connect-timeout 10 http://localhost/democon") ''; } From 11704c470189a0d6d76b71b8eb7b826d78f5a93e Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Fri, 12 Apr 2024 16:31:30 +0200 Subject: [PATCH 10/10] pretalx: Wire NixOS test --- pkgs/pretalx/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/pretalx/default.nix b/pkgs/pretalx/default.nix index e7fa8da0..afa944d0 100644 --- a/pkgs/pretalx/default.nix +++ b/pkgs/pretalx/default.nix @@ -1,6 +1,7 @@ { pretalx, withPlugins ? [], + nixosTests, }: pretalx.overrideAttrs ( finalAttrs: previousAttrs: { @@ -9,6 +10,11 @@ pretalx.overrideAttrs ( previousAttrs.passthru // { PYTHONPATH = "${pretalx.python.pkgs.makePythonPath finalAttrs.propagatedBuildInputs}:${pretalx.outPath}/${pretalx.python.sitePackages}"; + tests = + previousAttrs.passthru.tests + // { + inherit (nixosTests) pretalx; + }; }; } )