diff options
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/ecpdap/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/misc/jiq/default.nix | 31 | ||||
-rw-r--r-- | pkgs/development/tools/pypi2nix/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/rust/cargo-msrv/default.nix | 6 |
4 files changed, 39 insertions, 5 deletions
diff --git a/pkgs/development/tools/ecpdap/default.nix b/pkgs/development/tools/ecpdap/default.nix index 46b5945fb94..3bb12c40e35 100644 --- a/pkgs/development/tools/ecpdap/default.nix +++ b/pkgs/development/tools/ecpdap/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkg-config, libusb1 }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libusb1, AppKit }: rustPlatform.buildRustPackage rec { pname = "ecpdap"; @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 ] + ++ lib.optional stdenv.isDarwin AppKit; postInstall = '' mkdir -p $out/etc/udev/rules.d diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix new file mode 100644 index 00000000000..c52a9ae4c03 --- /dev/null +++ b/pkgs/development/tools/misc/jiq/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, jq, makeWrapper }: + +buildGoModule rec { + pname = "jiq"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "fiatjaf"; + repo = pname; + rev = version; + sha256 = "sha256-EPhnfgmn0AufuxwcwRrEEQk+RD97akFJSzngkTl4LmY="; + }; + + vendorSha256 = "sha256-ZUmOhPGy+24AuxdeRVF0Vnu8zDGFrHoUlYiDdfIV5lc="; + + nativeBuildInputs = [ makeWrapper ]; + + checkInputs = [ jq ]; + + postInstall = '' + wrapProgram $out/bin/jiq \ + --prefix PATH : ${lib.makeBinPath [ jq ]} + ''; + + meta = with lib; { + homepage = "https://github.com/fiatjaf/jiq"; + license = licenses.mit; + description = "jid on jq - interactive JSON query tool using jq expressions"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 980aa0f09ea..04d61995d3f 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -20,4 +20,6 @@ pkgs.buildPythonApplication rec { toml jsonschema ]; + # https://github.com/nix-community/pypi2nix/issues/460 + meta.broken = true; } diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index d5feba80d09..c6a02a4dff2 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "1ynv5d2rxlc1gzq93v8qjyl5063w7q42g9m95250yh2lmf9hdj5i"; + sha256 = "sha256-7XOpK6+JVV/p+g/Lb/ORUC9msME0vtuDbmiCBmuOJ8w="; }; - cargoSha256 = "03rphdps17gzcmf8n5w14x5i5rjnfznsl150s3cz5vzhbmnlpszf"; + cargoSha256 = "sha256-KYITZHBcb5G+7PW8kwbHSsereVjH39cVLQjqNaCq2iU="; passthru = { updateScript = nix-update-script { |