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: 833ee1809aad
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 19532f2ba243
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 3, 2018

  1. iwd: 0.11 -> 0.12

    @jfrankenau
    jfrankenau committed Dec 3, 2018
    Copy the full SHA
    de23f0b View commit details

Commits on Dec 4, 2018

  1. Merge pull request #51439 from jfrankenau/update-iwd 

    iwd: 0.11 -> 0.12
    @dywedir
    dywedir authored Dec 4, 2018
    Copy the full SHA
    19532f2 View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 pkgs/os-specific/linux/iwd/default.nix
11 changes: 7 additions & 4 deletions pkgs/os-specific/linux/iwd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,17 +3,17 @@
let
ell = fetchgit {
url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
rev = "0.14";
sha256 = "13jlmdk47pscmfs3c12awfwr3m6ka4fh6fyr9cl1bmqdpwqmmmk6";
rev = "0.15";
sha256 = "1jwk5gxcs964ddca9asw6fvc4h9q8d2x1y3linfi11b5vf30bghn";
};
in stdenv.mkDerivation rec {
name = "iwd-${version}";
version = "0.11";
version = "0.12";

src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = version;
sha256 = "0q79rdj3h16xdf0g2jdsvb2141z36z89vgzq0qn31pxzhgxdgf7j";
sha256 = "156zq3zqa2vfmvy3yv9lng23mhrhlgwh0p2x3fcn10nkks9q89pn";
};

nativeBuildInputs = [
@@ -40,6 +40,7 @@ in stdenv.mkDerivation rec {
"--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
"--with-systemd-unitdir=$(out)/lib/systemd/system/"
"--localstatedir=/var/"
"--enable-wired"
];

postUnpack = ''
@@ -59,6 +60,8 @@ in stdenv.mkDerivation rec {
'';

postFixup = ''
substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.ead.service \
--replace /bin/false ${coreutils}/bin/false
substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
--replace /bin/false ${coreutils}/bin/false
'';