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

treewide: various warning fixups

Browse source
This commit is contained in:
Luke Granger-Brown 2022-10-08 21:49:16 +01:00
parent 03d0572cae
commit 068f1e2d9c
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ops/maint/update_nixpkgs/default.nix
View file

@ -1,9 +1,7 @@
{ depot, lib, ... }: { depot, lib, ... }:
let let
inherit (depot) pkgs; inherit (depot) pkgs;
mercurial = (pkgs.mercurial.overridePythonAttrs (origAttrs: { inherit (depot.nix.pkgs) mercurial;
propagatedBuildInputs = [pkgs.python3Packages.hg-evolve];
}));
updateNixpkgs = pkgs.runCommand "update_nixpkgs" { updateNixpkgs = pkgs.runCommand "update_nixpkgs" {
buildInputs = with pkgs; [ makeWrapper ]; buildInputs = with pkgs; [ makeWrapper ];
} '' } ''
@ -25,9 +23,11 @@ pkgs.dockerTools.buildImage {
]; ];
}; };
contents = [ copyToRoot = pkgs.buildEnv {
pkgs.cacert updateNixpkgs name = "update_nixpkgs-root";
(pkgs.runCommand "update_nixpkgs_content" {} '' paths = [
pkgs.cacert updateNixpkgs
(pkgs.runCommand "update_nixpkgs_content" {} ''
mkdir $out $out/root $out/root/.ssh $out/etc $out/tmp mkdir $out $out/root $out/root/.ssh $out/etc $out/tmp
chmod 700 $out/root $out/root/.ssh chmod 700 $out/root $out/root/.ssh
chmod 1777 $out/tmp chmod 1777 $out/tmp
@ -56,6 +56,7 @@ topic =
purge = purge =
share = share =
EOF EOF
'') '')
]; ];
};
} }

2
ops/nixos/bvm-heptapod/default.nix
View file

@ -5,6 +5,7 @@
{ config, depot, lib, pkgs, ... }: { config, depot, lib, pkgs, ... }:
let let
inherit (depot.ops) secrets; inherit (depot.ops) secrets;
systemConfig = config;
in { in {
imports = [ imports = [
../lib/bvm.nix ../lib/bvm.nix
@ -182,6 +183,7 @@ in {
vim rxvt-unicode-unwrapped.terminfo kitty.terminfo rsync jq vim rxvt-unicode-unwrapped.terminfo kitty.terminfo rsync jq
depot.nix.pkgs.heptapod-runner-mercurial depot.nix.pkgs.heptapod-runner-mercurial
]; ];
system.stateVersion = systemConfig.system.stateVersion;
}; };
}; };

1
py/icalfilter/default.nix
View file

@ -12,6 +12,7 @@ let
propagatedBuildInputs = with ps; [ propagatedBuildInputs = with ps; [
zope_interface zope_interface
pytz pytz
setuptools
]; ];
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {

5
third_party/default.nix vendored
View file

@ -62,7 +62,10 @@ rec {
in origOut // { in origOut // {
dockerImage = nixpkgs.dockerTools.buildImage { dockerImage = nixpkgs.dockerTools.buildImage {
name = args.name; name = args.name;
contents = dockerData; copyToRoot = nixpkgs.buildEnv {
name = "${args.name}-env";
paths = dockerData;
};
config = { config = {
Entrypoint = [ "${origOut}/bin/${args.name}" ]; Entrypoint = [ "${origOut}/bin/${args.name}" ];
Env = [ Env = [