summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPol Dellaiera <pol.dellaiera@protonmail.com>2023-07-31 13:55:40 +0200
committerGitHub <noreply@github.com>2023-07-31 13:55:40 +0200
commit14826510517df715d5859e24319087fe2e120d40 (patch)
treef267966a1f43994cd7a27922cf144896f0c6e3e0
parentMerge pull request #246188 from gdamjan/bump-matrix-appservice-irc-2 (diff)
parentmaintainers: add knightpp (diff)
downloadnixpkgs-14826510517df715d5859e24319087fe2e120d40.tar.gz
Merge pull request #246087 from knightpp/pkg/espup
espup: init at 0.4.1
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/development/tools/espup/default.nix82
-rw-r--r--pkgs/top-level/all-packages.nix3
3 files changed, 90 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 42e34d009bc1..c74ec4ef8de5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8974,6 +8974,12 @@
githubId = 3287933;
name = "Josef Kemetmüller";
};
+ knightpp = {
+ email = "knightpp@proton.me";
+ github = "knightpp";
+ githubId = 28928944;
+ name = "Danylo Kondratiev";
+ };
knl = {
email = "nikola@knezevic.co";
github = "knl";
diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix
new file mode 100644
index 000000000000..6ff3a2972a46
--- /dev/null
+++ b/pkgs/development/tools/espup/default.nix
@@ -0,0 +1,82 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, installShellFiles
+, bzip2
+, openssl
+, xz
+, zstd
+, stdenv
+, darwin
+, runCommand
+, espup
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "espup";
+ version = "0.4.1";
+
+ src = fetchFromGitHub {
+ owner = "esp-rs";
+ repo = "espup";
+ rev = "v${version}";
+ hash = "sha256-gzM+RT4Rt+LaYk7CwYUTIMci8DDI0y3+7y+N2yKRDOc=";
+ };
+
+ cargoHash = "sha256-GYhF6VDBAieZbu4x9EiQVVJkmx0aRYK0xwGGP0nuVGc=";
+
+ nativeBuildInputs = [
+ pkg-config
+ installShellFiles
+ ];
+
+ buildInputs = [
+ bzip2
+ openssl
+ xz
+ zstd
+ ] ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.CoreFoundation
+ darwin.apple_sdk.frameworks.Security
+ ];
+
+ env = {
+ OPENSSL_NO_VENDOR = true;
+ ZSTD_SYS_USE_PKG_CONFIG = true;
+ };
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ checkFlags = [
+ # makes network calls
+ "--skip=toolchain::rust::tests::test_xtensa_rust_parse_version"
+ ];
+
+ postInstall = ''
+ installShellCompletion --cmd espup \
+ --bash <($out/bin/espup completions bash) \
+ --fish <($out/bin/espup completions fish) \
+ --zsh <($out/bin/espup completions zsh)
+ '';
+
+ passthru.tests = {
+ simple = runCommand "${pname}-test" { } ''
+ if [[ `${espup}/bin/espup --version` != *"${version}"* ]]; then
+ echo "Error: program version does not match package version"
+ exit 1
+ fi
+
+ touch $out
+ '';
+ };
+
+ meta = with lib; {
+ description = "Tool for installing and maintaining Espressif Rust ecosystem.";
+ homepage = "https://github.com/esp-rs/espup/";
+ license = with licenses; [ mit asl20 ];
+ maintainers = with maintainers; [ knightpp ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb552ca749ee..ff10e76bca89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18153,6 +18153,8 @@ with pkgs;
doq = callPackage ../development/tools/misc/doq { };
+ espup = callPackage ../development/tools/espup { };
+
phpunit = callPackage ../development/tools/misc/phpunit { };
teller = callPackage ../development/tools/teller { };
@@ -41567,5 +41569,4 @@ with pkgs;
gitrs = callPackage ../tools/misc/gitrs { };
wttrbar = callPackage ../applications/misc/wttrbar { };
-
}