public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-09-18 18:44:48 +02:00
parent 1df2560dde 9064d9db00
commit de419917a3
391 changed files with 32151 additions and 6103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/analysis/flow/default.nix
+2 -2
View File
@@ -3,14 +3,14 @@
with lib;
stdenv.mkDerivation rec {
version = "0.79.0";
version = "0.80.0";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "1m8239jl0kmpgmk81mak6k3hmmikji6bb3v0zaknb1z3jl8aa1wb";
sha256 = "0jixisimqwbr46gh9357ya0rscv46svm6kqnawkq1shlf9nwa3lx";
};
installPhase = ''
pkgs/development/tools/analysis/makefile2graph/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ stdenv, fetchFromGitHub, makeWrapper, bash, gnumake }:
stdenv.mkDerivation rec {
name = "makefile2graph-2018-01-03";
src = fetchFromGitHub {
owner = "lindenb";
repo = "makefile2graph";
rev = "61fb95a5ba91c20236f5e4deb11127c34b47091f";
sha256 = "07hq40bl48i8ka35fcciqcafpd8k9rby1wf4vl2p53v0665xaghr";
};
nativeBuildInputs = [ makeWrapper ];
makeFlags = [ "prefix=$(out)" ];
fixupPhase = ''
substituteInPlace $out/bin/makefile2graph \
--replace '/bin/sh' ${bash}/bin/bash \
--replace 'make2graph' "$out/bin/make2graph"
wrapProgram $out/bin/makefile2graph \
--set PATH ${stdenv.lib.makeBinPath [ gnumake ]}
'';
meta = with stdenv.lib; {
homepage = "https://github.com/lindenb/makefile2graph";
description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file";
maintainers = with maintainers; [ cmcdragonkai ];
license = licenses.mit;
platforms = platforms.linux;
};
}
pkgs/development/tools/build-managers/bazel/default.nix
+9 -2
View File
@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
version = "0.16.1";
version = "0.17.1";
meta = with lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "0v5kcz8q9vzf4cpmlx8k2gg0dsr8mj0jmx9a44pwb0kc6na6pih9";
sha256 = "081z40vsxvw6ndiinik4pn09gxmv140k6l9zv93dgjr86qf2ir13";
};
sourceRoot = ".";
@@ -89,6 +89,9 @@ stdenv.mkDerivation rec {
# and linkers from Xcode instead of from PATH
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
# Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
export GCOV=${coreutils}/bin/false
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
@@ -97,6 +100,10 @@ stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
# 10.10 apple_sdk Foundation doesn't have type arguments on classes
# Remove this when we update apple_sdk
sed -i -e 's/<.*\*>//g' tools/osx/xcode_locator.m
# don't use system installed Xcode to run clang, use Nix clang instead
sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
scripts/bootstrap/compile.sh \
pkgs/development/tools/build-managers/gn/default.nix
+26 -99
View File
@@ -1,107 +1,38 @@
{ stdenv, lib, fetchgit, fetchzip, fetchpatch
, libevent, ninja, python, darwin }:
{ stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin, writeText
, git, ninja, python }:
let
depsGit = {
"tools/gn" = fetchgit {
url = "https://chromium.googlesource.com/chromium/src/tools/gn";
rev = "0fa417a0d2d8484e9a5a636e3301da322f586601";
sha256 = "0pigcl14yc4aak6q1ghfjxdz2ah4fg4m2r5y3asw2rz6mpr5y9z0";
};
"base" = fetchgit {
url = "https://chromium.googlesource.com/chromium/src/base";
rev = "ab1d7c3b92ce9c9bc756bdefb8338360d1a33a1e";
sha256 = "15wis6qg9ka62k6v1vamg0bp3v5vkpapg485jsn4bbfcaqp6di0f";
};
"build" = fetchgit {
url = "https://chromium.googlesource.com/chromium/src/build";
rev = "8d44c08a4c9997695db8098198bdd5026bc7a6f9";
sha256 = "19sajgf55xfmvnwvy2ss7g6pyljp751cfsws30w415m6m00lmpxl";
};
"config" = fetchgit {
url = "https://chromium.googlesource.com/chromium/src/build/config";
rev = "14116c0cdcb9e28995ca8bb384a12e5c9dbd1dbb";
sha256 = "04nif0lm4wcy05b7xhal023874s4r0iq067q57cgwdm72i2gml40";
};
"testing/gtest" = fetchgit {
url = "https://chromium.googlesource.com/chromium/testing/gtest";
rev = "585ec31ea716f08233a815e680fc0d4699843938";
sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc";
};
"third_party/apple_apsl" = fetchzip {
url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz";
sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8";
stripRoot = false;
};
"buildtools/third_party/libc++/trunk" = fetchgit {
url = "https://chromium.googlesource.com/chromium/llvm-project/libcxx";
rev = "ece1de8658d749e19c12cacd4458cc330eca94e3";
sha256 = "1nlyvfkzhchwv9b18bh82jcamqv3acj26ah9ajs31f2dql05amhg";
};
"buildtools/third_party/libc++abi/trunk" = fetchgit {
url = "https://chromium.googlesource.com/chromium/llvm-project/libcxxabi";
rev = "52c7a3760aef1df328a9bc957f686410872f0dc0";
sha256 = "1aam539j01381q27b7xhij18pz3h0lhw08hglvqq4hgvlqx5cn2s";
};
};
rev = "106b823805adcc043b2bfe5bc21d58f160a28a7b";
sha256 = "1a5s6i07s8l4f1bakh3fyaym00xz7zgd49sp6awm10xb7yjh95ba";
in stdenv.mkDerivation rec {
name = "gn-${version}";
version = "20180423";
sourceRoot = ".";
shortRev = builtins.substring 0 7 rev;
lastCommitPosition = writeText "last_commit_position.h" ''
#ifndef OUT_LAST_COMMIT_POSITION_H_
#define OUT_LAST_COMMIT_POSITION_H_
unpackPhase = ''
${lib.concatStringsSep "\n" (
lib.mapAttrsToList (n: v: ''
mkdir -p $sourceRoot/${n}
if [ -d ${v} ]; then
cp -r ${v}/* $sourceRoot/${n}
else
mkdir -p $sourceRoot/${n}
pushd $sourceRoot/${n}
unpackFile ${v}
popd
fi
'') depsGit)}
#define LAST_COMMIT_POSITION "(${shortRev})"
chmod u+w -R $sourceRoot
#endif // OUT_LAST_COMMIT_POSITION_H_
'';
patches = [
(fetchpatch {
url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/3375fbc7b865dafe1230431a1e3f9bffd27ec184/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a";
})
];
in
stdenv.mkDerivation rec {
name = "gn-${version}";
version = "20180830";
src = fetchgit {
url = "https://gn.googlesource.com/gn";
inherit rev sha256;
};
postPatch = ''
# Disable libevent bootstrapping (we will provide it).
sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \
tools/gn/bootstrap/bootstrap.py
# FIXME Needed with old Apple SDKs
substituteInPlace base/mac/foundation_util.mm \
--replace "NSArray<NSString*>*" "NSArray*"
substituteInPlace base/mac/sdk_forward_declarations.h \
--replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \
--replace "NSArray<VNRequest*>*" "NSArray*" \
--replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption"
# Patch shebangs (for sandbox build)
patchShebangs build
'';
# FIXME again this shouldn't be necessary but I can't figure out a better way
NIX_CFLAGS_COMPILE = "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
NIX_LDFLAGS = "-levent";
nativeBuildInputs = [ ninja python ];
buildInputs = [ libevent ]
# FIXME These dependencies shouldn't be needed but can't find a way
# around it. Chromium pulls this in while bootstrapping GN.
++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
nativeBuildInputs = [ ninja python git ];
buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
libobjc
cctools
@@ -109,25 +40,21 @@ in stdenv.mkDerivation rec {
ApplicationServices
Foundation
AppKit
ImageCaptureCore
CoreBluetooth
IOBluetooth
CoreWLAN
Quartz
Cocoa
]);
buildPhase = ''
python tools/gn/bootstrap/bootstrap.py -s
python build/gen.py --no-sysroot --no-last-commit-position
ln -s ${lastCommitPosition} out/last_commit_position.h
ninja -j $NIX_BUILD_CORES -C out gn
'';
installPhase = ''
install -vD out/Release/gn "$out/bin/gn"
install -vD out/gn "$out/bin/gn"
'';
meta = with lib; {
description = "A meta-build system that generates NinjaBuild files";
homepage = https://chromium.googlesource.com/chromium/src/tools/gn;
homepage = https://gn.googlesource.com/gn;
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ stesie matthewbauer ];
pkgs/development/tools/build-managers/sbt/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "sbt-${version}";
version = "1.2.1";
version = "1.2.3";
src = fetchurl {
urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
"https://cocl.us/sbt-${version}.tgz"
];
sha256 = "1pyp98svh5x8b6yp5vfl0jhz8aysjm0dqvqf7znyb3l7knfqk726";
sha256 = "1szyp9hgrvr3r5rhr98cn5mkhca1mr0qfs6cd8fiihm6hzjzn0nm";
};
patchPhase = ''
pkgs/development/tools/cargo-web/default.nix
+5 -1
View File
@@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform }:
{ stdenv, fetchFromGitHub, openssl, pkgconfig, rustPlatform
, CoreServices, Security
}:
rustPlatform.buildRustPackage rec {
name = "cargo-web-${version}";
@@ -14,12 +16,14 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "157av9zkirr00w9v11mh7yp8w36sy7rw6i80i5jmi0mgrdvcg5si";
nativeBuildInputs = [ openssl pkgconfig ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
meta = with stdenv.lib; {
description = "A Cargo subcommand for the client-side Web";
homepage = https://github.com/koute/cargo-web;
license = with licenses; [asl20 /* or */ mit];
maintainers = [ maintainers.kevincox ];
broken = stdenv.isDarwin; # test with CoreFoundation 10.11
platforms = platforms.all;
};
}
pkgs/development/tools/continuous-integration/jenkins/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
version = "2.121.2";
version = "2.138.1";
src = fetchurl {
url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "00ln31ahhsihnxba2hldrjxdpyxl7xw731493a24cqlkdq89s3ys";
sha256 = "09svkqii9lv1br0al6wjn1l0fsqf6s7fdrfc0awmfsg8fmjlpf7c";
};
buildCommand = ''
pkgs/development/tools/database/pgcli/default.nix
+7 -11
View File
@@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
name = "pgcli-${version}";
version = "1.6.0";
version = "1.10.3";
src = fetchFromGitHub {
sha256 = "0f1zv4kwi2991pclf8chrhgjwf8jkqxdh5ndc9qx6igh56iyyncz";
rev = "v${version}";
repo = "pgcli";
owner = "dbcli";
repo = "pgcli";
rev = "v${version}";
sha256 = "1qcbv2w036l0gc0li3jpa6amxzqmhv8d1q6wv4pfh0wvl17hqv9r";
};
buildInputs = with pythonPackages; [ pytest mock ];
@@ -18,15 +18,10 @@ pythonPackages.buildPythonApplication rec {
'';
propagatedBuildInputs = with pythonPackages; [
click configobj humanize prompt_toolkit psycopg2
pygments sqlparse pgspecial setproctitle
cli-helpers click configobj humanize prompt_toolkit psycopg2
pygments sqlparse pgspecial setproctitle keyring
];
postPatch = ''
substituteInPlace setup.py --replace "==" ">="
rm tests/test_rowlimit.py
'';
meta = with lib; {
description = "Command-line interface for PostgreSQL";
longDescription = ''
@@ -35,5 +30,6 @@ pythonPackages.buildPythonApplication rec {
'';
homepage = https://pgcli.com;
license = licenses.bsd3;
maintainers = with maintainers; [ dywedir ];
};
}
pkgs/development/tools/flatpak-builder/default.nix
+2
View File
@@ -29,6 +29,7 @@
, libcap
, libdwarf
, libsoup
, libyaml
, ostree
, patch
, rpm
@@ -72,6 +73,7 @@ in stdenv.mkDerivation rec {
libdwarf
libsoup
libxml2
libyaml
ostree
];
pkgs/development/tools/godot/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@ let
};
in stdenv.mkDerivation rec {
name = "godot-${version}";
version = "3.0.4";
version = "3.0.6";
src = fetchFromGitHub {
owner = "godotengine";
repo = "godot";
rev = "${version}-stable";
sha256 = "0i4ssfb6igga9zwvsmahrnasx9cyqrsd6mlmssjgc482fy9q2kz4";
sha256 = "0g64h0x8dlv6aa9ggfcidk2mknkfl5li7z1phcav8aqp9srj8avf";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/development/tools/haskell/leksah/default.nix
+4
View File
@@ -14,4 +14,8 @@ in stdenv.mkDerivation {
--prefix PATH : "${leksahEnv}/bin" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
meta = {
broken = true; # 2018-09-13, no successful hydra build since 2017-08-19
};
}
pkgs/development/tools/heroku/default.nix
+21 -59
View File
@@ -1,70 +1,32 @@
{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub
, nodejs-6_x, postgresql, ruby }:
{ stdenv, lib, fetchurl, makeWrapper, nodejs }:
with stdenv.lib;
let
cli = buildGoPackage rec {
name = "cli-${version}";
version = "5.6.32";
goPackagePath = "github.com/heroku/cli";
src = fetchFromGitHub {
owner = "heroku";
repo = "cli";
rev = "v${version}";
sha256 = "062aa79mv2njjb0ix7isbz6646wxmsldv27bsz5v2pbv597km0vz";
};
buildFlagsArray = ''
-ldflags=
-X=main.Version=${version}
-X=main.Channel=stable
-X=main.Autoupdate=no
'';
preCheck = ''
export HOME=/tmp
'';
doCheck = true;
};
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "heroku-${version}";
version = "3.43.16";
version = "7.16.0";
meta = {
homepage = https://toolbelt.heroku.com;
description = "Everything you need to get started using Heroku";
maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
license = licenses.mit;
platforms = with platforms; unix;
broken = true; # Outdated function, not supported upstream. https://github.com/NixOS/nixpkgs/issues/27447
src = fetchurl {
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
sha256 = "434573b4773ce7ccbb21b43b19529475d941fa7dd219b01b75968b42e6b62abe";
};
binPath = lib.makeBinPath [ postgresql ruby ];
buildInputs = [ makeWrapper ];
doUnpack = false;
src = fetchurl {
url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
sha256 = "08pai3cjaj7wshhyjcmkvyr1qxv5ab980whcm406798ng8f91hn7";
};
dontBuild = true;
installPhase = ''
mkdir -p $out
tar xzf $src -C $out --strip-components=1
install -Dm755 ${cli}/bin/cli $out/share/heroku/cli/bin/heroku
wrapProgram $out/bin/heroku \
--set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \
--set XDG_DATA_HOME $out/share \
--set XDG_DATA_DIRS $out/share \
--prefix PATH : ${binPath}
mkdir -p $out/share/heroku $out/bin
cp -pr * $out/share/heroku
substituteInPlace $out/share/heroku/bin/run \
--replace "/usr/bin/env node" "${nodejs}/bin/node"
makeWrapper $out/share/heroku/bin/run $out/bin/heroku \
--set HEROKU_DISABLE_AUTOUPDATE 1
'';
meta = {
homepage = https://cli.heroku.com;
description = "Everything you need to get started using Heroku";
maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ];
license = lib.licenses.mit;
platforms = with lib.platforms; unix;
};
}
pkgs/development/tools/ocaml/cppo/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder }:
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }:
let
pname = "cppo";
webpage = "http://mjambon.com/${pname}.html";
@@ -9,9 +9,9 @@ let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "1.6.4";
sha256 = "16mlwck0wngr5pmlr8dxc471zzhhcja3mv4xf4n8jm9nhb3iikvh";
buildInputs = [ jbuilder ];
buildInputs = [ dune ];
extra = {
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
};
} else {
version = "1.5.0";
pkgs/development/tools/ocaml/jbuilder/default.nix → pkgs/development/tools/ocaml/dune/default.nix
+3 -5
View File
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, ocamlPackages, opaline }:
stdenv.mkDerivation rec {
name = "jbuilder-${version}";
version = "1.0.1";
name = "dune-${version}";
version = "1.1.1";
src = fetchFromGitHub {
owner = "ocaml";
repo = "dune";
rev = "${version}";
sha256 = "0k6r9qrbwlnb4rqwqys5fr7khwza7n7d8wpgl9jbb3xpag2zl3q9";
sha256 = "0v2pnxpmqsvrvidpwxvbsypzhqfdnjs5crjp9y61qi8nyj8d75zw";
};
buildInputs = with ocamlPackages; [ ocaml findlib ];
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
preFixup = "rm -rf $out/jbuilder";
meta = {
inherit (src.meta) homepage;
description = "Fast, portable and opinionated build system";
pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}:
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned ];
postPatch = "patchShebangs lib/generate_stubs.sh";
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
buildPhase = "jbuilder build -p js_of_ocaml";
buildPhase = "dune build -p js_of_ocaml";
}
pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, camlp4, ocsigen_deriving
}:
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder camlp4 ocsigen_deriving ];
buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];
buildPhase = "jbuilder build -p js_of_ocaml-camlp4";
buildPhase = "dune build -p js_of_ocaml-camlp4";
}
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+6 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
{ stdenv, fetchFromGitHub, ocaml, findlib, dune
, cmdliner, cppo, yojson
}:
@@ -8,22 +8,22 @@ else
stdenv.mkDerivation rec {
name = "js_of_ocaml-compiler-${version}";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "js_of_ocaml";
rev = version;
sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv";
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
};
buildInputs = [ ocaml findlib jbuilder cmdliner cppo ];
buildInputs = [ ocaml findlib dune cmdliner cppo ];
propagatedBuildInputs = [ yojson ];
buildPhase = "jbuilder build -p js_of_ocaml-compiler";
buildPhase = "dune build -p js_of_ocaml-compiler";
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = {
description = "Compiler from OCaml bytecode to Javascript";
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler, js_of_ocaml-ppx
, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, ocaml_lwt, lwt_log
}:
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
buildPhase = "jbuilder build -p js_of_ocaml-lwt";
buildPhase = "dune build -p js_of_ocaml-lwt";
}
pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocamlbuild
}:
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ];
buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ ocamlbuild ];
buildPhase = "jbuilder build -p js_of_ocaml-ocamlbuild";
buildPhase = "dune build -p js_of_ocaml-ocamlbuild";
}
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml
}:
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildPhase = "jbuilder build -p js_of_ocaml-ppx";
buildPhase = "dune build -p js_of_ocaml-ppx";
}
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, js_of_ocaml, ppx_deriving
}:
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ];
buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ js_of_ocaml ppx_deriving ];
buildPhase = "jbuilder build -p js_of_ocaml-ppx_deriving_json";
buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
}
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, reactivedata, tyxml
}:
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
buildPhase = "jbuilder build -p js_of_ocaml-tyxml";
buildPhase = "dune build -p js_of_ocaml-tyxml";
}
pkgs/development/tools/ocaml/ocaml-top/default.nix
+4 -3
View File
@@ -1,6 +1,7 @@
{ stdenv, fetchzip, ncurses
, ocamlPackages
, jbuilder }:
, dune
}:
stdenv.mkDerivation rec {
version = "1.1.5";
@@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1d4i6aanrafgrgk4mh154k6lkwk0b6mh66rykz33awlf5pfqd8yv";
};
buildInputs = [ ncurses jbuilder ]
buildInputs = [ ncurses dune ]
++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]);
configurePhase = ''
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
buildPhase = "jbuilder build";
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = {
homepage = https://www.typerex.org/ocaml-top.html;
pkgs/development/tools/ocaml/ocp-indent/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }:
{ stdenv, fetchzip, ocaml, findlib, dune, ocp-build, cmdliner }:
let inherit (stdenv.lib) getVersion versionAtLeast; in
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ ocp-build ];
buildInputs = [ ocaml findlib cmdliner ];
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = with stdenv.lib; {
homepage = http://typerex.ocamlpro.com/ocp-indent.html;
pkgs/development/tools/ocaml/ocp-index/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }:
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, ocp-build, ocp-indent, cmdliner, re }:
stdenv.mkDerivation rec {
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3";
};
buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ];
buildInputs = [ ocaml findlib dune ocp-build cmdliner re ];
propagatedBuildInputs = [ ocp-indent ];
buildPhase = "jbuilder build -p ocp-index";
buildPhase = "dune build -p ocp-index";
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = {
homepage = http://typerex.ocamlpro.com/ocp-index.html;
pkgs/development/tools/ocaml/utop/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune
, lambdaTerm, cppo, makeWrapper
}:
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild cppo jbuilder ];
buildInputs = [ ocaml findlib ocamlbuild cppo dune ];
propagatedBuildInputs = [ lambdaTerm ];
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
postFixup =
let
pkgs/development/tools/pyre/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript
, jbuilder, python3, rsync, fetchpatch }:
, dune, python3, rsync, fetchpatch }:
let
# Manually set version - the setup script requires
# hg and git + keeping the .git directory around.
@@ -39,7 +39,7 @@ let
ppx_deriving_yojson
ocamlbuild
ppxlib
jbuilder
dune
ounit
# python36Packages.python36Full # TODO
];
pkgs/development/tools/richgo/default.nix
+21
View File
@@ -0,0 +1,21 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "richgo-${version}";
version = "0.2.8";
goPackagePath = "github.com/kyoh86/richgo";
src = fetchFromGitHub {
owner = "kyoh86";
repo = "richgo";
rev = "v${version}";
sha256 = "0kbwl3a2gima23zmahk0jxp7wga91bs927a1rp5xl889ikng1n4j";
};
meta = with stdenv.lib; {
description = "Enrich `go test` outputs with text decorations.";
homepage = https://github.com/kyoh86/richgo;
license = licenses.unlicense; # NOTE: The project switched to MIT in https://git.io/fA1ik
maintainers = with maintainers; [ rvolosatovs ];
};
}