diff --git a/lib/fup-repl.nix b/lib/fup-repl.nix index 7db79c2..e636b6f 100644 --- a/lib/fup-repl.nix +++ b/lib/fup-repl.nix @@ -11,9 +11,9 @@ writeShellScriptBin "repl" '' ;; *) if [ -z "$1" ]; then - nix repl ${./repl.nix} + nix repl --file ${./repl.nix} else - nix repl --arg flakePath $(${coreutils}/bin/readlink -f $1 | ${gnused}/bin/sed 's|/flake.nix||') ${./repl.nix} + nix repl --arg flakePath $(${coreutils}/bin/readlink -f $1 | ${gnused}/bin/sed 's|/flake.nix||') --file ${./repl.nix} fi ;; esac diff --git a/lib/repl.nix b/lib/repl.nix index a46347a..9a1a098 100644 --- a/lib/repl.nix +++ b/lib/repl.nix @@ -5,7 +5,7 @@ let selfFlake = if pathExists registryPath - then filter (it: it.from.id == "self") (fromJSON (readFile registryPath)).flakes + then filter (it: it.from.id == "self") (fromJSON (builtins.unsafeDiscardStringContext (readFile registryPath))).flakes else [ ]; flakePath' = toString @@ -21,7 +21,7 @@ let nixpkgsFromInputsPath = flake.inputs.nixpkgs.outPath or ""; nixpkgs = flake.pkgs.${currentSystem}.nixpkgs or (if nixpkgsFromInputsPath != "" then import nixpkgsFromInputsPath { } else { }); - nixpkgsOutput = (removeAttrs (nixpkgs // nixpkgs.lib or { }) [ "options" "config" ]); + nixpkgsOutput = removeAttrs (nixpkgs // nixpkgs.lib or { }) [ "options" "config" ]; in { inherit flake; } // flake