diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-12-18 20:30:46 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-12-18 20:45:54 +0100 |
commit | 52424415bcc986fee47b518c6ed3a9519134edb0 (patch) | |
tree | abdddd8c700ada0da07171555feecf53d9347e7f /pkgs | |
parent | e0a8fe7bdff0e8005e191ff635a62192a528b6c7 (diff) |
vpcs: 0.8 -> 0.8.1
Thanks to Repology / Alpine Linux I noticed that the GNS3 team continued the development. From their README: > This is a continuation of VPCS, based on the last development version > and improved with patches wrote by various people from the community. > The original VPCS code, which is unfortunately not maintained anymore, > can be viewed on https://sourceforge.net/p/vpcs/code/
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/virtualization/vpcs/default.nix | 27 | ||||
-rw-r--r-- | pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch | 14 |
2 files changed, 12 insertions, 29 deletions
diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 464fe46b499c8..ce08428eba0a1 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchurl, glibc }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "vpcs"; - version = "0.8"; + version = "0.8.1"; - src = fetchurl { - name = "${pname}-${version}.tar.bz2"; - url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz"; - sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw"; + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "0kqy4bd3ns8nzn7fa72izn7a08sfrasy1rn7fd8ajah2wv8d2cak"; }; - patches = [ ./vpcs-0.8-glibc-2.26.patch ]; - - buildInputs = [ glibc.static ]; - buildPhase = ''( cd src ./mk.sh ${stdenv.buildPlatform.platform.kernelArch} @@ -27,13 +24,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Virtual PC simulator"; + description = "A simple virtual PC simulator"; longDescription = '' - The VPCS can simulate up to 9 PCs. You can ping/traceroute them, or - ping/traceroute the other hosts/routers from the VPCS when you study the - Cisco routers in the dynamips. + The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can + ping/traceroute them, or ping/traceroute the other hosts/routers from the + VPCS when you study the Cisco routers in the dynamips. ''; - homepage = "https://sourceforge.net/projects/vpcs/"; + inherit (src.meta) homepage; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch b/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch deleted file mode 100644 index d94a39ccd64da..0000000000000 --- a/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/getopt.h b/src/getopt.h -index 4394aa2..bf59e10 100644 ---- a/src/getopt.h -+++ b/src/getopt.h -@@ -49,9 +49,6 @@ extern int optind; - extern int opterr; - extern int optopt; - --#ifndef FreeBSD --int getopt(int argc, char** argv, char* optstr); --#endif - int arg_to_int(const char* arg, int min, int max, int defalt); - - #ifdef __cplusplus |