diff options
Diffstat (limited to 'pkgs/development')
139 files changed, 4359 insertions, 2973 deletions
diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index e4ceb40cad6e..b85d32326a1a 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "chez-scheme-${version}"; - version = "9.4-${dver}"; - dver = "20160507"; + version = "9.5-${dver}"; + dver = "20171012"; src = fetchgit { url = "https://github.com/cisco/chezscheme.git"; - rev = "65df1d1f7c37f5b5a93cd7e5b475dda9dbafe03c"; - sha256 = "1b273il3njnn04z55w1hnygvcqllc6p5qg9mcwh10w39fwsd8fbs"; + rev = "adb3b7bb22ddaa1ba91b98b6f4a647427c3a4d9b"; + sha256 = "0hiynf7g0q77ipqxjsqdm2zb0m15bl1hhp615fn3i2hv0qz5a4xr"; fetchSubmodules = true; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { */ patchPhase = '' substituteInPlace ./configure \ - --replace "git submodule init && git submodule update || exit 1" "" + --replace "git submodule init && git submodule update || exit 1" "true" substituteInPlace ./workarea \ --replace "/bin/ln" "${coreutils}/bin/ln" \ diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index a7381fa1a146..d4418b058d92 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -40,11 +40,6 @@ , coreutils , libiconv -, ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix { - generated = ./node-packages-generated.nix; - self = ghcjsNodePkgs; - } - , version ? "0.2.0" , ghcjsSrc ? fetchFromGitHub { owner = "ghcjs"; @@ -178,7 +173,7 @@ in mkDerivation (rec { isCross = true; isGhcjs = true; inherit nodejs ghcjsBoot; - inherit (ghcjsNodePkgs) "socket.io"; + socket-io = pkgs.nodePackages."socket.io"; inherit stage1Packages; mkStage2 = stage2 { diff --git a/pkgs/development/compilers/ghcjs/node-packages-generated.nix b/pkgs/development/compilers/ghcjs/node-packages-generated.nix deleted file mode 100644 index a3c882ff76c8..000000000000 --- a/pkgs/development/compilers/ghcjs/node-packages-generated.nix +++ /dev/null @@ -1,943 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."accepts"."1.1.4" = - self.by-version."accepts"."1.1.4"; - by-version."accepts"."1.1.4" = self.buildNodePackage { - name = "accepts-1.1.4"; - version = "1.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; - name = "accepts-1.1.4.tgz"; - sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; - }; - deps = { - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."after"."0.8.1" = - self.by-version."after"."0.8.1"; - by-version."after"."0.8.1" = self.buildNodePackage { - name = "after-0.8.1"; - version = "0.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz"; - name = "after-0.8.1.tgz"; - sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."arraybuffer.slice"."0.0.6" = - self.by-version."arraybuffer.slice"."0.0.6"; - by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage { - name = "arraybuffer.slice-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; - name = "arraybuffer.slice-0.0.6.tgz"; - sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."backo2"."1.0.2" = - self.by-version."backo2"."1.0.2"; - by-version."backo2"."1.0.2" = self.buildNodePackage { - name = "backo2-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; - name = "backo2-1.0.2.tgz"; - sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64-arraybuffer"."0.1.2" = - self.by-version."base64-arraybuffer"."0.1.2"; - by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage { - name = "base64-arraybuffer-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; - name = "base64-arraybuffer-0.1.2.tgz"; - sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64id"."0.1.0" = - self.by-version."base64id"."0.1.0"; - by-version."base64id"."0.1.0" = self.buildNodePackage { - name = "base64id-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; - name = "base64id-0.1.0.tgz"; - sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."benchmark"."1.0.0" = - self.by-version."benchmark"."1.0.0"; - by-version."benchmark"."1.0.0" = self.buildNodePackage { - name = "benchmark-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"; - name = "benchmark-1.0.0.tgz"; - sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."better-assert"."~1.0.0" = - self.by-version."better-assert"."1.0.2"; - by-version."better-assert"."1.0.2" = self.buildNodePackage { - name = "better-assert-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; - name = "better-assert-1.0.2.tgz"; - sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; - }; - deps = { - "callsite-1.0.0" = self.by-version."callsite"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."blob"."0.0.4" = - self.by-version."blob"."0.0.4"; - by-version."blob"."0.0.4" = self.buildNodePackage { - name = "blob-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; - name = "blob-0.0.4.tgz"; - sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."callsite"."1.0.0" = - self.by-version."callsite"."1.0.0"; - by-version."callsite"."1.0.0" = self.buildNodePackage { - name = "callsite-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; - name = "callsite-1.0.0.tgz"; - sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-bind"."1.0.0" = - self.by-version."component-bind"."1.0.0"; - by-version."component-bind"."1.0.0" = self.buildNodePackage { - name = "component-bind-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; - name = "component-bind-1.0.0.tgz"; - sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.1.2" = - self.by-version."component-emitter"."1.1.2"; - by-version."component-emitter"."1.1.2" = self.buildNodePackage { - name = "component-emitter-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - name = "component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.2.0" = - self.by-version."component-emitter"."1.2.0"; - by-version."component-emitter"."1.2.0" = self.buildNodePackage { - name = "component-emitter-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz"; - name = "component-emitter-1.2.0.tgz"; - sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-inherit"."0.0.3" = - self.by-version."component-inherit"."0.0.3"; - by-version."component-inherit"."0.0.3" = self.buildNodePackage { - name = "component-inherit-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; - name = "component-inherit-0.0.3.tgz"; - sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."0.7.4" = - self.by-version."debug"."0.7.4"; - by-version."debug"."0.7.4" = self.buildNodePackage { - name = "debug-0.7.4"; - version = "0.7.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; - name = "debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."2.2.0" = - self.by-version."debug"."2.2.0"; - by-version."debug"."2.2.0" = self.buildNodePackage { - name = "debug-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - name = "debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - deps = { - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."engine.io"."1.6.8" = - self.by-version."engine.io"."1.6.8"; - by-version."engine.io"."1.6.8" = self.buildNodePackage { - name = "engine.io-1.6.8"; - version = "1.6.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/engine.io/-/engine.io-1.6.8.tgz"; - name = "engine.io-1.6.8.tgz"; - sha1 = "de05a06b757e7517695e088c7b051c47819f511b"; - }; - deps = { - "base64id-0.1.0" = self.by-version."base64id"."0.1.0"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "ws-1.0.1" = self.by-version."ws"."1.0.1"; - "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4"; - "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."engine.io-client"."1.6.8" = - self.by-version."engine.io-client"."1.6.8"; - by-version."engine.io-client"."1.6.8" = self.buildNodePackage { - name = "engine.io-client-1.6.8"; - version = "1.6.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.8.tgz"; - name = "engine.io-client-1.6.8.tgz"; - sha1 = "6e2db11648b45e405c46b172ea3e3dac37cc0ceb"; - }; - deps = { - "has-cors-1.1.0" = self.by-version."has-cors"."1.1.0"; - "ws-1.0.1" = self.by-version."ws"."1.0.1"; - "xmlhttprequest-ssl-1.5.1" = self.by-version."xmlhttprequest-ssl"."1.5.1"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; - "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4"; - "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1"; - "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2"; - "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3"; - "yeast-0.1.2" = self.by-version."yeast"."0.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."engine.io-parser"."1.2.4" = - self.by-version."engine.io-parser"."1.2.4"; - by-version."engine.io-parser"."1.2.4" = self.buildNodePackage { - name = "engine.io-parser-1.2.4"; - version = "1.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz"; - name = "engine.io-parser-1.2.4.tgz"; - sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42"; - }; - deps = { - "after-0.8.1" = self.by-version."after"."0.8.1"; - "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6"; - "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2"; - "blob-0.0.4" = self.by-version."blob"."0.0.4"; - "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6"; - "utf8-2.1.0" = self.by-version."utf8"."2.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-binary"."0.1.6" = - self.by-version."has-binary"."0.1.6"; - by-version."has-binary"."0.1.6" = self.buildNodePackage { - name = "has-binary-0.1.6"; - version = "0.1.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz"; - name = "has-binary-0.1.6.tgz"; - sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10"; - }; - deps = { - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-binary"."0.1.7" = - self.by-version."has-binary"."0.1.7"; - by-version."has-binary"."0.1.7" = self.buildNodePackage { - name = "has-binary-0.1.7"; - version = "0.1.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; - name = "has-binary-0.1.7.tgz"; - sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; - }; - deps = { - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-cors"."1.1.0" = - self.by-version."has-cors"."1.1.0"; - by-version."has-cors"."1.1.0" = self.buildNodePackage { - name = "has-cors-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - name = "has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."indexof"."0.0.1" = - self.by-version."indexof"."0.0.1"; - by-version."indexof"."0.0.1" = self.buildNodePackage { - name = "indexof-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - name = "indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json3"."3.2.6" = - self.by-version."json3"."3.2.6"; - by-version."json3"."3.2.6" = self.buildNodePackage { - name = "json3-3.2.6"; - version = "3.2.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; - name = "json3-3.2.6.tgz"; - sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json3"."3.3.2" = - self.by-version."json3"."3.3.2"; - by-version."json3"."3.3.2" = self.buildNodePackage { - name = "json3-3.3.2"; - version = "3.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - name = "json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.12.0" = - self.by-version."mime-db"."1.12.0"; - by-version."mime-db"."1.12.0" = self.buildNodePackage { - name = "mime-db-1.12.0"; - version = "1.12.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - name = "mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.4" = - self.by-version."mime-types"."2.0.14"; - by-version."mime-types"."2.0.14" = self.buildNodePackage { - name = "mime-types-2.0.14"; - version = "2.0.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - name = "mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - deps = { - "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.1" = - self.by-version."ms"."0.7.1"; - by-version."ms"."0.7.1" = self.buildNodePackage { - name = "ms-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - name = "ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."negotiator"."0.4.9" = - self.by-version."negotiator"."0.4.9"; - by-version."negotiator"."0.4.9" = self.buildNodePackage { - name = "negotiator-0.4.9"; - version = "0.4.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"; - name = "negotiator-0.4.9.tgz"; - sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."object-component"."0.0.3" = - self.by-version."object-component"."0.0.3"; - by-version."object-component"."0.0.3" = self.buildNodePackage { - name = "object-component-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; - name = "object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."options".">=0.0.5" = - self.by-version."options"."0.0.6"; - by-version."options"."0.0.6" = self.buildNodePackage { - name = "options-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; - name = "options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parsejson"."0.0.1" = - self.by-version."parsejson"."0.0.1"; - by-version."parsejson"."0.0.1" = self.buildNodePackage { - name = "parsejson-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; - name = "parsejson-0.0.1.tgz"; - sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; - }; - deps = { - "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseqs"."0.0.2" = - self.by-version."parseqs"."0.0.2"; - by-version."parseqs"."0.0.2" = self.buildNodePackage { - name = "parseqs-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; - name = "parseqs-0.0.2.tgz"; - sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; - }; - deps = { - "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseuri"."0.0.4" = - self.by-version."parseuri"."0.0.4"; - by-version."parseuri"."0.0.4" = self.buildNodePackage { - name = "parseuri-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz"; - name = "parseuri-0.0.4.tgz"; - sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350"; - }; - deps = { - "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io"."*" = - self.by-version."socket.io"."1.4.5"; - by-version."socket.io"."1.4.5" = self.buildNodePackage { - name = "socket.io-1.4.5"; - version = "1.4.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io/-/socket.io-1.4.5.tgz"; - name = "socket.io-1.4.5.tgz"; - sha1 = "f202f49eeb9cf7cf6c0971ad75d8d96d451ea4f7"; - }; - deps = { - "engine.io-1.6.8" = self.by-version."engine.io"."1.6.8"; - "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6"; - "socket.io-client-1.4.5" = self.by-version."socket.io-client"."1.4.5"; - "socket.io-adapter-0.4.0" = self.by-version."socket.io-adapter"."0.4.0"; - "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "socket.io" = self.by-version."socket.io"."1.4.5"; - by-spec."socket.io-adapter"."0.4.0" = - self.by-version."socket.io-adapter"."0.4.0"; - by-version."socket.io-adapter"."0.4.0" = self.buildNodePackage { - name = "socket.io-adapter-0.4.0"; - version = "0.4.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz"; - name = "socket.io-adapter-0.4.0.tgz"; - sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "socket.io-parser-2.2.2" = self.by-version."socket.io-parser"."2.2.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io-client"."1.4.5" = - self.by-version."socket.io-client"."1.4.5"; - by-version."socket.io-client"."1.4.5" = self.buildNodePackage { - name = "socket.io-client-1.4.5"; - version = "1.4.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.5.tgz"; - name = "socket.io-client-1.4.5.tgz"; - sha1 = "400d630c31e7c9579e45173f977e4f5bd8dc7d2e"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "engine.io-client-1.6.8" = self.by-version."engine.io-client"."1.6.8"; - "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0"; - "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0"; - "object-component-0.0.3" = self.by-version."object-component"."0.0.3"; - "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6"; - "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7"; - "indexof-0.0.1" = self.by-version."indexof"."0.0.1"; - "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4"; - "to-array-0.1.4" = self.by-version."to-array"."0.1.4"; - "backo2-1.0.2" = self.by-version."backo2"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io-parser"."2.2.2" = - self.by-version."socket.io-parser"."2.2.2"; - by-version."socket.io-parser"."2.2.2" = self.buildNodePackage { - name = "socket.io-parser-2.2.2"; - version = "2.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz"; - name = "socket.io-parser-2.2.2.tgz"; - sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417"; - }; - deps = { - "debug-0.7.4" = self.by-version."debug"."0.7.4"; - "json3-3.2.6" = self.by-version."json3"."3.2.6"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."socket.io-parser"."2.2.6" = - self.by-version."socket.io-parser"."2.2.6"; - by-version."socket.io-parser"."2.2.6" = self.buildNodePackage { - name = "socket.io-parser-2.2.6"; - version = "2.2.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz"; - name = "socket.io-parser-2.2.6.tgz"; - sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99"; - }; - deps = { - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - "json3-3.3.2" = self.by-version."json3"."3.3.2"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."to-array"."0.1.4" = - self.by-version."to-array"."0.1.4"; - by-version."to-array"."0.1.4" = self.buildNodePackage { - name = "to-array-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; - name = "to-array-0.1.4.tgz"; - sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ultron"."1.0.x" = - self.by-version."ultron"."1.0.2"; - by-version."ultron"."1.0.2" = self.buildNodePackage { - name = "ultron-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - name = "ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utf8"."2.1.0" = - self.by-version."utf8"."2.1.0"; - by-version."utf8"."2.1.0" = self.buildNodePackage { - name = "utf8-2.1.0"; - version = "2.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz"; - name = "utf8-2.1.0.tgz"; - sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ws"."1.0.1" = - self.by-version."ws"."1.0.1"; - by-version."ws"."1.0.1" = self.buildNodePackage { - name = "ws-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ws/-/ws-1.0.1.tgz"; - name = "ws-1.0.1.tgz"; - sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9"; - }; - deps = { - "options-0.0.6" = self.by-version."options"."0.0.6"; - "ultron-1.0.2" = self.by-version."ultron"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xmlhttprequest-ssl"."1.5.1" = - self.by-version."xmlhttprequest-ssl"."1.5.1"; - by-version."xmlhttprequest-ssl"."1.5.1" = self.buildNodePackage { - name = "xmlhttprequest-ssl-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz"; - name = "xmlhttprequest-ssl-1.5.1.tgz"; - sha1 = "3b7741fea4a86675976e908d296d4445961faa67"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."yeast"."0.1.2" = - self.by-version."yeast"."0.1.2"; - by-version."yeast"."0.1.2" = self.buildNodePackage { - name = "yeast-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; - name = "yeast-0.1.2.tgz"; - sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/development/compilers/ghcjs/node-packages.json b/pkgs/development/compilers/ghcjs/node-packages.json deleted file mode 100644 index 55fa86675e7a..000000000000 --- a/pkgs/development/compilers/ghcjs/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "socket.io" ] diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 6eb160add26e..a113f5db4807 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -85,6 +85,9 @@ stdenv.mkDerivation { # https://reviews.llvm.org/rL281650 rm -vr src/test/run-pass/issue-36474.rs || true + # On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' + sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs + # Disable some failing gdb tests. Try re-enabling these when gdb # is updated past version 7.12. rm src/test/debuginfo/basic-types-globals.rs diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index aec3828f323e..65be1f4e0667 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,11 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }: let param = { - "8.7" = { - version = "0.6.1"; - rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; - sha256 = "1jaafkwsb5450378nprjsds1illgdaq60gryi8kspw0i25ykz2c9"; - }; "8.6" = { version = "0.6.1"; rev = "c3b87af6bfa338e18b83f014ebd0e56e1f611663"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2b050dd613f5..7bb62e1ccd05 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -98,7 +98,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1143qcsljp66v0xvq2a2nqji24890rnmxcmwnxw8xj818gqk0p3m"; + sha256 = "0iz0yz0bwkmpza5qahsxr9plg1ylmkv7znp1a8f0z65px7f300an"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8de2749004e5..93d8180bd0a7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.10 + # LTS Haskell 9.11 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -323,7 +323,7 @@ default-package-overrides: - bytestring-strict-builder ==0.4.5 - bytestring-tree-builder ==0.2.7.1 - bytestring-trie ==0.2.4.1 - - bzlib-conduit ==0.2.1.4 + - bzlib-conduit ==0.2.1.5 - c2hs ==0.28.2 - Cabal ==1.24.2.0 - cabal-dependency-licenses ==0.2.0.0 @@ -669,7 +669,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - exp-pairs ==0.1.5.2 - - extensible ==0.4.5 + - extensible ==0.4.6 - extensible-effects ==1.11.1.0 - extensible-exceptions ==0.1.1.4 - extra ==1.5.3 @@ -686,6 +686,7 @@ default-package-overrides: - fclabels ==2.0.3.2 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 + - fedora-haskell-tools ==0.3 - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 @@ -790,7 +791,7 @@ default-package-overrides: - gi-soup ==2.4.14 - git ==0.2.0 - github ==0.16.0 - - github-release ==1.0.6 + - github-release ==1.0.7 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -948,7 +949,7 @@ default-package-overrides: - haddock-api ==2.17.4 - haddock-library ==1.4.3 - haddock-test ==0.0.1 - - hailgun ==0.4.1.5 + - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 - hakyll ==4.9.8.0 - hakyll-favicon ==0.1.0 @@ -1024,12 +1025,12 @@ default-package-overrides: - hebrew-time ==0.1.1 - hedgehog ==0.5 - hedgehog-quickcheck ==0.1 - - hedis ==0.9.10 + - hedis ==0.9.11 - here ==1.2.11 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.0 - hex ==0.1.2 - - hexml ==0.3.2 + - hexml ==0.3.3 - hexpat ==0.20.13 - hexstring ==0.11.1 - hformat ==0.3.1.0 @@ -1090,8 +1091,8 @@ default-package-overrides: - hsebaysdk ==0.4.0.0 - hse-cpp ==0.2 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.4 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1207,7 +1208,7 @@ default-package-overrides: - inline-c ==0.5.6.1 - inline-c-cpp ==0.1.0.0 - inline-java ==0.6.5 - - inline-r ==0.9.0.1 + - inline-r ==0.9.0.2 - insert-ordered-containers ==0.2.1.0 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2 @@ -1232,10 +1233,10 @@ default-package-overrides: - ip6addr ==0.5.3 - iproute ==1.7.1 - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.2 + - IPv6DB ==0.2.3 - irc ==0.6.1.0 - irc-client ==0.4.4.4 - - irc-conduit ==0.2.2.3 + - irc-conduit ==0.2.2.4 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 - islink ==0.1.0.0 @@ -1283,7 +1284,7 @@ default-package-overrides: - kraken ==0.0.3 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==0.4.3 + - lackey ==0.4.4 - lame ==0.1.1 - language-c ==0.6.1 - language-c-quote ==0.12.1 @@ -1349,7 +1350,7 @@ default-package-overrides: - lmdb ==0.2.5 - loch-th ==0.2.1 - log ==0.9.0.1 - - log-base ==0.7.3.0 + - log-base ==0.7.4.0 - log-domain ==0.11.2 - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 @@ -1630,14 +1631,14 @@ default-package-overrides: - perf ==0.1.2 - persistable-record ==0.5.1.1 - persistable-types-HDBC-pg ==0.0.1.5 - - persistent ==2.7.0 + - persistent ==2.7.1 - persistent-mongoDB ==2.6.0 - - persistent-mysql ==2.6.1 + - persistent-mysql ==2.6.2.1 - persistent-mysql-haskell ==0.3.0.0 - - persistent-postgresql ==2.6.1 + - persistent-postgresql ==2.6.2 - persistent-redis ==2.5.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6.2 + - persistent-sqlite ==2.6.3 - persistent-template ==2.5.3 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 @@ -1646,7 +1647,7 @@ default-package-overrides: - picoparsec ==0.1.2.3 - picosat ==0.1.4 - pid1 ==0.1.2.0 - - pinboard ==0.9.12.5 + - pinboard ==0.9.12.6 - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - pipes ==4.3.6 @@ -1735,8 +1736,8 @@ default-package-overrides: - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.4 - - protocol-buffers ==2.4.4 - - protocol-buffers-descriptor ==2.4.4 + - protocol-buffers ==2.4.5 + - protocol-buffers-descriptor ==2.4.5 - proto-lens ==0.2.1.0 - proto-lens-arbitrary ==0.1.1.1 - proto-lens-combinators ==0.1.0.7 @@ -1752,7 +1753,7 @@ default-package-overrides: - publicsuffix ==0.20170508 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript-bridge ==0.11.1.0 + - purescript-bridge ==0.11.1.1 - pusher-http-haskell ==1.2.0.1 - pwstore-fast ==2.4.4 - QuasiText ==0.1.2.6 @@ -1783,7 +1784,7 @@ default-package-overrides: - rank-product ==0.2.0.1 - Rasterific ==0.7.2.1 - rasterific-svg ==0.3.3 - - ratel ==0.3.5 + - ratel ==0.3.6 - ratel-wai ==0.2.0 - rattletrap ==2.5.0 - rawfilepath ==0.2.4 @@ -1852,7 +1853,7 @@ default-package-overrides: - result ==0.2.6.0 - rethinkdb ==2.2.0.10 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.4.2 + - retry ==0.7.4.3 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - rng-utils ==0.2.1 @@ -1921,16 +1922,16 @@ default-package-overrides: - servant-mock ==0.8.2 - servant-purescript ==0.8.0.1 - servant-ruby ==0.2.1.0 - - servant-server ==0.11 + - servant-server ==0.11.0.1 - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.0 - servant-swagger ==1.1.3.1 - - servant-swagger-ui ==0.2.4.3.0.20 + - servant-swagger-ui ==0.2.4.3.4.0 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - serversession-frontend-yesod ==1.0 - - servius ==1.2.0.2 + - servius ==1.2.0.3 - set-cover ==0.0.8 - setenv ==0.1.1.3 - setlocale ==1.0.0.5 @@ -2251,7 +2252,7 @@ default-package-overrides: - typography-geometry ==1.0.0.1 - tz ==0.1.3.0 - tzdata ==0.1.20170320.0 - - ua-parser ==0.7.4 + - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 - unbound ==0.5.1 - unbounded-delays ==0.1.1.0 @@ -2357,7 +2358,7 @@ default-package-overrides: - wai-routes ==0.10.0 - wai-routing ==0.13.0 - wai-session ==0.3.2 - - wai-session-postgresql ==0.2.1.0 + - wai-session-postgresql ==0.2.1.1 - wai-slack-middleware ==0.2.0 - waitra ==0.0.4.0 - wai-transformers ==0.0.7 @@ -2802,6 +2803,7 @@ dont-distribute-packages: aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-tiled: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-yak: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] affection: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3258,6 +3260,7 @@ dont-distribute-packages: cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3409,6 +3412,7 @@ dont-distribute-packages: clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + clang-compilation-database: [ i686-linux, x86_64-linux, x86_64-darwin ] clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3564,6 +3568,7 @@ dont-distribute-packages: Configurable: [ i686-linux, x86_64-linux, x86_64-darwin ] congruence-relation: [ i686-linux, x86_64-linux, x86_64-darwin ] conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] + conkin: [ i686-linux, x86_64-linux, x86_64-darwin ] conlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] Conscript: [ i686-linux, x86_64-linux, x86_64-darwin ] consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4229,6 +4234,7 @@ dont-distribute-packages: filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] + filepath-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] FilePather: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4335,7 +4341,9 @@ dont-distribute-packages: free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] + freelude: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4831,6 +4839,7 @@ dont-distribute-packages: haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5020,6 +5029,7 @@ dont-distribute-packages: Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit: [ i686-linux, x86_64-linux, x86_64-darwin ] + herms: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5752,6 +5762,7 @@ dont-distribute-packages: karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] karps: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5943,6 +5954,7 @@ dont-distribute-packages: libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] libvirt-hs: [ "x86_64-darwin" ] + libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5964,6 +5976,7 @@ dont-distribute-packages: linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] + linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5988,6 +6001,7 @@ dont-distribute-packages: liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6129,6 +6143,7 @@ dont-distribute-packages: mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + manifolds-core: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6252,6 +6267,7 @@ dont-distribute-packages: mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + modern-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6314,6 +6330,7 @@ dont-distribute-packages: mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoid-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6324,6 +6341,7 @@ dont-distribute-packages: morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] morph: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + motor: [ i686-linux, x86_64-linux, x86_64-darwin ] mount: [ i686-linux, x86_64-linux, x86_64-darwin ] movie-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6673,6 +6691,7 @@ dont-distribute-packages: paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] + parameterized: [ i686-linux, x86_64-linux, x86_64-darwin ] paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6877,6 +6896,7 @@ dont-distribute-packages: postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7047,6 +7067,7 @@ dont-distribute-packages: rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] rails-session: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + Raincat: [ i686-linux, x86_64-linux, x86_64-darwin ] raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7175,6 +7196,7 @@ dont-distribute-packages: reify: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] + relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] reload: [ i686-linux, x86_64-linux, x86_64-darwin ] remark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7236,6 +7258,7 @@ dont-distribute-packages: rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] riak: [ i686-linux, x86_64-linux, x86_64-darwin ] RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7323,6 +7346,7 @@ dont-distribute-packages: safer-file-handles: [ i686-linux, x86_64-linux, x86_64-darwin ] saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + sajson: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7392,6 +7416,7 @@ dont-distribute-packages: sdl2-cairo-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-mixer: [ i686-linux, x86_64-linux, x86_64-darwin ] sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7762,6 +7787,7 @@ dont-distribute-packages: step-function: [ i686-linux, x86_64-linux, x86_64-darwin ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + STLinkUSB: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8354,6 +8380,7 @@ dont-distribute-packages: wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-make-assets: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-brotli: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8435,6 +8462,7 @@ dont-distribute-packages: WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] wild-bind-task-x11: [ "x86_64-darwin" ] + windns: [ i686-linux, x86_64-linux, x86_64-darwin ] windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] winio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8450,6 +8478,7 @@ dont-distribute-packages: woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] + wordchoice: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8509,6 +8538,7 @@ dont-distribute-packages: xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] xkbcommon: [ "x86_64-darwin" ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + xleb: [ i686-linux, x86_64-linux, x86_64-darwin ] xls: [ "x86_64-darwin" ] xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5d8a28f5c2b0..3e82003be43c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -362,8 +362,7 @@ stdenv.mkDerivation ({ env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment"; - nativeBuildInputs = [ ghcEnv systemBuildInputs ] - ++ optional isGhcjs ghc."socket.io"; # for ghcjsi + nativeBuildInputs = [ ghcEnv systemBuildInputs ]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 7fbca53886ef..6e43df9aba69 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, pkgconfig, glibcLocales, cacert }@depArgs: +{ stdenv, ghc, pkgconfig, glibcLocales, cacert, stack }@depArgs: with stdenv.lib; @@ -6,15 +6,17 @@ with stdenv.lib; , extraArgs ? [] , LD_LIBRARY_PATH ? [] , ghc ? depArgs.ghc +, stack ? depArgs.stack , ... }@args: -stdenv.mkDerivation (args // { +let stackCmd = "stack --internal-re-exec-version=${stack.version}"; +in stdenv.mkDerivation (args // { buildInputs = buildInputs ++ optional stdenv.isLinux glibcLocales ++ - [ ghc pkgconfig ]; + [ ghc pkgconfig stack ]; STACK_PLATFORM_VARIANT="nix"; STACK_IN_NIX_SHELL=1; @@ -39,13 +41,13 @@ stdenv.mkDerivation (args // { export STACK_ROOT=$NIX_BUILD_TOP/.stack ''; - buildPhase = args.buildPhase or "stack build"; + buildPhase = args.buildPhase or "${stackCmd} build"; - checkPhase = args.checkPhase or "stack test"; + checkPhase = args.checkPhase or "${stackCmd} test"; doCheck = args.doCheck or true; installPhase = args.installPhase or '' - stack --local-bin-path=$out/bin build --copy-bins + ${stackCmd} --local-bin-path=$out/bin build --copy-bins ''; }) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b9b9e75c859e..cc0d8deb1f53 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1835,8 +1835,8 @@ self: { }: mkDerivation { pname = "Blogdown"; - version = "0.2.2"; - sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c"; + version = "0.2.3"; + sha256 = "0xdlcx82nfm74n88fghbg5f6fnjvrajpsz52hrc4bl5afxx63bpx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -2230,10 +2230,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "CSPM-CoreLanguage"; - version = "0.3.0.3"; - sha256 = "0vr6zpdz5lnpkyzwhig72pv8ncvqdjyp1nn76zpx3v6xlpzrs3q2"; + version = "0.3.1.0"; + sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255"; libraryHaskellDepends = [ base ]; - description = "Definition of a FDR-compatible CSP core-language"; + description = "Definition of a CSP core-language"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -2243,8 +2243,8 @@ self: { }: mkDerivation { pname = "CSPM-FiringRules"; - version = "0.4.3.0"; - sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m"; + version = "0.4.4.0"; + sha256 = "11j4f9za74x9f0l8jbf7mvjnmd6gyx02zb31jjrhza3y4hpcj412"; libraryHaskellDepends = [ base containers CSPM-CoreLanguage mtl parallel-tree-search QuickCheck random tree-monad @@ -2255,16 +2255,16 @@ self: { }) {}; "CSPM-Frontend" = callPackage - ({ mkDerivation, alex, array, base, containers, dlist, either - , ghc-prim, mtl, parsec2, prettyclass, syb, transformers + ({ mkDerivation, alex, array, base, containers, dlist, either, mtl + , parsec, prettyclass, syb, transformers }: mkDerivation { pname = "CSPM-Frontend"; - version = "0.10.0.0"; - sha256 = "0wmfk9givv604ajzkg60586lz08xqcx60bnqgslpfzkh458mz9z3"; + version = "0.12.1.0"; + sha256 = "17i5app854vb4mghf9l0laldbgraqbq08w36hh61j5n161ypb1s5"; libraryHaskellDepends = [ - array base containers dlist either ghc-prim mtl parsec2 prettyclass - syb transformers + array base containers dlist either mtl parsec prettyclass syb + transformers ]; libraryToolDepends = [ alex ]; description = "A CSP-M parser compatible with FDR-2.91"; @@ -2278,8 +2278,8 @@ self: { }: mkDerivation { pname = "CSPM-Interpreter"; - version = "0.7.0.0"; - sha256 = "0shf0bb4zqnxvclsavvxnsy697xbl5q1xjqww8makps6dirwk0qn"; + version = "0.7.1.0"; + sha256 = "01byczl4109mwmxflmnflxxh4pnfj4anqsfgng5q664a8rjzqfwy"; libraryHaskellDepends = [ array base containers CSPM-CoreLanguage CSPM-Frontend mtl prettyclass syb @@ -2290,15 +2290,13 @@ self: { }) {}; "CSPM-ToProlog" = callPackage - ({ mkDerivation, array, base, containers, CSPM-Frontend, ghc-prim - , pretty - }: + ({ mkDerivation, array, base, containers, CSPM-Frontend, pretty }: mkDerivation { pname = "CSPM-ToProlog"; - version = "0.5.2.0"; - sha256 = "0qy2zdxgdm9vacm2ickf1lvyj6wrcnpifaxgh25apg9j9v6g0h12"; + version = "0.5.5.0"; + sha256 = "1jr4q8jyai53g4yps1377q7wv9c52mg50yikycyirrpz46giiy2r"; libraryHaskellDepends = [ - array base containers CSPM-Frontend ghc-prim pretty + array base containers CSPM-Frontend pretty ]; description = "some modules specific for the ProB tool"; license = stdenv.lib.licenses.bsd3; @@ -2308,22 +2306,22 @@ self: { "CSPM-cspm" = callPackage ({ mkDerivation, base, cmdargs, containers, CSPM-CoreLanguage , CSPM-FiringRules, CSPM-Frontend, CSPM-Interpreter, CSPM-ToProlog - , hslua, parallel, pretty, prettyclass, syb, transformers, xml + , hslua, parallel, prettyclass, syb, transformers, xml }: mkDerivation { pname = "CSPM-cspm"; - version = "0.8.0.0"; - sha256 = "1lhfq8gjls2g3xwskwa7vx1kj6n83b4msx4fc6769li4r2xn1bc9"; + version = "0.8.1.0"; + sha256 = "0brgzzhkqk8pvdniqwzcfwwr9v7y3kw3zdhsw053lxs0dcb191n0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules - CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty + CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel prettyclass syb transformers xml ]; executableHaskellDepends = [ base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules - CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty + CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel prettyclass syb transformers xml ]; description = "cspm command line tool for analyzing CSPM specifications"; @@ -6077,8 +6075,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.1.1"; - sha256 = "13536fari7askp70zp7arzbk16vwgz42lw7anwxnhi9gpq2hjy5y"; + version = "0.9.2"; + sha256 = "04k0i27igqzvxmyp2yy5gvd9agymmxwxnnkqxkiv0qjhk1kj8p8r"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -9351,8 +9349,8 @@ self: { }: mkDerivation { pname = "Hastodon"; - version = "0.1.0"; - sha256 = "012b8f2jb297bnx7sgsvz0vw0ic0xmlrr0b7fs65y6ycll6ih2zw"; + version = "0.2.0"; + sha256 = "1ybchvkcv9n4wp8r4xassmgw1z0kdscmkccg3rbhz72lwp3m13zz"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types MissingH text ]; @@ -10258,36 +10256,6 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.2.2"; - sha256 = "117qn9h25wi0q8nnj10yj33spqizcsf0inb7n4xpbccg60x9i51k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring fast-logger hedis http-types IPv6Addr mtl - optparse-applicative text unordered-containers vector wai - wai-logger warp - ]; - testHaskellDepends = [ - aeson base hspec http-client http-types vector - ]; - homepage = "http://ipv6db.cybervisible.com"; - description = "A RESTful Web Service for IPv6-related data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "IPv6DB_0_2_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger - , hedis, hspec, http-client, http-types, IPv6Addr, mtl - , optparse-applicative, text, unordered-containers, vector, wai - , wai-logger, warp - }: - mkDerivation { - pname = "IPv6DB"; version = "0.2.3"; sha256 = "0j51v7y475wdrhjwrqrmlh6574l032vh7zsdhxqx723f7iswjimf"; isLibrary = true; @@ -12662,31 +12630,33 @@ self: { }) {}; "MutationOrder" = callPackage - ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, base, bimaps - , BiobaseXNA, bytestring, cereal, cereal-vector, cmdargs - , containers, deepseq, directory, DPutils, file-embed, filepath - , FormalGrammars, log-domain, parallel, PrimitiveArray + ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, attoparsec, base + , bimaps, BiobaseXNA, bytestring, bytestring-trie, cereal + , cereal-vector, cmdargs, containers, deepseq, directory, DPutils + , errors, file-embed, filemanip, filepath, FormalGrammars, hashable + , lens, log-domain, mtl, OrderedBits, parallel, PrimitiveArray , PrimitiveArray-Pretty, QuickCheck, serialize-instances - , ShortestPathProblems, tasty, tasty-quickcheck, tasty-th, text - , unordered-containers, vector, vector-strategies + , ShortestPathProblems, split, tasty, tasty-quickcheck, tasty-th + , text, unordered-containers, vector, vector-strategies , ViennaRNA-bindings, zlib }: mkDerivation { pname = "MutationOrder"; - version = "0.0.0.2"; - sha256 = "0bzk2n84j2w1j11b8pi5505kdad3fzr4m86qwkwc9kmv2l25j680"; + version = "0.0.1.0"; + sha256 = "0zk0cwjapsinnadwk8ss5cv3g81c6cz1dcqq47g53bfi0m9aly9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ADPfusion ADPfusionSet aeson base bimaps BiobaseXNA bytestring - cereal cereal-vector containers deepseq directory DPutils filepath - FormalGrammars log-domain parallel PrimitiveArray - PrimitiveArray-Pretty serialize-instances ShortestPathProblems text - unordered-containers vector vector-strategies ViennaRNA-bindings - zlib + ADPfusion ADPfusionSet aeson attoparsec base bimaps BiobaseXNA + bytestring bytestring-trie cereal cereal-vector containers deepseq + directory DPutils errors filemanip filepath FormalGrammars hashable + lens log-domain mtl OrderedBits parallel PrimitiveArray + PrimitiveArray-Pretty serialize-instances ShortestPathProblems + split text unordered-containers vector vector-strategies + ViennaRNA-bindings zlib ]; executableHaskellDepends = [ - base bytestring cmdargs file-embed filepath + base bytestring cmdargs directory errors file-embed filepath ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th vector @@ -15171,7 +15141,7 @@ self: { homepage = "http://raincat.bysusanlin.com/"; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Random123" = callPackage @@ -15872,6 +15842,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "STLinkUSB" = callPackage + ({ mkDerivation, base, binary, bytestring, transformers, usb + , vector + }: + mkDerivation { + pname = "STLinkUSB"; + version = "0.1.0"; + sha256 = "17rqwr9f0g9p4i7qw4gih1g7wj2y7d7bdma55warp82v0v996ypr"; + libraryHaskellDepends = [ + base binary bytestring transformers usb vector + ]; + description = "STLink USB interface in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "STMonadTrans" = callPackage ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { @@ -17478,8 +17464,8 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.201.0.0"; - sha256 = "0lrv0wybagc1zka9nq78qrdaygl4wbhkllw3w79cnmk1bagslxs4"; + version = "0.201.1.0"; + sha256 = "13rf0q74kk8lmgwfxicgf2d83b1jnvyq623pykm5z4g3cnap4nn4"; libraryHaskellDepends = [ base decimal-literals dumb-cas hashable haskell-src-meta HaTeX template-haskell text unordered-containers vector-space void @@ -18330,8 +18316,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.1.14"; - sha256 = "020ialav8dxbzkyra8sjip397l50j7d3gy3m44jf4wgiyk3d9jpj"; + version = "0.1.2.1"; + sha256 = "1iabmpf31vb493xp8ypmai15ld4jbf0zchjnmf6hwfs58w92v27d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18674,14 +18660,14 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_6_0_0" = callPackage + "Win32_2_6_1_0" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 , msimg32, shell32, shfolder, shlwapi, unbuildable, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.6.0.0"; - sha256 = "1swrahwg89c6001cprzfx9fi64kndzmfvwbr34k2f00izv39fn6l"; + version = "2.6.1.0"; + sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b"; libraryHaskellDepends = [ base bytestring filepath unbuildable ]; librarySystemDepends = [ advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm @@ -19856,6 +19842,8 @@ self: { pname = "accelerate-blas"; version = "0.1.0.1"; sha256 = "0rjcga34ipml402gikwvdxnpdjrmh9vnhd8wvcv109gs1ih6pafd"; + revision = "2"; + editedCabalFile = "1bxh38hyn7lq73z1dqg8rsbdblvy3551lp08jlm2h8p9b8bsriia"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -21980,6 +21968,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-tiled" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec, text + , vector + }: + mkDerivation { + pname = "aeson-tiled"; + version = "0.0.0.1"; + sha256 = "147rm19czz8bvzmjj4mmcvjyz02mr3cisyprzdfpx1q5msi7aghk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers text vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ aeson base hspec ]; + homepage = "https://github.com/schell/aeson-tiled#readme"; + description = "Aeson instances for the Tiled map editor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-toolkit" = callPackage ({ mkDerivation, aeson, base, bytestring, failure, hspec, text }: mkDerivation { @@ -22426,8 +22435,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.3"; - sha256 = "0apx1i3v5p416wa9d0s8qacras3p137f9djbyv5miz5n7yhmlfi3"; + version = "5.3.1"; + sha256 = "1qgccxz77fa3j6vakg14z81wqw3259zrgg3xvfmrizshxnp1vh54"; libraryHaskellDepends = [ array base binary containers deepseq mtl mwc-random random vector ]; @@ -22459,8 +22468,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.7.4.2"; - sha256 = "12igx82kzbsg9zick5r9nai2zdds33pkfgp0zm9kdr4a04qz58z1"; + version = "0.8"; + sha256 = "1ggr95d6na41sllnz6a8lnscb63v04b8x466hw6658r8vxai0560"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -22558,15 +22567,16 @@ self: { }) {}; "aivika-lattice" = callPackage - ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl - , mwc-random, random + ({ mkDerivation, aivika, aivika-transformers, array, base + , containers, mtl, mwc-random, random }: mkDerivation { pname = "aivika-lattice"; - version = "0.3"; - sha256 = "1770w2jbfyvcrdsvlh00l7861ckxk37yk4qc27fmigd060gbz552"; + version = "0.4"; + sha256 = "0fczcyg9bmijjwzh4x2kgs5q0x5swz17b51cv298ka4cmbqbhmgv"; libraryHaskellDepends = [ - aivika aivika-transformers base containers mtl mwc-random random + aivika aivika-transformers array base containers mtl mwc-random + random ]; homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library using lattice"; @@ -25249,7 +25259,6 @@ self: { ]; description = "Generic Haskell AMQP Consumer"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -26130,25 +26139,25 @@ self: { "apiary" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html - , blaze-markup, bytestring, bytestring-read, case-insensitive - , data-default-class, directory, exceptions, hashable, http-date - , http-types, HUnit, mime-types, monad-control, mtl, process - , resourcet, stringsearch, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers, transformers-base - , types-compat, unix-compat, unordered-containers, vault, wai - , wai-extra, web-routing + , blaze-markup, bytestring, bytestring-lexing, case-insensitive + , data-default-class, directory, exceptions, ghc-prim, hashable + , hetero-dict, http-date, http-types, HUnit, mime-types + , monad-control, mtl, primitive, process, resourcet, stringsearch + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , time, transformers, transformers-base, unix-compat + , unordered-containers, vault, wai, wai-extra }: mkDerivation { pname = "apiary"; - version = "2.0.2"; - sha256 = "155mkd7fdy32vhpl3njwa4v5r720w1y436i3laz9nysxnjaqk85r"; + version = "2.1.2"; + sha256 = "03b3rhjpjfinj1xnkngipz09d1j1dijy25s0z0a5mvygahlf9kvc"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html blaze-markup bytestring - bytestring-read case-insensitive data-default-class exceptions - hashable http-date http-types mime-types monad-control mtl process - resourcet stringsearch template-haskell text time transformers - transformers-base types-compat unix-compat unordered-containers - vault wai wai-extra web-routing + bytestring-lexing case-insensitive data-default-class exceptions + ghc-prim hashable hetero-dict http-date http-types mime-types + monad-control mtl primitive process resourcet stringsearch + template-haskell text time transformers transformers-base + unix-compat unordered-containers vault wai wai-extra ]; testHaskellDepends = [ aeson base bytestring directory http-types HUnit mtl tasty @@ -26164,18 +26173,16 @@ self: { ({ mkDerivation, apiary, apiary-session, authenticate, base , blaze-builder, bytestring, cereal, data-default-class , http-client, http-client-tls, http-types, monad-control - , resourcet, text, types-compat, wai, web-routing + , resourcet, text, wai }: mkDerivation { pname = "apiary-authenticate"; - version = "1.4.0"; - sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0"; - revision = "5"; - editedCabalFile = "0jndacr6vcnh14d7bd10v9jl2qcpzfwr223j7x1f6zza70r2p5rl"; + version = "1.5.1"; + sha256 = "0j28iv0am45a104cpc6jd1gv1j7nqwbjji892d0q9g90wlf2r5p8"; libraryHaskellDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types - monad-control resourcet text types-compat wai web-routing + monad-control resourcet text wai ]; homepage = "https://github.com/philopon/apiary"; description = "authenticate support for apiary web framework"; @@ -26190,10 +26197,8 @@ self: { }: mkDerivation { pname = "apiary-clientsession"; - version = "1.4.0"; - sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6"; - revision = "3"; - editedCabalFile = "06kcmwm1mrvqmbl510ni2j1rdsrzhs81xsjia5wlyhn4jr4192ag"; + version = "1.5.1"; + sha256 = "1cxxc3nn05k2v0mr2lnhhjwigykx5jws23mik3znq259r18wjjk7"; libraryHaskellDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -26206,17 +26211,14 @@ self: { "apiary-cookie" = callPackage ({ mkDerivation, apiary, base, blaze-builder, blaze-html - , bytestring, cookie, time, types-compat, wai, web-routing + , bytestring, cookie, time, wai }: mkDerivation { pname = "apiary-cookie"; - version = "1.4.0"; - sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; - revision = "4"; - editedCabalFile = "0qc5nzjak8zb5i3kavz7hi1qy6ywalsrgj2wrxdb53jwac76gigc"; + version = "1.5.1"; + sha256 = "1lci1vim94nk3ah72wa9iy1vza3gnf3c05jp10bnv0khy131mghy"; libraryHaskellDepends = [ - apiary base blaze-builder blaze-html bytestring cookie time - types-compat wai web-routing + apiary base blaze-builder blaze-html bytestring cookie time wai ]; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; @@ -26228,10 +26230,8 @@ self: { ({ mkDerivation, apiary, base, blaze-builder, wai-extra }: mkDerivation { pname = "apiary-eventsource"; - version = "1.4.0"; - sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7"; - revision = "2"; - editedCabalFile = "15fc0hdrcic1nk62znn3dcq6dp00d0msl38kb7pdapvkpnyh1z0g"; + version = "1.5.1"; + sha256 = "0dkvj03ay44m49pmm96y9nvyqlrw91kyw0pzm6wraspagbvs57nm"; libraryHaskellDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -26281,18 +26281,15 @@ self: { "apiary-logger" = callPackage ({ mkDerivation, apiary, base, data-default-class, fast-logger , lifted-base, monad-control, monad-logger, transformers - , transformers-base, types-compat + , transformers-base }: mkDerivation { pname = "apiary-logger"; - version = "1.4.0"; - sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; - revision = "4"; - editedCabalFile = "1qs3fxaiybyb4g9d4w393yxwsxr4b6wzg5va7qmlqpcavr9l1224"; + version = "1.5.1"; + sha256 = "19a8qiv0dygxmznjpr46s3wihryi83qj6d12nzr7d0n7j36ja2d8"; libraryHaskellDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base - types-compat ]; homepage = "https://github.com/philopon/apiary"; description = "fast-logger support for apiary web framework"; @@ -26323,17 +26320,15 @@ self: { "apiary-mongoDB" = callPackage ({ mkDerivation, apiary, base, bson, data-default-class , lifted-base, monad-control, mongoDB, resource-pool, text, time - , transformers, types-compat + , transformers }: mkDerivation { pname = "apiary-mongoDB"; - version = "1.4.0"; - sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd"; - revision = "2"; - editedCabalFile = "1pk0axkr5zrlbyqskznh050ahvpnccdpa0ixfn3i5sw26nnva4ny"; + version = "1.5.1"; + sha256 = "1liiyk2w2v18455ydbxz7k5d58f29sgmlagxikkgsplbdm3m5mz0"; libraryHaskellDepends = [ apiary base bson data-default-class lifted-base monad-control - mongoDB resource-pool text time transformers types-compat + mongoDB resource-pool text time transformers ]; homepage = "https://github.com/philopon/apiary"; description = "mongoDB support for apiary web framework"; @@ -26344,18 +26339,15 @@ self: { "apiary-persistent" = callPackage ({ mkDerivation, apiary, apiary-logger, base, monad-control , monad-logger, persistent, resource-pool, resourcet, transformers - , transformers-base, types-compat, web-routing + , transformers-base }: mkDerivation { pname = "apiary-persistent"; - version = "1.4.0"; - sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9"; - revision = "3"; - editedCabalFile = "17i3l8aj2k1hzlmyf2h4jl5savbrdvnvz2i8riwcmwfqgnmcfdc2"; + version = "1.5.1"; + sha256 = "03vd0vjz72dd8ngi5n9dziplpxdysql5gxgiqfn825fzc75c9pn4"; libraryHaskellDepends = [ apiary apiary-logger base monad-control monad-logger persistent - resource-pool resourcet transformers transformers-base types-compat - web-routing + resource-pool resourcet transformers transformers-base ]; homepage = "https://github.com/philopon/apiary"; description = "persistent support for apiary web framework"; @@ -26385,16 +26377,12 @@ self: { }) {}; "apiary-session" = callPackage - ({ mkDerivation, apiary, base, types-compat, wai, web-routing }: + ({ mkDerivation, apiary, base, wai }: mkDerivation { pname = "apiary-session"; - version = "1.4.0"; - sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23"; - revision = "3"; - editedCabalFile = "04yrlp26dbhhybqvviajmd85vrcdbscmbw4nmag32wfnz5xdb0qr"; - libraryHaskellDepends = [ - apiary base types-compat wai web-routing - ]; + version = "1.5.0"; + sha256 = "01z4r0sfm562wssfpqs3yzgwrprh8jzp0xsck4z099pwjknfi4i4"; + libraryHaskellDepends = [ apiary base wai ]; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -26402,18 +26390,12 @@ self: { }) {}; "apiary-websockets" = callPackage - ({ mkDerivation, apiary, base, wai-websockets, web-routing - , websockets - }: + ({ mkDerivation, apiary, base, wai-websockets, websockets }: mkDerivation { pname = "apiary-websockets"; - version = "1.4.0"; - sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1"; - revision = "2"; - editedCabalFile = "1s8mpk1h6a6yxmwivclawwn20s2zs094cvbphl8ymil8mm505n3j"; - libraryHaskellDepends = [ - apiary base wai-websockets web-routing websockets - ]; + version = "1.5.0"; + sha256 = "0z43lqjz51r3mw92drjkrl3m8na7ldick76vqas0dr17v1d4qdsw"; + libraryHaskellDepends = [ apiary base wai-websockets websockets ]; homepage = "https://github.com/philopon/apiary"; description = "websockets support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -28914,8 +28896,8 @@ self: { ({ mkDerivation, attoparsec, base, ip }: mkDerivation { pname = "attoparsec-ip"; - version = "0.0.0"; - sha256 = "08hgjmi9nlgg9qavsh5sl0s52yzh7vk6c933dgx9k16vk456r2y4"; + version = "0.0.1"; + sha256 = "0aananvfa7h9d73yf1c69zw5b3s3m67qhfmfrzdbifw3wj5cm9cd"; libraryHaskellDepends = [ attoparsec base ip ]; testHaskellDepends = [ base ]; homepage = "https://github.com/athanclark/attoparsec-ip#readme"; @@ -29074,8 +29056,8 @@ self: { }: mkDerivation { pname = "attoparsec-uri"; - version = "0.0.2"; - sha256 = "096w3zb9a0fcqcnzl7lb9n27hgbaj6f5n93vll7rih972657h0my"; + version = "0.0.3"; + sha256 = "1n89gkgnd8zp7ggklv98y58hk3f45l20wr3m1avcpk9a42ig186n"; libraryHaskellDepends = [ attoparsec attoparsec-ip base bytedump ip strict text vector ]; @@ -34841,6 +34823,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bizzlelude-js" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "bizzlelude-js"; + version = "1.0.4"; + sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij"; + libraryHaskellDepends = [ base containers text ]; + homepage = "http://github.com/TheBizzle"; + description = "A lousy Prelude replacement by a lousy dude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -35993,8 +35987,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.10.0.0"; - sha256 = "1f7vfh9pcg6za8rcdpq1lbvyn2z7plcb70d5r1xj330akvl626jw"; + version = "0.10.1.0"; + sha256 = "024qd9dmgqsa3q5xykc0bbvgay9hp9qwl9xixkgjpa5li68rd54c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36184,8 +36178,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit }: mkDerivation { pname = "boolean-list"; - version = "0.1.0.1"; - sha256 = "0xz0p3simx0vzvpjcmlqw7hnx0v3fiz25q8d9n7iw6z72c1920mc"; + version = "0.1.0.2"; + sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs"; libraryHaskellDepends = [ base bytestring HUnit ]; homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; @@ -37140,6 +37134,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "buffer" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, criterion + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "buffer"; + version = "0.5.0.1"; + sha256 = "09dwscqkdppmiprz8k0rfxkwf7qd8b6md8iviqmxw3wamm9qx7dl"; + libraryHaskellDepends = [ base base-prelude bug bytestring ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/buffer"; + description = "Simple mutable low-level buffer for IO"; + license = stdenv.lib.licenses.mit; + }) {}; + "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances @@ -37494,8 +37508,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.6.1"; - sha256 = "18qg8fwmdq0lrfz7gyyzv6f4ch24sm925ykxb68rr996wxnmlbm2"; + version = "0.6.2"; + sha256 = "099awz60hp9bpc8d27zkb3vm8r5bqp2y358drj6bzas5gqlg67bf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -38132,8 +38146,8 @@ self: { }: mkDerivation { pname = "bzlib-conduit"; - version = "0.2.1.4"; - sha256 = "07gxnbr65pl70lssgcxbajc0id9x4p3p8mc0hfi9lgf8rh270w1d"; + version = "0.2.1.5"; + sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring conduit conduit-extra data-default mtl @@ -39107,6 +39121,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cabal-toolkit" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , template-haskell + }: + mkDerivation { + pname = "cabal-toolkit"; + version = "0.0.1"; + sha256 = "0rlr2zcm4pmiknw7z4jgn1n1wd9wr056g5hbv7jcr3l709b1753j"; + libraryHaskellDepends = [ + base binary bytestring Cabal containers template-haskell + ]; + homepage = "https://github.com/TerrorJack/cabal-toolkit#readme"; + description = "Helper functions for writing custom Setup.hs scripts."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-uninstall" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process }: mkDerivation { @@ -42191,8 +42222,8 @@ self: { }: mkDerivation { pname = "chatwork"; - version = "0.1.1.2"; - sha256 = "050a0vhv59svdgja4lc8jxcyxqbrd9zr14hwbrnk7hzk9dxvd0wz"; + version = "0.1.1.3"; + sha256 = "0g7995g5i49mxd0qhdb2l1l1yz047yqwnmzk9f6xvqv5fqy5c6p5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42378,6 +42409,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_4_9" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.4.9"; + sha256 = "1vpyyhvq1xkq8pxz2xpmw14yldn8ks95zaijpqxdzsmq4v3sy83a"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "checkmate" = callPackage ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec @@ -42676,13 +42721,14 @@ self: { }) {}; "chronologique" = callPackage - ({ mkDerivation, base, hourglass, hspec, QuickCheck, time }: + ({ mkDerivation, base, hourglass, hspec, QuickCheck, time, vector + }: mkDerivation { pname = "chronologique"; - version = "0.2.1.0"; - sha256 = "13lrngxfbsfsmqph8slh8zn7hvvihbwzc6cna315kjzhi3a3mwbm"; - libraryHaskellDepends = [ base hourglass time ]; - testHaskellDepends = [ base hourglass hspec QuickCheck ]; + version = "0.3.0.0"; + sha256 = "1pgggmsmb3ah15iqkib9d9ms0vs4j3945a7mbih0zra4xha39dg9"; + libraryHaskellDepends = [ base hourglass time vector ]; + testHaskellDepends = [ base hourglass hspec QuickCheck vector ]; description = "Time to manipulate time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42690,16 +42736,16 @@ self: { "chronos" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable , HUnit, primitive, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, vector + , test-framework-hunit, test-framework-quickcheck2, text, torsor + , vector }: mkDerivation { pname = "chronos"; - version = "0.4"; - sha256 = "0lc7qb1ky15sxmvndfjcmmy6j913ncnzq0hjx9mbqljvg7di0yal"; - revision = "1"; - editedCabalFile = "1mk6kn0gs7azv7c9bcal8k6zzlpska0x9akk91la2xvg298sy6a5"; + version = "1.0"; + sha256 = "135fb54lac1rqb7ql0810f22a41whmswckhjbmb1xysryv0gv05k"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector + aeson attoparsec base bytestring hashable primitive text torsor + vector ]; testHaskellDepends = [ attoparsec base bytestring HUnit QuickCheck test-framework @@ -43390,6 +43436,7 @@ self: { homepage = "https://github.com/lambdageek/clang-compilation-database"; description = "JSON Compilation Database Format encoding and decoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clang-pure" = callPackage @@ -45306,8 +45353,8 @@ self: { ({ mkDerivation, array, base, bytestring, text }: mkDerivation { pname = "cndict"; - version = "0.8.2"; - sha256 = "0pc6rph99mxy5cbrxrysxq5q01vn2k2ax3c00pv9sw7inn4inh0p"; + version = "0.8.3"; + sha256 = "1vci3z74jsxfhbbz122mcbcdh6n2371i0l803vgd8ndzawhs13m4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring text ]; homepage = "https://github.com/Lemmih/cndict"; @@ -46019,8 +46066,8 @@ self: { }: mkDerivation { pname = "colour-space"; - version = "0.1.3.0"; - sha256 = "06ainna4nrqd9an0s0hvcrqw18g55v0fqw4a6p00g5kw53729qyq"; + version = "0.1.4.0"; + sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq"; libraryHaskellDepends = [ base colour constrained-categories JuicyPixels linear linearmap-category manifolds semigroups vector-space @@ -47471,6 +47518,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concurrent-buffer" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, criterion + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "concurrent-buffer"; + version = "0.1"; + sha256 = "0qrnsp98x42blvngixm9wzk9cnwk335s5axslwrl6hq8pawx2ycd"; + libraryHaskellDepends = [ base base-prelude bug bytestring ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/concurrent-buffer"; + description = "Concurrent expanding buffer"; + license = stdenv.lib.licenses.mit; + }) {}; + "concurrent-dns-cache" = callPackage ({ mkDerivation, array, async, base, bytestring, containers, dns , hspec, iproute, lifted-base, monad-control, network, psqueues @@ -48565,6 +48632,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conkin" = callPackage + ({ mkDerivation, base, data-default, doctest, markdown-unlit + , pretty-show + }: + mkDerivation { + pname = "conkin"; + version = "1.0.2"; + sha256 = "1843mlmf09jgdj6hd7jzn81pwd4biimrc4rxaki9s2df2qd2zr6r"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base data-default doctest markdown-unlit pretty-show + ]; + homepage = "http://github.com/rampion/conkin"; + description = "Tools for functors from Hask^k to Hask"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conlogger" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -50806,8 +50891,8 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.20"; - sha256 = "08cvagp0v98s8x99cdq86yk1i33fcpgxq3zdm414lf6cpjq80qa1"; + version = "5.9.23"; + sha256 = "04f66vjl1bpfgsf0j5dpz7wjvkvw22ia0f1d375mzhp5xmv4qw46"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl @@ -51872,8 +51957,8 @@ self: { }: mkDerivation { pname = "cryptoids"; - version = "0.3.0.0"; - sha256 = "1n8mr80n1hmld02n1a97nsxh3x8fmnqmbpnnvjawkq1mj768nbc4"; + version = "0.4.0.0"; + sha256 = "1km63vgckjsxxrkd45w7c5gc3d5hk6dg6f0y4z4c8wajz4ddp1a3"; libraryHaskellDepends = [ base binary bytestring cryptoids-types cryptonite directory exceptions filepath memory @@ -52565,8 +52650,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.8.0.0"; - sha256 = "0zlasd6c3da462qaffj9z44546551b2cvs0wv0f23739x4i929z9"; + version = "0.8.0.1"; + sha256 = "0raaydjcnicg38kxy1mjpxb0k57q5nnzb7p38i8x5ify30bzxw0w"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -54183,14 +54268,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_1_2_0_2" = callPackage + "data-diverse_1_2_0_3" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "1.2.0.2"; - sha256 = "0h0wifwckybn0py6xndaj1fp0sld28aca4qgclw07qsyfd9rnc9x"; + version = "1.2.0.3"; + sha256 = "0mc9xzh0hja8zvgwnfa65hdwirqzggbw1k07fspgzs699wj9dh6r"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54215,13 +54300,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_0_5_0_0" = callPackage - ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: + "data-diverse-lens_0_5_1_0" = callPackage + ({ mkDerivation, base, data-diverse, hspec, lens, profunctors + , tagged + }: mkDerivation { pname = "data-diverse-lens"; - version = "0.5.0.0"; - sha256 = "1can16ndkff8c3dfn585hdbg8zw805icax01hfm0ys3rvypwn4vq"; - libraryHaskellDepends = [ base data-diverse lens tagged ]; + version = "0.5.1.0"; + sha256 = "0c1hrz9b8a01vphfqmlfgx3mh6ci8hd5wwr8iwpkv6z7ps7sp9kd"; + libraryHaskellDepends = [ + base data-diverse lens profunctors tagged + ]; testHaskellDepends = [ base data-diverse hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; @@ -56941,18 +57030,17 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_9_0_0" = callPackage + "dejafu_0_9_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, mtl, random, ref-fd, semigroups, transformers - , transformers-base + , leancheck, random, ref-fd, transformers, transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.9.0.0"; - sha256 = "0n2qj6kaldg006pjz5aj0wjigr3dd7vgbl35fgsz3fx9j64ydi72"; + version = "0.9.0.1"; + sha256 = "18i21basz8d50axa1ccgz9djghd95iazv4k7x499fff1nak39147"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck mtl random - ref-fd semigroups transformers transformers-base + base concurrency containers deepseq exceptions leancheck random + ref-fd transformers transformers-base ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Systematic testing for Haskell concurrency"; @@ -57448,16 +57536,20 @@ self: { }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, mtl, primitive, syb, template-haskell - , th-expand-syns, transformers + ({ mkDerivation, base, binary, derive, haskell-src, mtl, primitive + , QuickCheck, syb, template-haskell, th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.0.7"; - sha256 = "1r566bcp0qqwwbndwbbfnczxwmlyl9dfnsysnija7v8fn46z30ni"; + version = "0.0.0.9"; + sha256 = "0jvmdwd1dif8hxb45s2fw96pca1hm41p5cac68in1pkpsvq7z6cf"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; + testHaskellDepends = [ + base binary derive haskell-src mtl primitive QuickCheck syb + template-haskell th-expand-syns transformers + ]; homepage = "https://github.com/HaskellZhangSong/derive-topdown"; description = "Help Haskellers derive class instances for composited data types"; license = stdenv.lib.licenses.bsd3; @@ -59671,8 +59763,8 @@ self: { }: mkDerivation { pname = "diskhash"; - version = "0.0.2.1"; - sha256 = "1kgjwcggi33jw1k1s462cya6hydcz7ka9pkqk2lgdcxwlw9fy9kb"; + version = "0.0.2.3"; + sha256 = "08g484knhw96mlk5qa6cx1cm9kblxrz8979c9xcvmidgj44phb8z"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring directory HUnit QuickCheck test-framework @@ -61379,15 +61471,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dotenv_0_5_1_0" = callPackage + "dotenv_0_5_1_1" = callPackage ({ mkDerivation, base, base-compat, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text , transformers }: mkDerivation { pname = "dotenv"; - version = "0.5.1.0"; - sha256 = "1cgx9q8gdfvkv3vr10yafa0vls2iil5kr5nqdbn4n9xf8m5p3dn1"; + version = "0.5.1.1"; + sha256 = "1i4892xc2d05qnswcyf40ww5idjd1m3wwqz9wxwhph1jqzvsgc9b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -62332,15 +62424,14 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.1.0.0"; - sha256 = "0jrxphgxm6f7wzrn8vzfz0i6scz2xz72yja5i2bmkf185gqvhpjz"; - revision = "1"; - editedCabalFile = "0wzq73i209fa8apj34lc851cgg6047kimxkl9ykv8l9nspg22faq"; + version = "0.1.1.0"; + sha256 = "1crzw0axgamjhxrm2ggdqw45jw80avp227bwc1v0c7lmb4cmkr3p"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers ]; testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/leftaroundabout/dumb-cas"; description = "A computer “algebra” system that knows nothing about algebra, at the core"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -62388,8 +62479,8 @@ self: { ({ mkDerivation, base, transformers, transformers-base }: mkDerivation { pname = "dunai"; - version = "0.1.1.0"; - sha256 = "1smzf6m5l2ma500r9d51iia994lq8wvq2ryf3gijz3fyll6f5ibn"; + version = "0.2.0.0"; + sha256 = "1h6rw4h300hbmv05immhzxzf5yb9kc5zsykifdysi40l4fbx7rkc"; libraryHaskellDepends = [ base transformers transformers-base ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; @@ -62951,12 +63042,16 @@ self: { }) {}; "eap" = callPackage - ({ mkDerivation, base, binary, bytestring }: + ({ mkDerivation, base, binary, bytestring, cryptonite, memory, mtl + , pretty-hex + }: mkDerivation { pname = "eap"; - version = "0.1.0.0"; - sha256 = "118nayxnc8xwyhx622wvgr3l35v90481j50m43x2zfkwish23dir"; - libraryHaskellDepends = [ base binary bytestring ]; + version = "0.9.0.1"; + sha256 = "0z7ab3i16424gpxwjhc4x7c55yhvzx5qjm80f2klpf94zz4w37ab"; + libraryHaskellDepends = [ + base binary bytestring cryptonite memory mtl pretty-hex + ]; homepage = "https://github.com/erickg/eap#readme"; description = "Extensible Authentication Protocol (EAP)"; license = stdenv.lib.licenses.bsd3; @@ -67868,8 +67963,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.1.3"; - sha256 = "0b3f9h0s7ayijkpqk929pgw6lxszbq94c9y69wsfcs7h7awd792h"; + version = "0.1.4"; + sha256 = "1dxkg5yc2njq7dpv7vgkmrs73x5np5w1ahi79my6ysamnc2w8a04"; libraryHaskellDepends = [ attoparsec base containers lattices singletons text transformers ]; @@ -67887,8 +67982,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.0"; - sha256 = "1ma1g8b25466cpk8fyaf6fajp330wvnd44h2ddjvm9hkgaa8s82x"; + version = "0.1.1"; + sha256 = "0hk8qhkvlh4v210k7d845krg31px72ma44fmwahbycn6pgy32659"; libraryHaskellDepends = [ base containers expressions singletons transformers z3 ]; @@ -67976,17 +68071,18 @@ self: { "extensible" = callPackage ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim - , lens, monad-skeleton, mtl, primitive, profunctors, QuickCheck - , semigroups, StateVar, tagged, template-haskell, transformers + , hashable, lens, monad-skeleton, mtl, primitive, profunctors + , QuickCheck, semigroups, StateVar, tagged, template-haskell + , transformers, vector }: mkDerivation { pname = "extensible"; - version = "0.4.5"; - sha256 = "10cs47fdl79dasq5afbj5b47ybmvfsx589bwy6y3qcmlwybjnmlj"; + version = "0.4.6"; + sha256 = "0khi212qc834qnrssbn4xcfiypi2m7x8gwpwvpd6sbi6hi6c052v"; libraryHaskellDepends = [ - base comonad constraints deepseq ghc-prim monad-skeleton mtl - primitive profunctors QuickCheck semigroups StateVar tagged - template-haskell transformers + base comonad constraints deepseq ghc-prim hashable monad-skeleton + mtl primitive profunctors QuickCheck semigroups StateVar tagged + template-haskell transformers vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; homepage = "https://github.com/fumieval/extensible"; @@ -68532,6 +68628,28 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-builder_0_0_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, process, QuickCheck, scientific, stm + , template-haskell, text, true-name, unordered-containers, vector + }: + mkDerivation { + pname = "fast-builder"; + version = "0.0.1.0"; + sha256 = "09s0jyiv1ch8cbgwfaxn5mmn9w7ik661h2g6d5znxr0nsi0bp2n1"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring process QuickCheck stm ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq ghc-prim + scientific template-haskell text true-name unordered-containers + vector + ]; + homepage = "http://github.com/takano-akio/fast-builder"; + description = "Fast ByteString Builder"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-digits" = callPackage ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck @@ -69264,6 +69382,22 @@ self: { license = "GPL"; }) {}; + "fedora-haskell-tools" = callPackage + ({ mkDerivation, base, directory, filepath, process, time, unix }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.3"; + sha256 = "0ml5laiwkpd68j87px57jdvjc90pw1ma41gsc06h1qjlhnvhhill"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath process time unix + ]; + homepage = "https://github.com/fedora-haskell/fedora-haskell-tools"; + description = "Building and tracking tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -69717,8 +69851,8 @@ self: { }: mkDerivation { pname = "ffmpeg-light"; - version = "0.12.0"; - sha256 = "0cv8jq2if0pv40yp8inl3slsgs3z1rncffjgs2522qimq123rxcz"; + version = "0.12.0.1"; + sha256 = "1ikyhdkr3pvkpmqw7j4xgz07bnxnvckld8kd06191kgqlvr2k764"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70218,6 +70352,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "filepath-crypto" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , cryptoids, cryptoids-types, encoding, exceptions, filepath, sandi + , template-haskell + }: + mkDerivation { + pname = "filepath-crypto"; + version = "0.0.0.2"; + sha256 = "1i6y0bpyndghkfip2l0ijk9mnhia0fjmd6skzl1a3dbh5pibf7fd"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive cryptoids cryptoids-types + encoding exceptions filepath sandi template-haskell + ]; + description = "Reversable and secure encoding of object ids as filepaths"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filepath-io-access" = callPackage ({ mkDerivation, base, base-io-access, filepath }: mkDerivation { @@ -72808,6 +72960,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "fortytwo" = callPackage + ({ mkDerivation, ansi-terminal, async, base, doctest, hspec + , process, text + }: + mkDerivation { + pname = "fortytwo"; + version = "1.0.2"; + sha256 = "15imj5ps040iz5abfnzjpgfq726j9c28bwwg06zbf07ji74dz190"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base text ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ async base doctest hspec process ]; + homepage = "https://github.com/gianlucaguarini/fortytwo#readme"; + description = "Interactive terminal prompt"; + license = stdenv.lib.licenses.mit; + }) {}; + "forward-chan" = callPackage ({ mkDerivation, base, SafeSemaphore, stm, unagi-chan }: mkDerivation { @@ -73424,14 +73594,15 @@ self: { }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.2.0"; - sha256 = "1km43gdngrjbyd6z8v6nfj25aybb4xdkxdnfizkd9sbkdqyxkbk8"; + version = "0.1.4.0"; + sha256 = "057l1fnkqyqnjbhzjz2jjlcrsmkcv2gd16gb5n3j99crw97s62xj"; libraryHaskellDepends = [ base lens linear MemoTrie vector vector-space ]; homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-vl" = callPackage @@ -73492,6 +73663,7 @@ self: { homepage = "https://github.com/clintonmead/freelude#readme"; description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freenect" = callPackage @@ -74758,6 +74930,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fuzzyset" = callPackage + ({ mkDerivation, base, base-unicode-symbols, data-default, hspec + , ieee754, lens, text, text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.1.0.2"; + sha256 = "1gpx8qw9vxlardjxncgkbbk3zvq8zjrc6nhjk80va7d7ix5zpdhz"; + libraryHaskellDepends = [ + base base-unicode-symbols data-default lens text text-metrics + unordered-containers vector + ]; + testHaskellDepends = [ + base base-unicode-symbols hspec ieee754 lens text + unordered-containers + ]; + homepage = "https://github.com/laserpants/fuzzyset-haskell"; + description = "Fuzzy set for approximate string matching"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fuzzytime" = callPackage ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { @@ -75051,23 +75244,22 @@ self: { }) {}; "gauge" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, basement, bytestring - , code-page, containers, deepseq, directory, foundation, HUnit - , math-functions, mwc-random, optparse-applicative, QuickCheck - , statistics, tasty, tasty-hunit, tasty-quickcheck, vector + ({ mkDerivation, base, basement, bytestring, code-page, containers + , deepseq, directory, HUnit, math-functions, mwc-random, tasty + , tasty-hunit, vector }: mkDerivation { pname = "gauge"; - version = "0.1.0"; - sha256 = "10hxx7n8hpcivi0g34w85dsvfx4l926rv1b6s88hyhpwj4qyvxb5"; + version = "0.1.3"; + sha256 = "1i97f00haj4832s2arbnqq19dpna54ygmchvnqkq00hsxk38cyc0"; libraryHaskellDepends = [ - ansi-wl-pprint base basement code-page containers deepseq - foundation math-functions mwc-random optparse-applicative vector + base basement code-page containers deepseq math-functions + mwc-random vector ]; testHaskellDepends = [ - base bytestring deepseq directory foundation HUnit QuickCheck - statistics tasty tasty-hunit tasty-quickcheck vector + base bytestring deepseq directory HUnit tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ]; homepage = "https://github.com/vincenthz/hs-gauge"; description = "small framework for performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; @@ -75393,29 +75585,108 @@ self: { }) {inherit (pkgs) gegl;}; "gelatin" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , file-embed, FontyFruity, gl, GLFW-b, JuicyPixels, lens, linear - , time, vector + ({ mkDerivation, base, bytestring, containers, lens, linear, mtl + , transformers, vector }: mkDerivation { pname = "gelatin"; - version = "0.0.0.3"; - sha256 = "07ixnrhgqfqgb8cfm5qik17vx893jrjk7lq6342lpczpks22a58q"; + version = "0.1.0.0"; + sha256 = "08y9wsym19rgwr6k44n8pxffwi1fna3nmg4bq5cc7in5zj1ihfbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers directory file-embed FontyFruity - gl GLFW-b JuicyPixels lens linear time vector - ]; - executableHaskellDepends = [ - async base bytestring containers directory file-embed FontyFruity - gl GLFW-b JuicyPixels lens linear time vector + base bytestring containers lens linear mtl transformers vector ]; - description = "An experimental real time renderer"; + executableHaskellDepends = [ base linear mtl vector ]; + homepage = "https://github.com/schell/gelatin"; + description = "A graphics description language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gelatin-freetype2" = callPackage + ({ mkDerivation, base, containers, either, freetype2, gelatin + , gelatin-gl, mtl, transformers + }: + mkDerivation { + pname = "gelatin-freetype2"; + version = "0.1.0.0"; + sha256 = "0nr5xsxwg73liyr572jv1vzj5bjk3qhkkk7j6g0kqf2h31yxgqhr"; + libraryHaskellDepends = [ + base containers either freetype2 gelatin gelatin-gl mtl + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/schell/gelatin/gelatin-freetype2#readme"; + description = "FreeType2 based text rendering for the gelatin realtime rendering system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gelatin-fruity" = callPackage + ({ mkDerivation, base, FontyFruity, gelatin, linear, vector }: + mkDerivation { + pname = "gelatin-fruity"; + version = "0.1.0.0"; + sha256 = "0yp3z4sz52f21zvdy1xmd0bvpicbnv4wa53937rq1vw2jv60xx2r"; + libraryHaskellDepends = [ base FontyFruity gelatin linear vector ]; + homepage = "https://github.com/schell/gelatin-fruity#readme"; + description = "Gelatin's support for rendering TTF outlines, using FontyFruity"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gelatin-gl" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, either + , filepath, gelatin, gelatin-shaders, gl, JuicyPixels, lens, linear + , mtl, template-haskell, transformers, vector + }: + mkDerivation { + pname = "gelatin-gl"; + version = "0.1.0.0"; + sha256 = "1x9a3wb878d1nrlxj2rciw4xz93gn3m326zciqnn5dg31fwqs396"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory either filepath gelatin + gelatin-shaders gl JuicyPixels lens linear mtl template-haskell + transformers vector + ]; + executableHaskellDepends = [ base gelatin lens linear mtl vector ]; + homepage = "https://github.com/schell/gelatin/gelatin-gl"; + description = "OpenGL rendering routines for the gelatin-picture graphics EDSL"; + license = stdenv.lib.licenses.mit; + }) {}; + + "gelatin-sdl2" = callPackage + ({ mkDerivation, base, either, filepath, gelatin-gl, mtl, sdl2 + , transformers + }: + mkDerivation { + pname = "gelatin-sdl2"; + version = "0.1.1.0"; + sha256 = "0gnn5b06q6fsbblrjghyzn46dby2skm5r9ys6pl6fhp7pa3c924n"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base gelatin-gl mtl sdl2 transformers ]; + executableHaskellDepends = [ base either filepath sdl2 ]; + homepage = "https://github.com/schell/gelatin"; + description = "An SDL2 backend for the gelatin renderer"; + license = stdenv.lib.licenses.mit; + }) {}; + + "gelatin-shaders" = callPackage + ({ mkDerivation, base, bytestring, filepath, gelatin }: + mkDerivation { + pname = "gelatin-shaders"; + version = "0.1.0.0"; + sha256 = "001ifyyv85b9gb5l4hf21b5dqakg4f7n3bil5a1abb4vcj2zmpfr"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring filepath gelatin ]; + homepage = "https://github.com/schell/gelatin-shaders#readme"; + description = "Gelatin's OpenGL shaders"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gemstone" = callPackage ({ mkDerivation, array, base, bitmap, bitmap-opengl, containers , FTGL, lens, linear, OpenGL, random, SDL, SDL-image, stb-image @@ -77644,14 +77915,14 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_5_5" = callPackage + "ghc-typelits-natnormalise_0_5_6" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.5"; - sha256 = "1dr0568hfxrjhvpgl624zghnvinfg7wwn9x36lrnxr4cl7najqk5"; + version = "0.5.6"; + sha256 = "07rrc3aw00i36z6xgp2jik9wqi0d8byzy48dy8jj089vp7s6birb"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -79185,7 +79456,7 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive + , bloomfilter, bup, byteable, bytestring, case-insensitive , clientsession, concurrent-output, conduit, conduit-extra , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus , directory, disk-free-space, dlist, dns, edit-distance, esqueleto @@ -79204,8 +79475,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20171018"; - sha256 = "17armwygz44wphv6hqpyjggh4ybarhy3a2ypnsrc1ifhpq3rf15d"; + version = "6.20171026"; + sha256 = "0i44cfxp5wy6y527l9jbj83ilkxilp4jm7106q70czls0hnx6yij"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -79214,10 +79485,6 @@ self: { ]; isLibrary = false; isExecutable = true; - setupHaskellDepends = [ - base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse process split unix unix-compat - ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession concurrent-output conduit @@ -79717,27 +79984,6 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.0.6"; - sha256 = "1ixs76y5cb1dkrvl8i13a7s9xgs3170w3sjx6bhj05fi6wvz3n8z"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/tfausak/github-release#readme"; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_0_7" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater - }: - mkDerivation { - pname = "github-release"; version = "1.0.7"; sha256 = "17v9rpl6nljf2xa16s3zi6dr8w8385pxdsa1ksyzn84kpq58kdn9"; isLibrary = true; @@ -79750,7 +79996,6 @@ self: { homepage = "https://github.com/tfausak/github-release#readme"; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -85459,13 +85704,13 @@ self: { ({ mkDerivation, base, cairo, containers, filepath, gtk }: mkDerivation { pname = "gulcii"; - version = "0.2.0.3"; - sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; + version = "0.3"; + sha256 = "1crx9kz4s8by509x1k60m89jmmn7gfhi46d05q44ikhk5zkxycws"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo containers filepath gtk ]; - homepage = "http://code.mathr.co.uk/gulcii"; + homepage = "https://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -87501,25 +87746,6 @@ self: { }: mkDerivation { pname = "hailgun"; - version = "0.4.1.5"; - sha256 = "0hi9a8aa10n14ipk4g8ksrf175z92kkwk0d9n3qzn835fkj5kkyr"; - libraryHaskellDepends = [ - aeson base bytestring email-validate exceptions filepath - http-client http-client-tls http-types tagsoup text time - transformers - ]; - homepage = "https://bitbucket.org/robertmassaioli/hailgun"; - description = "Mailgun REST api interface for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hailgun_0_4_1_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, email-validate - , exceptions, filepath, http-client, http-client-tls, http-types - , tagsoup, text, time, transformers - }: - mkDerivation { - pname = "hailgun"; version = "0.4.1.6"; sha256 = "0hkz666vd02iknkxv0l60l3ara0yaszc6583sry0shk2cd74lv06"; libraryHaskellDepends = [ @@ -87530,7 +87756,6 @@ self: { homepage = "https://bitbucket.org/robertmassaioli/hailgun"; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun-send" = callPackage @@ -90687,23 +90912,25 @@ self: { }) {}; "haskell-compression" = callPackage - ({ mkDerivation, base, bimap, booleanlist, bytestring, containers + ({ mkDerivation, base, bimap, boolean-list, bytestring, containers }: mkDerivation { pname = "haskell-compression"; - version = "0.2"; - sha256 = "0z0jhz5m70qrs2w3q58xghgv279yjvhfdspy5pqpss87jm1fm3ab"; + version = "0.3"; + sha256 = "1yksgwhxpfl47d6zrqdx5bdxyya9vd3kr1g33pz19qfqsvfcqlhp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bimap booleanlist bytestring containers + base bimap boolean-list bytestring containers + ]; + executableHaskellDepends = [ + base bimap boolean-list bytestring containers ]; - executableHaskellDepends = [ base bimap bytestring containers ]; homepage = "http://xy30.com"; description = "compress files"; license = stdenv.lib.licenses.gpl3; - broken = true; - }) {booleanlist = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "haskell-conll" = callPackage ({ mkDerivation, base, containers, lens, pretty-show, protolude @@ -93337,8 +93564,8 @@ self: { }: mkDerivation { pname = "hasktags"; - version = "0.69.3"; - sha256 = "1yjsdvb3y6ly29anvh14bvfan1fplc9brb6i68ipcz9a7jk9l1jf"; + version = "0.69.4"; + sha256 = "1s7phsg20h15p2dnri6viy5k6c4n42gchy684dv3r30qrwwvv0ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95446,23 +95673,42 @@ self: { }) {}; "heavy-logger" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, fast-logger, hsyslog - , monad-control, monad-logger, mtl, template-haskell, text - , text-format-heavy, transformers-base + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, fast-logger, hsyslog, lifted-base, monad-control + , monad-logger, mtl, stm, template-haskell, text, text-format-heavy + , th-lift, th-lift-instances, thread-local-storage + , transformers-base }: mkDerivation { pname = "heavy-logger"; - version = "0.1.0.0"; - sha256 = "0wnvgjbhwscmq0wm7arlwpqj5dsrshaqhnx5nvlcvjkzrhcpxlpp"; + version = "0.3.1.0"; + sha256 = "0cmanxnahxgk52ffpni0zx4z22vdrh6r5my4llvsdd94bpfmxpi4"; libraryHaskellDepends = [ - attoparsec base bytestring fast-logger hsyslog monad-control - monad-logger mtl template-haskell text text-format-heavy - transformers-base + attoparsec base bytestring containers data-default fast-logger + hsyslog lifted-base monad-control monad-logger mtl stm + template-haskell text text-format-heavy th-lift th-lift-instances + thread-local-storage transformers-base ]; description = "Full-weight logging based on fast-logger"; license = stdenv.lib.licenses.bsd3; }) {}; + "heavy-logger-amazon" = callPackage + ({ mkDerivation, amazonka-core, base, binary, heavy-logger + , template-haskell, text + }: + mkDerivation { + pname = "heavy-logger-amazon"; + version = "0.1.0.0"; + sha256 = "18wcnpnjmv841ac3kvnyk0s9rrgfwvlgv950s1znnjdmi3qc0bjk"; + libraryHaskellDepends = [ + amazonka-core base binary heavy-logger template-haskell text + ]; + homepage = "https://github.com/portnov/heavy-logger-amazon#readme"; + description = "heavy-logger compatibility with amazonka-core logging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hebrew-time" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, time @@ -95562,30 +95808,6 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.9.10"; - sha256 = "1z8vl3ql5nyl4jg3pzghsbi1ld9a047zbwz6fgzgk1lvspa0pcd3"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq mtl network - resource-pool scanner stm text time unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring HUnit mtl slave-thread stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - homepage = "https://github.com/informatikr/hedis"; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_9_11" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, HUnit, mtl, network, resource-pool, scanner - , slave-thread, stm, test-framework, test-framework-hunit, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; version = "0.9.11"; sha256 = "1ya5jpf57zs66hqvr58xyj0k7jq5cmdci1yxzwj19cag1wfq47rb"; libraryHaskellDepends = [ @@ -95600,7 +95822,6 @@ self: { homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -96374,6 +96595,7 @@ self: { homepage = "https://github.com/JackKiefer/herms"; description = "A command-line manager for delicious kitchen recipes"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hero-club-five-tenets" = callPackage @@ -96699,8 +96921,8 @@ self: { ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; - version = "0.3.2"; - sha256 = "0vyv45s6nqhbgkzxcgx1ihmif0d7sxmfafqc2xcmcm2vg4jb7ls4"; + version = "0.3.3"; + sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4"; libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/ndmitchell/hexml#readme"; @@ -101147,20 +101369,20 @@ self: { license = stdenv.lib.licenses.isc; }) {inherit (pkgs) openssl;}; - "hoopl_3_10_2_1" = callPackage + "hoopl_3_10_2_2" = callPackage ({ mkDerivation, base, containers, filepath, mtl, parsec , test-framework, test-framework-hunit }: mkDerivation { pname = "hoopl"; - version = "3.10.2.1"; - sha256 = "1c20ahr12dlapajzgb7mhxb1m8q1485amwmvzmsgy7l7x2ls41kw"; + version = "3.10.2.2"; + sha256 = "15rbb9a8mza3zv8h3p237zhmy29bxc4k48ik27kzzj7islb16yq9"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers filepath mtl parsec test-framework test-framework-hunit ]; - homepage = "http://ghc.cs.tufts.edu/hoopl/"; + homepage = "https://github.com/haskell/hoopl"; description = "A library to support dataflow analysis and optimization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -102350,8 +102572,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.4"; - sha256 = "0vijl65rxir61nwx7sdgy6lcwgskyks3cdgcqd814smnavh6nhdn"; + version = "2.4.5"; + sha256 = "0f4h9b5c6s523967hkqg6wz57g350awa26r2y2wlfr4f39qgjwx3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102731,6 +102953,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libb2;}; + "hs-brotli" = callPackage + ({ mkDerivation, base, brotli, brotlidec, brotlienc, bytestring + , ghc-prim, libbrotlidec, libbrotlienc, QuickCheck + , quickcheck-instances, tasty-quickcheck + }: + mkDerivation { + pname = "hs-brotli"; + version = "0.1.0.0"; + sha256 = "083l7bbjlxh629a9m88mfp087f09gwsmzs9vmpxrqffw23zrnclf"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + librarySystemDepends = [ brotlidec brotlienc ]; + libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; + testHaskellDepends = [ + base brotli bytestring QuickCheck quickcheck-instances + tasty-quickcheck + ]; + homepage = "https://github.com/iand675/brotli#readme"; + description = "Compression and decompression in the brotli format"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {brotli = null; brotlidec = null; brotlienc = null; + libbrotlidec = null; libbrotlienc = null;}; + "hs-captcha" = callPackage ({ mkDerivation, base, bytestring, gd, random }: mkDerivation { @@ -103382,8 +103627,8 @@ self: { ({ mkDerivation, base, bytestring, unix }: mkDerivation { pname = "hsI2C"; - version = "0.1.2"; - sha256 = "0ma8klvyv4rnfxkag99vm4nvw77yppcv63p6829b4ynsa9vyv9rn"; + version = "0.1.3"; + sha256 = "0p77xndqpqfyjw9y7q791pysrpz3zkimw8mcxyfl4yrh34sammx9"; libraryHaskellDepends = [ base bytestring unix ]; description = "I2C access for Haskell and Linux"; license = stdenv.lib.licenses.bsd3; @@ -108910,15 +109155,15 @@ self: { }) {}; "hw-conduit" = callPackage - ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec - , mmap, time, vector, word8 + ({ mkDerivation, array, base, bytestring, conduit + , conduit-combinators, criterion, hspec, mmap, time, vector, word8 }: mkDerivation { pname = "hw-conduit"; - version = "0.2.0.2"; - sha256 = "052sgj1bny2d2j4gsmfj7mx9jcnkac7b0rsz7310nv2rc9h46sbl"; + version = "0.2.0.3"; + sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a"; libraryHaskellDepends = [ - array base bytestring conduit time word8 + array base bytestring conduit conduit-combinators time word8 ]; testHaskellDepends = [ base bytestring conduit hspec ]; benchmarkHaskellDepends = [ @@ -109115,20 +109360,20 @@ self: { "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache - , containers, errors, hashable, hspec, http-client, mtl, pure-zlib - , QuickCheck, semigroups, servant, servant-client, text + , containers, errors, hashable, hspec, http-client, http-types, mtl + , pure-zlib, QuickCheck, semigroups, servant, servant-client, text , transformers, unordered-containers }: mkDerivation { pname = "hw-kafka-avro"; - version = "1.2.0"; - sha256 = "0v2l7g524wz45mnqdqrs33qbb1psm33jlfl1hlnd22dxfw7mhdhl"; + version = "1.3.0"; + sha256 = "0lryr18gcmgfxa10gmd5y43l62x684ahpzk53wx5z5qww0chy7fa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable - http-client mtl pure-zlib semigroups servant servant-client text - transformers unordered-containers + http-client http-types mtl pure-zlib semigroups servant + servant-client text transformers unordered-containers ]; executableHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable @@ -109153,8 +109398,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.0.3"; - sha256 = "0xdkkasjql0la376kmb8zljndfbcxyizf9rqj02nlb1np8gs6apq"; + version = "2.0.4"; + sha256 = "0mqrxczjr822hccmrdsmy98mw10jdmiiq94vdibkqrh618hs4fd5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111855,6 +112100,8 @@ self: { pname = "imagesize-conduit"; version = "1.1"; sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i"; + revision = "1"; + editedCabalFile = "1gq749v6558zkvvn8iqkd4iqv4giiysxjqb2kncarnhghkkbgbaf"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions ]; @@ -113111,8 +113358,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.9.0.1"; - sha256 = "1by27qjsgwaws7nf3lslml7n58j2fk478pinflk10jji5zcs4nz9"; + version = "0.9.0.2"; + sha256 = "1swxdilr1l7h3pk313fyjgpg58g20v6560j9g4cxz0gakqqhb3jc"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions mtl pretty primitive process reflection setenv @@ -114665,8 +114912,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.2.2.3"; - sha256 = "06gklbipbjg0n2c3iqh753v9njd602r3lj4rmq1155kx0bxlwhmg"; + version = "0.2.2.4"; + sha256 = "118ksbf8kh0bmwk5m32qv609kggwssm3a56zc14f8bg67bkdkrc4"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -117857,8 +118104,8 @@ self: { }: mkDerivation { pname = "justified-containers"; - version = "0.2.0.0"; - sha256 = "0fsr9j4qnlffhkgbz50lwy3f18d619risxfl44wgfgr9b722xj8r"; + version = "0.2.0.1"; + sha256 = "0k2vw8d37hkjj786kx52hjs7qlmmv4hr8bp9dd2rskgsnwjizmw2"; libraryHaskellDepends = [ base containers roles ]; testHaskellDepends = [ base containers ghc-prim hspec QuickCheck should-not-typecheck @@ -118469,14 +118716,14 @@ self: { ({ mkDerivation, aeson, async, base, bloodhound, bytestring , containers, criterion, deepseq, enclosed-exceptions, exceptions , http-client, http-types, katip, lens, lens-aeson - , quickcheck-instances, retry, rng-utils, scientific, stm - , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text - , time, transformers, unordered-containers, uuid, vector + , quickcheck-instances, random, retry, scientific, stm, stm-chans + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.0.1"; - sha256 = "0w1iprf3lpnbgil3gzpka5akjc8kl3l6g2knizddjb6xvszy564q"; + version = "0.4.0.3"; + sha256 = "0aji0738dz7i0lry30y6rpfbhvcpc79mfqc77nlvaplb3plw0m51"; libraryHaskellDepends = [ aeson async base bloodhound bytestring enclosed-exceptions exceptions http-client http-types katip retry scientific stm @@ -118489,9 +118736,10 @@ self: { unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson base bloodhound criterion deepseq rng-utils text + aeson base bloodhound criterion deepseq random text unordered-containers uuid ]; + homepage = "https://github.com/Soostone/katip"; description = "ElasticSearch scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -118512,6 +118760,7 @@ self: { homepage = "https://github.com/iconnect/katip-syslog#readme"; description = "Syslog Katip Scribe"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katt" = callPackage @@ -119986,8 +120235,8 @@ self: { }: mkDerivation { pname = "lackey"; - version = "0.4.3"; - sha256 = "07n5acnrwy991qsx0bg1hbpxky0nxwybnh1zs08n4jmbl10rvsrs"; + version = "0.4.4"; + sha256 = "0p689g86rim4hqw0chn6p22yr9vcb4xcl44aiv6lzqb8fnwzyadx"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -121872,8 +122121,8 @@ self: { ({ mkDerivation, base, HUnit, parsec, wl-pprint }: mkDerivation { pname = "language-webidl"; - version = "0.1.4.0"; - sha256 = "06px2m4zf1b14lx7nx0m21gmxqskfyk7a777j7sbqd3dwsrbl834"; + version = "0.2.0.0"; + sha256 = "1h93a19y8109mwxl795hi0xdb3jy1z9w2ks3sc6g673kv04pw0pf"; libraryHaskellDepends = [ base parsec wl-pprint ]; testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; @@ -124160,24 +124409,26 @@ self: { }) {}; "libssh2" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libssh2, network, ssh2 + ({ mkDerivation, base, bytestring, c2hs, libssh2, network, select , syb, time }: mkDerivation { pname = "libssh2"; - version = "0.2.0.4"; - sha256 = "1abdd5k4pnfxpg1kg1kvmwgwv946zlndhnydhhphad2ah3d2pkjf"; + version = "0.2.0.5"; + sha256 = "0l224pd8bb9d29043qdy40dbknnhmwnjc95r3yyc93lhwd5fsqma"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring network syb time ]; - librarySystemDepends = [ ssh2 ]; + libraryHaskellDepends = [ + base bytestring network select syb time + ]; + librarySystemDepends = [ libssh2 ]; libraryPkgconfigDepends = [ libssh2 ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libssh2; ssh2 = null;}; + }) {inherit (pkgs) libssh2;}; "libssh2-conduit" = callPackage ({ mkDerivation, base, conduit, libssh2, monad-control, stm @@ -124280,7 +124531,7 @@ self: { homepage = "http://redmine.iportnov.ru/projects/libvirt-hs"; description = "FFI bindings to libvirt virtualization API (http://libvirt.org)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libvirt;}; "libvorbis" = callPackage @@ -125012,8 +125263,8 @@ self: { ({ mkDerivation, base, sbv }: mkDerivation { pname = "linearEqSolver"; - version = "1.3"; - sha256 = "0bszi1k27ag4yk31zxkn3jk3cqh1xzdcscm4nb6k4n0psf0qm2rp"; + version = "2.0"; + sha256 = "0dianwg8r4b6x6z17d994kmhjmqwdx083vlm9rzakfkn7p773l8w"; libraryHaskellDepends = [ base sbv ]; homepage = "http://github.com/LeventErkok/linearEqSolver"; description = "Use SMT solvers to solve linear systems over integers and rationals"; @@ -125027,8 +125278,10 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.3.2.0"; - sha256 = "0g93h1sl6djyf0r6295a7iayjnwjwmk8w7m06gi3vqr2srwjk4s5"; + version = "0.3.4.0"; + sha256 = "0idmaw25cz7lk3kr9n0jri776j0qajrlc9j1aki0brvx6p6yh2dp"; + revision = "1"; + editedCabalFile = "0vrx3ws23qg1ygh1ksvgrpz92nhnr1nmrwy8a3ax08n8jcx2nrrw"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core semigroups tagged transformers vector @@ -125037,6 +125290,7 @@ self: { homepage = "https://github.com/leftaroundabout/linearmap-family"; description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan" = callPackage @@ -125625,6 +125879,7 @@ self: { homepage = "https://github.com/ucsd-progsys/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -126968,8 +127223,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.7.3.0"; - sha256 = "15bf0ly3fl2k7dqn5vskafsihil5lb7ij96vw0nsb3dil80f54qk"; + version = "0.7.4.0"; + sha256 = "06rzvh3g294hpwpxw2syvywrw3rms1chjxqhki8b97ml1nlfnrs0"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -129094,22 +129349,23 @@ self: { "madlang" = callPackage ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude , containers, criterion, directory, file-embed, hspec - , hspec-megaparsec, http-client, megaparsec, MonadRandom, mtl - , optparse-applicative, process, random-shuffle, recursion-schemes - , tar, template-haskell, text, zip-archive, zlib + , hspec-megaparsec, http-client, http-client-tls, megaparsec + , MonadRandom, mtl, optparse-applicative, process, random-shuffle + , recursion-schemes, tar, template-haskell, text, th-lift-instances + , titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "3.0.0.1"; - sha256 = "0zh935qpaq3w0qdijbmpyf71yvjigygks7ryxfcw9q9hivypvxgj"; + version = "3.1.1.13"; + sha256 = "0qmgd368brmmibqlimv254i20ayxw96ipnwcfid4q3pdml9javn4"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory file-embed process ]; + setupHaskellDepends = [ base Cabal directory process ]; libraryHaskellDepends = [ ansi-wl-pprint base composition-prelude containers directory - file-embed http-client megaparsec MonadRandom mtl + file-embed http-client http-client-tls megaparsec MonadRandom mtl optparse-applicative random-shuffle recursion-schemes tar - template-haskell text zip-archive zlib + template-haskell text th-lift-instances titlecase zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-megaparsec text ]; @@ -129471,6 +129727,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "makefile_1_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "makefile"; + version = "1.1.0.0"; + sha256 = "01swnw8fp2cx5z5xim9apia3yw48six61mhf6p3g0gp99w4i4ypd"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base doctest Glob QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + homepage = "http://github.com/nmattia/mask"; + description = "Simple Makefile parser and generator"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mallard" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, exceptions , fgl, file-embed, hashable, hasql, hasql-optparse-applicative @@ -129982,8 +130257,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.4.1.0"; - sha256 = "0493y21sq56hj99ny10nn9kbgq2525ij79rmq5x2p1dx30gk16m5"; + version = "0.4.4.0"; + sha256 = "1qihbyhmf9abyb7fh4gf6qxwbk2a1jwnxdpnjinfi3x87xasvajj"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -129995,20 +130270,26 @@ self: { }) {}; "manifolds" = callPackage - ({ mkDerivation, base, comonad, constrained-categories, containers - , deepseq, free, free-vector-spaces, lens, linear + ({ mkDerivation, base, call-stack, comonad, constrained-categories + , containers, deepseq, free, free-vector-spaces, lens, linear , linearmap-category, manifolds-core, MemoTrie, number-show - , semigroups, tagged, transformers, vector, vector-space, void + , placeholders, pragmatic-show, semigroups, tagged, tasty + , tasty-hunit, tasty-quickcheck, transformers, vector, vector-space + , void }: mkDerivation { pname = "manifolds"; - version = "0.4.1.0"; - sha256 = "1vmgcv0yy72a29w15sg0z3z885vjhfpapgabilqbvh7dpxfv43x1"; + version = "0.4.4.0"; + sha256 = "1wsqar82w0sqspihyvkd9jndw2q6818nci82clqgxb1dawyna5vx"; libraryHaskellDepends = [ - base comonad constrained-categories containers deepseq free - free-vector-spaces lens linear linearmap-category manifolds-core - MemoTrie number-show semigroups tagged transformers vector - vector-space void + base call-stack comonad constrained-categories containers deepseq + free free-vector-spaces lens linear linearmap-category + manifolds-core MemoTrie number-show placeholders pragmatic-show + semigroups tagged transformers vector vector-space void + ]; + testHaskellDepends = [ + base constrained-categories containers lens linearmap-category + pragmatic-show tasty tasty-hunit tasty-quickcheck vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; @@ -130017,15 +130298,16 @@ self: { }) {}; "manifolds-core" = callPackage - ({ mkDerivation, base, tagged, vector-space }: + ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.4.1.0"; - sha256 = "041b4mjrl800vlyg1ibfmmyp87ad2mak6171s2mlc4mwsi4xrl4g"; - libraryHaskellDepends = [ base tagged vector-space ]; + version = "0.4.4.0"; + sha256 = "00b24ry943f6m46wkbxh8452q9xswcn2ri9c511r9bsinhzg653q"; + libraryHaskellDepends = [ base call-stack tagged vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-exts" = callPackage @@ -133119,8 +133401,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.1.0"; - sha256 = "0vfypwp503ab91hca5mmclgxxy0ggzd9g90h7jaj5vxrij7ya5ly"; + version = "0.5.2.0"; + sha256 = "06gx1j9bxzxnagsymgr0nzhs1s6jsr14mhh2qx38h85n5g12zpvb"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base monad-control mtl murmur-hash network random resource-pool @@ -133130,6 +133412,7 @@ self: { base bytestring lens mtl network QuickCheck semigroups tasty tasty-hspec tasty-quickcheck ]; + homepage = "https://github.com/adamflott/milena.git#readme"; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134077,6 +134360,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "modern-uri" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-megaparsec + , megaparsec, profunctors, QuickCheck, template-haskell, text + , weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.1.0.0"; + sha256 = "04k6v2mdkwdwvphfhhm7dwgy12n3kwxi02azkpzng0qa24vb1w1r"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec profunctors QuickCheck template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + homepage = "https://github.com/mrkkrp/modern-uri"; + description = "Modern library for working with URIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -135973,15 +136282,23 @@ self: { }) {}; "monoid-statistics" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, math-functions, QuickCheck, tasty + , tasty-quickcheck, vector, vector-th-unbox + }: mkDerivation { pname = "monoid-statistics"; - version = "0.3.1"; - sha256 = "0gfdjmx457r580lc40vpg8fkzd8n971b5vam96v6kzssg2cznqy3"; - libraryHaskellDepends = [ base ]; - homepage = "https://bitbucket.org/Shimuuar/monoid-statistics"; + version = "1.0.0"; + sha256 = "0n3q8izk197lrkvm6hmdzg7dl1mzji2z09b1wkz02pm4y0gganv3"; + libraryHaskellDepends = [ + base math-functions vector vector-th-unbox + ]; + testHaskellDepends = [ + base math-functions QuickCheck tasty tasty-quickcheck + ]; + homepage = "https://github.com/Shimuuar/monoid-statistics"; description = "Monoids for calculation of statistics of sample"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-subclasses" = callPackage @@ -136343,6 +136660,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "motor" = callPackage + ({ mkDerivation, base, CTRex, indexed, indexed-extras, reflection + }: + mkDerivation { + pname = "motor"; + version = "0.1.0.0"; + sha256 = "00jr7dlnm22cvjwprclizcbm4kw2i84zzzd7n6im9li00w1a2iwy"; + libraryHaskellDepends = [ + base CTRex indexed indexed-extras reflection + ]; + testHaskellDepends = [ base CTRex indexed indexed-extras ]; + description = "Type-safe effectful state machines in Haskell"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mount" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -141433,8 +141766,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.9.0.0"; - sha256 = "099q24f9879sdwqa0jnlsamvpz1jbyryn90w7jp7np68avbhv9bf"; + version = "0.9.1.2"; + sha256 = "1428pkzj7kam7ya21fb3qchq95lvp6dp9dnh5qj41nkw9x5dz517"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -141490,8 +141823,8 @@ self: { }: mkDerivation { pname = "nice-html"; - version = "0.2.0"; - sha256 = "0lkqqfp6x3w9lxh1jgm6c07pyfz1yr7drkr15s1m9vwvdh7mj24v"; + version = "0.3.0"; + sha256 = "1ns6qrzm9lwbgjcr7mw58g0qivbqac4yxisvbfy9j2cq3dqzm6d3"; libraryHaskellDepends = [ base bifunctors blaze-markup bytestring data-default-class deepseq free recursion-schemes template-haskell text transformers vector @@ -142663,6 +142996,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "numbered-semigroups" = callPackage + ({ mkDerivation, base, call-stack, semigroups }: + mkDerivation { + pname = "numbered-semigroups"; + version = "0.1.0.0"; + sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2"; + libraryHaskellDepends = [ base call-stack semigroups ]; + homepage = "https://github.com/leftaroundabout/numbered-semigroups"; + description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "numbering" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -143435,6 +143780,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "octane_0_20_3" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers + , data-default-class, file-embed, http-client, http-client-tls + , overloaded-records, rattletrap, text + }: + mkDerivation { + pname = "octane"; + version = "0.20.3"; + sha256 = "0rjvl7f3sa8i7a1svhh4phc2r2zjjwi1p3cajnwzms7kasmcqfjp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed overloaded-records rattletrap text + ]; + executableHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed http-client http-client-tls overloaded-records + rattletrap text + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -146472,6 +146843,54 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_0_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , binary, blaze-html, blaze-markup, bytestring, Cabal + , case-insensitive, cmark-gfm, containers, criterion, data-default + , deepseq, Diff, directory, doctemplates, executable-path, filepath + , Glob, haddock-library, hslua, HTTP, http-client, http-client-tls + , http-types, JuicyPixels, mtl, network, network-uri, pandoc-types + , parsec, process, QuickCheck, random, safe, scientific, SHA + , skylighting, split, syb, tagsoup, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, temporary, texmath, text, time + , unix, unordered-containers, vector, xml, yaml, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.0.0.1"; + sha256 = "1wq21vsg9afv8lxk6rmmmb57437q7gv1qs4ymbzd1mvxkvzx0hwh"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring binary blaze-html + blaze-markup bytestring case-insensitive cmark-gfm containers + data-default deepseq directory doctemplates filepath Glob + haddock-library hslua HTTP http-client http-client-tls http-types + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting split syb tagsoup temporary + texmath text time unix unordered-containers vector xml yaml + zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory executable-path filepath + hslua pandoc-types process QuickCheck tasty tasty-golden + tasty-hunit tasty-quickcheck temporary text zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion text time + ]; + doCheck = false; + homepage = "http://pandoc.org"; + description = "Conversion between markup formats"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -146510,20 +146929,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_11_1_1" = callPackage + "pandoc-citeproc_0_11_1_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , Cabal, containers, data-default, directory, filepath, hs-bibutils + , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 , setenv, split, syb, tagsoup, temporary, text, time , unordered-containers, vector, xml-conduit, yaml }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.11.1.1"; - sha256 = "00732amji7xlrkxzlwc5rzkq6saxjlvwlvinhkw4hyh1w0d74qwj"; + version = "0.11.1.2"; + sha256 = "0lv1j035f5c0dd0n772ivav6kwzfxvnk6zcxmmhmkc3s9r9716sd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson base bytestring containers data-default directory filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 @@ -146769,8 +147189,8 @@ self: { }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.1.0.1"; - sha256 = "1lzjia4fl2s6aak00cb79sq5n85wyfcdn5xjanl7x9xr07rv2641"; + version = "0.1.1.0"; + sha256 = "0blgccnzyignq14y94cnascjxlk6088wwpxifwm45rnn0hs786vf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147543,6 +147963,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "parameterized" = callPackage + ({ mkDerivation, base, data-diverse, hspec, transformers }: + mkDerivation { + pname = "parameterized"; + version = "0.2.0.0"; + sha256 = "0z40b6cja2c4y177w6iwg8dijlpk5zwrf5yfwppc5y6n57g260z7"; + libraryHaskellDepends = [ base data-diverse transformers ]; + testHaskellDepends = [ base data-diverse hspec transformers ]; + homepage = "https://github.com/louispan/parameterized#readme"; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parameterized-data" = callPackage ({ mkDerivation, base, template-haskell, type-level }: mkDerivation { @@ -148212,13 +148646,13 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, hedgehog }: + ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.2.0.1"; - sha256 = "0k3b66wlhi280wk3q5ilmcn93m4rch1ily8f3z79lpxjjlraz7lw"; + version = "0.3.0.2"; + sha256 = "0r2rhcq73lb18j03h5nk7j6vzv9qxjnw8zsir3zy6cynkv4w35zd"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog ]; + testHaskellDepends = [ base doctest hedgehog ]; homepage = "https://github.com/chris-martin/partial-semigroup"; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; @@ -148228,8 +148662,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.2.0.1"; - sha256 = "1c4rbf1x6llgprx0rgil71z3306ky9x59sl8db1z6hg9ykriv4n2"; + version = "0.3.0.1"; + sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; homepage = "https://github.com/chris-martin/partial-semigroup"; description = "Property testing for partial semigroups using Hedgehog"; @@ -148240,8 +148674,8 @@ self: { ({ mkDerivation, partial-semigroup-hedgehog }: mkDerivation { pname = "partial-semigroup-test"; - version = "0.2.0.1"; - sha256 = "1cdlwjq7bbbq7yz5flzjkj0kp5s991nwsjq52xiqhmlzbim598s4"; + version = "0.3.0.1"; + sha256 = "006dlck7dr1xs2wwd233bm87mf619dlwnb66xlcfp82ksdmnfl6n"; libraryHaskellDepends = [ partial-semigroup-hedgehog ]; doHaddock = false; homepage = "https://github.com/chris-martin/partial-semigroup"; @@ -149855,8 +150289,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.7.0"; - sha256 = "1snywd1qaj572m0nqdadqm9i86n0mhz8gcwwnaf35kk2sd8lvg6f"; + version = "2.7.1"; + sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger http-api-data @@ -150042,8 +150476,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.6.1"; - sha256 = "0i1a7xmspgxzlwi1z9jyh5ckjx16yba1xs289vh2id9400yh8c57"; + version = "2.6.2.1"; + sha256 = "0rk3rplz8y0b9macvb19w7m7ljnkq4gkmrjrdqdqcpga6ih357ik"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent @@ -150079,7 +150513,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql-haskell_0_3_4_1" = callPackage + "persistent-mysql-haskell_0_3_5" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-control, monad-logger, mysql-haskell, network , persistent, persistent-template, resource-pool, resourcet, text @@ -150087,8 +150521,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.4.1"; - sha256 = "0w80z2098rh3svxncyaa4jrqdcdgzrfrzq4p981g34cs7kysfmn2"; + version = "0.3.5"; + sha256 = "0sc6hw112d8jk1rflyrmcc8gkjddl41bbw6hksyv7a5w6sc7z33n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150147,8 +150581,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.6.1"; - sha256 = "0w7qssz4avq82vzs40kf82gkjdkcxqbkrfq6kz39x9m3za9b9pqc"; + version = "2.6.2"; + sha256 = "0140cki5c5aj21qg2cvqm5a511l6n4zbx3vb94hpfr1bs9nmfjam"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -150261,8 +150695,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.6.2"; - sha256 = "1gw5p531187dqchi7384q3irh9n8p7prs172zpq9r1l1ziqw8dk1"; + version = "2.6.3"; + sha256 = "0wgj8v6wkqvj60klmxlmhgmbl6yp3i425v95p8s45wm96phpzn9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151252,32 +151686,6 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.12.5"; - sha256 = "1gvq7slby26cm62203gh13s4blwphiy0chdhkp3vl4k3gjlbslam"; - libraryHaskellDepends = [ - aeson base bytestring containers http-client http-client-tls - http-types monad-logger mtl network profunctors random - safe-exceptions text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec mtl QuickCheck - safe-exceptions semigroups text time transformers - unordered-containers - ]; - homepage = "https://github.com/jonschoning/pinboard"; - description = "Access to the Pinboard API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pinboard_0_9_12_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec - , http-client, http-client-tls, http-types, monad-logger, mtl - , network, profunctors, QuickCheck, random, safe-exceptions - , semigroups, text, time, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "pinboard"; version = "0.9.12.6"; sha256 = "0z5sfgvbckd636hi1girlfpfz2v21xydzi3d1py3q6hyq34b67iq"; libraryHaskellDepends = [ @@ -151293,7 +151701,6 @@ self: { homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinch" = callPackage @@ -154938,6 +155345,8 @@ self: { pname = "postgresql-typed"; version = "0.5.1"; sha256 = "0bvrbbzqjvzsm0bqinvbcz897fzf1isg76mk3hniyf8l9a19a3wv"; + revision = "1"; + editedCabalFile = "047bjdwgg94gbpzcapar46vw33n4g8gx639ns9i4d32105w32f0r"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite haskell-src-meta HDBC memory network old-locale postgresql-binary @@ -155053,6 +155462,7 @@ self: { homepage = "https://github.com/diogob/postgrest-ws#readme"; description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postie" = callPackage @@ -155084,8 +155494,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.2.1"; - sha256 = "1afy3yra89909vilwr36j8vrvkhsy1xcp1jcvrdj90bj93rq64v3"; + version = "0.2.2"; + sha256 = "043q69v629r6y8ljij8nmfjz4qs3181278wrnlfgagfahh98pg0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156640,14 +157050,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_1_0" = callPackage + "process_1_6_2_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.1.0"; - sha256 = "0lwaa9qfh1x8zgmq7panhsvrs1nwcc1fficcg391dxp995ga4pr4"; + version = "1.6.2.0"; + sha256 = "0gsyzwvid2w1z5m0w492sqb8q8c86q9wa7iqjadcdhbv8ag9z6xm"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -157529,8 +157939,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.8.1"; - sha256 = "14q1zd6bvrfcs21pklxd6wgiqpb92v0464k4zhq9l31v4k2p5zpk"; + version = "4.9.0"; + sha256 = "1pciifl4hm5bmdx2li4hj3cm41ffj7s23r4ivkr8x3zghmik3n88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157953,8 +158363,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.4"; - sha256 = "1qlkilnxfx5grim0hxf7drg2m48z76f88d4r61sy71npybf3mqnv"; + version = "2.4.5"; + sha256 = "1dcyv89z3869zd43wkby7xrzb1gz1iy2jrdr7yk45q2d1i63ssh4"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -157968,8 +158378,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.4"; - sha256 = "0jr1clff6vn8lpx2rbc72angn0glc2v18ji5lqgzijri8zya9nqj"; + version = "2.4.5"; + sha256 = "0rz1v9iab012sc2m45yvmag94xg64gjrw0pqddp8gvw67i5lfan3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -158298,6 +158708,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ptr" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, contravariant + , mtl, profunctors, quickcheck-instances, rerebase, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "ptr"; + version = "0.15.3"; + sha256 = "1h66bk595nv0jmcxdzfzvpr7ymfm6hl3n4bnglwlwkp2y1ymm3i3"; + libraryHaskellDepends = [ + base base-prelude bug bytestring contravariant mtl profunctors + semigroups text transformers + ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/ptr"; + description = "Abstractions for operations on pointers"; + license = stdenv.lib.licenses.mit; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes , pipes-bytestring, text @@ -158846,8 +159278,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.11.1.0"; - sha256 = "0syx11yzan1m86skjlxwv17ickplbiamkhbf2xsif0w0216whbvx"; + version = "0.11.1.1"; + sha256 = "023j88q724l38zqry6v916na1hlqhcinb5pw3cqssmql0cf32ajh"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -159060,7 +159492,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_1_5_0_0" = callPackage + "pusher-http-haskell_1_5_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , containers, cryptonite, hashable, hspec, HTTP, http-client , http-types, memory, network-uri, QuickCheck, scientific, text @@ -159068,8 +159500,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.0.0"; - sha256 = "098vj92gwzspqp0xbd4dxxb3dggpdz5gpf616p2spkj9xvdqgy17"; + version = "1.5.0.1"; + sha256 = "08fgyvm1lp1yr9p9a6fr111x78rlzhr02gbsd6q6hjxnlffya4vf"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring containers cryptonite hashable HTTP http-client http-types memory text time transformers @@ -160866,8 +161298,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.8.0"; - sha256 = "04pc3zy09hg7p9w54ffwvfcby3341vbpzlv2d9ma2q9py0ymx6d5"; + version = "0.9.0"; + sha256 = "142c2qra8080yndj2y0m0bdrqmf8l6r0z43pj1icdvjqj9451j16"; libraryHaskellDepends = [ base containers lens parsec ]; testHaskellDepends = [ base Cabal containers hspec lens parsec QuickCheck @@ -160895,13 +161327,15 @@ self: { }) {}; "radius" = callPackage - ({ mkDerivation, base, binary, bytestring, iproute, pretty-hex }: + ({ mkDerivation, base, binary, bytestring, cryptonite, iproute + , memory + }: mkDerivation { pname = "radius"; - version = "0.2.0.0"; - sha256 = "1arch1d93yijbm7r9a9ggjj7wzy7rk0immj5g8frczrbp0xpgmzy"; + version = "0.4.0.0"; + sha256 = "0bdixglg4yy5n6chw0n5mpk563dbkhh7iyzrmp9q2vpzxxvvdi06"; libraryHaskellDepends = [ - base binary bytestring iproute pretty-hex + base binary bytestring cryptonite iproute memory ]; homepage = "https://github.com/erickg/radius#readme"; description = "Remote Authentication Dial In User Service (RADIUS)"; @@ -161142,8 +161576,8 @@ self: { }: mkDerivation { pname = "rakuten"; - version = "0.1.0.0"; - sha256 = "18gasv78zq8l51kpwvx6gc089day6pmlz2f43vrfichqbivahmhf"; + version = "0.1.0.1"; + sha256 = "1y9kyipmhhy5f0f7v805a17x7g938vkvxnzj9n4h9rlprpdbdczc"; libraryHaskellDepends = [ aeson base bytestring connection constraints data-default-class extensible http-api-data http-client http-client-tls http-types @@ -161994,25 +162428,6 @@ self: { }: mkDerivation { pname = "ratel"; - version = "0.3.5"; - sha256 = "0mw59q5wbj5mbhznqd4szc5ps7d1r7gf490vdjqfblb5sqncy510"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ base filepath tasty tasty-hspec ]; - homepage = "https://github.com/tfausak/ratel#readme"; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel_0_3_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, http-client, http-client-tls, http-types - , tasty, tasty-hspec, text, uuid - }: - mkDerivation { - pname = "ratel"; version = "0.3.6"; sha256 = "04d93i7044zpax9hhx1xyipc8lliyn5z1xgq7k0011yzdsd8w31s"; libraryHaskellDepends = [ @@ -162023,7 +162438,6 @@ self: { homepage = "https://github.com/tfausak/ratel#readme"; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ratel-wai" = callPackage @@ -164068,15 +164482,18 @@ self: { }) {}; "reflex-sdl2" = callPackage - ({ mkDerivation, base, dependent-sum, mtl, ref-tf, reflex, sdl2 }: + ({ mkDerivation, async, base, containers, dependent-sum + , exception-transformers, mtl, primitive, ref-tf, reflex, sdl2, stm + }: mkDerivation { pname = "reflex-sdl2"; - version = "0.1.0.0"; - sha256 = "1k18lb7aa440i76yd6x4bh3sz6wsqv1cq1l93wpac1673bvxicll"; + version = "0.2.0.0"; + sha256 = "1aqcmj9gv1dhm8vqykawphk41fi24k4k061ynvfnpdypakldlvvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dependent-sum mtl ref-tf reflex sdl2 + async base containers dependent-sum exception-transformers mtl + primitive ref-tf reflex sdl2 stm ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/schell/reflex-sdl2#readme"; @@ -165271,13 +165688,13 @@ self: { "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 - , persistable-record, relational-query, relational-query-HDBC - , relational-schemas, template-haskell, time + , persistable-record, product-isomorphic, relational-query + , relational-query-HDBC, relational-schemas, template-haskell, time }: mkDerivation { pname = "relational-record-examples"; - version = "0.3.2.1"; - sha256 = "1y0bxg2sgrq72wpa1llymhn3kbks7krnsh0qzqd1cqni01g6q8hv"; + version = "0.4.0.0"; + sha256 = "0ch075l87sxxgmvis6hnrpc72lr0v21nx0xhw0ahpirqbw01ndqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165286,10 +165703,11 @@ self: { template-haskell ]; executableHaskellDepends = [ - base relational-query template-haskell time + base product-isomorphic relational-query template-haskell time ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -166260,8 +166678,8 @@ self: { pname = "req-conduit"; version = "0.2.1"; sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c"; - revision = "1"; - editedCabalFile = "0pz1pz7l06c6g0d6ripgb8yn5kz5zryzjhabnx93d89qix0dzkg3"; + revision = "2"; + editedCabalFile = "1r7qfg670gdncb9yszgg4dw5x8az17cfgbkpbnb7zjdy7rqrj442"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -166418,15 +166836,14 @@ self: { }: mkDerivation { pname = "resolv"; - version = "0.1.1.0"; - sha256 = "03k0r57q93y3iv3g62zpjhh5a647v3g9imn3z9jr1vnj5gracyh5"; + version = "0.1.1.1"; + sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; testHaskellDepends = [ base bytestring directory filepath tasty tasty-hunit ]; - homepage = "http://github.com/hvr/resolv"; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -167012,8 +167429,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.7.4.2"; - sha256 = "0z5ls9z5zcqkk3vbpl4wdgspi98n19m5i8mfian1fyxkf0jkj6sj"; + version = "0.7.4.3"; + sha256 = "0i47gmlljz00fwf2qwkrh24hgsyw5sz2npaighx4wxvykf00d390"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; @@ -167243,8 +167660,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.1.0.0"; - sha256 = "1gjz5i7a00kq48fkg7ms3qr04jzg8mw5vb3lgn1pflp45m4p95vi"; + version = "0.1.1.0"; + sha256 = "1vl7hnnb2bmrzaf4231pq9rvn8l7y2y3x5g6b1ry77rb45bzspkq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167253,6 +167670,7 @@ self: { executableHaskellDepends = [ base ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rhythm-game-tutorial" = callPackage @@ -168179,6 +168597,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rose-trees_0_0_4_4" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hashable + , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups + , sets, tasty, tasty-quickcheck, unordered-containers, witherable + }: + mkDerivation { + pname = "rose-trees"; + version = "0.0.4.4"; + sha256 = "1kbjkfknl2pyp30n5c6m6xavqlm8zg06w78b3x7iwvi854yi64r3"; + libraryHaskellDepends = [ + base containers deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets + unordered-containers witherable + ]; + testHaskellDepends = [ + base containers deepseq hashable QuickCheck quickcheck-instances + semigroupoids semigroups sets tasty tasty-quickcheck + unordered-containers witherable + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets + unordered-containers witherable + ]; + description = "A collection of rose tree structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rose-trie" = callPackage ({ mkDerivation, base, containers, deepseq, minilens, mtl , transformers @@ -169607,6 +170054,7 @@ self: { homepage = "https://github.com/kccqzy/haskell-sajson#readme"; description = "Fast JSON parsing powered by Chad Austin's sajson library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "saltine" = callPackage @@ -170186,13 +170634,13 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck , template-haskell, text, unordered-containers, yaml }: mkDerivation { pname = "sbp"; - version = "2.2.12"; - sha256 = "14c188bn883nd5nngvydx6aj8z7x1cgjgsl41l8a6hsiwjx721l0"; + version = "2.2.15"; + sha256 = "02y9mvy2ij1kdn06wgdpn5y5f4wa814lj4krvfsjyc2g9am06y83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170202,7 +170650,7 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra yaml + conduit-extra resourcet yaml ]; testHaskellDepends = [ aeson base base64-bytestring basic-prelude bytestring QuickCheck @@ -171651,7 +172099,7 @@ self: { executableHaskellDepends = [ base data-default-class sdl2 vector ]; description = "Bindings to SDL2_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-ttf" = callPackage @@ -172560,15 +173008,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sensu-run_0_4_0" = callPackage + "sensu-run_0_4_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client , http-types, lens, network, optparse-applicative, process , temporary, text, time, unix, unix-compat, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.4.0"; - sha256 = "0wsrm7l12yfm89yfd5y1w8xypfg29d2s1afy7m8dpcdypmrxrghw"; + version = "0.4.0.1"; + sha256 = "05vmrbf3hk26ya5rvhadc8q1qb932x2n0x153bhafbf60yzc4bc5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173211,6 +173659,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-cookie_0_5_0_6" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring + , cereal, cookie, criterion, cryptonite, data-default, deepseq + , exceptions, hspec, http-api-data, http-types, memory, mtl + , QuickCheck, servant, servant-server, tagged, time, transformers + , wai + }: + mkDerivation { + pname = "servant-auth-cookie"; + version = "0.5.0.6"; + sha256 = "1bxvgf71710jzs0k83bz4rdj7zsagmwpsqv96invw8d7shipg650"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder bytestring cereal cookie + cryptonite data-default exceptions http-api-data http-types memory + mtl servant servant-server tagged time transformers wai + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default deepseq hspec + QuickCheck servant-server time transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite servant-server + ]; + description = "Authentication via encrypted cookies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-docs" = callPackage ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck , servant, servant-auth, servant-docs, text, yaml @@ -173505,6 +173983,8 @@ self: { pname = "servant-checked-exceptions"; version = "0.4.1.0"; sha256 = "19h0vywlh6b41mdjpka4b7rz4l6gxmjlvji8nzbgkllsjgr81g3g"; + revision = "1"; + editedCabalFile = "07srldxvgzgzxq5dik787ays7xylwsdmz8bv3ffvp435nvvpmrzr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173538,8 +174018,8 @@ self: { pname = "servant-client"; version = "0.11"; sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga"; - revision = "1"; - editedCabalFile = "0ymiqsn6451znpn524w1wn129plnqbplbvwxwjpp1drz3ab6xk6b"; + revision = "2"; + editedCabalFile = "0w3b3036rv9vfya5ayn9z70rkwk7hd9zisl7klgxzk4fgfmc3sgd"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring exceptions generics-sop http-api-data http-client http-client-tls @@ -173915,6 +174395,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-kotlin" = callPackage + ({ mkDerivation, aeson, base, containers, directory, formatting + , hspec, http-api-data, lens, servant, servant-foreign, shelly + , text, time, wl-pprint-text + }: + mkDerivation { + pname = "servant-kotlin"; + version = "0.1.0.0"; + sha256 = "0rsy8bmycmgxpnimaly08shlaqmna084bdgcxxs3ad0kicc427r1"; + libraryHaskellDepends = [ + base containers directory formatting lens servant servant-foreign + text time wl-pprint-text + ]; + testHaskellDepends = [ + aeson base containers directory formatting hspec http-api-data lens + servant servant-foreign text time wl-pprint-text + ]; + benchmarkHaskellDepends = [ + aeson base containers directory formatting http-api-data lens + servant servant-foreign shelly text time wl-pprint-text + ]; + homepage = "https://github.com/matsubara0507/servant-kotlin#readme"; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { @@ -173959,8 +174465,8 @@ self: { pname = "servant-mock"; version = "0.8.2"; sha256 = "146z4n7ayg0347kabwdz1crha7ilfdcdx3pazdgsmq2bl8mwad3w"; - revision = "1"; - editedCabalFile = "19vvzy09wj0yxjz4sv417c45h1n34nd7zc9n8agxavr3wyi9lihh"; + revision = "2"; + editedCabalFile = "16zbbjz7rj7fg6qs8zjy9arz7bwza9pq1gn15csnsvm5n6qnpgal"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174347,10 +174853,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.11"; - sha256 = "1c821ia2741v7nxbv651hcj21dmcqnqf4ix198is5b63sj4ff3ib"; - revision = "1"; - editedCabalFile = "04s8kzc1jzarxg68nqgdckv0ajw846a1byqjksgzlqlmfqm0l32l"; + version = "0.11.0.1"; + sha256 = "0yrcs1ixy7mzifdyssi58m34xn95mfy9zxbkm9k5z6svqnv1qp72"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -174557,10 +175061,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.2.4.3.0.20"; - sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn"; - revision = "1"; - editedCabalFile = "1wsbb9zaq5qv39hrymy1cma581337rbvqlm7y24jwfvk4vafs3fp"; + version = "0.2.4.3.4.0"; + sha256 = "1vb1bp7hjjyhb1p6x0j7z2ky05n72qm7zcmwgnsmnqalaxdnsvri"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -174912,25 +175414,6 @@ self: { }: mkDerivation { pname = "servius"; - version = "1.2.0.2"; - sha256 = "0asxkdg7csxmnpzw672jazynhnnc73ddpay65npql0jz93mq45n1"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base blaze-builder blaze-html bytestring http-types markdown - shakespeare text wai wai-app-static - ]; - homepage = "http://github.com/snoyberg/servius#readme"; - description = "Warp web server with template rendering"; - license = stdenv.lib.licenses.mit; - }) {}; - - "servius_1_2_0_3" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, bytestring - , http-types, markdown, shakespeare, text, wai, wai-app-static - }: - mkDerivation { - pname = "servius"; version = "1.2.0.3"; sha256 = "1w330lvkikbsv92g398kmnlw71wym6l080d8xsdfdx2wwl0iyqj7"; isLibrary = false; @@ -174942,7 +175425,6 @@ self: { homepage = "http://github.com/snoyberg/servius#readme"; description = "Warp web server with template rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html" = callPackage @@ -175334,8 +175816,8 @@ self: { }: mkDerivation { pname = "sext"; - version = "0.1.3"; - sha256 = "0z6a4ghv5knfcwv28bax4gny5za0k0y076d15bnk01qg293w273b"; + version = "0.1.3.1"; + sha256 = "0836faqrrb9wsw5hlm82587isw6rkn4v8i6dh9hzxsqif1izd363"; libraryHaskellDepends = [ base bytestring template-haskell text vector ]; @@ -177753,18 +178235,18 @@ self: { }) {}; "simplessh" = callPackage - ({ mkDerivation, base, bytestring, mtl, ssh2 }: + ({ mkDerivation, base, bytestring, libssh2, mtl }: mkDerivation { pname = "simplessh"; version = "0.2.0.5"; sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq"; libraryHaskellDepends = [ base bytestring mtl ]; - librarySystemDepends = [ ssh2 ]; + librarySystemDepends = [ libssh2 ]; homepage = "http://hub.darcs.net/thoferon/simplessh"; description = "Simple wrapper around libssh2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {ssh2 = null;}; + }) {inherit (pkgs) libssh2;}; "simplest-sqlite" = callPackage ({ mkDerivation, base, bytestring, exception-hierarchy, sqlite @@ -178391,7 +178873,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4_1" = callPackage + "skylighting_0_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -178400,8 +178882,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4.1"; - sha256 = "0dsngs2nw2ijhxxwa8d7fb9rxgqz6kgimbsvxmhpd5s4y6a1ygf4"; + version = "0.4.2"; + sha256 = "0szhhmjz14wq1ica3gl6nj5fh85fwh55xyywlq8q3dq8isl1hcz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180202,17 +180684,26 @@ self: { }) {}; "snaplet-redis" = callPackage - ({ mkDerivation, base, configurator, hedis, lens, mtl, network - , snap, text, transformers + ({ mkDerivation, aeson, base, bytestring, cereal, clientsession + , configurator, hedis, heist, lens, monad-control, mtl, network + , snap, snap-core, snap-server, text, time, transformers + , unordered-containers, xmlhtml }: mkDerivation { pname = "snaplet-redis"; - version = "0.1.4.2"; - sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh"; + version = "0.1.5"; + sha256 = "12c4pgh2axnvd7hnyf0xpnsidfss39siys3nzwafdmm0p5wf67bx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base configurator hedis lens mtl network snap text transformers + base bytestring cereal clientsession configurator hedis lens mtl + network snap snap-core text time transformers unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring hedis heist lens monad-control mtl snap + snap-core snap-server text time xmlhtml ]; - homepage = "https://github.com/dzhus/snaplet-redis/"; + homepage = "https://github.com/dzhus/snaplet-redis#readme"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -187034,6 +187525,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "substring-parser" = callPackage + ({ mkDerivation, attoparsec, base, hspec, NoTrace, text }: + mkDerivation { + pname = "substring-parser"; + version = "0.1.0.0"; + sha256 = "0f4rbfpdhbnpk4gm4rsavblqdabxlqbf58xr9rvjcxq62hac6lvc"; + libraryHaskellDepends = [ attoparsec base NoTrace text ]; + testHaskellDepends = [ attoparsec base hspec NoTrace text ]; + homepage = "https://gitlab.com/igrep/substring-parser"; + description = "Match / replace substrings with a parser combinators"; + license = stdenv.lib.licenses.asl20; + }) {}; + "subtitleParser" = callPackage ({ mkDerivation, attoparsec, base, containers, text }: mkDerivation { @@ -187736,8 +188240,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.4"; - sha256 = "177aipxcycs79kh5vdkgq5rj8n0mixy374mxaggfp959i28rx164"; + version = "0.0.1.5"; + sha256 = "0fpviny6yxrmdhraan3ffhgwynn1lj88xdj093jf4229ysj0cskk"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -192212,6 +192716,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-fixture_0_5_1_0" = callPackage + ({ mkDerivation, base, data-default-class, exceptions + , haskell-src-exts, haskell-src-meta, hspec, hspec-discover, mtl + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "test-fixture"; + version = "0.5.1.0"; + sha256 = "1mjy7nx2w7gvsibvc5vl21hr8ypxd4qdiy46iagnfij1k3kdh6wv"; + libraryHaskellDepends = [ + base data-default-class exceptions haskell-src-exts + haskell-src-meta mtl template-haskell th-orphans + ]; + testHaskellDepends = [ + base hspec hspec-discover mtl template-haskell transformers + ]; + homepage = "http://github.com/cjdev/test-fixture#readme"; + description = "Test monadic side-effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "test-framework" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers , hostname, old-locale, random, regex-posix, time, xml @@ -192578,13 +193104,18 @@ self: { }) {}; "testCom" = callPackage - ({ mkDerivation, base, haskell-src-meta, template-haskell }: + ({ mkDerivation, base, haskell-src-meta, random, template-haskell + }: mkDerivation { pname = "testCom"; - version = "0.2.0"; - sha256 = "1gp8ylpp6315srcr1pi78a9f6kr24kp5dyfml9yibj35qd6wdil2"; - libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; - testHaskellDepends = [ base haskell-src-meta template-haskell ]; + version = "0.3.0"; + sha256 = "0j9mh47jq6igh5xkalgbrvjrvjsnyl7ir6jq7kr9rhh7rab4m7h1"; + libraryHaskellDepends = [ + base haskell-src-meta random template-haskell + ]; + testHaskellDepends = [ + base haskell-src-meta random template-haskell + ]; description = "Write your tests in comments"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -192989,8 +193520,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.4.0"; - sha256 = "1kmiksxzvd99d762n4vgrx90awsdy0s3gm1a5s73r9yd79pajq5n"; + version = "0.1.5.0"; + sha256 = "127h2pw3p9ixx34jiql9kgpjbjmkmwigm56iklaz6wxd69zr0sfx"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -194359,8 +194890,8 @@ self: { }: mkDerivation { pname = "thank-you-stars"; - version = "0.1.0"; - sha256 = "1qxi26g81ndrx8vxckb8hkpaqqpbd60r2ck705mhafrv0yd3kry7"; + version = "0.2.0"; + sha256 = "0a1mv7k7m4yaadfrmb45s09aa5zy0wd2jccjsyqhp63v89m58z8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194368,7 +194899,9 @@ self: { hackage-db req split text ]; executableHaskellDepends = [ base containers directory filepath ]; - testHaskellDepends = [ base Cabal containers hackage-db hspec ]; + testHaskellDepends = [ + base Cabal containers directory filepath hspec + ]; homepage = "https://github.com/y-taka-23/thank-you-stars#readme"; description = "Give your dependencies stars on GitHub!"; license = stdenv.lib.licenses.bsd3; @@ -194620,8 +195153,8 @@ self: { }: mkDerivation { pname = "thread-hierarchy"; - version = "0.1.0.2"; - sha256 = "1fhbwzx8shf2ph9l5mkrlz40dxdzn02rvjgz9l2kvjmi8v5rclxk"; + version = "0.1.0.3"; + sha256 = "1j5caivjcvrmfqgl13lhlx9dq81kka64w96ykb0bfb089kwi0j9f"; libraryHaskellDepends = [ base containers lifted-base monad-control transformers-base ]; @@ -194808,22 +195341,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "threepenny-editors_0_5_5" = callPackage + "threepenny-editors_0_5_6" = callPackage ({ mkDerivation, base, bifunctors, casing, containers, generics-sop - , profunctors, threepenny-gui + , profunctors, text, threepenny-gui }: mkDerivation { pname = "threepenny-editors"; - version = "0.5.5"; - sha256 = "1gblkdkmkngry2fncjv4l7f3q614rw4p25cskf850kjgvcvm04fj"; + version = "0.5.6"; + sha256 = "0gnbzf3a3xykkf8xc5bnn1wznszyrnllf5s6cb4gqz6cbqnf2mnw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors + base bifunctors casing containers generics-sop profunctors text threepenny-gui ]; executableHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors + base bifunctors casing containers generics-sop profunctors text threepenny-gui ]; homepage = "https://github.com/pepeiborra/threepenny-editors"; @@ -195350,8 +195883,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "tile"; - version = "0.1.0.0"; - sha256 = "1j952m67spr4v7g3i8lpa9cn79rlmb8ybbg9hw2yswcijpq52fyb"; + version = "0.3.0.0"; + sha256 = "1w35rhrpjs39xbcg2i635jxdkbp4nhkzrrnl9p3bz85yc1iiiv8m"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/caneroj1/tile#readme"; @@ -196417,8 +196950,8 @@ self: { ({ mkDerivation, base, containers, HUnit, network-uri, text }: mkDerivation { pname = "tld"; - version = "0.3.0.1"; - sha256 = "0rfzcwaj9fyhrc8vswjjnqdj4bi7jln2lq38pcvnkl5zwx7kqhxa"; + version = "0.3.0.2"; + sha256 = "1snw5cdkyqyninqqqwa6qfndfmwfr4lkdg0v94267g7xbwcqjj8h"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; @@ -196969,8 +197502,8 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.14"; - sha256 = "1zms4vigyy29c3wmjh6zmhjlmvj3x98dx99mdpxws6sxl0wibfcv"; + version = "0.1.0.17"; + sha256 = "0yfy0453j3s5sskz529rd50dbjxhr411a4g5803dsw06kibij05s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -199153,25 +199686,24 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion - , data-default, directory, extra, hspec, htoml, http-client - , http-client-tls, http-types, lens, megaparsec - , optparse-applicative, QuickCheck, split, text - , unordered-containers + , data-default, directory, extra, hspec, htoml-megaparsec + , http-client, http-client-tls, http-types, lens, megaparsec + , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.9"; - sha256 = "1s9gg1247xa2rl30s9i4rza04107s7awrx7pbmd4vc436mv4624z"; + version = "1.0.1.21"; + sha256 = "0m35d2ym83d3c0k2imjr9ws2nai6yhm784is9k1g6xrbazd947gr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring - composition-prelude containers data-default directory extra htoml - http-client http-client-tls http-types lens megaparsec - optparse-applicative split text unordered-containers + composition-prelude containers data-default directory extra + htoml-megaparsec http-client http-client-tls http-types lens + megaparsec optparse-applicative split text unordered-containers ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base bytestring hspec QuickCheck ]; + testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; @@ -200199,17 +200731,19 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion, ghc-prim - , hspec, QuickCheck, text + ({ mkDerivation, base, blaze-html, bytestring, criterion + , double-conversion, ghc-prim, hspec, QuickCheck, text }: mkDerivation { pname = "type-of-html"; - version = "1.0.0.0"; - sha256 = "0yknmw9xfi0pdg0ps2wg966i5k9y3nrqr38srj4lifng9bcgahx0"; - libraryHaskellDepends = [ base bytestring ghc-prim text ]; - testHaskellDepends = [ base hspec QuickCheck text ]; + version = "1.0.1.1"; + sha256 = "1fc8pqkvmrcvh3wayykqbc0ha336x77xq0hbzym9bknzr1xpy56n"; + libraryHaskellDepends = [ + base bytestring double-conversion ghc-prim text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ - base blaze-html bytestring criterion text + base blaze-html bytestring criterion QuickCheck text ]; homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; @@ -200525,6 +201059,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typedflow" = callPackage + ({ mkDerivation, base, ghc-typelits-knownnat, mtl, pretty-compact + }: + mkDerivation { + pname = "typedflow"; + version = "0.9"; + sha256 = "0hanh2gww0i4a8dkq1kxizni8qgk5mzj6qkvz9k1yvprpx2kym8c"; + libraryHaskellDepends = [ + base ghc-typelits-knownnat mtl pretty-compact + ]; + description = "Typed frontend to TensorFlow and higher-order deep learning"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "typedquery" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-meta, parsec , template-haskell, text, transformers @@ -200848,8 +201396,8 @@ self: { }: mkDerivation { pname = "ua-parser"; - version = "0.7.4"; - sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i"; + version = "0.7.4.1"; + sha256 = "1pwls2qbhd3ig2lm4ix3kh08yw20k0iajigbxqd0vmpkx459pmrf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring data-default file-embed pcre-light text yaml @@ -202193,21 +202741,26 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, exceptions - , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe - , safe-exceptions, stm, text, text-format, transformers - , type-operators, unordered-containers, utf8-string, vector + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl + , safe, safe-exceptions, semigroups, stm, text, text-format + , transformers, type-operators, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "universum"; - version = "0.7.0"; - sha256 = "1d2887l2g8f9scpwcrvlxk0dm8w9d7qnlpbfjswa08dnmy63kcrf"; + version = "0.7.1"; + sha256 = "1q7q1ynfm4m1zz2inyvvj7868p3yxjl7w512j5xiz4mzx3llb292"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe safe-exceptions stm text text-format transformers type-operators unordered-containers utf8-string vector ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl semigroups text + unordered-containers + ]; homepage = "https://github.com/serokell/universum"; description = "Custom prelude used in Serokell"; license = stdenv.lib.licenses.mit; @@ -203860,8 +204413,8 @@ self: { }: mkDerivation { pname = "uuid-crypto"; - version = "1.3.0.0"; - sha256 = "02vzxxijz2pdwq4asgvsxvj6gcnjdzrfrhiavwbmc0vckw8s108s"; + version = "1.3.1.0"; + sha256 = "10r6phn23f3piqs4jhx764pcl6f3dbxq75pvwsnmwcszdi970a3l"; libraryHaskellDepends = [ base binary bytestring cryptoids cryptoids-types exceptions uuid ]; @@ -204217,23 +204770,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "validation_0_6_0" = callPackage - ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, directory - , doctest, filepath, lens, mtl, QuickCheck, semigroupoids - , semigroups, template-haskell, transformers + "validation_0_6_2" = callPackage + ({ mkDerivation, base, bifunctors, hedgehog, HUnit, lens, mtl + , semigroupoids, semigroups, transformers }: mkDerivation { pname = "validation"; - version = "0.6.0"; - sha256 = "1x2mi8lgy18q7g2gwwk8c31kg77lkfpmjkxf5nkli5pri9z947av"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.6.2"; + sha256 = "0631g3ffxchgg6hpy8w94a3713plgqp1k45zq85vaxyjg2x5bh7r"; libraryHaskellDepends = [ base bifunctors lens mtl semigroupoids semigroups transformers ]; - testHaskellDepends = [ - base cabal-doctest directory doctest filepath QuickCheck - template-haskell - ]; + testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; homepage = "https://github.com/qfpl/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; @@ -205259,8 +205807,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; - revision = "1"; - editedCabalFile = "1vgywmhxkkb7mfirl0wik5mk8xj9s3d23f9zwj5svnbyvdkc3fl4"; + revision = "2"; + editedCabalFile = "0jnnzhwkc82flvaxqc1vv30d8vpdwnyi82614c34j79m51wcmvya"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -205484,10 +206032,8 @@ self: { }: mkDerivation { pname = "vgrep"; - version = "0.2.0.0"; - sha256 = "0crd7hrnvl4z5xb1b6km47b6250ica1yv4sy370m7lkjx00c4lrb"; - revision = "1"; - editedCabalFile = "0qljh5nddpgv2w7y3nq5h12jpwc509yyizqv8cjzdr1krfsnk4ck"; + version = "0.2.1.0"; + sha256 = "0k74bpi995wqxmin6h7bx3yjiwh403c708yjp19igbw1971irxjr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206975,6 +207521,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-middleware-brotli" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, filepath + , hs-brotli, http-types, mtl, tasty, tasty-hspec, tasty-hunit, unix + , wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-brotli"; + version = "0.1.0.0"; + sha256 = "1gv3s2y49179kzkjqzs905g2rq1a9al9n716y86ivan8nnkhxjnq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring directory filepath hs-brotli http-types unix + wai + ]; + executableHaskellDepends = [ + base http-types wai wai-app-static wai-extra warp + ]; + testHaskellDepends = [ + base bytestring hs-brotli http-types mtl tasty tasty-hspec + tasty-hunit wai wai-extra + ]; + homepage = "https://github.com/iand675/wai-middleware-brotli#readme"; + description = "WAI middleware for brotli compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-cache" = callPackage ({ mkDerivation, base, binary, blaze-builder-conduit, bytestring , conduit, crypto-conduit, http-types, HUnit, pureMD5 @@ -207790,8 +208364,8 @@ self: { }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.2.1.0"; - sha256 = "16myzcxas9nwhd54bc5pi1biym39vrz707rfmmc1mar6ia7a1xil"; + version = "0.2.1.1"; + sha256 = "0yab46s0xyd49s46skrgm9hk4pvzqv3sr8mzr58231jvn7lijyf9"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy postgresql-simple resource-pool text time transformers wai @@ -209778,6 +210352,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wigner-ville-accelerate" = callPackage + ({ mkDerivation, accelerate, accelerate-fft, base, wigner }: + mkDerivation { + pname = "wigner-ville-accelerate"; + version = "0.1.0.2"; + sha256 = "1h5zdn3lkjnlr4m7s2xxiv36cr6hs7bnkr5rq20z585rfhbhavj5"; + libraryHaskellDepends = [ accelerate accelerate-fft base ]; + testHaskellDepends = [ base wigner ]; + homepage = "https://github.com/Haskell-mouse/wigner-ville-accelerate"; + description = "Wigner-ville transform using the Accelerate library"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {wigner = null;}; + "wikicfp-scraper" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec , scalpel-core, text, time @@ -209900,6 +210488,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "windns" = callPackage + ({ mkDerivation, base, bytestring, deepseq, dnsapi }: + mkDerivation { + pname = "windns"; + version = "0.1.0.0"; + sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c"; + revision = "1"; + editedCabalFile = "0kz6gv4dpppnnnyl57ibxi9gvykmkbmaz22yssx92mq306wbyimv"; + libraryHaskellDepends = [ base bytestring deepseq ]; + librarySystemDepends = [ dnsapi ]; + description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {dnsapi = null;}; + "windowslive" = callPackage ({ mkDerivation, base, Crypto, dataenc, mtl, network, parsec , pretty, split, time, urlencoded @@ -210085,6 +210688,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witherable_0_2" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.2"; + sha256 = "0bga2vx3bkg1m6pwdvnxbqjbljpwr6mxyq94fi87j3zy08mmmnwx"; + libraryHaskellDepends = [ + base base-orphans containers hashable transformers + unordered-containers vector + ]; + homepage = "https://github.com/fumieval/witherable"; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -210356,8 +210977,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.26"; - sha256 = "1wa1qpz5fdsgisvm9idla3jri1gzdgycmiphhynkn1k0337j0xy9"; + version = "0.3.29"; + sha256 = "147s2xg9y77gw81gnqgijnfzfx728ddv018n7zs2sl231asjqy3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210466,8 +211087,8 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.0"; - sha256 = "01zmgxs09dplk8hf41cfqjcm6w9mjnd6szn22kz2ycjxxdd7kncv"; + version = "0.1.2.1"; + sha256 = "0b9la9lh00x0rnh4mpgl8djgik72x75q5070r96ibzkl5hp6483w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210481,6 +211102,7 @@ self: { homepage = "https://github.com/githubuser/wordchoice#readme"; description = "Get word counts and distributions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wordcloud" = callPackage @@ -211117,6 +211739,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ws" = callPackage + ({ mkDerivation, async, base, bytestring, exceptions, haskeline + , mtl, network, network-uri, optparse-applicative, text, websockets + , wuss + }: + mkDerivation { + pname = "ws"; + version = "0.0.1"; + sha256 = "1i9jglq199pwxs9giigf3xgndspiwp30s2fb833mc7fl5s5mghhh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring exceptions haskeline mtl network network-uri + text websockets wuss + ]; + executableHaskellDepends = [ + base exceptions network-uri optparse-applicative + ]; + description = "A simple CLI utility for interacting with a websocket"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ws-chans" = callPackage ({ mkDerivation, async, base, http-types, HUnit, network , QuickCheck, quickcheck-instances, test-framework @@ -212175,6 +212819,7 @@ self: { homepage = "https://github.com/aisamanra/xleb"; description = "A simple monadic language for parsing XML structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xls" = callPackage @@ -212595,19 +213240,22 @@ self: { }) {}; "xml-isogen" = callPackage - ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck - , semigroups, template-haskell, text, xml-conduit - , xml-conduit-writer + ({ mkDerivation, base, data-default, dom-parser, generic-arbitrary + , hspec, lens, mtl, QuickCheck, quickcheck-instances, semigroups + , template-haskell, text, xml-conduit, xml-conduit-writer }: mkDerivation { pname = "xml-isogen"; - version = "0.2.0"; - sha256 = "1dmf660cyrs96ih1swlw44spd2g05dfikpak9mmjag40mab36116"; + version = "0.2.1"; + sha256 = "1kfv09ykz96dqd45bi618qi2qhzjkifh377ccylfzd55jkqnvn6l"; libraryHaskellDepends = [ base dom-parser lens mtl QuickCheck semigroups template-haskell text xml-conduit xml-conduit-writer ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base data-default dom-parser generic-arbitrary hspec QuickCheck + quickcheck-instances semigroups xml-conduit xml-conduit-writer + ]; homepage = "https://github.com/typeable/xml-isogen"; description = "Generate XML-isomorphic types"; license = stdenv.lib.licenses.mit; @@ -213217,6 +213865,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xmonad-extras_0_13_2" = callPackage + ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint + , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib + }: + mkDerivation { + pname = "xmonad-extras"; + version = "0.13.2"; + sha256 = "1ixnr76gmym9gab6m6r2rvrrvakxa5kda6cll9nbq954sjvj54jx"; + configureFlags = [ + "-f-with_hlist" "-fwith_parsec" "-fwith_split" + ]; + libraryHaskellDepends = [ + alsa-mixer base bytestring containers hint libmpd mtl network + regex-posix X11 xmonad xmonad-contrib + ]; + homepage = "https://github.com/xmonad/xmonad-extras"; + description = "Third party extensions for xmonad with wacky dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmonad-screenshot" = callPackage ({ mkDerivation, base, gtk, xmonad }: mkDerivation { @@ -217285,8 +217954,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.5.1.2"; - sha256 = "0q185phadgi8m45ii90x5k7mpw2xqf021q55q00nqyw8l7yai8pr"; + version = "0.6"; + sha256 = "059mbh2x4i521kg99b2mmgvc2rwbid641ilzc14ri7ym7ljkw1mv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ec7d961581a4..ac484b3c1124 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -74,6 +74,9 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \ --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \ --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" \ + ${lib.optionalString (ghc.isGhcjs or false) + ''--set NODE_PATH "${ghc.socket-io}/lib/node_modules"'' + } \ ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} fi done diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index edcd20c10978..d2b09808ec15 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -10,7 +10,7 @@ installIdrisLib () { if [ -d $1/lib/${idris.name} ]; then - ln -sv $1/lib/${idris.name}/* $out/lib/${idris.name} + ln -fsv $1/lib/${idris.name}/* $out/lib/${idris.name} fi } @@ -34,7 +34,7 @@ ''; buildPhase = '' - gcc -O3 -o idris idris.c + $CC -O3 -o idris idris.c ''; installPhase = '' diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index 80661c3feb9e..e7bcef7bc3e0 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jython-${version}"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; - sha256 = "0sk4myh9v7ma7nmzb8khg41na77xfi2zck7876bs7kq18n8nc1nx"; + sha256 = "0jwc4ly75cna78blnisv4q8nfcn5s0g4wk7jf4d16j0rfcd0shf4"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index c1d313a36569..a512a2513134 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.3"; - version = "${luaversion}.0"; + version = "${luaversion}.4"; src = fetchurl { - url = "http://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf"; + url = "https://www.lua.org/ftp/${name}.tar.gz"; + sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; }; nativeBuildInputs = [ readline ]; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 5246c5b0e593..97e395d2a6df 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -116,9 +116,7 @@ let platforms = platforms.all; }; }; - in rec { - perl = perl524; perl522 = common { @@ -127,8 +125,7 @@ in rec { }; perl524 = common { - version = "5.24.2"; - sha256 = "1x4yj814a79lcarwb3ab6bbcb36hvb5n4ph4zg3yb0nabsjfi6v0"; + version = "5.24.3"; + sha256 = "1m2px85kq2fyp2d4rx3bw9kg3car67qfqwrs5vlv96dx0x8rl06b"; }; - } diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 57383fa34126..be9aab50cb9f 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -326,17 +326,17 @@ let in { php56 = generic { - version = "5.6.31"; - sha256 = "03xixkvfp64bqp97p8vlj3hp63bpjw7hc16b7fgm7w35rdlp2fcg"; + version = "5.6.32"; + sha256 = "0lfbmdkvijkm6xc4p9sykv66y8xwhws0vsmka8v5cax4bxx4xr1y"; }; php70 = generic { - version = "7.0.24"; - sha256 = "06fgpljz6xpxxkpf4cv9rqz8g504l9ikbw5aq0hqh5sgd611kycv"; + version = "7.0.25"; + sha256 = "09fc2lj447phprvilvq2sb6n0r1snj142f8faphrd896s6b4v8lm"; }; php71 = generic { - version = "7.1.9"; - sha256 = "1blvzm2js8mrdbmwks0v6nlb5wj4789ixzmlxm1l8z6xvw8cqk9i"; + version = "7.1.11"; + sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn"; }; } diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 127c093501c3..1614159a7ef0 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let majorVersion = "3.6"; - minorVersion = "2"; + minorVersion = "3"; minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1ab4vlpdax1ihpiyiwchlgsk36apl4kgdw271wvl9l8ywhxpfacj"; + sha256 = "1nl1raaagr4car787a2hmjv2dw6gqny53xfd6wisbgx4r5kxk9yd"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 1a9475df2846..19517e2216b1 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.10.1"; + version = "6.11"; src = fetchurl { - url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "0v3z6x277lq1y7wkqdf6mj3826z5vq0yadygspx9h4r0f1dnmafc"; + url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + sha256 = "1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 4ab09f5bb1d5..bd540cdd5005 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec buildInputs = [ unzip cmake openexr hdf5 ]; - sourceRoot = "${name}-src"; - enableParallelBuilding = true; buildPhase = '' diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 5dbf134cf450..68398e93764c 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false }: +{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, + pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false }: with stdenv.lib; stdenv.mkDerivation rec { @@ -21,6 +22,10 @@ stdenv.mkDerivation rec { patches = [ ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 + (fetchpatch { # CVE-2013-4122 + url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff"; + sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2"; + }) ] ++ lib.optional stdenv.isFreeBSD ( fetchurl { url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch"; diff --git a/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch b/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch new file mode 100644 index 000000000000..ed916fcf4d1f --- /dev/null +++ b/pkgs/development/libraries/db/CVE-2017-10140-4.8-cwd-db_config.patch @@ -0,0 +1,11 @@ +--- a/env/env_open.c.old 2017-06-26 10:32:11.011419981 +0200 ++++ b/env/env_open.c 2017-06-26 10:32:46.893721233 +0200 +@@ -473,7 +473,7 @@ + env->db_mode = mode == 0 ? DB_MODE_660 : mode; + + /* Read the DB_CONFIG file. */ +- if ((ret = __env_read_db_config(env)) != 0) ++ if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0) + return (ret); + + /* diff --git a/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch b/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch new file mode 100644 index 000000000000..652e962bbe18 --- /dev/null +++ b/pkgs/development/libraries/db/CVE-2017-10140-cwd-db_config.patch @@ -0,0 +1,11 @@ +--- db-5.3.28/src/env/env_open.c.old 2017-06-26 10:32:11.011419981 +0200 ++++ db-5.3.28/src/env/env_open.c 2017-06-26 10:32:46.893721233 +0200 +@@ -473,7 +473,7 @@ + env->db_mode = mode == 0 ? DB_MODE_660 : mode; + + /* Read the DB_CONFIG file. */ +- if ((ret = __env_read_db_config(env)) != 0) ++ if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0) + return (ret); + + /* diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index bce91e5a9401..76e30e921ba1 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -3,7 +3,7 @@ import ./generic.nix (args // rec { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; - extraPatches = [ ./clang-4.8.patch ]; + extraPatches = [ ./clang-4.8.patch ./CVE-2017-10140-4.8-cwd-db_config.patch ]; drvArgs.hardeningDisable = [ "format" ]; drvArgs.doCheck = false; diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 066eca4e63d8..7894e4c73262 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,5 +3,5 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./clang-5.3.patch ]; + extraPatches = [ ./clang-5.3.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index b7c5667b883e..bafca3bd52d2 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -4,5 +4,5 @@ import ./generic.nix (args // rec { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ]; + extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix index f897e3744af1..96f7668aa903 100644 --- a/pkgs/development/libraries/db/db-6.2.nix +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -4,5 +4,5 @@ import ./generic.nix (args // rec { version = "6.2.23"; sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; license = stdenv.lib.licenses.agpl3; - extraPatches = [ ./clang-6.0.patch ]; + extraPatches = [ ./clang-6.0.patch ./CVE-2017-10140-cwd-db_config.patch ]; }) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 11d365159f80..b50025aa108a 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -411,7 +411,8 @@ stdenv.mkDerivation rec { ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals nvenc [ nvidia-video-sdk ] ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation - MediaToolbox VideoDecodeAcceleration ]; + MediaToolbox VideoDecodeAcceleration + libiconv ]; # Build qt-faststart executable buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 64d61d64bb63..483ee39c2da1 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; @@ -21,6 +23,8 @@ stdenv.mkDerivation rec { dbus dbus_glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; + propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + preConfigure = '' substituteInPlace configure --replace "-Werror" "" ''; @@ -35,7 +39,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; + postInstall = '' + sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|" + ''; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index f75290005391..ff65ca97eb74 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gnome2.GConf libxslt glib_networking ]; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index 17847695f973..b166a69043e8 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -8,9 +8,25 @@ stdenv.mkDerivation rec { sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray+=( + --includedir=$dev/include + ) + ''; + buildInputs = [ xlibsWrapper ]; propagatedBuildInputs = [ imlib2 ]; + postFixup = '' + moveToOutput bin/giblib-config "$dev" + + # Doesn't contain useful stuff + rm -rf $out/share/doc + ''; + meta = { homepage = http://linuxbrit.co.uk/giblib/; description = "wrapper library for imlib2, and other stuff"; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 8d26cabc9b54..54c70197af4d 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig -, freetype +, freetype, libid3tag , x11Support ? true, xlibsWrapper ? null }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wm2q2xlkbm71k7mw2jyzbxgzylrkcj5yh6nq58w5gybhp98qs9z"; }; - buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype ] + buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ] ++ optional x11Support xlibsWrapper; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index b324494faff7..8ad7cb95a5d7 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -23,15 +23,13 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lame-${version}"; - version = "3.99.5"; + version = "3.100"; src = fetchurl { url = "mirror://sourceforge/lame/${name}.tar.gz"; - sha256 = "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14"; + sha256 = "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx"; }; - patches = [ ./gcc-4.9.patch ]; - outputs = [ "out" "lib" "doc" ]; # a small single header outputMan = "out"; @@ -61,7 +59,7 @@ stdenv.mkDerivation rec { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = http://lame.sourceforge.net; license = licenses.lgpl2; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ codyopel fpletz ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/lame/gcc-4.9.patch b/pkgs/development/libraries/lame/gcc-4.9.patch deleted file mode 100644 index 59f8e00e4a8e..000000000000 --- a/pkgs/development/libraries/lame/gcc-4.9.patch +++ /dev/null @@ -1,33 +0,0 @@ -fix sse optimizations build on 32-bit with gcc 4.9 -http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=351af417bae0d09bd5a3753d1237f03adf591933 - -xmm_quantize_sub.c: In function 'init_xrpow_core_sse': -xmm_quantize_sub.c:65:18: warning: SSE vector return without SSE enabled changes the ABI [-W -psabi] - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); - ^ -In file included from xmm_quantize_sub.c:37:0: -/usr/lib/gcc/i686-w64-mingw32/4.9.0/include/xmmintrin.h:933:1: error: inlining failed in call to always_inline '_mm_loadu_ps': target specific option mismatch - _mm_loadu_ps (float const *__P) - ^ -xmm_quantize_sub.c:65:18: error: called from here - const __m128 vec_fabs_mask = _mm_loadu_ps(&fabs_mask._float[0]); - ^ ---- lame/libmp3lame/vector/xmm_quantize_sub.c.orig 2014-06-08 12:16:19.455468042 -0700 -+++ lame/libmp3lame/vector/xmm_quantize_sub.c 2014-06-08 12:16:09.592356980 -0700 -@@ -35,6 +35,7 @@ - #ifdef HAVE_XMMINTRIN_H - - #include <xmmintrin.h> -+#pragma GCC target("sse") - - typedef union { - int32_t _i_32[4]; /* unions are initialized by its first member */ -@@ -124,6 +125,7 @@ - } - - -+#pragma GCC target("sse2") - void - fht_SSE2(FLOAT * fz, int n) - { diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14166.patch b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch new file mode 100644 index 000000000000..b729ae41e0ad --- /dev/null +++ b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch @@ -0,0 +1,36 @@ +From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger <joerg@bec.de> +Date: Tue, 5 Sep 2017 18:12:19 +0200 +Subject: [PATCH] Do something sensible for empty strings to make fuzzers + happy. + +--- + libarchive/archive_read_support_format_xar.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c +index 7a22beb9d..93eeacc5e 100644 +--- a/libarchive/archive_read_support_format_xar.c ++++ b/libarchive/archive_read_support_format_xar.c +@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) + uint64_t l; + int digit; + ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + digit = *p - '0'; + while (digit >= 0 && digit < 10 && char_cnt-- > 0) { +@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) + { + int64_t l; + int digit; +- ++ ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + while (char_cnt-- > 0) { + if (*p >= '0' && *p <= '7') diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14502.patch b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch new file mode 100644 index 000000000000..dad8a93a8a81 --- /dev/null +++ b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch @@ -0,0 +1,28 @@ +From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001 +From: Joerg Sonnenberger <joerg@bec.de> +Date: Sat, 9 Sep 2017 17:47:32 +0200 +Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR + archives. + +Reported-By: OSS-Fuzz issue 573 +--- + libarchive/archive_read_support_format_rar.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c +index cbb14c32d..751de6979 100644 +--- a/libarchive/archive_read_support_format_rar.c ++++ b/libarchive/archive_read_support_format_rar.c +@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry, + return (ARCHIVE_FATAL); + } + filename[filename_size++] = '\0'; +- filename[filename_size++] = '\0'; ++ /* ++ * Do not increment filename_size here as the computations below ++ * add the space for the terminating NUL explicitly. ++ */ ++ filename[filename_size] = '\0'; + + /* Decoded unicode form is UTF-16BE, so we have to update a string + * conversion object for it. */ diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index fb1faf8d1b1b..e0242802fd34 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd"; }; + patches = [ + ./CVE-2017-14166.patch + ./CVE-2017-14502.patch + ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 90d7583673a3..e348fe0fae28 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -27,8 +27,9 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in let result = { + # e.g. https://libav.org/releases/libav-11.11.tar.xz.sha1 libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; - libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00"; + libav_11 = libavFun "11.11" "d7444fa4f135bdd7347cc962ab4b5228796b0f23"; libav_12 = libavFun "12.2" "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5"; }; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index b03d7643f0f3..a153001a9600 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -1,24 +1,33 @@ {stdenv, fetchurl, writeText, zlib, gperf}: stdenv.mkDerivation rec { - version = "0.15.1b"; - name = "libid3tag-${version}"; + version = "0.15.1b"; src = fetchurl { url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz; sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; + propagatedBuildInputs = [ zlib gperf ]; patches = [ ./debian-patches.patch ]; + preConfigure = '' + configureFlagsArray+=( + --includedir=$dev/include + ) + ''; + postInstall = '' - mkdir -p $out/lib/pkgconfig - cp ${./id3tag.pc} $out/lib/pkgconfig/id3tag.pc - substituteInPlace $out/lib/pkgconfig/id3tag.pc \ + mkdir -p $dev/lib/pkgconfig + cp ${./id3tag.pc} $dev/lib/pkgconfig/id3tag.pc + substituteInPlace $dev/lib/pkgconfig/id3tag.pc \ --subst-var-by out $out \ + --subst-var-by dev $dev \ --subst-var-by version "${version}" ''; diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/development/libraries/libid3tag/id3tag.pc index 854f1783cae5..e3df7b3f9df0 100644 --- a/pkgs/development/libraries/libid3tag/id3tag.pc +++ b/pkgs/development/libraries/libid3tag/id3tag.pc @@ -1,7 +1,7 @@ prefix=@out@ exec_prefix=${prefix} libdir=${exec_prefix}/lib -includedir=${exec_prefix}/include +includedir=@dev@/include Name: libid3tag Description: ID3 tag manipulation library diff --git a/pkgs/development/libraries/libmcs/default.nix b/pkgs/development/libraries/libmcs/default.nix deleted file mode 100644 index a457adfed80f..000000000000 --- a/pkgs/development/libraries/libmcs/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libmowgli }: - -stdenv.mkDerivation rec { - name = "libmcs-0.7.2"; - - src = fetchurl { - url = "http://distfiles.atheme.org/${name}.tbz2"; - sha256 = "1knmgxrg2kxdlin8qyf6351943ldg8myllwf860af58x1wncxc74"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libmowgli ]; - - meta = { - description = "A library and set of userland tools which abstract the storage of configuration settings away from userland applications"; - homepage = http://www.atheme.org/projects/mcs.shtml; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 516005b874fc..7fa53fe162b2 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - name = "CVE-2017-9310.patch"; + name = "CVE-2017-10790.patch"; url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=d8d805e1f2e6799bb2dff4871a8598dc83088a39"; sha256 = "1v5w0dazp9qc2v7pc8b6g7s4dz5ak10hzrn35hx66q76yzrrzp7i"; }) diff --git a/pkgs/development/libraries/libtbb/default.nix b/pkgs/development/libraries/libtbb/default.nix deleted file mode 100644 index 1422f6c5ceb9..000000000000 --- a/pkgs/development/libraries/libtbb/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, tree }: - -stdenv.mkDerivation rec { - name = "libtbb-${version}"; - version = "2018_U1"; - - src = fetchFromGitHub { - owner = "01org"; - repo = "tbb"; - rev = "${version}"; - sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; - }; - - buildInputs = [ tree ]; - - installPhase = '' - mkdir -p "$out"/usr/include "$out"/lib - install -m755 build/linux_*/*.so* "$out"/lib/ - cp -a include/tbb "$out"/usr/include/ - ''; - - meta = with stdenv.lib; { - homepage = "https://www.threadingbuildingblocks.org/"; - description = "High level abstract threading library"; - platforms = platforms.unix; - license = licenses.asl20; - maintainers = with maintainers; [ dizfer ]; - }; -} - diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 0fde0192726b..fe34a8bb88fa 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -66,7 +66,7 @@ let in let - version = "17.2.2"; + version = "17.2.4"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -81,7 +81,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "10jplvxg7rlbp7569w08z0igwlsjjfb7q3n07zgfr8d5sr224lng"; + sha256 = "0l75q9l4g15y66rqk2swqvj18qj60hpimv0f97jk44bfrpz0i92v"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/pcre/CVE-2017-7186.patch b/pkgs/development/libraries/pcre/CVE-2017-7186.patch deleted file mode 100644 index e9e1997e47c9..000000000000 --- a/pkgs/development/libraries/pcre/CVE-2017-7186.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/pcre_internal.h 2016/05/21 13:34:44 1649 -+++ b/pcre_internal.h 2017/02/24 17:30:30 1688 -@@ -2772,6 +2772,9 @@ - extern const pcre_uint16 PRIV(ucd_stage2)[]; - extern const pcre_uint32 PRIV(ucp_gentype)[]; - extern const pcre_uint32 PRIV(ucp_gbtable)[]; -+#ifdef COMPILE_PCRE32 -+extern const ucd_record PRIV(dummy_ucd_record)[]; -+#endif - #ifdef SUPPORT_JIT - extern const int PRIV(ucp_typerange)[]; - #endif -@@ -2780,9 +2783,15 @@ - /* UCD access macros */ - - #define UCD_BLOCK_SIZE 128 --#define GET_UCD(ch) (PRIV(ucd_records) + \ -+#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ - PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ - UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) -+ -+#ifdef COMPILE_PCRE32 -+#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) -+#else -+#define GET_UCD(ch) REAL_GET_UCD(ch) -+#endif - - #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype - #define UCD_SCRIPT(ch) GET_UCD(ch)->script ---- a/pcre_ucd.c 2014/06/19 07:51:39 1490 -+++ b/pcre_ucd.c 2017/02/24 17:30:30 1688 -@@ -38,6 +38,20 @@ - const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0}; - #else - -+/* If the 32-bit library is run in non-32-bit mode, character values -+greater than 0x10ffff may be encountered. For these we set up a -+special record. */ -+ -+#ifdef COMPILE_PCRE32 -+const ucd_record PRIV(dummy_ucd_record)[] = {{ -+ ucp_Common, /* script */ -+ ucp_Cn, /* type unassigned */ -+ ucp_gbOther, /* grapheme break property */ -+ 0, /* case set */ -+ 0, /* other case */ -+ }}; -+#endif -+ - /* When recompiling tables with a new Unicode version, please check the - types in this structure definition from pcre_internal.h (the actual - field names will be different): diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index d19410f735f9..e6055151301c 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; let - version = "8.40"; + version = "8.41"; pname = if (variant == null) then "pcre" else if (variant == "cpp") then "pcre-cpp" else variant; @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; - sha256 = "1x7lpjn7jhk0n3sdvggxrlrhab8kkfjwl7qix0ypw9nlx8lpmqh0"; + sha256 = "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76"; }; outputs = [ "bin" "dev" "out" "doc" "man" ]; @@ -31,8 +31,6 @@ in stdenv.mkDerivation rec { ] ++ optional (variant != null) "--enable-${variant}"; - patches = [ ./CVE-2017-7186.patch ]; - buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads; doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index db66d8545883..574899d3a89c 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -30,16 +30,16 @@ in }; cudnn_cudatoolkit8 = generic rec { - version = "7.0"; + version = "7.0.3"; cudatoolkit = cudatoolkit8; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "19yjdslrslwv5ic4vgpzb0fa0mqbgi6a66b7gc66vdc9n9589398"; + sha256 = "0gzwadxcyirr2zgiikdapnm860x3gcfwfxh5xn3s47zaa03x4kg4"; }; cudnn_cudatoolkit9 = generic rec { - version = "7.0"; + version = "7.0.3"; cudatoolkit = cudatoolkit9; srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz"; - sha256 = "1ld5x819vya6p2ppmr7i3lz9ac2y81kssgbzgd0lsign7r2qjapc"; + sha256 = "1ycy413cq9y9yxj20djqv05aarn3qzcy2md3dvvjpvhc269kwn09"; }; } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 6dc09ddd39f8..0625183fb7de 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.20.0"; + name = "sqlite-3.21.0"; src = fetchurl { - url = "http://sqlite.org/2017/sqlite-autoconf-3200000.tar.gz"; - sha256 = "1876dapm1xx5aqd2d8l7ymmkd2z9rybh99rp5f5rd4zz57vcc51q"; + url = "http://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz"; + sha256 = "1qxvzdjwzw6k0kqjfabj86rnq87xdbwbca7laxxdhnh0fmkm3pfp"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index a8a0d5dc2b3f..13b1970866e7 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }: -stdenv.mkDerivation { - name = "tbb-4.4-u2"; +with stdenv.lib; stdenv.mkDerivation rec { + name = "tbb-${version}"; + version = "2018_U1"; - src = fetchurl { - url = "https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20151115oss_src.tgz"; - sha256 = "1fvprkjdxj7529hr1qkzkxkk18mx6zllrpiwglq4k3y1hpyc9m9x"; + src = fetchFromGitHub { + owner = "01org"; + repo = "tbb"; + rev = version; + sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; }; - checkTarget = "test"; - doCheck = false; + makeFlags = concatStringsSep " " ( + optional (compiler != null) "compiler=${compiler}" ++ + optional (stdver != null) "stdver=${stdver}" + ); installPhase = '' mkdir -p $out/{lib,share/doc} @@ -23,8 +28,8 @@ stdenv.mkDerivation { meta = { description = "Intel Thread Building Blocks C++ Library"; - homepage = http://threadingbuildingblocks.org/; - license = stdenv.lib.licenses.lgpl3Plus; + homepage = "http://threadingbuildingblocks.org/"; + license = licenses.asl20; longDescription = '' Intel Threading Building Blocks offers a rich and complete approach to expressing parallelism in a C++ program. It is a library that helps you @@ -33,7 +38,7 @@ stdenv.mkDerivation { represents a higher-level, task-based parallelism that abstracts platform details and threading mechanisms for scalability and performance. ''; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ]; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ peti thoughtpolice dizfer ]; }; } diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix new file mode 100644 index 000000000000..a0110c5f22b2 --- /dev/null +++ b/pkgs/development/libraries/theft/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.4.3"; + name = "theft-${version}"; + + src = fetchFromGitHub { + owner = "silentbicycle"; + repo = "theft"; + rev = "v${version}"; + sha256 = "1ibh8np12lafnrsrvjbbzlyq45zq654939x0y22vdnc6s8dpbhw4"; + }; + + preConfigure = "patchShebangs ./scripts/mk_bits_lut"; + + doCheck = true; + checkTarget = "test"; + + installFlags = [ "PREFIX=$(out)" ]; + postInstall = "install -m644 vendor/greatest.h $out/include/"; + + meta = { + description = "A C library for property-based testing"; + platforms = stdenv.lib.platforms.linux; + homepage = "http://github.com/silentbicycle/theft/"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.kquick ]; + }; +} diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.18.nix index d69993534146..e1b520eb10b1 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -4,7 +4,7 @@ , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit , libidn, libedit, readline, mesa, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite -, gst-plugins-base +, gst-plugins-base, gst-plugins-bad }: assert enableGeoLocation -> geoclue2 != null; @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.16.6"; + version = "2.18.1"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw"; + sha256 = "15fp7szmkpannx7avsynf0nv3y343qwq0fvq3rz2m2mw5wq7pnww"; }; # see if we can clean this up.... @@ -77,10 +77,7 @@ stdenv.mkDerivation rec { "-DENABLE_GTKDOC=OFF" ]; - # XXX: WebKit2 missing include path for gst-plugins-base. - # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0" - + (optionalString stdenv.isDarwin " -lintl"); + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; nativeBuildInputs = [ cmake perl python2 ruby bison gperf @@ -90,7 +87,7 @@ stdenv.mkDerivation rec { buildInputs = libintlOrEmpty ++ [ gtk2 libwebp enchant libnotify gnutls pcre nettle libidn libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit - sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core ] ++ optional enableGeoLocation geoclue2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ optionals stdenv.isDarwin [ libedit readline mesa ] diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 2672d6efbec1..fbfc460db96d 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { name = "websocket++-${version}"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "zaphoyd"; repo = "websocketpp"; rev = version; - sha256 = "1n6j0dh3qpis0f7crd49a2nhxd5459h0blch408z3kwlasx2g0i5"; + sha256 = "1i64sps52kvy8yffysjbmmbb109pi28kqai0qdxxz1dcj3xfckqd"; }; buildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.zaphoyd.com/websocketpp/; description = "C++/Boost Asio based websocket client/server library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ andir ]; }; } diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix new file mode 100644 index 000000000000..79bd8bb96659 --- /dev/null +++ b/pkgs/development/libraries/wlroots/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman +, xcbutilwm, libX11, libcap +}: + +let pname = "wlroots"; + version = "unstable-2017-10-31"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "wlroots"; + rev = "7200d643363e988edf6777c38e7f8fcd451a2c50"; + sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac"; + }; + + # TODO: Temporary workaround for compilation errors + patches = [ ./libdrm.patch ./no-werror.patch ]; + + nativeBuildInputs = [ meson ninja pkgconfig ]; + + buildInputs = [ + wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman + xcbutilwm libX11 libcap + ]; + + meta = with stdenv.lib; { + description = "A modular Wayland compositor library"; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/wlroots/libdrm.patch b/pkgs/development/libraries/wlroots/libdrm.patch new file mode 100644 index 000000000000..2b9d85382764 --- /dev/null +++ b/pkgs/development/libraries/wlroots/libdrm.patch @@ -0,0 +1,9 @@ +--- a/backend/meson.build 2017-10-31 22:08:01.112927610 +0100 ++++ b/backend/meson.build 2017-10-31 22:09:28.155264343 +0100 +@@ -43,5 +43,5 @@ + 'wlr_backend', + backend_files, + include_directories: wlr_inc, +- dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos], ++ dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos, drm], + ) diff --git a/pkgs/development/libraries/wlroots/no-werror.patch b/pkgs/development/libraries/wlroots/no-werror.patch new file mode 100644 index 000000000000..78c374d9dbb8 --- /dev/null +++ b/pkgs/development/libraries/wlroots/no-werror.patch @@ -0,0 +1,10 @@ +--- a/meson.build 2017-10-31 22:08:01.132927689 +0100 ++++ b/meson.build 2017-10-31 22:20:58.215784350 +0100 +@@ -5,7 +5,6 @@ + default_options: [ + 'c_std=c11', + 'warning_level=2', +- 'werror=true', + ], + ) + diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 35300ed9419a..2375de4b1bfa 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -3,13 +3,13 @@ , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation { [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index fd5796276f7a..88d24fddf79e 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -3,17 +3,17 @@ with rustPlatform; buildRustPackage rec { - version = "2017-06-23"; + version = "0.4.1"; name = "loc-${version}"; src = fetchFromGitHub { owner = "cgag"; repo = "loc"; - rev = "bbea575f56879ef614d57a42a6b79fd45b9a8b38"; - sha256 = "0agyhi55rh248fmlsip4fi1iw4xv3433q7bcb2lpjfnjpzxxlvfn"; + rev = "v${version}"; + sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; }; - cargoSha256 = "0f3i8av9g19r2nhr9m8ca8s23kq294c5kqyvx155l6p76r7a9kvb"; + cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; meta = { homepage = http://github.com/cgag/loc; diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index dea7cd9b38b9..79f180759b09 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1,13 +1,34 @@ Node.js packages ================ -To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: +The `pkgs/development/node-packages` folder contains a generated collection of +[NPM packages](https://npmjs.com/) that can be installed with the Nix package +manager. + +As a rule of thumb, the package set should only provide *end user* software +packages, such as command-line utilities. Libraries should only be added to the +package set if there is a non-NPM package that requires it. + +When it is desired to use NPM libraries in a development project, use the +`node2nix` generator directly on the `package.json` configuration file of the +project. + +The package set also provides support for multiple Node.js versions. The policy +is that a new package should be added to the collection for the latest stable LTS +release (which is currently 6.x), unless there is an explicit reason to support +a different release. + +To add a package from NPM to nixpkgs: 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` - for packagages depending on Node.js 4.x) + for packages depending on Node.js 4.x) 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. 3. Build your new package to test your changes: `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`. To build against a specific Node.js version (e.g. 4.x): `nix-build -A nodePackages_4_x.<new-or-updated-package>` 4. Add and commit all modified and generated files. + +For more information about the generation process, consult the +[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` +tool. diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index 99cb7ca40441..c058154a9969 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -1,4 +1,4 @@ -{pkgs, system, nodejs}: +{pkgs, system, nodejs, stdenv}: let nodePackages = import ./composition-v4.nix { @@ -43,7 +43,7 @@ nodePackages // { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; }); diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 334c79a82672..6cf74cdc4e78 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -1,4 +1,4 @@ -{pkgs, system, nodejs}: +{pkgs, system, nodejs, stdenv}: let nodePackages = import ./composition-v6.nix { @@ -6,6 +6,13 @@ let }; in nodePackages // { + dnschain = nodePackages.dnschain.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + postInstall = '' + wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin + ''; + }); + node-inspector = nodePackages.node-inspector.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; }); @@ -41,7 +48,7 @@ nodePackages // { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do - wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; }); diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 7ea7ce2d3ed8..c2876f1128cd 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -73,6 +73,7 @@ , "sinopia" , "sloc" , "smartdc" +, "socket.io" , "stylus" , "svgo" , "tern" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index ebf116fed731..1b80e08ad2e9 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -157,13 +157,13 @@ let sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; }; }; - "resolve-1.4.0" = { + "resolve-1.5.0" = { name = "resolve"; packageName = "resolve"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"; - sha512 = "3aygixvrv5l6jm5n2dfgzyx4z86l3q2v7c2rln6znai3877q0r5ajlxgdaj4qm9h70yp7grmg9kmvr77ww2zckc7bm22zzfldafqvk9"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; + sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; }; }; "source-map-0.1.9" = { @@ -1399,13 +1399,13 @@ let sha1 = "56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"; }; }; - "ms-rest-2.2.3" = { + "ms-rest-2.2.4" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.3.tgz"; - sha1 = "f4f244de6282d9644504a50d11ac7f7cfb01b867"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.4.tgz"; + sha512 = "0v97pcpwwnmp3a1wyz2i2a2csiqsk0pnb9wcjsc2q2glyqr0nzhz51x6qhk3fz5dja6099p49p5bl87rkjp6cilnszjg6cpsklsbni9"; }; }; "ms-rest-azure-2.4.1" = { @@ -2020,22 +2020,22 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; - "@types/node-8.0.46" = { + "@types/node-8.0.47" = { name = "@types/node"; packageName = "@types/node"; - version = "8.0.46"; + version = "8.0.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.0.46.tgz"; - sha512 = "0bmyn8y1ifdybpbvvr9r1m473d789767c3yc5vj96jh2na04a4mbf7abvgkrq9cly0390sf6dql3xklvhv6hjl408gq49gr8vi0y6dd"; + url = "https://registry.npmjs.org/@types/node/-/node-8.0.47.tgz"; + sha512 = "24zynk3vnq6mz1x5s476q5hmksqcr3pwnsbqpkwyi2jlm8l61r4b9bh9l37zwhca9iaxb6v1ccyrxjzc3rfnpzqyizznmlnivphpv4h"; }; }; - "@types/request-2.0.6" = { + "@types/request-2.0.7" = { name = "@types/request"; packageName = "@types/request"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.0.6.tgz"; - sha512 = "13hi2wdyaa8iypfbfhf051n1jjbkqzywy7sh2hy1w605q5jy2hfc0sr684jpxa7hwfigck8n5gv72f9icb9m31k866nny90r69l1xgk"; + url = "https://registry.npmjs.org/@types/request/-/request-2.0.7.tgz"; + sha512 = "1ncrcrax2iw3iwr7qcnlx4qcd2cpymjl89kblqpxp54415ldf9x4drqap21rs0d8a1sjvhq2wmkfb8qaw5sjw46vmsiqprvwcxjcnc6"; }; }; "@types/uuid-3.4.3" = { @@ -2047,13 +2047,13 @@ let sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; }; }; - "is-buffer-1.1.5" = { + "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; "is-stream-1.1.0" = { @@ -3046,6 +3046,15 @@ let sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; }; }; + "mime-db-1.31.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.31.0.tgz"; + sha512 = "1yvkd7sias7i24nvvbv8kj6sagzn758wclfky650vs38mhz0aq28bwcyg3y8nx13pa2fck3kdn5855cg62rxs3px8fj7l3rbkvg07d0"; + }; + }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -4108,13 +4117,13 @@ let sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; }; }; - "asn1.js-4.9.1" = { + "asn1.js-4.9.2" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz"; - sha1 = "48ba240b45a9280e94748990ba597d216617fd40"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz"; + sha512 = "071d32h5646ddyfxvmm0yd0xc320zh2cdsjal4hs8cs0hgn9dpq7k9c9ndlhjq3y93nlawkinm99znqvp0cxx61ic7qy4nn7d5arwvg"; }; }; "ripemd160-2.0.1" = { @@ -6376,13 +6385,13 @@ let sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; }; }; - "acorn-5.1.2" = { + "acorn-5.2.1" = { name = "acorn"; packageName = "acorn"; - version = "5.1.2"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz"; - sha512 = "1cgdl1g9g05iz6r09i0hmf78cmjca2yafazwaj202w9dck00b7jnmyk4l27ackxy13g4g4ay6vkf6glh18wm29vpmjqsga1n9j8bpm3"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; + sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; }; }; "foreach-2.0.5" = { @@ -9179,13 +9188,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.138.0" = { + "aws-sdk-2.141.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.138.0"; + version = "2.141.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.138.0.tgz"; - sha1 = "acb923132b51fafe8a464aa757f65d61ac30bd77"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.141.0.tgz"; + sha1 = "3d96a5970fd9f540ceabcc1d4baeb33b71583aa7"; }; }; "request-2.83.0" = { @@ -9332,13 +9341,13 @@ let sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; - "ajv-5.2.4" = { + "ajv-5.3.0" = { name = "ajv"; packageName = "ajv"; - version = "5.2.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.2.4.tgz"; - sha1 = "3daf9a8b67221299fdae8d82d117ed8e6c80244b"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz"; + sha1 = "4414ff74a50879c208ee5fdc826e32c303549eda"; }; }; "har-schema-2.0.0" = { @@ -9368,6 +9377,15 @@ let sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; }; }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; "json-schema-traverse-0.3.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -9377,15 +9395,6 @@ let sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; }; }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; "hoek-4.2.0" = { name = "hoek"; packageName = "hoek"; @@ -9413,13 +9422,13 @@ let sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; }; }; - "sntp-2.0.2" = { + "sntp-2.1.0" = { name = "sntp"; packageName = "sntp"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz"; - sha1 = "5064110f0af85f7cfdb7d6b67a40028ce52b4b2b"; + url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; + sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; "boom-5.2.0" = { @@ -9935,13 +9944,13 @@ let sha1 = "898508da2226f380df904728456849c1501a4b0d"; }; }; - "chalk-2.2.0" = { + "chalk-2.3.0" = { name = "chalk"; packageName = "chalk"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz"; - sha512 = "3vfffivwlp2hr7dwh84lvayba94a98ddhb8dwkv14magmfdj1n895880sik7liqv4xgnvvpr2v5jsm1gzl1fypl7nl9dpa6d3zhq4yh"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; + sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; }; }; "indent-string-3.2.0" = { @@ -10268,13 +10277,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "ignore-3.3.6" = { + "ignore-3.3.7" = { name = "ignore"; packageName = "ignore"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.6.tgz"; - sha512 = "2bv6fgfnwzivrdak4qc7bxfydydg6qqv9nynyqc9bpj2fq57m5ac4asylrl5m5n67nq8bxx86vrv97b8r9zq9g0vrd9y6ck28vndg0y"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; + sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; }; }; "inquirer-3.3.0" = { @@ -10304,6 +10313,15 @@ let sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; }; }; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + }; + }; "levn-0.3.0" = { name = "levn"; packageName = "levn"; @@ -10538,13 +10556,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "jschardet-1.5.1" = { + "jschardet-1.6.0" = { name = "jschardet"; packageName = "jschardet"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz"; - sha512 = "3c44v9rz6j4z6i7gj2v3wmfcqv5i47psysgd1p4jcgz114vfk99fif1n1r08jbsdkp4g3smv1wx7x4ikwa7q9dp5i1bc77la17s2kdw"; + url = "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz"; + sha512 = "2crjzdrqdgc38g7nmam84m472pkagwnh3dj64d7pc87g5dgbw04p56ma6qqvmbb0b0r1pcx4wqr4kwvf7zplmk0434z1x681sys32y5"; }; }; "tmp-0.0.33" = { @@ -10664,13 +10682,13 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-keywords-2.1.0" = { + "ajv-keywords-2.1.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz"; - sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz"; + sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; "slice-ansi-1.0.0" = { @@ -10682,13 +10700,13 @@ let sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; - "eslint-4.9.0" = { + "eslint-4.10.0" = { name = "eslint"; packageName = "eslint"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz"; - sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz"; + sha512 = "284ihlnpkrds6jd5rwdbmknxhci60p5sv24p9aad5ra2rjwb1pcakk3p630bggahmq6jjsxngj9rfmpv31jy9gs29cl2qfxzzq6bi9h"; }; }; "supports-color-3.2.3" = { @@ -10754,13 +10772,13 @@ let sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; }; }; - "extract-zip-1.6.5" = { + "extract-zip-1.6.6" = { name = "extract-zip"; packageName = "extract-zip"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz"; - sha1 = "99a06735b6ea20ea9b705d779acffcc87cff0440"; + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz"; + sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c"; }; }; "https-proxy-agent-2.1.0" = { @@ -10790,15 +10808,6 @@ let sha512 = "1bj83dg7c5sca2v9cpzz4m83y9mm8icldvpk2c9sq3216cr6cn7qvfwhw9hq881nq7pii3xxbg8lz6g2p6223ililwkzzp68ndbfd45"; }; }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; "mkdirp-0.5.0" = { name = "mkdirp"; packageName = "mkdirp"; @@ -10817,15 +10826,6 @@ let sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; }; }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; "fd-slicer-1.0.1" = { name = "fd-slicer"; packageName = "fd-slicer"; @@ -11438,13 +11438,13 @@ let sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "tar-pack-3.4.0" = { + "tar-pack-3.4.1" = { name = "tar-pack"; packageName = "tar-pack"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz"; - sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984"; + url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; + sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; }; }; "console-control-strings-1.1.0" = { @@ -13005,22 +13005,22 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "@ionic/cli-utils-1.13.1" = { - name = "@ionic/cli-utils"; - packageName = "@ionic/cli-utils"; - version = "1.13.1"; + "@ionic/cli-framework-0.0.2" = { + name = "@ionic/cli-framework"; + packageName = "@ionic/cli-framework"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.13.1.tgz"; - sha512 = "0smk0gdbf976vrvp6n8yvcp1idyh5gp16810wyafah3hx4zgrmw3ni0xnq0a0m1lq914b9c5cfcw8hr5m94fb54381r62r684kr7b5g"; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.0.2.tgz"; + sha512 = "0sx59z1970yad1c2k9h7mz0fkjj21im682qb503ypng99fr0bm3nl6p5sw37iy2x44jj9jbh3a7lcc3kzm8ymy5gqw4v7rxbmcn8vv0"; }; }; - "@ionic/discover-0.3.3" = { - name = "@ionic/discover"; - packageName = "@ionic/discover"; - version = "0.3.3"; + "@ionic/cli-utils-1.15.2" = { + name = "@ionic/cli-utils"; + packageName = "@ionic/cli-utils"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz"; - sha512 = "3brs0chjqyz8drf7i6w67bmzxgvi88pb54m6qz3ml1wc3j42hgby7x0rjzwzdhkyx5573vbr91ias805gff1piyn7x7nq0c4568zj65"; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.15.2.tgz"; + sha512 = "1611izq9j89s32sjxkrv23zm9lihvk5wgyyxqwzn286npawpx2gxvs24xm45k5ysy0gxbba9k258ixj9a6vzaz644w69y63nh2fxw18"; }; }; "opn-5.1.0" = { @@ -13050,6 +13050,60 @@ let sha512 = "0k910mhnraax4m75hvgb3f2mhfj6yrsqn7fmyqm2sx137f1kqpz8icww9zhlmqka5pfi8hvprd0wcyflim0nvh7jb14yksjj9crcqna"; }; }; + "ncp-2.0.0" = { + name = "ncp"; + packageName = "ncp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + }; + }; + "superagent-3.8.0" = { + name = "superagent"; + packageName = "superagent"; + version = "3.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.0.tgz"; + sha512 = "05p3nzd9iw05i37pkvil2wjvrvlxzwr4ym9m6f7ykdlssf2ljywmsmc6y6kbm0qd91d2lssks1riwvlpnp63809qb6l9vv71ddccmgg"; + }; + }; + "component-emitter-1.2.1" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + }; + "cookiejar-2.1.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; + sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; + }; + }; + "formidable-1.1.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; + sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; + }; + }; + "@ionic/discover-0.3.3" = { + name = "@ionic/discover"; + packageName = "@ionic/discover"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.3.3.tgz"; + sha512 = "3brs0chjqyz8drf7i6w67bmzxgvi88pb54m6qz3ml1wc3j42hgby7x0rjzwzdhkyx5573vbr91ias805gff1piyn7x7nq0c4568zj65"; + }; + }; "archiver-2.1.0" = { name = "archiver"; packageName = "archiver"; @@ -13104,15 +13158,6 @@ let sha1 = "e400e57f0e60d8ef2bd4d068dc428a54345dbcda"; }; }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; - }; - }; "proxy-middleware-0.15.0" = { name = "proxy-middleware"; packageName = "proxy-middleware"; @@ -13131,15 +13176,6 @@ let sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c"; }; }; - "superagent-3.7.0" = { - name = "superagent"; - packageName = "superagent"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.7.0.tgz"; - sha512 = "0dv80576bgsb7mq2mh3f0jgik6wnrki1ml5n8c2r21g4ql72z683fn7v63bxkf20s9ihh39gr1sqaadhpkj3yvnc5wbqv4dxv26pjzz"; - }; - }; "tiny-lr-1.0.5" = { name = "tiny-lr"; packageName = "tiny-lr"; @@ -13149,6 +13185,15 @@ let sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32"; }; }; + "netmask-1.0.6" = { + name = "netmask"; + packageName = "netmask"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz"; + sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; + }; + }; "archiver-utils-1.3.0" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -13275,33 +13320,6 @@ let sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e"; }; }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; - "cookiejar-2.1.1" = { - name = "cookiejar"; - packageName = "cookiejar"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; - sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; - }; - }; - "formidable-1.1.1" = { - name = "formidable"; - packageName = "formidable"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; - sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; - }; - }; "body-5.1.0" = { name = "body"; packageName = "body"; @@ -13383,15 +13401,6 @@ let sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; }; }; - "netmask-1.0.6" = { - name = "netmask"; - packageName = "netmask"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz"; - sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; - }; - }; "is-wsl-1.1.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -13455,15 +13464,6 @@ let sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; }; }; - "@reactivex/rxjs-5.5.0" = { - name = "@reactivex/rxjs"; - packageName = "@reactivex/rxjs"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.5.0.tgz"; - sha512 = "3r28zxbg2644s5bc09s7bjngpgs5ws56r4j5vq7sk370zyl8vppri090phfblsmqnpv5y1hfb6qlb8j19mb8i2qzqvyqyzx98xd10jr"; - }; - }; "chai-4.1.2" = { name = "chai"; packageName = "chai"; @@ -13536,6 +13536,15 @@ let sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; }; }; + "rxjs-5.5.2" = { + name = "rxjs"; + packageName = "rxjs"; + version = "5.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.2.tgz"; + sha512 = "208dclsk809q1ra99l8j8xzrl9kcm4wpzwjb89rwdqrz78x3i0861kkgqi1sp3v8sdnnvdq0flmazdv96ah7jxpvwf74lw1llh2h5m1"; + }; + }; "semaphore-async-await-1.5.1" = { name = "semaphore-async-await"; packageName = "semaphore-async-await"; @@ -13590,15 +13599,6 @@ let sha1 = "5043ae47ee4ac16af07bb3d0ca561235e0c0d2fa"; }; }; - "symbol-observable-1.0.4" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"; - sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"; - }; - }; "assertion-error-1.0.2" = { name = "assertion-error"; packageName = "assertion-error"; @@ -13734,6 +13734,15 @@ let sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; }; }; + "symbol-observable-1.0.4" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"; + sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"; + }; + }; "vscode-uri-1.0.1" = { name = "vscode-uri"; packageName = "vscode-uri"; @@ -14724,6 +14733,15 @@ let sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; }; }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; "json3-3.3.2" = { name = "json3"; packageName = "json3"; @@ -14733,6 +14751,15 @@ let sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; }; }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; "lru-cache-2.2.4" = { name = "lru-cache"; packageName = "lru-cache"; @@ -17424,13 +17451,13 @@ let sha1 = "892e47000a99be55bbf3774ffea0561d8879c259"; }; }; - "moment-timezone-0.5.13" = { + "moment-timezone-0.5.14" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.13"; + version = "0.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz"; - sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz"; + sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1"; }; }; "fresh-0.5.0" = { @@ -17595,13 +17622,13 @@ let sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; - "websocket-stream-5.0.1" = { + "websocket-stream-5.1.1" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.1.tgz"; - sha512 = "3w842xsi7pgjjr5fkdzbx9dfsjl87x6c8wrvxgy8i1lr399yjiggbwrfdvpccv698f7n4ywvf7dbc8g61ly99yw1lf7fwpfrypg8x9p"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.1.tgz"; + sha512 = "18iw90ncl6cpip9j7rxdf6mag5klhhn7fklhb5lz41dy3wk9vxp3lxxkmwsnldjk5zfx3fjww55xg47k5k1a4cpph92k7j26p9kk56a"; }; }; "leven-1.0.2" = { @@ -18756,13 +18783,13 @@ let sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"; }; }; - "query-string-5.0.0" = { + "query-string-5.0.1" = { name = "query-string"; packageName = "query-string"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.0.0.tgz"; - sha1 = "fbdf7004b4d2aff792f9871981b7a2794f555947"; + url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz"; + sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8"; }; }; "qw-1.0.1" = { @@ -18819,13 +18846,13 @@ let sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; }; }; - "worker-farm-1.5.0" = { + "worker-farm-1.5.1" = { name = "worker-farm"; packageName = "worker-farm"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.0.tgz"; - sha512 = "2lrlysxfbyzywla6i1q07xncmw30w1icgq18c4bra25dl6wvcd3mxg1lqbf88w5h7mqnf98j8ll657wnqwjq9rwd7pbmd9i11964x0c"; + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.1.tgz"; + sha512 = "0vwa4w6rn98nh8igcx2sni6hccs5wfwhh68zxzzgffimr7gmy5nw1ks0j2n0gra7g2ahsl7p7l34mcn8702n01y30qc6xxcdbllg4sg"; }; }; "write-file-atomic-2.1.0" = { @@ -19350,13 +19377,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.45.0" = { + "snyk-1.47.0" = { name = "snyk"; packageName = "snyk"; - version = "1.45.0"; + version = "1.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.45.0.tgz"; - sha1 = "890eae8b1c14ff8ff1be25388702cb585df86834"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.47.0.tgz"; + sha1 = "2c86a734a842fdfc18b97df682a91d419fec70f3"; }; }; "spawn-please-0.3.0" = { @@ -19539,13 +19566,13 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-go-plugin-1.3.7" = { + "snyk-go-plugin-1.3.8" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.7.tgz"; - sha512 = "0i5dcqyyfmb0caz9fa3qaqx7k1f79qyd9y6jn031c75647y8hmk265w6ynkpz8gkv7cn4w6cznrm5q436vg4wgs1ahqd5xrwkhsbxp4"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.3.8.tgz"; + sha512 = "0q7vax6wyzrd2d3rzymrvhqcb1mnhpya12f26v05ly4ydivj1x67mbw0bpcdccagzijy8lbsvn9pp7zy59mikyfvfaj1084xkml4xwc"; }; }; "snyk-gradle-plugin-1.2.0" = { @@ -19575,6 +19602,15 @@ let sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r"; }; }; + "snyk-nuget-plugin-1.0.0" = { + name = "snyk-nuget-plugin"; + packageName = "snyk-nuget-plugin"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.0.0.tgz"; + sha512 = "0kqpbx8ic08dxrlg4mw6xv4ka0bi7f20h53i77rfs0v7j2cnihaij945b78rn6q464simc3amr66jv7svfwyyimj10qcvzhbb02ghvj"; + }; + }; "snyk-policy-1.7.1" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -19755,6 +19791,42 @@ let sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1"; }; }; + "zip-1.2.0" = { + name = "zip"; + packageName = "zip"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/zip/-/zip-1.2.0.tgz"; + sha1 = "ad0ad42265309be42eb56fc86194e17c24e66a9c"; + }; + }; + "bops-0.1.1" = { + name = "bops"; + packageName = "bops"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bops/-/bops-0.1.1.tgz"; + sha1 = "062e02a8daa801fa10f2e5dbe6740cff801fe17e"; + }; + }; + "base64-js-0.0.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz"; + sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"; + }; + }; + "to-utf8-0.0.1" = { + name = "to-utf8"; + packageName = "to-utf8"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz"; + sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852"; + }; + }; "minimatch-3.0.2" = { name = "minimatch"; packageName = "minimatch"; @@ -19900,13 +19972,13 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; - "domino-1.0.29" = { + "domino-1.0.30" = { name = "domino"; packageName = "domino"; - version = "1.0.29"; + version = "1.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.29.tgz"; - sha1 = "de8aa1f6f98e3c5538feb7a61fa69c1eabbace06"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz"; + sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla"; }; }; "express-handlebars-3.0.0" = { @@ -19918,13 +19990,13 @@ let sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "mediawiki-title-0.5.6" = { + "mediawiki-title-0.6.4" = { name = "mediawiki-title"; packageName = "mediawiki-title"; - version = "0.5.6"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.5.6.tgz"; - sha1 = "549069294e27728a1f13bed3d705d6beecf4ea24"; + url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.4.tgz"; + sha1 = "b453ded9e0d9d7c97b7914f3100dbe68840c6e03"; }; }; "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { @@ -19974,13 +20046,13 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; - "yargs-5.0.0" = { + "yargs-7.1.0" = { name = "yargs"; packageName = "yargs"; - version = "5.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; - sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; + sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; }; }; "is-arguments-1.0.2" = { @@ -20037,13 +20109,13 @@ let sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; }; }; - "hot-shots-4.7.0" = { + "hot-shots-4.7.1" = { name = "hot-shots"; packageName = "hot-shots"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.7.0.tgz"; - sha1 = "1fb2eecd234c938e3ccb56c93681b573455dd64c"; + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.7.1.tgz"; + sha1 = "35cb2d3691c66cd18a0fcdffcc9e5b21194275b0"; }; }; "limitation-0.2.0" = { @@ -20055,15 +20127,6 @@ let sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62"; }; }; - "yargs-7.1.0" = { - name = "yargs"; - packageName = "yargs"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz"; - sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; - }; - }; "dnscache-1.0.1" = { name = "dnscache"; packageName = "dnscache"; @@ -20182,13 +20245,13 @@ let sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff"; }; }; - "msgpack5-3.5.1" = { + "msgpack5-3.6.0" = { name = "msgpack5"; packageName = "msgpack5"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.5.1.tgz"; - sha512 = "3a93gp3vf9vwp9dk4xsf25d7m8hmlm779x1wbhv6a8fg9p0341nsmbp2nmip7ypa1bc59f2y07b92cr3lb99i8a62828l5bppsylv2j"; + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz"; + sha512 = "3nr151ygx2w2pydaamcjrcn5ksl2rx09sdad8gh0rp1l07igigvfsw0xjjcnxrdws1rwy7g1j533qzhr7w25jisad6npv9rf1j84yz8"; }; }; "dom-storage-2.0.2" = { @@ -20200,15 +20263,6 @@ let sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; }; }; - "yargs-parser-5.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; - sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; - }; - }; "lodash.clone-4.3.2" = { name = "lodash.clone"; packageName = "lodash.clone"; @@ -20227,13 +20281,13 @@ let sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; }; }; - "yargs-parser-3.2.0" = { + "yargs-parser-5.0.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "3.2.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; - sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz"; + sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; }; }; "airplayer-2.0.0" = { @@ -21362,13 +21416,13 @@ let sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; }; }; - "sanitize-html-1.14.1" = { + "sanitize-html-1.15.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.14.1"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz"; - sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8"; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.15.0.tgz"; + sha512 = "26swjh5wivmim7l7g64f40vnr1dr7kyl5hr9csv84s2apa43rs19qypyf7y5r3a19v0pg9ibcs1spqykznq6jcxvmwrbwdihm78ndfn"; }; }; "linkify-it-1.2.4" = { @@ -21380,13 +21434,22 @@ let sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a"; }; }; - "regexp-quote-0.0.0" = { - name = "regexp-quote"; - packageName = "regexp-quote"; - version = "0.0.0"; + "lodash.escaperegexp-4.1.2" = { + name = "lodash.escaperegexp"; + packageName = "lodash.escaperegexp"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + }; + }; + "srcset-1.0.0" = { + name = "srcset"; + packageName = "srcset"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz"; - sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; + url = "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz"; + sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; }; }; "domutils-1.6.2" = { @@ -21776,49 +21839,166 @@ let sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; }; }; - "coa-1.0.4" = { + "coa-2.0.0" = { name = "coa"; packageName = "coa"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz"; - sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd"; + url = "https://registry.npmjs.org/coa/-/coa-2.0.0.tgz"; + sha1 = "af881ebe214fc29bee4e9e76b4956b6132295546"; }; }; - "js-yaml-3.7.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.7.0"; + "css-url-regex-1.1.0" = { + name = "css-url-regex"; + packageName = "css-url-regex"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz"; + sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec"; }; }; - "whet.extend-0.9.9" = { - name = "whet.extend"; - packageName = "whet.extend"; - version = "0.9.9"; + "unquote-1.1.0" = { + name = "unquote"; + packageName = "unquote"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unquote/-/unquote-1.1.0.tgz"; + sha1 = "98e1fc608b6b854c75afb1b95afc099ba69d942f"; + }; + }; + "css-select-1.3.0-rc0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.3.0-rc0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz"; + sha1 = "6f93196aaae737666ea1036a8cb14a8fcb7a9231"; + }; + }; + "css-select-base-adapter-0.1.0" = { + name = "css-select-base-adapter"; + packageName = "css-select-base-adapter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz"; + sha1 = "0102b3d14630df86c3eb9fa9f5456270106cf990"; + }; + }; + "css-tree-1.0.0-alpha25" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha25"; src = fetchurl { - url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz"; - sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz"; + sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw"; }; }; - "csso-2.3.2" = { + "csso-3.3.1" = { name = "csso"; packageName = "csso"; - version = "2.3.2"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz"; - sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85"; + url = "https://registry.npmjs.org/csso/-/csso-3.3.1.tgz"; + sha512 = "087ks3lnvyygbxivwf2fnn53a033ncz1ywm3jyarhz2hvsflka09iw611cwc55ix974bflcf0wmg6zvfkhxsjqmqfrz61w5y1yi6c9s"; }; }; - "clap-1.2.3" = { - name = "clap"; - packageName = "clap"; - version = "1.2.3"; + "object.values-1.0.4" = { + name = "object.values"; + packageName = "object.values"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz"; + sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a"; + }; + }; + "stable-0.1.6" = { + name = "stable"; + packageName = "stable"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz"; + sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10"; + }; + }; + "util.promisify-1.0.0" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; + }; + }; + "mdn-data-1.0.0" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.0.0.tgz"; + sha1 = "a69d9da76847b4d5834c1465ea25c0653a1fbf66"; + }; + }; + "es-abstract-1.9.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz"; + sha512 = "3frzxsmb5c319c73k3r0zn7djgqbzvnjch99hni35lram09a0q8jlh666m8mjaag9gjnlqjd9gl9xb769gkjd4pb3lhvv58h8kchkcj"; + }; + }; + "es-to-primitive-1.1.1" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; + sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; + }; + }; + "is-callable-1.1.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz"; - sha512 = "1ha66pbxhll7c6vv641rahzq0ylwaifskwpwggy9k4sfh8r9n0r8mpqbib22dppb7zfrk6a84a4dyaal7mqs12jvlaxszz11py0nap0"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; + sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + }; + }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-symbol-1.0.1" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; + sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; + }; + }; + "object.getownpropertydescriptors-2.0.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; }; }; "enhanced-resolve-2.3.0" = { @@ -22001,13 +22181,13 @@ let sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de"; }; }; - "typescript-2.5.3" = { + "typescript-2.6.1" = { name = "typescript"; packageName = "typescript"; - version = "2.5.3"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz"; - sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz"; + sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631"; }; }; "zip-object-0.1.0" = { @@ -22127,15 +22307,6 @@ let sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg"; }; }; - "forever-monitor-1.1.0" = { - name = "forever-monitor"; - packageName = "forever-monitor"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz"; - sha1 = "439ce036f999601cff551aea7f5151001a869ef9"; - }; - }; "getmac-1.2.1" = { name = "getmac"; packageName = "getmac"; @@ -22181,6 +22352,15 @@ let sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937"; }; }; + "memorystore-1.6.0" = { + name = "memorystore"; + packageName = "memorystore"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.0.tgz"; + sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465"; + }; + }; "node-cache-4.1.1" = { name = "node-cache"; packageName = "node-cache"; @@ -22307,87 +22487,6 @@ let sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; - "broadway-0.2.10" = { - name = "broadway"; - packageName = "broadway"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz"; - sha1 = "0f58532be140426e9000e49a93e242a0d1263238"; - }; - }; - "minimatch-0.0.5" = { - name = "minimatch"; - packageName = "minimatch"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz"; - sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de"; - }; - }; - "watch-0.5.1" = { - name = "watch"; - packageName = "watch"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/watch/-/watch-0.5.1.tgz"; - sha1 = "50ea3a056358c98073e0bca59956de4afd20b213"; - }; - }; - "utile-0.1.7" = { - name = "utile"; - packageName = "utile"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/utile/-/utile-0.1.7.tgz"; - sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69"; - }; - }; - "cliff-0.1.8" = { - name = "cliff"; - packageName = "cliff"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz"; - sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272"; - }; - }; - "winston-0.7.2" = { - name = "winston"; - packageName = "winston"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.7.2.tgz"; - sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb"; - }; - }; - "lru-cache-1.0.6" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz"; - sha1 = "aa50f97047422ac72543bda177a9c9d018d98452"; - }; - }; - "ncp-0.2.7" = { - name = "ncp"; - packageName = "ncp"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz"; - sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1"; - }; - }; - "rimraf-1.0.9" = { - name = "rimraf"; - packageName = "rimraf"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz"; - sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1"; - }; - }; "extract-opts-3.3.1" = { name = "extract-opts"; packageName = "extract-opts"; @@ -22964,13 +23063,13 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "pino-4.8.0" = { + "pino-4.8.2" = { name = "pino"; packageName = "pino"; - version = "4.8.0"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.8.0.tgz"; - sha1 = "ffe37684233ebf33ffa58140d7fb5c1f7e170ecd"; + url = "https://registry.npmjs.org/pino/-/pino-4.8.2.tgz"; + sha512 = "2cd8127wzi403lmj965crklncvs06pfnnc8can3s1m2v1lrs1cfpxmnqa4g4rgdph5zz5rqfsg16a0hwzb6j15fpqhxmw3agl5axv8a"; }; }; "postcss-6.0.11" = { @@ -24297,7 +24396,7 @@ in sources."moment-2.17.1" sources."node.extend-1.0.10" sources."pkginfo-0.2.2" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."source-map-0.1.9" sources."walk-sync-0.3.2" sources."xml2tss-0.0.5" @@ -24586,7 +24685,7 @@ in ]; }) sources."moment-2.19.1" - (sources."ms-rest-2.2.3" // { + (sources."ms-rest-2.2.4" // { dependencies = [ sources."moment-2.18.1" ]; @@ -24692,10 +24791,10 @@ in sources."has-color-0.1.7" sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" - sources."@types/node-8.0.46" - sources."@types/request-2.0.6" + sources."@types/node-8.0.47" + sources."@types/request-2.0.7" sources."@types/uuid-3.4.3" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-stream-1.1.0" sources."@types/form-data-2.2.0" sources."lodash-4.17.4" @@ -24892,7 +24991,7 @@ in sources."ext-list-2.2.2" sources."meow-3.7.0" sources."sort-keys-length-1.0.1" - sources."mime-db-1.30.0" + sources."mime-db-1.31.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -25041,7 +25140,7 @@ in sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" sources."readable-stream-2.3.3" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" @@ -25108,7 +25207,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.1" + sources."asn1.js-4.9.2" (sources."ripemd160-2.0.1" // { dependencies = [ sources."hash-base-2.0.2" @@ -25126,7 +25225,7 @@ in sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."function-bind-1.1.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."lexical-scope-1.2.0" sources."astw-2.2.0" sources."acorn-4.0.13" @@ -25702,7 +25801,7 @@ in sources."browserify-transform-tools-1.7.0" sources."falafel-2.1.0" sources."through-2.3.8" - sources."acorn-5.1.2" + sources."acorn-5.2.1" sources."foreach-2.0.5" sources."isarray-0.0.1" sources."object-keys-1.0.11" @@ -25716,7 +25815,7 @@ in sources."interpret-1.0.4" sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."path-parse-1.0.5" (sources."browserify-14.4.0" // { dependencies = [ @@ -25841,7 +25940,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.1" + sources."asn1.js-4.9.2" (sources."ripemd160-2.0.1" // { dependencies = [ sources."hash-base-2.0.2" @@ -25850,7 +25949,7 @@ in sources."sha.js-2.4.9" sources."miller-rabin-4.0.1" sources."function-bind-1.1.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."lexical-scope-1.2.0" (sources."astw-2.2.0" // { dependencies = [ @@ -26532,7 +26631,7 @@ in sources."JSONStream-1.3.1" sources."async-2.5.0" sources."aws4-1.6.0" - sources."aws-sdk-2.138.0" + sources."aws-sdk-2.141.0" sources."ini-1.3.4" sources."optimist-0.6.1" sources."request-2.83.0" @@ -26581,13 +26680,12 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -26595,7 +26693,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -26637,7 +26735,7 @@ in sources."import-jsx-1.3.0" (sources."ink-0.3.1" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -26869,20 +26967,20 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz"; - sha1 = "76879d274068261b191fe0f2f56c74c2f4208e8b"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz"; + sha512 = "284ihlnpkrds6jd5rwdbmknxhci60p5sv24p9aad5ra2rjwb1pcakk3p630bggahmq6jjsxngj9rfmpv31jy9gs29cl2qfxzzq6bi9h"; }; dependencies = [ - sources."ajv-5.2.4" + sources."ajv-5.3.0" (sources."babel-code-frame-6.26.0" // { dependencies = [ sources."chalk-1.1.3" sources."strip-ansi-3.0.1" ]; }) - (sources."chalk-2.2.0" // { + (sources."chalk-2.3.0" // { dependencies = [ sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" @@ -26901,7 +26999,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-9.18.0" - sources."ignore-3.3.6" + sources."ignore-3.3.7" sources."imurmurhash-0.1.4" sources."inquirer-3.3.0" sources."is-resolvable-1.0.0" @@ -26928,6 +27026,7 @@ in sources."text-table-0.2.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."js-tokens-3.0.2" sources."ansi-styles-2.2.1" @@ -26957,7 +27056,7 @@ in sources."ms-2.0.0" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.1.2" + sources."acorn-5.2.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -27000,7 +27099,7 @@ in sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -27022,7 +27121,7 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."ajv-keywords-2.1.0" + sources."ajv-keywords-2.1.1" sources."slice-ansi-1.0.0" ]; buildInputs = globalBuildInputs; @@ -27047,9 +27146,9 @@ in sources."supports-color-2.0.0" ]; }) - (sources."eslint-4.9.0" // { + (sources."eslint-4.10.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."strip-ansi-4.0.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" @@ -27057,7 +27156,7 @@ in ]; }) sources."optionator-0.8.2" - sources."resolve-1.4.0" + sources."resolve-1.5.0" (sources."supports-color-3.2.3" // { dependencies = [ sources."has-flag-1.0.0" @@ -27068,7 +27167,7 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."ansi-regex-2.1.1" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."babel-code-frame-6.26.0" sources."concat-stream-1.6.0" sources."cross-spawn-5.1.0" @@ -27083,11 +27182,11 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" sources."globals-9.18.0" - sources."ignore-3.3.6" + sources."ignore-3.3.7" sources."imurmurhash-0.1.4" (sources."inquirer-3.3.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."strip-ansi-4.0.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" @@ -27110,7 +27209,7 @@ in sources."strip-json-comments-2.0.1" (sources."table-4.0.2" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -27118,6 +27217,7 @@ in sources."text-table-0.2.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."js-tokens-3.0.2" sources."color-convert-1.9.0" @@ -27142,7 +27242,7 @@ in sources."ms-2.0.0" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.1.2" + sources."acorn-5.2.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -27190,7 +27290,7 @@ in sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -27209,7 +27309,7 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."ajv-keywords-2.1.0" + sources."ajv-keywords-2.1.1" sources."slice-ansi-1.0.0" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" @@ -27248,7 +27348,7 @@ in sha512 = "261zykpcgv0r96yd3qck2g2a990psma49p37kdk1xgic657pv1jnp9n9js90hqv58spgmww85kig9bd7b05lyxagz4d8nm5algyc00x"; }; dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."log-update-2.2.0" sources."meow-3.7.0" (sources."ora-1.3.0" // { @@ -27336,12 +27436,7 @@ in ]; }) sources."debug-2.6.9" - (sources."extract-zip-1.6.5" // { - dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" - ]; - }) + sources."extract-zip-1.6.6" sources."https-proxy-agent-2.1.0" sources."mime-1.4.1" sources."progress-2.0.0" @@ -27524,7 +27619,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -27562,7 +27657,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" @@ -27846,7 +27941,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."acorn-globals-1.0.9" sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" @@ -27957,7 +28052,7 @@ in sources."lodash.isstring-4.0.1" sources."lodash.mapvalues-4.6.0" sources."rechoir-0.6.2" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."detect-file-0.1.0" sources."is-glob-2.0.1" sources."micromatch-2.3.11" @@ -27997,7 +28092,7 @@ in ]; }) sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."remove-trailing-separator-1.1.0" sources."for-own-0.1.5" @@ -28200,23 +28295,55 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "3.13.2"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.13.2.tgz"; - sha512 = "2wd7s9cn0x8ig8dpajdk40ssym0byplr6qv8gd2ppb96r4cyhmx519k8m0skdzdir02d5ady9hbaz90jcfl4j1zfzibjjwr9g8rddb1"; + url = "https://registry.npmjs.org/ionic/-/ionic-3.15.2.tgz"; + sha512 = "0sdvn9yk297mzlaw81phrpki1xcg06jyyg8kc5wkwkyxbki8vszans6ynzlicpfyq4nqj2a31h4nwh9qyb0pxm7p838a2kxl33016a6"; }; dependencies = [ - sources."@ionic/cli-utils-1.13.1" - sources."@ionic/discover-0.3.3" - sources."chalk-2.2.0" + sources."@ionic/cli-framework-0.0.2" + sources."@ionic/cli-utils-1.15.2" + sources."chalk-2.3.0" sources."opn-5.1.0" sources."os-name-2.0.1" sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tslib-1.8.0" + sources."ncp-2.0.0" + sources."strip-ansi-4.0.0" + sources."superagent-3.8.0" + sources."ansi-regex-3.0.0" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."debug-3.1.0" + sources."extend-3.0.1" + sources."form-data-2.3.1" + sources."formidable-1.1.1" + sources."methods-1.1.2" + sources."mime-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.3.3" + sources."ms-2.0.0" + sources."asynckit-0.4.0" + sources."combined-stream-1.0.5" + sources."mime-types-2.1.17" + sources."delayed-stream-1.0.0" + sources."mime-db-1.30.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + sources."util-deprecate-1.0.2" + sources."@ionic/discover-0.3.3" sources."archiver-2.1.0" sources."basic-auth-1.1.0" - sources."body-parser-1.18.2" + (sources."body-parser-1.18.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."chokidar-1.7.0" sources."ci-info-1.1.1" sources."cross-spawn-5.1.0" @@ -28225,15 +28352,19 @@ in sources."elementtree-0.1.7" (sources."express-4.16.2" // { dependencies = [ + sources."debug-2.6.9" sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) sources."inquirer-3.3.0" - sources."leek-0.0.24" + (sources."leek-0.0.24" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."lodash-4.17.4" sources."minimist-1.2.0" - sources."ncp-2.0.0" sources."proxy-middleware-0.15.0" (sources."slice-ansi-1.0.0" // { dependencies = [ @@ -28246,27 +28377,20 @@ in sources."is-fullwidth-code-point-2.0.0" ]; }) - (sources."strip-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - ]; - }) - (sources."superagent-3.7.0" // { + sources."tar-2.2.1" + (sources."tiny-lr-1.0.5" // { dependencies = [ - sources."debug-3.1.0" - sources."form-data-2.3.1" + sources."debug-2.6.9" ]; }) - sources."tar-2.2.1" - sources."tiny-lr-1.0.5" sources."uuid-3.1.0" sources."wrap-ansi-3.0.1" sources."ws-3.2.0" + sources."netmask-1.0.6" sources."archiver-utils-1.3.0" sources."async-2.5.0" sources."buffer-crc32-0.2.13" sources."glob-7.1.2" - sources."readable-stream-2.3.3" sources."tar-stream-1.5.4" sources."zip-stream-1.2.0" sources."graceful-fs-4.1.11" @@ -28275,7 +28399,6 @@ in sources."remove-trailing-separator-1.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."inherits-2.0.3" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -28283,12 +28406,6 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" sources."bl-1.2.1" sources."end-of-stream-1.4.0" sources."xtend-4.0.1" @@ -28297,22 +28414,17 @@ in sources."crc-3.5.0" sources."bytes-3.0.0" sources."content-type-1.0.4" - sources."debug-2.6.9" sources."depd-1.1.1" sources."http-errors-1.6.2" sources."iconv-lite-0.4.19" sources."on-finished-2.3.0" - sources."qs-6.5.1" sources."raw-body-2.3.2" sources."type-is-1.6.15" - sources."ms-2.0.0" sources."setprototypeof-1.0.3" sources."statuses-1.4.0" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.17" - sources."mime-db-1.30.0" sources."anymatch-1.3.2" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -28350,7 +28462,7 @@ in ]; }) sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -28373,11 +28485,16 @@ in sources."rc-1.2.2" (sources."request-2.81.0" // { dependencies = [ + sources."form-data-2.1.4" sources."qs-6.4.0" ]; }) sources."hawk-3.1.3" - sources."tar-pack-3.4.0" + (sources."tar-pack-3.4.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" @@ -28388,6 +28505,7 @@ in dependencies = [ sources."string-width-1.0.2" sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" ]; }) sources."set-blocking-2.0.0" @@ -28400,22 +28518,19 @@ in dependencies = [ sources."string-width-1.0.2" sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" ]; }) sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."ansi-regex-2.1.1" sources."deep-extend-0.4.2" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" - sources."combined-stream-1.0.5" - sources."extend-3.0.1" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" sources."har-validator-4.2.1" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" @@ -28426,8 +28541,6 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" sources."ajv-4.11.8" sources."har-schema-1.0.5" sources."co-4.6.0" @@ -28492,18 +28605,19 @@ in sources."etag-1.8.1" (sources."finalhandler-1.1.0" // { dependencies = [ + sources."debug-2.6.9" sources."statuses-1.3.1" ]; }) sources."fresh-0.5.2" sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" sources."parseurl-1.3.2" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.2" sources."range-parser-1.2.0" (sources."send-0.16.1" // { dependencies = [ + sources."debug-2.6.9" sources."statuses-1.3.1" ]; }) @@ -28514,7 +28628,6 @@ in sources."forwarded-0.1.2" sources."ipaddr.js-1.5.2" sources."destroy-1.0.4" - sources."mime-1.4.1" sources."ansi-escapes-3.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" @@ -28528,7 +28641,7 @@ in sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."mimic-fn-1.1.0" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."escape-string-regexp-1.0.5" sources."is-promise-2.1.0" @@ -28544,9 +28657,6 @@ in sources."lodash._getnative-3.9.1" sources."lodash.isarguments-3.1.0" sources."lodash.isarray-3.0.4" - sources."component-emitter-1.2.1" - sources."cookiejar-2.1.1" - sources."formidable-1.1.1" sources."block-stream-0.0.9" (sources."body-5.1.0" // { dependencies = [ @@ -28566,7 +28676,6 @@ in sources."websocket-extensions-0.1.2" sources."async-limiter-1.0.0" sources."ultron-1.1.0" - sources."netmask-1.0.6" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" sources."color-convert-1.9.0" @@ -28681,7 +28790,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."argparse-1.0.9" sources."sprintf-js-1.0.3" sources."has-flag-1.0.0" @@ -28698,16 +28807,15 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.5.2"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.2.tgz"; - sha512 = "2vlp1rxalykzb0qwn4sv1pk58ph37nhaqqgnih83i39msplqh826dvbdd4j1791hl2almpj9g1snhdfy89cyn8y86bz7bcbr9mh6aih"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.5.4.tgz"; + sha512 = "08pa61nhkvmac5kwr61iqbw0251r6kwhix9l41rgxjinpi8p9s5anvy8a2zzfjrlkr93aqbbniy4qa095li7xn84vl8dv6aqxkpaba4"; }; dependencies = [ - sources."@reactivex/rxjs-5.5.0" sources."chai-4.1.2" sources."chai-as-promised-7.1.1" - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."commander-2.11.0" sources."fast-json-patch-2.0.6" sources."glob-7.1.2" @@ -28721,13 +28829,13 @@ in sources."mz-2.7.0" sources."object-hash-1.2.0" sources."opentracing-0.14.1" + sources."rxjs-5.5.2" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."typescript-2.4.2" sources."vscode-jsonrpc-3.4.1" sources."vscode-languageserver-3.4.3" sources."vscode-languageserver-types-3.4.0" - sources."symbol-observable-1.0.4" sources."assertion-error-1.0.2" sources."check-error-1.0.2" sources."deep-eql-3.0.1" @@ -28764,6 +28872,7 @@ in sources."object-assign-4.1.1" sources."thenify-all-1.6.0" sources."thenify-3.3.0" + sources."symbol-observable-1.0.4" sources."vscode-uri-1.0.1" sources."vscode-languageserver-protocol-3.4.4" ]; @@ -28951,7 +29060,7 @@ in sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" - sources."superagent-3.7.0" + sources."superagent-3.8.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."debug-3.1.0" @@ -29117,13 +29226,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -29131,7 +29239,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -29401,7 +29509,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -29436,7 +29544,7 @@ in sources."hawk-3.1.3" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."osenv-0.1.4" @@ -29794,7 +29902,7 @@ in }; dependencies = [ sources."async-1.5.2" - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" sources."command-join-2.0.0" @@ -29959,7 +30067,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."through-2.3.8" sources."JSONStream-1.3.1" sources."is-text-path-1.0.1" @@ -30066,7 +30174,7 @@ in sources."onetime-2.0.1" sources."mimic-fn-1.1.0" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" @@ -30247,7 +30355,7 @@ in ]; }) sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."remove-trailing-separator-1.1.0" sources."for-own-0.1.5" @@ -30311,7 +30419,7 @@ in sources."hawk-6.0.2" sources."http-signature-1.2.0" sources."performance-now-2.1.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" @@ -30320,7 +30428,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" ]; }) @@ -30384,7 +30492,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -30426,7 +30534,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" @@ -30567,6 +30675,7 @@ in sources."html-entities-1.2.1" sources."is-wsl-1.1.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" (sources."engine.io-3.1.3" // { dependencies = [ @@ -30690,7 +30799,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -30728,7 +30837,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."osenv-0.1.4" @@ -30978,7 +31087,7 @@ in sources."slash-1.0.0" sources."uri-js-3.0.2" sources."lodash-4.17.4" - sources."superagent-3.7.0" + sources."superagent-3.8.0" sources."component-emitter-1.2.1" sources."cookiejar-2.1.1" sources."debug-3.1.0" @@ -31115,13 +31224,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -31129,7 +31237,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -31272,13 +31380,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -31286,7 +31393,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -31490,7 +31597,7 @@ in }) sources."hawk-3.1.3" sources."tar-2.2.1" - (sources."tar-pack-3.4.0" // { + (sources."tar-pack-3.4.1" // { dependencies = [ sources."rimraf-2.6.2" sources."glob-7.1.2" @@ -31623,7 +31730,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."osenv-0.1.4" @@ -31812,7 +31919,7 @@ in }) sources."repeat-string-1.6.1" sources."isarray-1.0.0" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -31846,7 +31953,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."minimist-0.0.8" sources."abbrev-1.1.1" sources."osenv-0.1.4" @@ -31977,7 +32084,7 @@ in sources."ansi-regex-3.0.0" ]; }) - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."configstore-3.1.1" sources."import-lazy-2.1.0" sources."is-installed-globally-0.1.0" @@ -32135,7 +32242,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" ]; }) @@ -32193,7 +32300,7 @@ in sources."cookie-signature-1.0.6" sources."object-assign-4.1.1" sources."vary-1.1.2" - sources."moment-timezone-0.5.13" + sources."moment-timezone-0.5.14" sources."moment-2.19.1" sources."accepts-1.3.4" sources."array-flatten-1.1.1" @@ -32251,7 +32358,7 @@ in sources."pump-1.0.2" sources."reinterval-1.1.0" sources."split2-2.2.0" - (sources."websocket-stream-5.0.1" // { + (sources."websocket-stream-5.1.1" // { dependencies = [ sources."ws-3.2.0" ]; @@ -32469,10 +32576,11 @@ in sources."performance-now-2.1.0" sources."uuid-3.1.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" sources."nan-2.6.2" (sources."node-pre-gyp-0.6.36" // { @@ -32494,7 +32602,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" ]; }) @@ -32502,7 +32610,7 @@ in sources."rc-1.2.2" sources."rimraf-2.6.2" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -32743,7 +32851,7 @@ in sources."path-is-inside-1.0.2" sources."promise-inflight-1.0.1" sources."qrcode-terminal-0.11.0" - sources."query-string-5.0.0" + sources."query-string-5.0.1" sources."qw-1.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" @@ -32783,7 +32891,7 @@ in sources."uuid-3.1.0" sources."validate-npm-package-name-3.0.0" sources."which-1.3.0" - sources."worker-farm-1.5.0" + sources."worker-farm-1.5.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" @@ -32976,13 +33084,12 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -32990,7 +33097,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -33016,7 +33123,7 @@ in sources."unique-slug-2.0.0" (sources."boxen-1.2.2" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."string-width-2.1.1" sources."is-fullwidth-code-point-2.0.0" ]; @@ -33174,13 +33281,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -33188,7 +33294,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -33305,7 +33411,7 @@ in }) sources."semver-5.4.1" sources."semver-utils-1.1.1" - (sources."snyk-1.45.0" // { + (sources."snyk-1.47.0" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -33320,7 +33426,7 @@ in (sources."update-notifier-2.3.0" // { dependencies = [ sources."boxen-1.2.2" - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."configstore-3.1.1" sources."latest-version-3.1.0" sources."xdg-basedir-3.0.0" @@ -33607,10 +33713,15 @@ in sources."open-0.0.5" sources."os-name-1.0.3" sources."snyk-config-1.0.1" - sources."snyk-go-plugin-1.3.7" + sources."snyk-go-plugin-1.3.8" sources."snyk-gradle-plugin-1.2.0" sources."snyk-module-1.8.1" sources."snyk-mvn-plugin-1.1.0" + (sources."snyk-nuget-plugin-1.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) sources."snyk-policy-1.7.1" sources."snyk-python-plugin-1.4.0" (sources."snyk-recursive-readdir-2.0.0" // { @@ -33677,7 +33788,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."graphlib-2.1.1" sources."toml-2.3.3" sources."clone-deep-0.3.0" @@ -33697,6 +33808,13 @@ in sources."for-in-0.1.8" ]; }) + sources."xml2js-0.4.19" + sources."zip-1.2.0" + sources."sax-1.2.4" + sources."xmlbuilder-9.0.4" + sources."bops-0.1.1" + sources."base64-js-0.0.2" + sources."to-utf8-0.0.1" sources."js-yaml-3.10.0" sources."argparse-1.0.9" sources."esprima-4.0.0" @@ -33869,10 +33987,10 @@ in parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/parsoid/-/parsoid-0.7.1.tgz"; - sha1 = "121dcf59d0bacd9247405988525888f9a6ba2328"; + url = "https://registry.npmjs.org/parsoid/-/parsoid-0.8.0.tgz"; + sha1 = "fbedac4c5c0b721f4c241287b81bdc3e4c7987c9"; }; dependencies = [ sources."async-0.9.2" @@ -33887,47 +34005,36 @@ in sources."content-type-git+https://github.com/wikimedia/content-type.git#master" sources."core-js-2.5.1" sources."diff-1.4.0" - sources."domino-1.0.29" + sources."domino-1.0.30" sources."entities-1.1.1" (sources."express-4.16.2" // { dependencies = [ sources."content-type-1.0.4" - sources."finalhandler-1.1.0" sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) sources."express-handlebars-3.0.0" - (sources."finalhandler-0.5.1" // { + (sources."finalhandler-1.1.0" // { dependencies = [ - sources."debug-2.2.0" sources."statuses-1.3.1" - sources."ms-0.7.1" ]; }) sources."js-yaml-3.10.0" - sources."mediawiki-title-0.5.6" + sources."mediawiki-title-0.6.4" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" - sources."node-uuid-1.4.8" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" sources."prfun-2.1.4" sources."request-2.83.0" sources."semver-5.4.1" sources."serve-favicon-2.4.5" - (sources."service-runner-2.3.0" // { - dependencies = [ - sources."yargs-7.1.0" - sources."camelcase-3.0.0" - sources."cliui-3.2.0" - ]; - }) + sources."service-runner-2.3.0" sources."simplediff-0.1.1" - (sources."yargs-5.0.0" // { + sources."uuid-3.1.0" + (sources."yargs-7.1.0" // { dependencies = [ - sources."cliui-3.2.0" - sources."window-size-0.2.0" - sources."yargs-parser-3.2.0" sources."camelcase-3.0.0" + sources."cliui-3.2.0" ]; }) sources."asap-2.0.6" @@ -34031,7 +34138,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."function-bind-1.1.1" sources."object-keys-1.0.11" sources."define-properties-1.1.2" @@ -34057,16 +34164,14 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -34074,7 +34179,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -34093,7 +34198,7 @@ in sources."bunyan-1.8.12" sources."bunyan-syslog-udp-0.1.0" sources."gelf-stream-1.1.1" - sources."hot-shots-4.7.0" + sources."hot-shots-4.7.1" (sources."limitation-0.2.0" // { dependencies = [ sources."readable-stream-2.3.3" @@ -34140,7 +34245,7 @@ in }) sources."lodash-3.10.1" sources."merge-1.2.0" - (sources."msgpack5-3.5.1" // { + (sources."msgpack5-3.6.0" // { dependencies = [ sources."readable-stream-2.3.3" sources."isarray-1.0.0" @@ -34157,6 +34262,8 @@ in sources."string_decoder-1.0.3" ]; }) + sources."lodash.clone-4.3.2" + sources."lodash._baseclone-4.5.7" sources."get-caller-file-1.0.2" sources."os-locale-1.4.0" sources."read-pkg-up-1.0.1" @@ -34200,9 +34307,6 @@ in sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."lodash.clone-4.3.2" - sources."lodash._baseclone-4.5.7" - sources."lodash.assign-4.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -35109,7 +35213,7 @@ in sources."string_decoder-1.0.3" ]; }) - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" @@ -35175,7 +35279,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.1" + sources."asn1.js-4.9.2" (sources."ripemd160-2.0.1" // { dependencies = [ sources."hash-base-2.0.2" @@ -35184,7 +35288,7 @@ in sources."sha.js-2.4.9" sources."miller-rabin-4.0.1" sources."function-bind-1.1.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."lexical-scope-1.2.0" sources."astw-2.2.0" sources."acorn-4.0.13" @@ -35294,7 +35398,7 @@ in sources."hawk-3.1.3" sources."semver-5.4.1" sources."tar-2.2.1" - (sources."tar-pack-3.4.0" // { + (sources."tar-pack-3.4.1" // { dependencies = [ sources."rimraf-2.6.2" ]; @@ -35557,13 +35661,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -35571,7 +35674,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -35613,10 +35716,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.3.1"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.3.1.tgz"; - sha512 = "3zimikqfpvw7vhrp8qaf1pk3wk9idqpa72jvla68f9skcyrl9027ksgb851y251fzxmklxzymipy42gf9m7vnp8jjvya4gwng7mmr6n"; + url = "https://registry.npmjs.org/serve/-/serve-6.4.0.tgz"; + sha512 = "0kb65fj5n5z4j11c8247zvabb0qp4w5w9ls29bypm11ay9g2a1riv5wl72ya44b4arwxhyawxxijb5r5zjlwfs9zsbklcp6vbc8mphs"; }; dependencies = [ sources."args-3.0.7" @@ -35637,7 +35740,11 @@ in sources."ip-1.1.5" sources."micro-9.0.0" sources."micro-compress-1.0.0" - sources."mime-types-2.1.17" + (sources."mime-types-2.1.17" // { + dependencies = [ + sources."mime-db-1.30.0" + ]; + }) sources."node-version-1.1.0" sources."openssl-self-signed-certificate-1.1.6" sources."opn-5.1.0" @@ -35730,7 +35837,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."media-typer-0.3.0" sources."raw-body-2.3.2" sources."bytes-3.0.0" @@ -35747,7 +35854,7 @@ in sources."on-headers-1.0.1" sources."vary-1.1.2" sources."negotiator-0.6.1" - sources."mime-db-1.30.0" + sources."mime-db-1.31.0" sources."is-wsl-1.1.0" sources."pify-3.0.0" sources."destroy-1.0.4" @@ -35939,13 +36046,12 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -35953,7 +36059,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -36000,7 +36106,7 @@ in sources."source-map-0.1.43" sources."amdefine-1.0.1" sources."markdown-it-4.4.0" - sources."sanitize-html-1.14.1" + sources."sanitize-html-1.15.0" sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" @@ -36010,7 +36116,8 @@ in sources."readable-stream-2.3.3" ]; }) - sources."regexp-quote-0.0.0" + sources."lodash.escaperegexp-4.1.2" + sources."srcset-1.0.0" sources."xtend-4.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.4.1" @@ -36024,6 +36131,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" + sources."array-uniq-1.0.3" + sources."number-is-nan-1.0.1" sources."jsonparse-1.3.1" sources."through-2.3.8" sources."minimist-0.0.8" @@ -36218,6 +36327,62 @@ in }; production = true; }; + "socket.io" = nodeEnv.buildNodePackage { + name = "socket.io"; + packageName = "socket.io"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz"; + sha1 = "c1a4590ceff87ecf13c72652f046f716b29e6014"; + }; + dependencies = [ + sources."debug-2.6.9" + sources."engine.io-3.1.3" + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.0.4" + sources."socket.io-parser-3.1.2" + sources."ms-2.0.0" + sources."accepts-1.3.3" + sources."base64id-1.0.0" + sources."engine.io-parser-2.1.1" + sources."ws-2.3.1" + sources."cookie-0.3.1" + sources."uws-0.14.5" + sources."mime-types-2.1.17" + sources."negotiator-0.6.1" + sources."mime-db-1.30.0" + sources."after-0.8.2" + sources."arraybuffer.slice-0.0.6" + sources."base64-arraybuffer-0.1.5" + sources."blob-0.0.4" + sources."has-binary2-1.0.2" + sources."isarray-2.0.1" + sources."safe-buffer-5.0.1" + sources."ultron-1.1.0" + sources."backo2-1.0.2" + sources."component-bind-1.0.0" + sources."component-emitter-1.2.1" + sources."engine.io-client-3.1.3" + sources."has-cors-1.1.0" + sources."indexof-0.0.1" + sources."object-component-0.0.3" + sources."parseqs-0.0.5" + sources."parseuri-0.0.5" + sources."to-array-0.1.4" + sources."component-inherit-0.0.3" + sources."xmlhttprequest-ssl-1.5.4" + sources."yeast-0.1.2" + sources."better-assert-1.0.2" + sources."callsite-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "node.js realtime framework server"; + homepage = "https://github.com/socketio/socket.io#readme"; + license = "MIT"; + }; + production = true; + }; stylus = nodeEnv.buildNodePackage { name = "stylus"; packageName = "stylus"; @@ -36258,33 +36423,56 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz"; - sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; + url = "https://registry.npmjs.org/svgo/-/svgo-1.0.1.tgz"; + sha512 = "2higmngdwd7fgjzcgy9drv5wgm201dza97l73s7arcwjvc725vkvwfqrzcs96agl989ya0mmi1k96d5k3hy6b9cb12jj5qz0dyy4h2q"; }; dependencies = [ - sources."sax-1.2.4" - sources."coa-1.0.4" - sources."js-yaml-3.7.0" + sources."coa-2.0.0" sources."colors-1.1.2" - sources."whet.extend-0.9.9" + sources."css-url-regex-1.1.0" + sources."unquote-1.1.0" sources."mkdirp-0.5.1" - sources."csso-2.3.2" + sources."css-select-1.3.0-rc0" + sources."css-select-base-adapter-0.1.0" + sources."css-tree-1.0.0-alpha25" + sources."csso-3.3.1" + sources."js-yaml-3.10.0" + sources."object.values-1.0.4" + sources."sax-1.2.4" + sources."stable-0.1.6" + sources."util.promisify-1.0.0" sources."q-1.5.1" - sources."argparse-1.0.9" - sources."esprima-2.7.3" - sources."sprintf-js-1.0.3" sources."minimist-0.0.8" - sources."clap-1.2.3" + sources."boolbase-1.0.0" + sources."css-what-2.1.0" + sources."domutils-1.5.1" + sources."nth-check-1.0.1" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."domelementtype-1.3.0" + sources."entities-1.1.1" + sources."mdn-data-1.0.0" sources."source-map-0.5.7" - sources."chalk-1.1.3" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" + sources."argparse-1.0.9" + sources."esprima-4.0.0" + sources."sprintf-js-1.0.3" + sources."define-properties-1.1.2" + sources."es-abstract-1.9.0" + sources."has-1.0.1" + sources."function-bind-1.1.1" + sources."foreach-2.0.5" + sources."object-keys-1.0.11" + sources."es-to-primitive-1.1.1" + sources."is-callable-1.1.3" + sources."is-regex-1.0.4" + sources."is-date-object-1.0.1" + sources."is-symbol-1.0.1" + sources."object.getownpropertydescriptors-2.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -36342,10 +36530,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.5.3"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz"; - sha512 = "3mhb4cnf07q9jnz7r8iy06iwsq32byfvn4z3f6bbbw2sknnppa4q2v5vm12bxix8lwvbdhhqhdvkr0v1bhdb0zkxf90pqcjrm1d5lm6"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz"; + sha1 = "ef39cdea27abac0b500242d6726ab90e0c846631"; }; buildInputs = globalBuildInputs; meta = { @@ -36378,7 +36566,7 @@ in sources."typings-core-2.3.3" (sources."update-notifier-2.3.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -36438,7 +36626,7 @@ in sources."thenify-3.3.0" sources."throat-3.2.0" sources."touch-1.0.0" - sources."typescript-2.5.3" + sources."typescript-2.6.1" sources."zip-object-0.1.0" sources."dot-prop-4.2.0" sources."make-dir-1.1.0" @@ -36504,7 +36692,7 @@ in sources."abbrev-1.1.1" (sources."boxen-1.2.2" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -36577,10 +36765,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.5.tgz"; - sha512 = "1fgrmz71wwy21h9m0vg1f0hd9g4c5gdj1xa87cfcl920plwpv90ps0kkafs6xhgbvxl2a9bqmjz8k6sdp96x9hf9cap0r66pwxsaamm"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.6.tgz"; + sha512 = "1hffvxym85dy9nzmjriwyazvy7k6x3iwp0j0dway300hawcdbmfirbglvshxjflzci25z725zl07650m5dgdfydlc0m648a275ixfzy"; }; dependencies = [ sources."commander-2.11.0" @@ -36597,10 +36785,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.33"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.33.tgz"; - sha1 = "f5b42a9e36e6d236060df399ece5bd14066cf716"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.2.0.tgz"; + sha512 = "3qbjszm2whg22ljrg0knwzn1d2ry9mxkpqsbh7pmnjgfzyalqjc8h8s7v8iyb71gavj78d6gmlk0dkhdlsr2hgcai9ndjs6vad8p6gg"; }; dependencies = [ sources."async-2.5.0" @@ -36622,10 +36810,9 @@ in sources."utils-merge-1.0.1" ]; }) - sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.3.6" + sources."ignore-3.3.7" sources."just-detect-adblock-1.0.0" (sources."keen.io-0.1.3" // { dependencies = [ @@ -36633,72 +36820,27 @@ in sources."qs-1.2.0" sources."mime-1.2.11" sources."methods-1.0.1" - sources."form-data-0.1.3" - sources."async-0.9.2" ]; }) sources."knockout-3.4.2" sources."lodash-4.17.4" - (sources."mkdirp-0.5.1" // { + (sources."memorystore-1.6.0" // { dependencies = [ - sources."minimist-0.0.8" + sources."debug-3.1.0" ]; }) + sources."mkdirp-0.5.1" sources."moment-2.18.1" sources."node-cache-4.1.1" (sources."npm-5.4.2" // { dependencies = [ - sources."lru-cache-4.1.1" sources."nopt-4.0.1" sources."readable-stream-2.3.3" - sources."request-2.81.0" sources."isarray-1.0.0" sources."string_decoder-1.0.3" - sources."combined-stream-1.0.5" - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."hawk-3.1.3" - sources."json-stringify-safe-5.0.1" - sources."oauth-sign-0.8.2" - sources."qs-6.4.0" - sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."npm-registry-client-8.4.0" // { - dependencies = [ - sources."request-2.83.0" - sources."aws-sign2-0.7.0" - sources."combined-stream-1.0.5" - sources."extend-3.0.1" - sources."forever-agent-0.6.1" - sources."form-data-2.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" - sources."json-stringify-safe-5.0.1" - sources."oauth-sign-0.8.2" - sources."performance-now-2.1.0" - sources."tunnel-agent-0.6.0" - sources."delayed-stream-1.0.0" - sources."ajv-5.2.4" - sources."har-schema-2.0.0" - sources."hoek-4.2.0" - sources."boom-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - sources."sntp-2.0.2" - sources."assert-plus-1.0.0" ]; }) + sources."npm-registry-client-8.4.0" sources."octicons-3.5.0" sources."open-0.0.5" sources."os-homedir-1.0.2" @@ -36706,8 +36848,6 @@ in sources."passport-local-1.0.0" (sources."raven-2.1.2" // { dependencies = [ - sources."json-stringify-safe-5.0.1" - sources."stack-trace-0.0.9" sources."uuid-3.0.0" ]; }) @@ -36744,7 +36884,6 @@ in (sources."winston-2.3.1" // { dependencies = [ sources."async-1.0.0" - sources."colors-1.0.3" ]; }) sources."yargs-9.0.1" @@ -36817,79 +36956,6 @@ in sources."on-headers-1.0.1" sources."uid-safe-2.1.5" sources."random-bytes-1.0.0" - (sources."broadway-0.2.10" // { - dependencies = [ - sources."winston-0.7.2" - sources."utile-0.2.1" - sources."async-0.2.10" - sources."pkginfo-0.3.1" - sources."request-2.16.6" - sources."mime-1.2.11" - sources."qs-0.5.6" - ]; - }) - sources."minimatch-0.0.5" - sources."pkginfo-0.4.1" - sources."ps-tree-0.0.3" - sources."watch-0.5.1" - (sources."utile-0.1.7" // { - dependencies = [ - sources."async-0.1.22" - sources."ncp-0.2.7" - sources."rimraf-1.0.9" - ]; - }) - (sources."cliff-0.1.8" // { - dependencies = [ - sources."winston-0.6.2" - sources."async-0.1.22" - sources."pkginfo-0.2.3" - ]; - }) - sources."eventemitter2-0.4.14" - (sources."nconf-0.6.9" // { - dependencies = [ - sources."async-0.2.9" - ]; - }) - sources."colors-0.6.2" - sources."eyes-0.1.8" - sources."cycle-1.0.3" - sources."request-2.9.203" - sources."stack-trace-0.0.10" - sources."ini-1.3.4" - sources."optimist-0.6.0" - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - (sources."form-data-0.0.10" // { - dependencies = [ - sources."mime-1.2.11" - sources."async-0.2.10" - ]; - }) - sources."hawk-0.10.2" - sources."node-uuid-1.4.8" - sources."cookie-jar-0.2.0" - sources."aws-sign-0.2.0" - sources."oauth-sign-0.2.0" - sources."forever-agent-0.2.0" - sources."tunnel-agent-0.2.0" - sources."json-stringify-safe-3.0.0" - sources."combined-stream-0.0.7" - sources."delayed-stream-0.0.5" - sources."hoek-0.7.6" - sources."boom-0.3.8" - sources."cryptiles-0.1.3" - sources."sntp-0.1.4" - sources."deep-equal-1.0.1" - sources."i-0.3.6" - sources."ncp-0.4.2" - sources."lru-cache-1.0.6" - (sources."event-stream-0.5.3" // { - dependencies = [ - sources."optimist-0.2.8" - ]; - }) sources."extract-opts-3.3.1" sources."eachr-3.2.0" sources."editions-1.3.3" @@ -36900,10 +36966,22 @@ in sources."cookiejar-2.0.1" sources."reduce-component-1.0.1" sources."extend-1.2.1" + (sources."form-data-0.1.3" // { + dependencies = [ + sources."mime-1.2.11" + sources."async-0.9.2" + ]; + }) sources."readable-stream-1.0.27-1" + sources."combined-stream-0.0.7" + sources."delayed-stream-0.0.5" sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" + sources."lru-cache-4.1.1" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."minimist-0.0.8" sources."clone-2.1.1" sources."JSONStream-1.3.1" sources."ansi-regex-3.0.0" @@ -36911,11 +36989,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.1.2" sources."archy-1.0.0" - (sources."cacache-9.2.9" // { - dependencies = [ - sources."lru-cache-4.1.1" - ]; - }) + sources."cacache-9.2.9" sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" @@ -36937,16 +37011,13 @@ in sources."string_decoder-1.0.3" ]; }) - (sources."glob-7.1.2" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) + sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" sources."hosted-git-info-2.5.0" sources."iferr-0.1.5" sources."inflight-1.0.6" + sources."ini-1.3.4" sources."init-package-json-1.10.1" sources."lazy-property-1.0.0" (sources."libnpx-9.6.0" // { @@ -36965,7 +37036,6 @@ in sources."move-concurrently-1.0.1" (sources."node-gyp-3.6.2" // { dependencies = [ - sources."minimatch-3.0.4" sources."nopt-3.0.6" sources."semver-5.3.0" sources."tar-2.2.1" @@ -36982,12 +37052,7 @@ in sources."once-1.4.0" sources."opener-1.4.3" sources."osenv-0.1.4" - (sources."pacote-6.0.4" // { - dependencies = [ - sources."lru-cache-4.1.1" - sources."minimatch-3.0.4" - ]; - }) + sources."pacote-6.0.4" sources."path-is-inside-1.0.2" sources."promise-inflight-1.0.1" sources."read-1.0.7" @@ -36995,6 +37060,15 @@ in sources."read-installed-4.0.3" sources."read-package-json-2.0.12" sources."read-package-tree-5.1.6" + (sources."request-2.81.0" // { + dependencies = [ + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."form-data-2.1.4" + sources."qs-6.4.0" + sources."delayed-stream-1.0.0" + ]; + }) sources."retry-0.10.1" sources."safe-buffer-5.1.1" (sources."sha-2.0.1" // { @@ -37027,7 +37101,7 @@ in sources."uuid-3.1.0" sources."validate-npm-package-name-3.0.0" sources."which-1.3.0" - sources."worker-farm-1.5.0" + sources."worker-farm-1.5.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" @@ -37043,8 +37117,6 @@ in sources."jsonparse-1.3.1" sources."through-2.3.8" sources."y18n-3.2.1" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" sources."wcwidth-1.0.1" (sources."defaults-1.0.3" // { dependencies = [ @@ -37056,6 +37128,7 @@ in sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."fs.realpath-1.0.0" + sources."minimatch-3.0.4" sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" @@ -37097,11 +37170,7 @@ in sources."execa-0.7.0" sources."lcid-1.0.0" sources."mem-1.1.0" - (sources."cross-spawn-5.1.0" // { - dependencies = [ - sources."lru-cache-4.1.1" - ]; - }) + sources."cross-spawn-5.1.0" sources."get-stream-3.0.0" sources."is-stream-1.1.0" sources."npm-run-path-2.0.2" @@ -37187,11 +37256,7 @@ in sources."block-stream-0.0.9" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" - (sources."ignore-walk-3.0.1" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) + sources."ignore-walk-3.0.1" sources."npm-bundled-1.0.3" (sources."are-we-there-yet-1.1.4" // { dependencies = [ @@ -37218,11 +37283,7 @@ in ]; }) sources."os-tmpdir-1.0.2" - (sources."make-fetch-happen-2.5.0" // { - dependencies = [ - sources."lru-cache-4.1.1" - ]; - }) + sources."make-fetch-happen-2.5.0" sources."npm-pick-manifest-1.0.4" sources."promise-retry-1.1.1" sources."protoduck-4.0.0" @@ -37249,19 +37310,28 @@ in sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" + sources."forever-agent-0.6.1" sources."har-validator-4.2.1" + sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" sources."asynckit-0.4.0" sources."ajv-4.11.8" sources."har-schema-1.0.5" sources."co-4.6.0" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" sources."assert-plus-0.2.0" (sources."jsprim-1.4.1" // { dependencies = [ @@ -37312,7 +37382,7 @@ in sources."unique-slug-2.0.0" (sources."boxen-1.2.2" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" ]; }) (sources."chalk-1.1.3" // { @@ -37378,11 +37448,10 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."fast-deep-equal-1.0.0" - sources."json-schema-traverse-0.3.1" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" + sources."stack-trace-0.0.9" sources."deep-extend-0.4.2" sources."strip-json-comments-2.0.1" sources."eve-0.5.4" @@ -37439,6 +37508,9 @@ in sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" + sources."colors-1.0.3" + sources."cycle-1.0.3" + sources."eyes-0.1.8" ]; buildInputs = globalBuildInputs; meta = { @@ -37618,14 +37690,14 @@ in sha512 = "1pjbfhy4mpjb68hg0k70iz51c13yq6biln5wyb3jg8ddbgc3qwhnqgxvd19if6sihd10yc42yrj50p451qkgd4wmy2p5a0cddcwp5g5"; }; dependencies = [ - sources."acorn-5.1.2" + sources."acorn-5.2.1" (sources."acorn-dynamic-import-2.0.2" // { dependencies = [ sources."acorn-4.0.13" ]; }) - sources."ajv-5.2.4" - sources."ajv-keywords-2.1.0" + sources."ajv-5.3.0" + sources."ajv-keywords-2.1.1" sources."async-2.5.0" sources."enhanced-resolve-3.4.1" sources."escope-3.6.0" @@ -37663,9 +37735,8 @@ in }) sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."lodash-4.17.4" sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" @@ -37751,7 +37822,7 @@ in sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."asn1.js-4.9.1" + sources."asn1.js-4.9.2" (sources."ripemd160-2.0.1" // { dependencies = [ sources."hash-base-2.0.2" @@ -37784,7 +37855,7 @@ in sources."kind-of-3.2.2" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."chokidar-1.7.0" sources."anymatch-1.3.2" sources."async-each-1.0.1" @@ -37852,7 +37923,7 @@ in sources."rimraf-2.6.2" sources."semver-5.4.1" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."os-homedir-1.0.2" @@ -37902,6 +37973,8 @@ in sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" sources."har-schema-1.0.5" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."assert-plus-0.2.0" (sources."jsprim-1.4.1" // { dependencies = [ @@ -38197,7 +38270,7 @@ in sources."esprima-3.1.3" sources."first-chunk-stream-2.0.0" sources."jed-1.1.1" - sources."pino-4.8.0" + sources."pino-4.8.2" (sources."postcss-6.0.11" // { dependencies = [ sources."supports-color-4.5.0" @@ -38395,7 +38468,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -38487,7 +38560,7 @@ in sources."file-entry-cache-2.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."ignore-3.3.6" + sources."ignore-3.3.7" sources."imurmurhash-0.1.4" (sources."inquirer-3.3.0" // { dependencies = [ @@ -38513,7 +38586,7 @@ in sources."typedarray-0.0.6" sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.1.2" + sources."acorn-5.2.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -38552,7 +38625,7 @@ in sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."is-promise-2.1.0" sources."tryit-1.0.3" sources."argparse-1.0.9" @@ -38562,7 +38635,7 @@ in sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."fast-levenshtein-2.0.6" - sources."ajv-keywords-2.1.0" + sources."ajv-keywords-2.1.1" (sources."slice-ansi-1.0.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -38592,7 +38665,7 @@ in sources."is-property-1.0.2" sources."interpret-1.0.4" sources."rechoir-0.6.2" - sources."resolve-1.4.0" + sources."resolve-1.5.0" sources."path-parse-1.0.5" sources."fast-json-parse-1.0.3" sources."fast-safe-stringify-1.2.0" @@ -38740,7 +38813,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."is-buffer-1.1.5" + sources."is-buffer-1.1.6" sources."is-posix-bracket-0.1.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" @@ -38774,7 +38847,7 @@ in sources."npmlog-4.1.2" sources."rc-1.2.2" sources."tar-2.2.1" - sources."tar-pack-3.4.0" + sources."tar-pack-3.4.1" sources."abbrev-1.1.1" sources."osenv-0.1.4" sources."are-we-there-yet-1.1.4" @@ -38899,7 +38972,7 @@ in sources."humanize-string-1.0.1" (sources."inquirer-3.3.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."strip-ansi-4.0.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" @@ -38981,7 +39054,7 @@ in sources."titleize-1.0.0" (sources."update-notifier-2.3.0" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; @@ -38996,7 +39069,7 @@ in sources."yeoman-doctor-2.1.0" (sources."yeoman-environment-2.0.5" // { dependencies = [ - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."debug-3.1.0" sources."log-symbols-2.1.0" sources."ansi-styles-3.2.0" @@ -39096,7 +39169,7 @@ in sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."iconv-lite-0.4.19" - sources."jschardet-1.5.1" + sources."jschardet-1.6.0" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" @@ -39150,13 +39223,12 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.2.4" + sources."ajv-5.3.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" sources."hoek-4.2.0" sources."boom-4.3.1" (sources."cryptiles-3.1.2" // { @@ -39164,7 +39236,7 @@ in sources."boom-5.2.0" ]; }) - sources."sntp-2.0.2" + sources."sntp-2.1.0" sources."assert-plus-1.0.0" sources."jsprim-1.4.1" sources."sshpk-1.13.1" @@ -39272,7 +39344,7 @@ in (sources."boxen-1.2.2" // { dependencies = [ sources."camelcase-4.1.0" - sources."chalk-2.2.0" + sources."chalk-2.3.0" sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" ]; diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index bf0ae24ff03d..90ee8d905a6e 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,20 +1,35 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner, astring, fmt, result }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, jbuilder +, cmdliner, astring, fmt, result +}: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "0.8.1"; + sha256 = "1bjhgwmshlaz9xncrrkknys7prigf8vlg1kqvfx9l8kn92mlf10b"; + buildInputs = [ jbuilder ]; + buildPhase = "jbuilder build -p alcotest"; + inherit (jbuilder) installPhase; + } else { + version = "0.7.2"; + sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; + buildInputs = [ ocamlbuild opam topkg ]; + inherit (topkg) buildPhase installPhase; + }; +in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-alcotest-${version}"; - version = "0.7.2"; + inherit (param) version buildPhase installPhase; src = fetchzip { url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz"; - sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ] ++ param.buildInputs; propagatedBuildInputs = [ cmdliner astring fmt result ]; - inherit (topkg) buildPhase installPhase; - createFindlibDestdir = true; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 9d01b73479a4..ff42af0c0e40 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,18 +1,24 @@ { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: -let - pname = "lablgtk"; +let param = + let check = stdenv.lib.versionAtLeast ocaml.version; in + if check "4.06" then { + version = "2.18.6"; + url = https://forge.ocamlcore.org/frs/download.php/1726/lablgtk-2.18.6.tar.gz; + sha256 = "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d"; + } else if check "3.12" then { + version = "2.18.5"; + url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; + sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "2.18.5"; + name = "lablgtk-${version}"; + inherit (param) version; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; - sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + inherit (param) url sha256; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index c3acdcf5bdb4..53ba904f628e 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, react, ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib +, react, ssl, libev, pkgconfig, ncurses, glib , ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" @@ -27,7 +27,7 @@ buildOcaml rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml_oasis which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] + buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ] diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index bf3089ebfb9a..a2a439b295b0 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,25 +1,24 @@ { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: buildPerlPackage rec { - name = "DBD-SQLite-1.50"; + name = "DBD-SQLite-${version}"; + version = "1.54"; src = fetchurl { url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; - sha256 = "1qcw2nzla03ywrl6mx1qklvbc8n5bn4gxqbjnvadfkwlffmi7i9s"; + sha256 = "3929a6dbd8d71630f0cb57f85dcef9588cd7ac4c9fa12db79df77b9d3a4d7269"; }; propagatedBuildInputs = [ DBI ]; - - makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}"; + buildInputs = [ sqlite ]; patches = [ # Support building against our own sqlite. ./external-sqlite.patch ]; - sqlite_dev = sqlite.dev; - sqlite_out = sqlite.out; - postPatch = "substituteAllInPlace Makefile.PL; cat Makefile.PL"; + SQLITE_INC = sqlite.dev + "/include"; + SQLITE_LIB = sqlite.out + "/lib"; preBuild = '' @@ -39,5 +38,9 @@ buildPerlPackage rec { # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t"). #doCheck = false; - meta.platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Self Contained SQLite RDBMS in a DBI Driver"; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch index 1f90546b252c..5aafa461d943 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch +++ b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch @@ -1,33 +1,11 @@ -diff --git a/Makefile.PL b/Makefile.PL -index 606b28d..0cea060 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -128,24 +128,10 @@ SCOPE: { - # the system SQLite. We expect that anyone sophisticated enough to use +--- a/Makefile.PL 2016-04-21 15:44:34.000000000 +0200 ++++ b/Makefile.PL 2017-10-31 11:04:28.389959946 +0100 +@@ -129,7 +129,7 @@ # a system sqlite is also sophisticated enough to have a patching system # that can change the if ( 0 ) to if ( 1 ) --my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc); + my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc); -if ( 0 ) { -- require File::Spec; -- if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { -- $sqlite_base =~ /=(.*)/; -- $sqlite_base = $1; -- $sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib' ); -- $sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' ); -- } -- if ( $sqlite_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) { -- $sqlite_local =~ /=(.*)/; -- $sqlite_local = "$1" ? 1 : 0; -- if ( $sqlite_local ) { -- # Keep these from making into CFLAGS/LDFLAGS -- undef $sqlite_lib; -- undef $sqlite_inc; -- } -- } -+my ($sqlite_local, $sqlite_lib, $sqlite_inc); +if ( 1 ) { -+ $sqlite_lib = '@sqlite_out@/lib'; -+ $sqlite_inc = '@sqlite_dev@/include'; - - # Now check for a compatible sqlite3 - unless ( $sqlite_local ) { + require File::Spec; + if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { + $sqlite_base =~ /=(.*)/; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix new file mode 100644 index 000000000000..06ad939cfa8b --- /dev/null +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, pycodestyle }: + +buildPythonPackage rec { + pname = "autopep8"; + version = "1.3.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0c1gl648g2xnz3j0rsp71ld4i32zlglmqjvqf4q8r08jp3zpny7z"; + }; + + propagatedBuildInputs = [ pycodestyle ]; + + # One test fails: + # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) + doCheck = false; + + meta = with stdenv.lib; { + description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; + homepage = https://pypi.python.org/pypi/autopep8/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix new file mode 100644 index 000000000000..f6c56646dcb9 --- /dev/null +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "bitstring"; + version = "3.1.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1algq30j6rz12b1902bpw7iijx5lhrfqhl80d4ac6xzkrrpshqy1"; + extension = "zip"; + }; + + meta = with stdenv.lib; { + description = "Module for binary data manipulation"; + homepage = "https://github.com/scott-griffiths/bitstring"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix new file mode 100644 index 000000000000..fed6f6e9219e --- /dev/null +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +, pillow, webcolors, funcparserlib +}: + +buildPythonPackage rec { + name = "blockdiag-${version}"; + version = "1.5.3"; + + src = fetchurl { + url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; + sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ pillow webcolors funcparserlib ]; + + # One test fails: + # ... + # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams) + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix new file mode 100644 index 000000000000..515494b5f931 --- /dev/null +++ b/pkgs/development/python-modules/bpython/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchurl, pygments, greenlet, curtsies, urwid, requests, mock }: + +buildPythonPackage rec { + pname = "bpython"; + version = "0.17"; + name = "${pname}-${version}"; + + # 0.17 is still missing on PyPI, https://github.com/bpython/bpython/issues/706 + src = fetchurl { + url = "https://bpython-interpreter.org/releases/${pname}-${version}.tar.gz"; + sha256 = "13fyyx06645ikvmj9zmkixr12kzk1c3a3f9s9i2rvaczjycn82lz"; + }; + + propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; + + checkInputs = [ mock ]; + + # tests fail: https://github.com/bpython/bpython/issues/712 + doCheck = false; + + meta = with stdenv.lib; { + description = "A fancy curses interface to the Python interactive interpreter"; + homepage = "https://bpython-interpreter.org/"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch new file mode 100644 index 000000000000..27674edb58b4 --- /dev/null +++ b/pkgs/development/python-modules/cffi/clang.patch @@ -0,0 +1,13 @@ +diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py +index a3277b0..0d6e2c3 100644 +--- a/testing/cffi1/test_recompiler.py ++++ b/testing/cffi1/test_recompiler.py +@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): + char32_t foo_4bytes(char32_t); + """) + lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ +- #if !defined(__cplusplus) || __cplusplus < 201103L ++ #if !defined(__cplusplus) + typedef uint_least16_t char16_t; + typedef uint_least32_t char32_t; + #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 5c99e77af56b..b0524b4121ad 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -10,13 +10,15 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; + patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; checkPhase = '' py.test diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix new file mode 100644 index 000000000000..9d8e61d1f450 --- /dev/null +++ b/pkgs/development/python-modules/construct/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, six, pythonOlder }: + +buildPythonPackage rec { + name = "construct-${version}"; + version = "2.8.16"; + + src = fetchFromGitHub { + owner = "construct"; + repo = "construct"; + rev = "v${version}"; + sha256 = "0lzz1dy419n254qccch7yx4nkpwd0fsyjhnsnaf6ysgwzqxxv63j"; + }; + + propagatedBuildInputs = [ six ]; + + # Tests fail with the following error on Python 3.5+ + # TypeError: not all arguments converted during string formatting + doCheck = pythonOlder "3.5"; + + meta = with stdenv.lib; { + description = "Powerful declarative parser (and builder) for binary data"; + homepage = http://construct.readthedocs.org/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix new file mode 100644 index 000000000000..a1e5f2352356 --- /dev/null +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, pytest, wcwidth }: + +buildPythonPackage rec { + pname = "curtsies"; + version = "0.2.11"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc"; + }; + + propagatedBuildInputs = [ blessings wcwidth pyte ]; + + checkInputs = [ nose mock pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + description = "Curses-like terminal wrapper, with colored strings!"; + homepage = https://pypi.python.org/pypi/curtsies; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix new file mode 100644 index 000000000000..dcb4e9474c3b --- /dev/null +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPyPy +, nose +, toolz +, python +}: + +buildPythonPackage rec { + pname = "cytoolz"; + version = "0.8.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; + }; + + # Extension types + disabled = isPyPy; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ toolz ]; + + # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 + checkPhase = '' + NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} + ''; + + meta = { + homepage = "http://github.com/pytoolz/cytoolz/"; + description = "Cython implementation of Toolz: High performance functional utilities"; + license = "licenses.bsd3"; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix new file mode 100644 index 000000000000..81ead8431695 --- /dev/null +++ b/pkgs/development/python-modules/datashape/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, mock +, numpy +, multipledispatch +, dateutil +}: + +buildPythonPackage rec { + pname = "datashape"; + version = "0.5.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; + }; + + checkInputs = [ pytest mock ]; + propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + + checkPhase = '' + py.test datashape/tests + ''; + + meta = { + homepage = https://github.com/ContinuumIO/datashape; + description = "A data description language"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix new file mode 100644 index 000000000000..4f5d7a11bd8f --- /dev/null +++ b/pkgs/development/python-modules/demjson/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy36 }: + +buildPythonPackage rec { + pname = "demjson"; + version = "2.2.4"; + name = "${pname}-${version}"; + disabled = isPy36; + + src = fetchPypi { + inherit pname version; + sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; + }; + + meta = with stdenv.lib; { + description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; + homepage = http://deron.meranda.us/python/demjson/; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix new file mode 100644 index 000000000000..43c318fc7c3e --- /dev/null +++ b/pkgs/development/python-modules/dpkt/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "dpkt"; + version = "1.9.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6"; + }; + + meta = with stdenv.lib; { + description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"; + homepage = https://code.google.com/p/dpkt/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix new file mode 100644 index 000000000000..8a3d3b3d09b7 --- /dev/null +++ b/pkgs/development/python-modules/gevent/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, buildPythonPackage, isPyPy, python, libev, greenlet }: + +buildPythonPackage rec { + name = "gevent-1.1.2"; + + src = fetchurl { + url = "mirror://pypi/g/gevent/${name}.tar.gz"; + sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c"; + }; + + # Why do we have this patch? + postPatch = '' + substituteInPlace libev/ev.c --replace \ + "ecb_inline void ecb_unreachable (void) ecb_noreturn" \ + "ecb_inline ecb_noreturn void ecb_unreachable (void)" + ''; + + buildInputs = [ libev ]; + propagatedBuildInputs = stdenv.lib.optionals (!isPyPy) [ greenlet ]; + + checkPhase = '' + cd greentest + ${python.interpreter} testrunner.py + ''; + + # Bunch of failures. + doCheck = false; + + meta = with stdenv.lib; { + description = "Coroutine-based networking library"; + homepage = http://www.gevent.org/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix new file mode 100644 index 000000000000..503ccb37d57e --- /dev/null +++ b/pkgs/development/python-modules/ipython_genutils/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, glibcLocales +}: + +buildPythonPackage rec { + pname = "ipython_genutils"; + version = "0.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; + }; + + checkInputs = [ nose glibcLocales ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests + ''; + + meta = { + description = "Vestigial utilities from IPython"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix new file mode 100644 index 000000000000..ab94d7b40acb --- /dev/null +++ b/pkgs/development/python-modules/jug/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, numpy +, bottle, pyyaml, redis, six +, zlib }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Jug"; + version = "1.6.3"; + buildInputs = [ nose numpy ]; + propagatedBuildInputs = [ + bottle + pyyaml + redis + six + + zlib + ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0dpcwjaf8zzqpdz8w8h0p7vmd6z6bzfz2805a6bdjqs9hhkhrg86"; + }; + + meta = with stdenv.lib; { + description = "A Task-Based Parallelization Framework"; + license = licenses.mit; + url = https://jug.readthedocs.io/; + maintainers = with maintainers; [ luispedro ]; + }; +} diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix new file mode 100644 index 000000000000..2746f1616682 --- /dev/null +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }: + +let + pname = "keyutils"; + version = "0.5"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/k/${pname}/${name}.tar.gz"; + sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; + }; + + buildInputs = [ pkgs.keyutils pytestrunner ]; + + doCheck = false; + + meta = { + description = "A set of python bindings for keyutils"; + homepage = https://github.com/sassoftware/python-keyutils; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix new file mode 100644 index 000000000000..7c907d1e5ef3 --- /dev/null +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, buildPythonPackage, pkgconfig, pytest, fuse, attr, which +, contextlib2 +}: + +buildPythonPackage rec { + name = "llfuse-1.0"; + + src = fetchurl { + url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; + sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pytest fuse attr which ]; + + propagatedBuildInputs = [ contextlib2 ]; + + checkPhase = '' + py.test + ''; + + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' + doCheck = false; + + meta = with stdenv.lib; { + description = "Python bindings for the low-level FUSE API"; + homepage = https://code.google.com/p/python-llfuse/; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index cf05cbff631d..8d9340625e1c 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,9 +1,9 @@ { lib , fetchurl , buildPythonPackage -, pytest +, cython +, pytest, psutil, pytestrunner , isPy3k -, psutil }: let @@ -17,11 +17,8 @@ in buildPythonPackage rec { sha256 = "e76909da2fad6966281d4e0e4ccfd3c3025699ebcc30806afa09fa1384c3532b"; }; - checkInputs = [ pytest psutil ]; - - checkPhase = '' - py.test - ''; + buildInputs = [ cython ]; + checkInputs = [ pytest psutil pytestrunner ]; disabled = !isPy3k; @@ -30,4 +27,4 @@ in buildPythonPackage rec { homepage = https://github.com/aio-libs/multidict/; license = lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix new file mode 100644 index 000000000000..d1c392106077 --- /dev/null +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "multipledispatch"; + version = "0.4.9"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; + }; + + # No tests in archive + doCheck = false; + + meta = { + homepage = http://github.com/mrocklin/multipledispatch/; + description = "A relatively sane approach to multiple dispatch in Python"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix new file mode 100644 index 000000000000..d9ec2f85fa25 --- /dev/null +++ b/pkgs/development/python-modules/nose-exclude/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + pname = "nose-exclude"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; + }; + + propagatedBuildInputs = [ nose ]; + + meta = { + license = lib.licenses.lgpl21; + description = "Exclude specific directories from nosetests runs"; + homepage = https://github.com/kgrandis/nose-exclude; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix new file mode 100644 index 000000000000..858b5ae594ae --- /dev/null +++ b/pkgs/development/python-modules/numtraits/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, six +, numpy +, traitlets +}: + +buildPythonPackage rec { + pname = "numtraits"; + version = "0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ six numpy traitlets]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Numerical traits for Python objects"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; + homepage = https://github.com/astrofrog/numtraits; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix new file mode 100644 index 000000000000..ebf7ce944c11 --- /dev/null +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +, blockdiag +}: + +buildPythonPackage rec { + name = "nwdiag-1.0.3"; + + src = fetchurl { + url = "mirror://pypi/n/nwdiag/${name}.tar.gz"; + sha256 = "0n7ary1fngxk8bk15vabc8fhnmxlh098piciwaviwn7l4a5q1zys"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ blockdiag ]; + + # tests fail + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix new file mode 100644 index 000000000000..73b3f0be1503 --- /dev/null +++ b/pkgs/development/python-modules/odo/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, datashape +, numpy +, pandas +, toolz +, multipledispatch +, networkx +}: + +buildPythonPackage rec { + pname = "odo"; + version= "0.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mh5k69d9ph9jd07jl9yqh78rbnh5cjspi1q530v3ml7ivjzz4p8"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ datashape numpy pandas toolz multipledispatch networkx ]; + + checkPhase = '' + py.test odo/tests + ''; + + meta = { + homepage = https://github.com/ContinuumIO/odo; + description = "Data migration utilities"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index c7877675530a..3b5fa1f531a2 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, - ofxhome, ofxparse, beautifulsoup, lxml, keyring + ofxhome, ofxparse, beautifulsoup4, lxml, keyring }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { # ImportError: No module named tests doCheck = false; - propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup lxml keyring ]; + propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup4 lxml keyring ]; meta = with stdenv.lib; { homepage = https://github.com/captin411/ofxclient; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 7bab184bb2a0..2cbb67545a06 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -8,6 +8,7 @@ , cython , dateutil , scipy +, moto , numexpr , pytz , xlrd @@ -27,12 +28,12 @@ let inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; - version = "0.20.3"; + version = "0.21.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a777e07633d83d546c55706420179551c8e01075b53c497dcf8ae4036766bc66"; + sha256 = "0nf50ls2cnlsd2635nyji7l70xc91dw81qg5y01g5sifwwqcpmaw"; }; LC_ALL = "en_US.UTF-8"; @@ -64,6 +65,7 @@ in buildPythonPackage rec { "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" ''; + checkInputs = [ moto ]; checkPhase = '' runHook preCheck '' diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 2c297d8d7193..d916f9b95b1d 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first -, setuptools_scm, glibcLocales, mock }: +, setuptools_scm, git, glibcLocales, mock }: buildPythonPackage rec { pname = "pip-tools"; @@ -12,12 +12,18 @@ buildPythonPackage rec { }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ pytest glibcLocales mock ]; + checkInputs = [ pytest git glibcLocales mock ]; propagatedBuildInputs = [ pip click six first setuptools_scm ]; checkPhase = '' - export HOME=$(mktemp -d) - py.test -k "not test_realistic_complex_sub_dependencies" # requires network + export HOME=$(mktemp -d) VIRTUAL_ENV=1 + tests_without_network_access=" + not test_realistic_complex_sub_dependencies \ + and not test_editable_package_vcs \ + and not test_generate_hashes_all_platforms \ + and not test_generate_hashes_without_interfering_with_each_other \ + " + py.test -k "$tests_without_network_access" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix new file mode 100644 index 000000000000..57f7c2c317dc --- /dev/null +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, Mako, packaging, pysocks, pygments, ROPGadget +, capstone, paramiko, pip, psutil +, pyelftools, pypandoc, pyserial, dateutil +, requests, tox, pandoc, unicorn, intervaltree }: + +buildPythonPackage rec { + version = "3.10.0"; + pname = "pwntools"; + name = "pwntools-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l8hb30mwxqd1y7r5ihd7kzmjm2mz6m5aiphd3hwzmxkmxbxj8zk"; + }; + + propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ]; + + disabled = isPy3k; + + meta = with stdenv.lib; { + homepage = "http://pwntools.com"; + description = "CTF framework and exploit development library"; + license = licenses.mit; + maintainers = with maintainers; [ bennofs kristoff3r ]; + }; +} diff --git a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch b/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch deleted file mode 100644 index 4e36612d80d0..000000000000 --- a/pkgs/development/python-modules/pycdio/add-cdtext-toc.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Nurp pycdio-0.20-orig/test/cdtext.toc pycdio-0.20/test/cdtext.toc ---- pycdio-0.20-orig/test/cdtext.toc 1970-01-01 01:00:00.000000000 +0100 -+++ pycdio-0.20/test/cdtext.toc 2014-11-06 23:36:12.520708320 +0100 -@@ -0,0 +1,48 @@ -+CD_DA -+ -+// global CD-TEXT data -+ -+CD_TEXT { -+ -+ // Mapping from language number (0..7) used in 'LANGUAGE' statements -+ // to language code. -+/// LANGUAGE_MAP { -+/// 0 : EN // 9 is the code for ENGLISH, -+/// // I don't know any other language code, yet -+/// } -+ -+ // Language number should always start with 0 -+ LANGUAGE 0 { -+ // Required fields - at least all CD-TEXT CDs I've seen so far have them. -+ TITLE "CD Title" -+ PERFORMER "Performer" -+ DISC_ID "XY12345" -+ UPC_EAN "" // usually empty -+ -+ // Further possible items, all of them are optional -+ ARRANGER "" -+ SONGWRITER "" -+ MESSAGE "" -+ GENRE "" // I'm not sure if this should be really ascii data -+ } -+} -+ -+ -+TRACK AUDIO -+// track specific CD-TEXT data -+CD_TEXT { -+ LANGUAGE 0 { -+ // if an item is defined for one track it should be defined for all tracks -+ TITLE "Track Title" -+ -+ PERFORMER "Performer" -+ ISRC "US-XX1-98-01234" -+ -+ ARRANGER "" -+ SONGWRITER "" -+ MESSAGE "" -+ } -+} -+ -+SILENCE 1:0:0 -+ diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix new file mode 100644 index 000000000000..948d9741bd8b --- /dev/null +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchPypi, buildPythonPackage, numpy, isPy3k, dateutil, dateutil_1_5 }: + +buildPythonPackage rec { + pname = "pycollada"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1g96maw2c25l4i3ks51784h33zf7s18vrn6iyz4ca34iy4sl7yq9"; + }; + + buildInputs = [ numpy ] ++ (if isPy3k then [dateutil] else [dateutil_1_5]); + + # Some tests fail because they refer to test data files that don't exist + # (upstream packaging issue) + doCheck = false; + + meta = with stdenv.lib; { + description = "Python library for reading and writing collada documents"; + homepage = http://pycollada.github.io/; + license = "BSD"; # they don't specify which BSD variant + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/pyev/default.nix b/pkgs/development/python-modules/pyev/default.nix new file mode 100644 index 000000000000..db06fedd68cc --- /dev/null +++ b/pkgs/development/python-modules/pyev/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, buildPythonPackage, libev }: + +buildPythonPackage rec { + name = "pyev-0.9.0"; + + src = fetchurl { + url = "mirror://pypi/p/pyev/${name}.tar.gz"; + sha256 = "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx"; + }; + + buildInputs = [ libev ]; + + libEvSharedLibrary = + if !stdenv.isDarwin + then "${libev}/lib/libev.so.4" + else "${libev}/lib/libev.4.dylib"; + + postPatch = '' + test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; } + sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py + ''; + + meta = with stdenv.lib; { + description = "Python bindings for libev"; + homepage = https://code.google.com/p/pyev/; + license = licenses.gpl3; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix new file mode 100644 index 000000000000..c09e15f4bfb3 --- /dev/null +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, libiodbc }: + +buildPythonPackage rec { + pname = "pyodbc"; + version = "4.0.19"; + name = "${pname}-${version}"; + disabled = isPyPy; # use pypypdbc instead + + src = fetchPypi { + inherit pname version; + sha256 = "05mkaxbi9n02bpr3l0qnyfb3458f35hk71bq8jmadikp3h8al7dg"; + }; + + buildInputs = [ libiodbc ]; + + meta = with stdenv.lib; { + description = "Python ODBC module to connect to almost any database"; + homepage = "https://github.com/mkleehammer/pyodbc"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix new file mode 100644 index 000000000000..dbad83bef7e7 --- /dev/null +++ b/pkgs/development/python-modules/pyro/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + name = "Pyro-3.16"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/P/Pyro/${name}.tar.gz"; + sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578"; + }; + + meta = with stdenv.lib; { + description = "Distributed object middleware for Python (IPC/RPC)"; + homepage = http://pythonhosted.org/Pyro/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/pysoundfile/default.nix b/pkgs/development/python-modules/pysoundfile/default.nix new file mode 100644 index 000000000000..fe24f0203f0d --- /dev/null +++ b/pkgs/development/python-modules/pysoundfile/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, numpy +, libsndfile +, cffi +, isPyPy +, stdenv +}: + +buildPythonPackage rec { + pname = "PySoundFile"; + name = "PySoundFile-${version}"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; + }; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy libsndfile cffi ]; + + meta = { + description = "An audio library based on libsndfile, CFFI and NumPy"; + license = lib.licenses.bsd3; + homepage = https://github.com/bastibe/PySoundFile; + maintainers = with lib.maintainers; [ fridh ]; + }; + + prePatch = '' + substituteInPlace soundfile.py --replace "'sndfile'" "'${libsndfile.out}/lib/libsndfile.so'" + ''; + + # https://github.com/bastibe/PySoundFile/issues/157 + disabled = isPyPy || stdenv.isi686; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix new file mode 100644 index 000000000000..2bd710705815 --- /dev/null +++ b/pkgs/development/python-modules/pyte/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, wcwidth }: + +buildPythonPackage rec { + pname = "pyte"; + version = "0.7.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7"; + }; + + propagatedBuildInputs = [ wcwidth ]; + + checkInputs = [ pytest pytestrunner ]; + + # tries to write to os.path.dirname(__file__) in test_input_output + checkPhase = '' + py.test -k "not test_input_output" + ''; + + meta = with stdenv.lib; { + description = "Simple VTXXX-compatible linux terminal emulator"; + homepage = https://github.com/selectel/pyte; + license = licenses.lgpl3; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix new file mode 100644 index 000000000000..6ba6794bfd13 --- /dev/null +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchPypi, buildPythonPackage, libusb, libusb1 }: + +buildPythonPackage rec { + pname = "pyusb"; + version = "1.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qkk2jn270jwwl1x26hmdhb14m9kkbrzzwzizdjcl1a29b6756sf"; + }; + + # Fix the USB backend library lookup + postPatch = + '' + libusb=${libusb1.out}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary} + test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } + sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py + ''; + + propagatedBuildInputs = [ libusb ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + description = "Python USB access module (wraps libusb 1.0)"; # can use other backends + homepage = http://pyusb.sourceforge.net/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix new file mode 100644 index 000000000000..00bc54d844b1 --- /dev/null +++ b/pkgs/development/python-modules/raven/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }: + +buildPythonPackage rec { + name = "raven-6.3.0"; + + src = fetchurl { + url = "mirror://pypi/r/raven/${name}.tar.gz"; + sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k"; + }; + + # way too many dependencies to run tests + # see https://github.com/getsentry/raven-python/blob/master/setup.py + doCheck = false; + + propagatedBuildInputs = lib.optionals (!isPy3k) [ contextlib2 ]; + + meta = { + description = "A Python client for Sentry (getsentry.com)"; + homepage = https://github.com/getsentry/raven-python; + license = [ lib.licenses.bsd3 ]; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix new file mode 100644 index 000000000000..e03bd3536271 --- /dev/null +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, sphinx +, CommonMark_54 +, docutils +}: + +buildPythonPackage rec { + pname = "recommonmark"; + name = "${pname}-${version}"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d"; + }; + + checkInputs = [ pytest sphinx ]; + propagatedBuildInputs = [ CommonMark_54 docutils ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "A docutils-compatibility bridge to CommonMark"; + homepage = https://github.com/rtfd/recommonmark; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix new file mode 100644 index 000000000000..4e2646eb6ab2 --- /dev/null +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "requests_download"; + version = "0.1.1"; + name = "${pname}-${version}"; + + format = "wheel"; + + #src = pkgs.fetchurl { + # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; + # sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + #}; + + src = fetchPypi { + inherit pname version format; + sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = { + description = "Download files using requests and save them to a target path"; + homepage = https://www.github.com/takluyver/requests_download; + license = lib.licenses.mit; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix new file mode 100644 index 000000000000..1e7b020cd513 --- /dev/null +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, buildPythonPackage, pyparsing, argparse, robotframework }: + +buildPythonPackage rec { + name = "robomachine-0.6"; + + src = fetchurl { + url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; + sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; + }; + + propagatedBuildInputs = [ pyparsing argparse robotframework ]; + + # Remove Windows .bat files + postInstall = '' + rm "$out/bin/"*.bat + ''; + + postPatch = '' + substituteInPlace setup.py --replace "argparse" "" + ''; + + meta = with stdenv.lib; { + description = "Test data generator for Robot Framework"; + homepage = https://github.com/mkorpela/RoboMachine; + license = licenses.asl20; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix new file mode 100644 index 000000000000..a9b536fc76ed --- /dev/null +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k, pygments, wxPython }: + +buildPythonPackage rec { + version = "1.2.3"; + name = "robotframework-ride-${version}"; + disabled = isPy3k; + + src = fetchurl { + url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; + sha256 = "1lf5f4x80f7d983bmkx12sxcizzii21kghs8kf63a1mj022a5x5j"; + }; + + propagatedBuildInputs = [ pygments wxPython ]; + + # ride_postinstall.py checks that needed deps are installed and creates a + # desktop shortcut. We don't really need it and it clutters up bin/ so + # remove it. + postInstall = '' + rm -f "$out/bin/ride_postinstall.py" + ''; + + # error: invalid command 'test' + doCheck = false; + + meta = with stdenv.lib; { + description = "Light-weight and intuitive editor for Robot Framework test case files"; + homepage = https://code.google.com/p/robotframework-ride/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix new file mode 100644 index 000000000000..e0a05eb2e258 --- /dev/null +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k }: + +buildPythonPackage rec { + version = "3.0.2"; + name = "robotframework-${version}"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/r/robotframework/${name}.tar.gz"; + sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610"; + }; + + meta = with stdenv.lib; { + description = "Generic test automation framework"; + homepage = http://robotframework.org/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix new file mode 100644 index 000000000000..2dd672c01097 --- /dev/null +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, unittest2, robotframework, lxml }: + +buildPythonPackage rec { + pname = "robotsuite"; + version = "2.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z"; + }; + + buildInputs = [ unittest2 ]; + propagatedBuildInputs = [ robotframework lxml ]; + + meta = with stdenv.lib; { + description = "Python unittest test suite for Robot Framework"; + homepage = http://github.com/collective/robotsuite/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix new file mode 100644 index 000000000000..912b3fd6ab06 --- /dev/null +++ b/pkgs/development/python-modules/rply/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pytest, fetchFromGitHub, buildPythonPackage, appdirs }: + +buildPythonPackage rec { + pname = "rply"; + name = "${pname}-${version}"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "alex"; + repo = "rply"; + rev = "v${version}"; + sha256 = "0v05gdy5dval30wvz96lywvz2jyf000dp0pnrd1lwdx3cyywq659"; + }; + + buildInputs = [ appdirs ]; + + checkInputs = [ pytest ]; + checkPhase = '' + HOME=$(mktemp -d) py.test tests + ''; + + meta = with stdenv.lib; { + description = "A python Lex/Yacc that works with RPython"; + homepage = https://github.com/alex/rply; + license = licenses.bsd3; + maintainers = with maintainers; [ nixy ]; + }; +} diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix new file mode 100644 index 000000000000..5241b632f122 --- /dev/null +++ b/pkgs/development/python-modules/scapy/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage, isPy3k, isPyPy }: + +buildPythonPackage rec { + name = "scapy-2.2.0"; + + disabled = isPy3k || isPyPy; + + src = fetchurl { + url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz"; + sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5"; + }; + + meta = with stdenv.lib; { + description = "Powerful interactive network packet manipulation program"; + homepage = http://www.secdev.org/projects/scapy/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix new file mode 100644 index 000000000000..1647e6cfc143 --- /dev/null +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, pandas +, matplotlib +}: + +buildPythonPackage rec { + pname = "seaborn"; + version = "0.7.1"; + name = "${pname}-${version}"; + src = fetchPypi { + inherit pname version; + sha256 = "0pawrqc3mxpwd5g9pvi9gba02637bh5c8ldpp8izfwpfn52469zs"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ pandas matplotlib ]; + + checkPhase = '' + nosetests -v + ''; + + # Computationally very demanding tests + doCheck = false; + + meta = { + description = "Statisitical data visualization"; + homepage = "http://stanford.edu/~mwaskom/software/seaborn/"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix new file mode 100644 index 000000000000..98a81873a718 --- /dev/null +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils +, blockdiag +}: + +buildPythonPackage rec { + name = "seqdiag-0.9.4"; + + src = fetchurl { + url = "mirror://pypi/s/seqdiag/${name}.tar.gz"; + sha256 = "1qa7d0m1wahvmrj95rxkb6128cbwd4w3gy8gbzncls66h46bifiz"; + }; + + buildInputs = [ pep8 nose unittest2 docutils ]; + + propagatedBuildInputs = [ blockdiag ]; + + # Tests fail: + # ... + # ERROR: Failure: OSError ([Errno 2] No such file or directory: '/tmp/nix-build-python2.7-seqdiag-0.9.0.drv-0/seqdiag-0.9.0/src/seqdiag/tests/diagrams/') + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; + homepage = http://blockdiag.com/; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix new file mode 100644 index 000000000000..9ddc2a0e08b3 --- /dev/null +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec { + version = "0.7.7"; + pname = "tabulate"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; + }; + + checkInputs = [ nose ]; + + # Tests: cannot import common (relative import). + doCheck = false; + + meta = { + description = "Pretty-print tabular data"; + homepage = https://bitbucket.org/astanin/python-tabulate; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix new file mode 100644 index 000000000000..36b85bce3acd --- /dev/null +++ b/pkgs/development/python-modules/toolz/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +}: + +buildPythonPackage rec{ + pname = "toolz"; + version = "0.8.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l3czks4xy37i8099waxk2fdz5g0k1dwys2mkhlxc0b0886cj4sa"; + }; + + checkInputs = [ nose ]; + + checkPhase = '' + # https://github.com/pytoolz/toolz/issues/357 + rm toolz/tests/test_serialization.py + nosetests toolz/tests + ''; + + meta = { + homepage = "http://github.com/pytoolz/toolz/"; + description = "List processing tools and functional utilities"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix new file mode 100644 index 000000000000..c34bb09b794c --- /dev/null +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, pytest +, mock +, ipython_genutils +, decorator +, enum34 +}: + +buildPythonPackage rec { + pname = "traitlets"; + version = "4.3.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; + }; + + checkInputs = [ glibcLocales pytest mock ]; + propagatedBuildInputs = [ ipython_genutils decorator enum34 ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test $out + ''; + + meta = { + description = "Traitlets Python config system"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix new file mode 100644 index 000000000000..129f4821e875 --- /dev/null +++ b/pkgs/development/python-modules/urwid/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage (rec { + pname = "urwid"; + version = "1.3.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng"; + }; + + meta = with stdenv.lib; { + description = "A full-featured console (xterm et al.) user interface library"; + homepage = http://excess.org/urwid; + repositories.git = git://github.com/wardi/urwid.git; + license = licenses.lgpl21; + maintainers = with maintainers; [ garbas ]; + }; +}) diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix new file mode 100644 index 000000000000..0c6842749073 --- /dev/null +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, buildPythonPackage, pyusb }: + +buildPythonPackage rec { + name = "usbtmc-${version}"; + version = "0.8"; + + src = fetchurl { + url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz"; + sha256 = "14f4j77ljr45crnjwlp1dqbxwa45s20y2fpq5rg59r60w15al4yw"; + }; + + propagatedBuildInputs = [ pyusb ]; + + meta = with stdenv.lib; { + description = "Python implementation of the USBTMC instrument control protocol"; + homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; + license = licenses.mit; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix new file mode 100644 index 000000000000..0915eb002b79 --- /dev/null +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy3k +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zipfile36"; + version = "0.1.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest test_zipfile.py + ''; + + # Only works with Python 3.x. + # Not supposed to be used with 3.6 and up. + disabled = !(isPy3k && (pythonOlder "3.6")); + + meta = { + description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; + homepage = https://gitlab.com/takluyver/zipfile36; + license = lib.licenses.psfl; + maintainer = lib.maintainers.fridh; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix new file mode 100644 index 000000000000..aac2bceeb15d --- /dev/null +++ b/pkgs/development/python-modules/zipstream/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, nose }: + +let + pname = "zipstream"; + version = "1.1.4"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/z/${pname}/${name}.tar.gz"; + sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; + }; + + buildInputs = [ nose ]; + + meta = { + description = "A zip archive generator"; + homepage = https://github.com/allanlei/python-zipstream; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch b/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch new file mode 100644 index 000000000000..b6bcedea91a8 --- /dev/null +++ b/pkgs/development/python-modules/zodb/ZODB-5.3.0-fix-tests.patch @@ -0,0 +1,29 @@ +Tests are kind of broken in ZODB-5.3.0. Fix setup code and disable one +especially problematic test. + +diff -u ZODB-5.3.0/setup.py ZODB-5.3.0/setup.py +--- ZODB-5.3.0/setup.py 2017-08-30 14:55:10.000000000 +0200 ++++ ZODB-5.3.0/setup.py 2017-10-29 11:34:17.277953730 +0100 +@@ -85,7 +85,10 @@ + mod = __import__( + _modname(dirpath, base, os.path.splitext(filename)[0]), + {}, {}, ['*']) +- _unittests_only(suite, mod.test_suite()) ++ try: ++ _unittests_only(suite, mod.test_suite()) ++ except AttributeError: ++ pass + elif 'tests.py' in filenames: + mod = __import__(_modname(dirpath, base, 'tests'), {}, {}, ['*']) + _unittests_only(suite, mod.test_suite()) +diff -u ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py +--- ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py 2017-08-30 14:55:10.000000000 +0200 ++++ ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py 2017-10-29 11:35:10.348240386 +0100 +@@ -1184,7 +1184,4 @@ + #unittest.makeSuite(Test_do_backup), #TODO + unittest.makeSuite(Test_do_recover), + unittest.makeSuite(Test_do_verify), +- # N.B.: this test take forever to run (~40sec on a fast laptop), +- # *and* it is non-deterministic. +- unittest.makeSuite(MonteCarloTests), + ]) diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index 5a318b5d040b..232acaec506c 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -25,6 +25,10 @@ buildPythonPackage rec { sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3"; }; + patches = [ + ./ZODB-5.3.0-fix-tests.patch + ]; + propagatedBuildInputs = [ manuel transaction diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 5490790fe385..79648c16f5e7 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.5.0"; in +let version = "3.5.2"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "0d7hjnj77hc7qqnnfmqlwij8n6pcldfavvd6lilvv5ak4hci9fdy"; + sha256 = "1zza5kjf69hnx41gy3yhvsk1kz259nig5njcmzjbsr8a75p1yyvh"; }; buildInputs = [ makeWrapper ]; @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://maven.apache.org/; license = licenses.asl20; platforms = platforms.unix; + maintainers = with maintainers; [ cko ]; }; } diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 8701db8d161e..e15b212ebca6 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.7.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "19rb1lh6v2gi8xlxhdmhydp16i1bgmvb510i053rfy0jlmh1znns"; + sha256 = "05n4zz2a29y4vr2svc7ya9fx7qxb9151a6gkycxk9qj3v32sk150"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix index cddb1a90765a..5d486f47844e 100644 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ b/pkgs/development/tools/build-managers/buck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "buck-${version}"; - version = "v2017.05.31.01"; + version = "v2017.10.01.01"; src = fetchFromGitHub { owner = "facebook"; repo = "buck"; - rev = "0b8b3828a11afa79dc128832cb55b106f07e48aa"; - sha256 = "1g3yg8qq91cdhsq7zmir7wxw3767l120f5zhq969gppdw9apqy0s"; + rev = "2025fd74327477728b524eafdd4619a0170a24ea"; + sha256 = "05nyyb6f0hv1h67zzvdq8297yl8zjhpbasx35lxnrsjz0m1h8ngw"; }; patches = [ ./pex-mtime.patch ]; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index bf876e81cda5..331f907ae612 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -84,6 +84,9 @@ makeCmakeFindLibs(){ -L*) export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}" ;; + -F*) + export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag:2}" + ;; -isystem) isystem_seen=1 ;; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 253aadb86d73..7914d8ebb4f8 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation { # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for # included Makefiles, don't look in /usr/include and friends. ./impure-dirs.patch + ./pselect.patch ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch new file mode 100644 index 000000000000..5a03acb2f7ca --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch @@ -0,0 +1,170 @@ +From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 +From: Paul Smith <psmith@gnu.org> +Date: Sat, 3 Jun 2017 16:20:51 -0400 +Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. + +* posixos.c (set_blocking): Set blocking on a file descriptor. +(jobserver_setup): Set non-blocking on the jobserver read side. +(jobserver_parse_auth): Ditto. +(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. +(jobserver_acquire): If the non-blocking read() returns without +taking a token then try again. +--- + posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 71 insertions(+), 26 deletions(-) + +diff --git posixos.c posixos.c +index e642d7f..dbafa51 100644 +--- posixos.c ++++ posixos.c +@@ -62,6 +62,24 @@ make_job_rfd (void) + #endif + } + ++static void ++set_blocking (int fd, int blocking) ++{ ++ // If we're not using pselect() don't change the blocking ++#ifdef HAVE_PSELECT ++ int flags; ++ EINTRLOOP (flags, fcntl (fd, F_GETFL)); ++ if (flags >= 0) ++ { ++ int r; ++ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); ++ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); ++ if (r < 0) ++ pfatal_with_name ("fcntl(O_NONBLOCK)"); ++ } ++#endif ++} ++ + unsigned int + jobserver_setup (int slots) + { +@@ -86,6 +104,9 @@ jobserver_setup (int slots) + pfatal_with_name (_("init jobserver pipe")); + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) + return 0; + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -169,7 +193,10 @@ jobserver_acquire_all (void) + { + unsigned int tokens = 0; + +- /* Close the write side, so the read() won't hang. */ ++ /* Use blocking reads to wait for all outstanding jobs. */ ++ set_blocking (job_fds[0], 1); ++ ++ /* Close the write side, so the read() won't hang forever. */ + close (job_fds[1]); + job_fds[1] = -1; + +@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) + unsigned int + jobserver_acquire (int timeout) + { +- sigset_t empty; +- fd_set readfds; + struct timespec spec; + struct timespec *specp = NULL; +- int r; +- char intake; ++ sigset_t empty; + + sigemptyset (&empty); + +- FD_ZERO (&readfds); +- FD_SET (job_fds[0], &readfds); +- + if (timeout) + { + /* Alarm after one second (is this too granular?) */ +@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) + specp = &spec; + } + +- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); +- +- if (r == -1) ++ while (1) + { +- /* Better be SIGCHLD. */ +- if (errno != EINTR) +- pfatal_with_name (_("pselect jobs pipe")); +- return 0; +- } ++ fd_set readfds; ++ int r; ++ char intake; + +- if (r == 0) +- /* Timeout. */ +- return 0; ++ FD_ZERO (&readfds); ++ FD_SET (job_fds[0], &readfds); + +- /* The read FD is ready: read it! */ +- EINTRLOOP (r, read (job_fds[0], &intake, 1)); +- if (r < 0) +- pfatal_with_name (_("read jobs pipe")); ++ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); ++ if (r < 0) ++ switch (errno) ++ { ++ case EINTR: ++ /* SIGCHLD will show up as an EINTR. */ ++ return 0; ++ ++ case EBADF: ++ /* Someone closed the jobs pipe. ++ That shouldn't happen but if it does we're done. */ ++ O (fatal, NILF, _("job server shut down")); + +- /* What does it mean if read() returns 0? It shouldn't happen because only +- the master make can reap all the tokens and close the write side...?? */ +- return r > 0; ++ default: ++ pfatal_with_name (_("pselect jobs pipe")); ++ } ++ ++ if (r == 0) ++ /* Timeout. */ ++ return 0; ++ ++ /* The read FD is ready: read it! This is non-blocking. */ ++ EINTRLOOP (r, read (job_fds[0], &intake, 1)); ++ ++ if (r < 0) ++ { ++ /* Someone sniped our token! Try again. */ ++ if (errno == EAGAIN) ++ continue; ++ ++ pfatal_with_name (_("read jobs pipe")); ++ } ++ ++ /* read() should never return 0: only the master make can reap all the ++ tokens and close the write side...?? */ ++ return r > 0; ++ } + } + + #else +-- +cgit v1.0-41-gc330 + diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a5ea6df3c8df..bbfcc8513078 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.2.1"; + name = "gradle-4.3"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1h7v133rm81jf0bgv9mgvydl7rgh4430dnsfs66wflfay82cqldm"; + sha256 = "0k358y18pp2809kn5il4kv3qvlqrbwmy276bbm3mnmwjxx7g9jwd"; }; }; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 1c2e726cdc54..8e4c5d4801a4 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py ''; - setupHook = ./setup-hook.sh; + setupHook = ./setup-hook.sh; meta = with lib; { homepage = http://mesonbuild.com; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 430e46f23030..44e4f494ff24 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "10.0.2"; + version = "10.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "14lrc9frigym93ppphmdhwnbhk7xz5drpai3d29gyi1z4xsm1jaq"; + sha256 = "0h8fwqsr8ibd82jxq4pc9p8x7af0i8jyrrsj13p4daqhla0srxr4"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "013bly0xswzkf2kwi2pr2ryd880h63n8pya2ccv4z77hxs80cfmp"; + sha256 = "0bzj8zr6d5ab5bjlbw7q3iwn19ha8fksymrvw6cyzs4qacfsj54w"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0hr964r7bcff74sna0b8w3d2ip0hs441ijlhplh2xzqnzpbvx2jq"; + sha256 = "0knvjmxcscyr6v5b9vvyvm8w6p58a1h6nfcvf13dxp59psm71q00"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index de0321109d7d..e6f01ba5c93d 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.86"; + version = "2.87"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "198fcj2wkz8qxawk3mq29kwl51pxlbd7ivndcpvdvg42g0caqyi0"; + sha256 = "1nzs9nn1nr2jav59v1xj39rzmrh1zmwaqnpaiqsll8kixkr9rb8f"; }; buildCommand = '' diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index e5c79f534b0c..0acd70b424a8 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-7.02"; + name = "camlp5${if transitional then "_transitional" else ""}-7.03"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel702.tar.gz; - sha256 = "1m2d55zrgllidhgslvzgmr27f56qzdahz2sv56bvjs3bg7grmhnc"; + url = https://github.com/camlp5/camlp5/archive/rel703.tar.gz; + sha256 = "0bwzhp4qjypfa0x8drp8w434dfixm1nzrm6pcy9s5akpmqvb50a8"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch new file mode 100644 index 000000000000..4d77cf45d417 --- /dev/null +++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -0,0 +1,54 @@ +From c21cc756b69a5f33c8a7758b746a816f40f55932 Mon Sep 17 00:00:00 2001 +From: Leon Isenberg <ljli@users.noreply.github.com> +Date: Sat, 28 Oct 2017 17:58:17 +0200 +Subject: [PATCH] nix customization: patchelf installed binaries + +--- + src/rustup-dist/src/component/package.rs | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs +index 8aa63db9..4d219826 100644 +--- a/src/rustup-dist/src/component/package.rs ++++ b/src/rustup-dist/src/component/package.rs +@@ -99,7 +99,13 @@ impl Package for DirectoryPackage { + let src_path = root.join(&path); + + match &*part.0 { +- "file" => try!(builder.copy_file(path.clone(), &src_path)), ++ "file" => { ++ try!(builder.copy_file(path.clone(), &src_path)); ++ nix_patchelf_if_needed( ++ &target.prefix().path().join(path.clone()), ++ &src_path, ++ ) ++ } + "dir" => try!(builder.copy_dir(path.clone(), &src_path)), + _ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()), + } +@@ -117,6 +123,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") ++ } else { ++ false ++ }; ++ ++ if is_bin { ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-interpreter") ++ .arg("@dynamicLinker@") ++ .arg(dest_path) ++ .output(); ++ } ++} ++ + // 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, +-- +2.14.1 + diff --git a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch b/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch deleted file mode 100644 index 3b429c1745e4..000000000000 --- a/pkgs/development/tools/rust/rustup/0001-use-hardcoded-dynamic-linker.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 36c053f37670c6003f9e8dc001741f7c49e9526a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Sat, 15 Apr 2017 20:42:10 +0200 -Subject: [PATCH] use hardcoded dynamic-linker -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - src/rustup-cli/common.rs | 3 ++- - src/rustup/toolchain.rs | 22 ++++++++++++++++++++-- - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs -index 1abf345..21096e7 100644 ---- a/src/rustup-cli/common.rs -+++ b/src/rustup-cli/common.rs -@@ -220,7 +220,8 @@ pub fn rustc_version(toolchain: &Toolchain) -> String { - if toolchain.exists() { - let rustc_path = toolchain.binary_file("rustc"); - if utils::is_file(&rustc_path) { -- let mut cmd = Command::new(&rustc_path); -+ let mut cmd = Command::new("@dynamicLinker@"); -+ cmd.arg(&rustc_path); - cmd.arg("--version"); - toolchain.set_ldpath(&mut cmd); - -diff --git a/src/rustup/toolchain.rs b/src/rustup/toolchain.rs -index dc29c32..212a4ab 100644 ---- a/src/rustup/toolchain.rs -+++ b/src/rustup/toolchain.rs -@@ -315,7 +315,7 @@ impl<'a> Toolchain<'a> { - } - Path::new(&binary) - }; -- let mut cmd = Command::new(&path); -+ let mut cmd = wrap_elf_interpreter(&path); - self.set_env(&mut cmd); - Ok(cmd) - } -@@ -363,7 +363,7 @@ impl<'a> Toolchain<'a> { - } else { - src_file - }; -- let mut cmd = Command::new(exe_path); -+ let mut cmd = wrap_elf_interpreter(exe_path); - self.set_env(&mut cmd); - cmd.env("RUSTUP_TOOLCHAIN", &primary_toolchain.name); - Ok(cmd) -@@ -648,3 +648,21 @@ impl<'a> Toolchain<'a> { - path - } - } -+ -+fn wrap_elf_interpreter<S: AsRef<OsStr>>(p: S) -> Command { -+ use std::fs::File; -+ use std::io::Read; -+ let path = Path::new(&p); -+ let is_elf = File::open(path).map(|mut f| { -+ let mut buf = [0; 4]; -+ let _ = f.read(&mut buf); -+ buf == b"\x7fELF"[..] -+ }).unwrap_or(false); -+ if is_elf { -+ let mut cmd = Command::new("@dynamicLinker@"); -+ cmd.arg(&path); -+ cmd -+ } else { -+ Command::new(&path) -+ } -+} --- -2.12.2 - diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 65599ad8d18f..b7065cc5d7da 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,18 +1,18 @@ -{ stdenv, lib, runCommand +{ stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform , pkgconfig, curl, Security }: rustPlatform.buildRustPackage rec { name = "rustup-${version}"; - version = "1.3.0"; + version = "2017-10-29"; - cargoSha256 = "1yd7k0jpx78p5bp6iyzgbyj7pjz8vyjg9g7fmf1bl60jsbdpgv3g"; + cargoSha256 = "1xwxv8y9xjgdmm92ldrn9m9fml2zb5h7qqm7dhw63j6psb3ajqrw"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustup.rs"; - rev = version; - sha256 = "199jlqqidzak7nxmv2nzjzv7zfzy9z7hw6h8d8wf1rbfdwd9l6hs"; + rev = "13c8092507bf646f3ef6a621fe2c5a68212e800f"; + sha256 = "1qd01rjk9qpfzgqs35f5nxrcf00kmf76zwmgj3yzdig9zymjwndg"; }; nativeBuildInputs = [ pkgconfig ]; @@ -24,9 +24,11 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (runCommand "0001-use-hardcoded-dynamic-linker.patch" { CC=stdenv.cc; } '' + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substituteAll ${./0001-use-hardcoded-dynamic-linker.patch} $out + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker '') ]; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 779aed7fea34..e0aac84abb70 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -2,11 +2,11 @@ let name = "wp-cli-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "0q5d32jq7a6rba77sr1yyj6ib6x838hw14mm186ah1xxgnn7rnry"; + sha256 = "0rav5a6znx81gwaxin1ib10sbfg16bgdnnyv1zn5sjify3f1wpqj"; }; completion = fetchurl { diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 427de79b33e4..c47a65bb4e19 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.8.0"; + version = "8.9.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "1ksfj6h6vwaws52055mg80pm2bslw23kpx3a7ahraa6ngk934kw5"; + sha256 = "128ir6rkdz1xj55hbflw0sh7snrrvjwgvxmgnka7cyhjkvw5i0mf"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix new file mode 100644 index 000000000000..7b99275eedc2 --- /dev/null +++ b/pkgs/development/web/nodejs/v9.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool, fetchpatch +, callPackage +, darwin ? null +, enableNpm ? true +}@args: + +let + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "9.0.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; + sha256 = "19az7mxcb3d1aj0f7gvhriyyghn1rwn0425924pa84d6j1mbsljv"; + }; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; + }) |