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: 571fb74f449a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58dc26180f43
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Aug 17, 2018

  1. perlPackages.NetDBus: Reduce closure size 

    The module compiles a native module that links to the DBus C libraries,
so dbus (and pkgconfig) for that matter shouldn't be propagated.
    @dezgeg
    dezgeg committed Aug 17, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    lforst Luca Forstner
    SSH Key Fingerprint: ljpBJ7bYHpwPGV7Y7sJZM+cMS44wfy1fkQqwY/900Nw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cea4be2 View commit details

  2. nixos: Fix iso_graphical evaluation 

    I broke it:
in job ‘nixos.iso_graphical.x86_64-linux’:
The option `services.udisks2.enable' has conflicting definitions, in `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/profiles/installation-device.nix' and `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/services/x11/desktop-managers/plasma5.nix'.
    @dezgeg
    dezgeg committed Aug 17, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    lforst Luca Forstner
    SSH Key Fingerprint: ljpBJ7bYHpwPGV7Y7sJZM+cMS44wfy1fkQqwY/900Nw
    Verified
    Learn about vigilant mode
    Copy the full SHA
    58dc261 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −2 nixos/modules/profiles/installation-device.nix
  2. +3 −2 pkgs/top-level/perl-packages.nix
4 changes: 2 additions & 2 deletions nixos/modules/profiles/installation-device.nix
View file
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ with lib;
#services.rogue.enable = true;

# Disable some other stuff we don't need.
security.sudo.enable = false;
services.udisks2.enable = false;
security.sudo.enable = mkDefault false;
services.udisks2.enable = mkDefault false;

# Automatically log in at the virtual consoles.
services.mingetty.autologinUser = "root";
5 changes: 3 additions & 2 deletions pkgs/top-level/perl-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -11213,8 +11213,9 @@ let self = _self // overrides; _self = with self; {
url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz";
sha256 = "8391696db9e96c374b72984c0bad9c7d1c9f3b4efe68f9ddf429a77548e0e269";
};
buildInputs = [ TestPod TestPodCoverage ];
propagatedBuildInputs = [ pkgs.pkgconfig pkgs.dbus XMLTwig ];
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ TestPod TestPodCoverage pkgs.dbus ];
propagatedBuildInputs = [ XMLTwig ];
meta = {
homepage = http://www.freedesktop.org/wiki/Software/dbus;
description = "Extension for the DBus bindings";