Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 19ee57bdaf35
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 971b5bea49d2
Choose a head ref
  • 4 commits
  • 4 files changed
  • 4 contributors

Commits on Oct 17, 2018

  1. rambox: fix invalid sha256 

    (cherry picked from commit 4051fc9)
    @anpryl @Mic92
    anpryl authored and Mic92 committed Oct 17, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ff7413b View commit details

  2. Fix hostapd's place in systemd dependency tree. (#45464) 

    * nat/bind/dhcp.service:
  Remove. Those services have nothing to do with a link-level service.

* sys-subsystem-net-devices-${if}.device:
  Add as BindsTo dependency as this will make hostapd stop when the
  device is unplugged.

* network-link-${if}.service:
  Add hostapd as dependency for this service via requiredBy clause,
  so that the network link is only considered to be established
  only after hostapd has started.

* network.target:
  Remove this from wantedBy clause as this is already implied from
  dependencies stacked above hostapd. And if it's not implied than
  starting hostapd is not required for this particular network
  configuration.

(cherry picked from commit 725fcde)
    @clefru
    clefru committed Oct 17, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 6371839BF51BA5DA
    Learn about vigilant mode
    Copy the full SHA
    20ebe73 View commit details

  3. Merge pull request #48632 from clefru/hostapd-fix-on-18.09 

    Fix hostapd's place in systemd dependency tree. (#45464)
    @Mic92
    Mic92 authored Oct 17, 2018
    Copy the full SHA
    56915a5 View commit details

  4. oraclejdk8: 8u181 -> 8u191 (#48624) 

    (cherry picked from commit 4035086)
Oracle download site provides 8u191 now.
    @xeji
    volth authored and xeji committed Oct 17, 2018

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 6371839BF51BA5DA
    Learn about vigilant mode
    Copy the full SHA
    971b5be View commit details
6 changes: 3 additions & 3 deletions nixos/modules/services/networking/hostapd.nix
View file
Original file line number Diff line number Diff line change
@@ -157,9 +157,9 @@ in
{ description = "hostapd wireless AP";

path = [ pkgs.hostapd ];
wantedBy = [ "network.target" ];

after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ];
after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
requiredBy = [ "network-link-${cfg.interface}.service" ];

serviceConfig =
{ ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/rambox/bare.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit src;

nodejs = nodejs-8_x;
sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr";
sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0";
};

patches = [ ./isDev.patch ];
10 changes: 5 additions & 5 deletions pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "181";
patchVersion = "191";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
10 changes: 5 additions & 5 deletions pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import ./jdk-linux-base.nix {
productVersion = "8";
patchVersion = "181";
patchVersion = "191";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";