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

Commits on Mar 30, 2019

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

    Comment said to remove these before 18.09 was released :(
    @worldofpeace
    worldofpeace committed Mar 30, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ffd2e9b View commit details

Commits on Mar 31, 2019

  1. Merge pull request #58596 from worldofpeace/nixos-stateversion-drop 

    nixos/rename: drop system.nixos.{stateVersion, defaultChannel}
    @worldofpeace
    worldofpeace authored Mar 31, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7a8d8e9 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
View file
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 [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])