Unverified Commit da831a4b authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #305864 from obsidiansystems/aa/netbsd_pkgs

netbsd: move packages into their own modules
parents 3afcb00f f0b2aa73
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -25,16 +25,11 @@ in makeScopeWithSplicing' {
      sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E=";
    };

    # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`?
    # See note in ../netbsd/default.nix.

    compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isFreeBSD) self.compat;

    freebsd-lib = import ./lib { inherit version; };

    # Overridden arguments avoid cross package-set splicing issues,
    # otherwise would just use implicit
    # `lib.packagesFromDirectoryRecursive` auto-call.
    # The manual callPackages below should in principle be unnecessary, but are
    # necessary. See note in ../netbsd/default.nix

    compat = self.callPackage ./pkgs/compat/package.nix {
      inherit stdenv;
+102 −997

File changed.

Preview size limit exceeded, changes collapsed.

+8 −0
Original line number Diff line number Diff line
{ lib, mkDerivation }:

mkDerivation {
  path = "usr.bin/cksum";
  version = "9.2";
  sha256 = "0msfhgyvh5c2jmc6qjnf12c378dhw32ffsl864qz4rdb2b98rfcq";
  meta.platforms = lib.platforms.netbsd;
}
+7 −0
Original line number Diff line number Diff line
{ mkDerivation }:

mkDerivation {
  path = "usr.bin/column";
  version = "9.2";
  sha256 = "0r6b0hjn5ls3j3sv6chibs44fs32yyk2cg8kh70kb4cwajs4ifyl";
}
+3 −0
Original line number Diff line number Diff line
{ fetchNetBSD }:

fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9"
Loading