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/nixpkgs
base: 73155864faf6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d8e4c8e612b0
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 12, 2020

  1. lib: add importTOML 

    Complements the `lib.importJSON`. `builtins.readTOML` has been
introduced in Nix 2.1.
    @zimbatm
    zimbatm committed Sep 12, 2020
    Copy the full SHA
    947a7d3 View commit details
    Browse the repository at this point in the history

  2. lib: allow to import JSON and TOML files 

    The vision here is that configuration tools can generate .json or .toml
files, which can be plugged into an existing configuration.

Eg:

    { lib, ... }:
    {
      imports = [
        (lib.modules.importJSON ./hardware-configuration.json)
      ];
    }
    @zimbatm
    zimbatm committed Sep 12, 2020
    Copy the full SHA
    035627d View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2020

  1. Merge pull request #96641 from zimbatm/data-module-imports 

    nixos: Data module imports
    @zimbatm
    zimbatm committed Oct 9, 2020
    Copy the full SHA
    d8e4c8e View commit details
    Browse the repository at this point in the history