diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2024-06-20 14:13:31 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2024-06-21 18:38:17 -0400 |
commit | 0bf10957e2679a6379f5e02e921a8f58ce18deac (patch) | |
tree | 08addd09f41928e453e8e1bf629dcbb1e72f7aa7 /pkgs/os-specific | |
parent | dee7e6f519de4c4a6b897097a7f6a58f8033024f (diff) |
netbsd: Sort top package set file
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 1a00128dcb5b8..f314ba5806f79 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -47,20 +47,6 @@ makeScopeWithSplicing' { # if we don't perform these manual calls, we get infinite recursion issues # because of the splices. - mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { - inherit (buildPackages.netbsd) - netbsdSetupHook - makeMinimal - install - tsort - lorder - ; - inherit (buildPackages) mandoc; - inherit (buildPackages.buildPackages) rsync; - }; - - makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { inherit (self) make; }; - compat = self.callPackage ./pkgs/compat/package.nix { inherit (buildPackages) coreutils; inherit (buildPackages.darwin) cctools-port; @@ -68,33 +54,25 @@ makeScopeWithSplicing' { inherit (self) install; }; - install = self.callPackage ./pkgs/install/package.nix { - inherit (self) - fts - mtree - make - compatIfNeeded - ; - inherit (buildPackages.netbsd) makeMinimal; - }; - - # See note in pkgs/stat/package.nix - stat = self.callPackage ./pkgs/stat/package.nix { - inherit (buildPackages.netbsd) makeMinimal install; - }; - - # See note in pkgs/stat/hook.nix - statHook = self.callPackage ./pkgs/stat/hook.nix { inherit (self) stat; }; - - tsort = self.callPackage ./pkgs/tsort.nix { inherit (buildPackages.netbsd) makeMinimal install; }; - - lorder = self.callPackage ./pkgs/lorder.nix { inherit (buildPackages.netbsd) makeMinimal install; }; - config = self.callPackage ./pkgs/config.nix { inherit (buildPackages.netbsd) makeMinimal install; inherit (self) cksum; }; + csu = self.callPackage ./pkgs/csu.nix { + inherit (self) headers sys-headers ld_elf_so; + inherit (buildPackages.netbsd) + netbsdSetupHook + makeMinimal + install + genassym + gencat + lorder + tsort + statHook + ; + }; + include = self.callPackage ./pkgs/include.nix { inherit (buildPackages.netbsd) makeMinimal @@ -105,74 +83,96 @@ makeScopeWithSplicing' { inherit (buildPackages) stdenv; }; - sys-headers = self.callPackage ./pkgs/sys/headers.nix { - inherit (buildPackages.netbsd) - makeMinimal - install - tsort - lorder - statHook - uudecode - config - genassym + install = self.callPackage ./pkgs/install/package.nix { + inherit (self) + fts + mtree + make + compatIfNeeded ; + inherit (buildPackages.netbsd) makeMinimal; }; - libutil = self.callPackage ./pkgs/libutil.nix { + libcMinimal = self.callPackage ./pkgs/libcMinimal.nix { + inherit (self) headers csu; inherit (buildPackages.netbsd) netbsdSetupHook makeMinimal install + genassym + gencat lorder tsort statHook + rpcgen ; }; libpthread-headers = self.callPackage ./pkgs/libpthread/headers.nix { }; - csu = self.callPackage ./pkgs/csu.nix { - inherit (self) headers sys-headers ld_elf_so; + librpcsvc = self.callPackage ./pkgs/librpcsvc.nix { inherit (buildPackages.netbsd) netbsdSetupHook makeMinimal install - genassym - gencat lorder tsort statHook + rpcgen ; }; - libcMinimal = self.callPackage ./pkgs/libcMinimal.nix { - inherit (self) headers csu; + libutil = self.callPackage ./pkgs/libutil.nix { inherit (buildPackages.netbsd) netbsdSetupHook makeMinimal install - genassym - gencat lorder tsort statHook - rpcgen ; }; - librpcsvc = self.callPackage ./pkgs/librpcsvc.nix { + lorder = self.callPackage ./pkgs/lorder.nix { inherit (buildPackages.netbsd) makeMinimal install; }; + + mtree = self.callPackage ./pkgs/mtree.nix { inherit (self) mknod; }; + + mkDerivation = self.callPackage ./pkgs/mkDerivation.nix { inherit (buildPackages.netbsd) netbsdSetupHook makeMinimal install + tsort lorder + ; + inherit (buildPackages) mandoc; + inherit (buildPackages.buildPackages) rsync; + }; + + makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { inherit (self) make; }; + + # See note in pkgs/stat/package.nix + stat = self.callPackage ./pkgs/stat/package.nix { + inherit (buildPackages.netbsd) makeMinimal install; + }; + + # See note in pkgs/stat/hook.nix + statHook = self.callPackage ./pkgs/stat/hook.nix { inherit (self) stat; }; + + sys-headers = self.callPackage ./pkgs/sys/headers.nix { + inherit (buildPackages.netbsd) + makeMinimal + install tsort + lorder statHook - rpcgen + uudecode + config + genassym ; }; - mtree = self.callPackage ./pkgs/mtree.nix { inherit (self) mknod; }; + tsort = self.callPackage ./pkgs/tsort.nix { inherit (buildPackages.netbsd) makeMinimal install; }; } ); } |