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: 48b4e1c6bf2d
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: 235487585ede
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 24, 2019

  1. Merge #52833: netatalk: 3.1.11 -> 3.1.12 (security) 

    (cherry picked from commit 0cf1580)
    @vcunat
    vcunat committed Feb 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    76811bf View commit details

  2. luakit: add HTTPS support (#52865) 

    Co-Authored-By: emmanuelrosa <emmanuelrosa@users.noreply.github.com>
(cherry picked from commit 421dd51)
Fixes #56266.  I briefly re-tested that on 18.09.
    @emmanuelrosa @vcunat
    emmanuelrosa authored and vcunat committed Feb 24, 2019
    Copy the full SHA
    2354875 View commit details
Showing with 5 additions and 4 deletions.
  1. +3 −2 pkgs/applications/networking/browsers/luakit/default.nix
  2. +2 −2 pkgs/tools/filesystems/netatalk/default.nix
5 changes: 3 additions & 2 deletions pkgs/applications/networking/browsers/luakit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook, makeWrapper
,help2man, lua5, luafilesystem, luajit, sqlite
,webkitgtk, gtk3, gst_all_1}:
,webkitgtk, gtk3, gst_all_1, glib-networking}:

let
lualibs = [luafilesystem];
@@ -27,7 +27,8 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
gst_all_1.gst-libav
];
glib-networking # TLS support
];

postPatch =
#Kind of ugly seds here. There must be a better solution.
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/netatalk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
}:

stdenv.mkDerivation rec{
name = "netatalk-3.1.11";
name = "netatalk-3.1.12";

src = fetchurl {
url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2";
sha256 = "3434472ba96d3bbe3b024274438daad83b784ced720f7662a4c1d0a1078799a6";
sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m";
};

patches = [