ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

pkgs/development: followup fmt

Browse Source
This commit is contained in:
Felix Buehler 2021-11-09 20:53:19 +01:00
parent 345d71ffd0
commit 66e4f4b3ee
31 changed files with 124 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/Xaw3d/default.nix
View File

@ -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";

10
pkgs/development/libraries/stfl/default.nix
View File

@ -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;
};
}

17
pkgs/development/libraries/telepathy/qt/default.nix
View File

@ -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";

4
pkgs/development/libraries/tokyo-tyrant/default.nix
View File

@ -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 = [ ];
};
}

23
pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
View File

@ -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 ];

23
pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
View File

@ -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 ];

23
pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
View File

@ -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 ];

7
pkgs/development/ocaml-modules/bolt/default.nix
View File

@ -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 ];
};
}

10
pkgs/development/ocaml-modules/calendar/default.nix
View File

@ -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
];

2
pkgs/development/ocaml-modules/cil/default.nix
View File

@ -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 [ ];
};
}

2
pkgs/development/ocaml-modules/config-file/default.nix
View File

@ -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 ];

2
pkgs/development/ocaml-modules/csv/1.5.nix
View File

@ -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 [ ];
};
}

2
pkgs/development/ocaml-modules/enumerate/default.nix
View File

@ -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 [ ];
};
}

2
pkgs/development/ocaml-modules/fieldslib/default.nix
View File

@ -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 [ ];
};
}

2
pkgs/development/ocaml-modules/fontconfig/default.nix
View File

@ -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 ];
};
}

10
pkgs/development/ocaml-modules/inifiles/default.nix
View File

@ -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 ];

2
pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
View File

@ -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";

2
pkgs/development/ocaml-modules/macaque/default.nix
View File

@ -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 ];
};
}

2
pkgs/development/ocaml-modules/ocurl/default.nix
View File

@ -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 [ ];
};
}

9
pkgs/development/ocaml-modules/odn/default.nix
View File

@ -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
];
};
}

4
pkgs/development/ocaml-modules/optcomp/default.nix
View File

@ -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
];

4
pkgs/development/ocaml-modules/pycaml/default.nix
View File

@ -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 [ ];
};
}

4
pkgs/development/ocaml-modules/react/default.nix
View File

@ -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 ];
};
}

2
pkgs/development/ocaml-modules/reactivedata/default.nix
View File

@ -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 ];
};
}

8
pkgs/development/ocaml-modules/type_conv/108.08.00.nix
View File

@ -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 ];
};
}

8
pkgs/development/ocaml-modules/type_conv/109.60.01.nix
View File

@ -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 ];
};
}

2
pkgs/development/ocaml-modules/uchar/default.nix
View File

@ -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";

5
pkgs/development/python-modules/pyside/apiextractor.nix
View File

@ -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";

2
pkgs/development/tools/misc/autoconf/2.13.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, m4, perl, xz}:
{ lib, stdenv, fetchurl, m4, perl, xz }:
stdenv.mkDerivation rec {
pname = "autoconf";

2
pkgs/development/tools/misc/autoconf/2.64.nix
View File

@ -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"
'';

2
pkgs/development/tools/misc/gperf/3.0.x.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, autoreconfHook }:
{ lib, stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "gperf";