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: f3a9cccdaddd
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: acefaff33d67
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 22, 2017

  1. matrix-synapse: 0.19.2 -> 0.19.3 

    (cherry picked from commit 28a4c99)
    @fpletz @globin
    fpletz authored and globin committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    05b0d31 View commit details
    Browse the repository at this point in the history

  2. nixos-container: don't use host's $NIXOS_CONFIG 

    fixes #22948

(cherry picked from commit 9b9416c)
    @globin
    globin committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    26db09a View commit details
    Browse the repository at this point in the history

  3. nixos-container: allow _ in container name 

    fixes #15089

(cherry picked from commit 3ac02df)
    @globin
    globin committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    443c7c0 View commit details
    Browse the repository at this point in the history

  4. nixos-container: check for correct path for chattr 

    Could fail on destroy if the container wasn't created correctly

(cherry picked from commit 91e74ed)
    @globin
    globin committed Mar 22, 2017
    Configuration menu
    Copy the full SHA
    acefaff View commit details
    Browse the repository at this point in the history