summary refs log tree commit diff
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2022-03-10 20:48:59 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2022-03-10 22:56:29 +1000
commit409560df4a4c6ed2b01668ffcd9ad67068d5019e (patch)
tree973d2b62377559e54861e9f30c71d8dcbd966323
parent04c605e170acbbbfbdf04f9766197efbb41d3a89 (diff)
downloadnixpkgs-409560df4a4c6ed2b01668ffcd9ad67068d5019e.tar
nixpkgs-409560df4a4c6ed2b01668ffcd9ad67068d5019e.tar.gz
nixpkgs-409560df4a4c6ed2b01668ffcd9ad67068d5019e.tar.bz2
nixpkgs-409560df4a4c6ed2b01668ffcd9ad67068d5019e.tar.lz
nixpkgs-409560df4a4c6ed2b01668ffcd9ad67068d5019e.tar.xz
nixpkgs-409560df4a4c6ed2b01668ffcd9ad67068d5019e.tar.zst
nixpkgs-409560df4a4c6ed2b01668ffcd9ad67068d5019e.zip
jless: 0.7.2 -> 0.8.0
https://github.com/PaulJuliusMartinez/jless/releases/tag/v0.8.0
-rw-r--r--pkgs/development/tools/jless/default.nix16
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix
index f18f3f556c5..558c9e019e1 100644
--- a/pkgs/development/tools/jless/default.nix
+++ b/pkgs/development/tools/jless/default.nix
@@ -1,21 +1,27 @@
-{ lib, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform, stdenv, python3, AppKit, libxcb }:
 
 rustPlatform.buildRustPackage rec {
   pname = "jless";
-  version = "0.7.2";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "PaulJuliusMartinez";
     repo = "jless";
     rev = "v${version}";
-    sha256 = "sha256-IK+EllkctdhIYuzj7eLjadxKoutICPeSXAjLMFiRjmo=";
+    sha256 = "sha256-NB/s29M46mVhTsJWFYnBgJjSjUVbfdmuz69VdpVuR7c=";
   };
 
-  cargoSha256 = "sha256-CAyKWwtMq5UOODVRrpVHrhlep2wqG434dMGeYV2FSZY=";
+  cargoSha256 = "sha256-cPj9cTRhWK/YU8Cae63p4Vm5ohB1IfGL5fu7yyFGSXA=";
+
+  nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ];
+
+  buildInputs = [ ]
+    ++ lib.optionals stdenv.isDarwin [ AppKit ]
+    ++ lib.optionals stdenv.isLinux [ libxcb ];
 
   meta = with lib; {
     description = "A command-line pager for JSON data";
-    homepage = "https://github.com/PaulJuliusMartinez/jless";
+    homepage = "https://jless.io";
     license = licenses.mit;
     maintainers = with maintainers; [ jfchevrette zowoq ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f85bb4ca34..d9b83973e34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6881,7 +6881,9 @@ with pkgs;
 
   jl = haskellPackages.callPackage ../development/tools/jl { };
 
-  jless = callPackage ../development/tools/jless { };
+  jless = callPackage ../development/tools/jless {
+    inherit (darwin.apple_sdk.frameworks) AppKit;
+  };
 
   jmespath = callPackage ../development/tools/jmespath { };