From bf3d1e143bfeefe8684041944bb4e468f6362c26 Mon Sep 17 00:00:00 2001 From: Quinn Unger Date: Mon, 27 Jul 2026 12:45:31 +0100 Subject: [PATCH] move all packages under pkgs/ --- flake.nix | 2 +- overlays.nix | 14 +++++++------- pkgs/{fonts => }/comic-code.nix | 0 pkgs/{programs => }/edalize.nix | 0 pkgs/{programs => }/naturaldocs.nix | 0 pkgs/{programs => }/quartus/overlay.nix | 0 pkgs/{programs => }/quartus/quartus-unwrapped.nix | 0 pkgs/{programs => }/quartus/quartus.nix | 0 pkgs/{programs => }/quartus/sources/helpers.nix | 0 pkgs/{programs => }/quartus/sources/lite.nix | 0 pkgs/{programs => }/quartus/sources/pro.nix | 0 pkgs/{programs => }/quartus/sources/standard.nix | 0 pkgs/{programs => }/slangServer/findfmt.patch | 0 pkgs/{programs => }/slangServer/slangServer.nix | 0 pkgs/{programs => }/ttf2psf.nix | 0 pkgs/{programs => }/veadotube.nix | 0 16 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/{fonts => }/comic-code.nix (100%) rename pkgs/{programs => }/edalize.nix (100%) rename pkgs/{programs => }/naturaldocs.nix (100%) rename pkgs/{programs => }/quartus/overlay.nix (100%) rename pkgs/{programs => }/quartus/quartus-unwrapped.nix (100%) rename pkgs/{programs => }/quartus/quartus.nix (100%) rename pkgs/{programs => }/quartus/sources/helpers.nix (100%) rename pkgs/{programs => }/quartus/sources/lite.nix (100%) rename pkgs/{programs => }/quartus/sources/pro.nix (100%) rename pkgs/{programs => }/quartus/sources/standard.nix (100%) rename pkgs/{programs => }/slangServer/findfmt.patch (100%) rename pkgs/{programs => }/slangServer/slangServer.nix (100%) rename pkgs/{programs => }/ttf2psf.nix (100%) rename pkgs/{programs => }/veadotube.nix (100%) diff --git a/flake.nix b/flake.nix index df8f430..960a3c4 100644 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,8 @@ ttf2psf ; quartus-prime-lite = quartusPackages.lite.latest; - quartus-prime-standard = quartusPackages.standard.latest; quartus-prime-pro = quartusPackages.pro.latest; + quartus-prime-standard = quartusPackages.standard.latest; }; } ) diff --git a/overlays.nix b/overlays.nix index 961ea02..b0e6c75 100644 --- a/overlays.nix +++ b/overlays.nix @@ -1,15 +1,15 @@ let overlays = (builtins.mapAttrs (name: value: (final: prev: { "${name}" = value final prev; })) { - comic-code = final: _: final.callPackage ./pkgs/fonts/comic-code.nix { }; - edalize = final: _: final.callPackage ./pkgs/programs/edalize.nix { }; - naturaldocs = final: _: final.callPackage ./pkgs/programs/naturaldocs.nix { }; - slang-server = final: _: final.callPackage ./pkgs/programs/slangServer/slangServer.nix { }; - ttf2psf = final: _: final.callPackage ./pkgs/programs/ttf2psf.nix { }; - veadotube = final: _: final.callPackage ./pkgs/programs/veadotube.nix { }; + comic-code = final: _: final.callPackage ./pkgs/comic-code.nix { }; + edalize = final: _: final.callPackage ./pkgs/edalize.nix { }; + naturaldocs = final: _: final.callPackage ./pkgs/naturaldocs.nix { }; + slang-server = final: _: final.callPackage ./pkgs/slangServer/slangServer.nix { }; + ttf2psf = final: _: final.callPackage ./pkgs/ttf2psf.nix { }; + veadotube = final: _: final.callPackage ./pkgs/veadotube.nix { }; }) // { - quartus = import ./pkgs/programs/quartus/overlay.nix; + quartus = import ./pkgs/quartus/overlay.nix; }; composeExtensions = diff --git a/pkgs/fonts/comic-code.nix b/pkgs/comic-code.nix similarity index 100% rename from pkgs/fonts/comic-code.nix rename to pkgs/comic-code.nix diff --git a/pkgs/programs/edalize.nix b/pkgs/edalize.nix similarity index 100% rename from pkgs/programs/edalize.nix rename to pkgs/edalize.nix diff --git a/pkgs/programs/naturaldocs.nix b/pkgs/naturaldocs.nix similarity index 100% rename from pkgs/programs/naturaldocs.nix rename to pkgs/naturaldocs.nix diff --git a/pkgs/programs/quartus/overlay.nix b/pkgs/quartus/overlay.nix similarity index 100% rename from pkgs/programs/quartus/overlay.nix rename to pkgs/quartus/overlay.nix diff --git a/pkgs/programs/quartus/quartus-unwrapped.nix b/pkgs/quartus/quartus-unwrapped.nix similarity index 100% rename from pkgs/programs/quartus/quartus-unwrapped.nix rename to pkgs/quartus/quartus-unwrapped.nix diff --git a/pkgs/programs/quartus/quartus.nix b/pkgs/quartus/quartus.nix similarity index 100% rename from pkgs/programs/quartus/quartus.nix rename to pkgs/quartus/quartus.nix diff --git a/pkgs/programs/quartus/sources/helpers.nix b/pkgs/quartus/sources/helpers.nix similarity index 100% rename from pkgs/programs/quartus/sources/helpers.nix rename to pkgs/quartus/sources/helpers.nix diff --git a/pkgs/programs/quartus/sources/lite.nix b/pkgs/quartus/sources/lite.nix similarity index 100% rename from pkgs/programs/quartus/sources/lite.nix rename to pkgs/quartus/sources/lite.nix diff --git a/pkgs/programs/quartus/sources/pro.nix b/pkgs/quartus/sources/pro.nix similarity index 100% rename from pkgs/programs/quartus/sources/pro.nix rename to pkgs/quartus/sources/pro.nix diff --git a/pkgs/programs/quartus/sources/standard.nix b/pkgs/quartus/sources/standard.nix similarity index 100% rename from pkgs/programs/quartus/sources/standard.nix rename to pkgs/quartus/sources/standard.nix diff --git a/pkgs/programs/slangServer/findfmt.patch b/pkgs/slangServer/findfmt.patch similarity index 100% rename from pkgs/programs/slangServer/findfmt.patch rename to pkgs/slangServer/findfmt.patch diff --git a/pkgs/programs/slangServer/slangServer.nix b/pkgs/slangServer/slangServer.nix similarity index 100% rename from pkgs/programs/slangServer/slangServer.nix rename to pkgs/slangServer/slangServer.nix diff --git a/pkgs/programs/ttf2psf.nix b/pkgs/ttf2psf.nix similarity index 100% rename from pkgs/programs/ttf2psf.nix rename to pkgs/ttf2psf.nix diff --git a/pkgs/programs/veadotube.nix b/pkgs/veadotube.nix similarity index 100% rename from pkgs/programs/veadotube.nix rename to pkgs/veadotube.nix -- 2.51.2