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/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6fadb3fc03a1
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b33b94748cc8
Choose a head ref
  • 3 commits
  • 36 files changed
  • 1 contributor

Commits on Jan 21, 2020

  1. absPath(): Use std::optional

    @edolstra
    edolstra committed Jan 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    brainrake Márton Boros
    GPG key ID: C0D4B398D4F3158F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1bf9eb2 View commit details

  2. Pluggable fetchers 

    Flakes are now fetched using an extensible mechanism. Also lots of
other flake cleanups.
    @edolstra
    edolstra committed Jan 21, 2020
    Copy the full SHA
    9f4d8c6 View commit details

  3. Convert fetchMercurial to a input type 

    This enables Mercurial flakes. It also fixes a bug in pure mode where
you could use a branch/tag name rather than a revision.
    @edolstra
    edolstra committed Jan 21, 2020
    Copy the full SHA
    b33b947 View commit details
6 changes: 3 additions & 3 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion flake.nix
View file
Original file line number Diff line number Diff line change
@@ -213,7 +213,8 @@
name = "nix-tarball";
version = builtins.readFile ./.version;
versionSuffix = if officialRelease then "" else
"pre${builtins.substring 0 8 self.lastModified}_${self.shortRev}";
"pre${builtins.substring 0 8 self.lastModified}" +
(if self ? shortRev then "_${self.shortRev}" else "");
src = self;
inherit officialRelease;

29 changes: 0 additions & 29 deletions src/libexpr/eval.hh
View file
Original file line number Diff line number Diff line change
@@ -20,10 +20,6 @@ class EvalState;
struct StorePath;
enum RepairFlag : bool;

namespace flake {
struct FlakeRegistry;
}


typedef void (* PrimOpFun) (EvalState & state, const Pos & pos, Value * * args, Value & v);

@@ -67,8 +63,6 @@ typedef std::list<SearchPathElem> SearchPath;
/* Initialise the Boehm GC, if applicable. */
void initGC();

typedef std::vector<std::pair<std::string, std::string>> RegistryOverrides;


class EvalState
{
@@ -95,8 +89,6 @@ public:

const ref<Store> store;

RegistryOverrides registryOverrides;


private:
SrcToStore srcToStore;
@@ -224,8 +216,6 @@ public:
path. Nothing is copied to the store. */
Path coerceToPath(const Pos & pos, Value & v, PathSet & context);

void addRegistryOverrides(RegistryOverrides overrides) { registryOverrides = overrides; }

public:

/* The base environment, containing the builtin functions and
@@ -328,16 +318,6 @@ private:
friend struct ExprOpConcatLists;
friend struct ExprSelect;
friend void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v);

public:

const std::vector<std::shared_ptr<flake::FlakeRegistry>> getFlakeRegistries();

std::shared_ptr<flake::FlakeRegistry> getGlobalFlakeRegistry();

private:
std::shared_ptr<flake::FlakeRegistry> _globalFlakeRegistry;
std::once_flag _globalFlakeRegistryInit;
};


@@ -388,15 +368,6 @@ struct EvalSettings : Config

Setting<bool> traceFunctionCalls{this, false, "trace-function-calls",
"Emit log messages for each function entry and exit at the 'vomit' log level (-vvvv)."};

Setting<std::string> flakeRegistry{this, "https://github.com/NixOS/flake-registry/raw/master/flake-registry.json", "flake-registry",
"Path or URI of the global flake registry."};

Setting<bool> allowDirty{this, true, "allow-dirty",
"Whether to allow dirty Git/Mercurial trees."};

Setting<bool> warnDirty{this, true, "warn-dirty",
"Whether to warn about dirty Git/Mercurial trees."};
};

extern EvalSettings evalSettings;
Loading