diff options
31 files changed, 124 insertions, 89 deletions
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 3fe58df2c7d..3ec220ca80d 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchurl -, imake, gccmakedep, bison, flex, pkg-config -, xlibsWrapper, libXmu, libXpm, libXp }: +{ lib +, stdenv +, fetchurl +, imake +, gccmakedep +, bison +, flex +, pkg-config +, xlibsWrapper +, libXmu +, libXpm +, libXp +}: stdenv.mkDerivation rec { pname = "Xaw3d"; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index e28ecd5f64a..48c5edd13bf 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { buildPhase = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h - '' + ( lib.optionalString stdenv.isDarwin '' + '' + (lib.optionalString stdenv.isDarwin '' sed -i s/-soname/-install_name/ Makefile - '' ) + '' + '') + '' make ''; @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.clifford.at/stfl/"; + homepage = "http://www.clifford.at/stfl/"; description = "A library which implements a curses-based widget set for text terminals"; maintainers = with lib.maintainers; [ lovek323 ]; - license = lib.licenses.lgpl3; - platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 899532564af..37a71fb2536 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,9 +1,20 @@ -{ lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus -, telepathy-farstream, telepathy-glib }: +{ lib +, stdenv +, fetchurl +, cmake +, qtbase +, pkg-config +, python3Packages +, dbus-glib +, dbus +, telepathy-farstream +, telepathy-glib +}: let inherit (python3Packages) python dbus-python; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "telepathy-qt"; version = "0.9.8"; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index 0862b71c016..6407840c443 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ tokyocabinet ]; - doCheck = false; # FIXME + doCheck = false; # FIXME meta = { description = "Network interface of the Tokyo Cabinet DBM"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice maintainers = [ ]; }; } diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index 9e674bd816d..4c8a63a0a52 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, makeWrapper}: +{ stdenv, fetchurl, unzip, makeWrapper }: let # Gradle is a build system that bootstraps itself. This is what it actually @@ -56,15 +56,18 @@ stdenv.mkDerivation { pname = "mobilesdk"; version = "7.5.1.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = "https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-linux.zip"; - sha256 = "1ihyh6szl9a2gbdgv13msd3g7i3xi9ifmgsh6v562hqlfi4lixng"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = "https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-osx.zip"; - sha256 = "1whs1j7fkk2hxr4nxq50d7ic5wj83b1i1jl0p722sqbvkmgxssa2"; - } - else throw "Platform: ${stdenv.system} not supported!"; + src = + if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then + fetchurl { + url = "https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-linux.zip"; + sha256 = "1ihyh6szl9a2gbdgv13msd3g7i3xi9ifmgsh6v562hqlfi4lixng"; + } + else if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-osx.zip"; + sha256 = "1whs1j7fkk2hxr4nxq50d7ic5wj83b1i1jl0p722sqbvkmgxssa2"; + } + else throw "Platform: ${stdenv.system} not supported!"; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 86d445fb4c6..e51775b8c6d 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, unzip, makeWrapper}: +{ stdenv, lib, fetchurl, unzip, makeWrapper }: let # Gradle is a build system that bootstraps itself. This is what it actually @@ -56,15 +56,18 @@ stdenv.mkDerivation { pname = "mobilesdk"; version = "8.2.1.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip"; - sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip"; - sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l"; - } - else throw "Platform: ${stdenv.system} not supported!"; + src = + if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then + fetchurl { + url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip"; + sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl"; + } + else if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip"; + sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l"; + } + else throw "Platform: ${stdenv.system} not supported!"; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index c372f50cf43..eadbad7e0f5 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, unzip, makeWrapper}: +{ stdenv, lib, fetchurl, unzip, makeWrapper }: let # Gradle is a build system that bootstraps itself. This is what it actually @@ -56,15 +56,18 @@ stdenv.mkDerivation { pname = "mobilesdk"; version = "8.3.2.GA"; - src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip"; - sha256 = "04pfw21jrx9w259lphynwykqjk4c9hm0zix4d40s7mf8mmh3xdx9"; - } - else if stdenv.system == "x86_64-darwin" then fetchurl { - url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip"; - sha256 = "1zflq5hc96lrriw71ya623kkskkisi9yayg8qs03zimi0gksizxw"; - } - else throw "Platform: ${stdenv.system} not supported!"; + src = + if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then + fetchurl { + url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip"; + sha256 = "04pfw21jrx9w259lphynwykqjk4c9hm0zix4d40s7mf8mmh3xdx9"; + } + else if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip"; + sha256 = "1zflq5hc96lrriw71ya623kkskkisi9yayg8qs03zimi0gksizxw"; + } + else throw "Platform: ${stdenv.system} not supported!"; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 3a158132cce..a6b63676e77 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; - patches = [ (fetchpatch { + patches = [ + (fetchpatch { url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch"; sha256 = "08cl39r98w312sw23cskd5wian6zg20isn9ki41hnbcgkazhi7pb"; }) @@ -43,7 +44,7 @@ EOF # option. Installation is handled by ocamlfind. dontAddPrefix = true; dontAddStaticConfigureFlags = true; - configurePlatforms = []; + configurePlatforms = [ ]; createFindlibDestdir = true; @@ -60,7 +61,7 @@ EOF modeled after the famous log4j logging framework for Java. ''; license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index a56dee3648b..29927aae04a 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchurl, ocaml, findlib}: +{ stdenv, lib, fetchurl, ocaml, findlib }: stdenv.mkDerivation rec { pname = "ocaml-calendar"; @@ -7,17 +7,17 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/915/calendar-${version}.tar.bz2"; sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; - }; + }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ]; createFindlibDestdir = true; - meta = { + meta = { homepage = "https://forge.ocamlcore.org/projects/calendar/"; description = "An Objective Caml library managing dates and times"; license = "LGPL"; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = [ lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index a75a6810f9f..c5a3dcde226 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A front-end for the C programming language that facilitates program analysis and transformation"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; }; } diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index ad7413d16de..c408d1a392f 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://config-file.forge.ocamlcore.org/"; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; description = "An OCaml library used to manage the configuration file(s) of an application"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/pkgs/development/ocaml-modules/csv/1.5.nix index c4fd5e85ce8..ee68782313c 100644 --- a/pkgs/development/ocaml-modules/csv/1.5.nix +++ b/pkgs/development/ocaml-modules/csv/1.5.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Chris00/ocaml-csv"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; }; } diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index 950c3688053..d7f467e8eb9 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://ocaml.janestreet.com/"; description = "Quotation expanders for enumerating finite types"; license = lib.licenses.asl20; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; }; } diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index c84d1bf579b..4d3c369d432 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; license = licenses.asl20; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; }; } diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 8382297891f..f4afe80d532 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Fontconfig bindings for OCaml"; license = lib.licenses.gpl2Plus; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix index 0c10a20c7e4..90308ee7d6d 100644 --- a/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -9,10 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns"; }; - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff"; - sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn"; - })]; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff"; + sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn"; + }) + ]; buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ocaml_pcre ]; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index d715bb7f05f..f2fbc71b5a9 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = with lib.maintainers; [ vbgl ]; homepage = "http://gtk-extras.forge.ocamlcore.org/"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index 79816e0c5bd..7caf99f4b39 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Macros for Caml Queries"; homepage = "https://github.com/ocsigen/macaque"; license = licenses.lgpl2; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 7ad81c2c71f..ea2af8dd4c8 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; homepage = "http://ygrek.org.ua/p/ocurl/"; maintainers = with lib.maintainers; [ bennofs ]; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; }; } diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index 930b281d642..9179ce3f1d1 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -18,16 +18,17 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; configurePhase = "ocaml setup.ml -configure"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + buildPhase = "ocaml setup.ml -build"; + installPhase = "ocaml setup.ml -install"; meta = with lib; { description = "Store data using OCaml notation"; homepage = "https://forge.ocamlcore.org/projects/odn/"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = with maintainers; [ - vbgl maggesi + vbgl + maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 5d2cffa7024..55ee0b419c7 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { ocamlfind install optcomp META _build/src/optcomp.{a,cma,cmxa,cmxs} _build/src/pa_optcomp.{cmi,cmx,mli} ''; - meta = { + meta = { homepage = "https://github.com/diml/optcomp"; description = "Optional compilation for OCaml with cpp-like directives"; license = lib.licenses.bsd3; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = [ lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index a67809eb75c..bee8a6106ea 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, ocaml, findlib, ncurses, python, ocaml_make}: +{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python, ocaml_make }: # This is the original pycaml version with patches from debian. @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/chemoelectric/pycaml"; description = "Bindings for python and ocaml"; license = "LGPL"; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; }; } diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 2934c1c0b62..0edae983069 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "https://erratique.ch/software/react"; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; - platforms = ocaml.meta.platforms or []; - maintainers = with maintainers; [ maggesi vbmithr gal_bolle]; + platforms = ocaml.meta.platforms or [ ]; + maintainers = with maintainers; [ maggesi vbmithr gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index a47568c32bc..b2bbd13fc90 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "An OCaml module for functional reactive programming (FRP) based on React"; homepage = "https://github.com/ocsigen/reactiveData"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index e0c852a9baa..337874e11a9 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -1,7 +1,7 @@ -{lib, stdenv, fetchurl, ocaml, findlib, camlp4}: +{ lib, stdenv, fetchurl, ocaml, findlib, camlp4 }: if !lib.versionAtLeast ocaml.version "3.12" -|| lib.versionAtLeast ocaml.version "4.03" + || lib.versionAtLeast ocaml.version "4.03" then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib camlp4 ]; createFindlibDestdir = true; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Support library for OCaml preprocessor type conversions"; license = licenses.asl20; branch = "108"; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = with maintainers; [ maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 4da9fc569a2..cc77a731f02 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -1,7 +1,7 @@ -{stdenv, lib, fetchurl, ocaml, findlib, camlp4}: +{ stdenv, lib, fetchurl, ocaml, findlib, camlp4 }: if !lib.versionAtLeast ocaml.version "4.00" -|| lib.versionAtLeast ocaml.version "4.03" + || lib.versionAtLeast ocaml.version "4.03" then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib camlp4 ]; createFindlibDestdir = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "http://forge.ocamlcore.org/projects/type-conv/"; description = "Support library for OCaml preprocessor type conversions"; license = lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = with lib.maintainers; [ maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index 3ea430189ec..7d7d87af853 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ findlib ocaml ocamlbuild ]; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${lib.boolToString withShared}"; installPhase = "${opaline}/bin/opaline -libdir $OCAMLFIND_DESTDIR"; - configurePlatforms = []; + configurePlatforms = [ ]; meta = { description = "Compatibility library for OCaml’s Uchar module"; diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index 5d6f91c1ae7..ab8c6eb7840 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -2,8 +2,9 @@ # This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. let - pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]); -in stdenv.mkDerivation rec { + pythonEnv = python3.withPackages (ps: with ps; [ sphinx ]); +in +stdenv.mkDerivation rec { pname = "pyside-apiextractor"; version = "0.10.10"; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 662503c7f00..dc36028332f 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, m4, perl, xz}: +{ lib, stdenv, fetchurl, m4, perl, xz }: stdenv.mkDerivation rec { pname = "autoconf"; diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix index 498a13c0201..8c6e104e11b 100644 --- a/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/pkgs/development/tools/misc/autoconf/2.64.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Make the Autotest test suite run in parallel. - preCheck ='' + preCheck = '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES" ''; diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix index 103db2f5680..f83b245417e 100644 --- a/pkgs/development/tools/misc/gperf/3.0.x.nix +++ b/pkgs/development/tools/misc/gperf/3.0.x.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "gperf"; |