From 08f68313a47a2093dc0f408a706b2c125bc59c95 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 13 Aug 2019 21:52:01 +0000 Subject: treewide: remove redundant rec --- pkgs/development/interpreters/ceptre/default.nix | 2 +- pkgs/development/interpreters/clips/default.nix | 2 +- pkgs/development/interpreters/clojurescript/lumo/default.nix | 2 +- pkgs/development/interpreters/elixir/1.5.nix | 2 +- pkgs/development/interpreters/elixir/1.6.nix | 2 +- pkgs/development/interpreters/elixir/1.7.nix | 2 +- pkgs/development/interpreters/elixir/1.8.nix | 2 +- pkgs/development/interpreters/elixir/1.9.nix | 2 +- pkgs/development/interpreters/erlang/R16B02-basho.nix | 2 +- pkgs/development/interpreters/erlang/R18.nix | 2 +- pkgs/development/interpreters/erlang/R19.nix | 2 +- pkgs/development/interpreters/erlang/R20.nix | 2 +- pkgs/development/interpreters/erlang/R21.nix | 2 +- pkgs/development/interpreters/erlang/R22.nix | 2 +- pkgs/development/interpreters/falcon/default.nix | 2 +- pkgs/development/interpreters/love/0.10.nix | 2 +- pkgs/development/interpreters/love/11.1.nix | 2 +- pkgs/development/interpreters/lua-5/filesystem.nix | 2 +- pkgs/development/interpreters/maude/default.nix | 2 +- pkgs/development/interpreters/metamath/default.nix | 2 +- pkgs/development/interpreters/pyrex/0.9.5.nix | 2 +- pkgs/development/interpreters/pyrex/0.9.6.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/2.7-html.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/2.7-text.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/3.7-html.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/3.7-text.nix | 2 +- pkgs/development/interpreters/python/cpython/docs/template.nix | 2 +- pkgs/development/interpreters/python/pypy/default.nix | 2 +- pkgs/development/interpreters/python/pypy/prebuilt.nix | 2 +- pkgs/development/interpreters/qnial/default.nix | 2 +- pkgs/development/interpreters/racket/default.nix | 2 +- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- pkgs/development/interpreters/self/default.nix | 2 +- pkgs/development/interpreters/spidermonkey/1.8.5.nix | 2 +- pkgs/development/interpreters/spidermonkey/52.nix | 2 +- pkgs/development/interpreters/spidermonkey/60.nix | 2 +- pkgs/development/interpreters/tcl/generic.nix | 2 +- pkgs/development/interpreters/unicon-lang/default.nix | 2 +- pkgs/development/interpreters/wasmtime/default.nix | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 29d63f1d0048..cde9146f78c6 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 918c577356cd..c70bfd9406e0 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 ab8e616ac6d5..0e9d81d5e959 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 d32f91275652..229c42d9f7b2 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 73afcbd1597e..94dffd1f763d 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 adbbbaff890b..10ebd5438a11 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 e240e1907e06..931fa50b1f72 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 41601eeaa118..b9b2400b78b9 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 c263551de2da..11637868ed0f 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 58b7fd71f0be..e9d9366851eb 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 25a3f662565c..d5f3afe5f3df 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 016e175d6b56..3a33e55767b4 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 e21bf6dafbff..fdd034fc6075 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 a8c05513c5a6..8b471f632471 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 744a0f76ff09..39d4918a70bf 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 07ce9347cf70..bba54c83f5c5 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 7adaca7b8656..1c64c417cb0c 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 0ac1fa30e2f8..64050ea95f87 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 afd2627d20ec..e44209799a31 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 cd325c949489..686cfee19a6d 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 009f9b48ea4e..d8e687980aa7 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 d79cd58c1598..21b8a7da06eb 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 73d1e0ea9fd7..e27959c05e8d 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 54c0954ae5d0..0226f7cd8809 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 059908029c0b..88d1a6931668 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 53c5aa3b629b..ea35e9fb6a35 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 5a6dcc63225e..45783eb82632 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 a122d7519f5d..998af644c718 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 4473f2e351c4..1c6aea5ee3c1 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 d9d21bfe3a57..32388780f6ff 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 4a0c84fb272e..3cc0c2a9ee85 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 3e86ddef4ed4..8154a87f667d 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 af933f0a4bd0..aa709bdc646d 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 3b41e14be850..d49886da8f54 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 35bd1729866e..f13adc21d9e6 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 47d8397c9668..c9731331b79e 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 c6c8caa7cf3e..43f5758e4c49 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 e00af6213479..8f9477c4c4ac 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 1e1ea10ef6dd..238afd4bd040 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 175b2f2e7671..f62638dd8386 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 d4ec1677bfbc..3c585c3f07fa 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 30ea124cf4bb..bb4a2d01499d 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 90fc38afa061..b53b3ed9dbfb 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"; -- cgit v1.2.3