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: d7d32101884d
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: b94c22f71724
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Oct 20, 2020

  1. Merge #98415: wordnet: Fix darwin build 

    (cherry picked from commit 81b1356)
    @vcunat
    vcunat committed Oct 20, 2020
    Copy the full SHA
    0056f62 View commit details

  2. Merge #100808: thunderbird*: 78.3.2 -> 78.3.3 

    (cherry picked from commit 176243b)
Re-tested both of them briefly atop 20.03 as well.
    @vcunat
    vcunat committed Oct 20, 2020
    Copy the full SHA
    7c2a362 View commit details

  3. opensc: patch for CVE-2020-26570, CVE-2020-26572 

    (cherry picked from commit c4237e2)
    @erictapen
    erictapen committed Oct 20, 2020
    Copy the full SHA
    b94c22f View commit details
5 changes: 3 additions & 2 deletions pkgs/applications/misc/wordnet/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:
{ stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }:

stdenv.mkDerivation rec {
version = "3.0";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
};

buildInputs = [tcl tk xlibsWrapper makeWrapper];
buildInputs = [ tcl tk xlibsWrapper makeWrapper ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];

hardeningDisable = [ "format" ];

Loading