From b6bfe83c83ea9231a0fb8d31af13bd54199d25ab Mon Sep 17 00:00:00 2001 From: daylin-bot Date: Wed, 20 Nov 2024 17:46:49 +0000 Subject: [PATCH] fix nph --- modules/languages/nim.nix | 3 ++- pkgs/default.nix | 2 +- pkgs/nim/nph/default.nix | 9 ++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/languages/nim.nix b/modules/languages/nim.nix index 8acbc0c..ed75c3b 100644 --- a/modules/languages/nim.nix +++ b/modules/languages/nim.nix @@ -13,9 +13,10 @@ in config = mkIfIn "nim" cfg { environment.systemPackages = with pkgs; [ nim - # nimble nimlangserver + (flake.pkgs "self").nimble + (flake.pkgs "self").nph ]; }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 7047ae6..92549c2 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,7 +3,7 @@ let inherit (pkgs) python3Packages; in { - # nph = pkgs.callPackage ./nim/nph { }; # doesn't compile with 2.2.0 :/ + nph = pkgs.callPackage ./nim/nph { }; # nimlangserver = pkgs.callPackage ./nim/nimlangserver { }; nimble = pkgs.callPackage ./nim/nimble { }; diff --git a/pkgs/nim/nph/default.nix b/pkgs/nim/nph/default.nix index 50ad510..5f51f13 100644 --- a/pkgs/nim/nph/default.nix +++ b/pkgs/nim/nph/default.nix @@ -1,8 +1,15 @@ { fetchFromGitHub, buildNimPackage, + nim-2_0, }: -buildNimPackage (finalAttrs: { +let + buildNimPackage' = buildNimPackage.override { + # Do not build with Nim-2.2.x. + nim2 = nim-2_0; + }; +in +buildNimPackage' (finalAttrs: { pname = "nph"; version = "0.6.0"; src = fetchFromGitHub {