diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-06-07 08:07:10 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-06-07 08:07:10 +0200 |
commit | 8f5edef47e2d7d3667148d7ea8122fb4ec6794d1 (patch) | |
tree | 3e5f880f656613c5fdd611ec7303d77162788d2d /pkgs/development/tools/misc | |
parent | 276dc23b614ce30cf628cbbf1f222efdeafb8cb9 (diff) | |
parent | 326148ec9bb5e5d93c23e720287f000f76ab2cae (diff) | |
download | nixlib-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar nixlib-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.gz nixlib-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.bz2 nixlib-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.lz nixlib-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.xz nixlib-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.tar.zst nixlib-8f5edef47e2d7d3667148d7ea8122fb4ec6794d1.zip |
Merge branch 'staging-next' (PR #62209)
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/gdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/misc/swig/2.x.nix | 27 | ||||
-rw-r--r-- | pkgs/development/tools/misc/swig/3.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/misc/swig/default.nix | 29 |
4 files changed, 18 insertions, 46 deletions
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 722490a56a93..100283656782 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -13,7 +13,7 @@ let basename = "gdb-${version}"; - version = "8.2.1"; + version = "8.3"; in assert pythonSupport -> python3 != null; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"; + sha256 = "0bnpzz0rl672xg5547q5qck2sxi6cnyixmk8bbb4gifw17ipwbw0"; }; patches = [ diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index acf1988c947d..9f0e767c3d0b 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { - name = "swig-${version}"; + pname = "swig"; version = "2.0.12"; src = fetchFromGitHub { @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-tcl" ]; + # Disable ccache documentation as it needs yodl postPatch = '' - # Disable ccache documentation as it need yodl sed -i '/man1/d' CCache/Makefile.in ''; @@ -25,26 +25,11 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - - longDescription = '' - SWIG is an interface compiler that connects programs written in C and - C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl. It - works by taking the declarations found in C/C++ header files and using - them to generate the wrapper code that scripting languages need to - access the underlying C/C++ code. In addition, SWIG provides a variety - of customization features that let you tailor the wrapping process to - suit your application. - ''; - homepage = http://swig.org/; - - # Licensing is a mess: http://www.swig.org/Release/LICENSE . - license = "BSD-style"; - - platforms = lib.platforms.linux ++ lib.platforms.darwin; - - maintainers = [ ]; + # Different types of licenses available: http://www.swig.org/Release/LICENSE . + license = licenses.gpl3Plus; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 903693b92808..bec855f3cee6 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre, buildPackages }: stdenv.mkDerivation rec { - name = "swig-${version}"; + pname = "swig"; version = "3.0.12"; src = fetchFromGitHub { @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-tcl" ]; + # Disable ccache documentation as it needs yodl postPatch = '' - # Disable ccache documentation as it need yodl sed -i '/man1/d' CCache/Makefile.in ''; diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index cfd1c7728cb2..e74b2898498c 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, boost, tcl }: stdenv.mkDerivation rec { - name = "swig-1.3.40"; + pname = "swig"; + version = "1.3.40"; src = fetchurl { - url = "mirror://sourceforge/swig/${name}.tar.gz"; + url = "mirror://sourceforge/swig/${pname}-${version}.tar.gz"; sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r"; }; @@ -14,26 +15,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-ccache" ]; - meta = { - description = "Interface compiler that connects C/C++ code to higher-level languages"; - - longDescription = '' - SWIG is an interface compiler that connects programs written in C and - C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl. It - works by taking the declarations found in C/C++ header files and using - them to generate the wrapper code that scripting languages need to - access the underlying C/C++ code. In addition, SWIG provides a variety - of customization features that let you tailor the wrapping process to - suit your application. - ''; + meta = with stdenv.lib; { + description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = http://swig.org/; - - # Licensing is a mess: http://www.swig.org/Release/LICENSE . - license = "BSD-style"; - - platforms = stdenv.lib.platforms.all; - - maintainers = [ ]; + # Different types of licenses available: http://www.swig.org/Release/LICENSE . + license = licenses.gpl3Plus; + platforms = with platforms; linux ++ darwin; }; } |