From 8672b5cabdc10359cc6e9bc2c04fd281618ae2c5 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 21 Nov 2023 18:26:15 +0200 Subject: Remove nimPackages and nim2Packages --- .../compilers/nim/build-nim-package.nix | 2 - pkgs/development/compilers/nim/default.nix | 8 +- pkgs/development/libraries/getdns/default.nix | 4 +- pkgs/development/libraries/tkrzw/default.nix | 3 +- .../nim-packages/asciigraph/default.nix | 21 ---- .../nim-packages/astpatternmatching/default.nix | 8 -- .../nim-packages/asynctools/default.nix | 20 ---- pkgs/development/nim-packages/bumpy/default.nix | 23 ---- pkgs/development/nim-packages/chroma/default.nix | 18 --- pkgs/development/nim-packages/csvtools/default.nix | 19 ---- .../nim-packages/db_connector/default.nix | 19 ---- pkgs/development/nim-packages/docopt/default.nix | 8 -- pkgs/development/nim-packages/flatty/default.nix | 21 ---- pkgs/development/nim-packages/frosty/default.nix | 8 -- pkgs/development/nim-packages/hashlib/default.nix | 17 --- pkgs/development/nim-packages/hts/default.nix | 21 ---- pkgs/development/nim-packages/illwill/default.nix | 20 ---- .../nim-packages/illwillwidgets/default.nix | 24 ---- pkgs/development/nim-packages/jester/default.nix | 8 -- .../nim-packages/jsonschema/default.nix | 22 ---- pkgs/development/nim-packages/jsony/default.nix | 21 ---- pkgs/development/nim-packages/karax/default.nix | 8 -- pkgs/development/nim-packages/lscolors/default.nix | 8 -- pkgs/development/nim-packages/markdown/default.nix | 8 -- pkgs/development/nim-packages/nimSHA2/default.nix | 17 --- pkgs/development/nim-packages/nimbox/default.nix | 8 -- .../development/nim-packages/nimcrypto/default.nix | 8 -- .../nim-packages/nimraylib-now/default.nix | 24 ---- pkgs/development/nim-packages/nimsimd/default.nix | 18 --- pkgs/development/nim-packages/noise/default.nix | 18 --- pkgs/development/nim-packages/npeg/default.nix | 18 --- .../nim-packages/packedjson/default.nix | 8 -- .../development/nim-packages/parsetoml/default.nix | 21 ---- pkgs/development/nim-packages/pixie/default.nix | 25 ----- pkgs/development/nim-packages/redis/default.nix | 8 -- pkgs/development/nim-packages/redpool/default.nix | 8 -- pkgs/development/nim-packages/regex/default.nix | 20 ---- pkgs/development/nim-packages/rocksdb/default.nix | 20 ---- pkgs/development/nim-packages/safeseq/default.nix | 21 ---- pkgs/development/nim-packages/safeset/default.nix | 21 ---- pkgs/development/nim-packages/sass/default.nix | 13 --- pkgs/development/nim-packages/sdl2/default.nix | 20 ---- .../nim-packages/segmentation/default.nix | 19 ---- pkgs/development/nim-packages/smtp/default.nix | 18 --- pkgs/development/nim-packages/snappy/default.nix | 20 ---- pkgs/development/nim-packages/spry/default.nix | 22 ---- pkgs/development/nim-packages/spry/nil.patch | 35 ------ pkgs/development/nim-packages/spry/python.patch | 43 -------- pkgs/development/nim-packages/spryvm/default.nix | 20 ---- pkgs/development/nim-packages/spryvm/nil.patch | 21 ---- pkgs/development/nim-packages/stew/default.nix | 20 ---- .../nim-packages/supersnappy/default.nix | 8 -- pkgs/development/nim-packages/tempfile/default.nix | 20 ---- pkgs/development/nim-packages/ui/default.nix | 23 ---- .../development/nim-packages/unicodedb/default.nix | 18 --- .../nim-packages/unicodeplus/default.nix | 19 ---- pkgs/development/nim-packages/vmath/default.nix | 24 ---- pkgs/development/nim-packages/ws/default.nix | 21 ---- pkgs/development/nim-packages/x11/default.nix | 20 ---- pkgs/development/nim-packages/zippy/default.nix | 22 ---- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/nim-packages.nix | 122 --------------------- 62 files changed, 4 insertions(+), 1148 deletions(-) delete mode 100644 pkgs/development/nim-packages/asciigraph/default.nix delete mode 100644 pkgs/development/nim-packages/astpatternmatching/default.nix delete mode 100644 pkgs/development/nim-packages/asynctools/default.nix delete mode 100644 pkgs/development/nim-packages/bumpy/default.nix delete mode 100644 pkgs/development/nim-packages/chroma/default.nix delete mode 100644 pkgs/development/nim-packages/csvtools/default.nix delete mode 100644 pkgs/development/nim-packages/db_connector/default.nix delete mode 100644 pkgs/development/nim-packages/docopt/default.nix delete mode 100644 pkgs/development/nim-packages/flatty/default.nix delete mode 100644 pkgs/development/nim-packages/frosty/default.nix delete mode 100644 pkgs/development/nim-packages/hashlib/default.nix delete mode 100644 pkgs/development/nim-packages/hts/default.nix delete mode 100644 pkgs/development/nim-packages/illwill/default.nix delete mode 100644 pkgs/development/nim-packages/illwillwidgets/default.nix delete mode 100644 pkgs/development/nim-packages/jester/default.nix delete mode 100644 pkgs/development/nim-packages/jsonschema/default.nix delete mode 100644 pkgs/development/nim-packages/jsony/default.nix delete mode 100644 pkgs/development/nim-packages/karax/default.nix delete mode 100644 pkgs/development/nim-packages/lscolors/default.nix delete mode 100644 pkgs/development/nim-packages/markdown/default.nix delete mode 100644 pkgs/development/nim-packages/nimSHA2/default.nix delete mode 100644 pkgs/development/nim-packages/nimbox/default.nix delete mode 100644 pkgs/development/nim-packages/nimcrypto/default.nix delete mode 100644 pkgs/development/nim-packages/nimraylib-now/default.nix delete mode 100644 pkgs/development/nim-packages/nimsimd/default.nix delete mode 100644 pkgs/development/nim-packages/noise/default.nix delete mode 100644 pkgs/development/nim-packages/npeg/default.nix delete mode 100644 pkgs/development/nim-packages/packedjson/default.nix delete mode 100644 pkgs/development/nim-packages/parsetoml/default.nix delete mode 100644 pkgs/development/nim-packages/pixie/default.nix delete mode 100644 pkgs/development/nim-packages/redis/default.nix delete mode 100644 pkgs/development/nim-packages/redpool/default.nix delete mode 100644 pkgs/development/nim-packages/regex/default.nix delete mode 100644 pkgs/development/nim-packages/rocksdb/default.nix delete mode 100644 pkgs/development/nim-packages/safeseq/default.nix delete mode 100644 pkgs/development/nim-packages/safeset/default.nix delete mode 100644 pkgs/development/nim-packages/sass/default.nix delete mode 100644 pkgs/development/nim-packages/sdl2/default.nix delete mode 100644 pkgs/development/nim-packages/segmentation/default.nix delete mode 100644 pkgs/development/nim-packages/smtp/default.nix delete mode 100644 pkgs/development/nim-packages/snappy/default.nix delete mode 100644 pkgs/development/nim-packages/spry/default.nix delete mode 100644 pkgs/development/nim-packages/spry/nil.patch delete mode 100644 pkgs/development/nim-packages/spry/python.patch delete mode 100644 pkgs/development/nim-packages/spryvm/default.nix delete mode 100644 pkgs/development/nim-packages/spryvm/nil.patch delete mode 100644 pkgs/development/nim-packages/stew/default.nix delete mode 100644 pkgs/development/nim-packages/supersnappy/default.nix delete mode 100644 pkgs/development/nim-packages/tempfile/default.nix delete mode 100644 pkgs/development/nim-packages/ui/default.nix delete mode 100644 pkgs/development/nim-packages/unicodedb/default.nix delete mode 100644 pkgs/development/nim-packages/unicodeplus/default.nix delete mode 100644 pkgs/development/nim-packages/vmath/default.nix delete mode 100644 pkgs/development/nim-packages/ws/default.nix delete mode 100644 pkgs/development/nim-packages/x11/default.nix delete mode 100644 pkgs/development/nim-packages/zippy/default.nix delete mode 100644 pkgs/top-level/nim-packages.nix diff --git a/pkgs/development/compilers/nim/build-nim-package.nix b/pkgs/development/compilers/nim/build-nim-package.nix index 73190575a576..5085edf90a76 100644 --- a/pkgs/development/compilers/nim/build-nim-package.nix +++ b/pkgs/development/compilers/nim/build-nim-package.nix @@ -90,7 +90,6 @@ let , nativeBuildInputs ? [ ] , nimFlags ? [ ] , requiredNimVersion ? defaultNimVersion - , nimCopySources ? (lockAttrs == {}) # TODO: remove when nimPackages is gone , ... }: (if requiredNimVersion == 1 then { @@ -103,7 +102,6 @@ let throw "requiredNimVersion ${toString requiredNimVersion} is not valid") // { nimFlags = lockFileNimFlags ++ nimFlags; - inherit nimCopySources; }; attrs = postLock // finalOverride postLock; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 19773ebe4999..425eda585c27 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -181,9 +181,8 @@ in { } // (let wrapNim = { nim', patches }: - let - targetPlatformConfig = stdenv.targetPlatform.config; - self = stdenv.mkDerivation (finalAttrs: { + let targetPlatformConfig = stdenv.targetPlatform.config; + in stdenv.mkDerivation (finalAttrs: { name = "${targetPlatformConfig}-nim-wrapper-${nim'.version}"; inherit (nim') version; preferLocalBuild = true; @@ -307,9 +306,6 @@ in { platforms = with lib.platforms; unix ++ genode; }; }); - in self // { - pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; }; - }; in { nim2 = wrapNim { diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 0c6fa4a1e633..0a6f34eab6cc 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -1,7 +1,7 @@ # Getdns and Stubby are released together, see https://getdnsapi.net/releases/ { lib, stdenv, fetchurl, cmake, darwin, doxygen, libidn2, libyaml, openssl -, systemd, unbound, yq, nimPackages }: +, systemd, unbound, yq }: let metaCommon = with lib; { maintainers = with maintainers; [ leenaars ehmry ]; @@ -34,8 +34,6 @@ in rec { postInstall = "rm -r $out/share/doc"; - passthru.tests.nim = nimPackages.getdns; - meta = with lib; metaCommon // { description = "A modern asynchronous DNS API"; diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/development/libraries/tkrzw/default.nix index b3e8c8fbae28..694225d9e3ba 100644 --- a/pkgs/development/libraries/tkrzw/default.nix +++ b/pkgs/development/libraries/tkrzw/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nimPackages }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tkrzw"; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { doCheck = false; # memory intensive - passthru.tests.nim = nimPackages.tkrzw; meta = with lib; { description = "A set of implementations of DBM"; homepage = "https://dbmx.net/tkrzw/"; diff --git a/pkgs/development/nim-packages/asciigraph/default.nix b/pkgs/development/nim-packages/asciigraph/default.nix deleted file mode 100644 index 0d8b471102ee..000000000000 --- a/pkgs/development/nim-packages/asciigraph/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "asciigraph"; - version = "unstable-2021-03-02"; - - src = fetchFromGitHub { - owner = "Yardanico"; - repo = "asciigraph"; - rev = "9f51fc4e94d0960ab63fa6ea274518159720aa69"; - hash = "sha256-JMBAW8hkE2wuXkRt4aHqFPoz1HX1J4SslvcaQXfpDNk"; - }; - - - meta = with lib; - src.meta // { - description = "Console ascii line graphs in pure Nim"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/development/nim-packages/astpatternmatching/default.nix b/pkgs/development/nim-packages/astpatternmatching/default.nix deleted file mode 100644 index c5c5a988bd5d..000000000000 --- a/pkgs/development/nim-packages/astpatternmatching/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "krux02"; - repo = "ast-pattern-matching"; - rev = "eb8b99d595517fd5d41ccc954edb896267f2db78"; - hash = "sha256-wPIiFr8OfXM7Hyh5o2aQXnlgkqLf0FennN6zzVTGgY4="; -} diff --git a/pkgs/development/nim-packages/asynctools/default.nix b/pkgs/development/nim-packages/asynctools/default.nix deleted file mode 100644 index 54893d00a980..000000000000 --- a/pkgs/development/nim-packages/asynctools/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, astpatternmatching }: - -buildNimPackage rec { - pname = "asynctools"; - version = "unstable-2021-07-06"; - - src = fetchFromGitHub { - owner = "cheatfate"; - repo = "asynctools"; - rev = "84ced6d002789567f2396c75800ffd6dff2866f7"; - hash = "sha256-mrO+WeSzCBclqC2UNCY+IIv7Gs8EdTDaTeSgXy3TgNM="; - }; - - meta = with lib; { - description = "Various asynchronous tools for Nim language"; - homepage = "https://github.com/cheatfate/asynctools"; - license = licenses.mit; - maintainers = [ maintainers.marsam ]; - }; -} diff --git a/pkgs/development/nim-packages/bumpy/default.nix b/pkgs/development/nim-packages/bumpy/default.nix deleted file mode 100644 index c816f0901777..000000000000 --- a/pkgs/development/nim-packages/bumpy/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, vmath }: - -buildNimPackage rec { - pname = "bumpy"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "treeform"; - repo = pname; - rev = version; - hash = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0="; - }; - - propagatedBuildInputs = [ vmath ]; - - - meta = with lib; - src.meta // { - description = "2d collision library"; - license = [ licenses.mit ]; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/chroma/default.nix b/pkgs/development/nim-packages/chroma/default.nix deleted file mode 100644 index f8f161eef67e..000000000000 --- a/pkgs/development/nim-packages/chroma/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage (final: prev: { - pname = "chroma"; - version = "0.2.7"; - src = fetchFromGitHub { - owner = "treeform"; - repo = "chroma"; - rev = final.version; - hash = "sha256-QSl8n60HO56kJ4BKKe/FjUC/cRNxqL2L56FqPwhmJl4="; - }; - meta = final.src.meta // { - description = "Everything you want to do with colors"; - homepage = "https://github.com/treeform/chroma"; - license = [ lib.licenses.mit ]; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/csvtools/default.nix b/pkgs/development/nim-packages/csvtools/default.nix deleted file mode 100644 index 2eaaae1dc526..000000000000 --- a/pkgs/development/nim-packages/csvtools/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, pkgs, buildNimPackage, fetchFromGitHub }: - -buildNimPackage (finalAttrs: { - pname = "csvtools"; - version = "0.2.1"; - src = fetchFromGitHub { - owner = "andreaferretti"; - repo = "csvtools"; - rev = "${finalAttrs.version}"; - hash = "sha256-G/OvcusnlRR5zdGF+wC7z411RLXI6D9aFJVj9LrMR+s="; - }; - doCheck = true; - meta = finalAttrs.src.meta // { - description = "Manage CSV files easily in Nim"; - homepage = "https://github.com/andreaferretti/csvtools"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.trevdev ]; - }; -}) diff --git a/pkgs/development/nim-packages/db_connector/default.nix b/pkgs/development/nim-packages/db_connector/default.nix deleted file mode 100644 index 287d6fd0552c..000000000000 --- a/pkgs/development/nim-packages/db_connector/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage (final: prev: { - pname = "db_connector"; - version = "unstable-2023-02-23"; - src = fetchFromGitHub { - owner = "nim-lang"; - repo = "db_connector"; - rev = "e65693709dd042bc723c8f1d46cc528701f1c479"; - hash = "sha256-g5X51VbES8OxR5m9WexK70Yo6S2PnroKLabj1cUu1P0="; - }; - doCheck = false; # tests only worked in the Nim sources - meta = final.src.meta // { - description = "Unified db connector in Nim"; - homepage = "https://github.com/nim-lang/db_connector"; - license = [ lib.licenses.mit ]; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/docopt/default.nix b/pkgs/development/nim-packages/docopt/default.nix deleted file mode 100644 index 38465384fbde..000000000000 --- a/pkgs/development/nim-packages/docopt/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "docopt"; - repo = "docopt.nim"; - rev = "v0.6.7"; - sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37"; -} diff --git a/pkgs/development/nim-packages/flatty/default.nix b/pkgs/development/nim-packages/flatty/default.nix deleted file mode 100644 index 8741c2cf8dc9..000000000000 --- a/pkgs/development/nim-packages/flatty/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage (final: prev: { - pname = "flatty"; - version = "0.3.4"; - - src = fetchFromGitHub { - owner = "treeform"; - repo = "flatty"; - rev = final.version; - hash = "sha256-ZmhjehmEJHm5qNlsGQvyYLajUdwhWt1+AtRppRrNtgA="; - }; - - doCheck = false; # tests fail with Nim-2.0.0 - - meta = final.src.meta // { - description = "Tools and serializer for plain flat binary files"; - license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/frosty/default.nix b/pkgs/development/nim-packages/frosty/default.nix deleted file mode 100644 index 6394c455d07f..000000000000 --- a/pkgs/development/nim-packages/frosty/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "disruptek"; - repo = "frosty"; - rev = "0.3.1"; - sha256 = "0hd6484ihjgl57gmqyp5xfq5prycb49k0313fqky600mhz71nmyz"; -} diff --git a/pkgs/development/nim-packages/hashlib/default.nix b/pkgs/development/nim-packages/hashlib/default.nix deleted file mode 100644 index 67fff072c182..000000000000 --- a/pkgs/development/nim-packages/hashlib/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "hashlib"; - version = "1.0.1"; - src = fetchFromGitHub { - owner = "khchen"; - repo = pname; - rev = "84e0247555e4488594975900401baaf5bbbfb531"; - hash = "sha256-nWNThelCh0LPVU7ryZgS/23hRRvJDVL2xWbQibb+zN0="; - }; - meta = src.meta // { - description = "Hash Library for Nim"; - maintainers = with lib.maintainers; [ ehmry ]; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/nim-packages/hts/default.nix b/pkgs/development/nim-packages/hts/default.nix deleted file mode 100644 index 1cf763d77b16..000000000000 --- a/pkgs/development/nim-packages/hts/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, htslib }: - -buildNimPackage (final: prev: { - pname = "hts"; - version = "0.3.23"; - src = fetchFromGitHub { - owner = "brentp"; - repo = "hts-nim"; - rev = "v${final.version}"; - hash = "sha256-o27yOtzW4hk8dpicqjW4D8zxqXHdxcz+e84PyK+yBq8="; - }; - propagatedBuildInputs = [ htslib ]; - nimFlags = [ "--mm:refc" ]; - doCheck = false; - meta = final.src.meta // { - description = "Nim wrapper for htslib for parsing genomics data files"; - homepage = "https://brentp.github.io/hts-nim/"; - license = [ lib.licenses.mit ]; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/illwill/default.nix b/pkgs/development/nim-packages/illwill/default.nix deleted file mode 100644 index aa5101766208..000000000000 --- a/pkgs/development/nim-packages/illwill/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "illwill"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "johnnovak"; - repo = "illwill"; - rev = "v${version}"; - hash = "sha256-4DHGVWzN/WTAyDRBBpXlcfKnYIcbFt42/iWInaBUwi4="; - }; - - meta = with lib; - src.meta // { - description = "A curses inspired simple cross-platform console library for Nim"; - license = [ licenses.wtfpl ]; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/development/nim-packages/illwillwidgets/default.nix b/pkgs/development/nim-packages/illwillwidgets/default.nix deleted file mode 100644 index f767216712ac..000000000000 --- a/pkgs/development/nim-packages/illwillwidgets/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, illwill }: - -buildNimPackage rec { - pname = "illwillwidgets"; - version = "0.1.11"; - - src = fetchFromGitHub { - owner = "enthus1ast"; - repo = "illwillWidgets"; - rev = "04f507cfd651df430b1421403b3a70cb061c4624"; - hash = "sha256-YVNdgs8jquJ58qbcyNMMJt+hJYcvahYpkSrDBbO4ILU="; - }; - - propagatedBuildInputs = [ illwill ]; - doCheck = false; - - meta = with lib; - src.meta // { - description = "Mouse enabled widgets for illwill"; - - license = [ licenses.mit ]; - maintainers = with maintainers; [ marcusramberg ]; - }; -} diff --git a/pkgs/development/nim-packages/jester/default.nix b/pkgs/development/nim-packages/jester/default.nix deleted file mode 100644 index 21646f3667f0..000000000000 --- a/pkgs/development/nim-packages/jester/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "dom96"; - repo = "jester"; - rev = "v0.5.0"; - sha256 = "0m8a4ss4460jd2lcbqcbdd68jhcy35xg7qdyr95mh8rflwvmcvhk"; -} diff --git a/pkgs/development/nim-packages/jsonschema/default.nix b/pkgs/development/nim-packages/jsonschema/default.nix deleted file mode 100644 index e19af7fbb865..000000000000 --- a/pkgs/development/nim-packages/jsonschema/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, astpatternmatching }: - -buildNimPackage rec { - pname = "jsonschema"; - version = "unstable-2019-09-12"; - - src = fetchFromGitHub { - owner = "PMunch"; - repo = "jsonschema"; - rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf"; - sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz"; - }; - - propagatedBuildInputs = [ astpatternmatching ]; - - meta = with lib; { - homepage = "https://github.com/PMunch/jsonschema"; - description = "Schema validation of JSON for Nim"; - license = licenses.mit; - maintainers = [ maintainers.marsam ]; - }; -} diff --git a/pkgs/development/nim-packages/jsony/default.nix b/pkgs/development/nim-packages/jsony/default.nix deleted file mode 100644 index 525da7928171..000000000000 --- a/pkgs/development/nim-packages/jsony/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "jsony"; - version = "1.1.5"; - - src = fetchFromGitHub { - owner = "treeform"; - repo = pname; - rev = version; - sha256 = "1720iqsxjhqmhw1zhhs7d2ncdz25r8fqadls1p1iry1wfikjlnba"; - }; - - - meta = with lib; - src.meta // { - description = "A loose, direct to object json parser with hooks"; - license = [ licenses.mit ]; - maintainers = [ maintainers.erdnaxe ]; - }; -} diff --git a/pkgs/development/nim-packages/karax/default.nix b/pkgs/development/nim-packages/karax/default.nix deleted file mode 100644 index 695386826f50..000000000000 --- a/pkgs/development/nim-packages/karax/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "karaxnim"; - repo = "karax"; - rev = "5cf360c"; - hash = "sha256-TPwQSqi7ciR6QMklWi/bOJnyzCAT1lZyxW4DTiWTALo="; -} diff --git a/pkgs/development/nim-packages/lscolors/default.nix b/pkgs/development/nim-packages/lscolors/default.nix deleted file mode 100644 index 5a72c46e4c50..000000000000 --- a/pkgs/development/nim-packages/lscolors/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "joachimschmidt557"; - repo = "nim-lscolors"; - rev = "v0.3.3"; - sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4"; -} diff --git a/pkgs/development/nim-packages/markdown/default.nix b/pkgs/development/nim-packages/markdown/default.nix deleted file mode 100644 index 9b9f0462c3f9..000000000000 --- a/pkgs/development/nim-packages/markdown/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "soasme"; - repo = "nim-markdown"; - rev = "a661c26"; - hash = "sha256-/GkCSOmg2JxQhiDS8vgnKIoKvVgld/uIilUHslvwMnk="; -} diff --git a/pkgs/development/nim-packages/nimSHA2/default.nix b/pkgs/development/nim-packages/nimSHA2/default.nix deleted file mode 100644 index ca9f08c8d253..000000000000 --- a/pkgs/development/nim-packages/nimSHA2/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "nimSHA2"; - version = "unstable-2021-09-09"; - src = fetchFromGitHub { - owner = "jangko"; - repo = pname; - rev = "b8f666069dff1ed0c5142dd1ca692f0e71434716"; - hash = "sha256-Wqb3mQ7638UOTze71mf6WMyGiw9qTwhbJiGGb+9OR2k="; - }; - meta = src.meta // { - description = "Secure Hash Algorithm 2"; - maintainers = with lib.maintainers; [ ehmry ]; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/nim-packages/nimbox/default.nix b/pkgs/development/nim-packages/nimbox/default.nix deleted file mode 100644 index 53663c642810..000000000000 --- a/pkgs/development/nim-packages/nimbox/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "dom96"; - repo = "nimbox"; - rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b"; - sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1"; -} diff --git a/pkgs/development/nim-packages/nimcrypto/default.nix b/pkgs/development/nim-packages/nimcrypto/default.nix deleted file mode 100644 index 6c212ef45f1a..000000000000 --- a/pkgs/development/nim-packages/nimcrypto/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "cheatfate"; - repo = "nimcrypto"; - rev = "a5742a9a214ac33f91615f3862c7b099aec43b00"; - sha256 = "0al0jsaicm8vyr63n909dq1glhvpra1n9sllmj0r7lsjsdb59wsz"; -} diff --git a/pkgs/development/nim-packages/nimraylib-now/default.nix b/pkgs/development/nim-packages/nimraylib-now/default.nix deleted file mode 100644 index f2e0028a32e1..000000000000 --- a/pkgs/development/nim-packages/nimraylib-now/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, nimPackages, fetchFromGitHub, raylib }: - -nimPackages.buildNimPackage rec { - pname = "nimraylib-now"; - version = "0.15.0"; - - src = fetchFromGitHub { - owner = "greenfork"; - repo = "nimraylib_now"; - rev = "v${version}"; - sha256 = "sha256-18YiAzJ46dpD5JN+gH0MWKchZ5YLPBNcm9eVFnyy2Sw="; - }; - - propagatedBuildInputs = [ raylib ]; - - doCheck = false; # no $DISPLAY available - - meta = with lib; { - homepage = "https://github.com/greenfork/nimraylib_now"; - description = "The Ultimate Raylib gaming library wrapper for Nim"; - license = licenses.mit; - maintainers = with maintainers; [ annaaurora ]; - }; -} diff --git a/pkgs/development/nim-packages/nimsimd/default.nix b/pkgs/development/nim-packages/nimsimd/default.nix deleted file mode 100644 index 57f85054ae37..000000000000 --- a/pkgs/development/nim-packages/nimsimd/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage (final: prev: { - pname = "nimsimd"; - version = "1.2.5"; - src = fetchFromGitHub { - owner = "guzba"; - repo = "nimsimd"; - rev = final.version; - hash = "sha256-EYLzpzmNUwEOEndAwnUXCqpIUMmpinpiZq+P6zO0Kk8="; - }; - meta = final.src.meta // { - description = "Pleasant Nim bindings for SIMD instruction sets"; - homepage = "https://github.com/guzba/nimsimd"; - license = [ lib.licenses.mit ]; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/noise/default.nix b/pkgs/development/nim-packages/noise/default.nix deleted file mode 100644 index d4b9bfdda5b6..000000000000 --- a/pkgs/development/nim-packages/noise/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage (finalAttrs: { - pname = "noise"; - version = "0.1.8"; - src = fetchFromGitHub { - owner = "jangko"; - repo = "nim-noise"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-QD7X1QTAKHYa2+QiYjrQq74CnEafwq/RsshlW2yZqmI="; - }; - meta = finalAttrs.src.meta // { - description = "Nim implementation of linenoise"; - homepage = "https://github.com/jangko/nim-noise"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/npeg/default.nix b/pkgs/development/nim-packages/npeg/default.nix deleted file mode 100644 index 7969dfb38df3..000000000000 --- a/pkgs/development/nim-packages/npeg/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "npeg"; - version = "1.2.1"; - src = fetchFromGitHub { - owner = "zevv"; - repo = pname; - rev = version; - hash = "sha256-kN91cp50ZL4INeRWqwrRK6CAkVXUq4rN4YlcN6WL/3Y="; - }; - nimFlags = [ "--threads:off" ]; - meta = src.meta // { - description = "NPeg is a pure Nim pattern matching library"; - maintainers = with lib.maintainers; [ ehmry ]; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/nim-packages/packedjson/default.nix b/pkgs/development/nim-packages/packedjson/default.nix deleted file mode 100644 index 25579540c0b7..000000000000 --- a/pkgs/development/nim-packages/packedjson/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "Araq"; - repo = "packedjson"; - rev = "d11d167"; - sha256 = "1302rn58277c3ic5sfq89c4mkn0d66bhilifh5xjf40x74ahir5x"; -} diff --git a/pkgs/development/nim-packages/parsetoml/default.nix b/pkgs/development/nim-packages/parsetoml/default.nix deleted file mode 100644 index d6504f1d9c67..000000000000 --- a/pkgs/development/nim-packages/parsetoml/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "parsetoml"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "NimParsers"; - repo = "parsetoml"; - rev = "v${version}"; - hash = "sha256-jtqn59x2ZRRgrPir6u/frsDHnl4kvTJWpbejxti8aHY="; - }; - - - meta = with lib; - src.meta // { - description = "A Nim library to parse TOML files"; - license = [ licenses.mit ]; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/development/nim-packages/pixie/default.nix b/pkgs/development/nim-packages/pixie/default.nix deleted file mode 100644 index 00c79089fc02..000000000000 --- a/pkgs/development/nim-packages/pixie/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, bumpy, chroma, flatty, nimsimd, vmath -, zippy }: - -buildNimPackage rec { - pname = "pixie"; - version = "3.1.2"; - - src = fetchFromGitHub { - owner = "treeform"; - repo = pname; - rev = version; - hash = "sha256-rF72ybfsipBHgQmH0e6DBn1e7WWY6dGn9yp1qvLIS3A="; - }; - - propagatedBuildInputs = [ bumpy chroma flatty nimsimd vmath zippy ]; - - doCheck = false; # doesn't find dependencies - - meta = with lib; - src.meta // { - description = "Full-featured 2d graphics library for Nim"; - license = [ licenses.mit ]; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/redis/default.nix b/pkgs/development/nim-packages/redis/default.nix deleted file mode 100644 index 1cd7c68ecc94..000000000000 --- a/pkgs/development/nim-packages/redis/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "zedeus"; - repo = "redis"; - rev = "d0a0e6f"; - sha256 = "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f"; -} diff --git a/pkgs/development/nim-packages/redpool/default.nix b/pkgs/development/nim-packages/redpool/default.nix deleted file mode 100644 index 76b222739cae..000000000000 --- a/pkgs/development/nim-packages/redpool/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "zedeus"; - repo = "redpool"; - rev = "8b7c1db"; - sha256 = "10xh5fhwnahnq1nf6j69vvnbi55kixa0ari630gr6cdx80arvbs6"; -} diff --git a/pkgs/development/nim-packages/regex/default.nix b/pkgs/development/nim-packages/regex/default.nix deleted file mode 100644 index 03e4315a2c80..000000000000 --- a/pkgs/development/nim-packages/regex/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, unicodedb }: - -buildNimPackage (finalAttrs: { - pname = "regex"; - version = "0.20.2"; - src = fetchFromGitHub { - owner = "nitely"; - repo = "nim-regex"; - rev = "v${finalAttrs.version}"; - hash = "sha256-VViDf0uD6bj9WOO827NRbLUt+PgBPEmz/A/DDRCrHpc="; - }; - propagatedBuildInputs = [ unicodedb ]; - doCheck = false; - meta = finalAttrs.src.meta // { - description = "Pure Nim regex engine"; - homepage = "https://github.com/nitely/nim-regex"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/rocksdb/default.nix b/pkgs/development/nim-packages/rocksdb/default.nix deleted file mode 100644 index 1ad32a086a05..000000000000 --- a/pkgs/development/nim-packages/rocksdb/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, rocksdb, stew, tempfile }: - -buildNimPackage rec { - pname = "rocksdb"; - version = "0.2.0"; - src = fetchFromGitHub { - owner = "status-im"; - repo = "nim-${pname}"; - rev = "5b1307cb1f4c85bb72ff781d810fb8c0148b1183"; - hash = "sha256-gjMCB9kpWVi9Qv73/jhoAYw857OmQpry//bDQCtyJo0="; - }; - buildInputs = [ stew tempfile ]; - propagatedBuildInputs = [ rocksdb ]; - doCheck = false; - meta = with lib; - src.meta // { - description = "Nim wrapper for RocksDB"; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/safeseq/default.nix b/pkgs/development/nim-packages/safeseq/default.nix deleted file mode 100644 index d2c8a5dfb846..000000000000 --- a/pkgs/development/nim-packages/safeseq/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: -buildNimPackage rec { - pname = "safeseq"; - - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "avahe-kellenberger"; - repo = pname; - rev = "v${version}"; - hash = "sha256-JSz2TPrbl5N8l+YDquad78aJMBsx+Lise27cMQKMdAc="; - }; - - - meta = with lib; - src.meta // { - description = "safeseq library for nim"; - license = [ licenses.gpl2 ]; - maintainers = [ maintainers.marcusramberg ]; - }; -} diff --git a/pkgs/development/nim-packages/safeset/default.nix b/pkgs/development/nim-packages/safeset/default.nix deleted file mode 100644 index b92228421c75..000000000000 --- a/pkgs/development/nim-packages/safeset/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: -buildNimPackage rec { - pname = "safeset"; - - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "avahe-kellenberger"; - repo = pname; - rev = "v${version}"; - hash = "sha256-ZLdStoNVoQhRkD2iEzKxhs1UPfgnbJM9QCDHdjH7vTU="; - }; - - - meta = with lib; - src.meta // { - description = "safeset library for nim"; - license = [ licenses.gpl2 ]; - maintainers = [ maintainers.marcusramberg ]; - }; -} diff --git a/pkgs/development/nim-packages/sass/default.nix b/pkgs/development/nim-packages/sass/default.nix deleted file mode 100644 index 79885ed9ec5a..000000000000 --- a/pkgs/development/nim-packages/sass/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ buildNimPackage, fetchFromGitHub, libsass }: - -buildNimPackage rec { - pname = "sass"; - version = "e683aa1"; - src = fetchFromGitHub { - owner = "dom96"; - repo = pname; - rev = version; - sha256 = "0qvly5rilsqqsyvr67pqhglm55ndc4nd6v90jwswbnigxiqf79lc"; - }; - propagatedBuildInputs = [ libsass ]; -} diff --git a/pkgs/development/nim-packages/sdl2/default.nix b/pkgs/development/nim-packages/sdl2/default.nix deleted file mode 100644 index 09e274ad0072..000000000000 --- a/pkgs/development/nim-packages/sdl2/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, SDL2 }: - -buildNimPackage (final: prev: { - pname = "sdl2"; - version = "2.0.5"; - src = fetchFromGitHub { - owner = "nim-lang"; - repo = "sdl2"; - rev = "v${final.version}"; - hash = "sha256-oUTUWuBphoR0pBMkcJBVDW+dnnF8KK23F7eW3lOLNO4="; - }; - propagatedBuildInputs = [ SDL2 ]; - meta = final.src.meta // { - description = "Nim wrapper for SDL 2.x"; - homepage = "https://github.com/nim-lang/sdl2"; - license = [ lib.licenses.mit ]; - maintainers = with lib.maintainers; [ ehmry ]; - badPlatforms = lib.platforms.darwin; - }; -}) diff --git a/pkgs/development/nim-packages/segmentation/default.nix b/pkgs/development/nim-packages/segmentation/default.nix deleted file mode 100644 index 4d1520d62ee8..000000000000 --- a/pkgs/development/nim-packages/segmentation/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, unicodedb }: - -buildNimPackage (finalAttrs: { - pname = "segmentation"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "nitely"; - repo = "nim-segmentation"; - rev = "v${finalAttrs.version}"; - sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh"; - }; - propagatedBuildInputs = [ unicodedb ]; - meta = finalAttrs.src.meta // { - description = "Unicode text segmentation (tr29)"; - homepage = "https://github.com/nitely/nim-segmentation"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/smtp/default.nix b/pkgs/development/nim-packages/smtp/default.nix deleted file mode 100644 index b439e20bc243..000000000000 --- a/pkgs/development/nim-packages/smtp/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage (final: prev: { - pname = "smtp"; - version = "unstable-2023-03-04"; - src = fetchFromGitHub { - owner = "nim-lang"; - repo = "smtp"; - rev = "8013aa199dedd04905d46acf3484a232378de518"; - hash = "sha256-7jPykp79nAY1G0CSajyn6Jw/Ad+XCulBk9HjtKMPEQ4="; - }; - meta = final.src.meta // { - description = "SMTP client"; - homepage = "https://github.com/nim-lang/smtp"; - license = [ lib.licenses.mit ]; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/snappy/default.nix b/pkgs/development/nim-packages/snappy/default.nix deleted file mode 100644 index e3775b20631b..000000000000 --- a/pkgs/development/nim-packages/snappy/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, snappy }: - -buildNimPackage rec { - pname = "snappy"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "jangko"; - repo = pname; - rev = "d13e2ccb2acaa4e8dedce4f25e8dbf28e19278a6"; - hash = "sha256-18CFRuDK+E701MHrCixx22QSVmglTc0EJwrMCsKwayM="; - }; - propagatedBuildInputs = [ snappy ]; - doCheck = false; - meta = with lib; - src.meta // { - description = "Nim implementation of snappy compression algorithm"; - license = [ lib.licenses.mit ]; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/spry/default.nix b/pkgs/development/nim-packages/spry/default.nix deleted file mode 100644 index 590832d11f33..000000000000 --- a/pkgs/development/nim-packages/spry/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, rocksdb, snappy, spryvm, stew -, tempfile, ui }: - -buildNimPackage rec { - pname = "spry"; - version = "0.9.0"; - src = fetchFromGitHub { - owner = "gokr"; - repo = pname; - rev = "098da7bb34a9113d5db5402fecfc76b1c3fa3b36"; - hash = "sha256-PfWBrG2Z16tLgcN8JYpHaNMysBbbYX812Lkgk0ItMwE="; - }; - buildInputs = [ rocksdb snappy spryvm stew tempfile ui ]; - patches = [ ./nil.patch ./python.patch ]; - meta = with lib; - src.meta // { - description = - "A Smalltalk and Rebol inspired language implemented as an AST interpreter in Nim"; - license = [ licenses.mit ]; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/spry/nil.patch b/pkgs/development/nim-packages/spry/nil.patch deleted file mode 100644 index beea30357235..000000000000 --- a/pkgs/development/nim-packages/spry/nil.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/ispry.nim b/src/ispry.nim -index 23ad6c3..dc38a9d 100644 ---- a/src/ispry.nim -+++ b/src/ispry.nim -@@ -134,8 +134,8 @@ proc main() = - #discard spry.setBinding(newEvalWord("@"), result) - var output = $result - # Print any result -- if output.isNil: -- output = if suspended: "nil" else: "" -+ if output == "" and suspended: -+ output = "nil" - stdout.write(output & "\n") - # except: - # echo "Oops, sorry about that: " & getCurrentExceptionMsg() & "\n" -diff --git a/src/spry.nim b/src/spry.nim -index 670a280..d81bb4c 100644 ---- a/src/spry.nim -+++ b/src/spry.nim -@@ -87,13 +87,13 @@ for kind, key, val in getopt(): - of cmdEnd: assert(false) # cannot happen - - if eval: -- if filename == nil: -+ if filename == "": - writeHelp() - else: - code = filename - else: - code = -- if filename == nil: -+ if filename == "": - # no filename has been given, so we use stdin - readAll stdin - else: diff --git a/pkgs/development/nim-packages/spry/python.patch b/pkgs/development/nim-packages/spry/python.patch deleted file mode 100644 index 565e53c2ddcd..000000000000 --- a/pkgs/development/nim-packages/spry/python.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/ispry.nim b/src/ispry.nim -index 23ad6c3..d2cfc89 100644 ---- a/src/ispry.nim -+++ b/src/ispry.nim -@@ -21,7 +21,7 @@ import spryvm/sprycore, spryvm/sprylib, spryvm/spryextend, spryvm/sprymath, - spryvm/spryos, spryvm/spryio, spryvm/sprymemfile, spryvm/sprythread, - spryvm/spryoo, spryvm/sprydebug, spryvm/sprycompress, spryvm/sprystring, - spryvm/sprymodules, spryvm/spryreflect, spryvm/spryblock, spryvm/sprynet, -- spryvm/sprysmtp, spryvm/spryjson, spryvm/sprysqlite, spryvm/sprypython, -+ spryvm/sprysmtp, spryvm/spryjson, spryvm/sprysqlite, - spryvm/spryrocksdb - - const Prompt = ">>> " -@@ -63,7 +63,6 @@ proc main() = - - spry.addMemfile() - spry.addThread() -- spry.addPython() - spry.addDebug() - spry.addCompress() - spry.addReflect() -diff --git a/src/spry.nim b/src/spry.nim -index 670a280..cda9027 100644 ---- a/src/spry.nim -+++ b/src/spry.nim -@@ -14,8 +14,7 @@ import spryvm/sprycore, spryvm/sprylib, spryvm/spryextend, spryvm/sprymath, - spryvm/spryos, spryvm/spryio, spryvm/sprymemfile, spryvm/sprythread, - spryvm/spryoo, spryvm/sprydebug, spryvm/sprycompress, spryvm/sprystring, - spryvm/sprymodules, spryvm/spryreflect, spryvm/spryui, spryvm/spryblock, spryvm/sprynet, -- spryvm/sprysmtp, spryvm/spryjson, spryvm/sprysqlite, spryvm/spryrocksdb, -- spryvm/sprypython -+ spryvm/sprysmtp, spryvm/spryjson, spryvm/sprysqlite, spryvm/spryrocksdb - - var spry = newInterpreter() - -@@ -34,7 +33,6 @@ spry.addOO() - - spry.addMemfile() - spry.addThread() --spry.addPython() - spry.addDebug() - spry.addCompress() - spry.addReflect() diff --git a/pkgs/development/nim-packages/spryvm/default.nix b/pkgs/development/nim-packages/spryvm/default.nix deleted file mode 100644 index 618e78256913..000000000000 --- a/pkgs/development/nim-packages/spryvm/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, sqlite }: - -buildNimPackage rec { - pname = "spryvm"; - version = "0.9.3"; - src = fetchFromGitHub { - owner = "gokr"; - repo = pname; - rev = "36c2b56bb194902d33de7bcf70d3041703e107ab"; - hash = "sha256-OxB49ef6qPvSXLsyVl5g2ic/P9MMbF3jRYDWrxNJ0Iw="; - }; - propagatedBuildInputs = [ sqlite ]; - patches = [ ./nil.patch ]; - meta = with lib; - src.meta // { - description = "Spry virtual machine"; - license = [ licenses.mit ]; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/spryvm/nil.patch b/pkgs/development/nim-packages/spryvm/nil.patch deleted file mode 100644 index 82d42b597fdb..000000000000 --- a/pkgs/development/nim-packages/spryvm/nil.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/spryvm/spryui.nim b/spryvm/spryui.nim -index 37f5329..50440e9 100644 ---- a/spryvm/spryui.nim -+++ b/spryvm/spryui.nim -@@ -140,14 +140,14 @@ proc addUI*(spry: Interpreter) = - nimMeth("openFile"): - var win = WindowNode(evalArgInfix(spry)) - var path = openFile(Window(win.widget)) -- if path.isNil: -+ if path == "": - spry.nilVal - else: - newValue($path) - nimMeth("saveFile"): - var win = WindowNode(evalArgInfix(spry)) - var path = saveFile(Window(win.widget)) -- if path.isNil: -+ if path == "": - spry.nilVal - else: - newValue($path) diff --git a/pkgs/development/nim-packages/stew/default.nix b/pkgs/development/nim-packages/stew/default.nix deleted file mode 100644 index d494e5f879ef..000000000000 --- a/pkgs/development/nim-packages/stew/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, snappy }: - -buildNimPackage rec { - pname = "stew"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "status-im"; - repo = "nim-${pname}"; - rev = "478cc6efdefaabadf0666a3351fb959b78009bcc"; - hash = "sha256-txlTF0zNV5kV4KfE744oB3aVLCfWS9BdoKxUmTQTTRY="; - }; - doCheck = false; - meta = with lib; - src.meta // { - description = - "Backports, standard library candidates and small utilities that don't yet deserve their own repository"; - license = [ lib.licenses.asl20 ]; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/supersnappy/default.nix b/pkgs/development/nim-packages/supersnappy/default.nix deleted file mode 100644 index f2f8205d8286..000000000000 --- a/pkgs/development/nim-packages/supersnappy/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ fetchFromGitHub }: - -fetchFromGitHub { - owner = "guzba"; - repo = "supersnappy"; - rev = "2.1.1"; - sha256 = "03df1qgrbp84swhqy12ansyn951lkaw0kf1arbnki4fkgdnqdamf"; -} diff --git a/pkgs/development/nim-packages/tempfile/default.nix b/pkgs/development/nim-packages/tempfile/default.nix deleted file mode 100644 index d23ea05cb322..000000000000 --- a/pkgs/development/nim-packages/tempfile/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "tempfile"; - version = "0.1.7"; - src = fetchFromGitHub { - owner = "OpenSystemsLab"; - repo = "${pname}.nim"; - rev = version; - hash = "sha256-08vvHXVxL1mAcpMzosaHd2FupTJrKJP5JaVcgxN4oYE="; - }; - doCheck = false; # impure - meta = with lib; - src.meta // { - description = "Temporary files and folders"; - license = [ lib.licenses.mit ]; - maintainers = [ maintainers.ehmry ]; - mainProgram = "tempfile_seeder"; - }; -} diff --git a/pkgs/development/nim-packages/ui/default.nix b/pkgs/development/nim-packages/ui/default.nix deleted file mode 100644 index 0af0665bfa65..000000000000 --- a/pkgs/development/nim-packages/ui/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, libui, pkg-config }: - -buildNimPackage rec { - pname = "ui"; - version = "0.9.4"; - src = fetchFromGitHub { - owner = "nim-lang"; - repo = pname; - rev = "547e1cea8e9fb68c138c422b77af0a3152e50210"; - hash = "sha256-rcvC0TO1r2zU7WEYfcsi/qX+nRITwKj7Fkqd4fHgTwU="; - }; - propagatedBuildInputs = [ libui ]; - propagatedNativeBuildInputs = [ pkg-config ]; - postPatch = '' - echo {.passL: r\"$(pkg-config --libs libui)\".} >> ui/rawui.nim - ''; - meta = with lib; - src.meta // { - description = "Nim bindings to libui"; - license = [ licenses.mit ]; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/unicodedb/default.nix b/pkgs/development/nim-packages/unicodedb/default.nix deleted file mode 100644 index cbc897a1fc4e..000000000000 --- a/pkgs/development/nim-packages/unicodedb/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage (finalAttrs: { - pname = "unicodedb"; - version = "0.12.0"; - src = fetchFromGitHub { - owner = "nitely"; - repo = "nim-unicodedb"; - rev = finalAttrs.version; - hash = "sha256-vtksdRTWH/Fjp1z8KSFGjgn1SRUxtUZwlOa+vMuB53A="; - }; - meta = finalAttrs.src.meta // { - description = "Unicode Character Database (UCD, tr44) for Nim"; - homepage = "https://github.com/nitely/nim-unicodedb"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/unicodeplus/default.nix b/pkgs/development/nim-packages/unicodeplus/default.nix deleted file mode 100644 index 8efb1fee7ec0..000000000000 --- a/pkgs/development/nim-packages/unicodeplus/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, segmentation }: - -buildNimPackage (finalAttrs: { - pname = "unicodeplus"; - version = "0.8.0"; - src = fetchFromGitHub { - owner = "nitely"; - repo = "nim-unicodeplus"; - rev = "v${finalAttrs.version}"; - sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk"; - }; - propagatedBuildInputs = [ segmentation ]; - meta = finalAttrs.src.meta // { - description = "Common unicode operations"; - homepage = "https://github.com/nitely/nim-unicodeplus"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/vmath/default.nix b/pkgs/development/nim-packages/vmath/default.nix deleted file mode 100644 index b7c0c37cbdfb..000000000000 --- a/pkgs/development/nim-packages/vmath/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "vmath"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "treeform"; - repo = pname; - rev = version; - hash = "sha256-/v0lQIOMogTxFRtbssziW4W6VhMDepM6Si8igLgcx30="; - }; - - nimFlags = [ "--mm:refc" ]; - - doCheck = !stdenv.isDarwin; - - meta = with lib; - src.meta // { - description = "Math vector library for graphical things"; - license = [ licenses.mit ]; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/development/nim-packages/ws/default.nix b/pkgs/development/nim-packages/ws/default.nix deleted file mode 100644 index 704d6d936bda..000000000000 --- a/pkgs/development/nim-packages/ws/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage (finalAttrs: { - pname = "ws"; - version = "0.5.0"; - src = fetchFromGitHub { - owner = "treeform"; - repo = "ws"; - rev = finalAttrs.version; - hash = "sha256-3wVi6CjMTjcc5MJEozJN6W3TuYDb53w2MDCsv6lMH0k="; - }; - preCheck = '' - rm tests/test_ws.nim tests/test_timeout.nim - ''; - meta = finalAttrs.src.meta // { - description = "Simple WebSocket library for Nim"; - homepage = "https://github.com/treeform/ws"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ehmry ]; - }; -}) diff --git a/pkgs/development/nim-packages/x11/default.nix b/pkgs/development/nim-packages/x11/default.nix deleted file mode 100644 index 85c5a18a381d..000000000000 --- a/pkgs/development/nim-packages/x11/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub }: - -buildNimPackage rec { - pname = "x11"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "nim-lang"; - repo = pname; - rev = "2093a4c01360cbb5dd33ab79fd4056e148b53ca1"; - hash = "sha256-2XRyXiBxAc9Zx/w0zRBHRZ240qww0FJvIvOKZ8YH50A="; - }; - - meta = with lib; - src.meta // { - description = "X11 library for nim"; - license = [ licenses.mit ]; - maintainers = [ maintainers.marcusramberg ]; - }; -} diff --git a/pkgs/development/nim-packages/zippy/default.nix b/pkgs/development/nim-packages/zippy/default.nix deleted file mode 100644 index c89d030288e5..000000000000 --- a/pkgs/development/nim-packages/zippy/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildNimPackage, fetchFromGitHub, unzip }: - -buildNimPackage rec { - pname = "zippy"; - version = "0.7.3"; - - nativeBuildInputs = [ unzip ]; - - src = fetchFromGitHub { - owner = "guzba"; - repo = pname; - rev = version; - hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8="; - }; - - meta = with lib; - src.meta // { - description = "Pure Nim implementation of deflate, zlib, gzip and zip"; - license = [ licenses.mit ]; - maintainers = [ maintainers.ehmry ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ade2f17ecc84..8d5ad5db9112 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16792,8 +16792,6 @@ with pkgs; { inherit (darwin) Security; } ) nim-unwrapped-1 nim-unwrapped-2 nim1 nim2; nim = nim1; - nimPackages = recurseIntoAttrs nim1.pkgs; - nim2Packages = recurseIntoAttrs nim2.pkgs; buildNimPackage = callPackage ../development/compilers/nim/build-nim-package.nix { }; nimOverrides = callPackage ./nim-overrides.nix { }; diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix deleted file mode 100644 index fce2071d5c8a..000000000000 --- a/pkgs/top-level/nim-packages.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ lib, pkgs, stdenv, newScope, nim, buildNimPackage }: - -lib.makeScope newScope (self: - let callPackage = self.callPackage; - in { - inherit nim; - buildNimPackage = buildNimPackage.override { - defaultNimVersion = - if lib.versionAtLeast nim.version "2.0.0" then 2 else 1; - } { }; - - asciigraph = callPackage ../development/nim-packages/asciigraph { }; - - astpatternmatching = - callPackage ../development/nim-packages/astpatternmatching { }; - - asynctools = callPackage ../development/nim-packages/asynctools { }; - - bumpy = callPackage ../development/nim-packages/bumpy { }; - - chroma = callPackage ../development/nim-packages/chroma { }; - - csvtools = callPackage ../development/nim-packages/csvtools { }; - - db_connector = callPackage ../development/nim-packages/db_connector { }; - - docopt = callPackage ../development/nim-packages/docopt { }; - - flatty = callPackage ../development/nim-packages/flatty { }; - - frosty = callPackage ../development/nim-packages/frosty { }; - - hashlib = callPackage ../development/nim-packages/hashlib { }; - - hts = callPackage ../development/nim-packages/hts { }; - - illwill = callPackage ../development/nim-packages/illwill { }; - - illwillwidgets = callPackage ../development/nim-packages/illwillwidgets { }; - - jester = callPackage ../development/nim-packages/jester { }; - - jsonschema = callPackage ../development/nim-packages/jsonschema { }; - - jsony = callPackage ../development/nim-packages/jsony { }; - - karax = callPackage ../development/nim-packages/karax { }; - - lscolors = callPackage ../development/nim-packages/lscolors { }; - - markdown = callPackage ../development/nim-packages/markdown { }; - - nimcrypto = callPackage ../development/nim-packages/nimcrypto { }; - - nimbox = callPackage ../development/nim-packages/nimbox { }; - - nimSHA2 = callPackage ../development/nim-packages/nimSHA2 { }; - - nimsimd = callPackage ../development/nim-packages/nimsimd { }; - - noise = callPackage ../development/nim-packages/noise { }; - - npeg = callPackage ../development/nim-packages/npeg { }; - - packedjson = callPackage ../development/nim-packages/packedjson { }; - - parsetoml = callPackage ../development/nim-packages/parsetoml { }; - - pixie = callPackage ../development/nim-packages/pixie { }; - - redis = callPackage ../development/nim-packages/redis { }; - - redpool = callPackage ../development/nim-packages/redpool { }; - - regex = callPackage ../development/nim-packages/regex { }; - - rocksdb = callPackage ../development/nim-packages/rocksdb { - inherit (pkgs) rocksdb; - }; - - safeseq = callPackage ../development/nim-packages/safeseq { }; - - safeset = callPackage ../development/nim-packages/safeset { }; - - sass = callPackage ../development/nim-packages/sass { }; - - sdl2 = callPackage ../development/nim-packages/sdl2 { }; - - segmentation = callPackage ../development/nim-packages/segmentation { }; - - snappy = - callPackage ../development/nim-packages/snappy { inherit (pkgs) snappy; }; - - nimraylib-now = callPackage ../development/nim-packages/nimraylib-now { }; - - smtp = callPackage ../development/nim-packages/smtp { }; - - spry = callPackage ../development/nim-packages/spry { }; - - spryvm = callPackage ../development/nim-packages/spryvm { }; - - stew = callPackage ../development/nim-packages/stew { }; - - supersnappy = callPackage ../development/nim-packages/supersnappy { }; - - tempfile = callPackage ../development/nim-packages/tempfile { }; - - ui = callPackage ../development/nim-packages/ui { inherit (pkgs) libui; }; - - unicodedb = callPackage ../development/nim-packages/unicodedb { }; - - unicodeplus = callPackage ../development/nim-packages/unicodeplus { }; - - vmath = callPackage ../development/nim-packages/vmath { }; - - ws = callPackage ../development/nim-packages/ws { }; - - x11 = callPackage ../development/nim-packages/x11 { }; - - zippy = callPackage ../development/nim-packages/zippy { }; - - }) -- cgit 1.4.1