public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-08-03 00:02:37 +00:00 committed by GitHub
commit 29bcf81336
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/captive-browser.nix
View File

@ -27,6 +27,7 @@ in
browser = mkOption { browser = mkOption {
type = types.str; type = types.str;
default = concatStringsSep " " [ default = concatStringsSep " " [
''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"''
''${pkgs.chromium}/bin/chromium'' ''${pkgs.chromium}/bin/chromium''
''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive'' ''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive''
''--proxy-server="socks5://$PROXY"'' ''--proxy-server="socks5://$PROXY"''
@ -111,6 +112,7 @@ in
security.wrappers.captive-browser = { security.wrappers.captive-browser = {
capabilities = "cap_net_raw+p"; capabilities = "cap_net_raw+p";
source = pkgs.writeShellScript "captive-browser" '' source = pkgs.writeShellScript "captive-browser" ''
export PREV_CONFIG_HOME="$XDG_CONFIG_HOME"
export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" '' export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
browser = """${cfg.browser}""" browser = """${cfg.browser}"""
dhcp-dns = """${cfg.dhcp-dns}""" dhcp-dns = """${cfg.dhcp-dns}"""

12
pkgs/applications/networking/browsers/captive-browser/default.nix
View File

@ -1,21 +1,21 @@
{ lib, fetchFromGitHub, buildGoPackage }: { lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec { buildGoPackage rec {
name = "captive-browser"; pname = "captive-browser";
version = "2019-04-16"; version = "2021-08-01";
goPackagePath = name; goPackagePath = pname;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FiloSottile"; owner = "FiloSottile";
repo = "captive-browser"; repo = "captive-browser";
rev = "08450562e58bf9564ee98ad64ef7b2800e53338f"; rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c";
sha256 = "17icgjg7h0xm8g4yy38qjhsvlz9pmlmj9kydz01y2nyl0v02i648"; sha256 = "sha256-65lPo5tpE0M/VyyvlzlcVSuHX4AhhVuqK0UF4BIAH/Y=";
}; };
meta = with lib; { meta = with lib; {
description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings";
homepage = "https://blog.filippo.io/captive-browser"; homepage = "https://blog.filippo.io/captive-browser";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ volth ]; maintainers = with maintainers; [ volth ma27 ];
}; };
} }

2
pkgs/desktops/gnome/apps/seahorse/default.nix
View File

@ -7,6 +7,7 @@
, pkg-config , pkg-config
, gtk3 , gtk3
, glib , glib
, glib-networking
, wrapGAppsHook , wrapGAppsHook
, itstool , itstool
, gnupg , gnupg
@ -48,6 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
glib glib
glib-networking
gcr gcr
gsettings-desktop-schemas gsettings-desktop-schemas
gnupg gnupg