Merge pull request #195091 from anthonyroussel/gns3_2_2_34
gns3-gui,gns3-server: 2.2.31 -> 2.2.34
This commit is contained in:
commit
e08dfb7454
3 changed files with 8 additions and 5 deletions
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
stableVersion = "2.2.31";
|
||||
stableVersion = "2.2.34";
|
||||
previewVersion = stableVersion;
|
||||
addVersion = args:
|
||||
let version = if args.stable then stableVersion else previewVersion;
|
||||
|
@ -27,8 +27,9 @@ let
|
|||
};
|
||||
mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
|
||||
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
|
||||
guiSrcHash = "sha256-o9j/avuapiUKIDO6aO/uWFF/5gu+xdfhL7ZSDSaQ858=";
|
||||
serverSrcHash = "sha256-8r8nWNqbHUDtJ6x+/SxHxaw1isSuWF/5as3YXLB6LFw=";
|
||||
guiSrcHash = "sha256-1YsVMrUYI46lJZbPjf3jnOFDr9Hp54m8DVMz9y4dvVc=";
|
||||
serverSrcHash = "sha256-h4d9s+QvqN/EFV97rPRhQiyC06wkZ9C2af9gx1Z/x/8=";
|
||||
|
||||
in {
|
||||
guiStable = mkGui {
|
||||
stable = true;
|
||||
|
|
|
@ -20,6 +20,7 @@ let
|
|||
python = python3.override {
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
|
||||
};
|
||||
|
||||
in python.pkgs.buildPythonPackage rec {
|
||||
pname = "gns3-gui";
|
||||
inherit version;
|
||||
|
@ -71,6 +72,6 @@ in python.pkgs.buildPythonPackage rec {
|
|||
changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ anthonyroussel ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -19,6 +19,7 @@ let
|
|||
python = python3.override {
|
||||
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
|
||||
};
|
||||
|
||||
in python.pkgs.buildPythonApplication {
|
||||
pname = "gns3-server";
|
||||
inherit version;
|
||||
|
@ -79,6 +80,6 @@ in python.pkgs.buildPythonApplication {
|
|||
changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ anthonyroussel ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue