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: 390742eb138b
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: 6460602eec5c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 24, 2020

  1. gns3-gui: Add the missing qt5Full runtime dependency

    qt5Full may not be installed on users' systems and the gns3-gui depends
    on it explicitly.
    Note: This also fixes e.g. "nix-shell -p gns3-gui --pure" (at the cost
    of an increased closure size).
    
    (cherry picked from commit 0eaec4d)
    Reason: This is a fix for possible runtime crashes.
    Atemu authored and primeos committed Jun 24, 2020
    Copy the full SHA
    6460602 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/networking/gns3/gui.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/gns3/gui.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{ stable, branch, version, sha256Hash, mkOverride }:

{ lib, stdenv, python3, fetchFromGitHub }:
{ lib, stdenv, python3, pkgs, fetchFromGitHub }:

let
# TODO: This package requires qt5Full to launch
defaultOverrides = [
(mkOverride "psutil" "5.6.3"
"1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")
@@ -29,6 +28,7 @@ in python.pkgs.buildPythonPackage rec {
raven psutil jsonschema # tox for check
# Runtime dependencies
sip (pyqt5.override { withWebSockets = true; }) distro setuptools
pkgs.qt5Full
];

doCheck = false; # Failing