diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-02-20 17:28:50 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-02-20 17:28:50 +0000 |
| commit | a9847c36e6aa003998c1ef5518e5710658ca5770 (patch) | |
| tree | 447433d13af676e0600c4fdc2d58a7b0bbbe04d0 /pkgs/applications/networking | |
| parent | 515d3cfa24df96c9e134ac5b87c2396f81354551 (diff) | |
| parent | d57c05acd165ba8a428b13457c87d24175f58136 (diff) | |
| download | nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.gz nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.bz2 nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.lz nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.xz nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.tar.zst nixpkgs-a9847c36e6aa003998c1ef5518e5710658ca5770.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index c25e41de5db..20ecbebd6d8 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1y0n1p14kg24qnybi201181q7j6vm20ka4xwmgggjll9v6qflvaz"; + sha256 = "182kzk68l6rr878aaaqx31c6npb65x77qzhbc5rbqlrrdrb69zsg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 2b44263096b..8256487b751 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,6 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native +, fx_cast_bridge , udev , kerberos }: @@ -71,6 +72,7 @@ let ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration + ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); libs = lib.optional stdenv.isLinux udev diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5c131948649..da943c2aa7e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -112,8 +112,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.20"; - sha256 = "1k94iwhdvp1ifg9w7y26cl89ihki2w9kxv8mz06pp9bnfwfw67x5"; + version = "0.12.21"; + sha256 = "128mrqib8rigy6kk6fby0pjh4jh2qm2qwkrlbn0wgfln0637d9ff"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); |