diff --git a/pkgs/development/compilers/kcc/default.nix b/pkgs/development/tools/knightos/kcc/default.nix similarity index 100% rename from pkgs/development/compilers/kcc/default.nix rename to pkgs/development/tools/knightos/kcc/default.nix diff --git a/pkgs/development/tools/misc/kimg/default.nix b/pkgs/development/tools/knightos/kimg/default.nix similarity index 100% rename from pkgs/development/tools/misc/kimg/default.nix rename to pkgs/development/tools/knightos/kimg/default.nix diff --git a/pkgs/development/tools/misc/kpack/default.nix b/pkgs/development/tools/knightos/kpack/default.nix similarity index 100% rename from pkgs/development/tools/misc/kpack/default.nix rename to pkgs/development/tools/knightos/kpack/default.nix diff --git a/pkgs/development/tools/misc/mkrom/default.nix b/pkgs/development/tools/knightos/mkrom/default.nix similarity index 100% rename from pkgs/development/tools/misc/mkrom/default.nix rename to pkgs/development/tools/knightos/mkrom/default.nix diff --git a/pkgs/development/compilers/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix similarity index 97% rename from pkgs/development/compilers/scas/default.nix rename to pkgs/development/tools/knightos/scas/default.nix index e80724c8a4cc..ad21e68eed8c 100644 --- a/pkgs/development/compilers/scas/default.nix +++ b/pkgs/development/tools/knightos/scas/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { pname = "scas"; - + version = "0.4.6"; - + src = fetchFromGitHub { owner = "KnightOS"; repo = "scas"; rev = version; sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h"; }; - + nativeBuildInputs = [ cmake ]; - + hardeningDisable = [ "format" ]; - + meta = with stdenv.lib; { homepage = "https://knightos.org/"; description = "Assembler and linker for the Z80."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea01758e5e84..5f3d85ddd23e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4904,11 +4904,6 @@ in kippo = callPackage ../servers/kippo { }; - kimg = callPackage ../development/tools/misc/kimg { - asciidoc = asciidoc-full; - imagemagick = imagemagick7Big; - }; - kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; @@ -9271,7 +9266,20 @@ in jwasm = callPackage ../development/compilers/jwasm { }; - knightos-kcc = callPackage ../development/compilers/kcc { }; + knightos-kcc = callPackage ../development/tools/knightos/kcc { }; + + knightos-kimg = callPackage ../development/tools/knightos/kimg { + asciidoc = asciidoc-full; + imagemagick = imagemagick7Big; + }; + + knightos-kpack = callPackage ../development/tools/knightos/kpack { }; + + knightos-mkrom = callPackage ../development/tools/knightos/mkrom { + asciidoc = asciidoc-full; + }; + + knightos-scas = callPackage ../development/tools/knightos/scas { }; kotlin = callPackage ../development/compilers/kotlin { }; @@ -9666,8 +9674,6 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; - scas = callPackage ../development/compilers/scas { }; - metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { }; @@ -11104,8 +11110,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - kpack = callPackage ../development/tools/misc/kpack { }; - kustomize = callPackage ../development/tools/kustomize { }; ktlint = callPackage ../development/tools/ktlint { }; @@ -11178,10 +11182,6 @@ in mkcert = callPackage ../development/tools/misc/mkcert { }; - mkrom = callPackage ../development/tools/misc/mkrom { - asciidoc = asciidoc-full; - }; - mkdocs = callPackage ../development/tools/documentation/mkdocs { }; mockgen = callPackage ../development/tools/mockgen { };