1 Commits

Author SHA1 Message Date
5ac99012e0 cachix action failing for unknown reasons, patch to use local runner
All checks were successful
Nix / build (nixos-unstable) (pull_request) Successful in 20m55s
Nix / build (nixos-22.11) (pull_request) Successful in 23m59s
Nix / build (nixos-23.05) (pull_request) Successful in 24m40s
2023-09-07 16:04:33 -04:00
2 changed files with 8 additions and 13 deletions

View File

@@ -18,10 +18,10 @@ jobs:
- nixos-unstable - nixos-unstable
- nixos-22.11 - nixos-22.11
- nixos-23.05 - nixos-23.05
runs-on: ubuntu-latest runs-on: native
container: pjjw/nix-flake-runner:1
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: cachix/install-nix-action@v22
- run: nix-shell --run ./ci.sh - run: nix-shell --run ./ci.sh
env: env:
CI_REGISTRY_AUTH: '${{ secrets.REGISTRY_AUTH }}' CI_REGISTRY_AUTH: '${{ secrets.REGISTRY_AUTH }}'

View File

@@ -6,20 +6,21 @@
, python3 , python3
, removeReferencesTo , removeReferencesTo
, runCommand , runCommand
, buildPackages
}: }:
let let
inherit (pkgsStatic) inherit (pkgsStatic)
bashInteractive bashInteractive
busybox busybox
cacert; cacert
openssl
;
bash = bashInteractive; bash = bashInteractive;
# Get nix from Hydra because the nixpkgs one is not fully static # Get nix from Hydra because the nixpkgs one is not fully static
nixStaticBin = fetchurl { nixStaticBin = fetchurl {
url = "https://hydra.nixos.org/build/228458395/download/1/nix"; url = "https://hydra.nixos.org/build/181573550/download/1/nix";
hash = "sha256-H361lUdMpBpBVwInBmpAXKAwjPIf740Jg9Nht0NV66s="; hash = "sha256-zO2xJhQIrLtL/ReTlcorjwsaTO1W5Rnr+sXwcLcujok=";
}; };
nixSymlinks = [ nixSymlinks = [
@@ -63,11 +64,6 @@ let
# Add user home folder # Add user home folder
mkdir home mkdir home
# Create an unpriveleged user that we can use also without the run-as-user.sh script
chmod +w $PWD/etc/group $PWD/etc/passwd
${buildPackages.shadow}/bin/groupadd --prefix $PWD -g 9000 nixuser
${buildPackages.shadow}/bin/useradd --prefix $PWD -m -d /tmp -u 9000 -g 9000 -G nixuser nixuser
# Add SSL CA certs # Add SSL CA certs
cp -a "${cacert}/etc/ssl/certs/ca-bundle.crt" etc/ssl/certs/ca-bundle.crt cp -a "${cacert}/etc/ssl/certs/ca-bundle.crt" etc/ssl/certs/ca-bundle.crt
@@ -121,8 +117,7 @@ let
Env = [ Env = [
"NIX_BUILD_SHELL=/bin/bash" "NIX_BUILD_SHELL=/bin/bash"
"PAGER=cat" "PAGER=cat"
# /host/bin can be used to extend the image with additional binaries "PATH=/bin"
"PATH=/bin:/host/bin"
"SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt" "SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt"
]; ];
}; };