Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sddm: 0.14.0 -> 0.15.0 #29129

Merged
merged 1 commit into from Sep 11, 2017
Merged

sddm: 0.14.0 -> 0.15.0 #29129

merged 1 commit into from Sep 11, 2017

Conversation

jokogr
Copy link
Contributor

@jokogr jokogr commented Sep 8, 2017

Motivation for this change

Upstream update

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@jokogr, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ttuegel, @abbradar and @infinisil to be potential reviewers.

};

patches =
copyPathsToStore (lib.readPathsFromFile ./. ./series)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you removing patchFixUserAvatars because it was accepted upstream?

You also removed sddm-ignore-config-mtime.patch which is Nixpkgs-specific. I think we still need this. If you intended to remove it, please also remove the patch file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I stand corrected:

  • patchFixUserAvatars has indeed been accepted upstream
  • sddm-ignore-config-mtime.patch is still needed

I have fixed it, tested it and rebased the PR to the current master.

@ttuegel ttuegel merged commit a7ebdf1 into NixOS:master Sep 11, 2017
@ttuegel
Copy link
Member

ttuegel commented Sep 11, 2017

Thanks!

@jokogr jokogr deleted the u/sddm-0.15.0 branch October 17, 2017 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants