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 | |
parent | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (diff) |
treewide: remove redundant rec
Diffstat (limited to 'pkgs/development')
877 files changed, 998 insertions, 1001 deletions
diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index e35444ed516e8..7bb779d1d1387 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -1,7 +1,7 @@ { androidenv, buildPackages, pkgs, targetPackages }: -rec { +{ "18b" = let ndkVersion = "18.1.5063045"; diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix index 45186914604dd..280fd496650cd 100644 --- a/pkgs/development/arduino/platformio/default.nix +++ b/pkgs/development/arduino/platformio/default.nix @@ -4,7 +4,7 @@ let callPackage = newScope self; - self = rec { + self = { platformio-chrootenv = callPackage ./chrootenv.nix { }; }; diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix index 18abe1055b5ba..6edee5d8bc65f 100644 --- a/pkgs/development/beam-modules/pgsql/default.nix +++ b/pkgs/development/beam-modules/pgsql/default.nix @@ -6,7 +6,7 @@ let buildInputs = [ drv ]; }; - pkg = self: buildRebar3 rec { + pkg = self: buildRebar3 { name = "pgsql"; version = "25+beta.2"; diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index 4de7e3cc01ea3..b6695029f34cb 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -6,7 +6,7 @@ let buildInputs = [ drv ]; }; - pkg = self: stdenv.mkDerivation rec { + pkg = self: stdenv.mkDerivation { name = "webdriver"; version = "0.0.0+build.18.7ceaf1f"; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 0e88e9c9798ef..03857627952d5 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -6,7 +6,7 @@ sourcePerArch: }: let cpuName = stdenv.hostPlatform.parsed.cpu.name; - result = stdenv.mkDerivation rec { + result = stdenv.mkDerivation { name = if sourcePerArch.packageType == "jdk" then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index 65f0481a8010e..235ec40903915 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }: -haskellPackages.mkDerivation rec { +haskellPackages.mkDerivation { pname = "carp"; version = "unstable-2018-09-15"; diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index 91c163fd343a9..03a5cec500412 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "clean-3.0"; src = diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index dab724ea607c4..9a01519a88124 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, runtimeShell }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cmdstan-2.17.1"; src = fetchurl { diff --git a/pkgs/development/compilers/fasm/default.nix b/pkgs/development/compilers/fasm/default.nix index 4b20c4051a82e..f17d18bf92a62 100644 --- a/pkgs/development/compilers/fasm/default.nix +++ b/pkgs/development/compilers/fasm/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fasm-bin, isx86_64 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (fasm-bin) version src meta; pname = "fasm"; diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index eca2cba7775fa..f00a8b6efc91e 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoconf, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gambit-bootstrap"; version = "4.9.3"; diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 1c3df80645a8a..f4f63bc9b19f1 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -7,7 +7,7 @@ assert stdenv.cc.isGNU ; assert stdenv.cc ? libc ; assert stdenv.cc.libc != null ; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gcl"; version = "2.6.13pre50"; diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 1534e6d1d08eb..18b2407a90baf 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation (rec { name = "D5123.diff"; sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; }) - (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; name = "loadpluginsinmodules.diff"; sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index c859a34729d0d..d68c6ab5d5910 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation (rec { name = "D5123.diff"; sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; }) - (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; name = "loadpluginsinmodules.diff"; sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 804edabba0c26..b78f5bc2204cd 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ - (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; name = "loadpluginsinmodules.diff"; sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index e9c303b88b6e6..ba0bbb1962b81 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -61,7 +61,7 @@ let inherit (bootPkgs) ghc; -in mkDerivation (rec { +in mkDerivation ({ pname = "ghcjs"; inherit version; src = ghcjsSrc; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 7e11c75e07dcc..0ae038d471388 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -2,7 +2,7 @@ let generic = { version, sha256, prePatch }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "haxe"; inherit version; diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix index b2db09e1c182f..a9613de91eb96 100644 --- a/pkgs/development/compilers/jwasm/default.nix +++ b/pkgs/development/compilers/jwasm/default.nix @@ -2,7 +2,7 @@ , cmake }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "jwasm"; version = "git-2017-11-22"; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 754ab020d51e6..90dc20fcd3ea9 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,7 +2,7 @@ let version = "1.3.41"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; pname = "kotlin"; diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 4f766e5f9a5c5..44610a1b11d3d 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -2,7 +2,7 @@ let version = "3.5.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 95632a45999db..fc53ad266a65d 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -17,7 +17,7 @@ , enableSharedLibraries ? !stdenv.isDarwin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "llvm"; inherit version; diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index b66284152d496..7c965926f2ee6 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 5fe681185b2d7..bca8e7877aca8 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -16,7 +16,7 @@ , enableSharedLibraries ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "llvm"; inherit version; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index af65fd6388eae..9d82aa230357a 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 74e9b8719d1d3..0213741e3e064 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index ea70382d2ac71..392ef42790964 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -23,7 +23,7 @@ let imap (i: _: concatStringsSep "." (take i parts)) parts; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 9660be4df11f9..c87b0f235961d 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index e3015ae8448da..03d8a2085d0b7 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 23b7bf4e2461a..efe2022bedba1 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -21,7 +21,7 @@ let imap (i: _: concatStringsSep "." (take i parts)) parts; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index da2a5cfb58aec..4cf79e79569ca 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,6 +1,6 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 906baa4ae6460..658068cbfaff1 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index e104d051fed79..2586602d73784 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -25,7 +25,7 @@ let imap (i: _: concatStringsSep "." (take i parts)) parts; in -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn"; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index e9cc6dfc1dbe1..0912435327cef 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,5 +1,5 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 7f99cc9ae2cdb..621a246225d72 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -111,7 +111,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith rec { + lldClangNoCompilerRt = wrapCCWith { cc = tools.clang-unwrapped; bintools = wrapBintoolsWith { inherit (tools) bintools; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index fc9e3714db0cf..7a0716a6eb386 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index a9caa88141a6b..cfcda02b41319 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -29,7 +29,7 @@ let let parts = splitString "." release_version; in imap (i: _: concatStringsSep "." (take i parts)) parts; -in stdenv.mkDerivation (rec { +in stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v"; diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 1f216178b558d..936c877d58c9b 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -1,5 +1,5 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index f864e24acfef9..36d7a14142b46 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -145,7 +145,7 @@ let '' + mkExtraBuildCommands cc; }; - lldClangNoCompilerRt = wrapCCWith rec { + lldClangNoCompilerRt = wrapCCWith { cc = tools.clang-unwrapped; libcxx = null; bintools = wrapBintoolsWith { diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index e0bc9e816f508..8ec1c419748d8 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version , enableShared ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libc++"; inherit version; diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 6799a3f935f5d..70e666ba27dec 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -27,7 +27,7 @@ let shortVersion = with stdenv.lib; concatStringsSep "." (take 1 (splitString "." release_version)); -in stdenv.mkDerivation (rec { +in stdenv.mkDerivation ({ name = "llvm-${version}"; src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24"; diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 1c0bdf479871c..6e0716659c79e 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -2,7 +2,7 @@ let rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "manticore"; version = "2018.09.29"; diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix index 3c748e2dff7de..cb6edb2a546dc 100644 --- a/pkgs/development/compilers/mono/4.nix +++ b/pkgs/development/compilers/mono/4.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { +callPackage ./generic.nix ({ inherit Foundation libobjc; version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; diff --git a/pkgs/development/compilers/mono/5.nix b/pkgs/development/compilers/mono/5.nix index 0db13308a5af3..0ecb362acb4de 100644 --- a/pkgs/development/compilers/mono/5.nix +++ b/pkgs/development/compilers/mono/5.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { +callPackage ./generic.nix ({ inherit Foundation libobjc; version = "5.20.1.27"; sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy"; diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix index ec91d7e979c1a..0157fa7b7f688 100644 --- a/pkgs/development/compilers/mono/6.nix +++ b/pkgs/development/compilers/mono/6.nix @@ -1,6 +1,6 @@ { callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { +callPackage ./generic.nix ({ inherit Foundation libobjc; version = "6.0.0.313"; srcArchiveSuffix = "tar.xz"; diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 193e45bf55ebd..36a457125fad2 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -13,7 +13,7 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "llvm"; version = "3.6-mono-2017-02-15"; diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index aa6cf68d2c969..6362f360f7dab 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { major_version = "4"; minor_version = "01"; patch_version = "0"; diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix index 9ac53f567909e..4773f9f74a5a1 100644 --- a/pkgs/development/compilers/ocaml/4.02.nix +++ b/pkgs/development/compilers/ocaml/4.02.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { major_version = "4"; minor_version = "02"; patch_version = "3"; diff --git a/pkgs/development/compilers/ocaml/4.03.nix b/pkgs/development/compilers/ocaml/4.03.nix index c9536c487d054..0bbe823304199 100644 --- a/pkgs/development/compilers/ocaml/4.03.nix +++ b/pkgs/development/compilers/ocaml/4.03.nix @@ -1,4 +1,4 @@ -import ./generic.nix rec { +import ./generic.nix { major_version = "4"; minor_version = "03"; patch_version = "0"; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 0085739147bfa..9557d0a79aebb 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -30,7 +30,7 @@ let x11inc = x11env + "/include"; in -stdenv.mkDerivation (args // rec { +stdenv.mkDerivation (args // { inherit name; inherit version; diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 881748c36ea78..aa50cf225cacc 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xlibsWrapper, ncurses }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ pname = "metaocaml"; version = "3.09-alpha-30"; diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix index 31e3800a6c9cf..b1e95bb704cbb 100644 --- a/pkgs/development/compilers/openspin/default.nix +++ b/pkgs/development/compilers/openspin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openspin"; version = "unstable-2018-10-02"; diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix index 7885582ad1257..67d444428e928 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "28"; pname = "pforth"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index acccc749686ce..06202901563e4 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -18,7 +18,7 @@ let in rec { - rustc = stdenv.mkDerivation rec { + rustc = stdenv.mkDerivation { name = "rustc-${versionType}-${version}"; inherit version; @@ -64,7 +64,7 @@ rec { setupHooks = ./setup-hook.sh; }; - cargo = stdenv.mkDerivation rec { + cargo = stdenv.mkDerivation { name = "cargo-${versionType}-${version}"; inherit version; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index e000edad49b67..2bf2722818b98 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -3,7 +3,7 @@ , CoreFoundation, Security }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { name = "cargo-${rustc.version}"; inherit (rustc) version src; diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 2b8fcbe0ba4ba..56b70f21d4c72 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, rustc, Security, patchelf }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { name = "clippy-${rustc.version}"; inherit (rustc) version src; diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 470611242e073..942e23c6170d9 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -2,7 +2,7 @@ , openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv , CoreFoundation, Security }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "rls"; inherit (rustPlatform.rust.rustc) src version; diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 0d2a10b6a9982..9c777cc75728e 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -2,38 +2,38 @@ let options = rec { - x86_64-darwin = rec { + x86_64-darwin = { version = "1.2.11"; system = "x86-64-darwin"; sha256 = "0lh4gpvi8hl6g6b9321g5pwh8sk3218i7h4lx7p3vd9z0cf3lz85"; }; - x86_64-linux = rec { + x86_64-linux = { version = "1.3.16"; system = "x86-64-linux"; sha256 = "0sq2dylwwyqfwkbdvcgqwz3vay9v895zpb0fyzsiwy31d1x9pr2s"; }; - i686-linux = rec { + i686-linux = { version = "1.2.7"; system = "x86-linux"; sha256 = "07f3bz4br280qvn85i088vpzj9wcz8wmwrf665ypqx181pz2ai3j"; }; - aarch64-linux = rec { + aarch64-linux = { version = "1.3.16"; system = "arm64-linux"; sha256 = "0q1brz9c49xgdljzfx8rpxxnlwhadxkcy5kg0mcd9wnxygind1cl"; }; - armv7l-linux = rec { + armv7l-linux = { version = "1.2.14"; system = "armhf-linux"; sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5"; }; armv6l-linux = armv7l-linux; - x86_64-freebsd = rec { + x86_64-freebsd = { version = "1.2.7"; system = "x86-64-freebsd"; sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6"; }; - x86_64-solaris = rec { + x86_64-solaris = { version = "1.2.7"; system = "x86-64-solaris"; sha256 = "05c12fmac4ha72k1ckl6i780rckd7jh4g5s5hiic7fjxnf1kx8d0"; diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index efcaf56110d2f..f6b732f02aeb7 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -2,7 +2,7 @@ bison, flex, libGLU, pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "seexpr"; version = "2.11"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index c9b4f9639d07f..6f1156897db9f 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "serpent"; # I can't find any version numbers, so we're just using the date diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index f21b2ae3cb80f..c9698fcad9b45 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -131,7 +131,7 @@ let extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "swift-${version_friendly}"; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index d5f0dcbec29f5..f3ff864f81b13 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -20,7 +20,7 @@ let inherit (stdenv.lib) optionalString concatMapStringsSep; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}"; src = fetchFromGitLab { diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix index 3196592da4850..5f812e2c46323 100644 --- a/pkgs/development/compilers/wcc/default.nix +++ b/pkgs/development/compilers/wcc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, capstone, libbfd, libelf, libiberty, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "wcc-unstable"; version = "2018-04-05"; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index f0e0693d12c4f..15ee5f403bc32 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -23,7 +23,7 @@ let xorg.libXt xorg.libXrender stdenv.cc.cc ])); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version openjdk platform hash extension; pname = "zulu"; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index d4c4c1f0ac31d..90b28d3183167 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -23,7 +23,7 @@ let xorg.libXt xorg.libXrender stdenv.cc.cc ])); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version openjdk platform hash extension; pname = "zulu"; diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index d58f65102190d..4e75b9407dee4 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -8,7 +8,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-Cheerios-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 4fe86c3fae185..5df96519e7ff6 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -8,7 +8,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-InfSeqExt-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index ed8c7ec6a69dd..b996128948027 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -14,7 +14,7 @@ let params = sha256 = "0fri4nih40vfb0fbr82dsi631ydkw48xszinq43lyinpknf54y17"; }; - "8.8" = rec { + "8.8" = { version = "20190311"; rev = "22af9e9a223d0038f05638654422e637e863b355"; sha256 = "00rnr19lg6lg0haq1sy4ld38p7imzand6fc52fvfq27gblxkp2aq"; @@ -31,7 +31,7 @@ in let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-QuickChick-${param.version}"; diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index e33b9427223ec..2e4d12478b795 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -8,7 +8,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-StructTact-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index e7371b6bbf579..92c9b2569ca45 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -23,7 +23,7 @@ let params = param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-Velisarios-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index 00d088a4a92c3..d2e9660a630e2 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -13,7 +13,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-verdi-${param.version}"; src = fetchFromGitHub { diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index d69eddf75a2e9..fb45e591ec1a1 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -25,7 +25,7 @@ let params = { param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-bignums"; diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index e16a873ddc1d8..025a67a1e70b1 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -22,7 +22,7 @@ let param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-category-theory-${param.version}"; diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index b8a34c49417bc..e9263fb2be1e4 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -29,7 +29,7 @@ let params = param = params.${coq.coq-version}; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "coq${coq.coq-version}-coq-haskell-${param.version}"; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 2b653cdaa2640..6798236591c43 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -73,7 +73,7 @@ let custom-version = if is-released then mathcomp-version else "custom"; # the base set of attributes for mathcomp - attrs = rec { + attrs = { name = "coq${coq.coq-version}-${pkgname}-${custom-version}"; # used in ssreflect @@ -136,7 +136,7 @@ mathcompCorePkgs_1_9 = mathcompGen "1.9.0"; mathcompCorePkgs = recurseIntoAttrs (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version)); -in rec { +in { # mathcompGenSingle: given a version of mathcomp # generates an attribute set {single = <drv>;} with the single mathcomp derivation inherit mathcompGenSingle; diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 29d63f1d00486..cde9146f78c65 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, mlton }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ceptre-2016-11-27"; src = fetchgit { diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index 918c577356cd8..c70bfd9406e09 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "6.30"; pname = "clips"; src = fetchurl { diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index ab8e616ac6d5f..0e9d81d5e9599 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -126,7 +126,7 @@ let # packageJSON=./package.json; getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit version; pname = "lumo"; diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix index d32f91275652b..229c42d9f7b24 100644 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.5.3"; sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5"; minimumOTPVersion = "18"; diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index 73afcbd1597e8..94dffd1f763d0 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.6.6"; sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl"; minimumOTPVersion = "19"; diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index adbbbaff890ba..10ebd5438a110 100644 --- a/pkgs/development/interpreters/elixir/1.7.nix +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.7.4"; sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla"; minimumOTPVersion = "19"; diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix index e240e1907e061..931fa50b1f725 100644 --- a/pkgs/development/interpreters/elixir/1.8.nix +++ b/pkgs/development/interpreters/elixir/1.8.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.8.2"; sha256 = "1n77cpcl2b773gmj3m9s24akvj9gph9byqbmj2pvlsmby4aqwckq"; minimumOTPVersion = "20"; diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix index 41601eeaa1183..b9b2400b78b97 100644 --- a/pkgs/development/interpreters/elixir/1.9.nix +++ b/pkgs/development/interpreters/elixir/1.9.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "1.9.1"; sha256 = "106s2a3dykc5iwfrd5icqd737yfzaz1dw4x5v1j5z2fvf46h96dx"; minimumOTPVersion = "20"; diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index c263551de2dae..11637868ed0f4 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -1,6 +1,6 @@ { pkgs, mkDerivation }: -mkDerivation rec { +mkDerivation { baseName = "erlang"; version = "16B02.basho10"; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 58b7fd71f0be8..e9d9366851ebf 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -21,7 +21,7 @@ let sha256 = "1cj9fjhdng6yllajjm3gkk04ag9bwyb3n70hrb5nk6c292v8a45c"; }; -in mkDerivation rec { +in mkDerivation { version = "18.3.4.8"; sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g"; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 25a3f662565cc..d5f3afe5f3dff 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchpatch }: -mkDerivation rec { +mkDerivation { version = "19.3.6.11"; sha256 = "0b02iv8dly1vkc2xnqqi030sdj34h4gji2h4qgilllajr1f868vm"; diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix index 016e175d6b569..3a33e55767b44 100644 --- a/pkgs/development/interpreters/erlang/R20.nix +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "20.3.8.9"; sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a"; diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index e21bf6dafbff5..fdd034fc6075d 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "21.3.8.3"; sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index a8c05513c5a6f..8b471f6324717 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -1,6 +1,6 @@ { mkDerivation }: -mkDerivation rec { +mkDerivation { version = "22.0.4"; sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai"; diff --git a/pkgs/development/interpreters/falcon/default.nix b/pkgs/development/interpreters/falcon/default.nix index 744a0f76ff092..39d4918a70bf9 100644 --- a/pkgs/development/interpreters/falcon/default.nix +++ b/pkgs/development/interpreters/falcon/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "falcon"; version = "2013-09-19"; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 07ce9347cf708..bba54c83f5c5f 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -8,7 +8,7 @@ let version = "0.10.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromBitbucket { owner = "rude"; diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 7adaca7b86566..1c64c417cb0ca 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -8,7 +8,7 @@ let version = "11.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromBitbucket { owner = "rude"; diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index 0ac1fa30e2f8b..64050ea95f877 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lua5 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.6.2"; pname = "lua-filesystem"; isLibrary = true; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index afd2627d20ecb..e44209799a31d 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -13,7 +13,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "maude"; inherit version; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index cd325c9494897..686cfee19a6dd 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "metamath"; version = "0.172"; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 009f9b48ea4e4..d8e687980aa79 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -2,7 +2,7 @@ let version = "0.9.5.1.1"; in -python2Packages.buildPythonPackage rec { +python2Packages.buildPythonPackage { name = "pyrex-${version}"; src = fetchurl { diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index d79cd58c1598d..21b8a7da06eb0 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -2,7 +2,7 @@ let version = "0.9.6.4"; in -python2Packages.buildPythonPackage rec { +python2Packages.buildPythonPackage { name = "pyrex-${version}"; src = fetchurl { diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index 73d1e0ea9fd78..e27959c05e8d2 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-html-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 54c0954ae5d01..0226f7cd88094 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-pdf-a4-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 059908029c0b3..88d1a69316684 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-pdf-letter-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 53c5aa3b629b3..ea35e9fb6a350 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python27-docs-text-2.7.16"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix index 5a6dcc63225e9..45783eb82632f 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-html-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix index a122d7519f5d0..998af644c718d 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-pdf-a4-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix index 4473f2e351c49..1c6aea5ee3c16 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-pdf-letter-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix index d9d21bfe3a57b..32388780f6ff9 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "python37-docs-text-3.7.2"; src = fetchurl { url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2; diff --git a/pkgs/development/interpreters/python/cpython/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index 4a0c84fb272ef..3cc0c2a9ee855 100644 --- a/pkgs/development/interpreters/python/cpython/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix @@ -2,7 +2,7 @@ { stdenv, fetchurl, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "pythonMAJORMINOR-docs-TYPE-VERSION"; src = fetchurl { url = URL; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 3e86ddef4ed44..8154a87f667d8 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let isPy3k = substring 0 1 pythonVersion == "3"; - passthru = passthruFun rec { + passthru = passthruFun { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index af933f0a4bd05..aa709bdc646d3 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -27,7 +27,7 @@ with stdenv.lib; let isPy3k = majorVersion == "3"; - passthru = passthruFun rec { + passthru = passthruFun { inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index 3b41e14be850b..d49886da8f548 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qnial"; version = "6.3"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 35bd1729866ec..f13adc21d9e6f 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { version = "7.3"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: - fetchurl rec { + fetchurl { url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; inherit sha256; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 47d8397c9668d..c9731331b79e5 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,6 +1,6 @@ { patchSet, useRailsExpress, ops, patchLevel }: -rec { +{ "2.3.8" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index c6c8caa7cf3ef..43f5758e4c495 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, xorg, makeWrapper, ncurses, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self # so that it can be written to when using the Self transposer. Running 'Self' # after installation runs without an image. You can then build a Self image with: diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index e00af6213479a..8f9477c4c4ac4 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,6 +1,6 @@ { stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "spidermonkey"; version = "1.8.5"; diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 1e1ea10ef6dd4..238afd4bd040d 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -2,7 +2,7 @@ let version = "52.9.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "spidermonkey"; inherit version; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 175b2f2e76719..f62638dd83866 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -5,7 +5,7 @@ with stdenv.lib; let version = "60.4.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "spidermonkey"; inherit version; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index d4ec1677bfbcc..3c585c3f07fae 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tcl"; inherit version; diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index 30ea124cf4bb7..bb4a2d01499d0 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, libX11, libXt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "unicon-lang"; version = "11.7"; src = fetchurl { diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 90fc38afa0610..b53b3ed9dbfba 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,6 +1,6 @@ { rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "wasmtime"; version = "20190521"; diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix index e6a2b0cae99d8..e5f4d5f6ee0f0 100644 --- a/pkgs/development/java-modules/apache/ant-launcher.nix +++ b/pkgs/development/java-modules/apache/ant-launcher.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ antLauncher_1_8_2 = map (obj: fetchMaven { version = "1.8.2"; artifactId = "ant-launcher"; diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix index b4a6aa68f4487..5de82b1703b31 100644 --- a/pkgs/development/java-modules/apache/ant.nix +++ b/pkgs/development/java-modules/apache/ant.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ ant_1_8_2 = map (obj: fetchMaven { version = "1.8.2"; artifactId = "ant"; diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix index 050d511b0a106..5cb25a0f379ee 100644 --- a/pkgs/development/java-modules/apache/commons-cli.nix +++ b/pkgs/development/java-modules/apache/commons-cli.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsCli_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "commons-cli"; diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix index 70ce940ccf177..28bb9d381f9eb 100644 --- a/pkgs/development/java-modules/apache/commons-io.nix +++ b/pkgs/development/java-modules/apache/commons-io.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsIo_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "commons-io"; diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix index a2d71e9db0c8c..501da6d204d0e 100644 --- a/pkgs/development/java-modules/apache/commons-lang.nix +++ b/pkgs/development/java-modules/apache/commons-lang.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsLang_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "commons-lang"; diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix index 63f68b925430a..3bbbe9d2e39af 100644 --- a/pkgs/development/java-modules/apache/commons-lang3.nix +++ b/pkgs/development/java-modules/apache/commons-lang3.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsLang3_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "commons-lang3"; diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix index 47750abe46232..befb2003d01c2 100644 --- a/pkgs/development/java-modules/apache/commons-logging-api.nix +++ b/pkgs/development/java-modules/apache/commons-logging-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ commonsLoggingApi_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "commons-logging-api"; diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix index f0614ec99e365..8f7c35b716f9a 100644 --- a/pkgs/development/java-modules/apache/xbean-reflect.nix +++ b/pkgs/development/java-modules/apache/xbean-reflect.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xbeanReflect_3_4 = map (obj: fetchMaven { version = "3.4"; artifactId = "xbean-reflect"; diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix index 41756bb80d507..783fdc8679cc7 100644 --- a/pkgs/development/java-modules/beanshell/bsh.nix +++ b/pkgs/development/java-modules/beanshell/bsh.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ bsh_2_0_b4 = map (obj: fetchMaven { version = "2.0b4"; artifactId = "bsh"; diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix index f8bbc07f10256..3561c0b6e5e1a 100644 --- a/pkgs/development/java-modules/classworlds/classworlds.nix +++ b/pkgs/development/java-modules/classworlds/classworlds.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ classworlds_1_1_alpha2 = map (obj: fetchMaven { version = "1.1-alpha-2"; artifactId = "classworlds"; diff --git a/pkgs/development/java-modules/collections.nix b/pkgs/development/java-modules/collections.nix index 39b274b5030ae..83f7a95af81d1 100644 --- a/pkgs/development/java-modules/collections.nix +++ b/pkgs/development/java-modules/collections.nix @@ -2,7 +2,7 @@ with pkgs.javaPackages; -rec { +{ mavenLibs_2_0_1 = [ mavenArtifact_2_0_1 mavenArtifactManager_2_0_1 diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix index 60aac560b9b2b..6ebca58c44e52 100644 --- a/pkgs/development/java-modules/eclipse/aether-util.nix +++ b/pkgs/development/java-modules/eclipse/aether-util.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ aetherUtil_0_9_0_M2 = map (obj: fetchMaven { version = "0.9.0.M2"; artifactId = "aether-util"; diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix index 2e842410aafbf..7816ab49d6121 100644 --- a/pkgs/development/java-modules/findbugs/jsr305.nix +++ b/pkgs/development/java-modules/findbugs/jsr305.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ findbugsJsr305_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "jsr305"; diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix index ec874c73e365e..b5b4551dd97b9 100644 --- a/pkgs/development/java-modules/google/collections.nix +++ b/pkgs/development/java-modules/google/collections.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ googleCollections_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "google-collections"; diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix index bab9e1b115d0f..73c27c4af8b17 100644 --- a/pkgs/development/java-modules/hamcrest/all.nix +++ b/pkgs/development/java-modules/hamcrest/all.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ hamcrestAll_1_3 = map (obj: fetchMaven { version = "1.3"; artifactId = "hamcrest-all"; diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix index 3842b8c5afa06..4145191fdd91a 100644 --- a/pkgs/development/java-modules/hamcrest/core.nix +++ b/pkgs/development/java-modules/hamcrest/core.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ hamcrestCore_1_3 = map (obj: fetchMaven { version = "1.3"; artifactId = "hamcrest-core"; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index abb549110a87c..d179fb531789f 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -15,7 +15,7 @@ in sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0"; fetchSubmodules = true; }; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { pname = "jogl"; inherit version; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index a7bfa545908ab..6f86cede51200 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -6,7 +6,7 @@ let poms = import (../poms.nix) { inherit fetchMaven; }; collections = import (../collections.nix) { inherit pkgs; }; in rec { - junitGen = { mavenDeps, sha512, version }: mavenbuild rec { + junitGen = { mavenDeps, sha512, version }: mavenbuild { inherit mavenDeps sha512 version; name = "junit-${version}"; diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix index a8b1ea9f02175..e95c0847aacc6 100644 --- a/pkgs/development/java-modules/log4j/default.nix +++ b/pkgs/development/java-modules/log4j/default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ log4j_1_2_12 = map (obj: fetchMaven { version = "1.2.12"; artifactId = "log4j"; diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index 7ebe655580e50..3a289c9c9c4ae 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -5,11 +5,11 @@ let name = "${artifactId}-${version}"; m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; m2File = "${name}${suffix}.${type}"; - src = fetchurl rec { + src = fetchurl { inherit sha512; url = "mirror://maven/${m2Path}/${m2File}"; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { inherit name m2Path m2File src; installPhase = '' diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index f3d5fb3e9342e..b8e128ac728cd 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -5,7 +5,7 @@ with pkgs.javaPackages; let poms = import ../poms.nix { inherit fetchMaven; }; in rec { - mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild rec { + mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild { inherit mavenDeps sha512 version skipTests quiet; name = "maven-hello-${version}"; diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix index f63c91cd360a8..c1fab1e9bc970 100644 --- a/pkgs/development/java-modules/maven-minimal.nix +++ b/pkgs/development/java-modules/maven-minimal.nix @@ -8,7 +8,7 @@ let fetchMaven = pkgs.callPackage ./m2install.nix { }; plugins = import ./mavenPlugins.nix { inherit pkgs; }; poms = import ./poms.nix { inherit fetchMaven; }; -in rec { +in { # Maven needs all of these to function mavenMinimal = flatten collections.mavenLibs_2_0_6 diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix index 14c5a99d42ff0..9965f86f72bd2 100644 --- a/pkgs/development/java-modules/maven/archiver.nix +++ b/pkgs/development/java-modules/maven/archiver.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArchiver_2_5 = map (obj: fetchMaven { version = "2.5"; artifactId = "maven-archiver"; diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix index 0796d0665103b..5bf3ef01bc65d 100644 --- a/pkgs/development/java-modules/maven/artifact-manager.nix +++ b/pkgs/development/java-modules/maven/artifact-manager.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArtifactManager_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-artifact-manager"; diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix index bb0e578d5d638..80e3392abd2f6 100644 --- a/pkgs/development/java-modules/maven/artifact.nix +++ b/pkgs/development/java-modules/maven/artifact.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenArtifact_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-artifact"; diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix index 948dbc3baf6c7..8c3886679919a 100644 --- a/pkgs/development/java-modules/maven/common-artifact-filters.nix +++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven { version = "1.2"; artifactId = "maven-common-artifact-filters"; diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix index 5b45f89e9d54a..a1ea9292a513c 100644 --- a/pkgs/development/java-modules/maven/core.nix +++ b/pkgs/development/java-modules/maven/core.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenCore_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-core"; diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix index 00d089ea249bb..aa3a93849c257 100644 --- a/pkgs/development/java-modules/maven/dependency-tree.nix +++ b/pkgs/development/java-modules/maven/dependency-tree.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenDependencyTree_2_1 = map (obj: fetchMaven { version = "2.1"; artifactId = "maven-dependency-tree"; diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix index 9fa1051cd80ba..8314abe4924fc 100644 --- a/pkgs/development/java-modules/maven/doxia-sink-api.nix +++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven { version = "1.0-alpha-6"; artifactId = "doxia-sink-api"; diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix index 014f678bc1491..c7a1d212e0e5f 100644 --- a/pkgs/development/java-modules/maven/enforcer.nix +++ b/pkgs/development/java-modules/maven/enforcer.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenEnforcerApi_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; artifactId = "enforcer-api"; diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix index 80cbf993a60de..f16f10462ff25 100644 --- a/pkgs/development/java-modules/maven/error-diagnostics.nix +++ b/pkgs/development/java-modules/maven/error-diagnostics.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-error-diagnostics"; diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix index 963d6c6b646dc..f1e2e551cee2e 100644 --- a/pkgs/development/java-modules/maven/filtering.nix +++ b/pkgs/development/java-modules/maven/filtering.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenFiltering_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-filtering"; diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix index 2ae3bfe6034c7..147b15b6e400e 100644 --- a/pkgs/development/java-modules/maven/model.nix +++ b/pkgs/development/java-modules/maven/model.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenModel_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-model"; diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix index ce6c7c1769411..609745e94229f 100644 --- a/pkgs/development/java-modules/maven/monitor.nix +++ b/pkgs/development/java-modules/maven/monitor.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenMonitor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-monitor"; diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix index f852cc957a56b..bf8d608488e87 100644 --- a/pkgs/development/java-modules/maven/plugin-annotations.nix +++ b/pkgs/development/java-modules/maven/plugin-annotations.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginAnnotations_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "maven-plugin-annotations"; diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix index be9642b0e2069..55fb0d2c5ddf4 100644 --- a/pkgs/development/java-modules/maven/plugin-api.nix +++ b/pkgs/development/java-modules/maven/plugin-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-api"; diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix index dbdc09a46734f..7f5c22fe3b3a6 100644 --- a/pkgs/development/java-modules/maven/plugin-descriptor.nix +++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-descriptor"; diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix index 9e11c0f408294..4ff07574dc925 100644 --- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix +++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-parameter-documenter"; diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix index f0074ef816ed7..a7bb92e645d35 100644 --- a/pkgs/development/java-modules/maven/plugin-registry.nix +++ b/pkgs/development/java-modules/maven/plugin-registry.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginRegistry_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-plugin-registry"; diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix index a65f19620485e..4cd32d508f331 100644 --- a/pkgs/development/java-modules/maven/plugin-testing-harness.nix +++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenPluginTestingHarness_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-plugin-testing-harness"; diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix index 6940fafae8219..c40f87f1c45d8 100644 --- a/pkgs/development/java-modules/maven/profile.nix +++ b/pkgs/development/java-modules/maven/profile.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenProfile_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-profile"; diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix index 0b07d8b8679bb..fad53a0250b36 100644 --- a/pkgs/development/java-modules/maven/project.nix +++ b/pkgs/development/java-modules/maven/project.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenProject_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-project"; diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix index 8a508cf150532..87999d452fc4f 100644 --- a/pkgs/development/java-modules/maven/reporting-api.nix +++ b/pkgs/development/java-modules/maven/reporting-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenReportingApi_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-reporting-api"; diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix index 443a1acd4513d..0d8f55737b771 100644 --- a/pkgs/development/java-modules/maven/repository-metadata.nix +++ b/pkgs/development/java-modules/maven/repository-metadata.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-repository-metadata"; diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix index 6b42082cfd8a9..09e0170945d5e 100644 --- a/pkgs/development/java-modules/maven/settings.nix +++ b/pkgs/development/java-modules/maven/settings.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSettings_2_0_1 = map (obj: fetchMaven { version = "2.0.1"; artifactId = "maven-settings"; diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix index 67c44986d0a02..9fa74f8bfe773 100644 --- a/pkgs/development/java-modules/maven/shared-incremental.nix +++ b/pkgs/development/java-modules/maven/shared-incremental.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSharedIncremental_1_1 = map (obj: fetchMaven { version = "1.1"; artifactId = "maven-shared-incremental"; diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix index b3cfc92809145..38addcfe8aa9d 100644 --- a/pkgs/development/java-modules/maven/shared-utils.nix +++ b/pkgs/development/java-modules/maven/shared-utils.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSharedUtils_0_1 = map (obj: fetchMaven { version = "0.1"; artifactId = "maven-shared-utils"; diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix index c1f7fcc3f76c1..9ad284365d95d 100644 --- a/pkgs/development/java-modules/maven/surefire-api.nix +++ b/pkgs/development/java-modules/maven/surefire-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireApi_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-api"; diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix index b62aa86bf45c3..41f9848d5cd9b 100644 --- a/pkgs/development/java-modules/maven/surefire-booter.nix +++ b/pkgs/development/java-modules/maven/surefire-booter.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireBooter_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-booter"; diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix index bc0573f6b7066..2f4617eff8c09 100644 --- a/pkgs/development/java-modules/maven/surefire-common.nix +++ b/pkgs/development/java-modules/maven/surefire-common.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireCommon_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "maven-surefire-common"; diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix index 1374080d0874e..d67177d80d23c 100644 --- a/pkgs/development/java-modules/maven/surefire-junit4.nix +++ b/pkgs/development/java-modules/maven/surefire-junit4.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "surefire-junit4"; diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix index 864d3b98f7ba1..91f8fdb77a419 100644 --- a/pkgs/development/java-modules/maven/toolchain.nix +++ b/pkgs/development/java-modules/maven/toolchain.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mavenToolchain_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "maven-toolchain"; diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix index 8cc79dc1d228a..e481f5d250a34 100644 --- a/pkgs/development/java-modules/mavenPlugins.nix +++ b/pkgs/development/java-modules/mavenPlugins.nix @@ -5,7 +5,7 @@ with pkgs.javaPackages; let fetchMaven = pkgs.callPackage ./m2install.nix { }; -in rec { +in { inherit fetchMaven; animalSniffer_1_11 = map (obj: fetchMaven { @@ -19,7 +19,7 @@ in rec { { type = "jar"; sha512 = "24dih4wp7p1rddvxcznlz42yxhqlln5ljdbvwnp75rsyf3ng25zv881ixk5qx8canr1lxx4kh22kwkaahz3qnw54fqn7w5z58m5768n"; } ]; - mavenClean_2_5 = map (obj: fetchMaven rec { + mavenClean_2_5 = map (obj: fetchMaven { version = "2.5"; artifactId = "maven-clean-plugin"; groupId = "org.apache.maven.plugins"; @@ -30,7 +30,7 @@ in rec { { type = "jar"; sha512 = "2fprppwpmzyvaynadm6slk382khlpf5s8sbi5x249qcaw2vkg5n77q79lgq981v9kjlr5wighjzpjqv8gdig45m2p37mcfwsy3jsv89"; } ]; - mavenCompiler_3_1 = map (obj: fetchMaven rec { + mavenCompiler_3_1 = map (obj: fetchMaven { version = "3.1"; artifactId = "maven-compiler-plugin"; groupId = "org.apache.maven.plugins"; @@ -41,7 +41,7 @@ in rec { { type = "jar"; sha512 = "1dvq13yc8yacxr66pkvwwd4cvx0jln8dv9fh5gmd5vir05h8l5j4y324r1bklnzpx0ancs5ad8z944zgmpaq3w195kfsarmndp0gv2y"; } ]; - mavenEnforcer_1_3_1 = map (obj: fetchMaven rec { + mavenEnforcer_1_3_1 = map (obj: fetchMaven { version = "1.3.1"; artifactId = "maven-enforcer-plugin"; groupId = "org.apache.maven.plugins"; @@ -52,7 +52,7 @@ in rec { { type = "jar"; sha512 = "15sb9qmxgbq82nzc9x66152va121vf33nn0ah2g4z169cv6jnjq05gk1472k59imypvwsh9hd3hqi9q6g8d0sawgk5l1ax900cx7n25"; } ]; - mavenInstall_2_4 = map (obj: fetchMaven rec { + mavenInstall_2_4 = map (obj: fetchMaven { version = "2.4"; artifactId = "maven-install-plugin"; groupId = "org.apache.maven.plugins"; @@ -63,7 +63,7 @@ in rec { { type = "jar"; sha512 = "35hbj5hbz085y1dxfmza6m207kn68q2g1k5a9mc75i9pj8fww7xm7xzcdv81xyxjm3r4qbqf1izlg16l99b93rfii9rg8kqz8mxqmb6"; } ]; - mavenJar_2_4 = map (obj: fetchMaven rec { + mavenJar_2_4 = map (obj: fetchMaven { version = "2.4"; artifactId = "maven-jar-plugin"; groupId = "org.apache.maven.plugins"; @@ -74,7 +74,7 @@ in rec { { type = "jar"; sha512 = "0frbikq8jm5pynlmv51k349kiaipd9jsrh6970313s0g6n4i0ws9vi232wc1mjrc3d27k63xqmb97jzgbbc6q337ypv5vil1ql9wh0d"; } ]; - mavenReplacer_1_5_3 = map (obj: fetchMaven rec { + mavenReplacer_1_5_3 = map (obj: fetchMaven { version = "1.5.3"; artifactId = "replacer"; groupId = "com.google.code.maven-replacer-plugin"; @@ -85,7 +85,7 @@ in rec { { type = "jar"; sha512 = "0f2rngcxpll0iigv115132fld5n6shjfn7m981sg7mdzlj75q2h5knd4x1ip33w60cm1j0rmqaxp1y6qn76ykvhprdyy9smiy667l9x"; } ]; - mavenResources_2_6 = map (obj: fetchMaven rec { + mavenResources_2_6 = map (obj: fetchMaven { version = "2.6"; artifactId = "maven-resources-plugin"; groupId = "org.apache.maven.plugins"; @@ -96,7 +96,7 @@ in rec { { type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; } ]; - mavenSurefire_2_12_4 = map (obj: fetchMaven rec { + mavenSurefire_2_12_4 = map (obj: fetchMaven { version = "2.12.4"; artifactId = "maven-surefire-plugin"; groupId = "org.apache.maven.plugins"; @@ -107,7 +107,7 @@ in rec { { type = "jar"; sha512 = "2sjq2l8i97h3ay8wwrsi75cfs9d1im5ar2sn2zv4q6xsv4v3hh5y481l9xwc5dnbcfdjs38ald0z60pxpcyiqrng6h69s2ws8fhb0mm"; } ]; - mavenSurefire_2_17 = map (obj: fetchMaven rec { + mavenSurefire_2_17 = map (obj: fetchMaven { version = "2.17"; artifactId = "maven-surefire-plugin"; groupId = "org.apache.maven.plugins"; diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix index dd9b1d1b0aa52..221e59f766b9e 100644 --- a/pkgs/development/java-modules/mojo/animal-sniffer.nix +++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mojoAnimalSniffer_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "animal-sniffer"; diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix index 245daa5fdb900..f6f7e490c7cf3 100644 --- a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix +++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "java-boot-classpath-detector"; diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix index 08d18745ed7fb..92418d8c61941 100644 --- a/pkgs/development/java-modules/ow2/asm-all.nix +++ b/pkgs/development/java-modules/ow2/asm-all.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ ow2AsmAll_4_0 = map (obj: fetchMaven { version = "4.0"; artifactId = "asm-all"; diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix index 384b92859762e..41a334007e8f4 100644 --- a/pkgs/development/java-modules/plexus/archiver.nix +++ b/pkgs/development/java-modules/plexus/archiver.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusArchiver_1_0_alpha7 = map (obj: fetchMaven { version = "1.0-alpha-7"; artifactId = "plexus-archiver"; diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix index c417c955b69ba..b362f905091e2 100644 --- a/pkgs/development/java-modules/plexus/build-api.nix +++ b/pkgs/development/java-modules/plexus/build-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusBuildApi_0_0_4 = map (obj: fetchMaven { version = "0.0.4"; artifactId = "plexus-build-api"; diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix index 6ff1755e8f536..7cb6c3dbf558e 100644 --- a/pkgs/development/java-modules/plexus/classworlds.nix +++ b/pkgs/development/java-modules/plexus/classworlds.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusClassworlds_2_2_2 = map (obj: fetchMaven { version = "2.2.2"; artifactId = "plexus-classworlds"; diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix index 11baab0950d05..a1c6556a76998 100644 --- a/pkgs/development/java-modules/plexus/compiler-api.nix +++ b/pkgs/development/java-modules/plexus/compiler-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerApi_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-api"; diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix index a42064a0e9e80..d86240b6d45b8 100644 --- a/pkgs/development/java-modules/plexus/compiler-javac.nix +++ b/pkgs/development/java-modules/plexus/compiler-javac.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerJavac_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-javac"; diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix index f7221a96627fb..3f27981b15405 100644 --- a/pkgs/development/java-modules/plexus/compiler-manager.nix +++ b/pkgs/development/java-modules/plexus/compiler-manager.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusCompilerManager_2_2 = map (obj: fetchMaven { version = "2.2"; artifactId = "plexus-compiler-manager"; diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix index fd3fc80e7e05a..89ae778e762fa 100644 --- a/pkgs/development/java-modules/plexus/component-annotations.nix +++ b/pkgs/development/java-modules/plexus/component-annotations.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven { version = "1.5.5"; artifactId = "plexus-component-annotations"; diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix index 375a1913afcda..79d8ac1087b45 100644 --- a/pkgs/development/java-modules/plexus/container-default.nix +++ b/pkgs/development/java-modules/plexus/container-default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven { version = "1.0-alpha-9"; artifactId = "plexus-container-default"; diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix index be2013a267608..a9c80c146c9b5 100644 --- a/pkgs/development/java-modules/plexus/digest.nix +++ b/pkgs/development/java-modules/plexus/digest.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusDigest_1_0 = map (obj: fetchMaven { version = "1.0"; artifactId = "plexus-digest"; diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix index 5b34cde0503c2..0b016a7bd493f 100644 --- a/pkgs/development/java-modules/plexus/i18n.nix +++ b/pkgs/development/java-modules/plexus/i18n.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusI18n_1_0_beta6 = map (obj: fetchMaven { version = "1.0-beta-6"; artifactId = "plexus-i18n"; diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix index 8ada106f48fdd..378fa76d8c62a 100644 --- a/pkgs/development/java-modules/plexus/interactivity-api.nix +++ b/pkgs/development/java-modules/plexus/interactivity-api.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven { version = "1.0-alpha-4"; artifactId = "plexus-interactivity-api"; diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix index 90ff3de6a3fec..f2813e103f5c6 100644 --- a/pkgs/development/java-modules/plexus/interpolation.nix +++ b/pkgs/development/java-modules/plexus/interpolation.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusInterpolation_1_11 = map (obj: fetchMaven { version = "1.11"; artifactId = "plexus-interpolation"; diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix index eee41f5ed2fda..e2cfd4b5882d0 100644 --- a/pkgs/development/java-modules/plexus/io.nix +++ b/pkgs/development/java-modules/plexus/io.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusIo_2_0_2 = map (obj: fetchMaven { version = "2.0.2"; artifactId = "plexus-io"; diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix index ce0537cea7d82..c52425342b0e7 100644 --- a/pkgs/development/java-modules/plexus/utils.nix +++ b/pkgs/development/java-modules/plexus/utils.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ plexusUtils_1_0_4 = map (obj: fetchMaven { version = "1.0.4"; artifactId = "plexus-utils"; diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix index 610f98a7e466a..d93edb7aa4fd3 100644 --- a/pkgs/development/java-modules/poms.nix +++ b/pkgs/development/java-modules/poms.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ aether_0_9_0_M2 = fetchMaven { version = "0.9.0.M2"; artifactId = "aether"; diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix index 51a004ed5451d..e4d0e1f98d4a1 100644 --- a/pkgs/development/java-modules/sisu/guice.nix +++ b/pkgs/development/java-modules/sisu/guice.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuGuice_2_9_4 = map (obj: fetchMaven { version = "2.9.4"; artifactId = "sisu-guice"; diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix index bca16ccd114ca..22d3582608a32 100644 --- a/pkgs/development/java-modules/sisu/inject-bean.nix +++ b/pkgs/development/java-modules/sisu/inject-bean.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuInjectBean_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; artifactId = "sisu-inject-bean"; diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix index 0a181dc1a1ecf..aee624c551c99 100644 --- a/pkgs/development/java-modules/sisu/inject-plexus.nix +++ b/pkgs/development/java-modules/sisu/inject-plexus.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ sisuInjectPlexus_2_1_1 = map (obj: fetchMaven { version = "2.1.1"; artifactId = "sisu-inject-plexus"; diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix index 11295b3128fdd..2ea05581d0d3f 100644 --- a/pkgs/development/java-modules/xerces/impl.nix +++ b/pkgs/development/java-modules/xerces/impl.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xercesImpl_2_8_0 = map (obj: fetchMaven { version = "2.8.0"; artifactId = "xercesImpl"; diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix index a96e3670b4012..871629dbf3c2f 100644 --- a/pkgs/development/java-modules/xml-apis/default.nix +++ b/pkgs/development/java-modules/xml-apis/default.nix @@ -1,6 +1,6 @@ { fetchMaven }: -rec { +{ xmlApis_1_3_03 = map (obj: fetchMaven { version = "1.3.03"; artifactId = "xml-apis"; diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index fcb708c829bef..94b36b855f25f 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, xorg, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "AntTweakBar-1.16"; buildInputs = [ unzip xorg.libX11 libGLU_combined ]; diff --git a/pkgs/development/libraries/SDL_gpu/default.nix b/pkgs/development/libraries/SDL_gpu/default.nix index dc88b7b12ef39..f15009c2f5d9e 100644 --- a/pkgs/development/libraries/SDL_gpu/default.nix +++ b/pkgs/development/libraries/SDL_gpu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, SDL2, libGLU }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "SDL_gpu-unstable"; version = "2019-01-24"; diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 7b8fb67a30f1f..66fa8888fd195 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "SDL_sixel"; version = "1.2-nightly"; diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 307f57d20cf5b..22f1566ad0ace 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -2,7 +2,7 @@ # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "appstream-qt"; inherit (appstream) version src prePatch; diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 4b8093f74031c..17093deae00fc 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -19,7 +19,7 @@ let sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "argp-standalone-1.3"; src = fetchurl { diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 992119faf65ec..fa9a45f1ed3cb 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -160,7 +160,7 @@ in rec { ### Languages - af = buildOfficialDict rec { + af = buildOfficialDict { language = "af"; version = "0.50-0"; fullName = "Afrikaans"; @@ -168,7 +168,7 @@ in rec { sha256 = "00p6k2ndi0gzfr5fkbvx4hkcpj223pidjvmxg0r384arrap00q4x"; }; - am = buildOfficialDict rec { + am = buildOfficialDict { language = "am"; version = "0.03-1"; fullName = "Amharic"; @@ -176,7 +176,7 @@ in rec { sha256 = "11ylp7gjq94wfacyawvp391lsq26rl1b84f268rjn7l7z0hxs9xz"; }; - ar = buildOfficialDict rec { + ar = buildOfficialDict { language = "ar"; version = "1.2-0"; fullName = "Arabic"; @@ -184,7 +184,7 @@ in rec { sha256 = "1avw40bp8yi5bnkq64ihm2rldgw34lk89yz281q9bmndh95a47h4"; }; - ast = buildOfficialDict rec { + ast = buildOfficialDict { language = "ast"; version = "0.01"; fullName = "Asturian"; @@ -192,7 +192,7 @@ in rec { sha256 = "14hg85mxcyvdigf96yvslk7f3v9ngdsxn85qpgwkg31k3k83xwj3"; }; - az = buildOfficialDict rec { + az = buildOfficialDict { language = "az"; version = "0.02-0"; fullName = "Azerbaijani"; @@ -200,7 +200,7 @@ in rec { sha256 = "1hs4h1jscpxf9f9iyk6mvjqsnhkf0yslkbjhjkasqqcx8pn7cc86"; }; - be = buildOfficialDict rec { + be = buildOfficialDict { language = "be"; version = "0.01"; fullName = "Belarusian"; @@ -208,7 +208,7 @@ in rec { sha256 = "1svls9p7rsfi3hs0afh0cssj006qb4v1ik2yzqgj8hm10c6as2sm"; }; - bg = buildOfficialDict rec { + bg = buildOfficialDict { language = "bg"; version = "4.1-0"; fullName = "Bulgarian"; @@ -216,7 +216,7 @@ in rec { sha256 = "1alacmgpfk0yrgq83y23d16fhav1bxmb98kg8d2a5r9bvh2h0mvl"; }; - bn = buildOfficialDict rec { + bn = buildOfficialDict { language = "bn"; version = "0.01.1-1"; fullName = "Bengali"; @@ -224,7 +224,7 @@ in rec { sha256 = "1nc02jd67iggirwxnhdvlvaqm0xfyks35c4psszzj3dhzv29qgxh"; }; - br = buildOfficialDict rec { + br = buildOfficialDict { language = "br"; version = "0.50-2"; fullName = "Breton"; @@ -232,7 +232,7 @@ in rec { sha256 = "0fradnm8424bkq9a9zhpl2132dk7y95xmw45sy1c0lx6rinjl4n2"; }; - ca = buildOfficialDict rec { + ca = buildOfficialDict { language = "ca"; version = "2.1.5-1"; fullName = "Catalan"; @@ -240,7 +240,7 @@ in rec { sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb"; }; - cs = buildOfficialDict rec { + cs = buildOfficialDict { language = "cs"; version = "20040614-1"; fullName = "Czech"; @@ -248,7 +248,7 @@ in rec { sha256 = "0rihj4hsw96pd9casvmpvw3r8040pfa28p1h73x4vyn20zwr3h01"; }; - csb = buildOfficialDict rec { + csb = buildOfficialDict { language = "csb"; version = "0.02-0"; fullName = "Kashubian"; @@ -256,7 +256,7 @@ in rec { sha256 = "1612ypkm684wjvc7n081i87mlrrzif9simc7kyn177hfsl3ssrn1"; }; - cy = buildOfficialDict rec { + cy = buildOfficialDict { language = "cy"; version = "0.50-3"; fullName = "Welsh"; @@ -264,7 +264,7 @@ in rec { sha256 = "15vq601lzz1gi311xym4bv9lv1k21xcfn50jmzamw7h6f36rsffm"; }; - da = buildOfficialDict rec { + da = buildOfficialDict { language = "da"; version = "1.4.42-1"; fullName = "Danish"; @@ -272,7 +272,7 @@ in rec { sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp"; }; - de = buildOfficialDict rec { + de = buildOfficialDict { language = "de"; version = "20030222-1"; fullName = "German"; @@ -280,7 +280,7 @@ in rec { sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s"; }; - de-alt = buildOfficialDict rec { + de-alt = buildOfficialDict { language = "de-alt"; version = "2.1-1"; fullName = "German - Old Spelling"; @@ -288,7 +288,7 @@ in rec { sha256 = "0wwc2l29svv3fv041fh6vfa5m3hi9q9pkbxibzq1ysrsfin3rl9n"; }; - el = buildOfficialDict rec { + el = buildOfficialDict { language = "el"; version = "0.08-0"; fullName = "Greek"; @@ -296,7 +296,7 @@ in rec { sha256 = "1ljcc30zg2v2h3w5h5jr5im41mw8jbsgvvhdd2cii2yzi8d0zxja"; }; - en = buildOfficialDict rec { + en = buildOfficialDict { language = "en"; version = "2018.04.16-0"; fullName = "English"; @@ -304,7 +304,7 @@ in rec { sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; }; - eo = buildOfficialDict rec { + eo = buildOfficialDict { language = "eo"; version = "2.1.20000225a-2"; fullName = "Esperanto"; @@ -312,7 +312,7 @@ in rec { sha256 = "09vf0mbiicbmyb4bwb7v7lgpabnylg0wy7m3hlhl5rjdda6x3lj1"; }; - es = buildOfficialDict rec { + es = buildOfficialDict { language = "es"; version = "1.11-2"; fullName = "Spanish"; @@ -320,7 +320,7 @@ in rec { sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd"; }; - et = buildOfficialDict rec { + et = buildOfficialDict { language = "et"; version = "0.1.21-1"; fullName = "Estonian"; @@ -328,7 +328,7 @@ in rec { sha256 = "0jdjfa2fskirhnb70fy86xryp9r6gkl729ib8qcjmsma7nm5gs5i"; }; - fa = buildOfficialDict rec { + fa = buildOfficialDict { language = "fa"; version = "0.11-0"; fullName = "Persian"; @@ -336,7 +336,7 @@ in rec { sha256 = "0nz1ybwv56q7nl9ip12hfmdch1vyyq2j55bkjcns13lshzm2cba8"; }; - fi = buildOfficialDict rec { + fi = buildOfficialDict { language = "fi"; version = "0.7-0"; fullName = "Finnish"; @@ -344,7 +344,7 @@ in rec { sha256 = "07d5s08ba4dd89cmwy9icc01i6fjdykxlb9ravmhdrhi8mxz1mzq"; }; - fo = buildOfficialDict rec { + fo = buildOfficialDict { language = "fo"; version = "0.2.16-1"; fullName = "Faroese"; @@ -352,7 +352,7 @@ in rec { sha256 = "022yz5lll20xrzizcyb7wksm3fgwklnvgnir5la5qkxv770dvq7p"; }; - fr = buildOfficialDict rec { + fr = buildOfficialDict { language = "fr"; version = "0.50-3"; fullName = "French"; @@ -360,7 +360,7 @@ in rec { sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr"; }; - fy = buildOfficialDict rec { + fy = buildOfficialDict { language = "fy"; version = "0.12-0"; fullName = "Frisian"; @@ -368,7 +368,7 @@ in rec { sha256 = "1almi6n4ni91d0rzrk8ig0473m9ypbwqmg56hchz76j51slwyirl"; }; - ga = buildOfficialDict rec { + ga = buildOfficialDict { language = "ga"; version = "4.5-0"; fullName = "Irish"; @@ -376,7 +376,7 @@ in rec { sha256 = "0y869mmvfb3bzadfgajwa2rfb0xfhi6m9ydwgxkb9v2claydnps5"; }; - gd = buildOfficialDict rec { + gd = buildOfficialDict { language = "gd"; version = "0.1.1-1"; fullName = "Scottish Gaelic"; @@ -384,7 +384,7 @@ in rec { sha256 = "0a89irv5d65j5m9sb0k36851x5rs0wij12gb2m6hv2nsfn5a05p3"; }; - gl = buildOfficialDict rec { + gl = buildOfficialDict { language = "gl"; version = "0.5a-2"; fullName = "Galician"; @@ -392,7 +392,7 @@ in rec { sha256 = "12pwghmy18fcdvf9hvhb4q6shi339hb1kwxpkz0bhw0yjxjwzkdk"; }; - grc = buildOfficialDict rec { + grc = buildOfficialDict { language = "grc"; version = "0.02-0"; fullName = "Ancient Greek"; @@ -400,7 +400,7 @@ in rec { sha256 = "1zxr8958v37v260fkqd4pg37ns5h5kyqm54hn1hg70wq5cz8h512"; }; - gu = buildOfficialDict rec { + gu = buildOfficialDict { language = "gu"; version = "0.03-0"; fullName = "Gujarati"; @@ -408,7 +408,7 @@ in rec { sha256 = "04c38jnl74lpj2jhjz4zpqbs2623vwc71m6wc5h4b1karid14b23"; }; - gv = buildOfficialDict rec { + gv = buildOfficialDict { language = "gv"; version = "0.50-0"; fullName = "Manx Gaelic"; @@ -416,7 +416,7 @@ in rec { sha256 = "1rknf4yaw9s29c77sdzg98nhnmjwpicdb69igmz1n768npz2drmv"; }; - he = buildOfficialDict rec { + he = buildOfficialDict { language = "he"; version = "1.0-0"; fullName = "Hebrew"; @@ -424,7 +424,7 @@ in rec { sha256 = "13bhbghx5b8g0119g3wxd4n8mlf707y41vlf59irxjj0kynankfn"; }; - hi = buildOfficialDict rec { + hi = buildOfficialDict { language = "hi"; version = "0.02-0"; fullName = "Hindi"; @@ -432,7 +432,7 @@ in rec { sha256 = "0drs374qz4419zx1lf2k281ydxf2750jk5ailafj1x0ncz27h1ys"; }; - hil = buildOfficialDict rec { + hil = buildOfficialDict { language = "hil"; version = "0.11-0"; fullName = "Hiligaynon"; @@ -440,7 +440,7 @@ in rec { sha256 = "1s482fsfhzic9qa80al4418q3ni3gfn2bkwkd2y46ydrs17kf2jp"; }; - hr = buildOfficialDict rec { + hr = buildOfficialDict { language = "hr"; version = "0.51-0"; fullName = "Croatian"; @@ -448,7 +448,7 @@ in rec { sha256 = "09aafyf1vqhaxvcf3jfzf365k394b5pf0iivsr2ix5npah1h7i1a"; }; - hsb = buildOfficialDict rec { + hsb = buildOfficialDict { language = "hsb"; version = "0.02-0"; fullName = "Upper Sorbian"; @@ -456,7 +456,7 @@ in rec { sha256 = "0bi2vhz7n1vmg43wbbh935pmzihv80iyz9z65j94lxf753j2m7wd"; }; - hu = buildOfficialDict rec { + hu = buildOfficialDict { language = "hu"; version = "0.99.4.2-0"; fullName = "Hungarian"; @@ -464,7 +464,7 @@ in rec { sha256 = "1d9nybip2k1dz69zly3iv0npbi3yxgfznh1py364nxzrbjsafd9k"; }; - hus = buildOfficialDict rec { + hus = buildOfficialDict { language = "hus"; version = "0.03-1"; fullName = "Huastec"; @@ -472,7 +472,7 @@ in rec { sha256 = "09glipfpkz9xch17z11zw1yn2z7jx1f2svfmjn9l6wm1s5qz6a3d"; }; - hy = buildOfficialDict rec { + hy = buildOfficialDict { language = "hy"; version = "0.10.0-0"; fullName = "Armenian"; @@ -480,7 +480,7 @@ in rec { sha256 = "1w5wq8lfl2xp1nid30b1j5qmya4vjyidq0vpr4y3gf53jc08vsid"; }; - ia = buildOfficialDict rec { + ia = buildOfficialDict { language = "ia"; version = "0.50-1"; fullName = "Interlingua"; @@ -488,7 +488,7 @@ in rec { sha256 = "0bqcpgsa72pga24fv4fkw38b4qqdvqsw97jvzvw7q03dc1cwp5sp"; }; - id = buildOfficialDict rec { + id = buildOfficialDict { language = "id"; version = "1.2-0"; fullName = "Indonesian"; @@ -496,7 +496,7 @@ in rec { sha256 = "023knfg0q03f7y5w6xnwa1kspnrcvcnky8xvdms93n2850414faj"; }; - is = buildOfficialDict rec { + is = buildOfficialDict { language = "is"; version = "0.51.1-0"; fullName = "Icelandic"; @@ -504,7 +504,7 @@ in rec { sha256 = "1mp3248lhbr13cj7iq9zs7h5ix0dcwlprp5cwrkcwafrv8lvsd9h"; }; - it = buildOfficialDict rec { + it = buildOfficialDict { language = "it"; version = "2.2_20050523-0"; fullName = "Italian"; @@ -512,7 +512,7 @@ in rec { sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v"; }; - kn = buildOfficialDict rec { + kn = buildOfficialDict { language = "kn"; version = "0.01-1"; fullName = "Kannada"; @@ -520,7 +520,7 @@ in rec { sha256 = "10sk0wx4x4ds1403kf9dqxv9yjvh06w8qqf4agx57y0jlws0n0fb"; }; - ku = buildOfficialDict rec { + ku = buildOfficialDict { language = "ku"; version = "0.20-1"; fullName = "Kurdi"; @@ -528,7 +528,7 @@ in rec { sha256 = "09va98krfbgdaxl101nmd85j3ysqgg88qgfcl42c07crii0pd3wn"; }; - ky = buildOfficialDict rec { + ky = buildOfficialDict { language = "ky"; version = "0.01-0"; fullName = "Kirghiz"; @@ -536,7 +536,7 @@ in rec { sha256 = "0kzv2syjnnn6pnwx0d578n46hg2l0j62977al47y6wabnhjjy3z1"; }; - la = buildOfficialDict rec { + la = buildOfficialDict { language = "la"; version = "20020503-0"; fullName = "Latin"; @@ -544,7 +544,7 @@ in rec { sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl"; }; - lt = buildOfficialDict rec { + lt = buildOfficialDict { language = "lt"; version = "1.2.1-0"; fullName = "Lithuanian"; @@ -552,7 +552,7 @@ in rec { sha256 = "1asjck911l96q26zj36lmz0jp4b6pivvrf3h38zgc8lc85p3pxgn"; }; - lv = buildOfficialDict rec { + lv = buildOfficialDict { language = "lv"; version = "0.5.5-1"; fullName = "Latvian"; @@ -560,7 +560,7 @@ in rec { sha256 = "12pvs584a6437ijndggdqpp5s7d0w607cimpkxsjwasnx83f4c1w"; }; - mg = buildOfficialDict rec { + mg = buildOfficialDict { language = "mg"; version = "0.03-0"; fullName = "Malagasy"; @@ -568,7 +568,7 @@ in rec { sha256 = "0hdhbk9b5immjp8l5h4cy82gwgsqzcqbb0qsf7syw333w4rgi0ji"; }; - mi = buildOfficialDict rec { + mi = buildOfficialDict { language = "mi"; version = "0.50-0"; fullName = "Maori"; @@ -576,7 +576,7 @@ in rec { sha256 = "12bxplpd348yx8d2q8qvahi9dlp7qf28qmanzhziwc7np8rixvmy"; }; - mk = buildOfficialDict rec { + mk = buildOfficialDict { language = "mk"; version = "0.50-0"; fullName = "Macedonian"; @@ -584,7 +584,7 @@ in rec { sha256 = "0wcr9n882xi5b7a7ln1hnhq4vfqd5gpqqp87v01j0gb7zf027z0m"; }; - ml = buildOfficialDict rec { + ml = buildOfficialDict { language = "ml"; version = "0.03-1"; fullName = "Malayalam"; @@ -592,7 +592,7 @@ in rec { sha256 = "1zcn4114gwia085fkz77qk13z29xrbp53q2qvgj2cvcbalg5bkg4"; }; - mn = buildOfficialDict rec { + mn = buildOfficialDict { language = "mn"; version = "0.06-2"; fullName = "Mongolian"; @@ -600,7 +600,7 @@ in rec { sha256 = "150j9y5c9pw80fwp5rzl5q31q9vjbxixaqljkfwxjb5q93fnw6rg"; }; - mr = buildOfficialDict rec { + mr = buildOfficialDict { language = "mr"; version = "0.10-0"; fullName = "Marathi"; @@ -608,7 +608,7 @@ in rec { sha256 = "0cvgb2l40sppqbi842ivpznsh2xzp1d4hxc371dll8z0pr05m8yk"; }; - ms = buildOfficialDict rec { + ms = buildOfficialDict { language = "ms"; version = "0.50-0"; fullName = "Malay"; @@ -616,7 +616,7 @@ in rec { sha256 = "0vr4vhipcfhsxqfs8dim2ph7iiixn22gmlmlb375bx5hgd9y7i1w"; }; - mt = buildOfficialDict rec { + mt = buildOfficialDict { language = "mt"; version = "0.50-0"; fullName = "Maltese"; @@ -624,7 +624,7 @@ in rec { sha256 = "1d2rl1nlfjq6rfywblvx8m88cyy2x0mzc0mshzbgw359c2nwl3z0"; }; - nb = buildOfficialDict rec { + nb = buildOfficialDict { language = "nb"; version = "0.50.1-0"; fullName = "Norwegian Bokmal"; @@ -632,7 +632,7 @@ in rec { sha256 = "12i2bmgdnlkzfinb20j2a0j4a20q91a9j8qpq5vgabbvc65nwx77"; }; - nds = buildOfficialDict rec { + nds = buildOfficialDict { language = "nds"; version = "0.01-0"; fullName = "Low Saxon"; @@ -640,7 +640,7 @@ in rec { sha256 = "1nkjhwzn45dizi89d19q4bqyd87cim8xyrgr655fampgkn31wf6f"; }; - nl = buildOfficialDict rec { + nl = buildOfficialDict { language = "nl"; version = "0.50-2"; fullName = "Dutch"; @@ -652,7 +652,7 @@ in rec { ''; }; - nn = buildOfficialDict rec { + nn = buildOfficialDict { language = "nn"; version = "0.50.1-1"; fullName = "Norwegian Nynorsk"; @@ -660,7 +660,7 @@ in rec { sha256 = "0w2k5l5rbqpliripgqwiqixz5ghnjf7i9ggbrc4ly4vy1ia10rmc"; }; - ny = buildOfficialDict rec { + ny = buildOfficialDict { language = "ny"; version = "0.01-0"; fullName = "Chichewa"; @@ -668,7 +668,7 @@ in rec { sha256 = "0gjb92vcg60sfgvrm2f6i89sfkgb179ahvwlgs649fx3dc7rfvqp"; }; - or = buildOfficialDict rec { + or = buildOfficialDict { language = "or"; version = "0.03-1"; fullName = "Oriya"; @@ -676,7 +676,7 @@ in rec { sha256 = "0kzj9q225z0ccrlbkijsrafy005pbjy14qcnxb6p93ciz1ls7zyn"; }; - pa = buildOfficialDict rec { + pa = buildOfficialDict { language = "pa"; version = "0.01-1"; fullName = "Punjabi"; @@ -684,7 +684,7 @@ in rec { sha256 = "0if93zk10pyrs38wwj3vpcdm01h51m5z9gm85h3jxrpgqnqspwy7"; }; - pl = buildOfficialDict rec { + pl = buildOfficialDict { language = "pl"; version = "6.0_20061121-0"; fullName = "Polish"; @@ -692,7 +692,7 @@ in rec { sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1"; }; - pt_BR = buildOfficialDict rec { + pt_BR = buildOfficialDict { language = "pt_BR"; version = "20090702-0"; fullName = "Brazilian Portuguese"; @@ -700,7 +700,7 @@ in rec { sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; }; - pt_PT = buildOfficialDict rec { + pt_PT = buildOfficialDict { language = "pt_PT"; version = "20070510-0"; fullName = "Portuguese"; @@ -708,7 +708,7 @@ in rec { sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; }; - qu = buildOfficialDict rec { + qu = buildOfficialDict { language = "qu"; version = "0.02-0"; fullName = "Quechua"; @@ -716,7 +716,7 @@ in rec { sha256 = "009z0zsvzq7r3z3m30clyibs94v77b92h5lmzmzxlns2p0lpd5w0"; }; - ro = buildOfficialDict rec { + ro = buildOfficialDict { language = "ro"; version = "3.3-2"; fullName = "Romanian"; @@ -724,7 +724,7 @@ in rec { sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; }; - ru = buildOfficialDict rec { + ru = buildOfficialDict { language = "ru"; version = "0.99f7-1"; fullName = "Russian"; @@ -732,7 +732,7 @@ in rec { sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw"; }; - rw = buildOfficialDict rec { + rw = buildOfficialDict { language = "rw"; version = "0.50-0"; fullName = "Kinyarwanda"; @@ -740,7 +740,7 @@ in rec { sha256 = "10gh8g747jbrvfk2fn3pjxy1nhcfdpwgmnvkmrp4nd1k1qp101il"; }; - sc = buildOfficialDict rec { + sc = buildOfficialDict { language = "sc"; version = "1.0"; fullName = "Sardinian"; @@ -748,7 +748,7 @@ in rec { sha256 = "0hl7prh5rccsyljwrv3m1hjcsphyrrywk2qvnj122irbf4py46jr"; }; - sk = buildOfficialDict rec { + sk = buildOfficialDict { language = "sk"; version = "2.01-2"; fullName = "Slovak"; @@ -756,7 +756,7 @@ in rec { sha256 = "19k0m1v5pcf7xr4lxgjkzqkdlks8nyb13bvi1n7521f3i4lhma66"; }; - sl = buildOfficialDict rec { + sl = buildOfficialDict { language = "sl"; version = "0.50-0"; fullName = "Slovenian"; @@ -764,7 +764,7 @@ in rec { sha256 = "1l9kc5g35flq8kw9jhn2n0bjb4sipjs4qkqzgggs438kywkx2rp5"; }; - sr = buildOfficialDict rec { + sr = buildOfficialDict { language = "sr"; version = "0.02"; fullName = "Serbian"; @@ -772,7 +772,7 @@ in rec { sha256 = "12cj01p4nj80cpf7m3s4jsaf0rsfng7s295j9jfchcq677xmhpkh"; }; - sv = buildOfficialDict rec { + sv = buildOfficialDict { language = "sv"; version = "0.51-0"; fullName = "Swedish"; @@ -780,7 +780,7 @@ in rec { sha256 = "02jwkjhr32kvyibnyzgx3smbnm576jwdzg3avdf6zxwckhy5fw4v"; }; - sw = buildOfficialDict rec { + sw = buildOfficialDict { language = "sw"; version = "0.50-0"; fullName = "Swahili"; @@ -788,7 +788,7 @@ in rec { sha256 = "15zjh7hdj2b4dgm5bc12w1ims9q357p1q3gjalspnyn5gl81zmby"; }; - ta = buildOfficialDict rec { + ta = buildOfficialDict { language = "ta"; version = "20040424-1"; fullName = "Tamil"; @@ -796,7 +796,7 @@ in rec { sha256 = "0sj8ygjsyvnr93cs6324y7az7k2vyw7rjxdc9vnm7z60lbqm5xaj"; }; - te = buildOfficialDict rec { + te = buildOfficialDict { language = "te"; version = "0.01-2"; fullName = "Telugu"; @@ -804,7 +804,7 @@ in rec { sha256 = "0pgcgxz7dz34zxp9sb85jjzbg3ky6il5wmhffz6ayrbsfn5670in"; }; - tet = buildOfficialDict rec { + tet = buildOfficialDict { language = "tet"; version = "0.1.1"; fullName = "Tetum"; @@ -812,7 +812,7 @@ in rec { sha256 = "17n0y4fhjak47j9qnqf4m4z6zra6dn72rwhp7ig0hhlgqk4ldmcx"; }; - tk = buildOfficialDict rec { + tk = buildOfficialDict { language = "tk"; version = "0.01-0"; fullName = "Turkmen"; @@ -820,7 +820,7 @@ in rec { sha256 = "02vad4jqhr0xpzqi5q5z7z0xxqccbn8j0c5dhpnm86mnr84l5wl6"; }; - tl = buildOfficialDict rec { + tl = buildOfficialDict { language = "tl"; version = "0.02-1"; fullName = "Tagalog"; @@ -828,7 +828,7 @@ in rec { sha256 = "1kca6k7qnpfvvwjnq5r1n242payqsjy96skmw78m7ww6d0n5vdj8"; }; - tn = buildOfficialDict rec { + tn = buildOfficialDict { language = "tn"; version = "1.0.1-0"; fullName = "Setswana"; @@ -836,7 +836,7 @@ in rec { sha256 = "0q5x7c6z88cn0kkpk7q1craq34g4g03v8x3xcj5a5jia3l7c5821"; }; - tr = buildOfficialDict rec { + tr = buildOfficialDict { language = "tr"; version = "0.50-0"; fullName = "Turkish"; @@ -844,7 +844,7 @@ in rec { sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb"; }; - uk = buildOfficialDict rec { + uk = buildOfficialDict { language = "uk"; version = "1.4.0-0"; fullName = "Ukrainian"; @@ -852,7 +852,7 @@ in rec { sha256 = "137i4njvnslab6l4s291s11xijr5jsy75lbdph32f9y183lagy9m"; }; - uz = buildOfficialDict rec { + uz = buildOfficialDict { language = "uz"; version = "0.6-0"; fullName = "Uzbek"; @@ -860,7 +860,7 @@ in rec { sha256 = "0sg3wlyply1idpq5ypyj7kgnaadaiskci1sqs811yhg2gzyc3092"; }; - vi = buildOfficialDict rec { + vi = buildOfficialDict { language = "vi"; version = "0.01.1-1"; fullName = "Vietnamese"; @@ -868,7 +868,7 @@ in rec { sha256 = "05vwgvf1cj45azhflywx69javqdvqd1f20swrc2d3c32pd9mvn1w"; }; - wa = buildOfficialDict rec { + wa = buildOfficialDict { language = "wa"; version = "0.50-0"; fullName = "Walloon"; @@ -876,7 +876,7 @@ in rec { sha256 = "1r1zwz7xkx40dga9vf5wc9ja3jwk1dkpcr1kaa7wryvslf5al5ss"; }; - yi = buildOfficialDict rec { + yi = buildOfficialDict { language = "yi"; version = "0.01.1-1"; fullName = "Yiddish"; @@ -884,7 +884,7 @@ in rec { sha256 = "0mi842l4038bx3ll2wx9nz44nqrg1x46h5b02zigi1hbbddd6ycq"; }; - zu = buildOfficialDict rec { + zu = buildOfficialDict { language = "zu"; version = "0.50-0"; fullName = "Zulu"; @@ -894,7 +894,7 @@ in rec { ### Jargons - en-computers = buildTxtDict rec { + en-computers = buildTxtDict { shortName = "en-computers"; fullName = "English Computer Jargon"; @@ -913,7 +913,7 @@ in rec { }; }; - en-science = buildTxtDict rec { + en-science = buildTxtDict { shortName = "en-science"; fullName = "English Scientific Jargon"; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 978376eb4fa78..6f10283b07bfb 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lv2-unstable"; version = "2017-07-08"; diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix index f8b1006d2eb78..2ac3115af2aa7 100644 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ b/pkgs/development/libraries/audio/vamp/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsndfile }: -rec { +{ vampSDK = stdenv.mkDerivation { name = "vamp-sdk-2.7.1"; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 9582e54ffacaa..f66d9369c20a4 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -2,7 +2,7 @@ let version = "1.9.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "avro-c"; inherit version; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 05203d6c233ae..af0053519e3d1 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { python3 ]; - passthru.utests = stdenv.mkDerivation rec { + passthru.utests = stdenv.mkDerivation { pname = "beignet-utests"; inherit version src; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 503e4b0fa43b2..62f050cbcb85c 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -22,7 +22,7 @@ let inherit (stdenv.lib) optional optionals; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "blitz++-0.10"; src = fetchurl { url = mirror://sourceforge/blitz/blitz-0.10.tar.gz; diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index 0a38f35af753e..bcb452ea4f866 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.55.0"; patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ]; diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index f4931dfe54740..fb65e49c500c1 100644 --- a/pkgs/development/libraries/boost/1.59.nix +++ b/pkgs/development/libraries/boost/1.59.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.59.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.60.nix b/pkgs/development/libraries/boost/1.60.nix index b6d74234f799b..646f4652f77da 100644 --- a/pkgs/development/libraries/boost/1.60.nix +++ b/pkgs/development/libraries/boost/1.60.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.60.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix index 871ef392c1ae9..a1b3c51d0e692 100644 --- a/pkgs/development/libraries/boost/1.62.nix +++ b/pkgs/development/libraries/boost/1.62.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.62.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix index c4749bc3ee411..a8b459f4b12ff 100644 --- a/pkgs/development/libraries/boost/1.63.nix +++ b/pkgs/development/libraries/boost/1.63.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.63.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix index 1cf9bfa51f4b2..32632f79d2250 100644 --- a/pkgs/development/libraries/boost/1.64.nix +++ b/pkgs/development/libraries/boost/1.64.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.64.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.65.nix b/pkgs/development/libraries/boost/1.65.nix index 9837e1c691930..922c09ba7fe9c 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.65.1"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index b44c1a3823a90..0a99717a79970 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.66.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 406e63b9622b5..a2fe9447c1254 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.67.0"; patches = [ diff --git a/pkgs/development/libraries/boost/1.68.nix b/pkgs/development/libraries/boost/1.68.nix index cd980439b7101..4d98172c6d05f 100644 --- a/pkgs/development/libraries/boost/1.68.nix +++ b/pkgs/development/libraries/boost/1.68.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.68.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix index 959fa851fe22a..95c4aa854a463 100644 --- a/pkgs/development/libraries/boost/1.69.nix +++ b/pkgs/development/libraries/boost/1.69.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.69.0"; src = fetchurl { diff --git a/pkgs/development/libraries/boost/1.70.nix b/pkgs/development/libraries/boost/1.70.nix index 5f7b39c1189eb..45a8bdb931859 100644 --- a/pkgs/development/libraries/boost/1.70.nix +++ b/pkgs/development/libraries/boost/1.70.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.70.0"; src = fetchurl { diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 3c27281571afe..9283f37a8c470 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, premake4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "bootil-unstable-2015-12-17"; meta = { diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 7db73f5ad47c3..67e2794c8a293 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, perl, go }: # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "boringssl"; version = "2017-02-23"; diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index ba7b51bb0e4e9..7710747d8004f 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "brigand"; version = "1.3.0"; diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 97fe7e5129931..8b0901832d11e 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -2,7 +2,7 @@ , Cocoa, OpenGL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bullet"; version = "2019-03-27"; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index d9e69b8e75129..3b7e870b4fe98 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -6,7 +6,7 @@ # The celt codec has been deprecated and is now a part of the opus codec -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "celt"; inherit version; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 80b6480323be5..74fd12ffea268 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,6 +1,6 @@ { fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "coin"; version = "unstable-2019-06-12"; diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index 2585a7abaed1d..dfebccc88e356 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, curl, cmake, nlohmann_json }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cpp-ipfs-api"; version = "2017-01-04"; diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index aa0708daaa7fd..9b6407715df5d 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -3,7 +3,7 @@ let pname = "cxxtest"; version = "4.4"; -in python2Packages.buildPythonApplication rec { +in python2Packages.buildPythonApplication { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 76e30e921ba19..dc668a233b06b 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ]; diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 7894e4c732628..1223cb897e861 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ]; diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index bafca3bd52d23..642054b5a0184 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index 96f7668aa903b..dee07a9637e6f 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ... } @ args: -import ./generic.nix (args // rec { +import ./generic.nix (args // { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; license = stdenv.lib.licenses.agpl3; diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index a6ff37bee97ad..cfc95de155522 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "dyncall"; version = "1.0"; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 566f8bfd8d15c..13617d67bf574 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "elementary-cmake-modules"; version = "0.1.0"; diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index 4fc85aee69f6c..e968e09459a07 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -2,7 +2,7 @@ openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "embree"; version = "2.17.4"; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index ec6f07f0953ab..21f63e07335df 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; version = "0.27.2"; - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index 439342a50b850..f5ef8e850ddc7 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libsixel, yasm }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ffmpeg-sixel"; version = "nightly-2.3.x"; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index bc5de5f9730fa..07dbaeef16546 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -9,7 +9,7 @@ let withDoc = stdenv.cc.isGNU; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "fftw-${precision}-${version}"; src = fetchurl { diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index 0b4172cdc764a..4ac8150274cfc 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, alsaLib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "flite-2.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 2ee0af8cfc131..5b98d6523b9a2 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,7 +1,7 @@ { runCommand, lib, fontconfig, fontDirectories }: runCommand "fc-cache" - rec { + { buildInputs = [ fontconfig.bin ]; preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 100c00eea497b..04903cc5e9eee 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "funambol-client-cpp-9.0.0"; src = fetchurl { diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index b7043b61c8a62..1a3447f6674f1 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -2,7 +2,7 @@ let newtonsoft-json = dotnetPackages.NewtonsoftJson; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "gdata-sharp"; version = "2.2.0.0"; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index d44bcdda9aedd..51e981a2a338e 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; let version = "1.0.22"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gloox"; inherit version; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index e914f9d78eef7..638d483b60e97 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -13,7 +13,7 @@ let sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnu-config"; version = "2019-04-15"; diff --git a/pkgs/development/libraries/gnutls-kdh/3.5.nix b/pkgs/development/libraries/gnutls-kdh/3.5.nix index e245496c63acd..015163b32931a 100644 --- a/pkgs/development/libraries/gnutls-kdh/3.5.nix +++ b/pkgs/development/libraries/gnutls-kdh/3.5.nix @@ -1,6 +1,6 @@ { callPackage, fetchFromGitHub, autoreconfHook, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 812128fb12fb6..8b118fe94834a 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -3,7 +3,7 @@ , glib, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsettings-qt"; version = "0.1.20170824"; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index 0ba3bf354235a..ebaf694f04e95 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-lastfm"; version = "2018-05-07"; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index d9afecc6d0c15..a140859b69315 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -2,7 +2,7 @@ , json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45 , docbook_xsl, glibcLocales, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-oauth"; version = "2018-10-15"; diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index b9eecaf0946f5..af57950ac653f 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, gsignond, gsasl, check , gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gsignond-plugin-sasl"; version = "2018-10-15"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 8acaefcedf463..27036ad86edf9 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -4,7 +4,7 @@ let ver_maj = "0.10"; ver_min = "11"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gstreamermm-${ver_maj}.${ver_min}"; src = fetchurl { diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 6588b8ab44073..1af62e14d8d2b 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -15,7 +15,7 @@ , json-glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gthree"; version = "unstable-2019-08-21"; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 26d0b5c359583..8cf9baa0c9926 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "gtk-mac-integration-2.0.8"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 4fa369e299d24..7fbc1bfe1eaac 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -6,7 +6,7 @@ let mkDict = { name, readmeFile, dictFileName, ... }@args: - stdenv.mkDerivation (rec { + stdenv.mkDerivation ({ inherit name; installPhase = '' # hunspell dicts @@ -542,7 +542,7 @@ in rec { /* ITALIAN */ it_IT = it-it; - it-it = mkDictFromLinguistico rec { + it-it = mkDictFromLinguistico { shortName = "it-it"; dictFileName = "it_IT"; shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico"; @@ -598,7 +598,7 @@ in rec { /* SWEDISH */ sv_SE = sv-se; - sv-se = mkDictFromDSSO rec { + sv-se = mkDictFromDSSO { shortName = "sv-se"; dictFileName = "sv_SE"; shortDescription = "Swedish (Sweden)"; @@ -606,7 +606,7 @@ in rec { # Finlandian Swedish (hello Linus Torvalds) sv_FI = sv-fi; - sv-fi = mkDictFromDSSO rec { + sv-fi = mkDictFromDSSO { shortName = "sv-fi"; dictFileName = "sv_FI"; shortDescription = "Swedish (Finland)"; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 297365be87497..3a642c8837a3e 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -3,7 +3,7 @@ let version = "2.6.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ign-math2"; inherit version; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 31b9a4b0e9f7a..0e7603db58564 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ign-transport"; inherit version; inherit src; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 2beff09d0b4e5..f74477eab3847 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, tcl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "incrtcl"; version = "4.0.4"; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 20a60f1a102db..13c71dc8f7047 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 68e2a7377919d..1f2aeda80cfec 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, ant, jdk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "hydra-ant-logger"; version = "2010.2"; diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 1ebf2c2e21e54..21e3c4d3424eb 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -8,7 +8,7 @@ let sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "kinetic-cpp-client-2015-04-14"; src = fetchgit { diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 3f84706bffb3b..71e88559dee64 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kmsxx"; version = "2018-10-23"; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index a8ddab2978d13..48fb0f1153e78 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -4,7 +4,7 @@ }: let srcs = import ./srcs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libagar"; inherit (srcs) version src; diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 43d66b8251cfd..4295971d5a0b1 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: let srcs = import ./srcs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libagar-test"; inherit (srcs) version src; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index b20850e88ff07..9aedde923f0be 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, which }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libbap"; version = "master-2019-04-05"; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 5af8acb5ed769..89ca984767b3e 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -3,7 +3,7 @@ , libiberty, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libbfd"; inherit (binutils-unwrapped) version src; diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index 10a4c276ebd5e..bfc7fe1d9498a 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libcredis-0.2.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 3fd2a328558eb..352d2b17406b8 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -16,7 +16,7 @@ let }; in rec { - libdwarf = stdenv.mkDerivation rec { + libdwarf = stdenv.mkDerivation { pname = "libdwarf"; inherit version; @@ -37,7 +37,7 @@ in rec { inherit meta src; }; - dwarfdump = stdenv.mkDerivation rec { + dwarfdump = stdenv.mkDerivation { pname = "dwarfdump"; inherit version; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 8555449f28bdf..9650f540fcfba 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libESMTP"; version = "1.0.6"; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 0c8a7084e095b..e007ab2f95af2 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -2,7 +2,7 @@ zlib, libpng, boost, qt5, guile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libfive"; version = "2018-07-01"; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index c0595ac93d1ce..8ddce0aa98c60 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libnfc, openssl , libobjc ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libfreefare"; version = "0.4.0"; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index ba9eab432029b..9ba3cdbd09aac 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -2,7 +2,7 @@ , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libgdiplus-5.6.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index b82c547fb331c..f1483c38c154e 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -4,7 +4,7 @@ , libxnd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libgumath"; version = "unstable-2018-11-27"; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 9c3d9faf1f4fc..265b5d8379629 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -8,7 +8,7 @@ let pname = "libhandy"; version = "0.0.10"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; outputs = [ "out" "dev" "devdoc" "glade" ]; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index ab1858c51a612..08a88bfee459a 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -2,7 +2,7 @@ let inherit (buildPackages.buildPackages) gcc; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libiberty-${gcc.cc.version}"; inherit (gcc.cc) src; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index c4dca659d3660..fccf4b3d50f23 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libipfix"; version = "110209"; src = fetchurl { diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix index 0f2c9dce28a22..4e9c165e71fb5 100644 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ b/pkgs/development/libraries/libjpeg-drop/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libjpeg-drop-9b"; srcs = [ diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index ba92bdd516557..b62f0f116a099 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip }: let version = "7.6.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "libjson"; inherit version; src = fetchurl { diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 92e7d26f5afa0..b4e9f2bdf8850 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, openssl, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libksi-2015-07-03"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index d9f460d44e8ce..c51cb9baead6c 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, curl, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "liblastfm-SF-0.5"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index a61c21ffec5fc..6dfb95d1fb837 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -4,7 +4,7 @@ let version = "3.10.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "liblouis"; inherit version; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 2ce11b998a1a3..4a4074e2f2296 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libmcrypt-2.5.8"; src = fetchurl { diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index d2fba5cddd82a..57053103417a5 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libmemcached-1.0.18"; src = fetchurl { diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index e4010280f4bdd..9ffbc95b1fd14 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -5,7 +5,7 @@ let version = "1.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libmpc"; inherit version; # to avoid clash with the MPD client diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index cde4251e2c697..518991120f7a7 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -2,7 +2,7 @@ let version = "1.3.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "libmypaint"; inherit version; diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index 6c4fc798f335e..a522c72fc7667 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libndtypes"; version = "unstable-2018-11-27"; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 695ddadb5f398..3d069d7a168d5 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libusb, readline }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libnfc"; version = "1.7.1"; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index c0c66bc1a4a01..4049a18145c72 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -2,7 +2,7 @@ let version = "1.0.3"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libnih"; inherit version; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index c42cd3206b418..aa307f68ca00e 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -3,7 +3,7 @@ , libiberty, libbfd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopcodes"; inherit (binutils-unwrapped) version src; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 752be52963cb8..01da76749baba 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -4,7 +4,7 @@ let version = "1.3.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopus"; inherit version; diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index e1d70bee6c4c8..9b91e32f22852 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -3,7 +3,7 @@ let version = "0.2.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libopusenc"; inherit version; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 54ee86f0a39ac..4be744e7ba936 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, protobuf}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libosmpbf-1.3.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index f1c7874e313e3..41a2a1b669d8d 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -2,7 +2,7 @@ , qtbase, qtmultimedia }: let - generic = version: sha256: prefix: stdenv.mkDerivation rec { + generic = version: sha256: prefix: stdenv.mkDerivation { pname = "libqmatrixclient"; inherit version; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index bdca44dc7d030..d85c9e94ebdff 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -2,7 +2,7 @@ let version = "1.8.5"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libspatialindex"; inherit version; diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix index 67d6d8d42ead4..2f6b2835c4e32 100644 --- a/pkgs/development/libraries/libstemmer/default.nix +++ b/pkgs/development/libraries/libstemmer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "libstemmer-2017-03-02"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 7a25980a38b99..6d95d81e5d9c9 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtcod"; version = "1.5.1"; diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index 139de830972fd..043acee0cfeb8 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtelnet"; version = "0.21+45f2d5c"; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 9bccff49b5404..e9267df5047b2 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -3,7 +3,7 @@ let generic = { version, sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "libtoxcore"; inherit version; @@ -42,7 +42,7 @@ let }; }; -in rec { +in { libtoxcore_0_1 = generic { version = "0.1.11"; sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij"; diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index c3981f5c58eae..6cd5f9122a4f7 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tox-core-new-20160727"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 9a3671c325897..4959674f0ad28 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -2,7 +2,7 @@ let version = "1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libtxc_dxtn_s2tc"; inherit version; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 446d30c609ee0..e333e73de3ffe 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -6,7 +6,7 @@ let backend = if stdenv.isDarwin then "darwin" else "unix"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${shortName}-${version}"; src = fetchgit { url = "https://github.com/andlabs/libui.git"; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index a0ec3b74cc17f..1adddadcc5eac 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -12,7 +12,7 @@ , autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libunity"; version = "unstable-2019-03-19"; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 75e935d18d90c..48dbc5f395c8d 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -4,7 +4,7 @@ , libtool }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libvterm-neovim"; version = "2018-11-26"; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 9eb891544b5f1..eb031eb2a9d79 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -4,7 +4,7 @@ , libndtypes }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libxnd"; version = "unstable-2018-11-27"; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index 9aa189586f054..e1bf4fca7b553 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libykclient"; version = "unstable-2019-03-18"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 857f5247cd51f..0098116563aed 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "linenoise"; version = "1.0.10"; # Its version 1.0 plus 10 commits diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 8b0aecdab1686..8c691f7759166 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "liquid-dsp"; version = "20170307"; diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 9c1815f840b4e..2df7ef94cf36d 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -8,7 +8,7 @@ let hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = requireFile { url = sourceInfo.url; sha256 = sourceInfo.hash; diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index ab8c2c9385f89..ccf246c044e99 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "log4shib"; version = "1.0.9"; diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 50baad6a7a0b8..7ca7456f78979 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, boost-build, lua, boost}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "luabind-0.9.1"; src = fetchurl { diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index ebd68134ba554..38261bd1e53a0 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -2,7 +2,7 @@ , fetchgit, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mediastreamer-openh264"; version = "0.0pre20160801"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 117722ae16a34..cf1bdaf643233 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ let branch = head (splitString "." version); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mesa"; inherit version; diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index 3493bc5d96797..287241a75c927 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "miniball"; version = "3.0"; diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 04f84d49f8440..c8ea3315f8b7a 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "msgpack"; inherit version; diff --git a/pkgs/development/libraries/mumlib/default.nix b/pkgs/development/libraries/mumlib/default.nix index 7117599d15ec3..f936fc8b3df6e 100644 --- a/pkgs/development/libraries/mumlib/default.nix +++ b/pkgs/development/libraries/mumlib/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig , boost, openssl, log4cpp, libopus, protobuf }: -with lib; stdenv.mkDerivation rec { +with lib; stdenv.mkDerivation { pname = "mumlib"; version = "unstable-2018-12-12"; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index 423a93b69a804..37bfb05c4eef6 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -4,7 +4,7 @@ , ninja }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mutest"; version = "unstable-2019-08-26"; diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix index 140dbcc937b5f..3dac7c93e84ba 100644 --- a/pkgs/development/libraries/mypaint-brushes/default.nix +++ b/pkgs/development/libraries/mypaint-brushes/default.nix @@ -3,7 +3,7 @@ let pname = "mypaint-brushes"; version = "1.3.0"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 6ec288f985b07..8164f4ec9729a 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "mysocketw-031026"; src = fetchurl { url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index 83d01f85d0a45..2e29ab395d6b1 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -2,7 +2,7 @@ let version = "2.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ndpi"; inherit version; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index 65679c7e28251..a79c42a1c8f44 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, glib, readline, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "neardal-0.7-post-git-20150930"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index d78a31d65cd36..064ef34439800 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -4,7 +4,7 @@ , version, src , ...}: -stdenv.mkDerivation (rec { +stdenv.mkDerivation ({ name = "nettle-${version}"; inherit src; diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index 798f9d3a39658..b7d46cd5537d5 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nvidia-video-sdk-6.0.1"; src = fetchurl { diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 5aeb07de92359..4d4505c3e703e 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, opencv, qtbase, qtsvg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.5"; pname = "openbr"; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 9ce8bb618bf99..d0cc6396b8d8c 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -2,7 +2,7 @@ , version # "12" for "1.2", "22" for "2.2" and so on }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "opencl-headers-${version}-2017-07-18"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index e35f5375fd982..d7f897ebcf831 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -139,7 +139,7 @@ let printEnabled = enabled : if enabled then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "opencv"; inherit version src; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 5732ce9e1cace..153737e2761e7 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -152,7 +152,7 @@ let printEnabled = enabled : if enabled then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "opencv"; inherit version src; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 5d26063adb61d..b8a3c4a81e00d 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "openexrid-unstable"; version = "2017-09-17"; diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index abc60f026e578..4a7927bfcb2e6 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "openfx"; version = "1.4"; diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix index 2a625f32e7ff6..beb151f0d2de9 100644 --- a/pkgs/development/libraries/openjpeg/1.x.nix +++ b/pkgs/development/libraries/openjpeg/1.x.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.5.2"; branch = "1.5"; revision = "version.1.5.2"; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 55d003d2d92b4..64ed6cb58f0b9 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -23,7 +23,7 @@ let mkFlag = optSet: flag: "-D${flag}=${if optSet then "ON" else "OFF"}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openjpeg"; inherit version; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 46028d3a7ea48..e2f6411471662 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -3,7 +3,7 @@ }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openssl-chacha"; version = "2016-08-22"; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index c3407289f020d..3d5988f8114ee 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -5,7 +5,7 @@ let version = "2018-11-13"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "openzwave"; inherit version; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 44293d52da485..d788f1eff346c 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -3,7 +3,7 @@ , Carbon ? null, Cocoa ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pangolin"; version = "2017-08-02"; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index d90a27ed54587..b08936dd34de6 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation { pname = "partio"; version = "2018-03-01"; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 32fc27f9ab4da..5a02229cb0e20 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -3,7 +3,7 @@ , portaudio, alsaLib , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pcaudiolib"; version = "2016-07-19"; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 6d2896ac3396f..2e111240758d6 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -13,7 +13,7 @@ let else if (variant == "cpp") then "pcre-cpp" else variant; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 67f343d603806..ef7633dadaf36 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -14,7 +14,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 829ecdb86e064..98c6be85672c3 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -15,7 +15,7 @@ assert withQt4 -> qt4 != null; assert !withQt4 -> qtbase != null; assert !withQt4 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 2dd0cc10c947c..dc32c4ebfb054 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -15,7 +15,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qttools != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index fb108dd7c2572..4ec1177778578 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -35,7 +35,7 @@ , libXmu }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "10.4.1"; pname = "geant4"; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index dd39fbbc84b7a..3d6891c48e2bb 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -14,7 +14,7 @@ let boost_python = boost.override { enablePython = true; inherit python; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (geant4_nomt) version src; pname = "g4py"; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 89248597f5d99..92b56467aee9a 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, pkgconfig, libjack2 , AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "portaudio-190600-20161030"; src = fetchurl { diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index ffe7f46b77d8a..37958038601cc 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; # XXX: This is to deactivate Java support. - patches = stdenv.lib.singleton (fetchurl rec { + patches = stdenv.lib.singleton (fetchurl { url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/" + "portmidi/files/portmidi-217-cmake-libdir-java-opts.patch"; sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h"; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 8f6adaf03d9be..7839547ee9283 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -2,7 +2,7 @@ let version = "1.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ppl"; inherit version; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 957b59a6f662a..01f74bc48eb7d 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -6,7 +6,7 @@ }: let -mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec { +mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { pname = "protobuf"; inherit version; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 773e31391758d..3c08537db0b6b 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protobuf"; inherit version; diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix index c3a815c45ac89..304f9d61f397f 100644 --- a/pkgs/development/libraries/protobufc/1.3.nix +++ b/pkgs/development/libraries/protobufc/1.3.nix @@ -1,6 +1,6 @@ { callPackage, fetchFromGitHub, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { version = "1.3.1"; src = fetchFromGitHub { owner = "protobuf-c"; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 91c0ae5624e87..838fa7de82610 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -3,7 +3,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "protobuf-c"; inherit version; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 596dc543e3352..92f927ee39859 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "qhull-2016.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 083e0a51b813e..03247f9d695b7 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,5 +1,5 @@ {stdenv, qtdeclarative, fetchFromGitHub, qmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "qml-box2d-2018-04-06"; src = fetchFromGitHub { owner = "qml-box2d"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index d3f4a8e88e2ef..b156a1cbf992f 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2018-11-24"; pname = "qmltermwidget-unstable"; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index dd50e6ec03983..a033f477afb08 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,6 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, gtk2 }: -mkDerivation rec { +mkDerivation { name = "qtstyleplugins-2017-03-11"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index 96a2347c50fa5..afb4e0daeb66e 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ant, jdk, jre, python, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "rabbitmq-java-client-3.3.4"; src = fetchurl { diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index e36b6f9488a58..2b60c3cbf546e 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "re2"; version = "20190401"; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index f9a20a535cb3d..73ed823d2be58 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "readline-6.3p08"; src = fetchurl { diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 75beddcd22ca6..53d30019f28d4 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "5.6.0"; pname = "papi"; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index d22858d64d0c9..26ec1237601f0 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -38,7 +38,7 @@ let ''; cub = { - src = fetchFromGitHub rec { + src = fetchFromGitHub { owner = "NVlabs"; repo = "cub"; rev = "v1.7.4"; diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 3c448abeccf6d..f0f5829ce4658 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -10,7 +10,7 @@ , addOpenGLRunpath }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; inherit version; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 2e5bb5e371f54..5a62578481c6b 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -11,7 +11,7 @@ let version = "3.8.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "liblapack"; inherit version; src = fetchurl { diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index c9c26ca0d66c3..ff29ae82c5ce3 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -2,7 +2,7 @@ assert stdenv ? cc && stdenv.cc.libc != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "scmccid-5.0.11"; src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { diff --git a/pkgs/development/libraries/sdformat/3.nix b/pkgs/development/libraries/sdformat/3.nix index 116f248b3b4e8..b78f1d5624ca1 100644 --- a/pkgs/development/libraries/sdformat/3.nix +++ b/pkgs/development/libraries/sdformat/3.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, callPackage, ... } @ args: -callPackage ./default.nix (args // rec { +callPackage ./default.nix (args // { version = "3.7.0"; srchash-sha256 = "07kn8bgvj9mwwinsp2cbmz11z7zw2lgnj61mi1gi1pjg7q9in98q"; }) diff --git a/pkgs/development/libraries/sdformat/default.nix b/pkgs/development/libraries/sdformat/default.nix index f81eb9b259e89..66ad311387f88 100644 --- a/pkgs/development/libraries/sdformat/default.nix +++ b/pkgs/development/libraries/sdformat/default.nix @@ -5,7 +5,7 @@ , ... }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { src = fetchurl { url = "http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${name}.tar.bz2"; sha256 = srchash-sha256; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index cf73e205830b1..4726221a40d95 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -7,7 +7,7 @@ let version = "2.5.1"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sfml"; inherit version; diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index 2f3ec44a08cec..d9fcea767d5ea 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, mesa, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "soil"; src = fetchurl { diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index edcb3549c310b..4a744c08ae33e 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sonic"; version = "2016-03-01"; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 98226ce20f4a0..79084ceda1c32 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,6 +1,6 @@ { fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soqt"; version = "1.6.0a"; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 50ba9c944ab5f..11ba48c59716b 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -1,6 +1,6 @@ { fetchhg, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "soxt"; version = "unstable-2019-06-14"; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index e4c1f8eb5f681..739dfc3bc5b47 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fuse, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sqlar"; version = "2018-01-07"; diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index 440f0c22ea6f4..c2353c7b70612 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stb"; version = "20180211"; diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 8992c7e75c056..401c2562167f8 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, zlib, cmake}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "taglib-1.9.1"; src = fetchurl { diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 61d9c710801c2..507f2fb275b7c 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, tcl, tk, fetchpatch } : -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "8.4.3"; pname = "tix"; src = fetchurl { diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix index 141f6da14ce49..3058af46ab57e 100644 --- a/pkgs/development/libraries/tk/8.5.nix +++ b/pkgs/development/libraries/tk/8.5.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, tcl, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 5013db64bbae9..c30f9a8194785 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, tcl, stdenv, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index d7162067debad..13e8f783915d0 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tnt"; version = "3.0.12"; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 5609f1d67d17f..2913360768925 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; src = fetchgit { diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index 46b65a08eaab3..e1284c39aa3be 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -2,7 +2,7 @@ , autoreconfHook, pkgconfig , libsndfile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "twolame"; version = "2017-09-27"; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index e1f3c0bd39c2a..e6cd082763966 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -3,7 +3,7 @@ let version = "2.1.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "uthash"; inherit version; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix index 7f9e8508a657f..d62a8524644d7 100644 --- a/pkgs/development/libraries/v8/3.14.nix +++ b/pkgs/development/libraries/v8/3.14.nix @@ -11,7 +11,7 @@ let arch = if stdenv.is64bit then "x64" else "ia32"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "v8"; inherit version; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 77cd3be0cbdae..2b0a807bfa75f 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -6,7 +6,7 @@ let version = "0.3.11"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "volume_key"; inherit version; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 95d420627c7d7..5bb3788a3b47f 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -6,7 +6,7 @@ let in assert version == vulkan-headers.version; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vulkan-loader"; inherit version; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 60f911765992e..958257ffe76d7 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -6,7 +6,7 @@ let generic = { version, sha256 }: - stdenv.mkDerivation rec { + stdenv.mkDerivation { pname = "wt"; inherit version; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 362f704a05d8d..9d317fe00d291 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -2,7 +2,7 @@ , libuuid, zlib }: let - generic = version: sha256: stdenv.mkDerivation rec { + generic = version: sha256: stdenv.mkDerivation { pname = "xapian"; inherit version; passthru = { inherit version; }; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 705bd6b87fc6d..4764c1bdb93cd 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig , xorg, gnum4, libxcb, gperf }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xcb-util-cursor-0.1.1-3-unstable"; version = "2017-04-05"; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 3e54944a3779e..25c5bf4588877 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -4,7 +4,7 @@ let version = "1.2.28"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xmlsec"; inherit version; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index 5a267bbfe7678..bd87d306b9659 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -3,7 +3,7 @@ let fixed_paths = ''LDFLAGS="-L${xercesc}/lib" CPPFLAGS="-I${xercesc}/include"''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "xsd"; version = "4.0.0"; diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index 6305b6c03a46a..d3df30e03e18a 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "yojimbo"; version = "1.1"; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 58e1940a3ef4d..bb5b602b64ac2 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -1,6 +1,6 @@ { stdenv, zookeeper, bash }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}"; src = zookeeper.src; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 46d417fd2aac5..d9478c60db887 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -36,7 +36,7 @@ let lispPackages = rec { }; }; - quicklisp-to-nix-system-info = stdenv.mkDerivation rec { + quicklisp-to-nix-system-info = stdenv.mkDerivation { pname = "quicklisp-to-nix-system-info"; version = "1.0.0"; src = ./quicklisp-to-nix; @@ -57,7 +57,7 @@ let lispPackages = rec { dontStrip = true; }; - quicklisp-to-nix = stdenv.mkDerivation rec { + quicklisp-to-nix = stdenv.mkDerivation { pname = "quicklisp-to-nix"; version = "1.0.0"; src = ./quicklisp-to-nix; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index a5fddd417fa1f..729f5937117eb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''_3bmd''; version = ''20171019-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix index a657159a41f1c..cbfcb6f436199 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''abnf''; version = ''cl-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 48dd57aac54b3..586502945ba63 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''alexandria''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix index 61a07c61ca07f..5921b5f49b127 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''anaphora''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 40d5aed49917f..1d64784a0a642 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''array-utils''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix index 68c8a7e087b54..482752f2c7f2e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''asdf-finalizers''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix index 65df45d95a50c..1d1ef41f2d16f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''asdf-system-connections''; version = ''20170124-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix index 4f438eb734a8f..5251cbc920fad 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''babel-streams''; version = ''babel-20171227-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index 4cba3e86e0685..d8a12f6edbe3f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''babel''; version = ''20171227-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix index a660882f36b1d..d7cebabb0adff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''blackbird''; version = ''20160531-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index c5305587a029b..530a3b76d3010 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''bordeaux-threads''; version = ''v0.8.6''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix index 5d7f3f2dd10b0..71a7a1894a25e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''buildnode-xhtml''; version = ''buildnode-20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix index 0a2e56a9c9b88..26d907c2524cd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''buildnode''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index 6cf8107073432..d159ce49581e9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''caveman''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index a7d22ac129b9a..c4e3b9b573400 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cffi-grovel''; version = ''cffi_0.20.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index 3d24638060734..db85c50a5c1e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cffi-toolchain''; version = ''cffi_0.20.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index b83b146119786..08115ea3a3ab3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cffi''; version = ''cffi_0.20.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index c30c68e53c8db..c9700a9d00919 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''chipz''; version = ''20190202-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 4a533220caf57..3209735adb593 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''chunga''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index 2e387d29833f4..ea812b38c954f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''circular-streams''; version = ''20161204-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 531d429df244f..9ffc4c0d39ef1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-aa''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix index 5f93167a11419..5dab19a553198 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-annot''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index a413743eb8d54..8459e32fd045c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-anonfun''; version = ''20111203-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix index 9b053c920e32e..1e61d4e48e755 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ansi-text''; version = ''20150804-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index d84233c434247..e366dc551d601 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-async-repl''; version = ''cl-async-20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index c13b8b70647d6..d18c95153ff50 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-async-ssl''; version = ''cl-async-20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index 363227534a8b6..876a24055c21b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-async''; version = ''20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix index a4a9a9261fd6f..8aa43a81f1903 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-base64''; version = ''20150923-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix index 36641b73b750a..aed744e04338f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-cli''; version = ''20151218-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix index 0d0337a65cec9..9b69bf886c0e3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-colors''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix index ebff2928c3ea0..9b558402ce6a6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-containers''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix index a3aacd0aa8bd1..62f895b202790 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-cookie''; version = ''20150804-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 56ccab7b5cd50..82b63ca088dd8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-csv''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index bdc5fe920cf67..7a1b7d9f8639c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-dbi''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 1510495a4cbc5..d6fb845aa3862 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-emb''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index d032b4768dd6e..f92d9c464cf45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-fad''; version = ''20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index 6a40d0fa8c92f..399abebe6e702 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-fuse-meta-fs''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index de71e2e299ada..b0e6159e62624 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-fuse''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 61a35f2b58c63..365360ba896b9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-html-parse''; version = ''20161031-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix index dde2cc31dd053..7f20a171734ab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-html5-parser''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index b0be8c775a377..feefecf75bbbd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-interpol''; version = ''20180711-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix index 713aff0ea405e..66fb98ee0dec4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-jpeg''; version = ''20170630-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix index d8bc535f35595..9faf2b1b38880 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-json''; version = ''20141217-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index dfabda0428f09..0c276740f90ae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-l10n-cldr''; version = ''20120909-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index f37e653bc5642..1a13df6792834 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-l10n''; version = ''20161204-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index 36d15673427c2..cbbc8ccb0b216 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-libuv''; version = ''20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix index d506acf876ee9..9c623c2278ece 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''cl-log''; version = ''cl-log.1.0.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix index f52952af3e1a2..0f3d0c126ff76 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-markdown''; version = ''20101006-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index b1916c27bfdda..7b5b7fb3e1ab0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-markup''; version = ''20131003-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index 1590f2536e341..c8460177a244b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-mysql''; version = ''20171019-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index cfca59e3b5035..c096c4d2728b7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-paths-ttf''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix index e8034b11c2375..0f0a22c97e0e2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-paths''; version = ''cl-vectors-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix index babdf04e3ec2f..d54c37c2de1c8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-pdf''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 2fad295c7ee5b..952a4394ae79a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-postgres''; version = ''postmodern-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 4c97f03870fab..c10a1500563b4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ppcre-template''; version = ''cl-unification-20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 27887f12497ef..20433b51f8774 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ppcre-unicode''; version = ''cl-ppcre-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index 8bb8fb2478d87..cfea494fc4bd8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-ppcre''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index 496a0bd4e567b..1e13378b38c45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-project''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix index 046f910a86601..81f1455714d94 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-protobufs''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix index 916af5b29727a..c16486754db37 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-reexport''; version = ''20150709-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 0d58e11b4d262..16cc2309e645a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-smtp''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index 2aff988dfd248..b639681fd306e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-store''; version = ''20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix index add200b09a1d9..4639a66da78f2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax-annot''; version = ''cl-syntax-20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix index c19a47df6c23f..cea65514d4b14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax-anonfun''; version = ''cl-syntax-20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix index cded8dc2d06d0..fa08d3b114ce8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax-markup''; version = ''cl-syntax-20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix index 353c8210885e4..2715cfdf8dac9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-syntax''; version = ''20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 968f2972abfcb..b04a6cd834445 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-test-more''; version = ''prove-20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix index 358666877a6d9..38237f6f3b7b6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-typesetting''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index 7849acb57c0a0..77e2ba0036ce5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-unicode''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index dbdd53a934694..bb8a05b0d6d16 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-unification''; version = ''20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index 750da99d5d6a7..4999da6d0b693 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-utilities''; version = ''1.2.4''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index f44bd0f22e0cd..dbdd6d6b617c6 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-vectors''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index 3be45384d4181..19af99826fce5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl-who''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index f344dbfa2fe84..5294613b9789a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cl_plus_ssl''; version = ''cl+ssl-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix index 6cfd7842409c7..4b0a4cd176d8a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-handler-hunchentoot''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix index 1ac6ccc329c27..5f4a96dbcc4a2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-socket''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index 1792d79f1d890..d8c8acf83aa63 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-test''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index 749fce006e4ea..0234f7644988c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack-v1-compat''; version = ''clack-20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 1813844e85fd8..ab615e5dc83fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clack''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index ca03207fabd8e..abbefea70b481 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''closer-mop''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index c1b36b6b653c4..3448f70f5adbf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''closure-common''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix index f55ccecadc614..2746ccff6c9c5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''closure-html''; version = ''20180711-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix index 9f4abb8e4756f..8f6760b96247e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-postgresql-socket''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix index add3a15d27c7a..e90cda0f6d93a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-postgresql''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix index 653adb3d12b32..254a22fbafa5e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-sqlite3''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix index 8243a33758536..c664c23dd1c58 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql-uffi''; version = ''clsql-20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix index 74b8442c0c908..e37eecabbca91 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clsql''; version = ''20160208-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index 2f07706a91294..458cb51e6adf0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clss''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix index 303d43a964ee9..ba45b3530573b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clx-truetype''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 6b99f99b7ab8f..0fe6e115f3f25 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''clx''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix index 7375b8dd70948..0a4a40b06841c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''collectors''; version = ''20161204-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index 1d81acba2dc63..25eaf1fa6fa9b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''command-line-arguments''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index f4941aa80cd63..0dd93c46fb2f7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-lite''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix index 98c565648dcb4..a0a6d2d7c2ec5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-selectors-simple-tree''; version = ''css-selectors-20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix index fcdb69f3c3515..1aff3a5826cbc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-selectors-stp''; version = ''css-selectors-20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix index aa523d6f838b3..268eea723ddf2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''css-selectors''; version = ''20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index ebae32962f10d..9bef7fb990c50 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cxml-stp''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 68a019fa027dd..667cf93d44f90 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''cxml''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix index 7c69878900cd4..1f0b4f9f71bc8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''db3''; version = ''cl-20150302-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 173a31e9f31d2..9d0f2549f50b0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbd-mysql''; version = ''cl-dbi-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 6668cd4f762bb..9f3046eb51ff8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbd-postgres''; version = ''cl-dbi-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index 9b6fde0ea94b4..7bc556eaff207 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbd-sqlite3''; version = ''cl-dbi-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index 26c5306c06a3a..2e4006dbf3f4d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dbi''; version = ''cl-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 4d5bc0a22175d..5a84a62ee8355 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dexador''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 3dbacdf0f81ad..2896ec154ecda 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''do-urlencode''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 7c25ed9a03773..a4196b2d394fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''documentation-utils''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index aa97f8f7cbe31..a3d063ec9bd90 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''drakma''; version = ''v2.0.5''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix index a4a58fd0d0b68..8c31820457202 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''dynamic-classes''; version = ''20130128-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix index 91b8db69a36b1..aa2b01e6bcd54 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''eos''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix index d68fd839bd163..e94ed40f9e1c7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''esrap-peg''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index a024ad3907a31..3ab6e03ab6591 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''esrap''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index 0e7f5b79160be..b247ea27298d3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''external-program''; version = ''20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index 82c8603d4a453..8d43fa3362cc3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fast-http''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 89bed83acd541..ea006556876e3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fast-io''; version = ''20171023-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 39f2af5430fca..8b5fe1f7de6cd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fiasco''; version = ''20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix index be9648a0da4a3..8ebd9f6038167 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fiveam''; version = ''v1.4.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index d9b25bebddc3f..4d5524d9d18db 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''flexi-streams''; version = ''20190107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index 90ce8b83dde6f..a5fe52ec0277a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''form-fiddle''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index d901df215a685..893cec1c72ad2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''fset''; version = ''20171019-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix index 76e2a55620cb8..e961aecf8540c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''garbage-pools''; version = ''20130720-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 3754829ac37b3..775e30e711a95 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''http-body''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index 1f2700608e377..6fc92c088822e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''hu_dot_dwim_dot_asdf''; version = ''20190521-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix index 51f4a2d06980e..98a77dad63cd8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''hu_dot_dwim_dot_stefil''; version = ''20170403-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index 611ef77256fad..11d0831c96fcf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''hunchentoot''; version = ''v1.2.38''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix index 1b948bcf325ee..9dfeb3f120625 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''idna''; version = ''20120107-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix index 4211dfbc9194d..675521dcde94e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ieee-floats''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index c4ae44cd67610..bd0e896e14342 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib''; version = ''v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix index 195b52c08c45a..d5e072e5f6a84 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_asdf''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix index aa650edde0204..445da3b1b1791 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_base''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix index c0ec72d48695d..415e7a598202e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_common-lisp''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix index 4ba0cfa1ce2e0..58fd95012e821 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_conf''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix index 7a1a12243fe2c..009e0e2786605 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iolib_dot_grovel''; version = ''iolib-v0.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 2c56b5964f97e..727be89bf4461 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ironclad''; version = ''v0.46''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index f276ec72736db..9a91033bb8be8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''iterate''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix index 9a46818948182..9d219f4c193cf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ixf''; version = ''cl-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 702eb2d05b55c..790638f5954c5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''jonathan''; version = ''20190202-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index e44004a9cf7e7..88ededf0e73bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''kmrcl''; version = ''20150923-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index 96a831147bbaf..cdac924b4396d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack-component''; version = ''lack-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 610633e9af258..68604485c77a2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack-middleware-backtrace''; version = ''lack-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 3607cbedf44f9..cda7716151ab5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack-util''; version = ''lack-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 08095979989bd..7740e73c0e5bc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lack''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index 1f6a0709b0f43..91e28f402b23e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''let-plus''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix index 9dd6baad1bdc7..8d52d518e1137 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lev''; version = ''20150505-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix index 10977c16f8389..6ff0fdb4c8294 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-client''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix index 4a5fe87982ae5..4be971bef065a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-common''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix index 354d6c3150762..44c8cc01c95f2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-server''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix index 348c71fe96639..3d917ff2817f3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lfarm-ssl''; version = ''lfarm-20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix index 1edb65596a6c7..84f0ca863ec1e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lift''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix index 7f88beb974b05..802b9eb2b7a91 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lisp-namespace''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix index 8d21f88cbf826..c623d368a043e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lisp-unit2''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix index 7189a09e20cfd..4eb30ef013b0b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''list-of''; version = ''asdf-finalizers-20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index 5ffa27fcca53c..4695c3dfe0e72 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''local-time''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix index 1a6f217a2f962..a4011b78d4f47 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lparallel''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index f64e9ee6a330c..5dbd186e62e76 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''lquery''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index 8187c99f94a4c..c6445010f5446 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''map-set''; version = ''20190307-hg''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 4f6842606b451..531cc1adc1afb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''marshal''; version = ''cl-20180328-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index 953dd0a58a4ac..b34fdd83ca38a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''md5''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index d72e0839d1e8b..cf2c3a1c777ba 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''metabang-bind''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix index 6bbdf5f911e03..c45a3eff384e0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''metatilities-base''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix index 6334804c4f708..ef0da68cfe4da 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''misc-extensions''; version = ''20150608-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix index 1f2dd20ee4bed..adb1ad27c45da 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''moptilities''; version = ''20170403-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix index 470d2fed738c6..974a63c1a7307 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''mssql''; version = ''cl-20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix index a8cfc070bf999..f1fe0e3c27916 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''mt19937''; version = ''1.1.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index 068d0eba69ddd..16b1f22ceebb3 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''myway''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index 82d06b1c93b2f..c5f1379f421fb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''named-readtables''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix index 4e7c84566a0ac..dcc49aa799374 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''net_dot_didierverna_dot_asdf-flv''; version = ''asdf-flv-version-2.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index ea6adac9e9f8d..0a3dba6b8243d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''nibbles''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix index 07b86f58fe7ca..b5b6ace2ae949 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''optima''; version = ''20150709-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index bf6216dcaddc5..2bf306507858f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''parenscript''; version = ''Parenscript-2.7.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix index e636df0805e7d..72bef6f60bf2d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''parse-number''; version = ''v1.7''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix index fe9ccae2886a8..0c34654b1ae3a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''pcall-queue''; version = ''pcall-0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix index 025d160f4602e..60385ab59393e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''pcall''; version = ''0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix index a913cdbe521c1..f0b5fb23d6619 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''pgloader''; version = ''v3.4.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix index 38fb942c331f5..e4fd9f0c4df8d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''plump-dom''; version = ''plump-20170725-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix index cd0db041c5b22..16cd9d5f062dc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix @@ -1,5 +1,5 @@ { fetchurl, ... }: -rec { +{ baseName = ''plump-lexer''; version = ''plump-20170725-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix index a9d07b48a9d4c..cb06b039abd9f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''plump-parser''; version = ''plump-20170725-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 8757c704c8f4c..53af356f05ac2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''plump''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index ba7bef260c08c..ed09e3805c082 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''postmodern''; version = ''20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix index 8ffcbc784ff73..3afcbf98d5058 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''proc-parse''; version = ''20160318-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index a1542dc13cf65..9bbc47275f807 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''prove''; version = ''20171130-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix index ffa2e595c26a2..b4957d68e8839 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''ptester''; version = ''20160929-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index 4f6946783939b..84b252f93a517 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''puri''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix index 0eb4c0f5b9e6b..741929484d849 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''py-configparser''; version = ''20170830-svn''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix index de24a59849605..03d96005935e4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''qmynd''; version = ''20180131-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 3666dda9bf879..dbeb5f1d08e0a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''query-fs''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index f6022cb2a1f29..fed624578912f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''quri''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index 25d535176a6ad..e6c1477298d4d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''rfc2388''; version = ''20180831-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix index d5be4be7daf43..14b327a97364b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''rt''; version = ''20101006-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index c283abd479edd..92fa577945222 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''s-sql''; version = ''postmodern-20180430-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 9056cfbdcca8f..26c616ec3922b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''salza2''; version = ''2.0.9''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index 33847198bdd96..f3c1dade82197 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''simple-date''; version = ''postmodern-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix index 63adab55741b2..a6fc781c3698d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''smart-buffer''; version = ''20160628-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index a22076facd399..be9f599864287 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''split-sequence''; version = ''v2.0.0''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index 57dec7c93cac7..cd018a4b9975b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''sqlite''; version = ''cl-20130615-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index 1cd4e4c440273..0386a674916b7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''static-vectors''; version = ''v1.8.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix index df63a5c9836af..7c769e614c142 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''stefil''; version = ''20181210-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix index 17a56c09b7e87..2b38115aabdd1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''string-case''; version = ''20180711-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index e89eb1971d602..fa0a2ab7944de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''stumpwm''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 50b815425dc61..ec14ffffcba14 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''swank''; version = ''slime-v2.24''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix index f0df3b84f153a..89003686df381 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''swap-bytes''; version = ''v1.1''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix index 4bae3cc1ceed8..9ec472fa08a10 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''symbol-munger''; version = ''20150407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 683f87357f56c..d10b68b2d2edf 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-backtrace''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 82d0e4513ab10..8db7c603ec88d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-features''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index c629bb3548d4d..4d26aa4351939 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-garbage''; version = ''20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index 2aee236ac0cad..7826a93799244 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-gray-streams''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index 33eedbaa81841..002c75e102126 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-indent''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index f02d9e0dc2c7f..960778dc17c11 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-mimes''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 8cc04c2c64ac3..6bfaac06f2ddc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-types''; version = ''20120407-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index c925382d81d44..0ac57089e50d1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''trivial-utf-8''; version = ''20111001-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index 1986f7c88f7ac..f5e8677f508f0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''uffi''; version = ''20180228-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 18f1b74edbd3a..ae9c1c6d5ac7e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''uiop''; version = ''3.3.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix index 6c45649673203..6a877e5a96464 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''unit-test''; version = ''20120520-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index c3928cf0e4ccb..fccce79eb84d4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''usocket''; version = ''0.8.2''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix index 0886b1082a88b..bfd8451462234 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''uuid''; version = ''20130813-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index 6a4751f799ea0..2fb1cdacfac2e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''vom''; version = ''20160825-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index 59a41a7cf9aea..7825678c77c5a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''woo''; version = ''20190710-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index f717441068b61..93bcb2072a7b1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''wookie''; version = ''20181018-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix index 9854567fd5bf6..db03e57a663b9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xembed''; version = ''clx-20190307-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix index 4bfc0678f0f13..71cd9cfbde6b9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xkeyboard''; version = ''clx-20120811-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index 0fd076509c228..ea08214cb6f51 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xmls''; version = ''3.0.2''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index 3e14a5ba9f06c..e2a5494c5b4bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xpath''; version = ''plexippus-20190521-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index b9ab71744c3a1..92f661f853101 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''xsubseq''; version = ''20170830-git''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix index c7031f4aa3fc9..cf8f3a8ac0fd5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''yacc''; version = ''cl-20101006-darcs''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix index e14a540a1783a..ca74dd0e50073 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''yason''; version = ''v0.7.6''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 74e5d7e97e95a..3aa695caed6f0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -rec { +{ baseName = ''zpb-ttf''; version = ''1.0.3''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 2e4ceda31c819..052bfb1194987 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -39,7 +39,7 @@ in }; }; hunchentoot = addNativeLibs [pkgs.openssl]; - iolib = x: rec { + iolib = x: { propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with pkgs; [libfixposix gcc]) ; diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix index d16f63152b844..e93f904b8959f 100644 --- a/pkgs/development/misc/amdadl-sdk/default.nix +++ b/pkgs/development/misc/amdadl-sdk/default.nix @@ -1,6 +1,6 @@ { requireFile, stdenv, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "6.0"; pname = "amdadl-sdk"; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index ba6d5559f26b1..4169b9e4d35d5 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -35,7 +35,7 @@ let }; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "amdapp-sdk"; inherit version; diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix index 105104ebd7217..db6ade1c85a65 100644 --- a/pkgs/development/misc/google-clasp/default.nix +++ b/pkgs/development/misc/google-clasp/default.nix @@ -5,7 +5,7 @@ in (import ./google-clasp.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; -})."@google/clasp-${version}".override rec { +})."@google/clasp-${version}".override { preRebuild = '' patch -p1 <<<"${builtins.readFile ./dotf.patch}" ''; diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index 8578e51e939d2..ebba63353dabf 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, python3, platform-tools, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "adb-sync"; version = "2016-08-31"; diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix index 0b9bb7c5b5fc2..c235b9e9a1266 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -1,7 +1,7 @@ { lib, bundlerApp, ruby , beta ? false }: -bundlerApp rec { +bundlerApp { inherit ruby; pname = "cocoapods"; gemfile = if beta then ./Gemfile-beta else ./Gemfile; diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix index 38673fb9ddc48..6a98267d89a55 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, bisect_ppx, ocamlbuild }: -buildDunePackage rec { +buildDunePackage { minimumOCamlVersion = "4.02"; inherit (bisect_ppx) version src meta; pname = "bisect_ppx-ocamlbuild"; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index a30b574f19bc0..eb9cdb78562e2 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "camomile"; version = "0.8.5"; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 64a8f2416ad46..588ba6711cb4b 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -7,7 +7,7 @@ if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99" then cohttp-lwt else -buildDunePackage rec { +buildDunePackage { pname = "cohttp-lwt-unix"; inherit (cohttp-lwt) version src meta; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 93ba084703e54..748b970477eeb 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast cohttp.version "0.99" then cohttp else -buildDunePackage rec { +buildDunePackage { pname = "cohttp-lwt"; inherit (cohttp) version src meta; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index b6d2e24ec5515..51fb369e66fee 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -6,7 +6,7 @@ if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0" then conduit-lwt else -buildDunePackage rec { +buildDunePackage { pname = "conduit-lwt-unix"; inherit (conduit-lwt) version src meta; diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 560600e2fee8a..2eb225d88b6e5 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -4,7 +4,7 @@ if !stdenv.lib.versionAtLeast conduit.version "1.0" then conduit else -buildDunePackage rec { +buildDunePackage { pname = "conduit-lwt"; inherit (conduit) version src meta; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 17da11708c60c..8d395798979c1 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -4,7 +4,7 @@ if stdenv.lib.versionAtLeast ocaml.version "4.06" then throw "cryptgps is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ocaml-cryptgps"; version = "0.2.1"; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 1811e21cf58f3..8180373a3dd9c 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -17,7 +17,7 @@ let param = }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cryptokit"; inherit (param) version; diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 0ddf3cb5995c6..567defea7d2f3 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,6 +1,6 @@ { stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }: -buildOcaml rec { +buildOcaml { name = "ctypes"; version = "0.13.1"; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index bff993a4d1939..5fb9131ef095f 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -10,7 +10,7 @@ in assert versionAtLeast (getVersion ocaml) "4.01.0"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix index 0869ae659cc3f..89a1803b52024 100644 --- a/pkgs/development/ocaml-modules/git-http/default.nix +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, git, cohttp-lwt, alcotest, mtime, nocrypto }: -buildDunePackage rec { +buildDunePackage { pname = "git-http"; inherit (git) version src; diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix index 9c8a7c48255f4..50e6f1d3bce97 100644 --- a/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, git-http, cohttp-lwt-unix, tls, cmdliner, mtime }: -buildDunePackage rec { +buildDunePackage { pname = "git-unix"; inherit (git-http) version src; diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix index 19eef7cf18257..ff923bbd467ef 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix @@ -2,7 +2,7 @@ bin_prot, core, ppx_custom_printf, fieldslib, herelib, pipebang, sexplib, async_rpc_kernel}: -buildOcamlJane rec { +buildOcamlJane { name = "async_extra"; hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh"; propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix index 938f5ccf4474c..49f38136c4f59 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -2,7 +2,7 @@ bin_prot, fieldslib, sexplib, herelib}: -buildOcamlJane rec { +buildOcamlJane { name = "async_kernel"; hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60"; propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix index 1f5ff6b9646f3..83a7e13a5d01c 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -2,7 +2,7 @@ fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, sexplib, typerep, variantslib}: -buildOcamlJane rec { +buildOcamlJane { name = "async_rpc_kernel"; hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw"; propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix index 7db7cae27096f..0d0f26134f2ff 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -2,7 +2,7 @@ bin_prot, comparelib, core, fieldslib, herelib, pipebang, sexplib}: -buildOcamlJane rec { +buildOcamlJane { name = "async_unix"; hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7"; propagatedBuildInputs = [ async_kernel core bin_prot comparelib diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix index 4cd67e1af86b7..fe01e47426da4 100644 --- a/pkgs/development/ocaml-modules/janestreet/async.nix +++ b/pkgs/development/ocaml-modules/janestreet/async.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, async_kernel, async_unix, async_extra}: -buildOcamlJane rec { +buildOcamlJane { name = "async"; version = "113.33.03"; hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr"; diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index 6315621597623..e8f42ef71d1e4 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -2,7 +2,7 @@ , openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis }: -buildOcamlJane rec { +buildOcamlJane { name = "async_ssl"; version = "113.33.07"; hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix index 11e6189e6c1e1..c47fcd2fea6b2 100644 --- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "bin_prot"; version = "113.33.03"; minimumSupportedOcamlVersion = "4.02"; diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix index 5410167e0a262..c7c69beedb7bf 100644 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -4,7 +4,7 @@ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, re2, textutils}: -buildOcamlJane rec { +buildOcamlJane { name = "core_extended"; hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix index c2f97badda93d..f6a7ba5b0db06 100644 --- a/pkgs/development/ocaml-modules/janestreet/core.nix +++ b/pkgs/development/ocaml-modules/janestreet/core.nix @@ -3,7 +3,7 @@ bin_prot, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: -buildOcamlJane rec { +buildOcamlJane { name = "core"; hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix index 83e6100f05970..b279318dd935e 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -5,7 +5,7 @@ , textutils }: -buildOcamlJane rec { +buildOcamlJane { name = "core_bench"; hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix index e5bbb7800520c..53e92a95c2365 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -2,7 +2,7 @@ bin_prot, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: -buildOcamlJane rec { +buildOcamlJane { name = "core_kernel"; hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix index 8823a0c8054d4..8ce1ca6c505a3 100644 --- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -1,6 +1,6 @@ { stdenv, type_conv, buildOcamlJane }: -buildOcamlJane rec { +buildOcamlJane { name = "fieldslib"; version = "113.33.03"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix index b61874d3a7ea8..3ed7106e7b652 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_assert"; hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix index 56a124c5b6913..9e5df431e04c2 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_inline_test, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_bench"; minimumSupportedOcamlVersion = "4.02"; hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix index 9dffbed69600f..d7f333d4cf4c5 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, bin_prot}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_bin_prot"; hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix index d70fe6ddd5508..0bfdd7bd540ce 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_tools, ppx_type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_compare"; hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix index 4f5bb87b76753..c5789ee9cfb4b 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_core"; hash = "0df7vyai488lfkyh8szw2hvn22jsyrkfvq1b91j1s0g0y27nnfax"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix index 3fe78e3e7e2e5..c652afa5fbfc9 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_custom_printf"; hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85"; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix index 7844756c7bfb3..b4fb9ec7602fa 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_optcomp}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_driver"; hash = "19cpfdn1n36vl5l9d6h7c61ffn0wmiipprn5by0354i5aywj8gpn"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix index 8dbf34ed2329a..2fdfede0f23df 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_enumerate"; hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix index 7e688a1dc1c82..f78f93ee1202b 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix @@ -3,7 +3,7 @@ ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools, ppx_variants_conv, re, sexplib, variantslib, fieldslib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_expect"; hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix index 187d5db199959..4f55a6c4eacb9 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_fail"; hash = "1ms5axpc0zg469zj4799nz3wwxi6rmmyvqj52dy03crmpj71s18l"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix index a05cf149b2681..551738573b369 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_fields_conv"; hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix index 3aa157a68c5b1..ea3ac5e8e5aef 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_here"; hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix index cd16d7c32864c..d0e4c84158c7d 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_inline_test"; hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix index 86394f228e9d3..1086059b19f3e 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -5,7 +5,7 @@ ppx_inline_test, ppx_let, ppx_pipebang, ppx_sexp_conv, ppx_sexp_message, ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_jane"; hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix index 3498affeb0900..8c8b87d7112e8 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_let"; hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467"; propagatedBuildInputs = [ ppx_core ppx_driver ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix index 5dcfc97bfa374..61fa66b77cc52 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_optcomp"; hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix index f3f4bcdead59a..209638f97b741 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_pipebang"; hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix index bf4a7b214decd..00361ee81ebed 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_sexp_conv"; hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix index e83aaa2c27235..2a8bf44bfab20 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_sexp_message"; hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix index a1a1080d73d74..64fbe4bd9bb9c 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_sexp_value"; hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0"; propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix index fc6d9ca034598..bf36dfab5cb05 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_deriving, ppx_driver, ppx_tools}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_type_conv"; hash = "0gv0mqwn97dwrfm6rj442565y8dz7kiq8s8vadnhywrl7j4znqyq"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix index e6d23e0dbdd0f..472ec19b55884 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, typerep}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_typerep_conv"; hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ]; diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix index 9bc1cbb59e46d..1d01b0bc321d1 100644 --- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -1,7 +1,7 @@ {stdenv, buildOcamlJane, ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}: -buildOcamlJane rec { +buildOcamlJane { name = "ppx_variants_conv"; hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn"; propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ]; diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix index 6604a8d012c63..9153d336b22a3 100644 --- a/pkgs/development/ocaml-modules/janestreet/re2.nix +++ b/pkgs/development/ocaml-modules/janestreet/re2.nix @@ -3,7 +3,7 @@ ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, rsync}: -buildOcamlJane rec { +buildOcamlJane { name = "re2"; hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw"; buildInputs = [ rsync ]; diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix index 4a785d199c8ca..f4a86f80b04d5 100644 --- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { minimumSupportedOcamlVersion = "4.02"; name = "sexplib"; version = "113.33.03"; diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/pkgs/development/ocaml-modules/janestreet/textutils.nix index 459743f055ab5..6b3dba5aac8e5 100644 --- a/pkgs/development/ocaml-modules/janestreet/textutils.nix +++ b/pkgs/development/ocaml-modules/janestreet/textutils.nix @@ -2,7 +2,7 @@ bin_prot, core, fieldslib, sexplib, typerep, variantslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: -buildOcamlJane rec { +buildOcamlJane { name = "textutils"; hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb"; propagatedBuildInputs = diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix index 81e6c4be9cbc4..2e8fcde1d0da3 100644 --- a/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "typerep"; version = "113.33.03"; diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix index d9acadbb6158d..7b3af8a080e98 100644 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -1,6 +1,6 @@ {stdenv, buildOcamlJane, type_conv}: -buildOcamlJane rec { +buildOcamlJane { name = "variantslib"; version = "113.33.03"; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index e78dd91f00a3d..09c3ac84e7da4 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -13,7 +13,7 @@ let param = } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version; diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix index 7e898be749015..be57c7e7146f8 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -1,6 +1,6 @@ { buildDunePackage, gtkspell3, lablgtk3 }: -buildDunePackage rec { +buildDunePackage { pname = "lablgtk3-gtkspell3"; buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; propagatedBuildInputs = [ lablgtk3 ]; diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index a266e57dd8598..0e8ba3ef3ffe8 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -1,6 +1,6 @@ { buildDunePackage, gtksourceview, lablgtk3 }: -buildDunePackage rec { +buildDunePackage { pname = "lablgtk3-sourceview3"; buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; propagatedBuildInputs = [ lablgtk3 ]; diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index d0a539ce8a17b..5a494fa5cb51a 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, lwt, react, zed, camlp4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.6"; pname = "lambda-term"; diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix index d93f87aac0da3..e6ef82a900880 100644 --- a/pkgs/development/ocaml-modules/lwt/legacy.nix +++ b/pkgs/development/ocaml-modules/lwt/legacy.nix @@ -18,7 +18,7 @@ let sha256 = { let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in -buildOcaml rec { +buildOcaml { name = "lwt"; inherit version; diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index 06784b445e3bf..cbd3a14541f56 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -13,7 +13,7 @@ , alcotest }: -buildDunePackage rec { +buildDunePackage { pname = "opium"; inherit (opium_kernel) version src meta minimumOCamlVersion; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index e80b322ffba1b..c78adce0ac15c 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -8,7 +8,7 @@ in assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 94120f2f8b9d7..31408ebe6a4a3 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -7,7 +7,7 @@ let version = "1.5.6"; webpage = "http://sawja.inria.fr/"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index 69b276db90ec1..64f05b26dd810 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildDunePackage, base, stdio, configurator, secp256k1 }: -buildDunePackage rec { +buildDunePackage { pname = "secp256k1"; version = "0.4.0"; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 9980b3f108301..dec0af5a9c122 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -19,7 +19,7 @@ if !versionAtLeast ocaml.version "4.03" then throw "vg is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/zmq/lwt.nix b/pkgs/development/ocaml-modules/zmq/lwt.nix index 378bcf3acec04..f8fc06791b1bc 100644 --- a/pkgs/development/ocaml-modules/zmq/lwt.nix +++ b/pkgs/development/ocaml-modules/zmq/lwt.nix @@ -1,6 +1,6 @@ { buildDunePackage, zmq, ocaml_lwt }: -buildDunePackage rec { +buildDunePackage { pname = "zmq-lwt"; inherit (zmq) version src meta; diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 54df32f3eb20d..6eed57c4e7c67 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,6 +1,6 @@ { fetchurl, buildPerlPackage, DBI, DevelChecklib, mysql }: -buildPerlPackage rec { +buildPerlPackage { pname = "DBD-mysql"; version = "4.050"; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 0e65a9b990edf..91cf01847090d 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -27,7 +27,7 @@ in let suffix = if stdenv.is64bit then "64" else "32"; in -rec { +{ # Build the latest VM spur = pharo-vm-build rec { name = "pharo-spur${suffix}"; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index 48878995bb4e8..0862fa63072d5 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -18,7 +18,7 @@ let in -buildPythonPackage rec { +buildPythonPackage { pname = "PyLD"; version = "0.7.2"; diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix index 83dab71e22165..4e37d18a9f3ae 100644 --- a/pkgs/development/python-modules/adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -7,7 +7,7 @@ , pytest , mock }: -buildPythonPackage rec { +buildPythonPackage { pname = "adb-homeassistant"; version = "1.3.1"; diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix index c79f9a5a73e39..73ce99eb75255 100644 --- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -8,7 +8,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "azure-mgmt-billing"; version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix index 86e323be1686d..ed0cb18aff335 100644 --- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix @@ -8,7 +8,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "azure-mgmt-commerce"; version = "1.0.1"; diff --git a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix index 6a0c04c58cc94..51e1c08e63dc2 100644 --- a/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix +++ b/pkgs/development/python-modules/azure-servicemanagement-legacy/default.nix @@ -5,7 +5,7 @@ , requests }: -buildPythonPackage rec { +buildPythonPackage { version = "0.20.7"; pname = "azure-servicemanagement-legacy"; diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 3cd37617a3935..1436574797108 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -5,7 +5,7 @@ , pythonOlder }: -if !(pythonOlder "3.3") then null else buildPythonPackage rec { +if !(pythonOlder "3.3") then null else buildPythonPackage { pname = "backports.shutil_get_terminal_size"; version = "unstable-2016-02-21"; diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix index a210b5b44aae7..56a60de59793e 100644 --- a/pkgs/development/python-modules/baselines/default.nix +++ b/pkgs/development/python-modules/baselines/default.nix @@ -15,7 +15,7 @@ , mpi4py }: -buildPythonPackage rec { +buildPythonPackage { pname = "baselines"; version = "0.1.6"; # remember to manually adjust the rev diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index bd19b8eb33e2e..88ef71cabdf17 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -15,7 +15,7 @@ let visualizationSupport = (pyqtgraph != null); in -buildPythonPackage rec { +buildPythonPackage { pname = "binwalk"; version = "2.1.1"; diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index dfd4d8f0cbf10..f998ebca06d9c 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchFromGitHub , pybluez }: -buildPythonPackage rec { +buildPythonPackage { pname = "bt-proximity"; version = "0.0.20180217"; diff --git a/pkgs/development/python-modules/bugz/default.nix b/pkgs/development/python-modules/bugz/default.nix index 4af8b247fcf39..57ec37285744d 100644 --- a/pkgs/development/python-modules/bugz/default.nix +++ b/pkgs/development/python-modules/bugz/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "bugz-0.9.3"; version = "0.13"; diff --git a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix index 7f4857a953197..a12a12547e968 100644 --- a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix +++ b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix @@ -4,7 +4,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { version = "asynkdev"; pname = "caldavclientlibrary-asynk"; diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 1afe23416331b..a76e05332f190 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -5,7 +5,7 @@ , can , canmatrix }: -buildPythonPackage rec { +buildPythonPackage { pname = "canopen"; version = "0.5.1"; diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix index c6338fce56bcc..7fa3a2b471de6 100644 --- a/pkgs/development/python-modules/chevron/default.nix +++ b/pkgs/development/python-modules/chevron/default.nix @@ -4,7 +4,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { pname = "chevron"; version = "0.13.1"; diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix index 3aece4020e6c3..c3e6a120ae787 100644 --- a/pkgs/development/python-modules/cliapp/default.nix +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -5,7 +5,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "cliapp"; version = "1.20150305"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/closure-linter/default.nix b/pkgs/development/python-modules/closure-linter/default.nix index f6c94ace1fad0..b814455da3ff6 100644 --- a/pkgs/development/python-modules/closure-linter/default.nix +++ b/pkgs/development/python-modules/closure-linter/default.nix @@ -8,7 +8,7 @@ /* There is a project called "closure-linter" on PyPI that is the same as this, but it does not appear to be owned by Google. So we're pulling from Google's GitHub repo instead. */ -buildPythonPackage rec { +buildPythonPackage { pname = "closure-linter"; version = "2.3.19"; diff --git a/pkgs/development/python-modules/cntk/default.nix b/pkgs/development/python-modules/cntk/default.nix index 43a7b7646dae5..ce388bb1d5d29 100644 --- a/pkgs/development/python-modules/cntk/default.nix +++ b/pkgs/development/python-modules/cntk/default.nix @@ -14,7 +14,7 @@ let cntk = pkgs.cntk; in -buildPythonPackage rec { +buildPythonPackage { inherit (cntk) name version src; nativeBuildInputs = [ swig openmpi ]; diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index 4722b049edf7c..46fcc378be9d1 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "contextlib2"; version = "0.5.5"; - src = fetchPypi rec { + src = fetchPypi { inherit pname version; sha256 = "509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48"; }; diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 05fa3aa835a3f..2e205ce695574 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -6,7 +6,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { name = "deskcon-0.3"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 8a51227da0e4b..4ce61680f03bd 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -18,7 +18,7 @@ let version = "1.33"; # first build all binaries and generate setup.py using bazel - bazel-build = buildBazelPackage rec { + bazel-build = buildBazelPackage { name = "dm-sonnet-bazel-${version}"; src = fetchFromGitHub { @@ -60,7 +60,7 @@ let }; # now use pip to install the package prepared by bazel -in buildPythonPackage rec { +in buildPythonPackage { pname = "dm-sonnet"; inherit version; diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index deeb8ce064209..a12a63c46f143 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -15,7 +15,7 @@ # , fetchPypi }: -buildPythonPackage rec { +buildPythonPackage { pname = "dogtail"; version = "0.9.10"; diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index beaca07575073..538a861c9f4cd 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -4,7 +4,7 @@ , six }: -buildPythonPackage rec { +buildPythonPackage { version = "2016-01-04"; pname = "dopy"; diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix index 731b83294a8fe..cbb5ca56fed5d 100644 --- a/pkgs/development/python-modules/filemagic/default.nix +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, file , isPy3k, mock, unittest2 }: -buildPythonPackage rec { +buildPythonPackage { pname = "filemagic"; version = "1.6"; diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix index edc873458a11c..653e39b17401e 100644 --- a/pkgs/development/python-modules/flask-silk/default.nix +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -4,7 +4,7 @@ , flask }: -buildPythonPackage rec { +buildPythonPackage { pname = "Flask-Silk"; version = "2018-06-28"; diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index e0b6b3e49fa4b..f9ad118673ac2 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -7,7 +7,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { name = "gateone-1.2-0d57c3"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index d352d6def24fa..c8ff60b318b73 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -10,7 +10,7 @@ , evernote }: -buildPythonPackage rec { +buildPythonPackage { version = "2015-05-11"; pname = "geeknote"; disabled = ! isPy27; diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix index 9c8d6ca93e050..311815ef3313f 100644 --- a/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix @@ -5,7 +5,7 @@ , google_auth }: -buildPythonPackage rec { +buildPythonPackage { pname = "google-cloud-testutils"; version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d"; diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index b0e418913b7d2..c6fddd1554c28 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }: -buildPythonPackage rec { +buildPythonPackage { pname = "GreatFET"; version = "2019.5.1.dev0"; diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index 46b0dde636af9..3cd89a7d0e1e3 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -4,7 +4,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "gyp"; version = "2015-06-11"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix index 377ed8549cff6..1778e5a81af67 100644 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -6,7 +6,7 @@ , requests }: -buildPythonPackage rec { +buildPythonPackage { pname = "ipfsapi"; version = "0.4.2.post1"; disabled = isPy27; diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index c65c5f21e5673..54d9aff280f6a 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pytest }: -buildPythonPackage rec { +buildPythonPackage { pname = "iso3166"; version = "0.8"; diff --git a/pkgs/development/python-modules/jsonwatch/default.nix b/pkgs/development/python-modules/jsonwatch/default.nix index 177b0d4cfee97..1b859e21e9042 100644 --- a/pkgs/development/python-modules/jsonwatch/default.nix +++ b/pkgs/development/python-modules/jsonwatch/default.nix @@ -5,7 +5,7 @@ , isPyPy }: -buildPythonPackage rec { +buildPythonPackage { pname = "jsonwatch"; version = "0.2.0"; disabled = isPyPy; # doesn't find setuptools diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index c456d67ac4982..e89b606879bb9 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -7,7 +7,7 @@ , enum34 }: -buildPythonPackage rec { +buildPythonPackage { pname = "libsoundtouch"; version = "0.4.0"; diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix index dd40ac8518652..9b262007706f0 100644 --- a/pkgs/development/python-modules/lpod/default.nix +++ b/pkgs/development/python-modules/lpod/default.nix @@ -7,7 +7,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { version = "1.1.7"; pname = "python-lpod"; # lpod library currently does not support Python 3.x diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix index a078d33a88957..26be7020c6665 100644 --- a/pkgs/development/python-modules/lxc/default.nix +++ b/pkgs/development/python-modules/lxc/default.nix @@ -5,7 +5,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-lxc-unstable"; version = "2016-08-25"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix index 41c932ed11170..3022eb52f502c 100644 --- a/pkgs/development/python-modules/magic/default.nix +++ b/pkgs/development/python-modules/magic/default.nix @@ -3,7 +3,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { name = "${pkgs.file.name}"; src = pkgs.file.src; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 3fbb36a37188e..0d5d8d75a368e 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -5,7 +5,7 @@ , pyparsing }: -buildPythonPackage rec { +buildPythonPackage { name = "mutag-0.0.2-2ffa0258ca"; disabled = ! isPy3k; diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix index 904284e5b332d..868700b622372 100644 --- a/pkgs/development/python-modules/muttils/default.nix +++ b/pkgs/development/python-modules/muttils/default.nix @@ -4,7 +4,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "muttils"; version = "1.3"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index f2e38a0e9b3b8..65eb2d44ffccc 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -8,7 +8,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { inherit (pkgs.mxnet) name version src meta; buildInputs = [ pkgs.mxnet ]; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix index b6e323ff9c69e..31662cd3941aa 100644 --- a/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, nanomsg }: -buildPythonPackage rec { +buildPythonPackage { pname = "nanomsg-python"; version = "1.0.20190114"; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 0b0220d32460c..0f84486674e95 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -4,7 +4,7 @@ let pname = "nbxmpp"; version = "0.6.10"; name = "${pname}-${version}"; -in buildPythonPackage rec { +in buildPythonPackage { inherit pname version; # Tests aren't included in PyPI tarball. src = fetchzip { diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix index 6aadd7f4533d7..f3a1d6514eb59 100644 --- a/pkgs/development/python-modules/notify/default.nix +++ b/pkgs/development/python-modules/notify/default.nix @@ -6,7 +6,7 @@ , pkgs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "python-notify"; version = "0.1.1"; diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index ec641420f6524..567977a84f547 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -4,7 +4,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { name = "python-${pkgs.notmuch.name}"; src = pkgs.notmuch.src; diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index c28f22aa5ec9e..8e294f290cbde 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -8,7 +8,7 @@ , git }: -buildPythonPackage rec { +buildPythonPackage { version = "unstable-20160819"; pname = "nxt-python"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index 116ba717add66..a9598825dd00e 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -4,7 +4,7 @@ , pyusb }: -buildPythonPackage rec { +buildPythonPackage { pname = "openant-unstable"; version = "2017-02-11"; diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index 4c0d4346ee796..694b87581cd64 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -4,7 +4,7 @@ , pythonPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { # compilation error in 2.9.0 https://gitlab.com/stuko/ovito/issues/40 # This is not the "released" 3.0.0 just a commit version = "3.0.0"; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 69dce2723ebbd..fcd3d997dcd80 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; -buildPythonPackage rec { +buildPythonPackage { inherit (protobuf) name src version; inherit disabled doCheck; diff --git a/pkgs/development/python-modules/ptable/default.nix b/pkgs/development/python-modules/ptable/default.nix index 02429f589cfc8..f1118325610ce 100644 --- a/pkgs/development/python-modules/ptable/default.nix +++ b/pkgs/development/python-modules/ptable/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, nose }: -buildPythonPackage rec { +buildPythonPackage { pname = "ptable"; version = "unstable-2019-06-14"; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index ece8938749392..fbaa1cfad7104 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -7,7 +7,7 @@ , numpy ? null }: -buildPythonPackage rec { +buildPythonPackage { pname = "purepng"; version = "0.2.0"; diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix index 8f074943dd322..f9737b935833c 100644 --- a/pkgs/development/python-modules/pybfd/default.nix +++ b/pkgs/development/python-modules/pybfd/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }: -buildPythonPackage rec { +buildPythonPackage { pname = "pybfd"; version = "-0.1.1.2017-12-31"; diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix index 1cd95c83fa2e2..4dcc343402565 100644 --- a/pkgs/development/python-modules/pyblock/default.nix +++ b/pkgs/development/python-modules/pyblock/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.53"; md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; - src = pkgs.fetchurl rec { + src = pkgs.fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/python-pyblock/" + "${pname}-${version}.tar.bz2/${md5_path}/${pname}-${version}.tar.bz2"; sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 163477a272511..b3e31a9bc7889 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -4,7 +4,7 @@ let rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; -in buildPythonPackage rec { +in buildPythonPackage { pname = "pycangjie"; version = "1.3_rev_${rev}"; format = "other"; diff --git a/pkgs/development/python-modules/pycuda/compyte.nix b/pkgs/development/python-modules/pycuda/compyte.nix index c441cea5f45d9..cfa685c1ac9ce 100644 --- a/pkgs/development/python-modules/pycuda/compyte.nix +++ b/pkgs/development/python-modules/pycuda/compyte.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -mkDerivation rec { +mkDerivation { pname = "compyte"; version = "git-20150817"; diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix index 9b04f2b6fcb4e..01428d41b7d20 100644 --- a/pkgs/development/python-modules/pycurl2/default.nix +++ b/pkgs/development/python-modules/pycurl2/default.nix @@ -8,7 +8,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { pname = "pycurl2"; version = "7.20.0"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index 31a188ed17207..2e4c639465b45 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyext"; version = "0.8"; diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index 1abf04079880e..b9e15d376b5bc 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -3,7 +3,7 @@ , fetchgit }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyfantom"; version = "unstable-2013-12-18"; diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index 507310b4c51e4..c7dfdef4be487 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -27,7 +27,7 @@ let ''; }); -in buildPythonPackage rec { +in buildPythonPackage { pname = "pygmo"; version = pagmo2WithPython.version; diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index 97401f2eb166e..103e215f047be 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, future, pyusb }: -buildPythonPackage rec { +buildPythonPackage { pname = "pygreat"; version = "2019.5.1.dev0"; diff --git a/pkgs/development/python-modules/pyinputevent/default.nix b/pkgs/development/python-modules/pyinputevent/default.nix index 153b5701b267a..90d13ae07877e 100644 --- a/pkgs/development/python-modules/pyinputevent/default.nix +++ b/pkgs/development/python-modules/pyinputevent/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyinputevent"; version = "2016-10-18"; diff --git a/pkgs/development/python-modules/pykde4/default.nix b/pkgs/development/python-modules/pykde4/default.nix index 272774a23ffe3..0adab56698b8c 100644 --- a/pkgs/development/python-modules/pykde4/default.nix +++ b/pkgs/development/python-modules/pykde4/default.nix @@ -3,13 +3,13 @@ let kdelibs = callPackage ./kdelibs.nix {}; - sip4_19_3 = sip.overrideAttrs (oldAttrs: rec { + sip4_19_3 = sip.overrideAttrs (oldAttrs: { src = fetchurl { url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz"; sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl"; }; }); - pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: rec { + pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: { propagatedBuildInputs = [ sip4_19_3 ]; }); in stdenv.mkDerivation rec { diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix index bc06a10f97325..27827270fa172 100644 --- a/pkgs/development/python-modules/pykickstart/default.nix +++ b/pkgs/development/python-modules/pykickstart/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "1.99.39"; md5_path = "d249f60aa89b1b4facd63f776925116d"; - src = fetchurl rec { + src = fetchurl { url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/" + "${pname}-${version}.tar.gz/${md5_path}/${pname}-${version}.tar.gz"; sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix index 895171ff7138f..f198d214172d2 100644 --- a/pkgs/development/python-modules/pylev/default.nix +++ b/pkgs/development/python-modules/pylev/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pylev"; version = "1.3.0"; diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix index 234aee8436dc9..81100a8e214bf 100644 --- a/pkgs/development/python-modules/pymaging/default.nix +++ b/pkgs/development/python-modules/pymaging/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "pymaging"; version = "unstable-2016-11-16"; diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index fb92739776da6..61239f1cbe364 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -4,7 +4,7 @@ , pymaging }: -buildPythonPackage rec { +buildPythonPackage { pname = "pymaging-png"; version = "unstable-2016-11-16"; diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix index 0839cb1aa4a14..755dda341c9df 100644 --- a/pkgs/development/python-modules/pynac/default.nix +++ b/pkgs/development/python-modules/pynac/default.nix @@ -3,7 +3,7 @@ , fetchurl }: -buildPythonPackage rec { +buildPythonPackage { pname = "pynac"; version = "0.2"; diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 280981ab2c246..d02c85fb4ffdd 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -16,7 +16,7 @@ , sc2-headless }: -buildPythonPackage rec { +buildPythonPackage { pname = "PySC2"; version = "1.2"; diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 625eae7b74b9d..2dfa1f22962e6 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -9,7 +9,7 @@ , pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { pname = "pyScss"; version = "1.3.5"; diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix index 5069bbe964840..3f55a015991b3 100644 --- a/pkgs/development/python-modules/pysensors/default.nix +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: -buildPythonPackage rec { +buildPythonPackage { version = "2017-07-13"; pname = "pysensors"; diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index 0950726172d50..feeeda812f989 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -5,7 +5,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ sphinx ]); pname = "pyside-generatorrunner"; version = "0.6.16"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/development/python-modules/pyside2-tools/default.nix b/pkgs/development/python-modules/pyside2-tools/default.nix index 5314a5cc71353..a96ea5d32ff85 100644 --- a/pkgs/development/python-modules/pyside2-tools/default.nix +++ b/pkgs/development/python-modules/pyside2-tools/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, wrapPython, python, fetchurl, stdenv, cmake, qt5, shiboken2, pyside2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pyside2-tools"; inherit (pyside2) version src; diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix index 45ff5a9b5b49d..5c3a6bb26f86e 100644 --- a/pkgs/development/python-modules/pysparse/default.nix +++ b/pkgs/development/python-modules/pysparse/default.nix @@ -8,7 +8,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { pname = "pysparse"; version = "1.3-dev"; disabled = !isPy27; diff --git a/pkgs/development/python-modules/python-unshare/default.nix b/pkgs/development/python-modules/python-unshare/default.nix index e6425c3004781..a7f0bd93b0af9 100644 --- a/pkgs/development/python-modules/python-unshare/default.nix +++ b/pkgs/development/python-modules/python-unshare/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-unshare"; # pypi version doesn't support Python 3 and the package didn't update for a long time: # https://github.com/TheTincho/python-unshare/pull/8 diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 93fa36fa2fcfc..8a160da29648d 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -7,7 +7,7 @@ , stdenv }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-xmp-toolkit"; version = "2.0.2"; diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 8a49e8418fd0e..00f15f801d16c 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -11,7 +11,7 @@ , pythonOlder }: -buildPythonPackage rec { +buildPythonPackage { pname = "qasm2image"; version = "0.8.0"; diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 987c1ca904907..e8076db60534b 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -5,7 +5,7 @@ , qtbase }: with pythonPackages; -buildPythonPackage rec { +buildPythonPackage { pname = "qscintilla"; version = qscintilla.version; src = qscintilla.src; diff --git a/pkgs/development/python-modules/qscintilla/default.nix b/pkgs/development/python-modules/qscintilla/default.nix index 06010b40ed967..e44f6205d39fc 100644 --- a/pkgs/development/python-modules/qscintilla/default.nix +++ b/pkgs/development/python-modules/qscintilla/default.nix @@ -9,7 +9,7 @@ }: disabledIf (isPy3k || isPyPy) - (buildPythonPackage rec { + (buildPythonPackage { # TODO: Qt5 support pname = "qscintilla"; version = pkgs.qscintilla.version; diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 4d80a40756467..08d4a8f36a347 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage }: -buildPythonPackage rec { +buildPythonPackage { pname = "radicale_infcloud"; version = "2017-07-27"; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index 83edfa4f1d277..a2da451905a10 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -6,7 +6,7 @@ assert useUnrar -> unrar != null; assert !useUnrar -> libarchive != null; -buildPythonPackage rec { +buildPythonPackage { pname = "rarfile"; version = "3.0"; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index e394b9646430a..2bd4217291789 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -6,7 +6,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "rbtools"; version = "0.7.2"; disabled = isPy3k; diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index 9644055b00718..c49f891ec1dea 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, python }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "python-recursive-pth-loader"; version = "1.0"; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index ac041d664ae42..46f562ee5d6dd 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -5,7 +5,7 @@ , cython }: -buildPythonPackage rec { +buildPythonPackage { pname = "rencode"; version = "git20150810"; disabled = isPy33; diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index 1a40f61cc50e9..577c21d6e0b4f 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,6 +1,6 @@ {buildPythonPackage, fetchurl, rpmextract, python, wirelesstools, gettext}: -buildPythonPackage rec { +buildPythonPackage { pname = "rhpl"; version = "0.218"; format = "other"; diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index b5952e6ee1560..8de675d4ea16c 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -4,7 +4,7 @@ , pkgs }: -buildPythonPackage rec { +buildPythonPackage { pname = "scikits.samplerate"; version = "0.3.3"; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 4072268609d2a..3201de0ba46cc 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pytest }: -buildPythonPackage rec { +buildPythonPackage { pname = "semver"; version = "2.8.1"; diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 82dfa3c4ea2af..0a0a3d8a9b2f2 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, python, fetchurl, stdenv, pyside2, cmake, qt5, llvmPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "shiboken2"; inherit (pyside2) version src; diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix index ee9444fd38ec7..312f58bf9fa9f 100644 --- a/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "simple-websocket-server"; version = "20180414"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/simplebayes/default.nix b/pkgs/development/python-modules/simplebayes/default.nix index 705b755937252..57f7df73c21d9 100644 --- a/pkgs/development/python-modules/simplebayes/default.nix +++ b/pkgs/development/python-modules/simplebayes/default.nix @@ -6,7 +6,7 @@ , isPy3k }: -buildPythonPackage rec { +buildPythonPackage { pname = "simplebayes"; version = "1.5.8"; diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 490113d6952a1..8a6971ceb8f86 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -6,7 +6,7 @@ , python }: -buildPythonPackage rec { +buildPythonPackage { name = "slob"; verison = "unstable-2016-11-03"; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix index db1a75ab7f27c..6b31145d519ab 100644 --- a/pkgs/development/python-modules/snappergui/default.nix +++ b/pkgs/development/python-modules/snappergui/default.nix @@ -5,7 +5,7 @@ , dbus-python }: -buildPythonPackage rec { +buildPythonPackage { pname = "Snapper-GUI"; version = "0.1"; diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 967e365dde0cf..71b643e5cb58f 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -14,7 +14,7 @@ , codecov }: -buildPythonPackage rec { +buildPythonPackage { pname = "stumpy"; version = "1.0"; diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index 024fd136c403c..eeef94e6c7654 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -4,7 +4,7 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { name = pkgs.subunit.name; src = pkgs.subunit.src; diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix index 4eff644a1616c..a903aae104efd 100644 --- a/pkgs/development/python-modules/tempita/default.nix +++ b/pkgs/development/python-modules/tempita/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, nose }: -buildPythonPackage rec { +buildPythonPackage { version = "0.5.3-2016-09-28"; pname = "tempita"; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 0f03adfccf5c1..b585ab4f81b53 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -63,7 +63,7 @@ let ''; }; }; -in buildPythonPackage rec { +in buildPythonPackage { inherit version pname; format = "wheel"; diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index a562ba8f2fad0..f7e3906ee1fb2 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -45,7 +45,7 @@ let variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; -in buildPythonPackage rec { +in buildPythonPackage { inherit pname; inherit (packages) version; format = "wheel"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 899e893684368..2468a3b3f7d73 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -61,7 +61,7 @@ let # TODO: remove after there's support for setupPyDistFlags setuppy = ../../../development/interpreters/python/run_setup.py; - bazel-build = buildBazelPackage rec { + bazel-build = buildBazelPackage { name = "${pname}-${version}"; src = fetchFromGitHub { @@ -300,7 +300,7 @@ let }; }; -in buildPythonPackage rec { +in buildPythonPackage { inherit version pname; src = bazel-build.python; diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index 987fbf010197e..c168492be721a 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -6,7 +6,7 @@ , scipy }: -buildPythonPackage rec { +buildPythonPackage { pname = "tess"; version = "unstable-2019-05-07"; diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index bd242c62ab8d3..ba910f75e1998 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -5,7 +5,7 @@ , isPyPy }: -buildPythonPackage rec { +buildPythonPackage { name = "tkinter-${python.version}"; src = py; format = "other"; diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 848c114543d24..27c4ac2468ffd 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -4,7 +4,7 @@ , cmake }: -buildPythonPackage rec { +buildPythonPackage { pname = "tlsh"; version = "3.4.5"; diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index 3aeb84113c2d7..ef3b1c78c3990 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -6,7 +6,7 @@ , pytestcov }: -buildPythonPackage rec { +buildPythonPackage { pname = "typesentry"; version = "0.2.7"; diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index c230cd9cfa6ed..6b3ca778ead14 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, django_1_8, waitress }: -buildPythonPackage rec { +buildPythonPackage { pname = "waitress-django"; version = "0.0.0"; diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index ef6089baa507f..7cf69fdb614da 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -2,7 +2,7 @@ , mock , boto3, envs, python-jose, requests }: -buildPythonPackage rec { +buildPythonPackage { pname = "warrant"; version = "0.6.1"; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index d672cb8bae908..97530989a382d 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -11,7 +11,7 @@ , fetchFromGitHub }: -buildPythonPackage rec { +buildPythonPackage { pname = "wordfreq"; version = "2.2.0"; diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index c75362436e4a3..81a8d05f5bf0c 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -12,7 +12,7 @@ , datatable }: -buildPythonPackage rec { +buildPythonPackage { pname = "xgboost"; inherit (xgboost) version src meta; diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix index d1cab88b45b8b..ce993d3d41a68 100644 --- a/pkgs/development/python-modules/zerobin/default.nix +++ b/pkgs/development/python-modules/zerobin/default.nix @@ -7,7 +7,7 @@ , clize }: -buildPythonPackage rec { +buildPythonPackage { pname = "zerobin"; version = "20160108"; diff --git a/pkgs/development/python-modules/zxcvbn/default.nix b/pkgs/development/python-modules/zxcvbn/default.nix index 8c9a0af142cb1..67f48f34731d1 100644 --- a/pkgs/development/python-modules/zxcvbn/default.nix +++ b/pkgs/development/python-modules/zxcvbn/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pytest }: -buildPythonPackage rec { +buildPythonPackage { pname = "zxcvbn"; version = "4.4.28"; diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index f5854a6533d1c..ff9b1bac321c7 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -1,6 +1,6 @@ { lib, bundlerApp, bundlerUpdateScript }: -bundlerApp rec { +bundlerApp { pname = "solargraph"; exes = ["solargraph" "solargraph-runtime"]; gemdir = ./.; diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 36fa7bb1f1613..c250f442a0ebf 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 7afa71429a75d..20fe74ecb74db 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 fb0f7414841cf..d9f39667ceff1 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 2db6b821b4e1e..a59a47b9e338b 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 86e4d6ef5f699..922a73a4be094 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 ba842289dba4d..23ffe28682418 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 60a011a49d07b..f14aa4eea6e29 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 24df6fa6ff3bc..7b29e7d02dc6b 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 0ec57cc8b82c2..3a737f6f3b3f7 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 28697f4c69cd3..7d08bbf6df2c0 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 612dd5c7810da..19ce0b44bf72e 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 317186ea3e0ea..3e6d66048851c 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 001f87b3b279d..8a1d81acaaa79 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 921448855a642..d5c7420141899 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 0390e7b86bbc9..a83b5a2194401 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 ca87395b9179c..070c7c81c403c 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 461acacf4e993..9e75088aa5cba 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 9dff0cc3ebed1..4f3d89c07881b 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 eb6f937800aac..4fb05da306783 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 39aab9cfa2781..9a14cc7f6e218 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 20d1f7c0f1e3e..fd22295540d0b 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 25b80d9cf6977..6caa32c16f2bf 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 009f475bb7dd7..ee15df1a9f6f5 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 c86c2e275ed13..d170936951146 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 b394e9e71fbf4..549a4d1b8266b 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 035964dafc01b..f2c926a6f391c 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 ad71dfb22a8f4..a6cb7a92b6398 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 a82c21b72e9e2..e6c562721c280 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 1691f09e6e41f..1dea14401138b 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 a5dd0a8827281..f921e900e56bb 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 664e7d28d7916..b3d380b0a0ad7 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 ea9b340fb0b74..c246ddb9d9055 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 c33741740adc9..210659289d1e2 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 0d78cfbbab8c1..6548e9643971a 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 0577165bcff45..4eeb61a7edd9c 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 4170570e08aa6..956a8df69cea0 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 daf39318432ab..e1b89d07cdfd4 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 02d480cf2cd50..c43509a4f43bc 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 a1c9e85a83abf..5bccea9ced882 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 afe9b59e012d7..ab2ab0de9cf93 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 77d4c5771f90e..b8fa02306c4d3 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 ce62634e7d7a8..518d128890a93 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 af3b45a8e62cd..8af1217079866 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 c0e7a3653a869..7bfff6328269d 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 7b6048eb475d8..e2d507ab80134 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 29d809b5f05e5..fb38d096ab436 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 613fd2673d56d..7741f2d4ffbcb 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 68409a59f3716..bad3ecd924136 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 e2ea96cd590bf..e1726efc40c1f 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 6edf6551b068c..caecad4b678a5 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 1424b8fe19745..04827fade70de 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 b409009b524e4..12f0b13a6602a 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 689b7da880211..6e0014b377325 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 06945f10eb23a..b07ab21fdf102 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 081e86c44dde7..068028c7da914 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 159260750a25e..90d74414308e1 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 90e88979de409..d1ff9eee81797 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 65afee16afbdd..5c8f4377e8d77 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 4b2b14d317b49..344352467e9b3 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 277973afba8a2..3adad22bd9c35 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 5b5f7d18f797b..2ff9ddbcf9e12 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 c24162cccf75f..c39c985183ad9 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 90b092f0e4b6c..04aeab5f43195 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 dbf33424439d3..91e2e67eaf1b1 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 0ed7312660a12..cf5372bdc2024 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 87490bcb617fe..53482598f1341 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 763642e5da1bb..df4c0f2d12c2e 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 b10b7bdae57b4..4a8a9da28a7bc 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 137f56bee59e6..cc33b675954a5 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 f29153334273c..af295eb242f6d 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 7e09b0a8cd382..e555f1d598547 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 3a46c6c8f01e3..fc2c769958393 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 d41c113821adb..e10fe49b1e45d 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 aa7b63dafea98..009ebe8e2ff0c 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 6d6a02ab49f4e..77c1df6f43e3e 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 b5dfe3c8bfd9d..060875924d80b 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 1b3bc7a216266..c8f7ccb18d599 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 6af444c7ce046..d9433f535dad8 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 a2ab9a47a79a2..d92003a575e15 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 51801864796e9..e4762796c18a8 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 5d965fc87a7ee..9a6393977d7fb 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 bd8a013fe2d05..ab70552c2e8c5 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 79afb54bfb702..1f789a6ade5da 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 05f7805a55aca..9a87f5f936941 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 82b6d7e1161ab..27e87d212e68b 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 786cac68425a6..e7b21c40f17bd 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 d24c3e88b8cb0..e26431b268751 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 3a7221e99ebe2..74f1f22426f9a 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 0ca7e37ef7064..895cedd70108a 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 e8173a6b5b0d4..df0c360f75c37 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 b0768ca4b7e54..e6dccbd332e18 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 0874c9e551557..8090aca5ff303 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 ece440c692f77..f31a119bb657a 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 82e4402361d95..f5989390c4b02 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 ]; diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 82faf32a32100..57fedb78407e1 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: -perlPackages.buildPerlPackage rec { +perlPackages.buildPerlPackage { pname = "wml"; version = "2.0.11"; |