Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tree-wide: Fix with nixUnstable #80775

Closed
wants to merge 4 commits into from
Closed

tree-wide: Fix with nixUnstable #80775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60eeb0d
nixos/nixos-option: Fix build with nixUnstable
jtojnar Feb 21, 2020
6aeab44
nixos/nixos-install: switch to legacy nix-build command
jtojnar Feb 21, 2020
c8266e2
nixos/nix-daemon: use legacy Nix command
jtojnar Feb 21, 2020
f115c04
fixup! nixos/nixos-install: switch to legacy nix-build command
jtojnar Feb 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions nixos/modules/installer/tools/nixos-install.sh
View file
Open in desktop
Expand Up @@ -100,9 +100,9 @@ sub="auto?trusted=1"
if [[ -z $system ]]; then
echo "building the configuration in $NIXOS_CONFIG..."
outLink="$tmpdir/system"
nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \
nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \
--extra-substituters "$sub" \
-f '<nixpkgs/nixos>' system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]} ${buildLogs}
'<nixpkgs/nixos>' -A system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]} ${buildLogs}
system=$(readlink -f $outLink)
fi

Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/installer/tools/nixos-option/nixos-option.cc
View file
Open in desktop
Expand Up @@ -588,13 +588,14 @@ int main(int argc, char ** argv)
std::string optionsExpr = "(import <nixpkgs/nixos> {}).options";
std::string configExpr = "(import <nixpkgs/nixos> {}).config";
std::vector<std::string> args;
std::string_view pname = nix::baseNameOf(argv[0]);

struct MyArgs : nix::LegacyArgs, nix::MixEvalArgs
{
using nix::LegacyArgs::LegacyArgs;
};

MyArgs myArgs(nix::baseNameOf(argv[0]), [&](Strings::iterator & arg, const Strings::iterator & end) {
MyArgs myArgs(pname.data(), [&](Strings::iterator & arg, const Strings::iterator & end) {
if (*arg == "--help") {
nix::showManPage("nixos-option");
} else if (*arg == "--version") {
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/nix-daemon.nix
View file
Open in desktop
Expand Up @@ -452,7 +452,7 @@ in
system.activationScripts.nix = stringAfter [ "etc" "users" ]
''
# Create directories in /nix.
${nix}/bin/nix ping-store --no-net
${nix}/bin/nix-store --query

# Subscribe the root user to the NixOS channel by default.
if [ ! -e "/root/.nix-channels" ]; then
Expand Down