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

Commits on Jun 26, 2019

  1. hostapd: fix hostapd noscan patch url. 

    Something somehow got wrong in #63699; some adjustments made after the
review have been discarded :/
    @picnoir
    picnoir committed Jun 26, 2019
    Copy the full SHA
    f3b94de View commit details

  2. hostapd: remove global with stdenv.lib

    @flokli
    flokli committed Jun 26, 2019
    Copy the full SHA
    1e5a8f9 View commit details

  3. hostapd: fix hostapd noscan patch url. (#63802) 

    hostapd: fix hostapd noscan patch url.
    @flokli
    flokli authored Jun 26, 2019
    Copy the full SHA
    cdb032d View commit details
Showing with 10 additions and 9 deletions.
  1. +10 −9 pkgs/os-specific/linux/hostapd/default.nix
19 changes: 10 additions & 9 deletions pkgs/os-specific/linux/hostapd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:

with stdenv.lib;
let noScanPatch = fetchurl {
url="https://git.telliq.com/gtu/openwrt/raw/master/package/network/services/hostapd/patches/300-noscan.patch";
sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";
};
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "hostapd-${version}";
version = "2.8";

@@ -17,7 +12,13 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libnl openssl sqlite ];

patches = [ noScanPatch ];
patches = [
(fetchurl {
# Note: fetchurl seems to be unhappy with openwrt git
# server's URLs containing semicolons. Using the github mirror instead.
url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch";
sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";})
];

outputs = [ "out" "man" ];

@@ -48,7 +49,7 @@ in stdenv.mkDerivation rec {
CONFIG_INTERNETWORKING=y
CONFIG_HS20=y
CONFIG_ACS=y
'' + optionalString (sqlite != null) ''
'' + stdenv.lib.optionalString (sqlite != null) ''
CONFIG_SQLITE=y
'';

@@ -67,7 +68,7 @@ in stdenv.mkDerivation rec {
install -vD hostapd_cli.1 -t $man/share/man/man1
'';

meta = {
meta = with stdenv.lib; {
homepage = http://hostap.epitest.fi;
repositories.git = git://w1.fi/hostap.git;
description = "A user space daemon for access point and authentication servers";