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

Merge remote-tracking branch 'upstream/master' into gcc-8

Browse Source
This commit is contained in:
Robin Gloster
2019-08-25 18:55:46 +02:00
parent 45d6ccea33 48191315aa
commit 616b8343c4
5048 changed files with 266048 additions and 268080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ruby-modules/bundled-common/test.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should }:
{ lib, ruby, defaultGemConfig, test, should }:
let
testConfigs = {
inherit lib;
pkgs/development/ruby-modules/bundler-app/default.nix
+7 -1
View File
@@ -36,10 +36,16 @@
let
basicEnv = (callPackage ../bundled-common {}) args;
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // {
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // {
inherit preferLocalBuild allowSubstitutes; # pass the defaults
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
meta = { platforms = ruby.meta.platforms; } // meta;
passthru = basicEnv.passthru // {
inherit basicEnv;
inherit (basicEnv) env;
} // passthru;
};
in
runCommand basicEnv.name cmdArgs ''
pkgs/development/ruby-modules/bundler-env/default.nix
+2 -1
View File
@@ -13,6 +13,7 @@
, document ? []
, meta ? {}
, ignoreCollisions ? false
, passthru ? {}
, ...
}@args:
@@ -55,5 +56,5 @@ in
passthru = basicEnv.passthru // {
inherit basicEnv;
inherit (basicEnv) env;
};
} // passthru;
})
pkgs/development/ruby-modules/bundler-env/test.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, writeText, lib, ruby, defaultGemConfig, callPackage, test, stubs, should}:
{ callPackage, test, stubs, should}:
let
bundlerEnv = callPackage ./default.nix stubs // {
basicEnv = callPackage ../bundled-common stubs;
pkgs/development/ruby-modules/bundler-update-script/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ runtimeShell, lib, writeScript, bundix, bundler, bundler-audit, coreutils, git, nix }:
attrPath:
let
updateScript = writeScript "bundler-update-script" ''
#!${runtimeShell}
PATH=${lib.makeBinPath [ bundler bundler-audit bundix coreutils git nix ]}
set -o errexit
set -o nounset
set -o pipefail
attrPath=$1
toplevel=$(git rev-parse --show-toplevel)
position=$(nix eval -f "$toplevel" --raw "$attrPath.meta.position")
gemdir=$(dirname "$position")
cd "$gemdir"
bundler lock --update
bundler-audit check --update
bundix
'';
in [ updateScript attrPath ]
pkgs/development/ruby-modules/gem-config/default.nix
+29 -2
View File
@@ -22,8 +22,9 @@
, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx
, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
, file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
, bison, flex, pango, python3, patchelf
, libselinux ? null, libsepol ? null
}@args:
@@ -158,7 +159,7 @@ in
gdk_pixbuf2 = attrs: {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ rake gdk_pixbuf ];
buildInputs = [ rake gdk-pixbuf ];
};
gpgme = attrs: {
@@ -257,6 +258,32 @@ in
];
};
mathematical = attrs: {
buildInputs = [
cmake
bison
flex
glib
pkgconfig
cairo
pango
gdk-pixbuf
libxml2
python3
];
# The ruby build script takes care of this
dontUseCmakeConfigure = true;
# For some reason 'mathematical.so' is missing cairo and glib in its RPATH, add them explicitly here
postFixup = lib.optionalString stdenv.isLinux ''
soPath="$out/${ruby.gemPath}/gems/mathematical-${attrs.version}/lib/mathematical/mathematical.so"
${patchelf}/bin/patchelf \
--set-rpath "${lib.makeLibraryPath [ glib cairo ]}:$(${patchelf}/bin/patchelf --print-rpath "$soPath")" \
"$soPath"
'';
};
magic = attrs: {
buildInputs = [ file ];
postInstall = ''
pkgs/development/ruby-modules/solargraph/Gemfile.lock
+10 -10
View File
@@ -2,9 +2,9 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.0)
backport (1.0.0)
backport (1.1.2)
htmlentities (4.3.4)
jaro_winkler (1.5.2)
jaro_winkler (1.5.3)
kramdown (1.17.0)
mini_portile2 (2.4.0)
nokogiri (1.10.3)
@@ -15,16 +15,16 @@ GEM
rainbow (3.0.0)
reverse_markdown (1.1.0)
nokogiri
rubocop (0.68.0)
rubocop (0.74.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.6)
ruby-progressbar (1.10.0)
solargraph (0.32.1)
backport (~> 1.0)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.1)
solargraph (0.35.2)
backport (~> 1.1)
bundler (>= 1.17.2)
htmlentities (~> 4.3, >= 4.3.4)
jaro_winkler (~> 1.5)
@@ -37,8 +37,8 @@ GEM
yard (~> 0.9)
thor (0.20.3)
tilt (2.0.9)
unicode-display_width (1.5.0)
yard (0.9.19)
unicode-display_width (1.6.0)
yard (0.9.20)
PLATFORMS
ruby
pkgs/development/ruby-modules/solargraph/default.nix
+4 -2
View File
@@ -1,15 +1,17 @@
{ lib, bundlerApp }:
{ lib, bundlerApp, bundlerUpdateScript }:
bundlerApp rec {
pname = "solargraph";
exes = ["solargraph" "solargraph-runtime"];
gemdir = ./.;
passthru.updateScript = bundlerUpdateScript "solargraph";
meta = with lib; {
description = "IDE tools for the Ruby language";
homepage = http://www.github.com/castwide/solargraph;
license = licenses.mit;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ worldofpeace nicknovitski angristan ];
platforms = platforms.unix;
};
}
pkgs/development/ruby-modules/solargraph/gemset.nix
+14 -14
View File
@@ -14,10 +14,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00kwxnj4jwjkf5ji473qsz0nq4kjsx6p6hzlm8iwbbylv22hf2xy";
sha256 = "1xmjljpyx5ly078gi0lmmgkv4y0msxxa3hmv74bzxzp3l8qbn5vc";
type = "gem";
};
version = "1.0.0";
version = "1.1.2";
};
htmlentities = {
groups = ["default"];
@@ -34,10 +34,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l";
sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
type = "gem";
};
version = "1.5.2";
version = "1.5.3";
};
kramdown = {
groups = ["default"];
@@ -118,20 +118,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171bczfafdmyz1lj6mgz2wdzz8i42w10zw2wj5j13y2f6hp687ca";
sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk";
type = "gem";
};
version = "0.68.0";
version = "0.74.0";
};
ruby-progressbar = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk";
sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
type = "gem";
};
version = "1.10.0";
version = "1.10.1";
};
solargraph = {
dependencies = ["backport" "htmlentities" "jaro_winkler" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
@@ -139,10 +139,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bsv0x9hhxwki7v8x99wzxcl1spgwrsxqd6alpb2y0wf9lsakabl";
sha256 = "1r0a7nfb0cwg2d7awbmvzk14594w7vkx844sshl9jpzkjx1asa9n";
type = "gem";
};
version = "0.32.1";
version = "0.35.2";
};
thor = {
groups = ["default"];
@@ -169,19 +169,19 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ssnc6rja9ii97z7m35y4zd0rd7cpv3bija20l7cpd7y4jyyx44q";
sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
type = "gem";
};
version = "1.5.0";
version = "1.6.0";
};
yard = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny";
type = "gem";
};
version = "0.9.19";
version = "0.9.20";
};
}