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: b144dfa3b270
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: f55c7cfa9402
Choose a head ref
  • 6 commits
  • 4 files changed
  • 6 contributors

Commits on Dec 10, 2018

  1. geckodriver: unstable-2018-02-24 -> 0.22.0 

    Motivation: unstable-2018-02-24 (which reports to be
0.19.1, but probably doesn't correspond to any actual
geckodriver release) isn't compatible with the currently
shipped Firefox version 63.0

closes NixOS/nixpkgs#50380
    @das-g @alyssais
    das-g authored and alyssais committed Dec 10, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    03c552a View commit details

  2. dbeaver: 5.2.5 -> 5.3.0 

    (cherry picked from commit 1c3079f)
    @samueldr
    samueldr committed Dec 10, 2018
    Copy the full SHA
    30e538b View commit details

Commits on Dec 11, 2018

  1. doc: Fix insecure nginx docs (#51840) 

    (cherry picked from commit e576c3b)
    @jappeace @Mic92
    jappeace authored and Mic92 committed Dec 11, 2018
    Copy the full SHA
    32d7eb3 View commit details

  2. Merge pull request #51856 from samueldr/auto/dbeaver/nixos-18.09/5.3.0 

    dbeaver: 5.2.5 -> 5.3.0 (18.09)
    @srhb
    srhb authored Dec 11, 2018
    Copy the full SHA
    87ee6c4 View commit details

  3. dropbox: add mesa, libxshmfence and libpthreadstubs

    @markus1189 @Mic92
    markus1189 authored and Mic92 committed Dec 11, 2018
    Copy the full SHA
    1d83bd0 View commit details

  4. Merge pull request #51835 from alyssais/geckodriver-backport 

    Backport "geckodriver: unstable-2018-02-24 -> 0.22.0" to 18.09
    @alyssais
    alyssais authored Dec 11, 2018
    Copy the full SHA
    f55c7cf View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/web-servers/nginx/vhost-options.nix
View file
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ with lib;
acmeRoot = mkOption {
type = types.str;
default = "/var/lib/acme/acme-challenge";
description = "Directory to store certificates and keys managed by the ACME service.";
description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here";
};

acmeFallbackHost = mkOption {
4 changes: 2 additions & 2 deletions pkgs/applications/misc/dbeaver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

stdenv.mkDerivation rec {
name = "dbeaver-ce-${version}";
version = "5.2.5";
version = "5.3.0";

desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
sha256 = "0xjggjq2brhi9x3i4d7hqfi18cd8czs6rzvihvspfxaqilsai0dm";
sha256 = "1gn52bffjn2fw9yhi1rv4iy9dfdn5qxc51gv6qri5g0c8pblvh7m";
};

installPhase = ''
2 changes: 1 addition & 1 deletion pkgs/applications/networking/dropbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ buildFHSUserEnv {
libICE libSM libX11 libXcomposite libXdamage libXext libXfixes libXrender
libXxf86vm libxcb xkeyboardconfig
curl dbus firefox-bin fontconfig freetype gcc glib gnutar libxml2 libxslt
procps zlib
procps zlib mesa libxshmfence libpthreadstubs
];

extraInstallCommands = ''
14 changes: 8 additions & 6 deletions pkgs/development/tools/geckodriver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
{ lib
, fetchFromGitHub
, rustPlatform
, stdenv
, darwin
}:

with rustPlatform;

buildRustPackage rec {
version = "unstable-2018-02-24";
version = "0.22.0";
name = "geckodriver-${version}";

src = fetchFromGitHub {
owner = "mozilla";
repo = "gecko-dev";
rev = "ecb86060b4c5a9808798b81a57e79e821bb47082";
sha256 = "1am84a60adw0bb12rlhdqbiwyywhza4qp5sf4f4fmssjl2qcr6nl";
repo = "geckodriver";
rev = "v${version}";
sha256 = "12m95lfqwdxs2m5kjh3yrpm9w2li5m8n3fw46a2nkxyfw6c94l4b";
};

sourceRoot = "${src.name}/testing/geckodriver";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

cargoSha256 = "0dvcvdb623jla29i93glx20nf8pbpfw6jj548ii6brzkcpafxxm8";
cargoSha256 = "1a8idl6falz0n9irh1p8hv5w2pmiknzsfnxl70k1psnznrpk2y8n";

meta = with lib; {
description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers";