Merge pull request #195091 from anthonyroussel/gns3_2_2_34

gns3-gui,gns3-server: 2.2.31 -> 2.2.34

authored by Mario Rodas and committed by GitHub e08dfb74 80e4946f

+8 -5
+4 -3
pkgs/applications/networking/gns3/default.nix
··· 3 }: 4 5 let 6 - stableVersion = "2.2.31"; 7 previewVersion = stableVersion; 8 addVersion = args: 9 let version = if args.stable then stableVersion else previewVersion; ··· 27 }; 28 mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; 29 mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; 30 - guiSrcHash = "sha256-o9j/avuapiUKIDO6aO/uWFF/5gu+xdfhL7ZSDSaQ858="; 31 - serverSrcHash = "sha256-8r8nWNqbHUDtJ6x+/SxHxaw1isSuWF/5as3YXLB6LFw="; 32 in { 33 guiStable = mkGui { 34 stable = true;
··· 3 }: 4 5 let 6 + stableVersion = "2.2.34"; 7 previewVersion = stableVersion; 8 addVersion = args: 9 let version = if args.stable then stableVersion else previewVersion; ··· 27 }; 28 mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; 29 mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; 30 + guiSrcHash = "sha256-1YsVMrUYI46lJZbPjf3jnOFDr9Hp54m8DVMz9y4dvVc="; 31 + serverSrcHash = "sha256-h4d9s+QvqN/EFV97rPRhQiyC06wkZ9C2af9gx1Z/x/8="; 32 + 33 in { 34 guiStable = mkGui { 35 stable = true;
+2 -1
pkgs/applications/networking/gns3/gui.nix
··· 20 python = python3.override { 21 packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); 22 }; 23 in python.pkgs.buildPythonPackage rec { 24 pname = "gns3-gui"; 25 inherit version; ··· 71 changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}"; 72 license = licenses.gpl3Plus; 73 platforms = platforms.linux; 74 - maintainers = with maintainers; [ ]; 75 }; 76 }
··· 20 python = python3.override { 21 packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); 22 }; 23 + 24 in python.pkgs.buildPythonPackage rec { 25 pname = "gns3-gui"; 26 inherit version; ··· 72 changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}"; 73 license = licenses.gpl3Plus; 74 platforms = platforms.linux; 75 + maintainers = with maintainers; [ anthonyroussel ]; 76 }; 77 }
+2 -1
pkgs/applications/networking/gns3/server.nix
··· 19 python = python3.override { 20 packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); 21 }; 22 in python.pkgs.buildPythonApplication { 23 pname = "gns3-server"; 24 inherit version; ··· 79 changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}"; 80 license = licenses.gpl3Plus; 81 platforms = platforms.linux; 82 - maintainers = with maintainers; [ ]; 83 }; 84 }
··· 19 python = python3.override { 20 packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); 21 }; 22 + 23 in python.pkgs.buildPythonApplication { 24 pname = "gns3-server"; 25 inherit version; ··· 80 changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}"; 81 license = licenses.gpl3Plus; 82 platforms = platforms.linux; 83 + maintainers = with maintainers; [ anthonyroussel ]; 84 }; 85 }