diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/emscripten-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/haxe-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/make-tarball.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 42 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release-small.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 2 |
10 files changed, 41 insertions, 41 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7f0c6b6c58..c8a665677b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2347,7 +2347,7 @@ in m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; - mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { + mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -2495,7 +2495,7 @@ in curl = callPackage ../tools/networking/curl { }; - curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; curlie = callPackage ../tools/networking/curlie { }; @@ -3024,7 +3024,7 @@ in m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; - mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { + mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -4863,7 +4863,7 @@ in mt-st = callPackage ../tools/backup/mt-st {}; - multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec { + multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; libbtree = callPackage ../tools/text/multitran/libbtree { }; @@ -12531,7 +12531,7 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; - libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec { + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { src = pkgs.fetchurl { url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; @@ -17973,7 +17973,7 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; - emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec { + emacsPackagesFor = emacs: self: let callPackage = newScope self; in { inherit emacs; autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { }; @@ -19353,7 +19353,7 @@ in links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone rec { + linphone = callPackage ../applications/networking/instant-messengers/linphone { polarssl = mbedtls_1_3; }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index df9d3dbcff5..7496449c044 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -82,7 +82,7 @@ rec { # Each field in this tuple represents all Beam packages in nixpkgs built with # appropriate Erlang/OTP version. - packages = rec { + packages = { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index e89a7d9df2a..f06b4f1c286 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -430,14 +430,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - Deedle = fetchNuGet rec { + Deedle = fetchNuGet { baseName = "Deedle"; version = "1.2.5"; sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw"; outputFiles = [ "*" ]; }; - ExcelDna = buildDotnetPackage rec { + ExcelDna = buildDotnetPackage { baseName = "Excel-DNA"; version = "0.32.0"; @@ -496,7 +496,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - ExtCore = buildDotnetPackage rec { + ExtCore = buildDotnetPackage { baseName = "ExtCore"; version = "0.8.46"; @@ -564,7 +564,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - FSharpCompilerService = buildDotnetPackage rec { + FSharpCompilerService = buildDotnetPackage { baseName = "FSharp.Compiler.Service"; version = "0.0.90"; @@ -667,7 +667,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # }; # }; - GitVersionTree = buildDotnetPackage rec { + GitVersionTree = buildDotnetPackage { baseName = "GitVersionTree"; version = "2013-10-01"; @@ -927,7 +927,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - UnionArgParser = buildDotnetPackage rec { + UnionArgParser = buildDotnetPackage { baseName = "UnionArgParser"; version = "0.8.7"; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 5b5b32b89da..a36c89fac0a 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -134,7 +134,7 @@ rec { zlib = (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation - (old: rec { + (old: { buildInputs = old.buildInputs ++ [ pkgconfig ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 35b0b42da3f..06b82a478a8 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -99,7 +99,7 @@ let hxnodejs_6 = let libname = "hxnodejs"; version = "6.9.0"; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { name = "${libname}-${version}"; src = fetchFromGitHub { owner = "HaxeFoundation"; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 6f30bd06a81..288971403f1 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -11,7 +11,7 @@ with pkgs; -releaseTools.sourceTarball rec { +releaseTools.sourceTarball { name = "nixpkgs-tarball"; src = nixpkgs; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 879ffc9f441..fc6d7674338 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -15,7 +15,7 @@ let isPhp73 = pkgs.lib.versionAtLeast php.version "7.3"; - apcu = buildPecl rec { + apcu = buildPecl { version = "5.1.17"; pname = "apcu"; @@ -29,7 +29,7 @@ let outputs = [ "out" "dev" ]; }; - apcu_bc = buildPecl rec { + apcu_bc = buildPecl { version = "1.0.5"; pname = "apcu_bc"; @@ -38,7 +38,7 @@ let buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; - ast = buildPecl rec { + ast = buildPecl { version = "1.0.3"; pname = "ast"; @@ -142,7 +142,7 @@ let ]; }; - event = buildPecl rec { + event = buildPecl { version = "2.5.3"; pname = "event"; @@ -167,7 +167,7 @@ let }; }; - igbinary = buildPecl rec { + igbinary = buildPecl { version = "3.0.1"; pname = "igbinary"; @@ -178,7 +178,7 @@ let outputs = [ "out" "dev" ]; }; - imagick = buildPecl rec { + imagick = buildPecl { version = "3.4.4"; pname = "imagick"; @@ -189,7 +189,7 @@ let buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; - mailparse = buildPecl rec { + mailparse = buildPecl { version = "3.0.3"; pname = "mailparse"; @@ -232,7 +232,7 @@ let ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; }; - oci8 = buildPecl rec { + oci8 = buildPecl { version = "2.2.0"; pname = "oci8"; @@ -245,14 +245,14 @@ let ''; }; - pcs = buildPecl rec { + pcs = buildPecl { version = "1.3.3"; pname = "pcs"; sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; }; - pdo_sqlsrv = buildPecl rec { + pdo_sqlsrv = buildPecl { version = "5.6.1"; pname = "pdo_sqlsrv"; @@ -427,7 +427,7 @@ let pinba = if isPhp73 then pinba73 else pinba7; - pinba7 = assert !isPhp73; buildPecl rec { + pinba7 = assert !isPhp73; buildPecl { version = "1.1.1"; pname = "pinba"; @@ -448,7 +448,7 @@ let }; }; - pinba73 = assert isPhp73; buildPecl rec { + pinba73 = assert isPhp73; buildPecl { version = "1.1.2-dev"; pname = "pinba"; @@ -469,7 +469,7 @@ let }; }; - protobuf = buildPecl rec { + protobuf = buildPecl { version = "3.9.0"; pname = "protobuf"; @@ -529,7 +529,7 @@ let buildInputs = with pkgs; [ pcre.dev ]; }; - pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec { + pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl { version = "3.2.0-dev"; pname = "pthreads"; @@ -543,14 +543,14 @@ let buildInputs = with pkgs; [ pcre2.dev ]; }; - redis = buildPecl rec { + redis = buildPecl { version = "5.0.2"; pname = "redis"; sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f"; }; - sqlsrv = buildPecl rec { + sqlsrv = buildPecl { version = "5.6.1"; pname = "sqlsrv"; @@ -559,7 +559,7 @@ let buildInputs = [ pkgs.unixODBC ]; }; - v8 = buildPecl rec { + v8 = buildPecl { version = "0.2.2"; pname = "v8"; @@ -570,7 +570,7 @@ let meta.broken = true; }; - v8js = assert !isPhp73; buildPecl rec { + v8js = assert !isPhp73; buildPecl { version = "2.1.0"; pname = "v8js"; @@ -581,7 +581,7 @@ let meta.broken = true; }; - xdebug = buildPecl rec { + xdebug = buildPecl { version = "2.7.1"; pname = "xdebug"; @@ -591,7 +591,7 @@ let checkTarget = "test"; }; - yaml = buildPecl rec { + yaml = buildPecl { version = "2.0.4"; pname = "yaml"; @@ -604,7 +604,7 @@ let nativeBuildInputs = [ pkgs.pkgconfig ]; }; - zmq = assert !isPhp73; buildPecl rec { + zmq = assert !isPhp73; buildPecl { version = "1.1.3"; pname = "zmq"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee0ba2ba951..510953f7699 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2656,7 +2656,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; - pycuda = callPackage ../development/python-modules/pycuda rec { + pycuda = callPackage ../development/python-modules/pycuda { cudatoolkit = pkgs.cudatoolkit_7_5; inherit (pkgs.stdenv) mkDerivation; }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 17239c6d879..1ed3601270f 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -14,7 +14,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; officialRelease = false; }; -} // (mapTestOn (rec { +} // (mapTestOn ({ aspell = all; at = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3437f620c74..7ae164acb2f 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -185,7 +185,7 @@ let }; }; - } // (mapTestOn ((packagePlatforms pkgs) // rec { + } // (mapTestOn ((packagePlatforms pkgs) // { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; idrisPackages = packagePlatforms pkgs.idrisPackages; |