Commit 8672b5ca authored by Emery Hemingway's avatar Emery Hemingway
Browse files

Remove nimPackages and nim2Packages

parent 7bd3fa9f

pkgs/development/compilers/nim/build-nim-package.nix

+0 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/development/compilers/nim/default.nix

+2 −6
Original line number Diff line number Diff line
@@ -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 {

pkgs/development/libraries/getdns/default.nix

+1 −3
Original line number Diff line number Diff line 
# 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";

pkgs/development/libraries/tkrzw/default.nix

+1 −2
Original line number Diff line number Diff line 
{ 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/";

pkgs/development/nim-packages/asciigraph/default.nix

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
{ 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 ];

    };

}