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: 099a2917b07e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 21c69b132ca8
Choose a head ref
  • 12 commits
  • 15 files changed
  • 10 contributors

Commits on Mar 27, 2017

  1. network-interfaces: reload bridges on conf changes 

    And adopt the tests to add an interface and remove it again.

It should work when deactivating rstp, it will not work when activating
rstp for the first bridge as then the userspace daemon is not yet
available. But once one bridge is active with stp, it should work with
the reload for any further bridge.

Fixes #21745. Also see #22547.

(cherry picked from commit 6872995)
    @kampfschlaefer @globin
    kampfschlaefer authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    2bd74c5 View commit details
    Browse the repository at this point in the history

  2. google-compute-image: fix Yama LSM option conflict 

    Having fixed the Google Compute Engine image build process's copying
of store paths in PR #24264, I ran `nixos-rebuild --upgrade switch`...
and the GCE image broke again, because it sets the NixOS configuration
option for the sysctl variable `kernel.yama.ptrace_scope` to
`mkDefault "1"`, i.e., with override priority 1000, and now the
`sysctl` module sets the same option to `mkDefault "0"` (this was
changed in commit 86721a5).

This patch raises the override priority of the Google Compute Engine
image configuration's definition of the Yama sysctl option to 500
(still lower than the priority of an unmodified option definition).

I have tested that this patch allows the Google Compute Engine image
to again build successfully for me.

(cherry picked from commit a4ac550)
    @8573 @globin
    8573 authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    8d45eda View commit details
    Browse the repository at this point in the history

  3. grsecurity: 4.9.17-201703221829 -> 4.9.18-201703261106 

    (cherry picked from commit 5fe81c1)
    @joachifm @globin
    joachifm authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    4d39290 View commit details
    Browse the repository at this point in the history

  4. linux: 4.11-rc3 -> 4.11-rc4 

    (cherry picked from commit 310bb3e)
    @NeQuissimus @globin
    NeQuissimus authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    3108fdf View commit details
    Browse the repository at this point in the history

  5. nixos/tests/virtualbox: Fix @shell@ expansion 

    This has surfaced since f803270.

The commit bumped bash to version 4.4, which caused to change the order
of --subst-var flags in substituteAll, which this test was relying on,
because it added a @shell@ to boot.initrd.postMountCommands.

Our substituter is currently working a bit like this:

original.replace('@var1@', 'val1').replace('@var2@', 'val2')...

Unfortunately, this means that if @var2@ occurs within @var1@ it is
replaced by the new value, so the order of the substvars actually
matter. I highly doubt that we want a behaviour like this and I'm
wondering why it didn't occur to me as a problem while writing the
initial implementation of the VirtualBox tests.

Whether to get rid of this and disallowing substitution of substvars
within substvars is another topic which I think needs discussion in a
different place.

As for now, I'm using stdenv.shell, because the closure size of this
should fit within the initrd, so it's fine especially because it's just
a test.

Tested with the net-hostonlyif and systemd-detect-virt tests and they
both succeed with this change.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: @globin on IRC
(cherry picked from commit ee39d4b)
    @aszlig @globin
    aszlig authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    d3ef981 View commit details
    Browse the repository at this point in the history

  6. libvirt: 3.0.0 -> 3.1.0 

    (cherry picked from commit 1cca97c)
    @globin
    Volth authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    c0bc736 View commit details
    Browse the repository at this point in the history

  7. virt-manager: needs file for building translations 

    (cherry picked from commit 160fd72)
    @fpletz @globin
    fpletz authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    0d0d419 View commit details
    Browse the repository at this point in the history

  8. libvirt: build with attr and apparmor 

    (cherry picked from commit ddb6088)
    @fpletz @globin
    fpletz authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    a3406d1 View commit details
    Browse the repository at this point in the history

  9. libvirt: make guest suspend work, use upstream units 

    (cherry picked from commit d545772)
    @fpletz @globin
    fpletz authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    fc77d48 View commit details
    Browse the repository at this point in the history

  10. idea.phpstorm: 2016.3.2 -> 2017.1 

    (cherry picked from commit bde3acb)
    @Ma27 @globin
    Ma27 authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    9628a71 View commit details
    Browse the repository at this point in the history

  11. idea-community: 2016.3.5 -> 2017.1 

    (cherry picked from commit da13619)
    @jiridanek @globin
    jiridanek authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    86e363d View commit details
    Browse the repository at this point in the history

  12. dropbox-cli: include dropbox icon (#24368) 

    (cherry picked from commit 6c116b8)
    @benley @globin
    benley authored and globin committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    21c69b1 View commit details
    Browse the repository at this point in the history