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: 64c8f268df0d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9179a3a406f7
Choose a head ref
  • 3 commits
  • 7 files changed
  • 1 contributor

Commits on Mar 12, 2019

  1. sway: Switch to 1.0

    This is the result of executing:
    git mv -f pkgs/applications/window-managers/sway/beta.nix pkgs/applications/window-managers/sway/default.nix
    git mv -f nixos/modules/programs/sway-beta.nix nixos/modules/programs/sway.nix
    
    And removing sway-beta from the following files:
    pkgs/top-level/all-packages.nix
    nixos/modules/module-list.nix
    primeos committed Mar 12, 2019
    Copy the full SHA
    45004c6 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2019

  1. nixos/sway: Improve the module and adapt it to NixOS

    This commit contains the following changes:
    - nixos/sway: Remove the beta references
    - sway: Drop buildDocs
    - nixos/sway: Improve the documentation
    - sway,nixos/sway: Adapt Sway to NixOS
      - Copy the default configuration file to /etc/sway/config (Sway will
        still load the identical file from the Nix store but this makes it
        easier to copy the default configuration file).
      - This will also remove all references to the Nix store from the
        default configuration file as they will eventually be garbage
        collected which is a problem if the user copies it.
      - I've also decided to drop the default wallpaper (alternatively we
        could copy it to a fixed location).
    - nixos/sway: Drop the package option
    primeos committed Mar 13, 2019
    4
    Copy the full SHA
    578fe3f View commit details
    Browse the repository at this point in the history
  2. Merge pull request #57414 from primeos/sway-1.0

    sway: Switch to 1.0
    primeos committed Mar 13, 2019
    Copy the full SHA
    9179a3a View commit details
    Browse the repository at this point in the history