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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bcac8869719b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7e9e5cab45e4
Choose a head ref

Commits on Sep 2, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    f3d3377 View commit details
  2. firefox: 68.0.2 -> 69.0

    andir committed Sep 2, 2019
    Copy the full SHA
    77fc386 View commit details

Commits on Sep 3, 2019

  1. firefox-bin: 68.0.2 -> 69.0

    andir committed Sep 3, 2019
    Copy the full SHA
    91c7f8b View commit details

Commits on Sep 4, 2019

  1. firefox/wrapper: Set new style override for legacy profiles & allow d…

    …owngrades
    
    While Firefox 68 started messing with our profiles and required new
    profiles on binary location changes Firefox 69 now verifies that we
    aren't downgrading to an older Firefox even of the same version. If you
    switch between two channel versions and/or between nixpkgs releases
    Firefox will refuse to start and demand a fresh profile. Disabling the
    downgrade protection works around that issue.
    andir committed Sep 4, 2019
    Copy the full SHA
    87e2618 View commit details
  2. vnstat: 2.3 -> 2.4

    dtzWill committed Sep 4, 2019
    Copy the full SHA
    06d794f View commit details
  3. Copy the full SHA
    6dce809 View commit details
  4. Copy the full SHA
    4e99ef6 View commit details

Commits on Sep 5, 2019

  1. tests/virtualbox: Clean up unnecessary things.

    Always enable the UART because the VirtualBug bug that required running without the UART was fixed in 6.0.10. Stop using an old kernel version because the tests work with the default kernel.
    
    (cherry picked from commit ae93571)
    ambrop72 authored and NeQuissimus committed Sep 5, 2019
    Copy the full SHA
    a97a047 View commit details

Commits on Sep 6, 2019

  1. Copy the full SHA
    2f14615 View commit details
  2. Copy the full SHA
    ca5ec23 View commit details
  3. Copy the full SHA
    b92fc09 View commit details
  4. nixos/iwd: add tmpfiles rule for ead service

    This is needed for the wired service ead.service.
    (in ReadWritePaths)
    worldofpeace committed Sep 6, 2019
    Copy the full SHA
    3722f1d View commit details
  5. Merge pull request #68203 from NixOS/staging-next

    Staging next
    FRidh authored Sep 6, 2019
    Copy the full SHA
    076860e View commit details
  6. exim: 4.92.1 -> 4.92.2

    security update: CVE-2019-15846
    pacien authored and alyssais committed Sep 6, 2019
    Copy the full SHA
    3387a16 View commit details
  7. pythonPackages.elpy: drop package

    Jonathan Ringer authored and FRidh committed Sep 6, 2019
    1
    Copy the full SHA
    4bd7e96 View commit details
  8. alpine: fix links

    sikmir authored and alyssais committed Sep 6, 2019
    Copy the full SHA
    ed9741d View commit details
  9. gerrit: 2.14.6 -> 3.0.2

    Milan Pässler authored and alyssais committed Sep 6, 2019
    Copy the full SHA
    1d6c542 View commit details
  10. nixos/lightdm: fix pam rules

    Rules are a translation of what's done in the
    GDM module and adjustments based of looking at
    Arch Linux's configuration and upstream's.
    
    A side effect of this change is that gnome-keyring
    and kwallet modules should work as expected when in-
    cluded.
    
    Fixes #64259 #62045
    worldofpeace committed Sep 6, 2019
    Copy the full SHA
    0c60254 View commit details
  11. Merge pull request #67917 from worldofpeace/lightdm-pam-gnome-keyring

    nixos/lightdm: fix pam rules
    worldofpeace authored Sep 6, 2019
    Copy the full SHA
    4e89375 View commit details
  12. Copy the full SHA
    042b63d View commit details
  13. Copy the full SHA
    466f5e5 View commit details
  14. Merge pull request #68233 from worldofpeace/plasma5-enable-libinput

    nixos/plasma5: enable libinput
    worldofpeace authored Sep 6, 2019
    Copy the full SHA
    e490494 View commit details
  15. Copy the full SHA
    c299ef8 View commit details
  16. Copy the full SHA
    1e2decf View commit details
  17. Copy the full SHA
    0217a90 View commit details
  18. Copy the full SHA
    bfdf5e9 View commit details
  19. linux: 5.2.11 -> 5.2.13

    NeQuissimus committed Sep 6, 2019
    Copy the full SHA
    5db81b6 View commit details

Commits on Sep 7, 2019

  1. nix-store-gcs-proxy: init at 0.1.0 (#68139)

    * nix-store-gcs-proxy: init at 0.1.0
    
    Co-Authored-By: Florian Klink <flokli@flokli.de>
    zimbatm and flokli committed Sep 7, 2019
    Copy the full SHA
    406e29f View commit details
  2. Merge pull request #66405 from NeQuissimus/virtualbox_6_0_10

    virtualbox: 6.0.8 -> 6.0.10
    flokli authored Sep 7, 2019
    Copy the full SHA
    db1f05c View commit details
  3. Merge pull request #68056 from dtzWill/update/vnstat-2.4

    vnstat: 2.3 -> 2.4
    dtzWill authored Sep 7, 2019
    Copy the full SHA
    c98c1a3 View commit details
  4. Merge pull request #68182 from worldofpeace/chrome-gnome-shell

    nixos/gnome3: enable chrome-gnome-shelll
    worldofpeace authored Sep 7, 2019
    Copy the full SHA
    93e5683 View commit details
  5. iso-image-kde: Disable synaptics

    It's been deprecated since 17.09 and libinput is a better default
    adisbladis authored and worldofpeace committed Sep 7, 2019
    Copy the full SHA
    b3a06f1 View commit details
  6. Copy the full SHA
    41ce0c2 View commit details
  7. Merge pull request #68213 from worldofpeace/ead/fix

    nixos/iwd: add tmpfiles rule for ead service
    worldofpeace authored Sep 7, 2019
    Copy the full SHA
    416f057 View commit details
  8. Merge master into staging-next

    FRidh committed Sep 7, 2019
    Copy the full SHA
    7e9e5ca View commit details
Showing with 1,290 additions and 502 deletions.
  1. +0 −3 nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
  2. +2 −0 nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
  3. +1 −0 nixos/modules/services/networking/iwd.nix
  4. +1 −0 nixos/modules/services/x11/desktop-managers/gnome3.nix
  5. +1 −0 nixos/modules/services/x11/desktop-managers/plasma5.nix
  6. +28 −23 nixos/modules/services/x11/display-managers/lightdm.nix
  7. +6 −18 nixos/tests/virtualbox.nix
  8. +373 −373 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
  9. +1 −1 pkgs/applications/networking/browsers/firefox/common.nix
  10. +4 −4 pkgs/applications/networking/browsers/firefox/packages.nix
  11. +2 −0 pkgs/applications/networking/browsers/firefox/wrapper.nix
  12. +2 −2 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
  13. +6 −6 pkgs/applications/networking/mailreaders/alpine/default.nix
  14. +2 −2 pkgs/applications/networking/vnstat/default.nix
  15. +3 −7 pkgs/applications/version-management/gerrit/default.nix
  16. +2 −2 pkgs/applications/virtualization/virtualbox/default.nix
  17. +3 −2 pkgs/applications/virtualization/virtualbox/extpack.nix
  18. +1 −1 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
  19. +1 −1 pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
  20. +0 −43 pkgs/development/python-modules/elpy/default.nix
  21. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  22. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  23. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  24. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  25. +2 −2 pkgs/os-specific/linux/kernel/linux-5.2.nix
  26. +2 −2 pkgs/servers/mail/exim/default.nix
  27. +24 −0 pkgs/tools/nix/nix-store-gcs-proxy/default.nix
  28. +813 −0 pkgs/tools/nix/nix-store-gcs-proxy/deps.nix
  29. +2 −0 pkgs/top-level/all-packages.nix
  30. +0 −2 pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -13,9 +13,6 @@ with lib;
enable = true;
enableQt4Support = false;
};

# Enable touchpad support for many laptops.
synaptics.enable = true;
};

environment.systemPackages = with pkgs; [
2 changes: 2 additions & 0 deletions nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix
Original file line number Diff line number Diff line change
@@ -23,5 +23,7 @@ with lib;
environment.systemPackages = [ pkgs.chrome-gnome-shell ];

services.dbus.packages = [ pkgs.chrome-gnome-shell ];

nixpkgs.config.firefox.enableGnomeExtensions = true;
};
}
1 change: 1 addition & 0 deletions nixos/modules/services/networking/iwd.nix
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ in {

systemd.tmpfiles.rules = [
"d /var/lib/iwd 0700 root root -"
"d /var/lib/ead 0700 root root -"
];
};

1 change: 1 addition & 0 deletions nixos/modules/services/x11/desktop-managers/gnome3.nix
Original file line number Diff line number Diff line change
@@ -227,6 +227,7 @@ in

(mkIf serviceCfg.core-shell.enable {
services.colord.enable = mkDefault true;
services.gnome3.chrome-gnome-shell.enable = mkDefault true;
services.gnome3.glib-networking.enable = true;
services.gnome3.gnome-remote-desktop.enable = mkDefault true;
services.gnome3.gnome-settings-daemon.enable = true;
1 change: 1 addition & 0 deletions nixos/modules/services/x11/desktop-managers/plasma5.nix
Original file line number Diff line number Diff line change
@@ -211,6 +211,7 @@ in
services.udisks2.enable = true;
services.upower.enable = config.powerManagement.enable;
services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
services.xserver.libinput.enable = mkDefault true;

# Extra UDEV rules used by Solid
services.udev.packages = [
51 changes: 28 additions & 23 deletions nixos/modules/services/x11/display-managers/lightdm.nix
Original file line number Diff line number Diff line change
@@ -232,36 +232,41 @@ in
# Enable the accounts daemon to find lightdm's dbus interface
environment.systemPackages = [ lightdm ];

security.pam.services.lightdm = {
allowNullPassword = true;
startSession = true;
};
security.pam.services.lightdm-greeter = {
allowNullPassword = true;
startSession = true;
text = ''
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_permit.so
security.pam.services.lightdm.text = ''
auth substack login
account include login
password substack login
session include login
'';

account required pam_permit.so
security.pam.services.lightdm-greeter.text = ''
auth required pam_succeed_if.so audit quiet_success user = lightdm
auth optional pam_permit.so
password required pam_deny.so
account required pam_succeed_if.so audit quiet_success user = lightdm
account sufficient pam_unix.so
password required pam_deny.so
session required pam_succeed_if.so audit quiet_success user = lightdm
session required pam_env.so envfile=${config.system.build.pamEnvironment}
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
session optional pam_keyinit.so force revoke
session optional pam_permit.so
'';

session required pam_env.so envfile=${config.system.build.pamEnvironment}
session required pam_unix.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
'';
};
security.pam.services.lightdm-autologin.text = ''
auth requisite pam_nologin.so
auth required pam_succeed_if.so uid >= 1000 quiet
auth required pam_permit.so
auth requisite pam_nologin.so
auth required pam_succeed_if.so uid >= 1000 quiet
auth required pam_permit.so
account include lightdm
account sufficient pam_unix.so
password include lightdm
password requisite pam_unix.so nullok sha512
session include lightdm
session optional pam_keyinit.so revoke
session include login
'';

users.users.lightdm = {
24 changes: 6 additions & 18 deletions nixos/tests/virtualbox.nix
Original file line number Diff line number Diff line change
@@ -10,17 +10,10 @@
# to run 32-bit guests.
useKvmNestedVirt ? false,
# Whether to run 64-bit guests instead of 32-bit. Requires nested KVM.
use64bitGuest ? false,
# Whether to enable the virtual UART in VirtualBox guests, allowing to see
# the guest console. There is currently a bug in VirtualBox where this will
# cause a crash if running with SW virtualization
# (https://www.virtualbox.org/ticket/18632). If you need to debug the tests
# then enable this and nested KVM to work around the crash (see above).
enableVBoxUART ? false
use64bitGuest ? false
}:

assert use64bitGuest -> useKvmNestedVirt;
assert enableVBoxUART -> useKvmNestedVirt; # VirtualBox bug, see above

with import ../lib/testing.nix { inherit system pkgs; };
with pkgs.lib;
@@ -65,9 +58,6 @@ let
"init=${pkgs.writeScript "mini-init.sh" miniInit}"
];

# XXX: Remove this once TSS location detection has been fixed in VirtualBox
boot.kernelPackages = pkgs.linuxPackages_4_9;

fileSystems."/" = {
device = "vboxshare";
fsType = "vboxsf";
@@ -162,11 +152,9 @@ let
"--register"
];

vmFlags = mkFlags (
(optionals enableVBoxUART [
"--uart1 0x3F8 4"
"--uartmode1 client /run/virtualbox-log-${name}.sock"
]) ++ [
vmFlags = mkFlags ([
"--uart1 0x3F8 4"
"--uartmode1 client /run/virtualbox-log-${name}.sock"
"--memory 768"
"--audio none"
] ++ (attrs.vmFlags or []));
@@ -199,15 +187,15 @@ let
];
in {
machine = {
systemd.sockets."vboxtestlog-${name}" = mkIf enableVBoxUART {
systemd.sockets."vboxtestlog-${name}" = {
description = "VirtualBox Test Machine Log Socket For ${name}";
wantedBy = [ "sockets.target" ];
before = [ "multi-user.target" ];
socketConfig.ListenStream = "/run/virtualbox-log-${name}.sock";
socketConfig.Accept = true;
};

systemd.services."vboxtestlog-${name}@" = mkIf enableVBoxUART {
systemd.services."vboxtestlog-${name}@" = {
description = "VirtualBox Test Machine Log For ${name}";
serviceConfig.StandardInput = "socket";
serviceConfig.StandardOutput = "syslog";
Loading