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: 8ea3aae70af6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4012f58e4378
Choose a head ref
  • 13 commits
  • 9 files changed
  • 1 contributor

Commits on Mar 13, 2019

  1. sway-beta: 1.0-rc3 -> 1.0-rc4 

    (cherry picked from commit 0c89c44)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    97f8768 View commit details
    Browse the repository at this point in the history

  2. sway-beta: 1.0-rc4 -> 1.0-rc5 

    (cherry picked from commit 7bf4323)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    3e6d7eb View commit details
    Browse the repository at this point in the history

  3. sway-beta: 1.0-rc5 -> 1.0 

    (cherry picked from commit eb2a26f)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    63bbd6d View commit details
    Browse the repository at this point in the history

  4. sway-beta: Use the upstream patch to fix the build failure 

    (cherry picked from commit 1240834)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    84853fa View commit details
    Browse the repository at this point in the history

  5. 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

(cherry picked from commit 45004c6)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    3c52417 View commit details
    Browse the repository at this point in the history

  6. 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

(cherry picked from commit 578fe3f)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    466007f View commit details
    Browse the repository at this point in the history

  7. wlroots: 0.3 -> 0.4 

    (cherry picked from commit afe0725)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    40476e8 View commit details
    Browse the repository at this point in the history

  8. wlroots: 0.4 -> 0.4.1 

    (cherry picked from commit c484f07)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    b9a3dd5 View commit details
    Browse the repository at this point in the history

  9. wlroots: 0.4.1 -> 0.5.0 

    (cherry picked from commit 7f43089)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    723eebd View commit details
    Browse the repository at this point in the history

  10. scdoc: 1.9.0 -> 1.9.1 

    (cherry picked from commit 410650c)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    9328158 View commit details
    Browse the repository at this point in the history

  11. scdoc: 1.9.1 -> 1.9.3 

    (cherry picked from commit 560c886)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    e2f0af0 View commit details
    Browse the repository at this point in the history

  12. scdoc: 1.9.3 -> 1.9.4 

    (cherry picked from commit 2170703)
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    8395a26 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #57601 from primeos/sway-1.0-backport 

    [19.03] Sway 1.0
    @primeos
    primeos committed Mar 13, 2019
    Copy the full SHA
    4012f58 View commit details
    Browse the repository at this point in the history