diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2022-10-15 15:11:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-15 15:11:28 -0500 |
commit | e08dfb7454b8700b9ff59f6a12795f96be9427a1 (patch) | |
tree | 26ad0ed84331e405cfa7637cbce9e5aa900780a3 | |
parent | 80e4946f38caf8692c2716cab631aae6697a490b (diff) | |
parent | 78fe5b0a4fabb9b7e1bd560b146fde572ebed36d (diff) |
Merge pull request #195091 from anthonyroussel/gns3_2_2_34
gns3-gui,gns3-server: 2.2.31 -> 2.2.34
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/gui.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 27ec34e15961f..44c9477c1c436 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -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; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 9d0b947e3f183..be08fe4f4c76b 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -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 ]; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 814beec74773f..a07409810c015 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -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 ]; }; } |