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: 8713c07ca5f4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 35421cfdf7b9
Choose a head ref
  • 3 commits
  • 7 files changed
  • 2 contributors

Commits on Oct 19, 2018

  1. treewide: fix allowAliases = false evaluation problems 

    (cherry picked from commit 856fbc8)

 Conflicts:
	pkgs/os-specific/linux/roccat-tools/default.nix

File isn't in release-18.09
    @ryantm @samueldr
    ryantm authored and samueldr committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    b02c65a View commit details
    Browse the repository at this point in the history

  2. treewide: fix config.allowAliases = false evaluation 

    (cherry picked from commit f91a79e)

 Conflicts:
	pkgs/misc/vim-plugins/default.nix

That file has NOT been touched in this cherry pick.
    @ryantm @samueldr
    ryantm authored and samueldr committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    9dc7c31 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2018

  1. Merge pull request #48692 from samueldr/fix/disallow-aliases 

    Backports misc. fixes for the new ofborg eval time checks
    @samueldr
    samueldr committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    35421cf View commit details
    Browse the repository at this point in the history