From 3d5455ac3b609bbdca913a523a94a327a00936f3 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 31 Oct 2023 16:31:12 +0000 Subject: [PATCH] eriscmd: migrate from nimPackages.eris --- pkgs/by-name/er/eriscmd/lock.json | 112 ++++++++++++++++++ .../er/eriscmd/package.nix} | 8 +- .../nim-packages/base32/default.nix | 17 --- .../development/nim-packages/cbor/default.nix | 20 ---- .../development/nim-packages/coap/default.nix | 20 ---- .../nim-packages/freedesktop_org/default.nix | 30 ----- .../nim-packages/getdns/default.nix | 24 ---- .../nim-packages/preserves/default.nix | 21 ---- .../nim-packages/syndicate/default.nix | 20 ---- .../development/nim-packages/taps/default.nix | 19 --- .../nim-packages/tkrzw/default.nix | 20 ---- pkgs/top-level/nim-overrides.nix | 15 +++ pkgs/top-level/nim-packages.nix | 21 ---- 13 files changed, 130 insertions(+), 217 deletions(-) create mode 100644 pkgs/by-name/er/eriscmd/lock.json rename pkgs/{development/nim-packages/eris/default.nix => by-name/er/eriscmd/package.nix} (79%) delete mode 100644 pkgs/development/nim-packages/base32/default.nix delete mode 100644 pkgs/development/nim-packages/cbor/default.nix delete mode 100644 pkgs/development/nim-packages/coap/default.nix delete mode 100644 pkgs/development/nim-packages/freedesktop_org/default.nix delete mode 100644 pkgs/development/nim-packages/getdns/default.nix delete mode 100644 pkgs/development/nim-packages/preserves/default.nix delete mode 100644 pkgs/development/nim-packages/syndicate/default.nix delete mode 100644 pkgs/development/nim-packages/taps/default.nix delete mode 100644 pkgs/development/nim-packages/tkrzw/default.nix diff --git a/pkgs/by-name/er/eriscmd/lock.json b/pkgs/by-name/er/eriscmd/lock.json new file mode 100644 index 000000000000..af543908cf4b --- /dev/null +++ b/pkgs/by-name/er/eriscmd/lock.json @@ -0,0 +1,112 @@ +{ + "depends": [ + { + "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": [ + "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": [ + "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": [ + "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": [ + "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": [ + "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": [ + "illwill" + ], + "path": "/nix/store/3lmm3z36qn4gz7bfa209zv0pqrpm3di9-source", + "ref": "v0.3.2", + "rev": "1d12cb36ab7b76c31d2d25fa421013ecb382e625", + "sha256": "0f9yncl5gbdja18mrqf5ixrdgrh95k0khda923dm1jd1x1b7ar8z", + "srcDir": "", + "url": "https://github.com/johnnovak/illwill/archive/1d12cb36ab7b76c31d2d25fa421013ecb382e625.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": [ + "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" + } + ] +} diff --git a/pkgs/development/nim-packages/eris/default.nix b/pkgs/by-name/er/eriscmd/package.nix similarity index 79% rename from pkgs/development/nim-packages/eris/default.nix rename to pkgs/by-name/er/eriscmd/package.nix index 2d7b229ca1a1..dcad67e2a8a4 100644 --- a/pkgs/development/nim-packages/eris/default.nix +++ b/pkgs/by-name/er/eriscmd/package.nix @@ -1,10 +1,10 @@ -{ lib, buildNimPackage, fetchFromGitea, pkg-config, base32, coap, cbor -, freedesktop_org, illwill, syndicate, tkrzw }: +{ lib, buildNimPackage, fetchFromGitea }: buildNimPackage (final: prev: { pname = "eris"; version = "20230722"; outputs = [ "bin" "out" ]; + requiredNimVersion = 1; src = fetchFromGitea { domain = "codeberg.org"; owner = "eris"; @@ -12,9 +12,7 @@ buildNimPackage (final: prev: { rev = final.version; hash = "sha256-JVl2/PmFVYuD4s9hKoQwVDKUa3PBWK5SBDEmVHVSuig="; }; - propagatedNativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = - [ base32 coap cbor freedesktop_org illwill tkrzw ]; + lockFile = ./lock.json; postInstall = '' mkdir -p "$bin/share/recoll/filters" mv "$bin/bin/rclerislink" "$bin/share/recoll/filters/" diff --git a/pkgs/development/nim-packages/base32/default.nix b/pkgs/development/nim-packages/base32/default.nix deleted file mode 100644 index a6ae28b45b54..000000000000 --- a/pkgs/development/nim-packages/base32/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "base32"; - version = "0.1.3"; - src = fetchFromGitHub { - owner = "OpenSystemsLab"; - repo = "${pname}.nim"; - rev = version; - hash = "sha256-BsDly13xsY2bu4N9LGHB0OGej/JhAx3B01TDdF0M8Jk="; - }; - meta = src.meta // { - description = "Base32 library for Nim"; - maintainers = with lib.maintainers; [ ehmry ]; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/nim-packages/cbor/default.nix b/pkgs/development/nim-packages/cbor/default.nix deleted file mode 100644 index 2949f4c1c853..000000000000 --- a/pkgs/development/nim-packages/cbor/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromSourcehut }: - -buildNimPackage rec { - pname = "cbor"; - version = "20230619"; - src = fetchFromSourcehut { - owner = "~ehmry"; - repo = "nim_${pname}"; - rev = version; - hash = "sha256-F6T/5bUwrJyhRarTWO9cjbf7UfEOXPNWu6mfVKNZsQA="; - }; - meta = with lib; - src.meta // { - description = - "Concise Binary Object Representation decoder and encoder (RFC8949)"; - license = licenses.unlicense; - maintainers = [ maintainers.ehmry ]; - mainProgram = "cbordiag"; - }; -} diff --git a/pkgs/development/nim-packages/coap/default.nix b/pkgs/development/nim-packages/coap/default.nix deleted file mode 100644 index b7a35dcb1a96..000000000000 --- a/pkgs/development/nim-packages/coap/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitea, taps }: - -buildNimPackage rec { - pname = "coap"; - version = "20230125"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "eris"; - repo = "${pname}-nim"; - rev = version; - hash = "sha256-wlDyqRxXTrX+zXDIe2o9FTU2o26LO/6m7H/FGok1JDw="; - }; - propagatedBuildInputs = [ taps ]; - meta = src.meta // { - description = - "Nim implementation of the Constrained Application Protocol (CoAP) over TCP"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/freedesktop_org/default.nix b/pkgs/development/nim-packages/freedesktop_org/default.nix deleted file mode 100644 index 52e672b3d697..000000000000 --- a/pkgs/development/nim-packages/freedesktop_org/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildNimPackage, fetchFromSourcehut, fetchFromGitHub }: - -let - # freedesktop_org requires a fork of configparser - configparser = buildNimPackage rec { - pname = "configparser"; - version = "20230120"; - src = fetchFromGitHub { - repo = "nim-" + pname; - owner = "ehmry"; - rev = "695f1285d63f1954c25eb1f42798d90fa7bcbe14"; - hash = "sha256-Z2Qr14pv2RHzQNfEYIKuXKHfHvvIfaEiGCHHCWJZFyw="; - }; - }; -in buildNimPackage rec { - pname = "freedesktop_org"; - version = "20230201"; - src = fetchFromSourcehut { - owner = "~ehmry"; - repo = pname; - rev = version; - hash = "sha256-gEN8kiWYCfC9H7o4UE8Xza5s7OwU3TFno6XnIlEm9Dg="; - }; - propagatedBuildInputs = [ configparser ]; - meta = src.meta // { - description = "Some Nim procedures for looking up freedesktop.org data"; - license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/getdns/default.nix b/pkgs/development/nim-packages/getdns/default.nix deleted file mode 100644 index 7d85077d7e8a..000000000000 --- a/pkgs/development/nim-packages/getdns/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildNimPackage, fetchFromSourcehut, pkg-config, getdns }: - -buildNimPackage rec { - pname = "getdns"; - version = "20221222"; - src = fetchFromSourcehut { - owner = "~ehmry"; - repo = pname + "-nim"; - rev = version; - hash = "sha256-y7yzY1PcodIK2kC9409FuTpLn0TsWHGiEPnrULrob+k="; - }; - - propagatedNativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ getdns ]; - - checkPhase = "nim c tests/test_example_synchronous"; - # The test requires network but check if it builds. - - meta = { - inherit (getdns.meta) homepage license platforms; - description = "Nim wrapper over the getdns library"; - maintainers = with lib.maintainers; [ ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/preserves/default.nix b/pkgs/development/nim-packages/preserves/default.nix deleted file mode 100644 index 2a795584adb5..000000000000 --- a/pkgs/development/nim-packages/preserves/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, buildNimPackage, fetchFromGitea, nim-unwrapped, npeg }: - -buildNimPackage (final: prev: { - pname = "preserves"; - version = "20230801"; - src = fetchFromGitea { - domain = "git.syndicate-lang.org"; - owner = "ehmry"; - repo = "preserves-nim"; - rev = final.version; - hash = "sha256-60QsbXMYYfEWvXQAXu7XSpvg2J9YaGKDkDrfclcK6pc="; - }; - propagatedBuildInputs = [ npeg ]; - nimFlags = [ "--mm:refc" "--path:${nim-unwrapped}/nim" "--threads:off" ]; - doCheck = !stdenv.isDarwin; - meta = final.src.meta // { - description = "Nim implementation of the Preserves data language"; - license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/syndicate/default.nix b/pkgs/development/nim-packages/syndicate/default.nix deleted file mode 100644 index 63fb28442424..000000000000 --- a/pkgs/development/nim-packages/syndicate/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitea, hashlib, preserves }: - -buildNimPackage (final: prev: { - pname = "syndicate"; - version = "20230801"; - src = fetchFromGitea { - domain = "git.syndicate-lang.org"; - owner = "ehmry"; - repo = "syndicate-nim"; - rev = final.version; - hash = "sha256-/mZGWVdQ5FtZf2snPIjTG2tNFVzxQmxvkKuLCAGARYs="; - }; - propagatedBuildInputs = [ hashlib preserves ]; - nimFlags = [ "--mm:refc" "--threads:off" ]; - meta = final.src.meta // { - description = "Nim implementation of the Syndicated Actor model"; - license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/taps/default.nix b/pkgs/development/nim-packages/taps/default.nix deleted file mode 100644 index ce453dbaa344..000000000000 --- a/pkgs/development/nim-packages/taps/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildNimPackage, fetchFromSourcehut, getdns }: - -buildNimPackage rec { - pname = "taps"; - version = "20230331"; - src = fetchFromSourcehut { - owner = "~ehmry"; - repo = "nim_${pname}"; - rev = version; - hash = "sha256-p2DBJWFwS82oHPq0uMCtZWFbn8GFndEJBjhkHeuPGos="; - }; - propagatedBuildInputs = [ getdns ]; - doCheck = false; - meta = src.meta // { - description = "Transport Services Interface"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/tkrzw/default.nix b/pkgs/development/nim-packages/tkrzw/default.nix deleted file mode 100644 index 9f88067f988a..000000000000 --- a/pkgs/development/nim-packages/tkrzw/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromSourcehut, pkg-config, tkrzw }: - -buildNimPackage rec { - pname = "tkrzw"; - version = "20220922"; - src = fetchFromSourcehut { - owner = "~ehmry"; - repo = "nim-${pname}"; - rev = version; - hash = "sha256-66rUuK+wUrqs1QYjteZcaIrfg+LHQNcR+XM+EtVuGsA="; - }; - propagatedNativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ tkrzw ]; - meta = with lib; - src.meta // { - description = "Nim wrappers over some of the Tkrzw C++ library"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ehmry ]; - }; -} diff --git a/pkgs/top-level/nim-overrides.nix b/pkgs/top-level/nim-overrides.nix index 7b3b18333c3a..bb1aaf36bac9 100644 --- a/pkgs/top-level/nim-overrides.nix +++ b/pkgs/top-level/nim-overrides.nix @@ -1,9 +1,12 @@ { lib , stdenv +, getdns , htslib , libsass , openssl +, pkg-config , SDL2 +, tkrzw , xorg }: @@ -22,6 +25,12 @@ buildInputs = buildInputs ++ [ htslib ]; }; + getdns = lockAttrs: finalAttrs: + { nativeBuildInputs ? [ ], buildInputs ? [ ], ... }: { + nativeBuildInputs = nativeBuildInputs ++ [ pkg-config ]; + buildInputs = buildInputs ++ [ getdns ]; + }; + sass = lockAttrs: finalAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ [ libsass ]; @@ -32,6 +41,12 @@ buildInputs = buildInputs ++ [ SDL2 ]; }; + tkrzw = lockAttrs: finalAttrs: + { nativeBuildInputs ? [ ], buildInputs ? [ ], ... }: { + nativeBuildInputs = nativeBuildInputs ++ [ pkg-config ]; + buildInputs = buildInputs ++ [ tkrzw ]; + }; + x11 = lockAttrs: finalAttrs: { buildInputs ? [ ], ... }: { buildInputs = buildInputs ++ (with xorg; [ libX11 libXft libXinerama ]); diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index 540882622bc5..d52fae1d72ee 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -18,35 +18,22 @@ lib.makeScope newScope (self: atlas = callPackage ../development/nim-packages/atlas { }; - base32 = callPackage ../development/nim-packages/base32 { }; - base45 = callPackage ../development/nim-packages/base45 { }; bumpy = callPackage ../development/nim-packages/bumpy { }; - cbor = callPackage ../development/nim-packages/cbor { }; - chroma = callPackage ../development/nim-packages/chroma { }; - coap = callPackage ../development/nim-packages/coap { }; - csvtools = callPackage ../development/nim-packages/csvtools { }; db_connector = callPackage ../development/nim-packages/db_connector { }; docopt = callPackage ../development/nim-packages/docopt { }; - eris = callPackage ../development/nim-packages/eris { }; - flatty = callPackage ../development/nim-packages/flatty { }; - freedesktop_org = callPackage ../development/nim-packages/freedesktop_org { }; - frosty = callPackage ../development/nim-packages/frosty { }; - getdns = callPackage ../development/nim-packages/getdns { - inherit (pkgs) getdns; }; - hashlib = callPackage ../development/nim-packages/hashlib { }; hts = callPackage ../development/nim-packages/hts { }; @@ -87,8 +74,6 @@ lib.makeScope newScope (self: pixie = callPackage ../development/nim-packages/pixie { }; - preserves = callPackage ../development/nim-packages/preserves { }; - redis = callPackage ../development/nim-packages/redis { }; redpool = callPackage ../development/nim-packages/redpool { }; @@ -124,14 +109,8 @@ lib.makeScope newScope (self: supersnappy = callPackage ../development/nim-packages/supersnappy { }; - syndicate = callPackage ../development/nim-packages/syndicate { }; - - taps = callPackage ../development/nim-packages/taps { }; - tempfile = callPackage ../development/nim-packages/tempfile { }; - tkrzw = callPackage ../development/nim-packages/tkrzw { inherit (pkgs) tkrzw; }; - ui = callPackage ../development/nim-packages/ui { inherit (pkgs) libui; }; unicodedb = callPackage ../development/nim-packages/unicodedb { };