Large diffs are not rendered by default.

@@ -0,0 +1,90 @@
#!/usr/bin/env node

const fs = require('fs')
const lockfile = require('@yarnpkg/lockfile')
const { docopt } = require('docopt')
const deepEqual = require('deep-equal')
const R = require('ramda')

const fixPkgAddMissingSha1 = require('../lib/fixPkgAddMissingSha1')
const mapObjIndexedReturnArray = require('../lib/mapObjIndexedReturnArray')
const generateNix = require('../lib/generateNix')

const USAGE = `
Usage: yarn2nix [options]
Options:
-h --help Shows this help.
--no-nix Hide the nix output
--no-patch Don't patch the lockfile if hashes are missing
--lockfile=FILE Specify path to the lockfile [default: ./yarn.lock].
--builtin-fetchgit Use builtin fetchGit for git dependencies to support on-the-fly generation of yarn.nix without an internet connection
`

const options = docopt(USAGE)

const data = fs.readFileSync(options['--lockfile'], 'utf8')

// json example:

// {
// type:'success',
// object:{
// 'abbrev@1':{
// version:'1.0.9',
// resolved:'https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135'
// },
// 'shell-quote@git+https://github.com/srghma/node-shell-quote.git#without_unlicenced_jsonify':{
// version:'1.6.0',
// resolved:'git+https://github.com/srghma/node-shell-quote.git#0aa381896e0cd7409ead15fd444f225807a61e0a'
// },
// '@graphile/plugin-supporter@git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git':{
// version:'1.6.0',
// resolved:'git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git#1234commit'
// },
// }
// }

const json = lockfile.parse(data)

if (json.type !== 'success') {
throw new Error('yarn.lock parse error')
}

// Check for missing hashes in the yarn.lock and patch if necessary

const pkgs = R.pipe(
mapObjIndexedReturnArray((value, key) => ({
...value,
nameWithVersion: key,
})),
R.uniqBy(R.prop('resolved')),
)(json.object)

const fixedPkgsPromises = R.map(fixPkgAddMissingSha1, pkgs)

;(async () => {
const fixedPkgs = await Promise.all(fixedPkgsPromises)

const origJson = lockfile.parse(data)

if (!deepEqual(origJson, json)) {
console.error('found changes in the lockfile', options['--lockfile'])

if (options['--no-patch']) {
console.error('...aborting')
process.exit(1)
}

fs.writeFileSync(options['--lockfile'], lockfile.stringify(json.object))
}

if (!options['--no-nix']) {
// print to stdout
console.log(generateNix(fixedPkgs, options['--builtin-fetchgit']))
}
})().catch(error => {
console.error(error)

process.exit(1)
})

Large diffs are not rendered by default.

@@ -0,0 +1,53 @@
#!/usr/bin/env node

/* Usage:
* node fixup_bin.js <bin_dir> <modules_dir> [<bin_pkg_1>, <bin_pkg_2> ... ]
*/

const fs = require('fs')
const path = require('path')

const derivationBinPath = process.argv[2]
const nodeModules = process.argv[3]
const packagesToPublishBin = process.argv.slice(4)

function processPackage(name) {
console.log('fixup_bin: Processing ', name)

const packagePath = `${nodeModules}/${name}`
const packageJsonPath = `${packagePath}/package.json`
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath))

if (!packageJson.bin) {
console.log('fixup_bin: No binaries provided')
return
}

// There are two alternative syntaxes for `bin`
// a) just a plain string, in which case the name of the package is the name of the binary.
// b) an object, where key is the name of the eventual binary, and the value the path to that binary.
if (typeof packageJson.bin === 'string') {
const binName = packageJson.bin
packageJson.bin = {}
packageJson.bin[packageJson.name] = binName
}

// eslint-disable-next-line no-restricted-syntax, guard-for-in
for (const binName in packageJson.bin) {
const binPath = packageJson.bin[binName]
const normalizedBinName = binName.replace('@', '').replace('/', '-')

const targetPath = path.normalize(`${packagePath}/${binPath}`)
const createdPath = `${derivationBinPath}/${normalizedBinName}`

console.log(
`fixup_bin: creating link ${createdPath} that points to ${targetPath}`,
)

fs.symlinkSync(targetPath, createdPath)
}
}

packagesToPublishBin.forEach(pkg => {
processPackage(pkg)
})
@@ -0,0 +1,49 @@
#!/usr/bin/env node

/* Usage:
* node fixup_yarn_lock.js yarn.lock
*/

const fs = require('fs')
const readline = require('readline')

const urlToName = require('../lib/urlToName')

const yarnLockPath = process.argv[2]

const readFile = readline.createInterface({
input: fs.createReadStream(yarnLockPath, { encoding: 'utf8' }),

// Note: we use the crlfDelay option to recognize all instances of CR LF
// ('\r\n') in input.txt as a single line break.
crlfDelay: Infinity,

terminal: false, // input and output should be treated like a TTY
})

const result = []

readFile
.on('line', line => {
const arr = line.match(/^ {2}resolved "([^#]+)#([^"]+)"$/)

if (arr !== null) {
const [_, url, shaOrRev] = arr

const fileName = urlToName(url)

result.push(` resolved "${fileName}#${shaOrRev}"`)
} else {
result.push(line)
}
})
.on('close', () => {
fs.writeFile(yarnLockPath, result.join('\n'), 'utf8', err => {
if (err) {
console.error(
'fixup_yarn_lock: fatal error when trying to write to yarn.lock',
err,
)
}
})
})
@@ -0,0 +1,66 @@
const https = require('https')
const crypto = require('crypto')

// TODO:
// make test case where getSha1 function is used, i.e. the case when resolved is without sha1?
// consider using https://github.com/request/request-promise-native

function getSha1(url) {
return new Promise((resolve, reject) => {
https.get(url, res => {
const { statusCode } = res
const hash = crypto.createHash('sha1')

if (statusCode !== 200) {
const err = new Error(`Request Failed.\nStatus Code: ${statusCode}`)

// consume response data to free up memory
res.resume()

reject(err)
}

res.on('data', chunk => {
hash.update(chunk)
})

res.on('end', () => {
resolve(hash.digest('hex'))
})

res.on('error', reject)
})
})
}

// Object -> Object
async function fixPkgAddMissingSha1(pkg) {
// local dependency

if (!pkg.resolved) {
console.error(
`yarn2nix: can't find "resolved" field for package ${
pkg.nameWithVersion
}, you probably required it using "file:...", this feature is not supported, ignoring`,
)
return pkg
}

const [url, sha1] = pkg.resolved.split('#', 2)

if (sha1) {
return pkg
}

// if there is no sha1 in resolved url
// (this could happen if yarn.lock was generated by older version of yarn)
// - request it from registry by https and add it to pkg
const newSha1 = await getSha1(url)

return {
...pkg,
resolved: `${url}#${newSha1}`,
}
}

module.exports = fixPkgAddMissingSha1
@@ -0,0 +1,124 @@
const R = require('ramda')

const urlToName = require('./urlToName')
const { execFileSync } = require('child_process')

// fetchgit transforms
//
// "shell-quote@git+https://github.com/srghma/node-shell-quote.git#without_unlicenced_jsonify":
// version "1.6.0"
// resolved "git+https://github.com/srghma/node-shell-quote.git#1234commit"
//
// to
//
// builtins.fetchGit {
// url = "https://github.com/srghma/node-shell-quote.git";
// ref = "without_unlicenced_jsonify";
// rev = "1234commit";
// }
//
// and transforms
//
// "@graphile/plugin-supporter@git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git":
// version "0.6.0"
// resolved "git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git#1234commit"
//
// to
//
// builtins.fetchGit {
// url = "https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git";
// ref = "master";
// rev = "1234commit";
// }

function prefetchgit(url, rev) {
return JSON.parse(
execFileSync("nix-prefetch-git", ["--rev", rev, url], {
stdio: [ "ignore", "pipe", "ignore" ],
timeout: 60000,
})
).sha256
}

function fetchgit(fileName, url, rev, branch, builtinFetchGit) {
return ` {
name = "${fileName}";
path =
let${builtinFetchGit ? `
repo = builtins.fetchGit {
url = "${url}";
ref = "${branch}";
rev = "${rev}";
};
` : `
repo = fetchgit {
url = "${url}";
rev = "${rev}";
sha256 = "${prefetchgit(url, rev)}";
};
`}in
runCommandNoCC "${fileName}" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C \${repo} .
'';
}`
}

function fetchLockedDep(builtinFetchGit) {
return function (pkg) {
const { nameWithVersion, resolved } = pkg

if (!resolved) {
console.error(
`yarn2nix: can't find "resolved" field for package ${nameWithVersion}, you probably required it using "file:...", this feature is not supported, ignoring`,
)
return ''
}

const [url, sha1OrRev] = resolved.split('#')

const fileName = urlToName(url)

if (url.startsWith('git+')) {
const rev = sha1OrRev

const [_, branch] = nameWithVersion.split('#')

const urlForGit = url.replace(/^git\+/, '')

return fetchgit(fileName, urlForGit, rev, branch || 'master', builtinFetchGit)
}

const sha = sha1OrRev

return ` {
name = "${fileName}";
path = fetchurl {
name = "${fileName}";
url = "${url}";
sha1 = "${sha}";
};
}`
}
}

const HEAD = `
{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
offline_cache = linkFarm "offline" packages;
packages = [
`.trim()

// Object -> String
function generateNix(pkgs, builtinFetchGit) {
const nameWithVersionAndPackageNix = R.map(fetchLockedDep(builtinFetchGit), pkgs)

const packagesDefinition = R.join(
'\n',
R.values(nameWithVersionAndPackageNix),
)

return R.join('\n', [HEAD, packagesDefinition, ' ];', '}'])
}

module.exports = generateNix
@@ -0,0 +1,21 @@
const _curry2 = require('ramda/src/internal/_curry2')
const _map = require('ramda/src/internal/_map')
const keys = require('ramda/src/keys')

// mapObjIndexed: ((v, k, {k: v}) → v') → {k: v} → {k: v'}
// mapObjIndexedReturnArray: ((v, k, {k: v}) → v') → {k: v} → [v']

/*
* @example
*
* const xyz = { x: 1, y: 2, z: 3 };
* const prependKeyAndDouble = (num, key, obj) => key + (num * 2);
*
* mapObjIndexedReturnArray(prependKeyAndDouble, xyz); //=> ['x2', 'y4', 'z6']
*/

const mapObjIndexedReturnArray = _curry2((fn, obj) =>
_map(key => fn(obj[key], key, obj), keys(obj)),
)

module.exports = mapObjIndexedReturnArray
@@ -0,0 +1,21 @@
const path = require('path')

// String -> String

// @url examples:
// - https://registry.yarnpkg.com/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz
// - https://registry.npmjs.org/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz
// - git+https://github.com/srghma/node-shell-quote.git
// - git+https://1234user:1234pass@git.graphile.com/git/users/1234user/postgraphile-supporter.git

function urlToName(url) {
if (url.startsWith('git+')) {
return path.basename(url)
}

return url
.replace('https://registry.yarnpkg.com/', '') // prevents having long directory names
.replace(/[@/:-]/g, '_') // replace @ and : and - characters with underscore
}

module.exports = urlToName
@@ -0,0 +1,30 @@
expectFilePresent () {
if [ -f "$1" ]; then
echo "Test passed: file is present - $1"
else
echo "Test failed: file is absent - $1"
exit 1
fi
}

expectFileOrDirAbsent () {
if [ ! -e "$1" ];
then
echo "Test passed: file or dir is absent - $1"
else
echo "Test failed: file or dir is present - $1"
exit 1
fi
}

expectEqual () {
if [ "$1" == "$2" ];
then
echo "Test passed: output is equal to expected_output"
else
echo "Test failed: output is not equal to expected_output:"
echo " output - $1"
echo " expected_output - $2"
exit 1
fi
}
@@ -0,0 +1,47 @@
{
"name": "yarn2nix",
"version": "1.0.0",
"description": "Convert packages.json and yarn.lock into a Nix expression that downloads all the dependencies",
"main": "index.js",
"repository": ".",
"author": "Maarten Hoogendoorn <maarten@moretea.nl>",
"license": "MIT",
"scripts": {
"yarn2nix": "bin/yarn2nix.js",
"format": "prettier-eslint --write './**/*.{js,jsx,json}'",
"lint": "eslint ."
},
"bin": {
"yarn2nix": "bin/yarn2nix.js"
},
"engines" : {
"node" : ">=8.0.0"
},
"dependencies": {
"@yarnpkg/lockfile": "^1.1.0",
"deep-equal": "^1.0.1",
"docopt": "^0.6.2",
"ramda": "^0.26.1"
},
"devDependencies": {
"babel-eslint": "^10.0.1",
"eslint": "^5.11.1",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^3.3.0",
"eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-node": "^8.0.0",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-react": "^7.12.2",
"eslint-plugin-standard": "^4.0.0",
"husky": "^1.3.1",
"lint-staged": "^8.1.0",
"prettier-eslint-cli": "^4.7.1"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
}
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

@@ -3,39 +3,32 @@
let
libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
in mkDerivation rec {
name = "multimc-${version}";
version = "0.6.4";
pname = "multimc";
version = "0.6.6";
src = fetchFromGitHub {
owner = "MultiMC";
repo = "MultiMC5";
rev = "0.6.4";
sha256 = "0z9mhvfsq9m2cmi0dbrjjc51642r6ppdbb8932236gar5j7w3bc2";
rev = version;
sha256 = "0a9ciqi73ihw17qmp8l5134py5gjjrdnrk50syl2mllsc1iqj4kf";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file makeWrapper ];
buildInputs = [ qtbase jdk zlib ];

enableParallelBuilding = true;

postInstall = ''
mkdir -p $out/share/{applications,pixmaps}
cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps
cp ../application/package/linux/multimc.desktop $out/share/applications
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/
cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ];

# MultiMC's CMakeLists.txt puts libraries in bin directory, causing them to be set executable, causing nixpkgs' wrapQtAppsHook to wrap them
chmod -x $out/bin/*.so
postInstall = ''
install -Dm644 ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg
install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop
# As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop,
# the desktop icon refers to `multimc`, but the executable actually gets
# installed as `MultiMC`. Create compatibility symlink to fix the desktop
# icon.
ln -sf $out/bin/MultiMC $out/bin/multimc
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
wrapProgram $out/bin/multimc --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/
'';

meta = with stdenv.lib; {
homepage = https://multimc.org/;
homepage = "https://multimc.org/";
description = "A free, open source launcher for Minecraft";
longDescription = ''
Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface.
@@ -97,7 +97,7 @@ in stdenv.mkDerivation rec {

enableParallelBuilding = true;

preFixup = ''
preFixup = stdenv.lib.optionalString qtMode ''
wrapQtApp "$out/games/nethack"
'';

Large diffs are not rendered by default.

@@ -47,6 +47,7 @@ ctrlpvim/ctrlp.vim
dag/vim2hs
dag/vim-fish
dannyob/quickfixstatus
darfink/starsearch.vim
dart-lang/dart-vim-plugin
davidhalter/jedi-vim
deoplete-plugins/deoplete-jedi
@@ -98,6 +99,7 @@ heavenshell/vim-jsdoc
hecal3/vim-leader-guide
HerringtonDarkholme/yats.vim
honza/vim-snippets
hotwatermorning/auto-git-diff
hsanson/vim-android
ianks/vim-tsx
icymind/NeoSolarized
@@ -118,13 +120,15 @@ jceb/vim-hier
jceb/vim-orgmode
jeetsukumaran/vim-buffergator
jeffkreeftmeijer/neovim-sensible
jelera/vim-javascript-syntax
jgdavey/tslime.vim
jhradilek/vim-docbk
jiangmiao/auto-pairs
jistr/vim-nerdtree-tabs
jlanzarotta/bufexplorer
jnurmine/zenburn
jonbri/vim-colorstepper
jonsmithers/vim-html-template-literals
joonty/vim-xdebug
josa42/coc-go
jpalardy/vim-slime
@@ -161,6 +165,7 @@ lambdalisue/vim-gista
lambdalisue/vim-pager
latex-box-team/latex-box
leafgarland/typescript-vim
leanprover/lean.vim
ledger/vim-ledger
lepture/vim-jinja
lervag/vimtex
@@ -171,6 +176,7 @@ LucHermitte/lh-vim-lib
ludovicchabant/vim-gutentags
ludovicchabant/vim-lawrencium
lukaszkorecki/workflowish
lumiliet/vim-twig
luochen1990/rainbow
lyokha/vim-xkbswitch
machakann/vim-highlightedyank
@@ -195,6 +201,7 @@ MarcWeber/vim-addon-sql
MarcWeber/vim-addon-syntax-checker
MarcWeber/vim-addon-toggle-buffer
MarcWeber/vim-addon-xdebug
MaxMEllon/vim-jsx-pretty
markonm/traces.vim
martinda/Jenkinsfile-vim-syntax
mattn/emmet-vim
@@ -214,6 +221,7 @@ mhinz/vim-startify
michaeljsmith/vim-indent-object
mileszs/ack.vim
mindriot101/vim-yapf
mk12/vim-lean
mkasa/lushtags
mopp/sky-color-clock.vim
morhetz/gruvbox
@@ -312,6 +320,7 @@ roxma/nvim-yarp
rust-lang/rust.vim
ryanoasis/vim-devicons
Rykka/riv.vim
samoshkin/vim-mergetool
sbdchd/neoformat
scrooloose/nerdcommenter
scrooloose/nerdtree
@@ -343,6 +352,7 @@ sjl/splice.vim
sk1418/last256
slashmili/alchemist.vim
sonph/onehalf
stefandtw/quickfix-reflector.vim
t9md/vim-choosewin
t9md/vim-smalls
takac/vim-hardtime
@@ -412,6 +422,7 @@ vim-scripts/changeColorScheme.vim
vim-scripts/Colour-Sampler-Pack
vim-scripts/DoxygenToolkit.vim
vim-scripts/emodeline
vim-scripts/gitignore.vim
vim-scripts/Improved-AnsiEsc
vim-scripts/jdaddy.vim
vim-scripts/matchit.zip
@@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "cpptools";
publisher = "ms-vscode";
version = "0.24.0";
sha256 = "0b0rwj3aadd4kf561zpzv95r96dqvhkn7db8d7rz3naaqydz0z8i";
version = "0.24.1";
sha256 = "0gqplcppfg2lr6k198q9pw08n0cpc0wvc9w350m9ivv35hw0x5ra";
};

buildInputs = [
@@ -23,14 +23,14 @@ let
else throw "Only x86_64 Linux and Darwin are supported.";

languageServerSha256 = {
"linux-x64" = "0mqjl3l1zk1zd7n0rrb2vdsrx6czhl4irdm4j5jishg9zp03gkkd";
"osx-x64" = "1csq8q8fszv9xk9qiabg12zybxnzn8y2jsnvjrlg4b8kvm63sz40";
"linux-x64" = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2";
"osx-x64" = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa";
}."${arch}";

# version is languageServerVersion in the package.json
languageServer = extractNuGet rec {
name = "Python-Language-Server";
version = "0.2.82";
version = "0.3.40";

src = fetchurl {
url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg";
@@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "python";
publisher = "ms-python";
version = "2019.6.22090";
sha256 = "11q4ac7acp946h43myjmp2f2vh10m1c4hn1n0s5pqgjvn0i6bi3i";
version = "2019.6.24221";
sha256 = "1l82y3mbplzipcij5a0wqlykypik0sbba4hwr2r4vwiwb6kxscmx";
};

buildInputs = [
@@ -8,8 +8,8 @@ in
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
version = "2.1.2";
sha256 = "1cdxmqdz8h9snx25cm3phipxdhjbcn38yfab09in661nr768vrkv";
version = "2.2.0";
sha256 = "0mwn72cp8rd9zc527k9l08iyap1wyqzpvzbj8142fa7nsy64jd04";
};

postPatch = ''
@@ -1,34 +1,21 @@
{ stdenv, fetchurl, perl, coreutils, getopt, makeWrapper }:
{ substituteAll, lib
, coreutils, getopt
}:

stdenv.mkDerivation rec {
version = "1.4";
name = "lsb-release-${version}";
substituteAll {
name = "lsb_release";

src = fetchurl {
url = "mirror://sourceforge/lsb/${name}.tar.gz";
sha256 = "0wkiy7ymfi3fh2an2g30raw6yxh6rzf6nz2v90fplbnnz2414clr";
};

preConfigure = ''
substituteInPlace help2man \
--replace /usr/bin/perl ${perl}/bin/perl
'';

installFlags = [ "prefix=$(out)" ];

nativeBuildInputs = [ makeWrapper perl ];
src = ./lsb_release.sh;

buildInputs = [ coreutils getopt ];
dir = "bin";
isExecutable = true;

# Ensure utilities used are available
preFixup = ''
wrapProgram $out/bin/lsb_release --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils getopt ]}
'';
inherit coreutils getopt;

meta = {
meta = with lib; {
description = "Prints certain LSB (Linux Standard Base) and Distribution information";
homepage = http://www.linuxfoundation.org/collaborate/workgroups/lsb;
license = [ stdenv.lib.licenses.gpl2Plus stdenv.lib.licenses.gpl3Plus ];
platforms = stdenv.lib.platforms.linux;
license = [ licenses.mit ];
maintainers = with maintainers; [ primeos ];
platforms = platforms.linux;
};
}
@@ -0,0 +1,190 @@
#! @shell@

set -o errexit
set -o nounset

show_help() {
@coreutils@/bin/cat << EOF
Usage: lsb_release [options]
Options:
-h, --help show this help message and exit
-v, --version show LSB modules this system supports
-i, --id show distributor ID
-d, --description show description of this distribution
-r, --release show release number of this distribution
-c, --codename show code name of this distribution
-a, --all show all of the above information
-s, --short show requested information in short format
EOF
exit 0
}

# Potential command-line options.
version=0
id=0
description=0
release=0
codename=0
all=0
short=0

@getopt@/bin/getopt --test > /dev/null && rc=$? || rc=$?
if [[ $rc -ne 4 ]]; then
# This shouldn't happen.
echo "Warning: Enhanced getopt not supported, please open an issue." >&2
else
# Define all short and long options.
SHORT=hvidrcas
LONG=help,version,id,description,release,codename,all,short

# Parse all options.
PARSED=`@getopt@/bin/getopt --options $SHORT --longoptions $LONG --name "$0" -- "$@"`

eval set -- "$PARSED"
fi


# Process each argument, and set the appropriate flag if we recognize it.
while [[ $# -ge 1 ]]; do
case "$1" in
-v|--version)
version=1
;;
-i|--id)
id=1
;;
-d|--description)
description=1
;;
-r|--release)
release=1
;;
-c|--codename)
codename=1
;;
-a|--all)
all=1
;;
-s|--short)
short=1
;;
-h|--help)
show_help
;;
--)
shift
break
;;
*)
echo "lsb_release: unrecognized option '$1'"
echo "Type 'lsb_release -h' for a list of available options."
exit 1
;;
esac
shift
done

# Read our variables.
if [[ -e /etc/os-release ]]; then
. /etc/os-release
OS_RELEASE_FOUND=1
else
# This is e.g. relevant for the Nix build sandbox and compatible with the
# original lsb_release binary:
OS_RELEASE_FOUND=0
NAME="n/a"
PRETTY_NAME="(none)"
VERSION_ID="n/a"
VERSION_CODENAME="n/a"
fi

# Default output
if [[ "$version" = "0" ]] && [[ "$id" = "0" ]] && \
[[ "$description" = "0" ]] && [[ "$release" = "0" ]] && \
[[ "$codename" = "0" ]] && [[ "$all" = "0" ]]; then
if [[ "$OS_RELEASE_FOUND" = "1" ]]; then
echo "No LSB modules are available." >&2
else
if [[ "$short" = "0" ]]; then
printf "LSB Version:\tn/a\n"
else
printf "n/a\n"
fi
fi
exit 0
fi

# Now output the data - The order of these was chosen to match
# what the original lsb_release used.

SHORT_OUTPUT=""
append_short_output() {
if [[ "$1" = "n/a" ]]; then
SHORT_OUTPUT+=" $1"
else
SHORT_OUTPUT+=" \"$1\""
fi
}

if [[ "$all" = "1" ]] || [[ "$version" = "1" ]]; then
if [[ "$OS_RELEASE_FOUND" = "1" ]]; then
if [[ "$short" = "0" ]]; then
echo "No LSB modules are available." >&2
else
append_short_output "n/a"
fi
else
if [[ "$short" = "0" ]]; then
printf "LSB Version:\tn/a\n"
else
append_short_output "n/a"
fi
fi
fi

if [[ "$all" = "1" ]] || [[ "$id" = "1" ]]; then
if [[ "$short" = "0" ]]; then
printf "Distributor ID:\t$NAME\n"
else
append_short_output "$NAME"
fi
fi

if [[ "$all" = "1" ]] || [[ "$description" = "1" ]]; then
if [[ "$short" = "0" ]]; then
printf "Description:\t$PRETTY_NAME\n"
else
append_short_output "$PRETTY_NAME"
fi
fi

if [[ "$all" = "1" ]] || [[ "$release" = "1" ]]; then
if [[ "$short" = "0" ]]; then
printf "Release:\t$VERSION_ID\n"
else
append_short_output "$VERSION_ID"
fi
fi

if [[ "$all" = "1" ]] || [[ "$codename" = "1" ]]; then
if [[ "$short" = "0" ]]; then
printf "Codename:\t$VERSION_CODENAME\n"
else
append_short_output "$VERSION_CODENAME"
fi
fi

if [[ "$short" = "1" ]]; then
# Output in one line without the first space:
echo "${SHORT_OUTPUT:1}"
fi

# For compatibility with the original lsb_release:
if [[ "$OS_RELEASE_FOUND" = "0" ]]; then
if [[ "$all" = "1" ]] || [[ "$id" = "1" ]] || \
[[ "$description" = "1" ]] || [[ "$release" = "1" ]] || \
[[ "$codename" = "1" ]]; then
exit 3
fi
fi
@@ -5,16 +5,15 @@
, xfsprogs, f2fs-tools, dosfstools, e2fsprogs, btrfs-progs, exfat, nilfs-utils, ntfs3g
}:

let
version = "2.8.2";
in stdenv.mkDerivation rec {
name = "udisks-${version}";
stdenv.mkDerivation rec {
pname = "udisks";
version = "2.8.4";

src = fetchFromGitHub {
owner = "storaged-project";
repo = "udisks";
rev = name;
sha256 = "000xf99id1f6w8l20jxm3f2g32v9wx68rzv6q2bwrfz6vmy76xwy";
rev = "${pname}-${version}";
sha256 = "01wx2x8xyal595dhdih7rva2bz7gqzgwdp56gi0ikjdzayx17wcf";
};

outputs = [ "out" "man" "dev" "devdoc" ];
@@ -33,7 +32,10 @@ in stdenv.mkDerivation rec {
})
(substituteAll {
src = ./force-path.patch;
path = stdenv.lib.makeBinPath [ btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils xfsprogs ntfs3g parted utillinux ];
path = stdenv.lib.makeBinPath [
btrfs-progs coreutils dosfstools e2fsprogs exfat f2fs-tools nilfs-utils
xfsprogs ntfs3g parted utillinux
];
})
];

@@ -59,20 +61,23 @@ in stdenv.mkDerivation rec {
"--localstatedir=/var"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=$(out)/lib/udev"
"--with-tmpfilesdir=no"
];

makeFlags = [
"INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0"
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
];

doCheck = false; # fails
enableParallelBuilding = true;

doCheck = true;

meta = with stdenv.lib; {
description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies";
homepage = https://www.freedesktop.org/wiki/Software/udisks/;
license = licenses.gpl2Plus; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
maintainers = with maintainers; [];
homepage = "https://www.freedesktop.org/wiki/Software/udisks/";
license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
maintainers = with maintainers; [ johnazoidberg ];
platforms = platforms.linux;
};
}
@@ -18,12 +18,12 @@ let

in stdenv.mkDerivation rec {
pname = "jellyfin";
version = "10.3.6";
version = "10.3.7";

# Impossible to build anything offline with dotnet
src = fetchurl {
url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
sha256 = "1vkb952y4n2gxgm2grxmpx93mljzfqm1m9f13lbw7qdhxb80zy41";
sha256 = "1lpd0dvf7x0wgl8bllqzk54nnbn9fj73jcsz292g7nip1ippgibl";
};

buildInputs = [
@@ -81,6 +81,8 @@ in stdenv.mkDerivation rec {
preBuild = ''
sconsFlags+=" CC=$CC"
sconsFlags+=" CXX=$CXX"
'' + optionalString stdenv.isAarch64 ''
sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
'';

preInstall = ''

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -1,197 +1,82 @@
{ stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper
, fetchpatch, nodejs-8_x, phantomjs2, runtimeShell }:
let
nodePackages = let
# Some packages fail to install with ENOTCACHED due to a mistakenly added
# package-lock.json that bundles optional dependencies not resolved with `node2nix.
# See also https://github.com/svanderburg/node2nix/issues/134
dontInstall = n: v:
if builtins.match ".*babel.*" n == null
then v
else v.override { dontNpmInstall = true; };

packages = stdenv.lib.mapAttrs (dontInstall) (
import ./node.nix {
inherit pkgs;
system = stdenv.system;
}
);
in packages // {
"js-url-^2.3.0" = packages."js-url-^2.3.0".overrideAttrs (_: {
# Don't download chromium (this isn't needed anyway for our case).
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "1";
});
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper
, which, nodejs, yarn2nix, python2, phantomjs2 }:

yarn2nix.mkYarnPackage rec {
name = "codimd";
version = "1.4.0";

src = fetchFromGitHub {
owner = "codimd";
repo = "server";
rev = version;
sha256 = "0cljgc056p19pjzphwkcfbvgp642w3r6p626w2fl6m5kdk78qd1g";
};

addPhantomjs = (pkgs:
map (pkg: pkg.override ( oldAttrs: {
buildInputs = oldAttrs.buildInputs or [] ++ [ phantomjs2 ];
})) pkgs);

drvName = drv: (builtins.parseDrvName drv).name;

linkNodeDeps = ({ pkg, deps, name ? "" }:
let
targetModule = if name != "" then name else drvName pkg;
in nodePackages.${pkg}.override (oldAttrs: {
postInstall = ''
mkdir -p $out/lib/node_modules/${targetModule}/node_modules
${stdenv.lib.concatStringsSep "\n" (map (dep: ''
ln -s ${nodePackages.${dep}}/lib/node_modules/${drvName dep} \
$out/lib/node_modules/${targetModule}/node_modules/${drvName dep}
'') deps
)}
'';
})
);

filterNodePackagesToList = (filterPkgs: allPkgs:
stdenv.lib.mapAttrsToList (_: v: v) (
stdenv.lib.filterAttrs (n: _:
! builtins.elem (drvName n) filterPkgs
) allPkgs)
);

# add phantomjs to buildInputs
pkgsWithPhantomjs = (addPhantomjs (map (
p: nodePackages.${p}
) [
"js-url-^2.3.0"
"markdown-pdf-^8.0.0"
]));

# link extra dependencies to lib/node_modules
pkgsWithExtraDeps = map (args:
linkNodeDeps args ) [
{ pkg = "select2-^3.5.2-browserify";
deps = [ "url-loader-^0.5.7" ]; }
{ pkg = "ionicons-~2.0.1";
deps = [ "url-loader-^0.5.7" "file-loader-^0.9.0" ]; }
{ pkg = "font-awesome-^4.7.0";
deps = [ "url-loader-^0.5.7" "file-loader-^0.9.0" ]; }
{ pkg = "bootstrap-^3.3.7";
deps = [ "url-loader-^0.5.7" "file-loader-^0.9.0" ]; }
{ pkg = "markdown-it-^8.2.2";
deps = [ "json-loader-^0.5.4" ]; }
{ pkg = "markdown-it-emoji-^1.3.0";
deps = [ "json-loader-^0.5.4" ]; }
{ pkg = "raphael-git+https://github.com/dmitrybaranovskiy/raphael";
deps = [ "eve-^0.5.4" ];
name = "raphael"; }
];

codemirror = pkgs.callPackage ./CodeMirror { };

nodeEnv = buildEnv {
name = "codimd-env";
paths = pkgsWithPhantomjs ++ pkgsWithExtraDeps ++ [
codemirror

# `js-sequence-diagrams` has been removed from the registry
# and replaced by a security holding package (the tarballs weren't published by
# upstream as upstream only supports bower,
# see https://github.com/bramp/js-sequence-diagrams/issues/212).
#
# As the tarballs are still there, we build this manually for now until codimd's upstream
# has resolved the issue.
(import ./js-sequence-diagrams {
inherit pkgs;
nodejs = nodejs-8_x;
extraNodePackages = {
lodash = nodePackages."lodash-^4.17.4";
eve = nodePackages."eve-^0.5.4";
};
})
] ++ filterNodePackagesToList [
"bootstrap"
"codemirror-git+https://github.com/hackmdio/CodeMirror.git"
"font-awesome"
"ionicons"
"js-url"
"markdown-it"
"markdown-pdf"
"node-uuid"
"raphael-git+https://github.com/dmitrybaranovskiy/raphael"
"select2-browserify"
"url-loader"
] nodePackages;
};
nativeBuildInputs = [ which makeWrapper ];
extraBuildInputs = [ python2 phantomjs2 ];

name = "codimd-${version}";
version = "1.2.0";
yarnNix = ./yarn.nix;
yarnLock = ./yarn.lock;
packageJSON = ./package.json;

src = stdenv.mkDerivation {
name = "${name}-src";
inherit version;
postConfigure = ''
rm deps/CodiMD/node_modules
cp -R "$node_modules" deps/CodiMD
chmod -R u+w deps/CodiMD
'';

src = fetchFromGitHub {
owner = "hackmdio";
repo = "codimd";
rev = version;
sha256 = "003v90g5sxxjv5smxvz6y6bq2ny0xpxhsx2cdgkvj7jla243v48s";
};
buildPhase = ''
runHook preBuild
dontBuild = true;
cd deps/CodiMD
installPhase = ''
mkdir $out
cp -R . $out
'';
};
in
stdenv.mkDerivation rec {
inherit name version src;

nativeBuildInputs = [ makeWrapper ];
buildInputs = [ nodejs-8_x ];

NODE_PATH = "${nodeEnv}/lib/node_modules";

patches = [
(fetchpatch { # fixes for configurable paths
url = "https://patch-diff.githubusercontent.com/raw/hackmdio/codimd/pull/940.patch";
sha256 = "0w1cvnp3k1n8690gzlrfijisn182i0v8psjs3df394rfx2347xyp";
})
];

postPatch = ''
# due to the `dontNpmInstall` workaround, `node_modules/.bin` isn't created anymore.
substituteInPlace package.json \
--replace "webpack --config" "${nodejs-8_x}/bin/node ./node_modules/webpack/bin/webpack.js --config"
'';
pushd node_modules/codemirror
npm run install
popd
pushd node_modules/sqlite3
export OLD_HOME="$HOME"
export HOME="$PWD"
mkdir -p .node-gyp/${nodejs.version}
echo 9 > .node-gyp/${nodejs.version}/installVersion
ln -s ${nodejs}/include .node-gyp/${nodejs.version}
npm run install
export HOME="$OLD_HOME"
unset OLD_HOME
popd
pushd node_modules/phantomjs-prebuilt
npm run install
popd
buildPhase = ''
ln -s ${nodeEnv}/lib/node_modules node_modules
npm run build
runHook postBuild
'';

installPhase = ''
mkdir -p $out/bin
dontInstall = true;

distPhase = ''
runHook preDist
mkdir -p $out
cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out
cat > $out/bin/codimd <<EOF
#!${runtimeShell}
${nodejs-8_x}/bin/node $out/app.js
#!${stdenv.shell}/bin/sh
${nodejs}/bin/node $out/app.js
EOF
cp -R {app.js,bin,lib,locales,package.json,public} $out/
'';

postFixup = ''
chmod +x $out/bin/codimd
wrapProgram $out/bin/codimd \
--set NODE_PATH "${nodeEnv}/lib/node_modules"
'';
--set NODE_PATH "$out/lib/node_modules"
passthru = {
sequelize = pkgs.writeScript "codimd-sequelize" ''
#!${pkgs.bash}/bin/bash -e
export NODE_PATH="${nodeEnv}/lib/node_modules"
exec -a "$0" "${nodeEnv}/lib/node_modules/sequelize-cli/bin/sequelize" "$@"
'';
};
runHook postDist
'';

meta = with stdenv.lib; {
description = "Realtime collaborative markdown notes on all platforms";
license = licenses.agpl3;
homepage = https://github.com/hackmdio/codimd;
homepage = "https://github.com/codimd/server";
maintainers = with maintainers; [ willibutz ma27 ];
platforms = platforms.linux;
};

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -0,0 +1,211 @@
{
"name": "CodiMD",
"version": "1.4.0",
"description": "Realtime collaborative markdown notes on all platforms.",
"main": "app.js",
"license": "AGPL-3.0",
"scripts": {
"test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite",
"eslint": "node_modules/.bin/eslint lib public test app.js",
"jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done",
"mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit",
"standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1",
"dev": "webpack --config webpack.dev.js --progress --colors --watch",
"heroku-prebuild": "bin/heroku",
"build": "webpack --config webpack.prod.js --progress --colors --bail",
"start": "sequelize db:migrate && node app.js"
},
"dependencies": {
"@passport-next/passport-openid": "^1.0.0",
"Idle.Js": "git+https://github.com/shawnmclean/Idle.js",
"archiver": "^2.1.1",
"async": "^2.1.4",
"aws-sdk": "^2.345.0",
"azure-storage": "^2.7.0",
"base64url": "^3.0.0",
"body-parser": "^1.15.2",
"bootstrap": "^3.4.0",
"bootstrap-validator": "^0.11.8",
"chance": "^1.0.4",
"cheerio": "^0.22.0",
"codemirror": "git+https://github.com/hackmdio/CodeMirror.git",
"compression": "^1.6.2",
"connect-flash": "^0.1.1",
"connect-session-sequelize": "^4.1.0",
"cookie": "0.3.1",
"cookie-parser": "1.4.3",
"deep-freeze": "^0.0.1",
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
"ejs": "^2.5.5",
"emojify.js": "~1.1.0",
"escape-html": "^1.0.3",
"express": ">=4.14",
"express-session": "^1.14.2",
"file-saver": "^1.3.3",
"flowchart.js": "^1.6.4",
"fork-awesome": "^1.1.3",
"formidable": "^1.0.17",
"gist-embed": "~2.6.0",
"graceful-fs": "^4.1.11",
"handlebars": "^4.1.2",
"helmet": "^3.13.0",
"highlight.js": "~9.12.0",
"i18n": "^0.8.3",
"imgur": "git+https://github.com/hackmdio/node-imgur.git",
"ionicons": "~2.0.1",
"jquery": "^3.4.1",
"jquery-mousewheel": "^3.1.13",
"jquery-ui": "^1.12.1",
"js-cookie": "^2.1.3",
"js-sequence-diagrams": "git+https://github.com/codimd/js-sequence-diagrams.git",
"js-yaml": "^3.13.1",
"jsdom-nogyp": "^0.8.3",
"keymaster": "^1.6.2",
"list.js": "^1.5.0",
"lodash": "^4.17.11",
"lutim": "^1.0.2",
"lz-string": "git+https://github.com/hackmdio/lz-string.git",
"markdown-it": "^8.2.2",
"markdown-it-abbr": "^1.0.4",
"markdown-it-container": "^2.0.0",
"markdown-it-deflist": "^2.0.1",
"markdown-it-emoji": "^1.3.0",
"markdown-it-footnote": "^3.0.1",
"markdown-it-imsize": "^2.0.1",
"markdown-it-ins": "^2.0.0",
"markdown-it-mark": "^2.0.0",
"markdown-it-mathjax": "^2.0.0",
"markdown-it-regexp": "^0.4.0",
"markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0",
"markdown-pdf": "^9.0.0",
"mathjax": "~2.7.0",
"mattermost": "^3.4.0",
"mermaid": "~7.1.0",
"meta-marked": "git+https://github.com/codimd/meta-marked#semver:^0.4.2",
"method-override": "^2.3.7",
"minimist": "^1.2.0",
"minio": "^6.0.0",
"moment": "^2.17.1",
"morgan": "^1.7.0",
"mysql": "^2.12.0",
"passport": "^0.4.0",
"passport-dropbox-oauth2": "^1.1.0",
"passport-facebook": "^2.1.1",
"passport-github": "^1.1.0",
"passport-gitlab2": "^4.0.0",
"passport-google-oauth20": "^1.0.0",
"passport-ldapauth": "^2.0.0",
"passport-local": "^1.0.0",
"passport-oauth2": "^1.4.0",
"passport-saml": "^1.0.0",
"passport-twitter": "^1.0.4",
"passport.socketio": "^3.7.0",
"pdfobject": "^2.0.201604172",
"pg": "^6.1.2",
"pg-hstore": "^2.3.2",
"prismjs": "^1.6.0",
"randomcolor": "^0.5.3",
"raphael": "git+https://github.com/dmitrybaranovskiy/raphael",
"readline-sync": "^1.4.7",
"request": "^2.88.0",
"reveal.js": "~3.7.0",
"scrypt-async": "^2.0.1",
"scrypt-kdf": "^2.0.1",
"select2": "^3.5.2-browserify",
"sequelize": "^3.28.0",
"sequelize-cli": "^2.5.1",
"shortid": "2.2.8",
"socket.io": "~2.1.1",
"socket.io-client": "~2.1.1",
"spin.js": "^2.3.2",
"sqlite3": "^4.0.7",
"store": "^2.0.12",
"string": "^3.3.3",
"tedious": "^1.14.0",
"toobusy-js": "^0.5.1",
"turndown": "^5.0.1",
"uuid": "^3.1.0",
"validator": "^10.4.0",
"velocity-animate": "^1.4.0",
"visibilityjs": "^1.2.4",
"viz.js": "^1.7.0",
"winston": "^3.1.0",
"ws": "^6.0.0",
"wurl": "^2.5.3",
"xss": "^1.0.3"
},
"resolutions": {
"**/tough-cookie": "~2.4.0",
"**/minimatch": "^3.0.2",
"**/request": "^2.88.0"
},
"engines": {
"node": ">=8.x"
},
"bugs": "https://github.com/codimd/server/issues",
"keywords": [
"Collaborative",
"Markdown",
"Notes"
],
"homepage": "https://codimd.org",
"maintainers": [
{
"name": "Claudius Coenen",
"url": "https://www.claudiuscoenen.de/"
},
{
"name": "Christoph (Sheogorath) Kern",
"email": "codimd@sheogorath.shivering-isles.com",
"url": "https://shivering-isles.com"
}
],
"repository": {
"type": "git",
"url": "https://github.com/codimd/server.git"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.4",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-runtime": "^6.26.0",
"copy-webpack-plugin": "^4.5.2",
"css-loader": "^1.0.0",
"ejs-loader": "^0.3.1",
"eslint": "^5.9.0",
"eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-node": "^8.0.0",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-standard": "^4.0.0",
"exports-loader": "^0.7.0",
"expose-loader": "^0.7.5",
"file-loader": "^2.0.0",
"html-webpack-plugin": "4.0.0-beta.2",
"imports-loader": "^0.8.0",
"jsonlint": "^1.6.2",
"less": "^2.7.1",
"less-loader": "^4.1.0",
"mini-css-extract-plugin": "^0.4.1",
"mocha": "^5.2.0",
"mock-require": "^3.0.3",
"optimize-css-assets-webpack-plugin": "^5.0.0",
"script-loader": "^0.7.2",
"string-loader": "^0.0.1",
"style-loader": "^0.21.0",
"uglifyjs-webpack-plugin": "^1.2.7",
"url-loader": "^1.0.1",
"webpack": "^4.14.0",
"webpack-cli": "^3.1.0",
"webpack-merge": "^4.1.4",
"webpack-parallel-uglify-plugin": "^1.1.0"
},
"optionalDependencies": {
"bufferutil": "^4.0.0",
"utf-8-validate": "^5.0.1"
}
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -62,8 +62,21 @@ rec {
];
mesonFlags = (args.mesonFlags or []) ++ [ "-Ddefault_library=static" ];
});
static = true;
};


/* Modify a stdenv so that all buildInputs are implicitly propagated to
consuming derivations
*/
propagateBuildInputs = stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // {
propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ (args.buildInputs or []);
buildInputs = [];
});
};


/* Modify a stdenv so that the specified attributes are added to
every derivation returned by its mkDerivation function.
@@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
atomos (0.1.3)
babosa (1.0.2)
@@ -13,39 +13,41 @@ GEM
highline (~> 1.7.2)
declarative (0.0.10)
declarative-option (0.1.0)
domain_name (0.5.20180417)
digest-crc (0.4.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.5.0)
emoji_regex (0.1.1)
excon (0.62.0)
faraday (0.15.3)
dotenv (2.7.4)
emoji_regex (1.0.1)
excon (0.65.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.12.2)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.4)
fastlane (2.107.0)
fastimage (2.1.5)
fastlane (2.128.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (~> 0.1)
emoji_regex (>= 0.1, < 2.0)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.9)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.21.2, < 0.24.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
mini_magick (~> 4.5.1)
multi_json
jwt (~> 2.1.0)
mini_magick (>= 4.9.4, < 5.0.0)
multi_xml (~> 0.5)
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
@@ -54,12 +56,12 @@ GEM
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.6.0, < 2.0.0)
xcodeproj (>= 1.8.1, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
@@ -71,6 +73,15 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.9)
google-cloud-core (1.3.0)
google-cloud-env (~> 1.0)
google-cloud-env (1.2.0)
faraday (~> 0.11)
google-cloud-storage (1.16.0)
digest-crc (~> 0.4)
google-api-client (~> 0.23)
google-cloud-core (~> 1.2)
googleauth (>= 0.6.2, < 0.10.0)
googleauth (0.6.7)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
@@ -82,28 +93,28 @@ GEM
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
json (2.1.0)
json (2.2.0)
jwt (2.1.0)
memoist (0.16.0)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
mini_magick (4.5.1)
mime-types-data (3.2019.0331)
mini_magick (4.9.5)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.6)
naturally (2.2.0)
os (1.0.0)
plist (3.4.0)
os (1.0.1)
plist (3.5.0)
public_suffix (2.0.5)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rouge (2.0.7)
rubyzip (1.2.2)
rubyzip (1.2.3)
security (0.1.3)
signet (0.11.0)
addressable (~> 2.3)
@@ -114,20 +125,20 @@ GEM
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (1.8.0)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tty-cursor (0.6.0)
tty-screen (0.6.5)
tty-spinner (0.8.0)
tty-cursor (>= 0.5.0)
tty-cursor (0.7.0)
tty-screen (0.7.0)
tty-spinner (0.9.1)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.4.0)
unf_ext (0.0.7.6)
unicode-display_width (1.6.0)
word_wrap (1.0.0)
xcodeproj (1.7.0)
xcodeproj (1.11.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
@@ -145,4 +156,4 @@ DEPENDENCIES
fastlane

BUNDLED WITH
1.16.3
1.17.2
@@ -1,12 +1,14 @@
{
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
type = "gem";
};
version = "2.5.2";
version = "2.6.0";
};
atomos = {
source = {
@@ -81,47 +83,67 @@
};
version = "0.1.0";
};
digest-crc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08q8p0fk51aa6dwhy2xmjaj76arcq9nn22gyia162jmqpccfx50l";
type = "gem";
};
version = "0.4.1";
};
domain_name = {
dependencies = ["unf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
type = "gem";
};
version = "0.5.20180417";
version = "0.5.20190701";
};
dotenv = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1va5y19f7l5jh53vz5vibz618lg8z93k5m2k70l25s9k46v2gfm3";
sha256 = "1375dyawvcp81d94jkjwjjkj3j23gsp06cfwh15g695l4g3ssswc";
type = "gem";
};
version = "2.5.0";
version = "2.7.4";
};
emoji_regex = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pcw3axgcmsgihp0xlsdqrqmavz0lw8g396b048fg21033kssxjn";
sha256 = "1jfsv8ik2h1msqf3if1f121pnx3lccp8fqnka9na309mnw3bq532";
type = "gem";
};
version = "0.1.1";
version = "1.0.1";
};
excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2";
sha256 = "1mc6y6n7i0hhk7i8wwi4qjnpkm013p7z3xr994s696hk74f91a7j";
type = "gem";
};
version = "0.62.0";
version = "0.65.0";
};
faraday = {
dependencies = ["multipart-post"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52";
sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
type = "gem";
};
version = "0.15.3";
version = "0.15.4";
};
faraday-cookie_jar = {
dependencies = ["faraday" "http-cookie"];
@@ -134,29 +156,35 @@
};
faraday_middleware = {
dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d";
sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr";
type = "gem";
};
version = "0.12.2";
version = "0.13.1";
};
fastimage = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i7p9jgb9x1lxkhkwq8xlq7an5qbgdq6gsyrbs2xnf5ffa8yx1i2";
sha256 = "1iy9jm13r2r4yz41xaivhxs8mvqn57fjwihxvazbip002mq6rxfz";
type = "gem";
};
version = "2.1.4";
version = "2.1.5";
};
fastlane = {
dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "highline" "json" "mini_magick" "multi_json" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
dependencies = ["CFPropertyList" "addressable" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multi_xml" "multipart-post" "plist" "public_suffix" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d3jv7ik3rivmhxzcapia2lzf9xjmjgi4yxkl60ly6pcbbvhl48w";
sha256 = "0h3k6rzy9p9s7ajk96jarg7sqs9npdnj7acr4v2gs8bpf31hqgpc";
type = "gem";
};
version = "2.107.0";
version = "2.128.1";
};
gh_inspector = {
source = {
@@ -175,6 +203,39 @@
};
version = "0.23.9";
};
google-cloud-core = {
dependencies = ["google-cloud-env"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gqn523gqj6dwbj9ddcb8rjw0sai4x138pk3l3qzmq8jxz67qqj5";
type = "gem";
};
version = "1.3.0";
};
google-cloud-env = {
dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j25sy2qhybqfwsyh8j4m10z2x7dn2jmf1gwr1w2b90cmya4yrbd";
type = "gem";
};
version = "1.2.0";
};
google-cloud-storage = {
dependencies = ["digest-crc" "google-api-client" "google-cloud-core" "googleauth"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lslrlrrhjj8imbpzvbbwflrvq06r0x5h74mlq726yvkr7akyqlq";
type = "gem";
};
version = "1.16.0";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
source = {
@@ -210,12 +271,14 @@
version = "2.8.3";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
type = "gem";
};
version = "2.1.0";
version = "2.2.0";
};
jwt = {
source = {
@@ -243,20 +306,24 @@
version = "3.2.2";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc";
sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
type = "gem";
};
version = "3.2018.0812";
version = "3.2019.0331";
};
mini_magick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a59k5l29vj060yscaqk370rg5vyr132kbw6x3zar7khzjqjqd8p";
sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
type = "gem";
};
version = "4.5.1";
version = "4.9.5";
};
multi_json = {
source = {
@@ -299,20 +366,24 @@
version = "2.2.0";
};
os = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk";
sha256 = "06r55k01g32lvz4wf2s6hpjlxbbag113jsvff3w64jllfr315a73";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
plist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f27kj49v76psqxgcwvwc63cf7va2bszmmw2qrrd281qzi2if79l";
sha256 = "0ra0910xxbhfsmdi0ig36pr3q0khdqzwb5da3wg7y3n8d1sh9ffp";
type = "gem";
};
version = "3.4.0";
version = "3.5.0";
};
public_suffix = {
source = {
@@ -348,12 +419,14 @@
version = "2.0.7";
};
rubyzip = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
type = "gem";
};
version = "1.2.2";
version = "1.2.3";
};
security = {
source = {
@@ -390,12 +463,14 @@
version = "2.3.2";
};
terminal-notifier = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vy75sbq236v1p83jj6r3a9d52za5lqj2vj24np9lrszdczm9zcb";
sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs";
type = "gem";
};
version = "1.8.0";
version = "2.0.0";
};
terminal-table = {
dependencies = ["unicode-display_width"];
@@ -407,29 +482,35 @@
version = "1.8.0";
};
tty-cursor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f4rsapf4apaxn11xnqrq7axgrlvn6pdlqxqb2g34jnpfh5yrk1i";
sha256 = "0prcxdy6qhqba4cv7hsy503b3bjciqk3j3hhzvcbij1kj2gh31c9";
type = "gem";
};
version = "0.6.0";
version = "0.7.0";
};
tty-screen = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1";
sha256 = "1143g05fs28ssgimaph6sdnsndd1wrpax9kjypvd2ripa1adm4kx";
type = "gem";
};
version = "0.6.5";
version = "0.7.0";
};
tty-spinner = {
dependencies = ["tty-cursor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xv5bycgmiyx00bq0kx2bdixi3h1ffi86mwj858gqbxlpjbzsi94";
sha256 = "089qiqzjs1m727kalz8vn2wzgwzdn8mg5gyag901pmimxl64lnvc";
type = "gem";
};
version = "0.8.0";
version = "0.9.1";
};
uber = {
source = {
@@ -449,20 +530,24 @@
version = "0.1.4";
};
unf_ext = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf";
type = "gem";
};
version = "0.0.7.5";
version = "0.0.7.6";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
type = "gem";
};
version = "1.4.0";
version = "1.6.0";
};
word_wrap = {
source = {
@@ -474,12 +559,14 @@
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hy2ihcqfjlsrnf8qkm51m1kk154yp0l0007f269ky8j9z5lyw3p";
sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j";
type = "gem";
};
version = "1.7.0";
version = "1.11.0";
};
xcpretty = {
dependencies = ["rouge"];
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
preInstall = ''
substituteInPlace src/cmake_install.cmake \
--replace ${fcitx} $out
substituteInPlace po/cmake_install.cmake \
--replace ${fcitx} $out
substituteInPlace data/cmake_install.cmake \
--replace ${fcitx} $out
substituteInPlace dictmanager/cmake_install.cmake \
@@ -1,6 +1,12 @@
{ stdenv, fetchFromGitLab, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }:
{ lib, mkDerivation, fetchFromGitLab
, cmake
, extra-cmake-modules
, fcitx
, pkgconfig
, qtbase
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "fcitx-qt5";
version = "1.2.3";

@@ -17,12 +23,12 @@ stdenv.mkDerivation rec {

preInstall = ''
substituteInPlace platforminputcontext/cmake_install.cmake \
--replace ${qtbase.out} $out
--replace ${qtbase.bin} $out
substituteInPlace quickphrase-editor/cmake_install.cmake \
--replace ${fcitx} $out
'';

meta = with stdenv.lib; {
meta = with lib; {
homepage = https://gitlab.com/fcitx/fcitx-qt5;
description = "Qt5 IM Module for Fcitx";
license = licenses.gpl2;
@@ -1,23 +1,16 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, libintl }:
{ stdenv, fetchurl, pkgconfig, glib, libintl }:

with stdenv.lib;

stdenv.mkDerivation rec {
name = "desktop-file-utils-0.23";
pname = "desktop-file-utils";
version = "0.24";

src = fetchurl {
url = "https://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz";
sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc";
url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz";
sha256 = "1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1";
};

patches = [
# Makes font a recognized media type. Committed upstream, but no release has been made.
(fetchpatch {
url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/commit/92af4108750ceaf4191fd54e255885c7d8a78b70.patch";
sha256 = "14sqy10p5skp6hv4hgiwnj9hpr460250x42k5z0390l6nr6gahsq";
})
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libintl ];

@@ -1,4 +1,10 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, tokyocabinet, cairo, pango, ncurses }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, tokyocabinet, ncurses
, cairo ? null, pango ? null
, enableCairo ? stdenv.isLinux
}:

assert enableCairo -> cairo != null && pango != null;

stdenv.mkDerivation rec {
name = "duc-${version}";
@@ -12,14 +18,18 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ tokyocabinet cairo pango ncurses ];
buildInputs = [ tokyocabinet ncurses ] ++
stdenv.lib.optionals enableCairo [ cairo pango ];

configureFlags =
stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ];

meta = with stdenv.lib; {
homepage = http://duc.zevv.nl/;
description = "Collection of tools for inspecting and visualizing disk usage";
license = licenses.gpl2;

platforms = platforms.linux;
platforms = platforms.all;
maintainers = [ maintainers.lethalman ];
};
}
@@ -3,80 +3,80 @@ GEM
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
aws-eventstream (1.0.2)
aws-partitions (1.149.0)
aws-sdk-core (3.48.3)
aws-eventstream (1.0.3)
aws-partitions (1.193.0)
aws-sdk-core (3.61.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-firehose (1.14.0)
aws-sdk-core (~> 3, >= 3.48.2)
aws-sdk-firehose (1.20.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-kinesis (1.13.1)
aws-sdk-core (~> 3, >= 3.48.2)
aws-sdk-kinesis (1.19.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.16.0)
aws-sdk-core (~> 3, >= 3.48.2)
aws-sdk-kms (1.24.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.36.0)
aws-sdk-core (~> 3, >= 3.48.2)
aws-sdk-s3 (1.46.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
aws-sdk-sqs (1.13.0)
aws-sdk-core (~> 3, >= 3.48.2)
aws-sigv4 (~> 1.1)
aws-sdk-sqs (1.20.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
bson (4.4.2)
bson (4.5.0)
cool.io (1.5.4)
dig_rb (1.0.1)
digest-crc (0.4.1)
elasticsearch (6.3.0)
elasticsearch-api (= 6.3.0)
elasticsearch-transport (= 6.3.0)
elasticsearch-api (6.3.0)
elasticsearch (7.2.1)
elasticsearch-api (= 7.2.1)
elasticsearch-transport (= 7.2.1)
elasticsearch-api (7.2.1)
multi_json
elasticsearch-transport (6.3.0)
elasticsearch-transport (7.2.1)
faraday
multi_json
excon (0.62.0)
excon (0.65.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
fluent-config-regexp-type (1.0.0)
fluentd (> 1.0.0, < 2)
fluent-plugin-elasticsearch (3.4.1)
fluent-plugin-elasticsearch (3.5.3)
elasticsearch
excon
fluentd (>= 0.14.22)
fluent-plugin-kafka (0.9.2)
fluent-plugin-kafka (0.11.0)
fluentd (>= 0.10.58, < 2)
ltsv
ruby-kafka (>= 0.7.1, < 0.8.0)
fluent-plugin-kinesis (3.0.0)
ruby-kafka (>= 0.7.8, < 0.8.0)
fluent-plugin-kinesis (3.1.0)
aws-sdk-firehose (~> 1, != 1.9, != 1.5)
aws-sdk-kinesis (~> 1, != 1.5, != 1.4)
fluentd (>= 0.14.10, < 2)
google-protobuf (~> 3)
fluent-plugin-mongo (1.2.2)
fluent-plugin-mongo (1.3.0)
fluentd (>= 0.14.22, < 2)
mongo (~> 2.6.0)
fluent-plugin-record-reformer (0.9.1)
fluentd
fluent-plugin-rewrite-tag-filter (2.2.0)
fluent-config-regexp-type
fluentd (>= 0.14.2, < 2)
fluent-plugin-s3 (1.1.9)
fluent-plugin-s3 (1.1.11)
aws-sdk-s3 (~> 1.0)
aws-sdk-sqs (~> 1.0)
fluentd (>= 0.14.22, < 2)
fluent-plugin-scribe (1.0.0)
fluentd
thrift (~> 0.8.0)
fluent-plugin-webhdfs (1.2.3)
fluentd (>= 0.14.4)
fluent-plugin-webhdfs (1.2.4)
fluentd (>= 0.14.22)
webhdfs (>= 0.6.0)
fluentd (1.4.2)
fluentd (1.6.2)
cool.io (>= 1.4.5, < 2.0.0)
dig_rb (~> 1.0.0)
http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -87,27 +87,27 @@ GEM
tzinfo (~> 1.0)
tzinfo-data (~> 1.0)
yajl-ruby (~> 1.0)
google-protobuf (3.7.1)
google-protobuf (3.9.0)
http_parser.rb (0.6.0)
jmespath (1.4.0)
ltsv (0.1.2)
mongo (2.6.4)
bson (>= 4.3.0, < 5.0.0)
msgpack (1.2.9)
msgpack (1.3.0)
multi_json (1.13.1)
multipart-post (2.0.0)
public_suffix (3.0.3)
ruby-kafka (0.7.6)
multipart-post (2.1.1)
public_suffix (3.1.1)
ruby-kafka (0.7.9)
digest-crc
serverengine (2.1.0)
serverengine (2.1.1)
sigdump (~> 0.2.2)
sigdump (0.2.4)
strptime (0.2.3)
thread_safe (0.3.6)
thrift (0.8.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
tzinfo-data (1.2019.1)
tzinfo-data (1.2019.2)
tzinfo (>= 1.0.0)
webhdfs (0.8.0)
addressable
@@ -129,4 +129,4 @@ DEPENDENCIES
fluentd

BUNDLED WITH
1.16.3
1.17.2