Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b55535a608ff
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e26497e49d50
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 5, 2020

  1. rename nixpkgs entry in NIX_PATH 

    This ensures the local sources are still allowed in restricted mode, but
referencing <nixpkgs> in expressions inside nixpkgs is not.
    @LnL7
    LnL7 committed Apr 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    GPG key ID: 06AF1D3C38F04E0E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f6c22bf View commit details

  2. Merge pull request #451 from LnL7/eval-no-nixpkgs 

    rename nixpkgs entry in NIX_PATH
    @grahamc
    grahamc authored Apr 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e26497e View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 ofborg/src/nix.rs
6 changes: 3 additions & 3 deletions ofborg/src/nix.rs
View file
Original file line number Diff line number Diff line change
@@ -298,7 +298,7 @@ impl Nix {
where
S: AsRef<OsStr>,
{
let nixpkgspath = format!("nixpkgs={}", nixpkgs.display());
let nixpkgspath = format!("ofborg-nixpkgs-pr={}", nixpkgs.display());
let mut nixpath: Vec<String> = safe_paths
.iter()
.map(|path| format!("{}", path.display()))
@@ -577,7 +577,7 @@ mod tests {
Expect::Pass,
vec![
"HOME=/homeless-shelter",
"NIX_PATH=nixpkgs=",
"NIX_PATH=ofborg-nixpkgs-pr=",
"NIX_REMOTE=",
"PATH=",
],
@@ -604,7 +604,7 @@ mod tests {
Expect::Pass,
vec![
"HOME=/homeless-shelter",
"NIX_PATH=nixpkgs=",
"NIX_PATH=ofborg-nixpkgs-pr=",
"NIX_REMOTE=",
"PATH=",
"GC_INITIAL_HEAP_SIZE=4g",