Skip to content

Commit

Permalink
Remove clearDeps function
Browse files Browse the repository at this point in the history
`clearDeps` is a bit of a bug factory as it turns out.

It is not necessary anyway; all it does is shrink the development containers a bit, which we can very much live without.
  • Loading branch information
daniel-noland committed Feb 4, 2025
1 parent 874d1aa commit ef7ece9
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -544,9 +544,6 @@ rec {
musl64.release
];

clearDeps =
obj: with builtins; (/. + "${unsafeDiscardStringContext (unsafeDiscardOutputDependency (obj))}");

maxLayers = 120;

initfrr = toolchainPkgs.stdenv.mkDerivation {
Expand Down Expand Up @@ -582,7 +579,7 @@ rec {
frr = toolchainPkgs.dockerTools.buildLayeredImage {
name = "${contianer-repo}/frr";
tag = "${image-tag}";
contents = map clearDeps frrContainerContents;
contents = frrContainerContents;
config = {
Env = [
"LD_LIBRARY_PATH=/lib"
Expand All @@ -606,7 +603,7 @@ rec {
pkgs.release.gnu64.glibc.dev
pkgs.dev.gnu64.glibc.out
pkgs.release.gnu64.glibc.out
] ++ (map clearDeps sysroots);
] ++ (sysroots);
inherit maxLayers;
};
doc-env = toolchainPkgs.dockerTools.buildLayeredImage {
Expand Down

0 comments on commit ef7ece9

Please sign in to comment.