Skip to content

Commit cfb13ba

Browse files
committed
Remove unused shell-fixup files from compile-env
Closes #71 Signed-off-by: Daniel Noland <[email protected]>
1 parent 56a71fd commit cfb13ba

File tree

10 files changed

+1
-56
lines changed

10 files changed

+1
-56
lines changed

Dockerfile

-13
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,4 @@ RUN for frr in /nix/store/*-frr-*; do \
66
done
77
FROM ${IMAGE} AS doc-env
88
FROM ${IMAGE} AS compile-env
9-
10-
# I can't properly set permissions in nix because of the way it works.
11-
# So I have to do this hacky thing to get sudo to work.
12-
RUN chmod 777 /tmp \
13-
&& chmod 4755 /sbin/sudo \
14-
&& chmod 555 /etc/pam.d \
15-
&& chmod -R 444 /etc/pam.d/* \
16-
&& chmod 444 /etc/group \
17-
&& chmod 444 /etc/passwd \
18-
&& mkdir -p /home/runner \
19-
&& chown -R runner:runner /home/runner
20-
21-
USER runner
229
CMD ["/bin/bash", "--login"]

default.nix

+1-5
Original file line numberDiff line numberDiff line change
@@ -417,19 +417,15 @@ rec {
417417
});
418418

419419
compileEnvPackageList = with toolchainPkgs; [
420-
(callPackage ./nix/shell-fixup { })
421-
bash-completion
422-
bashInteractive
420+
bash
423421
cacert
424422
cargo-nextest
425423
coreutils
426424
just
427-
libcap # for test runner
428425
llvmPackages.clang
429426
llvmPackages.libclang.lib
430427
llvmPackages.lld
431428
rust-toolchain
432-
sudo # for test runner
433429
tmpdir
434430
];
435431

nix/shell-fixup/default.nix

-11
This file was deleted.

nix/shell-fixup/src/etc/bash.bashrc

-17
This file was deleted.

nix/shell-fixup/src/etc/group

-2
This file was deleted.

nix/shell-fixup/src/etc/pam.d/sudo

-3
This file was deleted.

nix/shell-fixup/src/etc/passwd

-2
This file was deleted.

nix/shell-fixup/src/etc/profile

-1
This file was deleted.

nix/shell-fixup/src/etc/sudoers.d/dangerous

-1
This file was deleted.

nix/shell-fixup/src/os-release

-1
This file was deleted.

0 commit comments

Comments
 (0)