diff options
Diffstat (limited to 'pkgs/development')
5 files changed, 8 insertions, 23 deletions
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 685d095a818..64b223d4ebb 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, cmake, boost, openssl }: -let - version = "0.11.2"; -in - stdenv.mkDerivation rec { name = "cpp-netlib-${version}"; + version = "0.11.2"; src = fetchurl { url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2"; @@ -19,7 +16,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - inherit version; description = "A collection of open-source libraries for high level network programming"; homepage = http://cpp-netlib.org; license = licenses.boost; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index a1beee602d7..1dc4c57e979 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,8 +3,6 @@ let - version = "${libVersion}-list-${listVersion}"; - listVersion = "2016-01-15"; listSources = fetchFromGitHub { sha256 = "1smn4fl0fhldy7gdn0k1diyghbxdxnr4cj921bjdl2i4wxas41g5"; @@ -15,8 +13,9 @@ let libVersion = "0.12.0"; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { name = "libpsl-${version}"; + version = "${libVersion}-list-${listVersion}"; src = fetchFromGitHub { sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw"; @@ -54,7 +53,6 @@ in stdenv.mkDerivation { doCheck = true; meta = with stdenv.lib; { - inherit version; description = "C library for the Publix Suffix List"; longDescription = '' libpsl is a C library for the Publix Suffix List (PSL). A "public suffix" diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 08e6a3b6559..b3788d7f324 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - inherit version; description = "A program maintenance (make) utility using a C-like grammar"; homepage = https://fbb-git.github.io/icmake/; license = licenses.gpl3; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 29fe621d676..4a278e052fa 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,15 +1,11 @@ { stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }: -let +let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; version = "3.2.4"; - sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w"; - ccache = -stdenv.mkDerivation { - inherit name; src = fetchurl { - inherit sha256; + sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w"; url = "mirror://samba/ccache/${name}.tar.xz"; }; @@ -65,7 +61,6 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - inherit version; description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; downloadPage = https://ccache.samba.org/download.html; @@ -73,5 +68,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; }; -in -ccache +in ccache diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index 23d4ea911db..46aaa830512 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -2,8 +2,6 @@ let - version = "1.0"; - srcs = { lemon = fetchurl { sha256 = "1grm95m2cnc61zim332g7z8nchmcy91ljf50k13lm421v0ygyyv6"; @@ -17,8 +15,9 @@ let }; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { name = "lemon-${version}"; + version = "1.0"; phases = [ "buildPhase" "installPhase" ]; @@ -32,7 +31,6 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - inherit version; description = "An LALR(1) parser generator"; longDescription = '' The Lemon program is an LALR(1) parser generator that takes a |