Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a111a5ee09cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0c4786cf7649
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Feb 1, 2019

  1. Verified

    This commit was signed with the committer’s verified signature.
    etu Elis Hirwing
    Copy the full SHA
    0c4786c View commit details
Showing with 7 additions and 8 deletions.
  1. +3 −4 pkgs/applications/networking/gns3/default.nix
  2. +1 −1 pkgs/applications/networking/gns3/gui.nix
  3. +3 −3 pkgs/applications/networking/gns3/server.nix
7 changes: 3 additions & 4 deletions pkgs/applications/networking/gns3/default.nix
Original file line number Diff line number Diff line change
@@ -2,8 +2,7 @@

let
stableVersion = "2.1.12";
# Currently there is no preview version.
previewVersion = stableVersion;
previewVersion = "2.2.0a1";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
@@ -19,7 +18,7 @@ in {
};
guiPreview = mkGui {
stable = false;
sha256Hash = guiSrcHash;
sha256Hash = "16jjgfbdi7b3349wrqalf40qcaqzw3d4vdjbwcy8dbqblg48hn5w";
};

serverStable = mkServer {
@@ -28,6 +27,6 @@ in {
};
serverPreview = mkServer {
stable = false;
sha256Hash = serverSrcHash;
sha256Hash = "0bcsjljy947grfn3y9xyi3dbzdw5wkljq1nr66cqfkidx9f4fzni";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/gns3/gui.nix
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ in pythonPackages.buildPythonPackage rec {
raven psutil jsonschema # tox for check
# Runtime dependencies
sip (pyqt5.override { withWebSockets = true; })
];
] ++ stdenv.lib.optional (!stable) pythonPackages.distro;

doCheck = false; # Failing

6 changes: 3 additions & 3 deletions pkgs/applications/networking/gns3/server.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
{ stdenv, python36, fetchFromGitHub }:

let
python = python36.override {
python = if stable then python36.override {
packageOverrides = self: super: {
async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
version = "2.0.1";
@@ -31,7 +31,7 @@ let
++ stdenv.lib.optional (pythonOlder "3.5") typing;
});
};
};
} else python36;

in python.pkgs.buildPythonPackage {
pname = "gns3-server";
@@ -48,7 +48,7 @@ in python.pkgs.buildPythonPackage {
aiohttp-cors yarl aiohttp multidict
jinja2 psutil zipstream raven jsonschema typing
(python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
];
] ++ stdenv.lib.optional (!stable) python.pkgs.distro;

# Requires network access
doCheck = false;