lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

treewide: hack/nixpkgs, which uses _our_ nixpkgs, not actual nixpkgs

Browse source
This commit is contained in:
Luke Granger-Brown 2023-08-11 23:05:35 +01:00
parent 0500d97b67
commit b16bfb93ce
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hack/nixpkgs/default.nix Normal file
View file

@ -0,0 +1,5 @@
{ system ? builtins.currentSystem }@args:
let
depot = import ../.. args;
in
depot.pkgs

4
nix/gitlab-ci/default.nix
View file

@ -65,7 +65,7 @@ let
only.refs = [ "branch/default" ]; only.refs = [ "branch/default" ];
script = '' script = ''
export NIX_PATH=nixpkgs=$(readlink -f third_party/nixpkgs) export NIX_PATH=nixpkgs=$(readlink -f hack/nixpkgs)
$(nix-build -A nix.pkgs.flipperzero-firmware.upload)/bin/upload-f0 $(nix-build -A nix.pkgs.flipperzero-firmware.upload)/bin/upload-f0
''; '';
}; };
@ -76,7 +76,7 @@ let
only.refs = [ "branch/default" ]; only.refs = [ "branch/default" ];
script = '' script = ''
export NIX_PATH=nixpkgs=$(readlink -f third_party/nixpkgs) export NIX_PATH=nixpkgs=$(readlink -f hack/nixpkgs)
cd web/lukegbcom cd web/lukegbcom
./deploy.sh ./deploy.sh
''; '';

2
ops/nixos/lib/common.nix
View file

@ -115,7 +115,7 @@ in
nix = { nix = {
package = pkgs.nix_2_3; # Use a working nix. package = pkgs.nix_2_3; # Use a working nix.
nixPath = [ "depot=/home/lukegb/depot/" "nixpkgs=/home/lukegb/depot/third_party/nixpkgs/" ]; nixPath = [ "depot=/home/lukegb/depot/" "nixpkgs=/home/lukegb/depot/hack/nixpkgs/" ];
settings = { settings = {
trusted-users = [ "root" "@wheel" "deployer" ]; trusted-users = [ "root" "@wheel" "deployer" ];
substituters = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ]; substituters = lib.mkForce [ "https://cache.nixos.org/" "s3://lukegb-nix-cache?endpoint=storage.googleapis.com&trusted=1" ];