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

Merge remote-tracking branch 'origin/master' into gcc-9

Browse Source
This commit is contained in:
Franz Pletz
2019-12-26 14:17:36 +01:00
parent 602bccd1a8 4d2dd15546
commit 77b6c3cd06
4311 changed files with 115681 additions and 107815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ruby-modules/gem-config/default.nix
+2 -7
View File
@@ -21,7 +21,7 @@
, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian, gpgme, utillinux, tzdata, icu, libffi
, cmake, libssh2, openssl, libmysqlclient, darwin, git, perl, pcre, gecode_3, curl
, msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, 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, binutils, freetds, wrapGAppsHook, atk
@@ -70,11 +70,6 @@ in
buildInputs = [ cairo pcre xorg.libpthreadstubs xorg.libXdmcp ];
};
capybara-webkit = attrs: {
buildInputs = [ qt59.qtbase qt59.qtwebkit ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
};
charlock_holmes = attrs: {
buildInputs = [ which icu zlib ];
};
@@ -542,7 +537,7 @@ in
dontBuild = false;
postPatch = ''
substituteInPlace lib/rbreadline.rb \
--replace 'infocmp' '${ncurses.dev}/bin/infocmp'
--replace 'infocmp' '${ncurses}/bin/infocmp'
'';
};
pkgs/development/ruby-modules/gem/default.nix
+1 -1
View File
@@ -99,7 +99,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
runHook preUnpack
if [[ -f $src && $src == *.gem ]]; then
if [[ -z "$dontBuild" ]]; then
if [[ -z "''${dontBuild-}" ]]; then
# we won't know the name of the directory that RubyGems creates,
# so we'll just use a glob to find it and move it over.
gempkg="$src"
pkgs/development/ruby-modules/gem/nix-bundle-install.rb
+3 -2
View File
@@ -5,6 +5,7 @@ require 'rubygems/command'
require 'fileutils'
require 'pathname'
require 'tmpdir'
require 'shellwords'
if defined?(Encoding.default_internal)
Encoding.default_internal = Encoding::UTF_8
@@ -31,7 +32,7 @@ bin_dir = File.join(ENV["out"], "bin")
type = ARGV[0]
name = ARGV[1]
version = ARGV[2]
build_flags = ARGV[3]
build_flags = Shellwords.split(ARGV[3])
if type == "git"
uri = ARGV[4]
REPO = ARGV[5]
@@ -117,7 +118,7 @@ else
source = Bundler::Source::Path.new(options)
end
spec = source.specs.search_all(name).first
Bundler.rubygems.with_build_args [build_flags] do
Bundler.rubygems.with_build_args build_flags do
source.install(spec)
end
pkgs/development/ruby-modules/solargraph/Gemfile.lock
+8 -8
View File
@@ -3,18 +3,18 @@ GEM
specs:
ast (2.4.0)
backport (1.1.2)
htmlentities (4.3.4)
jaro_winkler (1.5.3)
jaro_winkler (1.5.4)
maruku (0.7.3)
mini_portile2 (2.4.0)
nokogiri (1.10.4)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
parallel (1.18.0)
parallel (1.19.1)
parser (2.6.5.0)
ast (~> 2.4.0)
rainbow (3.0.0)
reverse_markdown (1.3.0)
nokogiri
rubocop (0.75.1)
rubocop (0.77.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
@@ -22,11 +22,11 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-progressbar (1.10.1)
solargraph (0.37.2)
solargraph (0.38.0)
backport (~> 1.1)
bundler (>= 1.17.2)
htmlentities (~> 4.3, >= 4.3.4)
jaro_winkler (~> 1.5)
maruku (~> 0.7, >= 0.7.3)
nokogiri (~> 1.9, >= 1.9.1)
parser (~> 2.3)
reverse_markdown (~> 1.0, >= 1.0.5)
@@ -46,4 +46,4 @@ DEPENDENCIES
solargraph!
BUNDLED WITH
1.17.2
1.17.3
pkgs/development/ruby-modules/solargraph/gemset.nix
+22 -22
View File
@@ -19,25 +19,25 @@
};
version = "1.1.2";
};
htmlentities = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
type = "gem";
};
version = "4.3.4";
};
jaro_winkler = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf";
sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
type = "gem";
};
version = "1.5.3";
version = "1.5.4";
};
maruku = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r7bxpgnx2hp3g12bjrmdrpv663dfqxsdp0af69kjhxmaxpia56x";
type = "gem";
};
version = "0.7.3";
};
mini_portile2 = {
groups = ["default"];
@@ -55,20 +55,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
type = "gem";
};
version = "1.10.4";
version = "1.10.5";
};
parallel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "091p5zrzzyg3fg48jhdz9lzjf2r9r3akra2cd46yd4nza3xgxshz";
sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
type = "gem";
};
version = "1.18.0";
version = "1.19.1";
};
parser = {
dependencies = ["ast"];
@@ -108,10 +108,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s5q1i7776yklkcwwx6ibm2mwnjky6wv7rpa3xhn8448854is31n";
sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9";
type = "gem";
};
version = "0.75.1";
version = "0.77.0";
};
ruby-progressbar = {
groups = ["default"];
@@ -124,15 +124,15 @@
version = "1.10.1";
};
solargraph = {
dependencies = ["backport" "htmlentities" "jaro_winkler" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
dependencies = ["backport" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w20g68i6djc2vyx3awzvn15brdfpcwbna27r0903h5djcmnr8a0";
sha256 = "1pdqpxvjj6r6gzrz9rmxfg85cmfjs4y2lyq8p5qfg3kfpqx4rhpw";
type = "gem";
};
version = "0.37.2";
version = "0.38.0";
};
thor = {
groups = ["default"];
@@ -174,4 +174,4 @@
};
version = "0.9.20";
};
}
}