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

Commits on Mar 14, 2019

  1. gns3Packages.{server,gui}Preview: 2.2.0a1 -> 2.2.0a2

    @primeos
    primeos committed Mar 14, 2019
    Copy the full SHA
    0e0a00b View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 pkgs/applications/networking/gns3/default.nix
  2. +1 −1 pkgs/applications/networking/gns3/server.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/gns3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

let
stableVersion = "2.1.14";
previewVersion = "2.2.0a1";
previewVersion = "2.2.0a2";
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview";
@@ -18,7 +18,7 @@ in {
};
guiPreview = mkGui {
stable = false;
sha256Hash = "16jjgfbdi7b3349wrqalf40qcaqzw3d4vdjbwcy8dbqblg48hn5w";
sha256Hash = "1lvdff4yfavfkjmdbhxqfxdd5nq77c2vyy2wnsdliwnmdh3fhm28";
};

serverStable = mkServer {
@@ -27,6 +27,6 @@ in {
};
serverPreview = mkServer {
stable = false;
sha256Hash = "0bcsjljy947grfn3y9xyi3dbzdw5wkljq1nr66cqfkidx9f4fzni";
sha256Hash = "033bi1bcw5ss6g380qnam1qqyi4bz1cykbb3lparb8hryikicdb9";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/networking/gns3/server.nix
View file
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ in python.pkgs.buildPythonPackage {
aiohttp-cors yarl aiohttp multidict
jinja2 psutil zipstream raven jsonschema
(python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
] ++ stdenv.lib.optional (!stable) python.pkgs.distro;
] ++ stdenv.lib.optional (!stable) [ distro async_generator aiofiles ];

# Requires network access
doCheck = false;