summary refs log tree commit diff
diff options
context:
space:
mode:
authorFelix Schröter <dev@felschr.com>2023-07-10 18:15:42 +0200
committerAnderson Torres <torres.anderson.85@protonmail.com>2023-07-10 14:55:46 -0300
commita9e20ed1e0568ddebc89b01afd93424ea578260d (patch)
tree77235c1553a8a4f6cf88118511eac5526a059134
parentc86eb69b639870622e9f3f11200d1e908d60c6f7 (diff)
downloadnixpkgs-a9e20ed1e0568ddebc89b01afd93424ea578260d.tar
nixpkgs-a9e20ed1e0568ddebc89b01afd93424ea578260d.tar.gz
nixpkgs-a9e20ed1e0568ddebc89b01afd93424ea578260d.tar.bz2
nixpkgs-a9e20ed1e0568ddebc89b01afd93424ea578260d.tar.lz
nixpkgs-a9e20ed1e0568ddebc89b01afd93424ea578260d.tar.xz
nixpkgs-a9e20ed1e0568ddebc89b01afd93424ea578260d.tar.zst
nixpkgs-a9e20ed1e0568ddebc89b01afd93424ea578260d.zip
{nickel,nls}: 1.0.0 -> 1.1.1
-rw-r--r--pkgs/development/interpreters/nickel/default.nix15
-rw-r--r--pkgs/development/tools/language-servers/nls/default.nix4
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/nickel/default.nix b/pkgs/development/interpreters/nickel/default.nix
index 7d083f988e9..d74bfbc4f38 100644
--- a/pkgs/development/interpreters/nickel/default.nix
+++ b/pkgs/development/interpreters/nickel/default.nix
@@ -1,21 +1,28 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
+, python3
 , nix-update-script
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "nickel";
-  version = "1.0.0";
+  version = "1.1.1";
 
   src  = fetchFromGitHub {
     owner = "tweag";
     repo = pname;
-    rev = "refs/tags/${version}"; # because pure ${version} doesn't work
-    hash = "sha256-8peoO3B5LHKiTUyDLpe0A2xg82LPI7l2vuGdyNhV478=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-bG0vNfKQpFQHDBfokvTpfXgVmKg6u/BcIz139pLwwsE=";
   };
 
-  cargoHash = "sha256-lrRCc5kUekUHrJTznR8xRiLVgQLJ/PsMP967PS41UJU=";
+  cargoHash = "sha256-qPKAozFXv94wgY99ugjsSuaN92SXZGgZwI2+7UlerHQ=";
+
+  cargoBuildFlags = [ "-p nickel-lang-cli" ];
+
+  nativeBuildInputs = [
+    python3
+  ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/development/tools/language-servers/nls/default.nix b/pkgs/development/tools/language-servers/nls/default.nix
index ad92c681bf2..9b9fea87b30 100644
--- a/pkgs/development/tools/language-servers/nls/default.nix
+++ b/pkgs/development/tools/language-servers/nls/default.nix
@@ -6,9 +6,9 @@
 rustPlatform.buildRustPackage {
   pname = "nls";
 
-  inherit (nickel) src version;
+  inherit (nickel) src version nativeBuildInputs;
 
-  cargoHash = "sha256-tahSuSc16oUUjeBBAnTDAiSaLr0zMKgN/XvypXqvvxw=";
+  cargoHash = "sha256-UGfc5cr6vl10aCVihOEEZktF8MzT56C9/wSvSQhCiVs=";
 
   cargoBuildFlags = [ "-p nickel-lang-lsp" ];