diff options
| author | Felix Schröter <dev@felschr.com> | 2023-07-10 18:15:42 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-07-10 17:56:25 +0000 |
| commit | 01df6c832a784841f52e24ede87ba54552026301 (patch) | |
| tree | 0ec060b031af99537154464ba9f6e9024b032886 | |
| parent | Merge pull request #242618 from NixOS/backport-242606-to-release-23.05 (diff) | |
| download | nixpkgs-origin/backport-242669-to-release-23.05.tar.gz | |
{nickel,nls}: 1.0.0 -> 1.1.1origin/backport-242669-to-release-23.05
(cherry picked from commit c63d0ebe294e83ee15ac5f897d86b55e4bbb39fc)
| -rw-r--r-- | pkgs/development/interpreters/nickel/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/tools/language-servers/nls/default.nix | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/nickel/default.nix b/pkgs/development/interpreters/nickel/default.nix index 7d083f988e9f..d74bfbc4f380 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 ad92c681bf28..9b9fea87b30e 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" ]; |