diff options
author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2019-08-28 11:07:32 +0000 |
commit | 08f68313a47a2093dc0f408a706b2c125bc59c95 (patch) | |
tree | bb48188c0bf9fac152c038426146df518ef8c562 /pkgs/development/tools | |
parent | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (diff) | |
download | nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.gz nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.bz2 nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.lz nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.xz nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.tar.zst nixpkgs-08f68313a47a2093dc0f408a706b2c125bc59c95.zip |
treewide: remove redundant rec
Diffstat (limited to 'pkgs/development/tools')
94 files changed, 95 insertions, 95 deletions
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 36fa7bb1f16..c250f442a0e 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "evmdis-unstable"; version = "2018-03-23"; goPackagePath = "github.com/Arachnid/evmdis"; diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/development/tools/analysis/makefile2graph/default.nix index 7afa71429a7..20fe74ecb74 100644 --- a/pkgs/development/tools/analysis/makefile2graph/default.nix +++ b/pkgs/development/tools/analysis/makefile2graph/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "makefile2graph-2018-01-03"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index fb0f7414841..d9f39667cef 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -3,7 +3,7 @@ let name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name; src = kcachegrind.src; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 2db6b821b4e..a59a47b9e33 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -31,7 +31,7 @@ let cs_ver, cs_sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "radare2"; inherit version; diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index 86e4d6ef5f6..922a73a4be0 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "swarm-2019-03-11"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index ba842289dba..23ffe286824 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -49,7 +49,7 @@ let installPhase = ''cp $src $out''; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index 60a011a49d0..f14aa4eea6e 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchgit, perl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "colormake"; version = "2.1.0"; diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index 24df6fa6ff3..7b29e7d02dc 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -16,7 +16,7 @@ let ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gn"; version = "20190403"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 0ec57cc8b82..3a737f6f3b3 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }: rec { - gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec { + gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation { inherit name src nativeVersion; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index 28697f4c69c..7d08bbf6df2 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, python2, which}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "redo-apenwarr"; version = "unstable-2019-06-21"; diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index 612dd5c7810..19ce0b44bf7 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.0.3"; pname = "redo-sh"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 317186ea3e0..3e6d6604885 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,7 +14,7 @@ let goPackagePath = "github.com/containers/buildah"; -in buildGoPackage rec { +in buildGoPackage { pname = "buildah"; inherit version; inherit src; diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index 001f87b3b27..8a1d81acaaa 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -2,7 +2,7 @@ let version = "1.1.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "casperjs"; inherit version; diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 921448855a6..d5c74201418 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }: -bundlerEnv rec { +bundlerEnv { pname = "chef-dk"; ruby = ruby_2_4; diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index 0390e7b86bb..a83b5a21944 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -1,7 +1,7 @@ { stdenv, pythonPackages, fetchFromGitHub }: let - pgdbconn = pythonPackages.buildPythonPackage rec { + pgdbconn = pythonPackages.buildPythonPackage { pname = "pgdbconn"; version = "0.8.0"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ let }; in -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { pname = "pyrseas"; version = "0.8.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix index ca87395b917..070c7c81c40 100644 --- a/pkgs/development/tools/database/sqldeveloper/18.2.nix +++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix @@ -13,7 +13,7 @@ let categories = "Application;Development;"; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { inherit version; pname = "sqldeveloper"; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 461acacf4e9..9e75088aa5c 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -13,7 +13,7 @@ let categories = "Application;Development;"; }; in - stdenv.mkDerivation rec { + stdenv.mkDerivation { inherit version; pname = "sqldeveloper"; diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index 9dff0cc3ebe..4f3d89c0788 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "easyjson"; version = "unstable-2019-06-26"; goPackagePath = "github.com/mailru/easyjson"; diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index eb6f937800a..4fb05da3067 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -6,7 +6,7 @@ , makeWrapper } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fusee-launcher"; version = "unstable-2018-07-14"; diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix index 39aab9cfa27..9a14cc7f6e2 100644 --- a/pkgs/development/tools/github-changelog-generator/default.nix +++ b/pkgs/development/tools/github-changelog-generator/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "github_changelog_generator"; gemdir = ./.; exes = [ "github_changelog_generator" ]; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 20d1f7c0f1e..fd22295540d 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -4,7 +4,7 @@ , Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "glslviewer"; version = "2019-04-22"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 25b80d9cf69..6caa32c16f2 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "gox"; version = "20181025"; diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/development/tools/gpp/default.nix index 009f475bb7d..ee15df1a9f6 100644 --- a/pkgs/development/tools/gpp/default.nix +++ b/pkgs/development/tools/gpp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpp"; version = "2.25"; diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index c86c2e275ed..d1709369511 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, pythonPackages }: -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication { name = "grabserial-1.9.3"; namePrefix = ""; diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index b394e9e71fb..549a4d1b826 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pcre } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "imatix_gsl"; version = "4.1"; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index 035964dafc0..f2c926a6f39 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, llvmPackages, irony }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "irony-server"; inherit (irony) version; diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix index ad71dfb22a8..a6cb7a92b63 100644 --- a/pkgs/development/tools/jazzy/default.nix +++ b/pkgs/development/tools/jazzy/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "jazzy"; gemdir = ./.; exes = [ "jazzy" ]; diff --git a/pkgs/development/tools/kexpand/default.nix b/pkgs/development/tools/kexpand/default.nix index a82c21b72e9..e6c562721c2 100644 --- a/pkgs/development/tools/kexpand/default.nix +++ b/pkgs/development/tools/kexpand/default.nix @@ -1,6 +1,6 @@ { buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { name = "kexpand-unstable-2017-05-12"; goPackagePath = "github.com/kopeio/kexpand"; diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix index 1691f09e6e4..1dea1440113 100644 --- a/pkgs/development/tools/lattice-diamond/default.nix +++ b/pkgs/development/tools/lattice-diamond/default.nix @@ -1,7 +1,7 @@ { stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, freetype, fontconfig, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "diamond-3.10"; nativeBuildInputs = [ rpmextract patchelf makeWrapper file ]; diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index a5dd0a88272..f921e900e56 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { name = "manul-unstable-2016-09-30"; goPackagePath = "github.com/kovetskiy/manul"; diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 664e7d28d79..b3d380b0a0a 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -14,7 +14,7 @@ let sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "arcanist"; version = "20180916"; diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index ea9b340fb0b..c246ddb9d90 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libelf, txt2man }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bin_replace_string"; version = "0.2"; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index c33741740ad..210659289d1 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -22,7 +22,7 @@ let "${stdenv.targetPlatform.config}-"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = targetPrefix + basename; # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 0d78cfbbab8..6548e964397 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -13,7 +13,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bossa-1.8"; src = fetchgit { diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 0577165bcff..4eeb61a7edd 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -30,7 +30,7 @@ let ccache = stdenv.mkDerivation rec { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = {unwrappedCC, extraConfig}: stdenv.mkDerivation rec { + links = {unwrappedCC, extraConfig}: stdenv.mkDerivation { name = "ccache-links"; passthru = { isClang = unwrappedCC.isClang or false; diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix index 4170570e08a..956a8df69ce 100644 --- a/pkgs/development/tools/misc/chrpath/default.nix +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "chrpath-0.16"; src = fetchurl { diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index daf39318432..e1b89d07cdf 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -5,7 +5,7 @@ let pname = "circleci-cli"; version = "0.1.2569"; in -buildGoPackage rec { +buildGoPackage { name = "${pname}-${version}"; inherit version; diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 02d480cf2cd..c43509a4f43 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -14,7 +14,7 @@ let stdenv = llvmPackages.stdenv; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cquery"; version = "2018-10-14"; diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index a1c9e85a83a..5bccea9ced8 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoconf, popt, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dbench-2013-01-01"; src = fetchgit { diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index afe9b59e012..ab2ab0de9cf 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gnum4-1.4.18"; src = fetchurl { diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 77d4c5771f9..b8fa02306c4 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, elfutils, libunwind }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ltrace-0.7.3"; src = fetchurl { diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index ce62634e7d7..518d128890a 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "macdylibbundler"; version = "20180825"; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index af3b45a8e62..8af12170798 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -2,7 +2,7 @@ assert stdenv ? glibc; -perlPackages.buildPerlPackage rec { +perlPackages.buildPerlPackage { pname = "ninka"; version = "2.0-pre"; diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index c0e7a3653a8..7bfff632826 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -3,7 +3,7 @@ let version = "20130503"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "prelink"; inherit version; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 7b6048eb475..e2d507ab801 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql , libaio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "sysbench-1.0.17"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index 29d809b5f05..fb38d096ab4 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ version = "3.8"; pname = "tet"; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 613fd2673d5..7741f2d4ffb 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -8,7 +8,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "texinfo-${optionalString interactive "interactive-"}${version}"; inherit version; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 68409a59f37..bad3ecd9241 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "universal-ctags"; version = "unstable-2019-07-30"; diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index e2ea96cd590..e1726efc40c 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; - env = bundlerEnv rec { + env = bundlerEnv { name = "watson-ruby-gems-${version}"; inherit ruby; # expects Gemfile, Gemfile.lock and gemset.nix in the same directory diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 6edf6551b06..caecad4b678 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "787"; pname = "xc3sprog"; - src = fetchsvn rec { + src = fetchsvn { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx"; rev = "${version}"; diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index 1424b8fe197..04827fade70 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "xxdiff-5.0b1"; src = fetchFromBitbucket { diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index b409009b524..12f0b13a660 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -5,7 +5,7 @@ , fixDarwinDylibNames, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ycmd"; version = "2018-09-20"; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 689b7da8802..6e0014b3773 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -9,7 +9,7 @@ let sha256 = "1mk8pv0g2xg9m0gsb96plbh6mc24xrlyrmnqac5mlbl4637l4q95"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nailgun"; inherit version; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index 06945f10eb2..b07ab21fdf1 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -30,7 +30,7 @@ let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = '' sys.symlinkDir=INSTALLDIR/bin ''; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "neoload-4.1.4"; src = fetchurl ( diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index 081e86c44dd..068028c7da9 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "nrpl"; version = "20150522"; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 159260750a2..90d74414308 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -26,7 +26,7 @@ let param = } ; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "${pname}-${param.version}"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix index 90e88979de4..d1ff9eee817 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix @@ -2,7 +2,7 @@ , ocaml-migrate-parsetree, ppx_tools_versioned, uchar }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 65afee16afb..5c8f4377e8d 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -3,7 +3,7 @@ , js_of_ocaml, ocaml_lwt, lwt_log }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-lwt"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 4b2b14d317b..344352467e9 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -2,7 +2,7 @@ , ocamlbuild }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-ocamlbuild"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 277973afba8..3adad22bd9c 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -3,7 +3,7 @@ , js_of_ocaml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-ppx"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 5b5f7d18f79..2ff9ddbcf9e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -2,7 +2,7 @@ , js_of_ocaml, ppx_deriving }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-ppx_deriving_json"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index c24162cccf7..c39c985183a 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -3,7 +3,7 @@ , js_of_ocaml, reactivedata, tyxml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "js_of_ocaml-tyxml"; inherit (js_of_ocaml-compiler) version src installPhase meta; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 90b092f0e4b..04aeab5f431 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocamlmod, ocamlify }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.4.10"; pname = "ocaml-oasis"; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index dbf33424439..91e2e67eaf1 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ocamlmod"; version = "0.0.9"; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 0ed7312660a..cf5372bdc20 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -2,7 +2,7 @@ let version = "1.99.19-beta"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocp-build-${version}"; diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index 87490bcb617..53482598f13 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -43,7 +43,7 @@ let sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 763642e5da1..df4c0f2d12c 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -59,7 +59,7 @@ let sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s"; }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "opam"; version = "2.0.5"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index b10b7bdae57..4a8a9da28a7 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # derivation of just runtime deps so env vars created by # setup-hooks can be saved for use at runtime - runtime = stdenv.mkDerivation rec { + runtime = stdenv.mkDerivation { pname = "utop-runtime-env"; inherit version; diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index 137f56bee59..cc33b675954 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -7,7 +7,7 @@ , qtscript }: -mkDerivation rec { +mkDerivation { pname = "ofono-phonesim"; version = "unstable-2014-04-22"; diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index f2915333427..af295eb242f 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.2.3"; - src = fetchurl rec { + src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; sha256 = "1jlb0wps6311dmhnphn64gv46z0bl8grch4fd9dcx5dlib02lh96"; }; diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index 7e09b0a8cd3..e555f1d5985 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flex-2.5.35"; src = fetchurl { diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index 3a46c6c8f01..fc2c7699583 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, bison, m4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flex-2.6.1"; src = fetchurl { diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index d41c113821a..e10fe49b1e4 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, glib, pkgconfig, python, scons }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hammer"; version = "e7aa734"; diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index aa7b63dafea..009ebe8e2ff 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -15,7 +15,7 @@ let }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "lemon"; version = "1.69"; diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index 6d6a02ab49f..77c1df6f43e 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,6 +1,6 @@ { buildGoModule, fetchFromGitHub, lib }: -buildGoModule rec { +buildGoModule { pname = "protoc-gen-doc-unstable"; version = "2019-04-22"; diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index b5dfe3c8bfd..060875924d8 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -91,7 +91,7 @@ typeshed = stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = "cp -r $src $out"; }; -in python3.pkgs.buildPythonApplication rec { +in python3.pkgs.buildPythonApplication { pname = "pyre-check"; version = pyre-version; src = pyre-src; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 1b3bc7a2162..c8f7ccb18d5 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -11,7 +11,7 @@ let # Fetch clang from qt vendor, this contains submodules like this: # clang<-clang-tools-extra<-clazy. - clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: rec { + clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: { src = fetchgit { url = "https://code.qt.io/clang/clang.git"; rev = "c12b012bb7465299490cf93c2ae90499a5c417d5"; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 6af444c7ce0..d9433f535da 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "quicktemplate"; version = "unstable-2019-07-08"; goPackagePath = "github.com/valyala/quicktemplate"; diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index a2ab9a47a79..d92003a575e 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, openssh }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rdocker"; version = "unstable-2018-07-17"; diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index 51801864796..e4762796c18 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ronn"; version = env.gems.ronn.version; - env = bundlerEnv rec { + env = bundlerEnv { name = "ronn-gems"; gemdir = ./.; }; diff --git a/pkgs/development/tools/rubocop/default.nix b/pkgs/development/tools/rubocop/default.nix index 5d965fc87a7..9a6393977d7 100644 --- a/pkgs/development/tools/rubocop/default.nix +++ b/pkgs/development/tools/rubocop/default.nix @@ -1,6 +1,6 @@ { lib, bundlerEnv, ruby, bundlerUpdateScript }: -bundlerEnv rec { +bundlerEnv { pname = "rubocop"; inherit ruby; diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index bd8a013fe2d..ab70552c2e8 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -16,7 +16,7 @@ let outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; buildInputs = [ jdk makeWrapper deps ]; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 79afb54bfb7..1f789a6ade5 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -16,7 +16,7 @@ let outputHash = "1k5qn0w6hqql8yqhlma67ilp8hf0xwxwkzvwg8bkky1jvsapjsl5"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${baseName}-${version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix index 05f7805a55a..9a87f5f9369 100644 --- a/pkgs/development/tools/scry/default.nix +++ b/pkgs/development/tools/scry/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, crystal, shards, llvm, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "scry"; version = "0.8.0"; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index 82b6d7e1161..27e87d212e6 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -16,7 +16,7 @@ let }; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit name; inherit version; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 786cac68425..e7b21c40f17 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -19,7 +19,7 @@ let goPackagePath = "github.com/containers/skopeo"; in -buildGoPackage rec { +buildGoPackage { pname = "skopeo"; inherit version; inherit src goPackagePath; diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index d24c3e88b8c..e26431b2687 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "statik"; version = "unstable-2019-07-31"; goPackagePath = "github.com/rakyll/statik"; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 3a7221e99eb..74f1f22426f 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -2,7 +2,7 @@ , boost, doxygen, openssl, mysql, postgresql, graphviz, loki , qscintilla, qtbase, qttools }: -mkDerivation rec { +mkDerivation { pname = "tora"; version = "3.2.176"; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 0ca7e37ef70..895cedd7010 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -22,7 +22,7 @@ let ver = "2018.3.0"; build = "f2"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "unity-editor"; version = "${ver}x${build}"; diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index e8173a6b5b0..df0c360f75c 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -7,7 +7,7 @@ , fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "vgo2nix"; version = "unstable-2019-02-06"; goPackagePath = "github.com/adisbladis/vgo2nix"; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index b0768ca4b7e..e6dccbd332e 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -7,7 +7,7 @@ , fetchpatch }: -mkDerivation rec { +mkDerivation { pname = "vogl"; version = "2016-05-13"; diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 0874c9e5515..8090aca5ff3 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -15,7 +15,7 @@ let rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3"; sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "xcbuild"; # Once a version is released that includes diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index ece440c692f..f31a119bb65 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +buildGoPackage { pname = "yaml2json"; version = "unstable-2017-05-03"; goPackagePath = "github.com/bronze1man/yaml2json"; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 82e4402361d..f5989390c4b 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -406,7 +406,7 @@ in rec { ''; }; - fixup_yarn_lock = stdenv.mkDerivation rec { + fixup_yarn_lock = stdenv.mkDerivation { name = "fixup_yarn_lock"; buildInputs = [ nodejs ]; |