From 33d05c1c55fe3b9a2dc3b033033ef444c991a8a7 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 22 Feb 2024 11:19:01 +0000 Subject: [PATCH] nim_lk: 20231031 -> 20240210 --- pkgs/by-name/ni/nim_lk/lock.json | 32 ++++++++++++++++++++++++------ pkgs/by-name/ni/nim_lk/package.nix | 13 +++++++----- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ni/nim_lk/lock.json b/pkgs/by-name/ni/nim_lk/lock.json index 90929f01a04b..88a746065af8 100644 --- a/pkgs/by-name/ni/nim_lk/lock.json +++ b/pkgs/by-name/ni/nim_lk/lock.json @@ -1,12 +1,33 @@ { "depends": [ + { + "method": "fetchzip", + "packages": [ + "atlas" + ], + "path": "/nix/store/v015scfifr10ialyimn7xxm0rdg4dha2-source", + "rev": "60681b93af4c8914afbd8eae9fc9820ba4d198a0", + "sha256": "1kc47w20ipbdh31s1gcblcikzlvlagmmha1qw3by70fc7mgazrxf", + "srcDir": "src", + "url": "https://github.com/nim-lang/atlas/archive/60681b93af4c8914afbd8eae9fc9820ba4d198a0.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "bigints" + ], + "path": "/nix/store/jvrm392g8adfsgf36prgwkbyd7vh5jsw-source", + "rev": "86ea14d31eea9275e1408ca34e6bfe9c99989a96", + "sha256": "15pcpmnk1bnw3k8769rjzcpg00nahyrypwbxs88jnwr4aczp99j4", + "srcDir": "src", + "url": "https://github.com/ehmry/nim-bigints/archive/86ea14d31eea9275e1408ca34e6bfe9c99989a96.tar.gz" + }, { "method": "fetchzip", "packages": [ "npeg" ], "path": "/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source", - "ref": "1.2.1", "rev": "26d62fdc40feb84c6533956dc11d5ee9ea9b6c09", "sha256": "0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh", "srcDir": "src", @@ -17,12 +38,11 @@ "packages": [ "preserves" ], - "path": "/nix/store/nrcpzf9hx70kry3gwhrdzcs3qicjncjh-source", - "ref": "20231021", - "rev": "edece399be70818208bf2263c30cb2bcf435bbff", - "sha256": "0xmw35wmw3a4lja9q4qvlvpxv3xk0hnkjg4fwfw6f3inh6zfiqki", + "path": "/nix/store/6nnn5di5vip1vladlb7z56rbw18d1y7j-source", + "rev": "2825bceecf33a15b9b7942db5331a32cbc39b281", + "sha256": "145vf46fy3wc52j6vs509fm9bi5lx7c53gskbkpcfbkv82l86dgk", "srcDir": "src", - "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/edece399be70818208bf2263c30cb2bcf435bbff.tar.gz" + "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/2825bceecf33a15b9b7942db5331a32cbc39b281.tar.gz" } ] } diff --git a/pkgs/by-name/ni/nim_lk/package.nix b/pkgs/by-name/ni/nim_lk/package.nix index 597a4d3c89df..680ba976b5bd 100644 --- a/pkgs/by-name/ni/nim_lk/package.nix +++ b/pkgs/by-name/ni/nim_lk/package.nix @@ -8,25 +8,28 @@ , makeWrapper }: -buildNimPackage (finalAttrs: { +let nim' = nim.passthru.nim; +in buildNimPackage (finalAttrs: { pname = "nim_lk"; - version = "20231031"; + version = "20240210"; src = fetchFromSourcehut { owner = "~ehmry"; repo = "nim_lk"; rev = finalAttrs.version; - hash = "sha256-dXm3dfXAxgucek19f1KdRShOsJyELPTB32qgGSKId6A="; + hash = "sha256-LLOf8HNee0Mol+e7/dvu9hQUCmpaVBNggTxaAl/wV6Y="; }; + lockFile = ./lock.json; + buildInputs = [ openssl ]; nativeBuildInputs = [ makeWrapper ]; - lockFile = ./lock.json; + nimFlags = [ "--path:${nim'}/nim" ]; postFixup = '' wrapProgram $out/bin/nim_lk \ - --suffix PATH : ${lib.makeBinPath [ nim nix-prefetch nix-prefetch-git ]} + --suffix PATH : ${lib.makeBinPath [ nim' nix-prefetch nix-prefetch-git ]} ''; meta = finalAttrs.src.meta // {