diff options
| -rw-r--r-- | modules/system/boot/readonly-mountpoint.c | 2 | ||||
| -rw-r--r-- | release-combined.nix | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/modules/system/boot/readonly-mountpoint.c b/modules/system/boot/readonly-mountpoint.c index 605adfafabb..27b66687382 100644 --- a/modules/system/boot/readonly-mountpoint.c +++ b/modules/system/boot/readonly-mountpoint.c @@ -8,7 +8,7 @@ int main(int argc, char ** argv) { fprintf(stderr, "Usage: %s PATH", argv[0]); exit(2); } - if(statvfs(argv[1], &stat) != 0) { + if (statvfs(argv[1], &stat) != 0) { perror("statvfs"); exit(3); } diff --git a/release-combined.nix b/release-combined.nix index 3a378123d2c..dbd56b18524 100644 --- a/release-combined.nix +++ b/release-combined.nix @@ -3,7 +3,7 @@ , officialRelease ? false }: -let nixpkgs' = nixpkgs; in # urgh +let nixpkgs' = nixpkgs; pkgs = import <nixpkgs> {}; in # urgh rec { @@ -19,9 +19,12 @@ rec { supportedSystems = [ "x86_64-linux" "i686-linux" ]; }; - tested = (import <nixpkgs> { }).releaseTools.aggregate { + tested = pkgs.releaseTools.aggregate { name = "nixos-${nixos.tarball.version}"; - meta.description = "Release-critical builds for the NixOS unstable channel"; + meta = { + description = "Release-critical builds for the NixOS unstable channel"; + maintainers = [ pkgs.lib.maintainers.shlevy ]; + }; members = [ nixos.channel nixos.manual |