From e44368b01fac10912995eea953ff8e5a6b365082 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 9 Oct 2023 19:57:05 +0100 Subject: [PATCH] Add lockfile --- .gitignore | 2 +- Tupfile | 3 +++ Tuprules.tup | 2 ++ lock.json | 1 + nix_actor.nimble | 2 +- shell.nix | 18 +++++++++++++++--- 6 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 Tupfile create mode 100644 lock.json diff --git a/.gitignore b/.gitignore index 7ad6275..8454dc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/.direnv +/nim.cfg diff --git a/Tupfile b/Tupfile new file mode 100644 index 0000000..9368191 --- /dev/null +++ b/Tupfile @@ -0,0 +1,3 @@ +include_rules +: |> !nim_lk |> | ./ +: lock.json |> !nim_cfg |> | ./ diff --git a/Tuprules.tup b/Tuprules.tup index ab2cf9f..0d08158 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -3,3 +3,5 @@ NIM_FLAGS += --path:$(TUP_CWD)/../eris-nim/src include ../syndicate-nim/depends.tup NIM_FLAGS += --path:$(TUP_CWD)/../syndicate-nim/src + +NIM_GROUPS += $(TUP_CWD)/ diff --git a/lock.json b/lock.json new file mode 100644 index 0000000..21f963e --- /dev/null +++ b/lock.json @@ -0,0 +1 @@ +{"depends":[{"method":"fetchzip","packages":["syndicate"],"path":"/nix/store/008s11kkqscfqxs6g29q77c38pnrlppi-source","ref":"20231005","rev":"552e51899c82c0c2f4f466382be7d8e22a1da689","sha256":"1j3k0zlh5z02adhfvb7rdqz8fjzc6gri4v3v1fgcv2h2b7vrf0dg","srcDir":"src","url":"https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/552e51899c82c0c2f4f466382be7d8e22a1da689.tar.gz"},{"method":"fetchzip","packages":["coap"],"path":"/nix/store/pqj933cnw7r7hp46jrpjlwh1yr0jvckp-source","ref":"20230331","rev":"a134213b51a8d250684f2ba26802ffa97fae4ffb","sha256":"1wbix6d8l26nj7m3xinh4m2f27n4ma0yzs3x5lpann2ha0y51k8b","srcDir":"src","url":"https://codeberg.org/eris/nim-coap/archive/a134213b51a8d250684f2ba26802ffa97fae4ffb.tar.gz"},{"method":"fetchzip","packages":["hashlib"],"path":"/nix/store/v03nzlpdgbfxd2zhcnkfbkq01d5kqxcl-source","rev":"84e0247555e4488594975900401baaf5bbbfb53","sha256":"1pfczsv8kl36qpv543f93d2y2vgz2acckssfap7l51s2x62m6qwx","srcDir":"","url":"https://github.com/khchen/hashlib/archive/84e0247555e4488594975900401baaf5bbbfb53.tar.gz"},{"method":"fetchzip","packages":["preserves"],"path":"/nix/store/vx6ihnickx7d5lwy69i8k7fsjicv33r3-source","ref":"20230914","rev":"c915accf7d2a36ca1f323e2f02e2df7375e815f1","sha256":"11rlcbs9mvk335ibkbj8fk9aslhmnlaiqhcsjpp5n04k447sr7nx","srcDir":"src","url":"https://git.syndicate-lang.org/ehmry/preserves-nim/archive/c915accf7d2a36ca1f323e2f02e2df7375e815f1.tar.gz"},{"method":"fetchzip","packages":["eris"],"path":"/nix/store/lxa6ba8r9hhs06k6f2iyznwjxix1klv1-source","ref":"20230823","rev":"49d8117367d3530533dc1d6a9111ddd134b08b1e","sha256":"0lq9a04cayf04nnhn0gvp5phlij0cis38v7cz7jmgks2xvz1bcbr","srcDir":"src","url":"https://codeberg.org/eris/nim-eris/archive/49d8117367d3530533dc1d6a9111ddd134b08b1e.tar.gz"},{"method":"fetchzip","packages":["cbor"],"path":"/nix/store/70cqa9s36dqnmsf179cn9psj77jhqi1l-source","ref":"20230619","rev":"a4a1affd45ba90bea24e08733ae2bd02fe058166","sha256":"005ib6im97x9pdbg6p0fy58zpdwdbkpmilxa8nhrrb1hnpjzz90p","srcDir":"src","url":"https://git.sr.ht/~ehmry/nim_cbor/archive/a4a1affd45ba90bea24e08733ae2bd02fe058166.tar.gz"},{"method":"fetchzip","packages":["freedesktop_org"],"path":"/nix/store/98wncmx58cfnhv3y96lzwm22zvyk9b1h-source","ref":"20230210","rev":"fb04d0862aca4be2edcc0eafa94b1840030231c8","sha256":"0wj5m09x1pr36gv8p5r72p6l3wwl01y8scpnlzx7q0h5ij6jaj6s","srcDir":"src","url":"https://git.sr.ht/~ehmry/freedesktop_org/archive/fb04d0862aca4be2edcc0eafa94b1840030231c8.tar.gz"},{"method":"fetchzip","packages":["configparser"],"path":"/nix/store/4zl5v7i6cj3f9sayvsjcx2h20lqwr9a6-source","ref":"newSection","rev":"695f1285d63f1954c25eb1f42798d90fa7bcbe14","sha256":"0b0pb5i0kir130ia2zf8zcgdz8awms161i6p83ri3nbgibbjnr37","srcDir":"src","url":"https://github.com/ehmry/nim-configparser/archive/695f1285d63f1954c25eb1f42798d90fa7bcbe14.tar.gz"},{"method":"fetchzip","packages":["tkrzw"],"path":"/nix/store/4x9wxyli4dy719svg1zaww0c0b3xckp0-source","ref":"20220922","rev":"efd87edb7b063182c1a1fa018006a87b515d589b","sha256":"1h0sdvai4gkkz48xfh67wa1xz2k8bkkba8q6snnbllmhmywd9apb","srcDir":"src","url":"https://git.sr.ht/~ehmry/nim-tkrzw/archive/efd87edb7b063182c1a1fa018006a87b515d589b.tar.gz"},{"method":"fetchzip","packages":["getdns"],"path":"/nix/store/x9xmn7w4k6jg8nv5bnx148ibhnsfh362-source","ref":"20221222","rev":"c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6","sha256":"1sbgx2x51szr22i72n7c8jglnfmr8m7y7ga0v85d58fwadiv7g6b","srcDir":"src","url":"https://git.sr.ht/~ehmry/getdns-nim/archive/c73cbe288d9f9480586b8fa87f6d794ffb6a6ce6.tar.gz"},{"method":"fetchzip","packages":["nimcrypto"],"path":"/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source","ref":"traditional-api","rev":"602c5d20c69c76137201b5d41f788f72afb95aa8","sha256":"1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65","srcDir":"","url":"https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz"},{"method":"fetchzip","packages":["taps"],"path":"/nix/store/did1li0xk9qih80pvxqhjc4np3ijlfjj-source","ref":"20230331","rev":"4f9c9972d74eb39c662b43ed79d761e109bf00f1","sha256":"12qsizmisr1q0q4x37c5q6gmnqb5mp0bid7s3jlcsjvhc4jw2q57","srcDir":"src","url":"https://git.sr.ht/~ehmry/nim_taps/archive/4f9c9972d74eb39c662b43ed79d761e109bf00f1.tar.gz"},{"method":"fetchzip","packages":["base32"],"path":"/nix/store/qcnchjsak3hyn4c6r0zd6qvm7j8y1747-source","ref":"0.1.3","rev":"f541038fbe49fdb118cc2002d29824b9fc4bfd61","sha256":"16gh1ifp9hslsg0is0v1ya7rxqfhq5hjqzc3pfdqvcgibp5ybh06","srcDir":"","url":"https://github.com/OpenSystemsLab/base32.nim/archive/f541038fbe49fdb118cc2002d29824b9fc4bfd61.tar.gz"},{"method":"fetchzip","packages":["npeg"],"path":"/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source","ref":"1.2.1","rev":"26d62fdc40feb84c6533956dc11d5ee9ea9b6c09","sha256":"0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh","srcDir":"src","url":"https://github.com/zevv/npeg/archive/26d62fdc40feb84c6533956dc11d5ee9ea9b6c09.tar.gz"}]} diff --git a/nix_actor.nimble b/nix_actor.nimble index 21fd165..f532d82 100644 --- a/nix_actor.nimble +++ b/nix_actor.nimble @@ -5,4 +5,4 @@ license = "Unlicense" srcDir = "src" bin = @["nix_actor"] -requires "nim >= 1.6.10", "syndicate >= 20230530" +requires "nim >= 1.6.10", "syndicate >= 20231005", "eris >= 20230823" diff --git a/shell.nix b/shell.nix index 00ec36d..656b039 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,16 @@ +{ pkgs ? import { } }: + let - flake = builtins.getFlake "/home/emery/src/syndicate-flake"; - pkgs = import { overlays = [ flake.overlays.default ]; }; -in pkgs.nim2Packages.nix_actor + nix' = pkgs.nix.overrideAttrs (final: prev: { + src = pkgs.fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "2.13.3"; + hash = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc="; + }; + }); +in pkgs.nim2Packages.buildNimPackage { + name = "dummy"; + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = [ pkgs.boost nix' ]; +}