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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d6994e4b9754
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7e39a961fdc9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 31, 2019

  1. nixos/rename: drop system.nixos.{stateVersion, defaultChannel}

    Comment said to remove these before 18.09 was released :(
    worldofpeace committed Mar 31, 2019
    Copy the full SHA
    8764be9 View commit details
  2. Merge pull request #58599 from worldofpeace/nixos-stateversion-drop-1…

    …9.03
    
    [19.03] nixos/rename: drop system.nixos.{stateVersion, defaultChannel}
    samueldr authored Mar 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7e39a96 View commit details
Showing with 0 additions and 5 deletions.
  1. +0 −5 nixos/modules/rename.nix
5 changes: 0 additions & 5 deletions nixos/modules/rename.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,6 @@ with lib;

{
imports = [
# !!! These were renamed the other way, but got reverted later.
# !!! Drop these before 18.09 is released.
(mkRenamedOptionModule [ "system" "nixos" "stateVersion" ] [ "system" "stateVersion" ])
(mkRenamedOptionModule [ "system" "nixos" "defaultChannel" ] [ "system" "defaultChannel" ])

(mkRenamedOptionModule [ "environment" "x11Packages" ] [ "environment" "systemPackages" ])
(mkRenamedOptionModule [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ])
(mkRenamedOptionModule [ "environment" "nix" ] [ "nix" "package" ])