Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-09-01 10:41:58 +02:00
34 changed files with 46485 additions and 49210 deletions

View File

@@ -17,8 +17,8 @@ let
"i386"
else "amd64";
update = "10.0.1";
build = "10";
update = "10.0.2";
build = "13";
repover = "jdk-${update}+${build}";
paxflags = if stdenv.isi686 then "msp" else "m";
@@ -27,7 +27,7 @@ let
src = fetchurl {
url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
sha256 = "1fg0rl5pd3f2y3v3bq8p3zdkrpa1pyslwdln4s64clyr7spvxkjw";
sha256 = "0y7hyzgvn6z8gyp3h9xvxwj6zda899y6i629jn6yxqzj96q56jpk";
};
outputs = [ "out" "jre" ];

View File

@@ -7,11 +7,11 @@ let
};
jdk = stdenv.mkDerivation {
name = "zulu10.1+11-jdk10";
name = "zulu10.3+5-jdk10";
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu10.1+11-jdk10-macosx_x64.zip";
sha256 = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y";
url = https://cdn.azul.com/zulu/bin/zulu10.3+5-jdk10.0.2-macosx_x64.zip;
sha256 = "05pxfjn8fqw6ddr8m5hzyphwzqgrq8w6b4h3lwc1s7ymh05xmspz";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
};

View File

@@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec {
postPatch = ''
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
'' + lib.optionalString (stdenv.hostPlatform.isArm && stdenv.buildPlatform != stdenv.hostPlatform ) ''
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h

View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
stdenv.mkDerivation rec {
name = "libtirpc-1.0.3";
name = "libtirpc-1.1.4";
src = fetchurl {
url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
sha256 = "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6";
sha256 = "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c";
};
postPatch = ''

View File

@@ -7,78 +7,17 @@ let
};
in
nodePackages // {
dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
};
dnschain = nodePackages.dnschain.override {
buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
postInstall = ''
wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
'';
};
node-inspector = nodePackages.node-inspector.override {
buildInputs = [ nodePackages.node-pre-gyp ];
};
phantomjs = nodePackages.phantomjs.override {
buildInputs = [ pkgs.phantomjs2 ];
};
webdrvr = nodePackages.webdrvr.override {
buildInputs = [ pkgs.phantomjs ];
preRebuild = ''
mkdir $TMPDIR/webdrvr
ln -s ${pkgs.fetchurl {
url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar";
sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b";
}} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar
ln -s ${pkgs.fetchurl {
url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip";
sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
}} $TMPDIR/webdrvr/chromedriver_linux64.zip
'';
dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
};
npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
postInstall = "npm run-script prepublish";
};
bower2nix = nodePackages.bower2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
pnpm = nodePackages.pnpm.override {
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = let
pnpmLibPath = stdenv.lib.makeBinPath [
nodejs.passthru.python
nodejs
];
in ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
done
'';
};
ios-deploy = nodePackages.ios-deploy.override {
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
'';
};
fast-cli = nodePackages."fast-cli-1.x".override {
preRebuild = ''
# Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
'';
buildInputs = [ pkgs.phantomjs2 ];
};
node2nix = nodePackages.node2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
'';
};
}

View File

@@ -7,25 +7,76 @@ let
};
in
nodePackages // {
bower2nix = nodePackages.bower2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
done
'';
};
dat = nodePackages.dat.override {
buildInputs = [ nodePackages.node-gyp-build ];
};
dnschain = nodePackages.dnschain.override {
dnschain = nodePackages.dnschain.override {
buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ];
postInstall = ''
wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin
'';
};
ios-deploy = nodePackages.ios-deploy.override {
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
'';
};
fast-cli = nodePackages."fast-cli-1.x".override {
preRebuild = ''
# Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
'';
buildInputs = [ pkgs.phantomjs2 ];
};
node-inspector = nodePackages.node-inspector.override {
buildInputs = [ nodePackages.node-pre-gyp ];
};
node2nix = nodePackages.node2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
'';
};
npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
postInstall = "npm run-script prepublish";
};
phantomjs = nodePackages.phantomjs.override {
buildInputs = [ pkgs.phantomjs2 ];
};
pnpm = nodePackages.pnpm.override {
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = let
pnpmLibPath = stdenv.lib.makeBinPath [
nodejs.passthru.python
nodejs
];
in ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
done
'';
};
webdrvr = nodePackages.webdrvr.override {
buildInputs = [ pkgs.phantomjs ];
@@ -45,47 +96,4 @@ nodePackages // {
dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
};
npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
postInstall = "npm run-script prepublish";
};
bower2nix = nodePackages.bower2nix.override {
buildInputs = [ pkgs.makeWrapper ];
postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
done
'';
};
ios-deploy = nodePackages.ios-deploy.override {
preRebuild = ''
LD=$CC
tmp=$(mktemp -d)
ln -s /usr/bin/xcodebuild $tmp
export PATH="$PATH:$tmp"
'';
};
pnpm = nodePackages.pnpm.override {
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = let
pnpmLibPath = stdenv.lib.makeBinPath [
nodejs.passthru.python
nodejs
];
in ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
done
'';
};
fast-cli = nodePackages."fast-cli-1.x".override {
preRebuild = ''
# Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore
sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js
'';
buildInputs = [ pkgs.phantomjs2 ];
};
}

View File

@@ -661,13 +661,13 @@ let
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
};
};
"glob-7.1.2" = {
"glob-7.1.3" = {
name = "glob";
packageName = "glob";
version = "7.1.2";
version = "7.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==";
url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz";
sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
};
};
"global-modules-1.0.0" = {
@@ -787,13 +787,13 @@ let
sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
};
};
"iconv-lite-0.4.23" = {
"iconv-lite-0.4.24" = {
name = "iconv-lite";
packageName = "iconv-lite";
version = "0.4.23";
version = "0.4.24";
src = fetchurl {
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==";
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
};
};
"ignore-walk-3.0.1" = {
@@ -1183,22 +1183,22 @@ let
sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
};
};
"mime-db-1.35.0" = {
"mime-db-1.36.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.35.0";
version = "1.36.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz";
sha512 = "JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz";
sha512 = "L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==";
};
};
"mime-types-2.1.19" = {
"mime-types-2.1.20" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.19";
version = "2.1.20";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz";
sha512 = "P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz";
sha512 = "HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==";
};
};
"minimatch-3.0.4" = {
@@ -2416,7 +2416,7 @@ in
sources."fstream-1.0.11"
sources."gauge-2.7.4"
sources."getpass-0.1.7"
sources."glob-7.1.2"
sources."glob-7.1.3"
sources."graceful-fs-4.1.11"
sources."har-schema-2.0.0"
sources."har-validator-5.1.0"
@@ -2434,8 +2434,8 @@ in
sources."json-schema-traverse-0.3.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."mime-db-1.35.0"
sources."mime-types-2.1.19"
sources."mime-db-1.36.0"
sources."mime-types-2.1.20"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
@@ -2530,9 +2530,9 @@ in
sources."fs-minipass-1.2.5"
sources."fs.realpath-1.0.0"
sources."gauge-2.7.4"
sources."glob-7.1.2"
sources."glob-7.1.3"
sources."has-unicode-2.0.1"
sources."iconv-lite-0.4.23"
sources."iconv-lite-0.4.24"
sources."ignore-walk-3.0.1"
sources."inflight-1.0.6"
sources."inherits-2.0.3"
@@ -2593,10 +2593,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
version = "2.13.5";
version = "2.13.6";
src = fetchurl {
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.5.tgz";
sha512 = "JImNFSl+9EpBYJ4B3mvlAqkh1r8qweq1RsEsQ0BAUgL3+ZsMFtWYjRRlElg0u5FXwU+11p8s1bePIRTCQTKZ4g==";
url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz";
sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA==";
};
buildInputs = globalBuildInputs;
meta = {

View File

@@ -1,124 +1,9 @@
[
"alloy"
, "asar"
, "azure-cli"
, "bower"
, "bower2nix"
, "browserify"
, "castnow"
, "clean-css"
"bower"
, "coffee-script"
, "coinmon"
, "configurable-http-proxy"
, "cordova"
, "create-react-app"
, "create-react-native-app"
, "csslint"
, "dat"
, "dhcp"
, "dnschain"
, "docker-registry-server"
, "elasticdump"
, "elm-oracle"
, "elm-test"
, "emoj"
, "eslint"
, "eslint_d"
, "emojione"
, { "fast-cli": "1.x" }
, "fetch-bower"
, "forever"
, "git-run"
, "git-standup"
, "graphql-cli"
, "grunt-cli"
, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
, "gulp"
, "hipache"
, "htmlhint"
, "html-minifier"
, "ionic"
, "ios-deploy"
, "istanbul"
, "imapnotify"
, "jake"
, "javascript-typescript-langserver"
, "jayschema"
, "jsdoc"
, "jshint"
, "json"
, "js-beautify"
, "jsonlint"
, "jsontool"
, "json-diff"
, "json-refs"
, "json-server"
, "js-yaml"
, "karma"
, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
, "lcov-result-merger"
, "leetcode-cli"
, "lerna"
, "less"
, "less-plugin-clean-css"
, "live-server"
, "livedown"
, "madoko"
, "meat"
, "meguca"
, "mocha"
, "multi-file-swagger"
, "nijs"
, "node2nix"
, "node-gyp"
, "node-gyp-build"
, "node-inspector"
, "node-pre-gyp"
, "nodemon"
, "node-red"
, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
, "npm"
, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
, "npm-check-updates"
, "nsp"
, "ocaml-language-server"
, { "parsoid": "git://github.com/abbradar/parsoid#stable" }
, "peerflix"
, "peerflix-server"
, "phantomjs"
, "prettier"
, "pulp"
, "quassel-webserver"
, "react-tools"
, "react-native-cli"
, "s3http"
, "semver"
, "serve"
, "shout"
, "sinopia"
, "sloc"
, "smartdc"
, "socket.io"
, "stackdriver-statsd-backend"
, "statsd"
, "statsd-influxdb-backend"
, "statsd-librato-backend"
, "stylus"
, "svgo"
, "tern"
, "tiddlywiki"
, "titanium"
, "triton"
, "typescript"
, "typings"
, "uglify-js"
, "ungit"
, "vue-cli"
, "webdrvr"
, "webpack"
, "webtorrent-cli"
, "web-ext"
, "wring"
, "yarn"
, "yo"
, "pnpm"
]

File diff suppressed because it is too large Load Diff

View File

@@ -1,20 +1,130 @@
[
"bower"
"alloy"
, "asar"
, "azure-cli"
, "bower"
, "bower2nix"
, "browserify"
, "castnow"
, "clean-css"
, "coffee-script"
, "coinmon"
, "configurable-http-proxy"
, "cordova"
, "create-cycle-app"
, "create-react-app"
, "create-react-native-app"
, "csslint"
, "dat"
, "dhcp"
, "dnschain"
, "docker-registry-server"
, "elasticdump"
, "elm-oracle"
, "elm-test"
, "emoj"
, "eslint"
, "eslint_d"
, "emojione"
, { "fast-cli": "1.x" }
, "fetch-bower"
, "forever"
, "git-run"
, "git-standup"
, "graphql-cli"
, "grunt-cli"
, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
, "gulp"
, "hipache"
, "htmlhint"
, "html-minifier"
, "ionic"
, "ios-deploy"
, "istanbul"
, "imapnotify"
, "jake"
, "javascript-typescript-langserver"
, "jayschema"
, "jsdoc"
, "jshint"
, "json"
, "js-beautify"
, "jsonlint"
, "jsontool"
, "json-diff"
, "json-refs"
, "json-server"
, "js-yaml"
, "karma"
, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
, "lcov-result-merger"
, "leetcode-cli"
, "lerna"
, "less"
, "less-plugin-clean-css"
, "live-server"
, "livedown"
, "madoko"
, "mathjax"
, "meat"
, "meguca"
, "mocha"
, "multi-file-swagger"
, "nijs"
, "node2nix"
, "node-gyp"
, "node-gyp-build"
, "node-inspector"
, "node-pre-gyp"
, "pnpm"
, "semver"
, "sloc"
, "vue-cli"
, "swagger"
, "nodemon"
, "node-red"
, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
, "npm"
, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
, "npm-check-updates"
, "nsp"
, "ocaml-language-server"
, { "parsoid": "git://github.com/abbradar/parsoid#stable" }
, "peerflix"
, "peerflix-server"
, "phantomjs"
, "pnpm"
, "prettier"
, "pulp"
, "quassel-webserver"
, "react-tools"
, "react-native-cli"
, "s3http"
, "semver"
, "serve"
, "shout"
, "sinopia"
, "sloc"
, "smartdc"
, "socket.io"
, "stackdriver-statsd-backend"
, "statsd"
, "statsd-influxdb-backend"
, "statsd-librato-backend"
, "stylus"
, "svgo"
, "swagger"
, "tern"
, "three"
, "mathjax"
, "tiddlywiki"
, "titanium"
, "triton"
, "typescript"
, "typings"
, "uglify-js"
, "ungit"
, "vue-cli"
, "@vue/cli"
, "webdrvr"
, "webpack"
, "webtorrent-cli"
, "web-ext"
, "wring"
, "yarn"
, "yo"
]

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,18 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "pyotp";
version = "2.2.6";
src = fetchPypi {
inherit pname version;
sha256 = "dd9130dd91a0340d89a0f06f887dbd76dd07fb95a8886dc4bc401239f2eebd69";
};
meta = with lib; {
description = "Python One Time Password Library";
homepage = https://github.com/pyotp/pyotp;
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}

View File

@@ -0,0 +1,21 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "PyQRCode";
version = "1.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5";
};
# No tests in PyPI tarball
doCheck = false;
meta = with lib; {
description = "A QR code generator written purely in Python with SVG, EPS, PNG and terminal output";
homepage = https://github.com/mnooner256/pyqrcode;
license = licenses.bsd3;
maintainers = with maintainers; [ dotlambda ];
};
}