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: c04cece6026e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7a4d7c58e3cb
Choose a head ref
  • 8 commits
  • 9 files changed
  • 2 contributors

Commits on Sep 21, 2019

  1. iosevka: Simplify custom build process

    Although hopefully this can eventually be added to nodePackages, it uses
    some devDependencies to build custom fonts. Node2nix doesn't currently
    support enabling devDependencies for a single package.
    
    - Got rid of redundant let-in statements.
    - node-packages.json now only pulls in Iosevka.
    - generate.sh
      * Uses a nix-shell shebang to ensure it builds using the current
        version of node2nix (the old version caused some issues due to the
        19.03 release version being 1.6.0 instead of 1.7.0).
      * Builds in development mode to fix the devDependencies issue.
    - Use the tree of the built node package as sourceRoot instead of
      installing node dependencies manually. This means the source will have
      to be updated in both node-packages.json and default.nix, but to make
      things easier the derivation inherits the version number.
    - Disparate build options now all live under privateBuildPlan, which is
      converted first with builtins.toJSON and then to TOML using remarshal
      (Unfortunately there is not currently a builtins.toTOML).
    - Extra parameters can also be provided that will be converted to JSON
      then TOML. This will overwrite the default parameters.toml file.
    rileyinman committed Sep 21, 2019
    Configuration menu
    Copy the full SHA
    98a7d79 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2019

  1. Configuration menu
    Copy the full SHA
    8bfb679 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e1ace0f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0ef7d0d View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2019

  1. Configuration menu
    Copy the full SHA
    64accf2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c847da5 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2019

  1. Configuration menu
    Copy the full SHA
    dd2f026 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #69219 from rileyinman/iosevka

    iosevka: Simplify custom build process
    
    The interface to configure a custom build with Nix has changed due to changes upstream; please refer to the derivation for details.
    ttuegel committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    7a4d7c5 View commit details
    Browse the repository at this point in the history