diff options
Diffstat (limited to 'pkgs/development/libraries')
56 files changed, 65 insertions, 154 deletions
diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index 927bd00656e..2761eaf3753 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }: -let - version = "0.6.3"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "libgme"; - inherit version; + version = "0.6.3"; meta = with lib; { description = "A collection of video game music chip emulators"; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 15e2516c1b6..ad373300e02 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, cmake, boost, python2}: -let version = "1.8.2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avro-c++"; - inherit version; + version = "1.8.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 95e3053b534..ee43daf2d04 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: -let - version = "1.10.2"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avro-c"; - inherit version; + version = "1.10.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/development/libraries/bearssl/default.nix index de9c182df14..36873f03f7e 100644 --- a/pkgs/development/libraries/bearssl/default.nix +++ b/pkgs/development/libraries/bearssl/default.nix @@ -1,17 +1,12 @@ { lib, stdenv, fetchurl }: -let - version = "0.6"; - sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; - -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bearssl"; - inherit version; + version = "0.6"; src = fetchurl { url = "https://www.bearssl.org/bearssl-${version}.tar.gz"; - inherit sha256; + sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; }; outputs = [ "bin" "lib" "dev" "out" ]; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index d51cf159598..32a4859a1bc 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -10,17 +10,17 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md buildGoModule { pname = "boringssl"; - version = "2021-04-18"; + version = "2021-07-09"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "468cde90ca58421d63f4dfeaebcf8bb3fccb4127"; - sha256 = "0gaqcbvp6r5fq265mckmg0i0rjab0bhxkxcvfxp3ar5dm7q88w39"; + rev = "268a4a6ff3bd656ae65fe41ef1185daa85cfae21"; + sha256 = "04fja4fdwhc69clmvg8i12zm6ks3sfl3r8i5bxn4x63b9dj5znlx"; }; nativeBuildInputs = [ cmake ninja perl ]; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; # hack to get both go and cmake configure phase # (if we use postConfigure then cmake will loop runHook postConfigure) diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 9ff54f8ebf9..e0d6149362c 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { # Requested here: https://github.com/cddlib/cddlib/issues/25 doCheck = true; meta = with lib; { - inherit version; description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron"; license = licenses.gpl2Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index ba8961c8f6c..991fb2b41d5 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pcre }: -let version = "1.0.10"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "classads"; - inherit version; + version = "1.0.10"; src = fetchurl { url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix index 91267208d2e..db18bce72be 100644 --- a/pkgs/development/libraries/clfft/default.nix +++ b/pkgs/development/libraries/clfft/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: -let - version = "2.12.2"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "clfft"; - inherit version; + version = "2.12.2"; src = fetchFromGitHub { owner = "clMathLibraries"; @@ -29,6 +27,5 @@ in stdenv.mkDerivation { homepage = "http://clmathlibraries.github.io/clFFT/"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ chessai ]; - inherit version; }; } diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 740b0d81ca9..74a6f21992b 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ]; doCheck = true; meta = with lib; { - inherit version; description = "Elliptic curve tools"; homepage = "https://github.com/JohnCremona/eclib"; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 2a394f8279b..930bfc99f28 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -10,6 +10,7 @@ , doxygen , graphviz , libxslt +, libiconv }: stdenv.mkDerivation rec { @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { libxslt ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; + propagatedBuildInputs = [ expat zlib diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index fd7d89a8831..ca2f3b0e381 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - inherit version; description = "Finite Field Linear Algebra Subroutines"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 50f9e688cb9..028ab6a7530 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -2,13 +2,9 @@ , libXrandr, libGLU, libGL, libXft, libXfixes, xinput , CoreServices }: -let - version = "1.6.57"; -in - stdenv.mkDerivation rec { pname = "fox"; - inherit version; + version = "1.6.57"; src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index e13302319a1..0e96a346f41 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; - inherit version; homepage = "http://openkinect.org"; license = with lib.licenses; [ gpl2 asl20 ]; maintainers = with lib.maintainers; [ bennofs ]; diff --git a/pkgs/development/libraries/givaro/3.7.nix b/pkgs/development/libraries/givaro/3.7.nix index dfd6b6b476b..a9b6325c3d7 100644 --- a/pkgs/development/libraries/givaro/3.7.nix +++ b/pkgs/development/libraries/givaro/3.7.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool gmpxx]; meta = { - inherit version; description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/givaro/3.nix b/pkgs/development/libraries/givaro/3.nix index 9d216b9d8e5..1bfe7682ffa 100644 --- a/pkgs/development/libraries/givaro/3.nix +++ b/pkgs/development/libraries/givaro/3.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool gmpxx]; meta = { - inherit version; description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index f6d6ddab4d0..29674118dfe 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - inherit version; description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index 610f49d2259..59230761cd4 100644 --- a/pkgs/development/libraries/glibc/2.33-master.patch.gz +++ b/pkgs/development/libraries/glibc/2.33-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 3a5da0afc74..e651a8effac 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.33"; - patchSuffix = "-45"; + patchSuffix = "-47"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-45-g58b90461ae + glibc-2.33-47-gb5711025bc $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index c4df9f1f0fd..4194064a5a2 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: -let - version = "2.0.4"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "goocanvas"; - inherit version; + version = "2.0.4"; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 9d1d23ede8b..36ca0b0ca0b 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let - version = "2.9.4"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "http-parser"; - inherit version; + version = "2.9.4"; src = fetchFromGitHub { owner = "nodejs"; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 09ae213eb5d..474605fe769 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { "--with-cblas=-lblas" ]; meta = { - inherit version; description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers"; license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index bc50f020659..e6742520865 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -1,17 +1,14 @@ { fetchurl, lib, stdenv, unzip, ant, javac, jvm }: let - version = "1.7R2"; - xbeans = fetchurl { url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk"; }; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rhino"; - inherit version; + version = "1.7R2"; src = fetchurl { url = "mirror://mozilla/js/rhino1_7R2.zip"; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index f41bf0f0c80..6c162c381ac 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - inherit version; homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "A C++ library for interacting with JSON"; maintainers = with maintainers; [ ttuegel cpages ]; diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 41d07d58cba..d1f942a3498 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "ANSI C routines for fast base64 encoding/decoding"; license = lib.licenses.publicDomain; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 01c10dab60a..5d86dd12246 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.raskin ] ; platforms = lib.platforms.unix; - inherit version; }; } diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index fc871f174eb..df05754da58 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Denable-test=false" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Ddisable-introspection=true" ]; passthru = { diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 77df340a55f..0aeef61dae9 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { description = "Portable, simple C-language 9P client and server libary"; maintainers = with lib.maintainers; [ kovirobi ]; license = lib.licenses.mit; - inherit version; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index c78aa3f617e..a64afbb930a 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchurl, expat, curl, fftw }: -let - version = "0.9.3"; - deb_patch = "5"; -in stdenv.mkDerivation rec { pname = "libofa"; - inherit version; + version = "0.9.3"; + deb_patch = "5"; src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index 625e780d192..0130af66459 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libsigcxx }: -let version = "0.4"; in - stdenv.mkDerivation rec { pname = "libpar2"; - inherit version; + version = "0.4"; src = fetchurl { url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index e960fe8f4b2..7c91950a4c4 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [raskin]; license = lib.licenses.bsd3; - inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/re-.*[.]tar[.].*"; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 60b52152f67..acf82886d46 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobject-introspection }: -let - version = "5.4"; -in stdenv.mkDerivation rec { pname = "libxklavier"; - inherit version; + version = "5.4"; src = fetchgit { url = "git://anongit.freedesktop.org/git/libxklavier"; diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index a2b4800ec4c..21052df8630 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -4,11 +4,9 @@ , enableStatic ? stdenv.hostPlatform.isStatic }: -let - version = "1.16.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libxsmm"; - inherit version; + version = "1.16.1"; src = fetchFromGitHub { owner = "hfp"; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 8a21bd3bcde..821edd33369 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - inherit version; description = "C++ library for exact, high-performance linear algebra"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 0fc74963299..89fbdd9f215 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { checkInputs = [ boost ]; meta = with lib; { - inherit version; homepage = "https://gitlab.com/mdds/mdds"; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = platforms.all; diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index 5ff0dcd29e7..152c35e6e6f 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ mpfr ]; meta = { - inherit version; description = "A multiple precision interval arithmetic library based on MPFR"; homepage = "https://gforge.inria.fr/projects/mpfi/"; license = lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 36505b4a667..b8ee4fb4e76 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ "--enable-fat" ]; meta = { - inherit version; description = "A highly optimised library for bignum arithmetic forked from GMP"; license = lib.licenses.lgpl3Plus; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index c3df23052e2..4048f28e5d7 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap , pkg-config }: -let version = "3.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ndpi"; - inherit version; + version = "3.4"; src = fetchFromGitHub { owner = "ntop"; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 915e733473e..a4c18e9f046 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }: -let version = "6.0.0"; in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "nix-plugins"; - inherit version; + version = "6.0.0"; src = fetchFromGitHub { owner = "shlevy"; diff --git a/pkgs/development/libraries/nss/3.53.nix b/pkgs/development/libraries/nss/3.53.nix index 9f281743f6c..5d44a4d2469 100644 --- a/pkgs/development/libraries/nss/3.53.nix +++ b/pkgs/development/libraries/nss/3.53.nix @@ -9,15 +9,12 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.53.1"; - underscoreVersion = builtins.replaceStrings ["."] ["_"] version; - in stdenv.mkDerivation rec { pname = "nss"; - inherit version; + version = "3.53.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; + url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/${pname}-${version}.tar.gz"; sha256 = "05jk65x3zy6q8lx2djj8ik7kg741n88iy4n3bblw89cv0xkxxk1d"; }; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index cb9f9ff575f..eef6bbdd580 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }: -let - version = "016"; -in - stdenv.mkDerivation rec { pname = "ntrack"; - inherit version; + version = "016"; src = fetchurl { url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index d1348d96e3b..26b2715658b 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl }: -let - version = "0.1.5"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "opencore-amr"; - inherit version; + version = "0.1.5"; src = fetchurl { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 05f1ef65a30..9276ccac6fd 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ deepfire ]; platforms = platforms.linux; # PAM is not available on Darwin - inherit version; }; } diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index b7cfc5da9d3..b0603cc454f 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.all; - inherit version; }; } diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index b7adc3d2a42..7791973bb12 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -2,12 +2,9 @@ , libtool, flex, libevent, hwloc, munge, zlib, pandoc } : -let - version = "3.2.3"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pmix"; - inherit version; + version = "3.2.3"; src = fetchFromGitHub { repo = "openpmix"; diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 293a13dbddc..2865ab06319 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { }; meta = { - inherit version; description = "File open routines to safely open a file when in the presence of an attack"; license = lib.licenses.asl20 ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index c871f18e69b..351eb5c1547 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { license = licenses.cpl10; maintainers = with maintainers; [ deepfire ]; platforms = platforms.unix; - inherit version; }; } diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix index 58c2744605a..6adf5251471 100644 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.6"; + version = "7.7"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-VLuMkhZ6fxP4qnP8S4oJeFJW0smCE0Z968eigqQxMYs="; + sha256 = "sha256-pwjmtOkOLNZCdDRxW1kbucPUAFyZcl7ElLjgvtLeU1U="; }; nativeBuildInputs = [ flex ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 66f343d4912..79e494a053b 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -7,12 +7,11 @@ }: let inherit (lib) optional; - version = "3.9.1"; in stdenv.mkDerivation rec { pname = "liblapack"; - inherit version; + version = "3.9.1"; src = fetchFromGitHub { owner = "Reference-LAPACK"; @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix index f7f981e223b..063fead1165 100644 --- a/pkgs/development/libraries/science/math/lrs/default.nix +++ b/pkgs/development/libraries/science/math/lrs/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index c9a326afa7f..7ed5070ebb0 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -3,13 +3,9 @@ , IOKit, Foundation, AppKit, OpenAL }: -let - version = "2.5.1"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "sfml"; - inherit version; + version = "2.5.1"; src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index 9f330f3f32f..001123ead60 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -1,11 +1,8 @@ {lib, stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}: -let - version = "0.12"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libstartup-notification"; - inherit version; + version = "0.12"; src = fetchurl { url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 5994aeb0a59..fa6ca014181 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation rec { cp -r scenes "$out/share/tachyon/scenes" ''; meta = { - inherit version; description = "A Parallel / Multiprocessor Ray Tracing System"; license = lib.licenses.bsd3; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index 7ddae062f76..97c6d10191f 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, perl }: -let - version = "2.1.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "uthash"; - inherit version; + version = "2.1.0"; src = fetchurl { url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 567a5e3e251..ce2f7c20d3c 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -4,11 +4,9 @@ , buildPackages }: -let - version = "0.3.11"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "volume_key"; - inherit version; + version = "0.3.11"; src = fetchgit { url = "https://pagure.io/volume_key.git"; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 77e0e20eaf5..5674f076bec 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -11,12 +11,9 @@ assert withMesa -> libGLU != null && libGL != null; with lib; -let - version = "2.9.4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "wxwidgets"; - inherit version; + version = "2.9.4"; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 8bf98760950..71a10764667 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -4,12 +4,9 @@ , openssl, nss_3_53, lib, runCommandCC, writeText }: lib.fix (self: -let - version = "1.2.31"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xmlsec"; - inherit version; + version = "1.2.31"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; |