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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2019-09-15 13:18:54 +02:00
parent 9f8a7d2679 c860babfe6
commit b6c6e1f9e8
192 changed files with 4150 additions and 2678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/tflint/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tflint";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "wata727";
repo = pname;
rev = "v${version}";
sha256 = "0aff7ckl245cyjs2rbgczkqlp2x6g4g458p4li0k1agk3m9bbq35";
sha256 = "0aw39xv6jpnhy201gp9jhz6cbz47k7qgxgcwsffak8janbk6bj2a";
};
modSha256 = "1facqppgpmmz2j7j77fa3mnjv2nzjxz4ya6xvyvyy92ma0ybclgh";

20
pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix Normal file
View File

@@ -0,0 +1,20 @@
{ pythonPackages, isPy3k, pkgs }:
pythonPackages.buildPythonPackage rec {
name = "beautifulsoup-3.2.1";
disabled = isPy3k;
src = pkgs.fetchurl {
url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
};
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = http://www.crummy.com/software/BeautifulSoup/;
license = "bsd";
description = "Undemanding HTML/XML parser";
};
}

86
pkgs/development/tools/build-managers/redo-apenwarr/default.nix
View File

@@ -1,30 +1,80 @@
{stdenv, fetchFromGitHub, python2, which}:
stdenv.mkDerivation {
pname = "redo-apenwarr";
{ stdenv, lib, python27, fetchFromGitHub, mkdocs, which, findutils, coreutils
, perl
, doCheck ? true
}: let
version = "unstable-2019-06-21";
# copy from
# pkgs/applications/networking/pyload/beautifulsoup.nix
beautifulsoup = python27.pkgs.callPackage ./beautifulsoup.nix {
pythonPackages = python27.pkgs;
};
mkdocs-exclude = python27.pkgs.callPackage ./mkdocs-exclude.nix {
pythonPackages = python27.pkgs;
};
in stdenv.mkDerivation rec {
pname = "redo-apenwarr";
version = "0.42";
src = fetchFromGitHub {
owner = "apenwarr";
repo = "redo";
rev = "8924fa35fa7363b531f8e6b48a1328d2407ad5cf";
sha256 = "1dj20w29najqjyvk0jh5kqbcd10k32rad986q5mzv4v49qcwdc1q";
repo = pname;
rev = "${pname}-${version}";
sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm";
};
DESTDIR="";
PREFIX = placeholder "out";
postPatch = ''
patchShebangs minimal/do
'' + lib.optionalString doCheck ''
unset CC CXX
substituteInPlace minimal/do.test \
--replace "/bin/pwd" "${coreutils}/bin/pwd"
substituteInPlace t/105-sympath/all.do \
--replace "/bin/pwd" "${coreutils}/bin/pwd"
substituteInPlace t/all.do \
--replace "/bin/ls" "ls"
substituteInPlace t/110-compile/hello.o.do \
--replace "/usr/include" "${stdenv.lib.getDev stdenv.cc.libc}/include"
substituteInPlace t/200-shell/nonshelltest.do \
--replace "/usr/bin/env perl" "${perl}/bin/perl"
patchPhase = ''
patchShebangs .
'';
buildInputs = [ python2 which ];
inherit doCheck;
meta = with stdenv.lib; {
description = "Apenwarr version of the redo build tool.";
homepage = https://github.com/apenwarr/redo/;
license = stdenv.lib.licenses.asl20;
platforms = platforms.all;
maintainers = with stdenv.lib.maintainers; [ andrewchambers ];
checkTarget = "test";
outputs = [ "out" "man" ];
installFlags = [
"PREFIX=$(out)"
"DESTDIR=/"
];
nativeBuildInputs = [
python27
beautifulsoup
mkdocs
mkdocs-exclude
which
findutils
];
meta = with lib; {
description = "Smaller, easier, more powerful, and more reliable than make. An implementation of djb's redo.";
homepage = https://github.com/apenwarr/redo;
maintainers = with maintainers; [
andrewchambers
ck3d
];
license = licenses.asl20;
};
}

20
pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix Normal file
View File

@@ -0,0 +1,20 @@
{ pythonPackages, isPy3k, pkgs }:
pythonPackages.buildPythonPackage rec {
name = "mkdocs-exclude";
disabled = isPy3k;
src = pkgs.fetchFromGitHub {
owner = "apenwarr";
repo = "mkdocs-exclude";
rev = "fdd67d2685ff706de126e99daeaaaf3f6f7cf3ae";
sha256 = "1phhl79xf4xq8w2sb2w5zm4bahcr33gsbxkz7dl1dws4qhcbxrfd";
};
buildInputs = with pkgs; [
mkdocs
];
# error: invalid command 'test'
doCheck = false;
}

4
pkgs/development/tools/buildah/default.nix
View File

@@ -4,13 +4,13 @@
buildGoPackage rec {
pname = "buildah";
version = "1.11.0";
version = "1.11.1";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "114dmjqacz5hairl1s8qhndzr52lcvh99g565cq5ydscblnzpw1b";
sha256 = "0mbmb7994dcv8i41zgiqmb6qp5hawgygzam7mi4pmdygkx4ckkxw";
};
outputs = [ "bin" "man" "out" ];

6
pkgs/development/tools/continuous-integration/cide/Gemfile
View File

@@ -1,6 +0,0 @@
source "https://rubygems.org"
gem 'cide'
# Optional dependency, only used by `cide upload`
gem 'aws-sdk', '~> 2'

40
pkgs/development/tools/continuous-integration/cide/Gemfile.lock
View File

@@ -1,40 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
aws-sdk (2.2.17)
aws-sdk-resources (= 2.2.17)
aws-sdk-core (2.2.17)
jmespath (~> 1.0)
aws-sdk-resources (2.2.17)
aws-sdk-core (= 2.2.17)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
cide (0.9.0)
thor (~> 0.19)
virtus (~> 1.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
equalizer (0.0.11)
ice_nine (0.11.2)
jmespath (1.1.3)
thor (0.19.1)
thread_safe (0.3.5)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
PLATFORMS
ruby
DEPENDENCIES
aws-sdk (~> 2)
cide
BUNDLED WITH
1.10.6

32
pkgs/development/tools/continuous-integration/cide/default.nix
View File

@@ -1,32 +0,0 @@
{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, docker, git, gnutar, gzip }:
stdenv.mkDerivation rec {
pname = "cide";
version = "0.9.0";
env = bundlerEnv {
name = "${pname}-${version}-gems";
gemdir = ./.;
};
phases = ["installPhase"];
buildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
makeWrapper ${env}/bin/cide $out/bin/cide \
--set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]}
'';
passthru.updateScript = bundlerUpdateScript "cide";
meta = with lib; {
description = "Isolated test runner with Docker";
homepage = http://zimbatm.github.io/cide/;
license = licenses.mit;
maintainers = with maintainers; [ zimbatm nicknovitski ];
platforms = docker.meta.platforms;
};
}

103
pkgs/development/tools/continuous-integration/cide/gemset.nix
View File

@@ -1,103 +0,0 @@
{
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
source = {
sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
type = "gem";
};
version = "1.0.5";
};
thread_safe = {
source = {
sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
type = "gem";
};
version = "0.3.5";
};
thor = {
source = {
sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
type = "gem";
};
version = "0.19.1";
};
jmespath = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vpvd61kc60f98jn28kw7x7vi82qrwgglam42nvzh98i43yxwsfb";
type = "gem";
};
version = "1.1.3";
};
ice_nine = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
type = "gem";
};
version = "0.11.2";
};
equalizer = {
source = {
sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
type = "gem";
};
version = "0.0.11";
};
descendants_tracker = {
dependencies = ["thread_safe"];
source = {
sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
type = "gem";
};
version = "0.0.4";
};
coercible = {
dependencies = ["descendants_tracker"];
source = {
sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
type = "gem";
};
version = "1.0.0";
};
cide = {
version = "0.9.0";
source = {
type = "gem";
remotes = ["https://rubygems.org"];
sha256 = "1wykwv0jnrh49jm9zsy1cb5wddv65iw4ixh072hr242wb83dcyl0";
};
};
axiom-types = {
dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
source = {
sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
type = "gem";
};
version = "0.1.1";
};
aws-sdk-resources = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vdnpjmil99n9d1fpk1w6ssgvmzx4wfmrqcij8nyd0iqdaacx3fj";
type = "gem";
};
version = "2.2.17";
};
aws-sdk-core = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vq7ny5n3rdfzkdqdm76r48slmp2a5v7565llrl4bw5hb5k4p75z";
type = "gem";
};
version = "2.2.17";
};
aws-sdk = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cwycrdk21blzjzf8fj1wlmdix94rj9aixj6phx6lwbqykn2dzx9";
type = "gem";
};
version = "2.2.17";
};
}

8
pkgs/development/tools/doctl/default.nix
View File

@@ -4,8 +4,8 @@ buildGoPackage rec {
pname = "doctl";
version = "${major}.${minor}.${patch}";
major = "1";
minor = "18";
patch = "0";
minor = "31";
patch = "2";
goPackagePath = "github.com/digitalocean/doctl";
excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)'';
@@ -18,10 +18,10 @@ buildGoPackage rec {
'';
src = fetchFromGitHub {
owner = "digitalocean";
owner = "digitalocean";
repo = "doctl";
rev = "v${version}";
sha256 = "1p43q1iyjj597gr47hn589fv7n26mny9niq7yb9hlmslkplsrb0a";
sha256 = "1q71kfjiav8xfw1bb3dziik1d0jr84hl83d3sx3cak0nd9nmakgs";
};
meta = {

32
pkgs/development/tools/jazzy/Gemfile.lock
View File

@@ -1,18 +1,18 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
CFPropertyList (3.0.1)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.7.4)
claide (1.0.3)
cocoapods (1.7.5)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.4)
cocoapods-core (= 1.7.5)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -28,7 +28,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.4)
cocoapods-core (1.7.5)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
@@ -38,7 +38,7 @@ GEM
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
cocoapods-trunk (1.4.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
@@ -51,13 +51,13 @@ GEM
gh_inspector (1.1.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jazzy (0.10.0)
jazzy (0.11.0)
cocoapods (~> 1.5)
mustache (~> 1.1)
open4
redcarpet (~> 3.4)
rouge (>= 2.0.6, < 4.0)
sass (~> 3.6)
sassc (~> 2.1)
sqlite3 (~> 1.3)
xcinvoke (~> 0.3.0)
liferaft (0.0.6)
@@ -68,24 +68,18 @@ GEM
nap (1.1.0)
netrc (0.11.0)
open4 (1.3.4)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
redcarpet (3.4.0)
rouge (3.6.0)
redcarpet (3.5.0)
rouge (3.10.0)
ruby-macho (1.4.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.2.0)
ffi (~> 1.9)
sqlite3 (1.4.1)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.11.0)
xcodeproj (1.12.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)

80
pkgs/development/tools/jazzy/gemset.nix
View File

@@ -25,18 +25,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z";
sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
type = "gem";
};
version = "3.0.0";
version = "3.0.1";
};
claide = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc";
sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
type = "gem";
};
version = "1.0.2";
version = "1.0.3";
};
cocoapods = {
dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
@@ -44,10 +46,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc";
sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz";
type = "gem";
};
version = "1.7.4";
version = "1.7.5";
};
cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"];
@@ -55,10 +57,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c";
sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4";
type = "gem";
};
version = "1.7.4";
version = "1.7.5";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -113,10 +115,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1plssgabdv6hcaq1c3gf43kf1d2prx883q8lzdr6chi5byzzs3yl";
sha256 = "1m0p27aij7d0n0b8h7nvyv3q3prcpwisbj7sla0fp2hvn4lqarl5";
type = "gem";
};
version = "1.3.1";
version = "1.4.0";
};
cocoapods-try = {
source = {
@@ -202,15 +204,15 @@
version = "0.9.5";
};
jazzy = {
dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sass" "sqlite3" "xcinvoke"];
dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sassc" "sqlite3" "xcinvoke"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sljk5v4823h7kzf0yag7f1vf6sahpqip62xngvrhm3il9dx3j72";
sha256 = "0cwsmijhb845lrkwq1gxwa6a698vp47gdxcpav30dghrf1ikyzqm";
type = "gem";
};
version = "0.10.0";
version = "0.11.0";
};
liferaft = {
source = {
@@ -284,44 +286,25 @@
};
version = "1.3.4";
};
rb-fsevent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
type = "gem";
};
version = "0.10.3";
};
rb-inotify = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
type = "gem";
};
version = "0.10.0";
};
redcarpet = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
type = "gem";
};
version = "3.4.0";
version = "3.5.0";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bxjfg6bgc6zpczc5nsmpd6406b97fg0hldl968rgxkz1m6hblda";
sha256 = "07j29vbgsi9v7kpx4lqpmh0hx59i420jig73dy46wx3id1i7vdqz";
type = "gem";
};
version = "3.6.0";
version = "3.10.0";
};
ruby-macho = {
groups = ["default"];
@@ -333,25 +316,16 @@
};
version = "1.4.0";
};
sass = {
dependencies = ["sass-listen"];
sassc = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0";
sha256 = "178iflma5z4qk2lfzlxk8kh942skj45q6v6xwllkqng9xbjlyzkf";
type = "gem";
};
version = "3.7.4";
};
sass-listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
type = "gem";
};
version = "4.0.0";
version = "2.2.0";
};
sqlite3 = {
groups = ["default"];
@@ -397,9 +371,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j";
sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8";
type = "gem";
};
version = "1.11.0";
version = "1.12.0";
};
}

10
pkgs/development/tools/misc/ccls/default.nix
View File

@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, makeWrapper
{ stdenv, fetchFromGitHub
, cmake, llvmPackages, rapidjson, runtimeShell }:
stdenv.mkDerivation rec {
pname = "ccls";
version = "0.20190314.1";
version = "0.20190823";
src = fetchFromGitHub {
owner = "MaskRay";
repo = "ccls";
rev = version;
sha256 = "1yvxliryqx2bc7r6ri4iafbrjx19jk8hnfbvq5xla72q0gqb97lf";
sha256 = "1qy1kf83mrvbhwl8m0h7ralwd3sid8y8fpk7pmy81y1nq8f1cf6f";
};
nativeBuildInputs = [ cmake makeWrapper ];
nativeBuildInputs = [ cmake ];
buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ];
cmakeFlags = [
"-DSYSTEM_CLANG=ON"
"-DCCLS_VERSION=${version}"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12"
];

19
pkgs/development/tools/misc/hydra/default.nix
View File

@@ -1,9 +1,9 @@
{ stdenv, nix, perlPackages, buildEnv, releaseTools, fetchFromGitHub
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, fetchpatch, boost, autoreconfHook
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook
}:
with stdenv;
@@ -67,17 +67,17 @@ let
boehmgc
];
};
in releaseTools.nixBuild rec {
in stdenv.mkDerivation rec {
pname = "hydra";
version = "2019-05-06";
version = "2019-08-30";
inherit stdenv;
src = fetchFromGitHub {
owner = "NixOS";
repo = pname;
rev = "ff64583d07f046e378a6be596ec0ce7a9e2b7472";
sha256 = "0w88q0saz7si22z3ryim6vdrv9qkwn6l25xfmiapvh5qrnrrdcb9";
rev = "242b8b7a314759ed33f69205d26a1b7c337511e0";
sha256 = "167ijcf9qdm10kjvqax3hcvs5mpa4mx2y2i9idwwc6xfvn8fhs84";
};
buildInputs =
@@ -97,13 +97,6 @@ in releaseTools.nixBuild rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
patches = [
(fetchpatch {
url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch";
sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx";
})
];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
NIX_CFLAGS_COMPILE = [ "-pthread" ];

4
pkgs/development/tools/misc/sccache/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
rustPlatform.buildRustPackage rec {
version = "0.2.10";
version = "0.2.11";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = version;
sha256 = "13fiifv3bi9shzp30wd7k2nd2j43vzdhk6z5rnfn5a9hmijqpg9n";
sha256 = "0084ddvzjgdpkwqc38kvzaz8n6av9ml3qqlkjma70hsis8w8gqjz";
};
cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6";

2
pkgs/development/tools/misc/universal-ctags/default.nix
View File

@@ -42,6 +42,6 @@ stdenv.mkDerivation {
platforms = platforms.unix;
# universal-ctags is preferred over emacs's ctags
priority = 1;
maintainers = [ maintainers.mimadrid ];
maintainers = [ maintainers.mimame ];
};
}

23
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View File

@@ -1,35 +1,26 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, dune
{ lib, fetchFromGitHub, buildDunePackage
, cmdliner, cppo, yojson
}:
if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "js_of_ocaml-compiler is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
buildDunePackage rec {
pname = "js_of_ocaml-compiler";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "js_of_ocaml";
rev = version;
sha256 = "0bg8x2s3f24c8ia2g293ikd5yg0yjw3hkdgdql59c8k2amqin8f8";
sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj";
};
buildInputs = [ ocaml findlib dune cmdliner cppo ];
buildInputs = [ cmdliner cppo ];
propagatedBuildInputs = [ yojson ];
buildPhase = "dune build -p js_of_ocaml-compiler";
inherit (dune) installPhase;
meta = {
description = "Compiler from OCaml bytecode to Javascript";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
}

14
pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
View File

@@ -1,8 +1,8 @@
diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
index e0fdea28..38d9d0e4 100644
index 4b432785..fa45e87e 100644
--- a/src/dist/component/package.rs
+++ b/src/dist/component/package.rs
@@ -104,10 +104,11 @@ impl Package for DirectoryPackage {
@@ -109,10 +109,11 @@ impl Package for DirectoryPackage {
match &*part.0 {
"file" => {
if self.copy {
@@ -16,10 +16,10 @@ index e0fdea28..38d9d0e4 100644
}
"dir" => {
if self.copy {
@@ -132,6 +133,22 @@ impl Package for DirectoryPackage {
@@ -135,6 +136,22 @@ impl Package for DirectoryPackage {
}
}
+fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) {
+ let is_bin = if let Some(p) = src_path.parent() {
+ p.ends_with("bin")
@@ -36,6 +36,6 @@ index e0fdea28..38d9d0e4 100644
+ }
+}
+
// On Unix we need to set up the file permissions correctly so
// binaries are executable and directories readable. This shouldn't be
// necessary: the source files *should* have the right permissions,
#[derive(Debug)]
pub struct TarPackage<'a>(DirectoryPackage, temp::Dir<'a>);

6
pkgs/development/tools/rust/rustup/default.nix
View File

@@ -4,16 +4,16 @@
rustPlatform.buildRustPackage rec {
pname = "rustup";
version = "1.18.3";
version = "1.19.0";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rustup.rs";
rev = version;
sha256 = "062l893i9czm1lm0x3arj3vfnjg3fg8q8xvq3y4adakmk6yrcc4x";
sha256 = "1c0qz9s09ikgy23yssd57v7b5s005y128sldmq0xd9i1fryp129z";
};
cargoSha256 = "1zwlr0zxc97m6xr28ryq5hkrvcns6qg68h7w09sga23xinm3fr11";
cargoSha256 = "0rjm01pnb2w39c0jrscmhhsx9gsi3sl9cxd838m77h9pzwsp1h40";
nativeBuildInputs = [ pkgconfig ];