From 25945099f18c21878ab800b60cc93a2762bb8f66 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 26 Jan 2024 00:09:45 -0600 Subject: [PATCH] remove old overlay --- modules/langs/nim.nix | 1 - overlays/nim/default.nix | 18 ------------------ overlays/nim/install.patch | 10 ---------- overlays/nimble/default.nix | 2 +- overlays/wezterm/default.nix | 11 ----------- 5 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 overlays/nim/default.nix delete mode 100644 overlays/nim/install.patch delete mode 100644 overlays/wezterm/default.nix diff --git a/modules/langs/nim.nix b/modules/langs/nim.nix index de7625d..3481bb5 100644 --- a/modules/langs/nim.nix +++ b/modules/langs/nim.nix @@ -11,7 +11,6 @@ in { options.languages.nim = mkEnableOption "nim"; config = mkIf cfg.nim { nixpkgs.overlays = [ - (import ../../overlays/nim {}) (import ../../overlays/nimlsp {}) (import ../../overlays/nimble {}) (import ../../overlays/nim-atlas {}) diff --git a/overlays/nim/default.nix b/overlays/nim/default.nix deleted file mode 100644 index 73ca9a9..0000000 --- a/overlays/nim/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{...}: (final: prev: { - nim-unwrapped-2 = prev.nim-unwrapped-2.overrideAttrs { - patches = - (prev.patches or []) - ++ [ - ./install.patch - ]; - # installPhase = '' - # runHook preInstall - # install -Dt $out/bin bin/* - # ln -sf $out/nim/bin/nim $out/bin/nim - # ln -sf $out/nim/lib $out/lib - # ./install.sh $out - # cp -a dist tools $out/nim/ - # runHook postInstall - # ''; - }; -}) diff --git a/overlays/nim/install.patch b/overlays/nim/install.patch deleted file mode 100644 index 8c08fbd..0000000 --- a/overlays/nim/install.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/install.sh b/install.sh -@@ -1113,6 +1113,8 @@ - chmod 644 "$nimbleDir/doc/advopt.txt" - cp "doc/nimdoc.css" "$nimbleDir/doc/nimdoc.css" - chmod 644 "$nimbleDir/doc/nimdoc.css" -+ cp "doc/nimdoc.cls" "$nimbleDir/doc/nimdoc.cls" -+ chmod 644 "$nimbleDir/doc/nimdoc.cls" - cp "nim.nimble" "$nimbleDir/nim.nimble" - chmod 644 "$nimbleDir/nim.nimble" - diff --git a/overlays/nimble/default.nix b/overlays/nimble/default.nix index a7a6391..bd90a07 100644 --- a/overlays/nimble/default.nix +++ b/overlays/nimble/default.nix @@ -2,7 +2,7 @@ nimble = prev.nimble.overrideNimAttrs { version = "0.14.2-f74bf2"; requiredNimVersion = 2; - buildInputs = [prev.pkgs.openssl]; + buildInputs = [ prev.pkgs.openssl ]; src = prev.fetchFromGitHub { owner = "nim-lang"; diff --git a/overlays/wezterm/default.nix b/overlays/wezterm/default.nix deleted file mode 100644 index d257f10..0000000 --- a/overlays/wezterm/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{...}: (final: prev: { - wezterm = prev.wezterm.overrideAttrs { - src = prev.fetchFromGitHub { - version = "main-20240121"; - owner = "wez"; - repo = "wezterm"; - rev = "b0671294d1c9225096909e12875ada25dd19a35e"; - hash = "sha256-oIt4bUVXRR7qnBPizcPA7fTiZl4xz9QaSdzLNukjtkw="; - }; - }; -})