Merge master into staging

This commit is contained in:
Frederik Rietdijk
2018-10-02 18:22:37 +02:00
402 changed files with 13082 additions and 6278 deletions

View File

@@ -1,22 +1,27 @@
{ stdenv, fetchurl, cmake, llvmPackages }:
{ stdenv, fetchurl, cmake, llvmPackages, python2 }:
stdenv.mkDerivation rec {
name = "include-what-you-use-${version}";
# Also bump llvmPackages in all-packages.nix to the supported version!
version = "0.8";
version = "0.10";
src = fetchurl {
sha256 = "0r6n5gqicl0f9c8jrphq40kc2cis952gmnkm3643m3jwad0mn33d";
sha256 = "16alan9rwbhpyfxmlpc7gbfnbqd877wdqrkvgqrjb1jlqkzpg55s";
url = "${meta.homepage}/downloads/${name}.src.tar.gz";
};
buildInputs = with llvmPackages; [ clang-unwrapped llvm ];
buildInputs = with llvmPackages; [ clang-unwrapped llvm python2 ];
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ];
enableParallelBuilding = true;
postInstall = ''
substituteInPlace $out/bin/iwyu_tool.py \
--replace "['include-what-you-use']" "['$out/bin/include-what-you-use']"
'';
meta = with stdenv.lib; {
description = "Analyze #includes in C/C++ source files with clang";
longDescription = ''

View File

@@ -1,28 +1,32 @@
{ stdenv, fetchurl, crystal, libyaml, which }:
{ stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }:
stdenv.mkDerivation rec {
name = "shards-${version}";
version = "0.8.1";
src = fetchurl {
url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz";
sha256 = "198768izbsqqp063847r2x9ddcf4qfxx7vx7c6gwbmgjmjv4mivm";
src = fetchFromGitHub {
owner = "crystal-lang";
repo = "shards";
rev = "v${version}";
sha256 = "1cjn2lafr08yiqzlhyqx14jjjxf1y24i2kk046px07gljpnlgqwk";
};
buildInputs = [ crystal libyaml which ];
buildInputs = [ crystal libyaml pcre which ];
buildFlags = [ "CRFLAGS=--release" ];
installPhase = ''
mkdir -p $out/bin
cp bin/shards $out/bin/
runHook preInstall
install -Dm755 bin/shards $out/bin/shards
runHook postInstall
'';
meta = with stdenv.lib; {
homepage = https://crystal-lang.org/;
license = licenses.asl20;
description = "Dependency manager for the Crystal language";
maintainers = with maintainers; [ sifmelcara ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg ];
inherit (crystal.meta) homepage platforms;
};
}

View File

@@ -2,8 +2,8 @@
buildGoPackage rec {
name = "drone.io-${version}";
version = "0.8.5-20180329-${stdenv.lib.strings.substring 0 7 revision}";
revision = "81103a98208b0bfc76be5b07194f359fbc80183b";
version = "0.8.6-20180727-${stdenv.lib.strings.substring 0 7 revision}";
revision = "c48150767c2700d35dcc29b110a81c8b5969175e";
goPackagePath = "github.com/drone/drone";
# These dependencies pulled (in `drone` buildprocess) via Makefile,
@@ -16,7 +16,7 @@ buildGoPackage rec {
owner = "drone";
repo = "drone";
rev = revision;
sha256 = "1890bwhxr62adv261v4kn1azhq7qvcj2zpll68i9nsvjib8a52bq";
sha256 = "0miq2012nivvr1ysi3aa2xrr5ak3mf0l3drybyc83iycy0kp4bda";
};
meta = with stdenv.lib; {

View File

@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
version = "11.3.0";
version = "11.3.1";
# 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}/helper-images/prebuilt-x86_64.tar.xz";
sha256 = "1xl48lrycwy4d7h83ydp9gj27d9mhbpa4xrd1bn7i3ad9lrn7xjz";
sha256 = "13w8fjjc087klracv4ggjifj08vx3b549mhy220r5wn9aga5m549";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
sha256 = "0afjg4hv9iy80anl5h7cnjdxzk4zrkj2zn3f4qsl9rf7354ik1zj";
sha256 = "10s2g6mqy7p5dmjmlxggsfqqqf4bfrqjri7m2nd11l1lf4mmr2kk";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "0p992mm8zz30nx0q076g0waqvfknn05wyyr1n1sxglbh9nmym157";
sha256 = "1k978zsvsvr7ys18zqjg6n45cwi3nj0919fwj442dv99s95zyf6s";
};
patches = [ ./fix-shell-path.patch ];

View File

@@ -1,16 +1,16 @@
diff --git a/shells/bash.go b/shells/bash.go
index 839b7781..2b478e1e 100644
index 673f4765..a58cc5e2 100644
--- a/shells/bash.go
+++ b/shells/bash.go
@@ -7,6 +7,7 @@ import (
"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
@@ -5,6 +5,7 @@ import (
"bytes"
"fmt"
"io"
+ "os/exec"
"path"
"runtime"
"strconv"
@@ -208,7 +209,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
@@ -225,7 +226,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
if info.User != "" {
script.Command = "su"
if runtime.GOOS == "linux" {
@@ -22,4 +22,7 @@ index 839b7781..2b478e1e 100644
+ script.Arguments = append(script.Arguments, "-s", shellPath)
}
script.Arguments = append(script.Arguments, info.User)
script.Arguments = append(script.Arguments, "-c", shellCommand)
script.Arguments = append(script.Arguments, "-c", shellCommand)
--
2.18.0

View File

@@ -1,68 +0,0 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
let
version = "1.11.5";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
sha256 = "0qy3xrq574c1lhkqw1zrkcn32w0ky3f4fppzdjhb5zwqvnaz7kx0";
};
docker_arm = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "12clc28yc157s2kaa8239p0g086vq062jfjh2m1bxqmaypw9pyla";
};
in
buildGoPackage rec {
inherit version;
name = "gitlab-runner-${version}";
goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner";
commonPackagePath = "${goPackagePath}/common";
buildFlagsArray = ''
-ldflags=
-X ${commonPackagePath}.NAME=gitlab-runner
-X ${commonPackagePath}.VERSION=${version}
-X ${commonPackagePath}.REVISION=v${version}
'';
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-ci-multi-runner";
rev = "v${version}";
sha256 = "1xgx8jbgcc3ga7dkjxa2i8nj4afsdavzpfrgpdzma03jkcq1g2sv";
};
patches = [ ./fix-shell-path.patch ];
buildInputs = [ go-bindata ];
preBuild = ''
(
# go-bindata names the assets after the filename thus we create a symlink with the name we want
cd go/src/${goPackagePath}
ln -sf ${docker_x86_64} prebuilt-x86_64.tar.xz
ln -sf ${docker_arm} prebuilt-arm.tar.xz
go-bindata \
-pkg docker \
-nocompress \
-nomemcopy \
-o executors/docker/bindata.go \
prebuilt-x86_64.tar.xz \
prebuilt-arm.tar.xz
)
'';
postInstall = ''
install -d $out/bin
# The recommended name is gitlab-runner so we create a symlink with that name
ln -sf gitlab-ci-multi-runner $bin/bin/gitlab-runner
'';
meta = with lib; {
description = "GitLab Runner the continuous integration executor of GitLab";
license = licenses.mit;
homepage = https://about.gitlab.com/gitlab-ci/;
platforms = platforms.unix;
maintainers = [ lib.maintainers.bachp ];
};
}

View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "delve-${version}";
version = "1.0.0";
version = "1.1.0";
goPackagePath = "github.com/derekparker/delve";
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "derekparker";
repo = "delve";
rev = "v${version}";
sha256 = "08hsairhrifh41d288jhc65zbhs9k0hs738dbdzsbcvlmycrhvgx";
sha256 = "0gpsd9hb7r65rn4ml9jzsmy72b8j0id6wik2l48ghzkwjm72rsdz";
};
meta = with stdenv.lib; {

View File

@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "gauge-${version}";
version = "1.0.0";
version = "1.0.2";
goPackagePath = "github.com/getgauge/gauge";
excludedPackages = ''\(build\|man\)'';
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "getgauge";
repo = "gauge";
rev = "v${version}";
sha256 = "1dnlqnpzqsikpxy2mndrmxpcsj4r1zcjmv8px1idzblp117vsnw1";
sha256 = "0cnhkxfw78i4lgkbrk87hgrjh98f0z6a97g77c9av20z4962hmfy";
};
meta = with stdenv.lib; {

View File

@@ -1,17 +1,18 @@
{ stdenv, buildGoPackage, fetchgit }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "go-symbols-${version}";
version = "unstable-2017-02-06";
rev = "5a7f75904fb552189036c640d04cd6afef664836";
version = "unstable-2018-05-23";
rev = "953befd75e223f514580fcb698aead0dd6ad3421";
goPackagePath = "github.com/acroca/go-symbols";
goDeps = ./deps.nix;
src = fetchgit {
src = fetchFromGitHub {
inherit rev;
url = "https://github.com/acroca/go-symbols";
sha256 = "0qh2jjhwwk48gi8yii0z031bah11anxfz81nwflsiww7n426a8bb";
owner = "acroca";
repo = "go-symbols";
sha256 = "0dwf7w3zypv5brk68n7siakz222jwnhrhkzvwk1iwdffk79gqp3x";
};
meta = {

View File

@@ -1,16 +1,17 @@
{ stdenv, buildGoPackage, fetchgit }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "gomodifytags-${version}";
version = "unstable-2017-12-14";
rev = "20644152db4fe0ac406d81f3848e8a15f0cdeefa";
name = "gomodifytags-unstable-${version}";
version = "2018-09-14";
rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d";
goPackagePath = "github.com/fatih/gomodifytags";
src = fetchgit {
src = fetchFromGitHub {
inherit rev;
url = "https://github.com/fatih/gomodifytags";
sha256 = "0k0ly3mmm9zcaxwlzdbvdxr2gn7kvcqzk1bb7blgq7fkkzpp7i1q";
owner = "fatih";
repo = "gomodifytags";
sha256 = "16qbp594l90qpvf388wlv0kf6wvqj1vz2mqq0g3qcz6dkrc4cjqa";
};
meta = {

View File

@@ -2,17 +2,16 @@
buildGoPackage rec {
name = "gopkgs-${version}";
version = "unstable-2017-12-29";
rev = "b2ea2ecd37740e6ce0e020317d90c729aab4dc6d";
version = "2.0.1";
goPackagePath = "github.com/uudashr/gopkgs";
goDeps = ./deps.nix;
src = fetchFromGitHub {
inherit rev;
rev = "v${version}";
owner = "uudashr";
repo = "gopkgs";
sha256 = "1hwzxrf2h8xjbbx6l86mjpjh4csxxsy17zkh8h3qzncyfnsnczzg";
sha256 = "03zfwkmzwx2knkghky3irb2r78lbc1ccszjcg9y445b4pbqkn6w4";
};
meta = {

View File

@@ -1,11 +1,21 @@
# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
goPackagePath = "github.com/MichaelTJones/walk";
goPackagePath = "github.com/karrick/godirwalk";
fetch = {
type = "git";
url = "https://github.com/MichaelTJones/walk";
rev = "4748e29d5718c2df4028a6543edf86fd8cc0f881";
sha256 = "03bc3cql3w8cx05xlnzxsff59c6679rcpx4njzk86k00blkkizv7";
url = "https://github.com/karrick/godirwalk";
rev = "5cc8b3875be6c21825a1b54d3029ed415c93c4f7";
sha256 = "02nlyr0sa0lj1f27fsrxlspcsrx7fs60qwr33l5r6yq52axcikcd";
};
}
]
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
]

View File

@@ -9,8 +9,8 @@ mkDerivation {
src = fetchFromGitHub {
owner = "haskell-CI";
repo = "haskell-ci";
rev = "f67bc41621d40d6559684be5406d65409df4c480";
sha256 = "1r79dbgjq97h30xa3xhf75l0bivag8an9ag00mgzgpglvgc96czm";
rev = "18a7f5edcde360cea0740ff143eff1113ecda7d2";
sha256 = "00gxpxb5n1a1v562fd4cg1j92vwmd2zp00c2j60piyl8ppxxa115";
};
isLibrary = true;
isExecutable = true;

View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "icestorm-${version}";
version = "2018.08.01";
version = "2018.09.04";
src = fetchFromGitHub {
owner = "cliffordwolf";
repo = "icestorm";
rev = "8cac6c584044034210fe0ba1e6b930ff1cc59465";
sha256 = "01cnmk4khbbgzc308qj04sfwg0r8b9nh3s7xjsxdjcb3h1m9w88c";
rev = "8f61acd0556c8afee83ec2e77dedb03e700333d9";
sha256 = "1dwix8bb87xqf27dixdnfp47pll8739h9m9aw8wvvwz4s4989q6v";
};
nativeBuildInputs = [ pkgconfig ];

View File

@@ -0,0 +1,34 @@
{ stdenv, fetchFromGitHub, crystal, shards, which
, openssl, readline }:
stdenv.mkDerivation rec {
name = "icr";
version = "0.5.0";
src = fetchFromGitHub {
owner = "crystal-community";
repo = "icr";
rev = "v${version}";
sha256 = "1vavdzgm06ssnxm6mylki6xma0mfsj63n5kivhk1v4pg4xj966w5";
};
postPatch = ''
substituteInPlace Makefile \
--replace /usr/local $out
'';
buildInputs = [ openssl readline ];
nativeBuildInputs = [ crystal shards which ];
doCheck = true;
checkTarget = "test";
meta = with stdenv.lib; {
description = "Interactive console for the Crystal programming language";
homepage = https://github.com/crystal-community/icr;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
}

View File

@@ -3,12 +3,21 @@
buildGoPackage rec {
name = "kustomize-${version}";
version = "1.0.4";
version = "1.0.8";
# rev is the 1.0.8 commit, mainly for kustomize version command output
rev = "58492e2d83c59ed63881311f46ad6251f77dabc3";
goPackagePath = "github.com/kubernetes-sigs/kustomize";
goPackagePath = "sigs.k8s.io/kustomize";
buildFlagsArray = let t = "${goPackagePath}/pkg/commands"; in ''
-ldflags=
-s -X ${t}.kustomizeVersion=${version}
-X ${t}.gitCommit=${rev}
-X ${t}.buildDate=unknow
'';
src = fetchFromGitHub {
sha256 = "0lbf94wz34axaf8ps7h79qbj4dpihrpvnqa12zrawcmmgqallwhm";
sha256 = "0y6dqwhm7lczjy0zk2fnc1i43lvnjhcvihvm7qknky05z9f0v8bx";
rev = "v${version}";
repo = "kustomize";
owner = "kubernetes-sigs";
@@ -23,6 +32,6 @@ buildGoPackage rec {
'';
homepage = https://github.com/kubernetes-sigs/kustomize;
license = licenses.asl20;
maintainers = [ maintainers.carlosdagos ];
maintainers = [ maintainers.carlosdagos maintainers.vdemeester ];
};
}

View File

@@ -4,19 +4,19 @@ let
libphutil = fetchFromGitHub {
owner = "phacility";
repo = "libphutil";
rev = "01b33af6f4d570b34ad791cd5ccaa3ea7f77dcb9";
sha256 = "0glrxlj4cr2821pdc2yy2m5bss4yr1zx3sdgw3r5d8hbfz361nx7";
rev = "3215e4e291ed4468faeed4542d47a571b5bc559a";
sha256 = "0bbinaxny0j4iniz2grf0s9cysbl3x24yc32f3jra9mwsgh2v2zj";
};
arcanist = fetchFromGitHub {
owner = "phacility";
repo = "arcanist";
rev = "3b6b523c2b236e3724a1e115f126cb6fd05fa128";
sha256 = "1pr2izwj446rf2v6x6v2wsj7iwnaxq3xg3qqipybyf1xpqfmh5q8";
rev = "2650e8627a20e1bfe334a4a2b787f44ef5d6ebc5";
sha256 = "0x0xxiar202ypbgxh19swzjil546bbp8li4k5yrpvab55y8ymkd4";
};
in
stdenv.mkDerivation rec {
name = "arcanist-${version}";
version = "20170323";
version = "20180916";
src = [ arcanist libphutil ];
buildInputs = [ php makeWrapper flex ];

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lttng-tools-${version}";
version = "2.10.4";
version = "2.10.5";
src = fetchurl {
url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
sha256 = "1p3y7p8m5i5f8qvsib4da2m41rkw7pamvsngplh7wspgvg0zxvay";
sha256 = "04bll20lqb76xi6hcjrlankvyqc1hkyj8kvc4gf867lnxxw811m4";
};
nativeBuildInputs = [ pkgconfig ];

View File

@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
meta = {
meta = with stdenv.lib; {
homepage = https://nixos.org/patchelf.html;
license = "GPL";
license = licenses.gpl3;
description = "A small utility to modify the dynamic linker and RPATH of ELF executables";
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all;
maintainers = [ maintainers.eelco ];
platforms = platforms.all;
};
}

View File

@@ -1,19 +1,24 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
name = "patchelf-0.10-pre-20180108";
name = "patchelf-${version}";
version = "0.10-pre-20180509";
src = fetchFromGitHub {
owner = "NixOS";
repo = "patchelf";
rev = "48452cf6b4ccba1c1f47a09f4284a253634ab7d1";
sha256 = "1f1s8q3as3nrhcc1a8qc2z7imm644jfz44msn9sfv4mdynp2m2yb";
rev = "27ffe8ae871e7a186018d66020ef3f6162c12c69";
sha256 = "1sfkqsvwqqm2kdgkiddrxni86ilbrdw5my29szz81nj1m2j16asr";
};
# Drop test that fails on musl (?)
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
substituteInPlace tests/Makefile.am \
--replace "set-rpath-library.sh" ""
'' +
# extend version identifier to more informative than "0.10".
''
echo -n ${version} > version
'';
setupHook = [ ./setup-hook.sh ];
@@ -21,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ];
doCheck = true;
doCheck = !stdenv.isDarwin;
meta = {
homepage = https://nixos.org/patchelf.html;

View File

@@ -5,6 +5,8 @@
, libnotify
, ffmpeg, libxcb, cups
, sqlite, udev
, libuuid
, sdk ? false
}:
let
bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
@@ -23,6 +25,7 @@ let
ffmpeg libxcb
# chromium runtime deps (dlopend)
sqlite udev
libuuid
];
extraOutputsToInstall = [ "lib" "out" ];
@@ -30,13 +33,18 @@ let
in stdenv.mkDerivation rec {
name = "nwjs-${version}";
version = "0.32.2";
version = "0.33.4";
src = fetchurl {
src = if sdk then fetchurl {
url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then
"1hi6xispxvyb6krm5j11mv8509dwpw5ikpbkvq135gsk3gm29c9y" else
"00p4clbfinrj5gp2i84a263l3h00z8g7mnx61qwmr0z02kvswz9s";
} else fetchurl {
url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then
"0f0p17mbr24zhzm2cf77ddy6yj4k0k181dzf4gxdf8szd5vxpliy" else
"0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250";
"09zd6gja3l20xx03h2gawpmh9f8nxqjp8qdkds5nz9kbbckhkj52" else
"0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964";
};
phases = [ "unpackPhase" "installPhase" ];

View File

@@ -1,26 +1,26 @@
{ stdenv, fetchFromGitHub, ocamlPackages, opaline }:
{ stdenv, fetchurl, ocamlPackages, opaline }:
stdenv.mkDerivation rec {
name = "dune-${version}";
version = "1.2.1";
src = fetchFromGitHub {
owner = "ocaml";
repo = "dune";
rev = "${version}";
sha256 = "14m5zg1b6d0y03c5qsmqmwiwz2h0iys02rlgn6kzm519ck679bkq";
version = "1.3.0";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "15bzakiclipsyjgcfrj83xdpwwww3aaijyw01bn5cx96cmcqyjad";
};
buildInputs = with ocamlPackages; [ ocaml findlib ];
buildFlags = "release";
dontAddPrefix = true;
installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
meta = {
inherit (src.meta) homepage;
description = "Fast, portable and opinionated build system";
homepage = "https://github.com/ocaml/dune";
description = "A composable build system";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.asl20;
license = stdenv.lib.licenses.mit;
inherit (ocamlPackages.ocaml.meta) platforms;
};
}

View File

@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }:
{ stdenv, fetchFromGitHub, rustPlatform, clang, llvmPackages, rustfmt, writeScriptBin }:
rustPlatform.buildRustPackage rec {
name = "rust-bindgen-${version}";
version = "0.37.0";
version = "0.40.0";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "rust-bindgen";
rev = "v${version}";
sha256 = "0cqjr7qspjrfgqcp4nqxljmhhbqyijb2jpw3lajgjj48y6wrnw93";
sha256 = "0d7jqgi3aadwqcxiaz7axsq9h6n2i42yd3q0p1hc5l0kcdwwbj5k";
};
cargoSha256 = "0b8v6c7q1abibzygrigldpd31lyd5ngmj4vq5d7zni96m20mm85w";
cargoSha256 = "1rjyazhnk9xihqw1qzkkcrab627lqbj789g5d5nb8bn2hkbdx5d6";
libclang = llvmPackages.libclang.lib; #for substituteAll
@@ -19,14 +19,6 @@ rustPlatform.buildRustPackage rec {
propagatedBuildInputs = [ clang ]; # to populate NIX_CXXSTDLIB_COMPILE
patches = [
# https://github.com/rust-lang-nursery/rust-bindgen/pull/1376
(fetchpatch {
url = https://github.com/rust-lang-nursery/rust-bindgen/commit/c8b5406f08af82a92bf8faf852c21ba941d9c176.patch;
sha256 = "16ibr2rplh0qz8rsq6gir45xlz5nasad4y8fprwhrb7ssv8wfkss";
})
];
configurePhase = ''
export LIBCLANG_PATH="${libclang}/lib"
'';

View File

@@ -0,0 +1,50 @@
{ stdenv, fetchFromGitHub, crystal, shards, which }:
stdenv.mkDerivation rec {
name = "scry";
# 0.7.1 doesn't work with crystal > 0.25
version = "0.7.1.20180919";
src = fetchFromGitHub {
owner = "crystal-lang-tools";
repo = "scry";
rev = "543c1c3f764298f9fff192ca884d10f72338607d";
sha256 = "1yq7jap3y5pr2yqc6fn6bxshzwv7dz3w97incq7wpcvi7ibb4lcn";
};
nativeBuildInputs = [ crystal shards which ];
buildPhase = ''
runHook preBuild
shards build --release
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin bin/scry
runHook postInstall
'';
# https://github.com/crystal-lang-tools/scry/issues/138
doCheck = false;
checkPhase = ''
runHook preCheck
crystal spec
runHook postCheck
'';
meta = with stdenv.lib; {
description = "Code analysis server for the Crystal programming language";
homepage = https://github.com/crystal-lang-tools/scry;
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
}

View File

@@ -6,7 +6,7 @@ let
allSpecs = {
"x86_64-linux" = {
system = "linux64";
sha256 = "1iwmdkkxfmmiqzvj2bjh98db6j6zfb8s2m5kq15wmnq0g44gxski";
sha256 = "10phyz7ffzzx5ysbpyidssvwjdrcyszxf3lnba8qsrcajzm21nff";
};
"x86_64-darwin" = {
@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
name = "chromedriver-${version}";
version = "2.41";
version = "2.42";
src = fetchurl {
url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

View File

@@ -0,0 +1,26 @@
{stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "uftrace-${version}";
version = "0.9";
src = fetchFromGitHub {
owner = "namhyung";
repo = "uftrace";
rev = "f0fed0b24a9727ffed04673b62f66baad21a1f99";
sha256 = "0rn2xwd87qy5ihn5zq9pwq8cs1vfmcqqz0wl70wskkgp2ccsd9x8";
};
postUnpack = ''
patchShebangs .
'';
meta = {
description = "Function (graph) tracer for user-space";
homepage = https://github.com/namhyung/uftrace;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [stdenv.lib.maintainers.nthorne];
};
}

View File

@@ -1,9 +1,9 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "vndr-${version}";
version = "20171005-${lib.strings.substring 0 7 rev}";
rev = "b57c5799efd5ed743f347a025482babf01ba963e";
name = "vndr-unstable-${version}";
version = "2018-06-23";
rev = "81cb8916aad3c8d06193f008dba3e16f82851f52";
goPackagePath = "github.com/LK4D4/vndr";
excludedPackages = "test";
@@ -12,7 +12,7 @@ buildGoPackage rec {
inherit rev;
owner = "LK4D4";
repo = "vndr";
sha256 = "15mmy4a06jgzvlbjbmd89f0xx695x8wg7jqi76kiz495i6figk2v";
sha256 = "0c0k0cic35d1141az72gbf8r0vm9zaq4xi8v1sqpxhlzf28m297l";
};
meta = {

View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yarn-${version}";
version = "1.9.4";
version = "1.10.1";
src = fetchzip {
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
sha256 = "0lxncqvz66167ijhsi76ds2yp8140d9ywn89y5vm92010irsgs20";
sha256 = "0j9y53k0wxgwjvvpbs6rr4nbydg3bn4khcxsrnzyrakym0ihgmr1";
};
buildInputs = [ nodejs ];