mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-19 11:41:43 +03:00
gns3-gui,gns3-server: 2.2.31 -> 2.2.34
This commit is contained in:
parent
5f41d9525a
commit
1ec792a0dc
@ -3,7 +3,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
stableVersion = "2.2.31";
|
stableVersion = "2.2.34";
|
||||||
previewVersion = stableVersion;
|
previewVersion = stableVersion;
|
||||||
addVersion = args:
|
addVersion = args:
|
||||||
let version = if args.stable then stableVersion else previewVersion;
|
let version = if args.stable then stableVersion else previewVersion;
|
||||||
@ -27,8 +27,9 @@ let
|
|||||||
};
|
};
|
||||||
mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
|
mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
|
||||||
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
|
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
|
||||||
guiSrcHash = "sha256-o9j/avuapiUKIDO6aO/uWFF/5gu+xdfhL7ZSDSaQ858=";
|
guiSrcHash = "sha256-1YsVMrUYI46lJZbPjf3jnOFDr9Hp54m8DVMz9y4dvVc=";
|
||||||
serverSrcHash = "sha256-8r8nWNqbHUDtJ6x+/SxHxaw1isSuWF/5as3YXLB6LFw=";
|
serverSrcHash = "sha256-h4d9s+QvqN/EFV97rPRhQiyC06wkZ9C2af9gx1Z/x/8=";
|
||||||
|
|
||||||
in {
|
in {
|
||||||
guiStable = mkGui {
|
guiStable = mkGui {
|
||||||
stable = true;
|
stable = true;
|
||||||
|
@ -20,6 +20,7 @@ let
|
|||||||
python = python3.override {
|
python = python3.override {
|
||||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
|
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
|
||||||
};
|
};
|
||||||
|
|
||||||
in python.pkgs.buildPythonPackage rec {
|
in python.pkgs.buildPythonPackage rec {
|
||||||
pname = "gns3-gui";
|
pname = "gns3-gui";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
@ -19,6 +19,7 @@ let
|
|||||||
python = python3.override {
|
python = python3.override {
|
||||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
|
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
|
||||||
};
|
};
|
||||||
|
|
||||||
in python.pkgs.buildPythonApplication {
|
in python.pkgs.buildPythonApplication {
|
||||||
pname = "gns3-server";
|
pname = "gns3-server";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
Loading…
Reference in New Issue
Block a user