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: 5e46d5a7b59d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 40f3bf66f611
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 27, 2020

  1. nixos/release: rename iso_graphical to iso_plasma5 

    And all the other things and paths to match it
    @worldofpeace
    worldofpeace committed Jan 27, 2020
    Copy the full SHA
    0f2536f View commit details

  2. Merge pull request #66640 from worldofpeace/iso-gnome3 

    rename iso_graphical to iso_plasma5
    @edolstra
    edolstra authored Jan 27, 2020
    Copy the full SHA
    40f3bf6 View commit details
2 changes: 1 addition & 1 deletion ...tallation-cd-graphical-kde-new-kernel.nix → ...ation-cd-graphical-plasma5-new-kernel.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ pkgs, ... }:

{
imports = [ ./installation-cd-graphical-kde.nix ];
imports = [ ./installation-cd-graphical-plasma5.nix ];

boot.kernelPackages = pkgs.linuxPackages_latest;
}
0 .../cd-dvd/installation-cd-graphical-kde.nix → ...dvd/installation-cd-graphical-plasma5.nix
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion nixos/release-combined.nix
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ in rec {
(all nixos.dummy)
(all nixos.manual)

nixos.iso_graphical.x86_64-linux or []
nixos.iso_plasma5.x86_64-linux or []
nixos.iso_minimal.aarch64-linux or []
nixos.iso_minimal.i686-linux or []
nixos.iso_minimal.x86_64-linux or []
6 changes: 3 additions & 3 deletions nixos/release.nix
View file
Original file line number Diff line number Diff line change
@@ -149,9 +149,9 @@ in rec {
inherit system;
});

iso_graphical = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;
type = "graphical";
iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix;
type = "plasma5";
inherit system;
});