Merge commit '3ed545ab31146e607c57649936c75869d6aa9ba2' into ericson2314-cross-master

This commit is contained in:
John Ericson
2018-01-09 17:19:27 -05:00
535 changed files with 10031 additions and 6356 deletions

View File

@@ -4,14 +4,14 @@
with lib;
stdenv.mkDerivation rec {
version = "0.62.0";
version = "0.63.1";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "03la72wgsh7s063h2l171h74c84haqsinnnk8fwifq3id0gq6xk1";
sha256 = "1djcyf1c88xw5mv1gh4wggy16d2gi84ndj31n11y5qh99hh3lmfl";
};
installPhase = ''

View File

@@ -6,13 +6,13 @@ assert qtbase != null -> qt4 == null;
stdenv.mkDerivation rec {
name = "snowman-${version}";
version = "2017-08-13";
version = "2017-11-19";
src = fetchFromGitHub {
owner = "yegord";
repo = "snowman";
rev = "cd9edcddf873fc40d7bcb1bb1eae815faedd3a03";
sha256 = "10f3kd5m5xw7hqh92ba7dcczwbznxvk1qxg0yycqz7y9mfr2282n";
rev = "d03c2d6ffbf262c0011584df59d6bd69c020e08e";
sha256 = "0bzqp3zc100dzvybf57bj4dvnybvds0lmn1w2xjb19wkzm9liskn";
};
nativeBuildInputs = [ cmake ];

View File

@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "0.8.0";
version = "0.9.0";
meta = with stdenv.lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "0y50fhwh135fim39ra4szwzzgyb4ibls3i0hpv3d7asns0hh715a";
sha256 = "0aiifrp6g1d3ilhg8111wdhsrjy41x8gcmq67rjyxypw9znqzcpg";
};
sourceRoot = ".";

View File

@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "icmake-${version}";
version = "9.02.03";
version = "9.02.04";
src = fetchFromGitHub {
sha256 = "1g3pdcd2i8n29rqwrdg6bd7qnsii55hi0rnma86hy0pm5cshpwi5";
sha256 = "0dkqdm7nc3l9kgwkkf545hfbxj7ibkxl7n49wz9m1rcq9pvpmrw3";
rev = version;
repo = "icmake";
owner = "fbb-git";

View File

@@ -32,7 +32,7 @@ in buildPythonApplication rec {
meta = {
description = "A build system for software projects in a variety of languages";
homepage = "http://www.pantsbuild.org/";
homepage = "https://www.pantsbuild.org/";
license = licenses.asl20;
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.unix;

View File

@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
let
version = "10.2.0";
version = "10.3.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
sha256 = "191yzh9k6ivj7mdfi5mv7wgbdcclb5q99rcbry70h064vzwfgkp6";
sha256 = "0nhxxx2wxnli5nfz8vxqc0mwdjzj836zx3zmywnfyy1k2zybjijv";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "1xvfsffwks5z74kxba6f4cilbabcsxhr0kskbxwczi90pn0rxsnn";
sha256 = "0jacimz4p9k5s9j510g3vn7gg8pybpa20j4cvz4pffrcwl1lgk4i";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "1psnajn4b3ym2fpvn6rizxqb093s78lvxcs3bysgrmf9q1ivf3a6";
sha256 = "0wjy5bbz6bw0na57vglcwzn17q980x6j24qkschqx49rjyk3fz2i";
};
patches = [ ./fix-shell-path.patch ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "coursier-${version}";
version = "1.0.0-RC13";
version = "1.0.0";
src = fetchurl {
url = "https://github.com/coursier/coursier/raw/v${version}/coursier";
sha256 = "18i7imd6lqkvpzhx1m72g6jwsqq7h6aisfny5aiccgnyg6jpag6i";
sha256 = "0167cgp3kqx336p8dmlxx57bi3lhzyp6ncly28v1s7r2sjxj9krj";
};
nativeBuildInputs = [ makeWrapper ];

View File

@@ -1,7 +1,7 @@
{ stdenv, makeWrapper, requireFile, unzip, openjdk }:
stdenv.mkDerivation rec {
version = "17.3.0.271.2323";
version = "17.4.0.355.2349";
name = "sqldeveloper-${version}";
src = requireFile rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
obtain it you need to
- navigate to ${url}
- make sure that it says "Version ${version}" above the list of downloads
- make sure that it says "Version ${version}" above the list of downloads
- if it does not, click on the "Previous Version" link below the downloads
and repeat until the version is correct. This is necessarry because as the
time of this writing there exists no permanent link for the current version
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
nix-prefetch-url --type sha256 file:///path/to/${name}
'';
# obtained by `sha256sum sqldeveloper-${version}-no-jre.zip`
sha256 = "06ba5920544bacbea83425548b1b8f69ab3e9bb279076321aece2c0c6d415dad";
sha256 = "70add9b5c998583416e3d127aeb63dde8e3d0489036982026b930c85496c7850";
};
buildInputs = [ makeWrapper unzip ];

View File

@@ -2,14 +2,31 @@
stdenv.mkDerivation rec {
name = "dtools-${version}";
version = "2.075.1";
version = "2.078.0";
src = fetchFromGitHub {
owner = "dlang";
repo = "tools";
rev = "v${version}";
sha256 = "0lxn400s9las9hq6h9vj4mis2jr662k2yw0zcrvqcm1yg9pd245d";
};
srcs = [
(fetchFromGitHub {
owner = "dlang";
repo = "dmd";
rev = "v${version}";
sha256 = "1ia4swyq0xqppnpmcalh2yxywdk2gv3kvni2abx1mq6wwqgmwlcr";
name = "dmd";
})
(fetchFromGitHub {
owner = "dlang";
repo = "tools";
rev = "v${version}";
sha256 = "1cydhn8g0h9i9mygzi80fb5fz3z1f6m8b9gypdvmyhkkzg63kf12";
name = "dtools";
})
];
sourceRoot = ".";
postUnpack = ''
mv dmd dtools
cd dtools
'';
postPatch = ''
substituteInPlace posix.mak \
@@ -26,27 +43,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ dmd ];
buildInputs = [ curl ];
makeCmd = ''
make -f posix.mak DMD=${dmd.out}/bin/dmd DMD_DIR=dmd
'';
buildPhase = ''
make -f posix.mak DMD=${dmd.out}/bin/dmd INSTALL_DIR=$out
$makeCmd
'';
doCheck = true;
checkPhase = ''
export BITS=${builtins.toString stdenv.hostPlatform.parsed.cpu.bits}
export OSNAME=${if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name}
./generated/$OSNAME/$BITS/rdmd -main -unittest rdmd.d
${dmd.out}/bin/dmd rdmd_test.d
./rdmd_test
$makeCmd test_rdmd
'';
installPhase = ''
mkdir -p $out/bin
${
let bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits;
osname = if stdenv.hostPlatform.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; in
"find $PWD/generated/${osname}/${bits} -perm /a+x -type f -exec cp {} $out/bin \\;"
}
$makeCmd INSTALL_DIR=$out install
'';
meta = with stdenv.lib; {

View File

@@ -0,0 +1,30 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
buildGoPackage rec {
name = "fac-${version}";
version = "1.0.1";
goPackagePath = "github.com/mkchoi212/fac";
src = fetchFromGitHub {
owner = "mkchoi212";
repo = "fac";
rev = "v${version}";
sha256 = "1j5kip3l3p9qlly03pih905sdz3ncvpj7135jpnfhckbk1s5x9dc";
};
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $bin/bin/fac \
--prefix PATH : ${git}/bin
'';
meta = with stdenv.lib; {
description = "CUI for fixing git conflicts";
inherit (src.meta) homepage;
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
};
}

View File

@@ -1,17 +1,20 @@
{ mkDerivation, fetchurl, async, base, bytestring, http-conduit, lens
, lens-aeson, optparse-applicative, retry, stdenv, text, unix
{ mkDerivation, fetchzip, async, base, bytestring, hpack, http-conduit
, lens, lens-aeson, optparse-applicative, retry, stdenv, text, unix
, unordered-containers, utf8-string
}:
mkDerivation rec {
pname = "vaultenv";
version = "0.5.0";
version = "0.5.3";
src = fetchurl {
src = fetchzip {
url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz";
sha256 = "0hdcxq88cf3ygnikkppyg3fcf7xmwm9zif7274j3n34p9vd8xci3";
sha256 = "1kxq2pp8l8xf7xwjyd9cwyi7z192013s6psq5fk8jrkkhrk8z3li";
};
buildTools = [ hpack ];
preConfigure = "hpack .";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -23,5 +26,4 @@ mkDerivation rec {
description = "Runs processes with secrets from HashiCorp Vault";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ lnl7 ];
broken = true; # https://hydra.nixos.org/build/66706385
}

View File

@@ -21,11 +21,18 @@ stdenv.mkDerivation rec {
src = [ arcanist libphutil ];
buildInputs = [ php makeWrapper flex ];
unpackPhase = "true";
buildPhase = ''
unpackPhase = ''
cp -R ${libphutil} libphutil
cp -R ${arcanist} arcanist
chmod +w -R libphutil arcanist
'';
postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
substituteInPlace libphutil/support/xhpast/Makefile \
--replace "-minline-all-stringops" ""
'';
buildPhase = ''
(
cd libphutil/support/xhpast
make clean all install

View File

@@ -91,7 +91,11 @@ stdenv.mkDerivation rec {
else "-static-libgcc";
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
configurePlatforms =
# TODO(@Ericson2314): Figure out what's going wrong with Arm
if hostPlatform == targetPlatform && targetPlatform.isArm
then []
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
configureFlags = [
"--enable-targets=all" "--enable-64-bit-bfd"

View File

@@ -13,11 +13,14 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
stdenv.mkDerivation rec {
name = "dialog-${version}";
version = "1.3-20160209";
version = "1.3-20171209";
src = fetchurl {
url = "ftp://invisible-island.net/dialog/${name}.tgz";
sha256 = "11rzh14xy9s99gxdi5i7fgmgihjqsv0ls0ksavkmip2y37rgf503";
urls = [
"ftp://ftp.invisible-island.net/dialog/${name}.tgz"
"https://invisible-mirror.net/archives/dialog/${name}.tgz"
];
sha256 = "1rk72as52f5br3wcr74d00wib41w65g8wvi36mfgybly251984r0";
};
buildInputs = [ ncurses ];

View File

@@ -2,12 +2,12 @@
python2.pkgs.buildPythonApplication rec {
pname = "lit";
version = "0.5.0";
version = "0.5.1";
name = "${pname}-${version}";
src = python2.pkgs.fetchPypi {
inherit pname version;
sha256 = "3ea4251e78ebeb2e07be2feb33243d1f8931d956efc96ccc2b0846ced212b58c";
sha256 = "0z651m3vkbk85y41larnsjxrszkbi58x9gzml3lb6ga7qwcrsg97";
};
# Non-standard test suite. Needs custom checkPhase.

View File

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Source code search and cross reference engine";
homepage = http://opengrok.github.io/OpenGrok/;
homepage = https://opengrok.github.io/OpenGrok/;
license = licenses.cddl;
maintainers = [ maintainers.lethalman ];
};

View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "sloccount-2.26";
src = fetchurl {
url = "http://www.dwheeler.com/sloccount/${name}.tar.gz";
url = "https://www.dwheeler.com/sloccount/${name}.tar.gz";
sha256 = "0ayiwfjdh1946asah861ah9269s5xkc8p5fv1wnxs9znyaxs4zzs";
};
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://www.dwheeler.com/sloccount/;
homepage = https://www.dwheeler.com/sloccount/;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;

View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
license = licenses.gpl3;
description = "Firmware uploader for the Teensy microcontroller boards";
homepage = http://www.pjrc.com/teensy/;
homepage = https://www.pjrc.com/teensy/;
maintainers = with maintainers; [ the-kenny ];
platforms = platforms.linux;
};

View File

@@ -2,22 +2,25 @@
stdenv.mkDerivation rec {
name = "universal-ctags-${version}";
version = "2017-09-22";
version = "2018-01-05";
src = fetchFromGitHub {
owner = "universal-ctags";
repo = "ctags";
rev = "b9537289952cc7b26526aaff3094599d714d1729";
sha256 = "1kbw9ycl2ddzpfs1v4rbqa4gdhw4inrisf4awyaxb7zxfxmbzk1g";
rev = "c66bdfb4db99977c1bd0568e33e60853a48dca65";
sha256 = "0fdzhr0704cj84ym00plkl5l9w83haal6i6w70lx6f4968pcliyi";
};
nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ];
buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
# to generate makefile.in
autoreconfPhase = ''
./autogen.sh --tmpdir
./autogen.sh
'';
configureFlags = [ "--enable-tmpdir=/tmp" ];
postConfigure = ''
sed -i 's|/usr/bin/env perl|${perl}/bin/perl|' misc/optlib2c
'';

View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation {
inherit (jbuilder) installPhase;
meta = {
homepage = http://www.typerex.org/ocaml-top.html;
homepage = https://www.typerex.org/ocaml-top.html;
license = stdenv.lib.licenses.gpl3;
description = "A simple cross-platform OCaml code editor built for top-level evaluation";
platforms = ocamlPackages.ocaml.meta.platforms or [];

View File

@@ -22,7 +22,7 @@ buildOcaml {
'';
meta = with stdenv.lib; {
homepage = http://www.typerex.org/ocp-build.html;
homepage = https://www.typerex.org/ocp-build.html;
description = "A build tool for OCaml";
longDescription = ''
ocp-build is a build system for OCaml application, based on simple

View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "byacc-${version}";
version = "20170201";
version = "20170709";
src = fetchurl {
urls = [
"ftp://invisible-island.net/byacc/${name}.tgz"
"http://invisible-mirror.net/archives/byacc/${name}.tgz"
"ftp://ftp.invisible-island.net/byacc/${name}.tgz"
"https://invisible-mirror.net/archives/byacc/${name}.tgz"
];
sha256 = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91";
sha256 = "1syrg1nwh2qmlr5mh7c4vz9psdv4gf55h8i5ffw84q6whlcq1kr7";
};
doCheck = true;

View File

@@ -74,6 +74,10 @@ in stdenv.mkDerivation rec {
url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/build-qt55-print.patch?id=9b5c1ce95a7044ebffc634f773edf7d4eb9b6cd3";
sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw";
})
(fetchpatch {
url = "https://anonscm.debian.org/cgit/collab-maint/phantomjs.git/plain/debian/patches/unlock-qt.patch";
sha256 = "13bwz4iw17d6hq5pwkbpcckqyw7fhc6648lvs26m39pp31zwyp03";
})
./system-qtbase.patch
];

View File

@@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
name = "remarshal-${version}";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "dbohdan";
repo = "remarshal";
rev = "v${version}";
sha256 = "0jslawpzghv3chamrfddnyn5p5068kjxy8d38fxvi5h06qgfb4wp";
sha256 = "1wsgvzfp40lvly7nyyhv9prip4vi32rfc8kdji587jpw28zc1dfb";
};
propagatedBuildInputs = with pythonPackages; [

View File

@@ -1,20 +0,0 @@
[
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
};
}
]

View File

@@ -2,7 +2,7 @@
let
baseName = "scalafmt";
version = "1.3.0";
version = "1.4.0";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@@ -13,7 +13,7 @@ let
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "0q1vw6drpdrfifbm3266igpml0phdk6pl0gd3b5amysigx83m251";
outputHash = "12hsix3b7qnyr9x2v7i6jgqljdqxpfj4bfvhjdl99ijr793g3lnp";
};
in
stdenv.mkDerivation rec {