From 123dd9f4e748f64affc2cf77976174444b394705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 26 Jan 2017 17:33:26 +0100 Subject: [PATCH 01/64] services: ipfs: separate system units, add offline mode Offline mode: When adding a lot of data, start this service. It will will not flood the DHT since it only exposes the API. When you are done simply reverse the process. --- .../services/network-filesystems/ipfs.nix | 62 ++++++++++++++++--- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index d43147a16f3..e6e04248854 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -104,30 +104,72 @@ in }; }; - systemd.services.ipfs = { - description = "IPFS Daemon"; + systemd.services.ipfs-init = { + description = "IPFS Initializer"; + + after = [ "local-fs.target" ]; + before = [ "ipfs.service" "ipfs-offline.service" ]; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "local-fs.target" ]; path = [ pkgs.ipfs pkgs.su pkgs.bash ]; preStart = '' install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} + ''; + + script = '' if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then cd ${cfg.dataDir} - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \ - "${ipfs}/bin/ipfs init ${if cfg.emptyRepo then "-e" else ""}" + ${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"} fi - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \ - "${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} && \ - ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}" + ${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} + ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress} ''; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Type = "oneshot"; + RemainAfterExit = true; + PermissionsStartOnly = true; + }; + }; + + systemd.services.ipfs = { + description = "IPFS Daemon"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" "ipfs-init.service" ]; + + conflicts = [ "ipfs-offline.service" ]; + wants = [ "ipfs-init.service" ]; + + path = [ pkgs.ipfs ]; + serviceConfig = { ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}"; User = cfg.user; Group = cfg.group; - PermissionsStartOnly = true; + Restart = "on-failure"; + RestartSec = 1; + }; + }; + + systemd.services.ipfs-offline = { + description = "IPFS Daemon (offline mode)"; + + after = [ "local-fs.target" "ipfs-init.service" ]; + + conflicts = [ "ipfs.service" ]; + wants = [ "ipfs-init.service" ]; + + path = [ pkgs.ipfs ]; + + serviceConfig = { + ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --offline"; + User = cfg.user; + Group = cfg.group; + Restart = "on-failure"; + RestartSec = 1; }; }; }; From 0cbb65c832f708e1986c0d1145c5aa457018393c Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 27 Jan 2017 01:45:50 +0100 Subject: [PATCH 02/64] ghcjs-HEAD: upgrade to the latest HEAD It includes the following changes: * Fixed crash on Safari on iOS * Make linker write externs for closure compiler ADVANCED_OPTIMIZATIONS * ghcjs-pkg fixes for ghc 8.0.2 Because of the latter I switched from GHC-8.0.1 to GHC-8.0.2 to build ghcjs-HEAD. --- pkgs/development/compilers/ghcjs/head.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index b191f9655d2..1c347655ebe 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -10,8 +10,8 @@ bootPkgs.callPackage ./base.nix { ghcjsSrc = fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs"; - rev = "899c834a36692bbbde9b9d16fe5b92ce55a623c4"; - sha256 = "024yj4k0dxy7nvyq19n3xbhh4b4csdrgj19a3l4bmm1zn84gmpl6"; + rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6"; + sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz"; }; ghcjsBootSrc = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7309121486e..805e9560c20 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -61,8 +61,8 @@ rec { ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; }; - ghcjsHEAD = packages.ghc801.callPackage ../development/compilers/ghcjs/head.nix { - bootPkgs = packages.ghc801; + ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { + bootPkgs = packages.ghc802; }; jhc = callPackage ../development/compilers/jhc { From d6a7182493aeba5f0a60ccde60929520ad055cd3 Mon Sep 17 00:00:00 2001 From: Alistair Bill Date: Mon, 30 Jan 2017 16:12:42 +0000 Subject: [PATCH 03/64] neofetch: 3.0 -> 3.0.1 --- pkgs/tools/misc/neofetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 92a2f589b30..2ecaae6a33f 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0z8sqbspf6j7yqy7wbd8ba3pfn836b0y8kmgkcyvswgjkcyh8m68"; + sha256 = "0ccdgyn9m7vbrmjlsxdwv7cagsdg8hy8x4n1mx334pkqvl820jjn"; }; patchPhase = '' From 612333a7703e22df98dd6b3d9cd99bdeaac4f808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 30 Jan 2017 20:07:44 +0100 Subject: [PATCH 04/64] knot-resolver: yet another attempt to fix build on Darwin --- pkgs/servers/dns/knot-resolver/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 3c84d0942e7..1e7dbaf8e2f 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, utillinux, vimNox, which +{ stdenv, fetchurl, pkgconfig, utillinux, hexdump, which , knot-dns, luajit, libuv, lmdb , cmocka, systemd, hiredis, libmemcached , gnutls, nettle @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { configurePhase = ":"; - nativeBuildInputs = [ pkgconfig which makeWrapper ] - ++ [(if stdenv.isLinux then utillinux.bin/*hexdump*/ else vimNox/*xxd*/)]; + nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ]; buildInputs = [ knot-dns luajit libuv gnutls ] # TODO: lmdb needs lmdb.pc; embedded for now diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af1a6220ecf..cb76372b097 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10321,7 +10321,10 @@ with pkgs; jetty = callPackage ../servers/http/jetty { }; knot-dns = callPackage ../servers/dns/knot-dns { }; - knot-resolver = callPackage ../servers/dns/knot-resolver { }; + knot-resolver = callPackage ../servers/dns/knot-resolver { + # TODO: vimNox after it gets fixed on Darwin or something lighter + hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/; + }; rdkafka = callPackage ../development/libraries/rdkafka { }; From d70c26df0981f9ce27defd26c68a769b6f9666db Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 30 Jan 2017 20:20:11 +0100 Subject: [PATCH 05/64] emby: 3.0.8500 -> 3.1.5 Notable changes: * mono46 is now required by emby * switch back to pre-built binaries due to problems building from source * sqlite path is now configured in SQLitePCLRaw.provider.sqlite3.dll.config --- pkgs/servers/emby/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 3813baa6420..9fc0a303ad0 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -1,33 +1,36 @@ -{ stdenv, fetchurl, pkgs, makeWrapper, mono, ffmpeg, ... }: +{ stdenv, fetchurl, pkgs, unzip, sqlite, makeWrapper, mono46, ffmpeg, ... }: stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.8500"; + version = "3.1.5"; src = fetchurl { - url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "0vm2yvwyhswsp31g48qdzm17c4p7c25vyiy1029hgy8nd5qy4shc"; + url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; + sha256 = "0s0m456rxdrj58zbaby6mdgc1ndc3zx2c07n94hn3hdlgralgwaa"; }; buildInputs = with pkgs; [ + unzip makeWrapper ]; propagatedBuildInputs = with pkgs; [ - mono + mono46 sqlite ]; + # Need to set sourceRoot as unpacker will complain about multiple directory output + sourceRoot = "."; + buildPhase = '' - xbuild /p:Configuration="Release Mono" /p:Platform="Any CPU" /t:build MediaBrowser.Mono.sln - substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/System.Data.SQLite.dll.config --replace libsqlite3.so ${pkgs.sqlite.out}/lib/libsqlite3.so - substituteInPlace MediaBrowser.Server.Mono/bin/Release\ Mono/MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server" + substituteInPlace SQLitePCLRaw.provider.sqlite3.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so + substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server" ''; installPhase = '' mkdir -p $out/bin - cp -r MediaBrowser.Server.Mono/bin/Release\ Mono/* $out/bin/ + cp -r * $out/bin - makeWrapper "${mono}/bin/mono" $out/bin/MediaBrowser.Server.Mono \ + makeWrapper "${mono46}/bin/mono" $out/bin/MediaBrowser.Server.Mono \ --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; From e8df68673ccc05ca617369a667cc0c1738444512 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Tue, 31 Jan 2017 00:56:27 +0530 Subject: [PATCH 06/64] nomad: 0.4.1 -> 0.5.3 --- pkgs/applications/networking/cluster/nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index fdb8e09d6a5..b5137c47845 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.4.1"; + version = "0.5.3"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "093nljhibphhccjwxkylbvlc8dh8g2js36mlxxdh9nh21b3mghcs"; + sha256 = "06s4irjz7k5qp895hvwv68xmr6mdq8bv91vhgh6rmx58my8jb68b"; }; meta = with stdenv.lib; { From b08524bf01723a23f17d24487b6b528c603127fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 30 Jan 2017 20:31:03 +0100 Subject: [PATCH 07/64] nixos: nylon, use named instances --- nixos/modules/services/networking/nylon.nix | 74 ++++++++++++++------- 1 file changed, 51 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index da6487dbd49..4864ecf3f92 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -8,7 +8,7 @@ let homeDir = "/var/lib/nylon"; - configFile = pkgs.writeText "nylon.conf" '' + configFile = cfg: pkgs.writeText "nylon-${cfg.name}.conf" '' [General] No-Simultaneous-Conn=${toString cfg.nrConnections} Log=${if cfg.logging then "1" else "0"} @@ -22,15 +22,9 @@ let Deny-IP=${concatStringsSep " " cfg.deniedIPRanges} ''; -in + nylonOpts = { name, config, ... }: { -{ - - ###### interface - - options = { - - services.nylon = { + options = { enable = mkOption { type = types.bool; @@ -40,6 +34,12 @@ in ''; }; + name = mkOption { + type = types.str; + default = ""; + description = "The name of this nylon instance."; + }; + nrConnections = mkOption { type = types.int; default = 10; @@ -107,13 +107,51 @@ in ''; }; }; + config = { name = mkDefault name; }; + }; + + mkNamedNylon = cfg: { + "nylon-${cfg.name}" = { + description = "Nylon, a lightweight SOCKS proxy server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + { + User = "nylon"; + Group = "nylon"; + WorkingDirectory = homeDir; + ExecStart = "${pkgs.nylon}/bin/nylon -f -c ${configFile cfg}"; + }; + }; + }; + + anyNylons = collect (p: p ? enable) cfg; + enabledNylons = filter (p: p.enable == true) anyNylons; + nylonUnits = map (nylon: mkNamedNylon nylon) enabledNylons; + +in + +{ + + ###### interface + + options = { + + services.nylon = mkOption { + default = {}; + description = "Collection of named nylon instances"; + type = with types; loaOf (submodule nylonOpts); + internal = true; + options = [ nylonOpts ]; + }; + }; ###### implementation - config = mkIf cfg.enable { + config = mkIf (length(enabledNylons) > 0) { - users.extraUsers.nylon= { + users.extraUsers.nylon = { group = "nylon"; description = "Nylon SOCKS Proxy"; home = homeDir; @@ -123,17 +161,7 @@ in users.extraGroups.nylon.gid = config.ids.gids.nylon; - systemd.services.nylon = { - description = "Nylon, a lightweight SOCKS proxy server"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = - { - User = "nylon"; - Group = "nylon"; - WorkingDirectory = homeDir; - ExecStart = "${pkgs.nylon}/bin/nylon -f -c ${configFile}"; - }; - }; + systemd.services = fold (a: b: a // b) {} nylonUnits; + }; } From c6c2137a9cd5e757ee6fdd00dce1f975dff62736 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 30 Jan 2017 21:15:56 +0100 Subject: [PATCH 08/64] pythonPackages.hypothesis: 3.5.2 -> 3.6.0 --- .../development/python-modules/hypothesis.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 36 +----------------- 2 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/python-modules/hypothesis.nix diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix new file mode 100644 index 00000000000..f313f6ab5c4 --- /dev/null +++ b/pkgs/development/python-modules/hypothesis.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, python +, isPy27, enum34 +, doCheck ? true, pytest, flake8, flaky +}: +buildPythonPackage rec { + # http://hypothesis.readthedocs.org/en/latest/packaging.html + + # Hypothesis has optional dependencies on the following libraries + # pytz fake_factory django numpy pytest + # If you need these, you can just add them to your environment. + + name = "hypothesis-${version}"; + version = "3.6.0"; + + # Upstream prefers github tarballs + src = fetchFromGitHub { + owner = "HypothesisWorks"; + repo = "hypothesis"; + rev = "${version}"; + sha256 = "0a3r4c8sr9jn7sv419vdzrzfc9sp7zf105f1lgyiwyzi3cgyvcvg"; + }; + + buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ]; + propagatedBuildInputs = stdenv.lib.optionals isPy27 [ enum34 ]; + + inherit doCheck; + + # https://github.com/DRMacIver/hypothesis/issues/300 + checkPhase = '' + ${python.interpreter} -m pytest tests/cover + ''; + + meta = with stdenv.lib; { + description = "A Python library for property based testing"; + homepage = https://github.com/DRMacIver/hypothesis; + license = licenses.mpl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d54eef393a..03d03d6f8dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12548,41 +12548,7 @@ in { propagatedBuildInputs = with self; [ requests2 ]; }; - hypothesis = buildPythonPackage rec { - # http://hypothesis.readthedocs.org/en/latest/packaging.html - - # Hypothesis has optional dependencies on the following libraries - # pytz fake_factory django numpy pytest - # If you need these, you can just add them to your environment. - - name = "hypothesis-${version}"; - version = "3.5.2"; - - # Upstream prefers github tarballs - src = pkgs.fetchFromGitHub { - owner = "HypothesisWorks"; - repo = "hypothesis"; - rev = "${version}"; - sha256 = "030rf4gn4b0hylr90wazilwa3bc038fcqng0wibcx67mqaq035n4"; - }; - - buildInputs = with self; [ flake8 pytest flaky ]; - propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34 ]); - - # Fails randomly in tests/cover/test_conjecture_engine.py::test_interleaving_engines. - doCheck = false; - - # https://github.com/DRMacIver/hypothesis/issues/300 - checkPhase = '' - ${python.interpreter} -m pytest tests/cover - ''; - - meta = { - description = "A Python library for property based testing"; - homepage = https://github.com/DRMacIver/hypothesis; - license = licenses.mpl20; - }; - }; + hypothesis = callPackage ../development/python-modules/hypothesis.nix { }; colored = buildPythonPackage rec { name = "colored-${version}"; From e07f1f2066ba045690d9373a39049874430cec27 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Jan 2017 21:38:37 +0100 Subject: [PATCH 09/64] gitlab: 8.16.1 -> 8.16.3 --- pkgs/applications/version-management/gitlab/Gemfile | 2 +- pkgs/applications/version-management/gitlab/Gemfile.lock | 2 +- pkgs/applications/version-management/gitlab/default.nix | 4 ++-- pkgs/applications/version-management/gitlab/gemset.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 0e80d9f233e..6d6564ea5f9 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -322,7 +322,7 @@ group :test do gem 'email_spec', '~> 1.6.0' gem 'json-schema', '~> 2.6.2' gem 'webmock', '~> 1.21.0' - gem 'test_after_commit', '~> 0.4.2' + gem 'test_after_commit', '~> 1.1' gem 'sham_rack', '~> 1.3.6' gem 'timecop', '~> 0.8.0' end diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index ca1e2ed25c3..80cdf9d3258 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -762,7 +762,7 @@ GEM teaspoon-jasmine (2.2.0) teaspoon (>= 1.0.0) temple (0.7.7) - test_after_commit (0.4.2) + test_after_commit (1.1.0) activerecord (>= 3.2) thin (1.7.0) daemons (~> 1.0, >= 1.0.9) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 2840b06ecf5..a2b08e43617 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.16.1"; + version = "8.16.3"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "0c6cf8p1xx21xxmlpldhxs0i01myd4ddpjl7vfv932qmw9bw4in7"; + sha256 = "0fdm92w97ggnpiqlpr5aia6x8j09v8id7n6pks134hq3pkdiz6mv"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 21ab6d324dd..1ebb7c5b1fa 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -2579,10 +2579,10 @@ test_after_commit = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb"; + sha256 = "0s8pz00xq28lsa1rfczm83yqwk8wcb5dqw2imlj8gldnsdapcyc2"; type = "gem"; }; - version = "0.4.2"; + version = "1.1.0"; }; thin = { source = { From 1a45ddeb2d5a8802c34659d99ad9ae8e19c73641 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Jan 2017 21:39:08 +0100 Subject: [PATCH 10/64] yotubeDL: 2017.01.28 -> 2017.01.29 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 061f64ce982..6ea9baf216b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.01.28"; + version = "2017.01.29"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "16dyci631i6dgy1ia9vg69wk5zn8f1zd7bjwhw6adacrcx2nb89w"; + sha256 = "0visxc4rb6kw4hjcgcv5llis08z0syhian1m5hr1fdbz4w73hx9l"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From f6e2772cd303e71125f47872a2998aba2d70aa4c Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Mon, 30 Jan 2017 20:42:16 +0000 Subject: [PATCH 11/64] wmutils-opt: init at v1.0 --- lib/maintainers.nix | 1 + pkgs/tools/X11/wmutils-opt/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 pkgs/tools/X11/wmutils-opt/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cd9ced5832f..298afcbc161 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -495,6 +495,7 @@ vcunat = "Vladimír Čunát "; vdemeester = "Vincent Demeester "; veprbl = "Dmitry Kalinkin "; + vifino = "Adrian Pistol "; viric = "Lluís Batlle i Rossell "; vizanto = "Danny Wilson "; vklquevs = "vklquevs "; diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix new file mode 100644 index 00000000000..c01aa8dc75f --- /dev/null +++ b/pkgs/tools/X11/wmutils-opt/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libxcb }: + +stdenv.mkDerivation rec { + name = "wmutils-opt-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "wmutils"; + repo = "opt"; + rev = "v${version}"; + sha256 = "0gd05qsir1lnzfrbnfh08qwsryz7arwj20f886nqh41m87yqaljz"; + }; + + buildInputs = [ libxcb ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Optional addons to wmutils"; + homepage = https://github.com/wmutils/opt; + license = licenses.isc; + maintainers = with maintainers; [ vifino ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b587b4fd43..e20c9860e43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17879,6 +17879,8 @@ with pkgs; wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; + wraith = callPackage ../applications/networking/irc/wraith { }; wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { }; From 54b27890f8713eda00a6494eb0b7311e0e5701b8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 28 Jan 2017 23:04:28 +0300 Subject: [PATCH 12/64] wayland: fix configure flags' type --- pkgs/development/libraries/wayland/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index e644b5728ed..836a4527b50 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1"; }; - configureFlags = "--with-scanner --disable-documentation"; + configureFlags = [ "--with-scanner" "--disable-documentation" ]; nativeBuildInputs = [ pkgconfig ]; From 37e2c5378f9057ebd2a429a5be21f69dddc0c871 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:06:28 +0300 Subject: [PATCH 13/64] ejabberd: 16.09 -> 17.01 --- pkgs/servers/xmpp/ejabberd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 5f850a09ded..b898abc9778 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -23,12 +23,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ]; in stdenv.mkDerivation rec { - version = "16.09"; + version = "17.01"; name = "ejabberd-${version}"; src = fetchurl { url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "054gzf4df466a6pyh4w476hxald6637nayy44hvaf31iycxani3v"; + sha256 = "02y9f1zxqvqrhapfay3avkys0llpyjsag6rpz5vfig01zqjqzyky"; }; nativeBuildInputs = [ fakegit ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "12dj1k5pfxc5rw4qjzqf3848190i559h3f9s1dwzpfpkdgjd38vf"; + outputHash = "0flybfhq6qv1ihsjfg9p7191bffip7gpizg29wdbf1x6qgxhpz5r"; }; configureFlags = From 0cfefc7c99e242a676023dc09c42427e045ee883 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:07:35 +0300 Subject: [PATCH 14/64] grub4dos: 0.4.6a-2016-11-09 -> 0.4.6a-2016-12-24 --- pkgs/tools/misc/grub4dos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index fabefb81031..d9e4ae3a638 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -6,13 +6,13 @@ let arch = else abort "Unknown architecture"; in stdenv.mkDerivation rec { name = "grub4dos-${version}"; - version = "0.4.6a-2016-11-09"; + version = "0.4.6a-2016-12-24"; src = fetchFromGitHub { owner = "chenall"; repo = "grub4dos"; - rev = "4cdcd3c1aa4907e7775aa8816ca9cf0175b78bcd"; - sha256 = "17y5wsiqcb2qk1vr8n1wlhcsj668735hj8l759n8aiydw408bl55"; + rev = "ca0371bb1e2365bfe4e44031a3b8b59e8c58ce0d"; + sha256 = "0a9m7n5la3dmbfx6n5iqlfbm607r1mww0wkimn29mlsc30d8aamr"; }; nativeBuildInputs = [ nasm ]; From 8371d736cfd23a78d16fd50ecf70d8852235d267 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:07:47 +0300 Subject: [PATCH 15/64] thermald: fix identation --- pkgs/tools/system/thermald/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index d5936b00806..ddd6740c983 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; preConfigure = '' - export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" - ./autogen.sh #--prefix="$out" - ''; + export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" + ./autogen.sh + ''; configureFlags = [ "--sysconfdir=$(out)/etc" "--localstatedir=/var" @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - preInstall = "sysconfdir=$out/etc"; - meta = with stdenv.lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; From 82d9c2e3fb09bac2c3e577485b9ec1103112b98c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:01:07 +0300 Subject: [PATCH 16/64] krita: 3.0.1.1 -> 3.1.1 --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index fded09545e1..af6d3e492c4 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "krita-${version}"; - version = "3.0.1.1"; + version = "3.1.1"; src = fetchurl { url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0v58p9am2gsrgn5nhynvdg1a7v8d9kcsswb1962r8ijszm3fav5k"; + sha256 = "13qff9kdd38x81rq6yfmkm3083l8s0yn9h3d5qg3qmhrkd5jrvv2"; }; nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ]; From 20b8212a1489f5377114d69c480774f23791d1f6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:07:55 +0300 Subject: [PATCH 17/64] pythonPackages.chainmap: init at 1.0.2 --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a44156b2b8d..010cdd3127e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1149,6 +1149,25 @@ in { }; }; + chainmap = buildPythonPackage rec { + name = "chainmap-1.0.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/chainmap/${name}.tar.gz"; + sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0"; + }; + + # Requires tox + doCheck = false; + + meta = { + description = "Backport/clone of ChainMap"; + homepage = "https://bitbucket.org/jeunice/chainmap"; + license = licenses.psfl; + maintainers = with maintainers; [ abbradar ]; + }; + }; + arrow = buildPythonPackage rec { name = "arrow-${version}"; version = "0.7.0"; From 84ee358735a0a5a360ede485c28ec4bf0ae60512 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:08:02 +0300 Subject: [PATCH 18/64] pythonPackages.scandir: init at 1.4 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 010cdd3127e..60d9a1334dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9651,6 +9651,23 @@ in { }; }; + scandir = self.buildPythonPackage rec { + name = "scandir-${version}"; + version = "1.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/scandir/${name}.tar.gz"; + sha256 = "0yjrgp0mxp3d8bjkq2m1ac2ys8n76wykksvgyjrnil9gr3fx7a5d"; + }; + + meta = with stdenv.lib; { + description = "A better directory iterator and faster os.walk()"; + homepage = "https://github.com/benhoyt/scandir"; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + scfbuild = self.buildPythonPackage rec { name = "scfbuild-${version}"; version = "1.0.3"; From d19b83e32b064f351bb72bd1e787ee045b53ec01 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:02:09 +0300 Subject: [PATCH 19/64] octoprint: 1.2.17 -> 1.3.1 Bundled dependencies: tornado: 4.0.1 -> 4.0.2 flask_login: 0.4.0 -> 0.2.2 --- pkgs/applications/misc/octoprint/default.nix | 51 ++++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index aecea732a23..9e287bf6fd5 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -2,15 +2,15 @@ let - tornado_4_0_1 = pythonPackages.buildPythonPackage rec { + tornado_4_0_2 = pythonPackages.buildPythonPackage rec { name = "tornado-${version}"; - version = "4.0.1"; + version = "4.0.2"; propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; src = fetchurl { url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df"; + sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; }; }; @@ -24,34 +24,53 @@ let }; # This is needed for compatibility with OctoPrint - propagatedBuildInputs = [ tornado_4_0_1 ]; + propagatedBuildInputs = [ tornado_4_0_2 ]; + }; - meta = with stdenv.lib; { - description = "SockJS python server implementation on top of Tornado framework"; - homepage = "http://github.com/mrjoes/sockjs-tornado/"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; + websocket_client = pythonPackages.buildPythonPackage rec { + name = "websocket_client-0.32.0"; + + src = fetchurl { + url = "mirror://pypi/w/websocket-client/${name}.tar.gz"; + sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040"; }; + + propagatedBuildInputs = with pythonPackages; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ]; + }; + + flask_login = pythonPackages.buildPythonPackage rec { + name = "Flask-Login-${version}"; + version = "0.2.2"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; + sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; + }; + + propagatedBuildInputs = with pythonPackages; [ flask ]; + + # FIXME + doCheck = false; }; in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.2.17"; + version = "1.3.1"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1di2f5npwsfckx5p2fl23bl5zi75i0aksd9qy4sa3zmw672337fh"; + sha256 = "1av755agyym1k5ig9av0q9ysf26ldfixz82x73v3g47a1m28pxq9"; }; # We need old Tornado propagatedBuildInputs = with pythonPackages; [ awesome-slugify flask_assets rsa requests2 pkginfo watchdog - semantic-version flask_principal werkzeug flaskbabel tornado_4_0_1 + semantic-version flask_principal werkzeug flaskbabel tornado_4_0_2 psutil pyserial flask_login netaddr markdown sockjs-tornado - pylru pyyaml sarge feedparser netifaces + pylru pyyaml sarge feedparser netifaces click websocket_client + scandir chainmap future ]; # Jailbreak dependencies. @@ -67,10 +86,12 @@ in pythonPackages.buildPythonApplication rec { -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \ -e 's,markdown>=[^"]*,markdown,g' \ -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ - -e 's,Flask-Login>=[^"]*,Flask-Login,g' \ -e 's,rsa>=[^"]*,rsa,g' \ -e 's,PyYAML>=[^"]*,PyYAML,g' \ -e 's,flask>=[^"]*,flask,g' \ + -e 's,Click>=[^"]*,Click,g' \ + -e 's,websocket-client>=[^"]*,websocket-client,g' \ + -e 's,scandir>=[^"]*,scandir,g' \ setup.py ''; From e89f6e3a7c1d4fd81791980c0c7abfe662fbf99c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:03:38 +0300 Subject: [PATCH 20/64] octoprint-plugins.m33-fio: 1.11 -> 1.17 --- .../misc/octoprint/m33-fio-one-library.patch | 40 +++++++++---------- pkgs/applications/misc/octoprint/plugins.nix | 6 +-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch index cbfb6111ec5..87b00f3ab70 100644 --- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch +++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch @@ -1,4 +1,4 @@ -From c84b2130dab0d26be35294d023ed8f4be404c3c1 Mon Sep 17 00:00:00 2001 +From 0defcf6ec155899c414f66524b7df629f59327f0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 23 Nov 2016 00:40:48 +0300 Subject: [PATCH] Build and use one version of preprocessor library @@ -9,10 +9,10 @@ Subject: [PATCH] Build and use one version of preprocessor library 2 files changed, 6 insertions(+), 123 deletions(-) diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py -index f9f84c4..b365024 100755 +index 4b43c59..d1259e4 100755 --- a/octoprint_m33fio/__init__.py +++ b/octoprint_m33fio/__init__.py -@@ -1061,71 +1061,8 @@ class M33FioPlugin( +@@ -1062,71 +1062,8 @@ class M33FioPlugin( # Check if using shared library or checking if it is usable if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : @@ -23,19 +23,19 @@ index f9f84c4..b365024 100755 - if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm1176jzf-s.so") - - # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 - elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm_cortex-a7.so") - - # Otherwise check if running on an ARM7 device - elif platform.uname()[4].startswith("armv7") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_arm7.so") - - # Otherwise check if using an i386 or x86-64 device - elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") : @@ -44,13 +44,13 @@ index f9f84c4..b365024 100755 - if platform.architecture()[0].startswith("32") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.so") - - # Otherwise check if Python is running as 64-bit - elif platform.architecture()[0].startswith("64") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.so") - - # Otherwise check if running on Windows and using an i386 or x86-64 device - elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : @@ -59,39 +59,39 @@ index f9f84c4..b365024 100755 - if platform.architecture()[0].startswith("32") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dll") - - # Otherwise check if Python is running as 64-bit - elif platform.architecture()[0].startswith("64") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dll") - -- # Otherwise check if running on OS X and using an i386 or x86-64 device +- # Otherwise check if running on macOS and using an i386 or x86-64 device - elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : - - # Check if Python is running as 32-bit - if platform.architecture()[0].startswith("32") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_i386.dylib") - - # Otherwise check if Python is running as 64-bit - elif platform.architecture()[0].startswith("64") : - - # Set shared library -- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib") -+ # Set shared library -+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") +- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib") ++ # Set shared library ++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") # Check if shared library was set if self.sharedLibrary : diff --git a/shared library source/Makefile b/shared library source/Makefile -index 887899b..4c74f5c 100755 +index 792b4f4..4c74f5c 100755 --- a/shared library source/Makefile +++ b/shared library source/Makefile @@ -1,68 +1,14 @@ --# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64 +-# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, MACOS32, MACOS64 -LIBRARY_NAME = preprocessor -TARGET_PLATFORM = LINUX64 +LIBRARY_NAME = libpreprocessor @@ -139,14 +139,14 @@ index 887899b..4c74f5c 100755 - CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++ -endif - --ifeq ($(TARGET_PLATFORM), OSX32) +-ifeq ($(TARGET_PLATFORM), MACOS32) - PROG = $(LIBRARY_NAME)_i386.dylib - CC = clang++ - CFLAGS = -fPIC -m32 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) - -endif - --ifeq ($(TARGET_PLATFORM), OSX64) +-ifeq ($(TARGET_PLATFORM), MACOS64) - PROG = $(LIBRARY_NAME)_x86-64.dylib - CC = clang++ - CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) @@ -164,5 +164,5 @@ index 887899b..4c74f5c 100755 clean: rm -f ../octoprint_m33fio/static/libraries/$(PROG) -- -2.10.2 +2.11.0 diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 8f015245763..2f894514c51 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -12,13 +12,13 @@ let m33-fio = buildPlugin rec { name = "M33-Fio-${version}"; - version = "1.11"; + version = "1.17"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M33-Fio"; rev = "V${version}"; - sha256 = "11nbsi93clrqlnmaj73ak87hkqyghybccqz5jzhn2dhp0263adhl"; + sha256 = "19r860hqax09a79s9bl181ab7jsgx0pa8fvnr62lbgkwhis7m8mh"; }; patches = [ @@ -34,7 +34,7 @@ let ''; meta = with stdenv.lib; { - homepage = "https://github.com/donovan6000/M3D-Fio"; + homepage = "https://github.com/donovan6000/M33-Fio"; description = "OctoPrint plugin for the Micro 3D printer"; platforms = platforms.all; license = licenses.gpl3; From 7b1cbd0dcbdefc2d0741ff85e804b73fcb48f4e1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:03:45 +0300 Subject: [PATCH 21/64] slade: 3.1.1.4 -> 3.1.1.5 --- pkgs/applications/misc/slade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index b50c2f18690..3bb97463e5d 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "slade-${version}"; - version = "3.1.1.4"; + version = "3.1.1.5"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; rev = version; - sha256 = "0c2yjkpcwxkid1wczmc9f16x1p40my8jv61jc93ldgjzcprmrpn8"; + sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6"; }; nativeBuildInputs = [ cmake pkgconfig zip ]; From e734f044abd0e6846ebda58f46813c9ec02ce898 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:03:56 +0300 Subject: [PATCH 22/64] tdesktop: 1.0.0 -> 1.0.2 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 16956782a24..67d86571b88 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,14 +19,14 @@ let in stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.0.0"; + version = "1.0.2"; qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1qxzi82cgd8klk6rn83rzrmik0s76alarfaknknww5iw5px7gi8b"; + sha256 = "1pakxzs28v794x9mm7pb2m0phkfrwq19shz8a6lfyidb6ng85hy2"; }; tgaur = fetchgit { From db9989281779d9e67565093488512970b2ca307e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:04:12 +0300 Subject: [PATCH 23/64] treewide: quote homepages in my packages --- pkgs/applications/video/bomi/default.nix | 2 +- pkgs/development/interpreters/spidermonkey/38.nix | 2 +- pkgs/games/dwarf-fortress/game.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 841fe299430..c98e2747989 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Powerful and easy-to-use multimedia player"; - homepage = https://bomi-player.github.io/; + homepage = "https://bomi-player.github.io/"; license = licenses.gpl2Plus; maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index b4823817d4b..e2a4ad2e302 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 740125bf442..cb56969578e 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A single-player fantasy game with a randomly generated adventure world"; - homepage = http://www.bay12games.com/dwarves; + homepage = "http://www.bay12games.com/dwarves"; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ]; From f5f8d59f44b155892b4d485bb5d82e32093a024b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:04:38 +0300 Subject: [PATCH 24/64] folly: 2016.11.21.00 -> 2016.12.19.00 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 1e070ca2599..1e8d7ce543f 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2016.11.21.00"; + version = "2016.12.19.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1f7j73avj00mmzz8wyh9rl1k9i0cvk77d0nf9c80vzr2zfk9f31x"; + sha256 = "1q5nh84sxkdi4x0gwr0x7bgk33pq6071vxz5vnjkznwywhgw2hnn"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; From e778f8032c21387a109b3e3472b2dfa4225abddc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:04:49 +0300 Subject: [PATCH 25/64] crawl: 0.19.1 -> 0.19.3 --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index dc84b18547b..b6259c033af 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.19.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "02iklz5q5h7h27gw86ws8wk5gz1fg86jclkar05nd7zxxgiwsk96"; + sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7"; }; patches = [ ./crawl_purify.patch ]; From 1809cb56e12fe0f00d030585907d9fa9ab1b3aa7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:05:10 +0300 Subject: [PATCH 26/64] dwarf-fortress-packages.dfhack: 0.43.05-alpha2 -> 0.43.05-alpha4 --- pkgs/games/dwarf-fortress/dfhack/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 74dddbe8df9..ce935512178 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -7,12 +7,12 @@ let dfVersion = "0.43.05"; # version = "${dfVersion}-r1"; # rev = "refs/tags/${version}"; - version = "${dfVersion}-alpha2"; - rev = "13eb5e702beb6d8e40c0e17be64cda9a8d9d1efb"; - sha256 = "18i8qfhhfnfrpa519akwagn73q2zns1pry2sdfag63vffxh60zr5"; + version = "${dfVersion}-alpha4"; + rev = "refs/tags/${version}"; + sha256 = "0wnwdapw955k69ds5xh5qsh7h0l547wjxgcy8hkvly6wp5c16sls"; # revision of library/xml submodule - xmlRev = "84f6e968a9ec5515f9dbef96b445e3fc83f83e8b"; + xmlRev = "bb4228f58b1601c4868c95be6763f5ff2e5d0a08"; arch = if stdenv.system == "x86_64-linux" then "64" From 5fb5914c35a57147d9539229975459479c765cd7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 29 Jan 2017 20:05:33 +0300 Subject: [PATCH 27/64] ioquake3: 2016-11-02 -> 2017-01-27 --- pkgs/games/quake3/ioquake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 81077d9461f..734f9daa970 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ioquake3-git-${version}"; - version = "2016-11-02"; + version = "2017-01-27"; src = fetchFromGitHub { owner = "ioquake"; repo = "ioq3"; - rev = "1c1e1f61f180596c925a4ac0eddba4806d1369cd"; - sha256 = "1sx78hzvcbc05g2ikxcmnm6lq7bhgd86dzxnfzqpibcvgrlgsmy1"; + rev = "468da0fabca2f21b811a501c184b986e270c5113"; + sha256 = "14mhkqn6h2mbmz90j4ns1wp72ca5w9481sbyw2ving8xpw376i58"; }; nativeBuildInputs = [ which pkgconfig ]; From 98b0195dde0c2dad83759e314affc2d085d839cc Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 31 Jan 2017 03:35:31 +0300 Subject: [PATCH 28/64] video services: don't install OpenCL files to /etc They shouldn't be needed now that we search them in /run/opengl-driver. --- nixos/modules/hardware/video/amdgpu-pro.nix | 3 --- nixos/modules/hardware/video/nvidia.nix | 2 -- 2 files changed, 5 deletions(-) diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix index 979810abf90..06a405ee057 100644 --- a/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -44,9 +44,6 @@ in "amd/amdrc".source = package + "/etc/amd/amdrc"; "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb"; "gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf"; - "OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd"; - } // optionalAttrs opengl.driSupport32Bit { - "OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd"; }; }; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 8514f765e61..b604d645132 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -62,8 +62,6 @@ in services.acpid.enable = true; - environment.etc."OpenCL/vendors/nvidia.icd".source = "${nvidia_x11}/lib/vendors/nvidia.icd"; - }; } From 8d379ddfef1e7bcf123d8b0092f9924bf5232c07 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 31 Jan 2017 04:20:07 +0300 Subject: [PATCH 29/64] opengl service: use option for XDG_DATA_DIRS --- nixos/modules/hardware/opengl.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 5e38a988096..486fe7c1cd8 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -133,13 +133,10 @@ in ''; environment.sessionVariables.LD_LIBRARY_PATH = - [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]; + [ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib"; - environment.extraInit = '' - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver/share - '' + optionalString cfg.driSupport32Bit '' - export XDG_DATA_DIRS=$XDG_DATA_DIRS:/run/opengl-driver-32/share - ''; + environment.variables.XDG_DATA_DIRS = + [ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share"; hardware.opengl.package = mkDefault (makePackage pkgs); hardware.opengl.package32 = mkDefault (makePackage pkgs_i686); From dbd4a35060b242839ba4d41e9bb743365faef8ce Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sun, 29 Jan 2017 17:15:34 -0800 Subject: [PATCH 30/64] vulkan-loader: 1.0.26.0 -> 1.0.39.1 --- .../development/compilers/glslang/default.nix | 6 +- .../compilers/glslang/install-headers.patch | 25 +- .../libraries/vulkan-loader/default.nix | 26 +- .../vulkan-loader/use-xdg-paths.patch | 388 +++++++++++++----- .../development/tools/spirv-tools/default.nix | 10 +- 5 files changed, 318 insertions(+), 137 deletions(-) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index cd03c246624..d2384598456 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2016-08-26"; + version = "2016-12-21"; # `vulkan-loader` requires a specific version of `glslang` as specified in # `/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "81cd764b5ffc475bc73f1fb35f75fd1171bb2343"; - sha256 = "1vfwl6lzkjh9nh29q32b7zca4q1abf3q4nqkahskijgznw5lr59g"; + rev = "807a0d9e2f4e176f75d62ac3c179c81800ec2608"; + sha256 = "02jckgihqhagm73glipb4c6ri5fr3pnbxb5vrznn2vppyfdfghbj"; }; patches = [ ./install-headers.patch ]; diff --git a/pkgs/development/compilers/glslang/install-headers.patch b/pkgs/development/compilers/glslang/install-headers.patch index 9ad6f5e1906..75f27130978 100644 --- a/pkgs/development/compilers/glslang/install-headers.patch +++ b/pkgs/development/compilers/glslang/install-headers.patch @@ -1,21 +1,30 @@ diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 48a6c46..593d941 100755 +index c538e84..6ece1ab 100755 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt -@@ -42,3 +42,8 @@ endif(WIN32) +@@ -34,8 +34,9 @@ if(ENABLE_AMD_EXTENSIONS) + endif(ENABLE_AMD_EXTENSIONS) + + if(ENABLE_NV_EXTENSIONS) +- set(HEADERS +- GLSL.ext.NV.h) ++ list(APPEND ++ HEADERS ++ GLSL.ext.NV.h) + endif(ENABLE_NV_EXTENSIONS) + + add_library(SPIRV STATIC ${SOURCES} ${HEADERS}) +@@ -51,3 +52,5 @@ endif(WIN32) install(TARGETS SPIRV SPVRemapper ARCHIVE DESTINATION lib) + -+foreach(file ${HEADERS} ${SPVREMAP_HEADERS}) -+ get_filename_component(dir ${file} DIRECTORY) -+ install(FILES ${file} DESTINATION include/SPIRV/${dir}) -+endforeach() ++install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION include/SPIRV/) diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index ff91135..4318279 100644 +index 95d4bdd..e7fda90 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt -@@ -90,3 +90,8 @@ endif(WIN32) +@@ -93,3 +93,8 @@ endif(WIN32) install(TARGETS glslang ARCHIVE DESTINATION lib) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 731bd81cb6f..46994a495eb 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, - python3Packages, glslang, spirv-tools, x11, libxcb, wayland }: + python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, + libXext, wayland }: let - version = "1.0.26.0"; + version = "1.0.39.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-LoaderAndValidationLayers"; rev = "sdk-${version}"; - sha256 = "157m746hc76xrxd3qq0f44f5dy7pjbz8cx74ykqrlbc7rmpjpk58"; + sha256 = "0y9zzrnjjjza2kkf5jfsdqhn98md6rsq0hb7jg62z2dipzky7zdp"; }; in @@ -15,23 +16,13 @@ stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; inherit version src; - prePatch = '' - if [ "$(cat '${src}/spirv-tools_revision')" != '${spirv-tools.src.rev}' ] \ - || [ "$(cat '${src}/spirv-headers_revision')" != '${spirv-tools.headers.rev}' ] \ - || [ "$(cat '${src}/glslang_revision')" != '${glslang.src.rev}' ] - then - echo "Version mismatch, aborting!" - false - fi - ''; - buildInputs = [ cmake pkgconfig git python3 python3Packages.lxml - glslang spirv-tools x11 libxcb wayland + glslang spirv-tools x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ - "-DBUILD_WSI_WAYLAND_SUPPORT=ON" # XLIB/XCB supported by default + "-DBUILD_WSI_MIR_SUPPORT=OFF" ]; patches = [ ./use-xdg-paths.patch ]; @@ -40,7 +31,7 @@ stdenv.mkDerivation rec { preConfigure = '' checkRev() { - [ "$2" = $(cat "$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "$1_revision") && exit 1) + [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1) } checkRev spirv-tools "${spirv-tools.src.rev}" checkRev spirv-headers "${spirv-tools.headers.rev}" @@ -58,7 +49,8 @@ stdenv.mkDerivation rec { mkdir -p $dev/include cp -rv ../include $dev/ mkdir -p $demos/bin - cp demos/smoketest demos/tri demos/cube demos/*.spv demos/*.ppm $demos/bin + cp demos/*.spv demos/*.ppm $demos/bin + find demos -type f -executable -not -name vulkaninfo -exec cp {} $demos/bin \; ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch index 1ae0f20889f..eb7869cd73c 100644 --- a/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch +++ b/pkgs/development/libraries/vulkan-loader/use-xdg-paths.patch @@ -1,142 +1,322 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27ab6e5..e59256e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,17 +256,10 @@ if(NOT WIN32) + include(GNUInstallDirs) + + add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") +- add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}") +- + # Make sure /etc is searched by the loader +- if (NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) ++ if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) + add_definitions(-DEXTRASYSCONFDIR="/etc") + endif() +- +- # Make sure /usr/share is searched by the loader +- if (NOT (CMAKE_INSTALL_FULL_DATADIR STREQUAL "/usr/share")) +- add_definitions(-DEXTRADATADIR="/usr/share") +- endif() + endif() + + if(UNIX) diff --git a/loader/loader.c b/loader/loader.c -index a950ea1..9462d05 100644 +index 24758f4..af7cc85 100644 --- a/loader/loader.c +++ b/loader/loader.c -@@ -2671,6 +2671,94 @@ static VkResult loader_get_manifest_files( - } +@@ -2909,7 +2909,7 @@ static VkResult + loader_get_manifest_files(const struct loader_instance *inst, + const char *env_override, const char *source_override, + bool is_layer, bool warn_if_not_present, +- const char *location, const char *home_location, ++ const char *location, const char *relative_location, + struct loader_manifest_files *out_files) { + const char * override = NULL; + char *override_getenv = NULL; +@@ -2941,9 +2941,9 @@ loader_get_manifest_files(const struct loader_instance *inst, } + #if !defined(_WIN32) +- if (location == NULL && home_location == NULL) { ++ if (location == NULL && relative_location == NULL) { + #else +- home_location = NULL; ++ relative_location = NULL; + if (location == NULL) { + #endif + loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, +@@ -2962,16 +2962,89 @@ loader_get_manifest_files(const struct loader_instance *inst, + // Make a copy of the input we are using so it is not modified + // Also handle getting the location(s) from registry on Windows + if (override == NULL) { +- loc = loader_stack_alloc(strlen(location) + 1); ++ size_t loc_size = strlen(location) + 1; +#if !defined(_WIN32) -+ if (home_location && override == NULL) { -+ char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS"); -+ char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS"); -+ char *cur, *src = loc; -+ size_t src_size = strlen(src), rel_size = strlen(home_location); -+ size_t size = 0; -+ -+ if (src_size > 0) -+ size += src_size + 1; -+ -+ if (xdgconfdirs == NULL) ++ const char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS"); ++ const char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS"); ++ if (xdgconfdirs == NULL || xdgconfdirs[0] == '\0') + xdgconfdirs = "/etc/xdg"; -+ if (xdgdatadirs == NULL) ++ if (xdgdatadirs == NULL || xdgdatadirs[0] == '\0') + xdgdatadirs = "/usr/local/share:/usr/share"; -+ -+ for (char *x = xdgconfdirs; *x; ++x) -+ if (*x == PATH_SEPERATOR) size += rel_size; -+ size += strlen(xdgconfdirs) + rel_size + 1; -+ for (char *x = xdgdatadirs; *x; ++x) -+ if (*x == PATH_SEPERATOR) size += rel_size; -+ size += strlen(xdgdatadirs) + rel_size + 1; -+ -+#if defined(LOCALPREFIX) -+ size += strlen(LOCALPREFIX "/" SYSCONFDIR) + rel_size + 1; -+ size += strlen(LOCALPREFIX "/" DATADIR) + rel_size + 1; ++ const size_t rel_size = strlen(relative_location); ++ // Leave space for trailing separators ++ loc_size += strlen(xdgconfdirs) + strlen(xdgdatadirs) + 2*rel_size + 2; ++ for (const char *x = xdgconfdirs; *x; ++x) ++ if (*x == PATH_SEPARATOR) loc_size += rel_size; ++ for (const char *x = xdgdatadirs; *x; ++x) ++ if (*x == PATH_SEPARATOR) loc_size += rel_size; ++ loc_size += strlen(SYSCONFDIR) + rel_size + 1; ++#ifdef EXTRASYSCONFDIR ++ loc_size += strlen(EXTRASYSCONFDIR) + rel_size + 1; +#endif ++#endif ++ loc = loader_stack_alloc(loc_size); + if (loc == NULL) { + loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, + "loader_get_manifest_files: Failed to allocate " + "%d bytes for manifest file location.", +- strlen(location)); ++ loc_size); + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto out; + } +- strcpy(loc, location); ++ char *loc_write = loc; ++#if !defined(_WIN32) ++ const char *loc_read; + -+ loc = cur = loader_stack_alloc(size); -+ if (cur == NULL) { -+ loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, -+ "Out of memory can't get manifest files"); -+ res = VK_ERROR_OUT_OF_HOST_MEMORY; -+ goto out; -+ } -+ -+ if (src_size > 0) { -+ memcpy(cur, src, src_size); -+ cur += src_size; -+ *cur++ = PATH_SEPERATOR; -+ } -+ -+ src = xdgconfdirs; -+ for (char *x = src;; ++x) { -+ if (*x == PATH_SEPERATOR || *x == 0) { -+ size_t s = x - src; -+ memcpy(cur, src, s); cur += s; -+ memcpy(cur, home_location, rel_size); cur += rel_size; -+ *cur++ = PATH_SEPERATOR; ++ loc_read = &xdgconfdirs[0]; ++ for (const char *x = loc_read;; ++x) { ++ if (*x == PATH_SEPARATOR || *x == '\0') { ++ const size_t s = x - loc_read; ++ memcpy(loc_write, loc_read, s); ++ loc_write += s; ++ memcpy(loc_write, relative_location, rel_size); ++ loc_write += rel_size; ++ *loc_write++ = PATH_SEPARATOR; + if (*x == 0) + break; -+ src = ++x; ++ loc_read = ++x; + } + } + -+#if defined(LOCALPREFIX) -+ strcpy(cur, LOCALPREFIX "/" SYSCONFDIR); -+ cur += strlen(cur); -+ memcpy(cur, home_location, rel_size); cur += rel_size; -+ *cur++ = PATH_SEPERATOR; ++ memcpy(loc_write, SYSCONFDIR, strlen(SYSCONFDIR)); ++ loc_write += strlen(SYSCONFDIR); ++ memcpy(loc_write, relative_location, rel_size); ++ loc_write += rel_size; ++ *loc_write++ = PATH_SEPARATOR; ++ ++#ifdef EXTRASYSCONFDIR ++ memcpy(loc_write, EXTRASYSCONFDIR, strlen(EXTRASYSCONFDIR)); ++ loc_write += strlen(EXTRASYSCONFDIR); ++ memcpy(loc_write, relative_location, rel_size); ++ loc_write += rel_size; ++ *loc_write++ = PATH_SEPARATOR; +#endif + -+ src = xdgdatadirs; -+ for (char *x = src;; ++x) { -+ if (*x == PATH_SEPERATOR || *x == 0) { -+ size_t s = x - src; -+ memcpy(cur, src, s); cur += s; -+ memcpy(cur, home_location, rel_size); cur += rel_size; -+ *cur++ = PATH_SEPERATOR; ++ loc_read = &xdgdatadirs[0]; ++ for (const char *x = loc_read;; ++x) { ++ if (*x == PATH_SEPARATOR || *x == '\0') { ++ const size_t s = x - loc_read; ++ memcpy(loc_write, loc_read, s); ++ loc_write += s; ++ memcpy(loc_write, relative_location, rel_size); ++ loc_write += rel_size; ++ *loc_write++ = PATH_SEPARATOR; + if (*x == 0) + break; -+ src = ++x; ++ loc_read = ++x; + } + } -+ -+#if defined(LOCALPREFIX) -+ strcpy(cur, LOCALPREFIX "/" DATADIR); -+ cur += strlen(cur); -+ memcpy(cur, home_location, rel_size); cur += rel_size; -+ *cur++ = PATH_SEPERATOR; ++ --loc_write; ++ *loc_write = '\0'; ++#else ++ memcpy(loc_write, location, loc_size); ++ loc[loc_size-1] = '\0'; +#endif + -+ loc[size - 1] = 0; -+ assert(cur == loc + size); -+ list_is_dirs = true; -+ } -+#endif -+ - // Print out the paths being searched if debugging is enabled - loader_log(inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, - "Searching the following paths for manifest files: %s\n", loc); + #if defined(_WIN32) + VkResult reg_result = loaderGetRegistryFiles(inst, loc, ®); + if (VK_SUCCESS != reg_result || NULL == reg) { +@@ -3122,14 +3195,14 @@ loader_get_manifest_files(const struct loader_instance *inst, + } + file = next_file; + #if !defined(_WIN32) +- if (home_location != NULL && ++ if (relative_location != NULL && + (next_file == NULL || *next_file == '\0') && override == NULL) { + char *xdgdatahome = secure_getenv("XDG_DATA_HOME"); + size_t len; + if (xdgdatahome != NULL) { + + char *home_loc = loader_stack_alloc(strlen(xdgdatahome) + 2 + +- strlen(home_location)); ++ strlen(relative_location)); + if (home_loc == NULL) { + loader_log(inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, + "loader_get_manifest_files: Failed to allocate " +@@ -3139,15 +3212,15 @@ loader_get_manifest_files(const struct loader_instance *inst, + } + strcpy(home_loc, xdgdatahome); + // Add directory separator if needed +- if (home_location[0] != DIRECTORY_SYMBOL) { ++ if (relative_location[0] != DIRECTORY_SYMBOL) { + len = strlen(home_loc); + home_loc[len] = DIRECTORY_SYMBOL; + home_loc[len + 1] = '\0'; + } +- strcat(home_loc, home_location); ++ strcat(home_loc, relative_location); + file = home_loc; + next_file = loader_get_next_path(file); +- home_location = NULL; ++ relative_location = NULL; + + loader_log( + inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, +@@ -3160,7 +3233,7 @@ loader_get_manifest_files(const struct loader_instance *inst, + char *home = secure_getenv("HOME"); + if (home != NULL) { + char *home_loc = loader_stack_alloc(strlen(home) + 16 + +- strlen(home_location)); ++ strlen(relative_location)); + if (home_loc == NULL) { + loader_log( + inst, VK_DEBUG_REPORT_ERROR_BIT_EXT, 0, +@@ -3178,15 +3251,15 @@ loader_get_manifest_files(const struct loader_instance *inst, + } + strcat(home_loc, ".local/share"); + +- if (home_location[0] != DIRECTORY_SYMBOL) { ++ if (relative_location[0] != DIRECTORY_SYMBOL) { + len = strlen(home_loc); + home_loc[len] = DIRECTORY_SYMBOL; + home_loc[len + 1] = '\0'; + } +- strcat(home_loc, home_location); ++ strcat(home_loc, relative_location); + file = home_loc; + next_file = loader_get_next_path(file); +- home_location = NULL; ++ relative_location = NULL; + + loader_log( + inst, VK_DEBUG_REPORT_DEBUG_BIT_EXT, 0, +@@ -3263,7 +3336,7 @@ VkResult loader_icd_scan(const struct loader_instance *inst, + // Get a list of manifest files for ICDs + res = loader_get_manifest_files(inst, "VK_ICD_FILENAMES", NULL, false, true, + DEFAULT_VK_DRIVERS_INFO, +- HOME_VK_DRIVERS_INFO, &manifest_files); ++ RELATIVE_VK_DRIVERS_INFO, &manifest_files); + if (VK_SUCCESS != res || manifest_files.count == 0) { + goto out; + } +@@ -3490,7 +3563,7 @@ void loader_layer_scan(const struct loader_instance *inst, + if (VK_SUCCESS != + loader_get_manifest_files(inst, LAYERS_PATH_ENV, LAYERS_SOURCE_PATH, + true, true, DEFAULT_VK_ELAYERS_INFO, +- HOME_VK_ELAYERS_INFO, &manifest_files[0])) { ++ RELATIVE_VK_ELAYERS_INFO, &manifest_files[0])) { + goto out; + } + +@@ -3499,7 +3572,7 @@ void loader_layer_scan(const struct loader_instance *inst, + // overridden by LAYERS_PATH_ENV + if (VK_SUCCESS != loader_get_manifest_files(inst, NULL, NULL, true, false, + DEFAULT_VK_ILAYERS_INFO, +- HOME_VK_ILAYERS_INFO, ++ RELATIVE_VK_ILAYERS_INFO, + &manifest_files[1])) { + goto out; + } +@@ -3569,7 +3642,7 @@ void loader_implicit_layer_scan(const struct loader_instance *inst, + // overridden by LAYERS_PATH_ENV + VkResult res = loader_get_manifest_files( + inst, NULL, NULL, true, false, DEFAULT_VK_ILAYERS_INFO, +- HOME_VK_ILAYERS_INFO, &manifest_files); ++ RELATIVE_VK_ILAYERS_INFO, &manifest_files); + if (VK_SUCCESS != res || manifest_files.count == 0) { + return; + } diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h -index 3a02640..70a2652 100644 +index dc4ac10..50a7966 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h -@@ -57,35 +57,10 @@ +@@ -57,47 +57,9 @@ #define VULKAN_ILAYERCONF_DIR "implicit_layer.d" #define VULKAN_LAYER_DIR "layer" --#if defined(LOCALPREFIX) --#define LOCAL_DRIVERS_INFO \ -- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ -- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" --#define LOCAL_ELAYERS_INFO \ -- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ -- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" --#define LOCAL_ILAYERS_INFO \ -- LOCALPREFIX "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ -- LOCALPREFIX "/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" +-#if defined(EXTRASYSCONFDIR) +-#define EXTRA_DRIVERS_SYSCONFDIR_INFO ":" \ +- EXTRASYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR +-#define EXTRA_ELAYERS_SYSCONFDIR_INFO ":" \ +- EXTRASYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR +-#define EXTRA_ILAYERS_SYSCONFDIR_INFO ":" \ +- EXTRASYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR -#else --#define LOCAL_DRIVERS_INFO --#define LOCAL_ELAYERS_INFO --#define LOCAL_ILAYERS_INFO +-#define EXTRA_DRIVERS_SYSCONFDIR_INFO +-#define EXTRA_ELAYERS_SYSCONFDIR_INFO +-#define EXTRA_ILAYERS_SYSCONFDIR_INFO +-#endif +- +-#if defined(EXTRADATADIR) +-#define EXTRA_DRIVERS_DATADIR_INFO ":" \ +- EXTRADATADIR VULKAN_DIR VULKAN_ICDCONF_DIR +-#define EXTRA_ELAYERS_DATADIR_INFO ":" \ +- EXTRADATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR +-#define EXTRA_ILAYERS_DATADIR_INFO ":" \ +- EXTRADATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR +-#else +-#define EXTRA_DRIVERS_DATADIR_INFO +-#define EXTRA_ELAYERS_DATADIR_INFO +-#define EXTRA_ILAYERS_DATADIR_INFO -#endif - -#define DEFAULT_VK_DRIVERS_INFO \ -- LOCAL_DRIVERS_INFO \ -- "/" SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ -- "/usr/" DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR -+#define DEFAULT_VK_DRIVERS_INFO "" - #define DEFAULT_VK_DRIVERS_PATH "" +- SYSCONFDIR VULKAN_DIR VULKAN_ICDCONF_DIR ":" \ +- DATADIR VULKAN_DIR VULKAN_ICDCONF_DIR \ +- EXTRA_DRIVERS_SYSCONFDIR_INFO \ +- EXTRA_DRIVERS_DATADIR_INFO -#define DEFAULT_VK_ELAYERS_INFO \ -- LOCAL_ELAYERS_INFO \ -- "/" SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ -- "/usr/" DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR +- SYSCONFDIR VULKAN_DIR VULKAN_ELAYERCONF_DIR ":" \ +- DATADIR VULKAN_DIR VULKAN_ELAYERCONF_DIR \ +- EXTRA_ELAYERS_SYSCONFDIR_INFO \ +- EXTRA_ELAYERS_DATADIR_INFO -#define DEFAULT_VK_ILAYERS_INFO \ -- LOCAL_ILAYERS_INFO \ -- "/" SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ -- "/usr/" DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR +- SYSCONFDIR VULKAN_DIR VULKAN_ILAYERCONF_DIR ":" \ +- DATADIR VULKAN_DIR VULKAN_ILAYERCONF_DIR \ +- EXTRA_ILAYERS_SYSCONFDIR_INFO \ +- EXTRA_ILAYERS_DATADIR_INFO ++#define DEFAULT_VK_DRIVERS_INFO "" +#define DEFAULT_VK_ELAYERS_INFO "" +#define DEFAULT_VK_ILAYERS_INFO "" - #define DEFAULT_VK_LAYERS_PATH "" - #if !defined(LAYERS_SOURCE_PATH) + + #define DEFAULT_VK_DRIVERS_PATH "" + #if !defined(DEFAULT_VK_LAYERS_PATH) +@@ -109,9 +71,9 @@ + #endif + #define LAYERS_PATH_ENV "VK_LAYER_PATH" + +-#define HOME_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR +-#define HOME_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR +-#define HOME_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR ++#define RELATIVE_VK_DRIVERS_INFO VULKAN_DIR VULKAN_ICDCONF_DIR ++#define RELATIVE_VK_ELAYERS_INFO VULKAN_DIR VULKAN_ELAYERCONF_DIR ++#define RELATIVE_VK_ILAYERS_INFO VULKAN_DIR VULKAN_ILAYERCONF_DIR + + // C99: + #define PRINTF_SIZE_T_SPECIFIER "%zu" +@@ -251,9 +213,9 @@ loader_platform_thread_cond_broadcast(loader_platform_thread_cond *pCond) { #define LAYERS_SOURCE_PATH NULL + #endif + #define LAYERS_PATH_ENV "VK_LAYER_PATH" +-#define HOME_VK_DRIVERS_INFO "" +-#define HOME_VK_ELAYERS_INFO "" +-#define HOME_VK_ILAYERS_INFO "" ++#define RELATIVE_VK_DRIVERS_INFO "" ++#define RELATIVE_VK_ELAYERS_INFO "" ++#define RELATIVE_VK_ILAYERS_INFO "" + #define PRINTF_SIZE_T_SPECIFIER "%Iu" + + // File IO diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 4693e547716..9bc9bf9c0e4 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -8,14 +8,14 @@ spirv_sources = { tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "923a4596b44831a07060df45caacb522613730c9"; - sha256 = "0hmgng2sv34amfsag3ya09prnv1w535djwlzfn8h2vh430vgawxa"; + rev = "37422e9dba1a3a8cb8028b779dd546d43add6ef8"; + sha256 = "0sp2p4wg902clq0fr94vj19vyv43cq333jjxr0mjzay8dw2h4yzk"; }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "33d41376d378761ed3a4c791fc4b647761897f26"; - sha256 = "1s103bpi3g6hhq453qa4jbabfkyxxpf9vn213j8k4vm26lsi8hs2"; + rev = "c470b68225a04965bf87d35e143ae92f831e8110"; + sha256 = "18jgcpmm0ixp6314r5w144l3wayxjkmwqgx8dk5jgyw36dammkwd"; }; }; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2016-07-18"; + version = "2016-12-19"; src = spirv_sources.tools; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; From a9afa48915730b4a25164892d0b04a6755ab1f70 Mon Sep 17 00:00:00 2001 From: Jake Waksbaum Date: Mon, 30 Jan 2017 22:07:44 -0500 Subject: [PATCH 31/64] smartmontools: 6.4 -> 6.5 and fix segfault on darwin --- pkgs/tools/system/smartmontools/default.nix | 24 +++++------------ .../system/smartmontools/smartmontools.patch | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 pkgs/tools/system/smartmontools/smartmontools.patch diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index cc30cd7a488..1a9e2d3b5b9 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,30 +1,18 @@ -{ stdenv, fetchurl -, IOKit ? null }: +{ stdenv, fetchurl, +IOKit ? null , ApplicationServices ? null }: -let - version = "6.4"; - drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB"; - dbrev = "4167"; - driverdb = fetchurl { - url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "14rv1cxbpmnq12hjwr3icjiahx5i0ak7j69310c09rah0241l5j1"; - name = "smartmontools-drivedb.h"; - }; -in stdenv.mkDerivation rec { + version = "6.5"; name = "smartmontools-${version}"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "11bsxcghh7adzdklcslamlynydxb708vfz892d5w7agdq405ddza"; + sha256 = "1g25r6sx85b5lay5n6sbnqv05qxzj6xsafsp93hnrg1h044bps49"; }; - buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices]; - patchPhase = '' - cp ${driverdb} drivedb.h - sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in - ''; + patches = [ ./smartmontools.patch ]; meta = with stdenv.lib; { description = "Tools for monitoring the health of hard drives"; diff --git a/pkgs/tools/system/smartmontools/smartmontools.patch b/pkgs/tools/system/smartmontools/smartmontools.patch new file mode 100644 index 00000000000..144b2be2d33 --- /dev/null +++ b/pkgs/tools/system/smartmontools/smartmontools.patch @@ -0,0 +1,26 @@ +diff --git a/../smartmontools-6.5/configure b/./configure +index acb028a..5e2c7a1 100755 +--- a/../smartmontools-6.5/configure ++++ b/./configure +@@ -6703,7 +6703,7 @@ fi + ;; + *-*-darwin*) + os_deps='os_darwin.o' +- os_libs='-framework CoreFoundation -framework IOKit' ++ os_libs='-framework ApplicationServices -framework IOKit' + os_darwin=yes + os_man_filter=Darwin + ;; +diff --git a/../smartmontools-6.5/configure.ac b/./configure.ac +index 6bd61d7..32ff50c 100644 +--- a/../smartmontools-6.5/configure.ac ++++ b/./configure.ac +@@ -508,7 +508,7 @@ case "${host}" in + ;; + *-*-darwin*) + os_deps='os_darwin.o' +- os_libs='-framework CoreFoundation -framework IOKit' ++ os_libs='-framework ApplicationServices -framework IOKit' + os_darwin=yes + os_man_filter=Darwin + ;; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b587b4fd43..32db483785a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3804,7 +3804,7 @@ with pkgs; slsnif = callPackage ../tools/misc/slsnif { }; smartmontools = callPackage ../tools/system/smartmontools { - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices; }; smbldaptools = callPackage ../tools/networking/smbldaptools { From 61c48d9c45254e36e4ecb58ce7c263dda13bd9a0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 31 Jan 2017 05:05:07 +0000 Subject: [PATCH 32/64] luaPackages.luaexpat: fix build on darwin --- pkgs/top-level/lua-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3db9e66a98e..ecf6d11547d 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -112,6 +112,11 @@ let buildInputs = [ expat ]; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace '-shared' '-bundle -undefined dynamic_lookup -all_load' + ''; + preBuild = '' makeFlagsArray=( LUA_LDIR="$out/share/lua/${lua.luaversion}" @@ -121,7 +126,7 @@ let meta = { homepage = "http://matthewwild.co.uk/projects/luaexpat"; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.flosse ]; }; }; From 3dd2a271efff2617a54c3ed63bf3ed212ded77f8 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 31 Jan 2017 02:17:11 -0500 Subject: [PATCH 33/64] vim: make it possible to build with --enable-gui=gtk3 This doesn't change any defaults; I suspect that dropping gtk2 support would annoy some people so I didn't want to do that without asking around first. --- pkgs/applications/editors/vim/configurable.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index d0a0c63d9d0..ee33c3e3070 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, gettext -, composableDerivation, writeText, lib, config, glib, gtk2, python, perl, tcl, ruby +, composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -69,8 +69,8 @@ composableDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs - = [ ncurses gtk2 libX11 libXext libSM libXpm libXt libXaw libXau - libXmu glib libICE ]; + = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau + libXmu glib libICE ] ++ (if args.gui == "gtk3" then [gtk3] else [gtk2]); # most interpreters aren't tested yet.. (see python for example how to do it) flags = { @@ -149,7 +149,7 @@ composableDerivation { ftNixSupport = config.vim.ftNix or true; }; - #--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon + #--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gtk3/gnome/gnome2/motif/athena/neXtaw/photon/carbon /* // edf "gtk_check" "gtk_check" { } #If auto-select GUI, check for GTK default=yes // edf "gtk2_check" "gtk2_check" { } #If GTK GUI, check for GTK+ 2 default=yes @@ -171,4 +171,3 @@ composableDerivation { dontStrip = 1; }) - From e01c15d433cdaacca0c0525a29ce304b3832d16a Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 31 Jan 2017 02:36:35 -0500 Subject: [PATCH 34/64] nixos: if gnome3 is installed, build gvim for gtk3 too --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 17e84b1d9a1..21453d1917e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -78,7 +78,7 @@ in { }; debug = mkEnableOption "gnome-session debug messages"; - }; + }; environment.gnome3.packageSet = mkOption { default = null; @@ -86,7 +86,7 @@ in { description = "Which GNOME 3 package set to use."; apply = p: if p == null then pkgs.gnome3 else p; }; - + environment.gnome3.excludePackages = mkOption { default = []; example = literalExample "[ pkgs.gnome3.totem ]"; @@ -125,6 +125,9 @@ in { services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ]; + # If gnome3 is installed, build vim for gtk3 too. + nixpkgs.config.vim.gui = "gtk3"; + fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; services.xserver.desktopManager.session = singleton From e2bf0416a920e69cca2acc01ca0804ff3757422b Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Thu, 26 Jan 2017 08:16:50 +0100 Subject: [PATCH 35/64] pgroonga: init at 1.1.9 --- .../sql/postgresql/pgroonga/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/pgroonga/default.nix diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix new file mode 100644 index 00000000000..edd99aa9a69 --- /dev/null +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }: + +stdenv.mkDerivation rec { + name = "pgroonga-${version}"; + version = "1.1.9"; + + src = fetchurl { + url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; + sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag"; + }; + + buildInputs = [ postgresql pkgconfig libmsgpack groonga ]; + + makeFlags = [ "HAVE_MSGPACK=1" ]; + + installPhase = '' + mkdir -p $out/bin + install -D pgroonga.so -t $out/lib/ + install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "A PostgreSQL extension to use Groonga as the index"; + longDescription = "PGroonga is a PostgreSQL extension to use Groonga as the index. PostgreSQL supports full text search against languages that use only alphabet and digit. It means that PostgreSQL doesn't support full text search against Japanese, Chinese and so on. You can use super fast full text search feature against all languages by installing PGroonga into your PostgreSQL."; + homepage = https://pgroonga.github.io/; + license = licenses.postgresql; + maintainers = with maintainers; [ DerTim1 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dfa9711a1a..51ad8d8b307 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9055,6 +9055,8 @@ with pkgs; pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; + pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; + phonon = callPackage ../development/libraries/phonon {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; From 4cf8ae3a8c239eecef6c275f88e508370defbf08 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 30 Jan 2017 21:17:00 +0100 Subject: [PATCH 36/64] pythonPackages.pytest: use pytest_30 --- pkgs/tools/misc/tmuxp/default.nix | 2 +- pkgs/top-level/python-packages.nix | 40 ++++++++++++++++-------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 3ca01d7e5eb..04b42f6d722 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { ''; buildInputs = with pythonPackages; [ - pytest + pytest_29 pytest-rerunfailures ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03d03d6f8dc..d957d452218 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -895,7 +895,7 @@ in { sha256 = "1ybywzkd840v1qvb1p2bs08js260vq1jscjg8182hv7bmwacqy0k"; }; - buildInputs = with self; [ pytest_30 case ]; + buildInputs = with self; [ pytest case ]; propagatedBuildInputs = with self; [ vine ]; meta = { @@ -2650,7 +2650,7 @@ in { sha256 = "1anw68rkja1dbgvndxz5mq6f89hmxwaha0fjcdnsl5j1wj7imc1y"; }; - buildInputs = with self; [ pytest_30 case ]; + buildInputs = with self; [ pytest case ]; meta = { homepage = https://github.com/celery/billiard; @@ -3566,7 +3566,7 @@ in { sha256 = "0kgmbs3fl9879n48p4m79nxy9by2yhvxq1jdvlnqzzvkdb2sdmg3"; }; - buildInputs = with self; [ pytest_30 case ]; + buildInputs = with self; [ pytest case ]; propagatedBuildInputs = with self; [ kombu billiard pytz anyjson amqp eventlet ]; meta = { @@ -3812,7 +3812,7 @@ in { sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609"; }; - checkInputs = with self; [ pytest ]; + checkInputs = with self; [ pytest_29 ]; propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures; checkPhase = '' @@ -4672,7 +4672,7 @@ in { sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k"; }; - buildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest_29 ]; propagatedBuildInputs = with self; [ future numpy ]; doCheck = true; @@ -4944,7 +4944,7 @@ in { }; }; - pytest = self.pytest_29; + pytest = self.pytest_30; pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {}; @@ -4952,7 +4952,13 @@ in { pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {}; - pytest_30 = callPackage ../development/python-modules/pytest {}; + pytest_30 = callPackage ../development/python-modules/pytest{ + hypothesis = self.hypothesis.override { + # hypothesis requires pytest that causes dependency cycle + doCheck = false; + pytest = null; + }; + }; pytestcache = buildPythonPackage rec { name = "pytest-cache-1.0"; @@ -4978,9 +4984,7 @@ in { }; }; - pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { - pytest = self.pytest_30; - }; + pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { }; pytest-fixture-config = buildPythonPackage rec { name = "${pname}-${version}"; @@ -5568,7 +5572,7 @@ in { sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s"; }; - buildInputs = with self; [ pytest ]; + buildInputs = with self; [ pytest_29 ]; patchPhase = '' sed -i 's/==.*$//' requirements/test.txt ''; @@ -10306,9 +10310,7 @@ in { }; }; - django_guardian = callPackage ../development/python-modules/django_guardian.nix { - pytest = self.pytest_30; - }; + django_guardian = callPackage ../development/python-modules/django_guardian.nix { }; django_tagging = buildPythonPackage rec { name = "django-tagging-0.4.5"; @@ -13485,7 +13487,7 @@ in { sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h"; }; - buildInputs = with self; [ pytest_30 case pytz ]; + buildInputs = with self; [ pytest case pytz ]; propagatedBuildInputs = with self; [ amqp ]; @@ -18370,7 +18372,7 @@ in { sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn"; }; LC_ALL="en_US.UTF-8"; - buildInputs = with self; [ pkgs.glibcLocales pytest ]; + buildInputs = with self; [ pkgs.glibcLocales pytest_29 ]; checkPhase = '' py.test @@ -23334,7 +23336,7 @@ in { url = "mirror://pypi/s/${pname}/${name}.tar.gz"; sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; }; - buildInputs = with self; [ pytest virtualenv pytestrunner pytest-virtualenv ]; + buildInputs = with self; [ pytest_29 virtualenv pytestrunner pytest-virtualenv ]; propagatedBuildInputs = with self; [ twisted pathlib2 ]; postPatch = '' sed -i '12,$d' tests/test_main.py @@ -31558,7 +31560,7 @@ EOF url = "mirror://pypi/a/${pname}/${name}.tar.gz"; sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51"; }; - buildInputs = with self; [ unittest2 mock pytest trollius ]; + buildInputs = with self; [ unittest2 mock pytest_29 trollius ]; propagatedBuildInputs = with self; [ six twisted txaio ]; checkPhase = '' py.test $out @@ -31792,7 +31794,7 @@ EOF sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7"; }; - buildInputs = with self; [ case pytest_30 ]; + buildInputs = with self; [ case pytest ]; meta = { homepage = https://github.com/celery/vine; From d409d239459bbe0dabe9bff854ea15b4b12f10d5 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 31 Jan 2017 06:19:56 +0000 Subject: [PATCH 37/64] pidgin-xmpp-receipts: init at 0.7 --- lib/maintainers.nix | 1 + .../pidgin-xmpp-receipts/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 298afcbc161..42304f68b45 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -351,6 +351,7 @@ olejorgenb = "Ole Jørgen Brønner "; orbekk = "KJ Ørbekk "; orbitz = "Malcolm Matalka "; + orivej = "Orivej Desh "; osener = "Ozan Sener "; otwieracz = "Slawomir Gonet "; oxij = "Jan Malakhovski "; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix new file mode 100644 index 00000000000..c69de60c6cf --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, pidgin } : + +let + version = "0.7"; +in +stdenv.mkDerivation rec { + name = "pidgin-xmpp-receipts-${version}"; + + src = fetchFromGitHub { + owner = "noonien-d"; + repo = "pidgin-xmpp-receipts"; + rev = "release_${version}"; + sha256 = "1ackqwsqgy1nfggl9na4jicv7hd542aazkg629y2jmbyj1dl3kjm"; + }; + + buildInputs = [ pidgin ]; + + installPhase = '' + mkdir -p $out/lib/pidgin/ + cp xmpp-receipts.so $out/lib/pidgin/ + ''; + + meta = with stdenv.lib; { + homepage = http://devel.kondorgulasch.de/pidgin-xmpp-receipts/; + description = "Message delivery receipts (XEP-0184) Pidgin plugin"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51ad8d8b307..e8bb1b2262e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14548,6 +14548,8 @@ with pkgs; pidgin-skypeweb = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb { }; + pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; + pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; pidginosd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; From 68b4a1f669e2ca95ebbb3f80631952a7168214f1 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Tue, 31 Jan 2017 03:38:02 -0500 Subject: [PATCH 38/64] nixos: Respect nixpkgs.overlays (#22221) --- nixos/modules/misc/nixpkgs.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 7451888484f..b8824e6374b 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -45,9 +45,8 @@ let in { - options = { - - nixpkgs.config = mkOption { + options.nixpkgs = { + config = mkOption { default = {}; example = literalExample '' @@ -61,7 +60,7 @@ in ''; }; - nixpkgs.overlays = mkOption { + overlays = mkOption { default = []; example = literalExample '' @@ -85,7 +84,7 @@ in ''; }; - nixpkgs.system = mkOption { + system = mkOption { type = types.str; example = "i686-linux"; description = '' @@ -95,14 +94,9 @@ in multi-platform deployment, or when building virtual machines. ''; }; - }; config = { - _module.args.pkgs = import ../../.. { - system = config.nixpkgs.system; - - inherit (config.nixpkgs) config; - }; + _module.args.pkgs = import ../../.. config.nixpkgs; }; } From 3ccc139b3db8d9417006eb9deeb75038b2fc33fa Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 20 Dec 2016 15:38:02 +0100 Subject: [PATCH 39/64] cataract: init at 1.1.0 and HEAD --- pkgs/applications/misc/cataract/build.nix | 38 ++++++++++++++++++++ pkgs/applications/misc/cataract/default.nix | 17 +++++++++ pkgs/applications/misc/cataract/unstable.nix | 17 +++++++++ pkgs/top-level/all-packages.nix | 3 ++ 4 files changed, 75 insertions(+) create mode 100644 pkgs/applications/misc/cataract/build.nix create mode 100644 pkgs/applications/misc/cataract/default.nix create mode 100644 pkgs/applications/misc/cataract/unstable.nix diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix new file mode 100644 index 00000000000..587a20b2704 --- /dev/null +++ b/pkgs/applications/misc/cataract/build.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchgit +, autoreconfHook +, glib +, pkgconfig +, libxml2 +, exiv2 +, imagemagick +, version +, sha256 +, rev }: + +stdenv.mkDerivation rec { + inherit version; + name = "cataract-${version}"; + + src = fetchgit { + url = "git://git.bzatek.net/cataract"; + inherit sha256 rev; + }; + + buildInputs = [ autoreconfHook glib pkgconfig libxml2 exiv2 imagemagick ]; + + installPhase = '' + mkdir $out/{bin,share} -p + cp src/cgg{,-dirgen} $out/bin/ + ''; + + meta = { + homepage = "http://cgg.bzatek.net/"; + description = "a simple static web photo gallery, designed to be clean and easily usable"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; +} + + diff --git a/pkgs/applications/misc/cataract/default.nix b/pkgs/applications/misc/cataract/default.nix new file mode 100644 index 00000000000..83292a76c5d --- /dev/null +++ b/pkgs/applications/misc/cataract/default.nix @@ -0,0 +1,17 @@ +{ callPackage +, stdenv +, fetchgit +, autoconf +, automake +, glib +, pkgconfig +, libxml2 +, exiv2 +, imagemagick }: + +callPackage ./build.nix { + version = "1.1.0"; + rev = "675e647dc8ae918d29f520a29be9201ae85a94dd"; + sha256 = "13b9rvcy9k2ay8w36j28kc7f4lnxp4jc0494ck3xsmwgqsawmzdj"; +} + diff --git a/pkgs/applications/misc/cataract/unstable.nix b/pkgs/applications/misc/cataract/unstable.nix new file mode 100644 index 00000000000..8d8b063e48b --- /dev/null +++ b/pkgs/applications/misc/cataract/unstable.nix @@ -0,0 +1,17 @@ +{ callPackage +, stdenv +, fetchgit +, autoconf +, automake +, glib +, pkgconfig +, libxml2 +, exiv2 +, imagemagick }: + +callPackage ./build.nix { + version = "unstable-2016-10-18"; + rev = "db3d992febbe703931840e9bdad95c43081694a5"; + sha256 = "04f85piy675lq36w1mw6mw66n8911mmn4ifj8h9x47z8z806h3rf"; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8bb1b2262e..d4c71c6c8fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -696,6 +696,9 @@ with pkgs; capstone = callPackage ../development/libraries/capstone { }; + cataract = callPackage ../applications/misc/cataract { }; + cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { }; + catch = callPackage ../development/libraries/catch { }; catdoc = callPackage ../tools/text/catdoc { }; From 58dc8e30248e5c69ce6af9c80ec0cb5a3e448c43 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 31 Jan 2017 11:00:14 +0100 Subject: [PATCH 40/64] Remove myself from maintainers --- nixos/tests/emacs-daemon.nix | 2 +- .../misc/open-pdf-presenter/default.nix | 2 +- pkgs/applications/misc/tnef/default.nix | 2 +- .../networking/sync/backintime/common.nix | 2 +- .../science/programming/plm/default.nix | 2 +- pkgs/applications/video/byzanz/default.nix | 2 +- .../video/recordmydesktop/default.nix | 2 +- .../video/recordmydesktop/gtk.nix | 2 +- .../applications/video/recordmydesktop/qt.nix | 2 +- .../data/fonts/gentium-book-basic/default.nix | 2 +- pkgs/desktops/gnome-3/3.22/default.nix | 2 +- .../gnome-3/3.22/misc/pidgin/default.nix | 2 +- .../gnome-3/3.22/misc/pomodoro/default.nix | 2 +- .../libraries/uhttpmock/default.nix | 2 +- pkgs/development/pharo/launcher/default.nix | 2 +- pkgs/development/pharo/vm/build-vm.nix | 2 +- pkgs/development/pharo/vm/share.nix | 2 +- pkgs/tools/misc/tmate/default.nix | 2 +- pkgs/tools/misc/umlet/default.nix | 2 +- pkgs/tools/misc/vdirsyncer/default.nix | 2 +- pkgs/tools/networking/asynk/default.nix | 2 +- .../typesetting/git-latexdiff/default.nix | 2 +- pkgs/top-level/python-packages.nix | 36 +++++++++---------- 23 files changed, 40 insertions(+), 40 deletions(-) diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix index a4d63bdb7e4..466e772a881 100644 --- a/nixos/tests/emacs-daemon.nix +++ b/nixos/tests/emacs-daemon.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "emacs-daemon"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ DamienCassou ]; + maintainers = [ ]; }; enableOCR = true; diff --git a/pkgs/applications/misc/open-pdf-presenter/default.nix b/pkgs/applications/misc/open-pdf-presenter/default.nix index 1d5811226d5..0f40a236c58 100644 --- a/pkgs/applications/misc/open-pdf-presenter/default.nix +++ b/pkgs/applications/misc/open-pdf-presenter/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/olabini/open-pdf-presenter; description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)"; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index b59f1a43710..9e3cf011316 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/verdammelt/tnef; license = licenses.gpl2; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 3190d999a91..ccd08e2844e 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { homepage = https://github.com/bit-team/backintime; description = "Simple backup tool for Linux"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; longDescription = '' Back In Time is a simple backup tool (on top of rsync) for Linux diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index 0e35a0b2264..eb157e8b99f 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/pkgs/applications/science/programming/plm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Free cross-platform programming exerciser"; Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/; license = licenses.gpl3; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 872ac098f00..ca9620a0eb0 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/GNOME/byzanz; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix index 54dc88b452e..8797ad8f953 100644 --- a/pkgs/applications/video/recordmydesktop/default.nix +++ b/pkgs/applications/video/recordmydesktop/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://recordmydesktop.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix index f3bf714b941..2beb3ca94f2 100644 --- a/pkgs/applications/video/recordmydesktop/gtk.nix +++ b/pkgs/applications/video/recordmydesktop/gtk.nix @@ -32,6 +32,6 @@ in stdenv.mkDerivation rec { homepage = http://recordmydesktop.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix index de372c905bd..56080135151 100644 --- a/pkgs/applications/video/recordmydesktop/qt.nix +++ b/pkgs/applications/video/recordmydesktop/qt.nix @@ -32,6 +32,6 @@ in stdenv.mkDerivation rec { homepage = http://recordmydesktop.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 8bc9ec5e2f3..2c7b1eea577 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://software.sil.org/gentium/"; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; license = licenses.ofl; platforms = platforms.all; }; diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index 6069fc1ed02..21e1ecc7a04 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -14,7 +14,7 @@ let callPackage = pkgs.newScope self; version = "3.22"; - maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds DamienCassou ]; + maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ]; corePackages = with gnome3; [ pkgs.desktop_file_utils pkgs.ibus diff --git a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix index e3f6bca10a4..a5dd1480d3d 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix index 1c7f712b12c..8c1ab41de52 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { This GNOME utility helps to manage time according to Pomodoro Technique. It intends to improve productivity and focus by taking short breaks. ''; - maintainers = with maintainers; [ DamienCassou jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 6105db73bc7..94223378151 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Project for mocking web service APIs which use HTTP or HTTPS"; homepage = https://gitlab.com/groups/uhttpmock/; license = licenses.lgpl21; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 6e6722a804f..02004061b83 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; platforms = pharo-vm.meta.platforms; }; } diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 8265e1dc776..1eeb5dc3151 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; # Pharo VM sources are packaged separately for darwin (OS X) platforms = with stdenv.lib; intersectLists diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index 46d25334260..aba42e3981c 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "Shared files for Pharo"; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index b5009165799..baadd6f3064 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Instant Terminal Sharing"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ DamienCassou ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 8ef357f65eb..918ff2f3179 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.umlet.com; license = licenses.gpl3; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 633371606a8..e32e58fcded 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer jgeerds DamienCassou ]; + maintainers = with maintainers; [ matthiasbeyer jgeerds ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix index 9c381bea65d..de8bcc8e7ff 100644 --- a/pkgs/tools/networking/asynk/default.nix +++ b/pkgs/tools/networking/asynk/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = http://asynk.io/; description = "Flexible contacts synchronization program"; license = licenses.agpl3; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix index 9dc73886b5a..61c05666726 100644 --- a/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View diff on LaTeX source files on the generated PDF files"; - maintainers = [ maintainers.DamienCassou ]; + maintainers = [ ]; license = licenses.free; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9 platforms = platforms.unix; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 081448e0d82..11b24891fdb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3819,7 +3819,7 @@ in { homepage = https://github.com/click-contrib/click-log/; description = "Logging integration for Click"; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -3846,7 +3846,7 @@ in { homepage = https://github.com/click-contrib/click-threading/; description = "Multithreaded Click apps made easy"; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -7403,7 +7403,7 @@ in { homepage = https://github.com/matlink/gplaycli; description = "Google Play Downloader via Command line"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -8365,7 +8365,7 @@ in { homepage = https://github.com/cedadev/ndg_httpsclient/; description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"; license = licenses.bsd2; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -8620,7 +8620,7 @@ in { description = "Tool for extracting information from PDF documents"; homepage = http://euske.github.io/pdfminer/index.html; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -11129,7 +11129,7 @@ in { meta = { homepage = https://f-droid.org; description = "Server and tools for F-Droid, the Free Software repository system for Android"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; license = licenses.agpl3; }; }; @@ -15052,7 +15052,7 @@ in { meta = { homepage = https://github.com/aroig/mutag; license = licenses.gpl3; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -15157,7 +15157,7 @@ in { meta = { description = "Python client library to the MediaWiki API"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; license = licenses.mit; homepage = https://github.com/mwclient/mwclient; }; @@ -19547,7 +19547,7 @@ in { description = "Module for reading vCard and vCalendar files"; homepage = http://eventable.github.io/vobject/; license = licenses.asl20; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -19568,7 +19568,7 @@ in { description = "Command-line interface carddav client"; homepage = http://lostpackets.de/pycarddav; license = licenses.mit; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20409,7 +20409,7 @@ in { description = "Media Meta Data retrieval framework"; homepage = http://sourceforge.net/projects/mmpython/; license = licenses.gpl2; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20452,7 +20452,7 @@ in { description = "Generic application framework, providing the foundation for other modules"; homepage = https://github.com/freevo/kaa-base; license = licenses.lgpl21; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -20499,7 +20499,7 @@ in { description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; homepage = https://github.com/freevo/kaa-metadata; license = licenses.gpl2; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -23561,7 +23561,7 @@ in { description = "A Parser Generator for Python"; homepage = https://pypi.python.org/pypi/SimpleParse; platforms = platforms.all; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -25033,7 +25033,7 @@ in { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; homepage = http://www.subdownloader.net; license = licenses.gpl3; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; @@ -25171,7 +25171,7 @@ in { meta = { description = " GTK3 & python based GUI for Syncthing "; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; platforms = pkgs.syncthing.meta.platforms; homepage = "https://github.com/syncthing/syncthing-gtk"; license = licenses.gpl2; @@ -27843,7 +27843,7 @@ EOF homepage = https://github.com/scs3jb/screenkey; description = "A screencast tool to show your keys"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }; @@ -29361,7 +29361,7 @@ EOF homepage = http://weboob.org; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = licenses.agpl3; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ ]; }; }; From dacbca273007fad83a22fc51b33b2350ed7094c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Jan 2017 12:53:24 +0100 Subject: [PATCH 41/64] knot-dns: yet another attempt to fix build on Darwin --- pkgs/servers/dns/knot-dns/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 834d9a09b5b..c7b2032a579 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn -, systemd, nettle, libedit, zlib, libiconv +, systemd, nettle, libedit, zlib, libiconv, fetchpatch }: # Note: ATM only the libraries have been tested in nixpkgs. @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b"; }; + patches = stdenv.lib.optional stdenv.isDarwin + (fetchpatch { + name = "before-sierra.diff"; + url = "https://gitlab.labs.nic.cz/labs/knot/merge_requests/664.diff"; + sha256 = "0g4gm2m3pi0lfpkp53xayf6jq6yn3ifidh40maiy1a46dfadvw6w"; + }); + outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - CFLAGS = [ "-DNDEBUG" ]; + CFLAGS = [ "-O2" "-DNDEBUG" ]; #doCheck = true; problems in combination with dynamic linking From 904bcb391dc41717fedeefc07c63b5f8c4e6b88a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 29 Jan 2017 14:10:44 +0100 Subject: [PATCH 42/64] yaft: init at 0.2.9 --- pkgs/applications/misc/yaft/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/yaft/default.nix diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix new file mode 100644 index 00000000000..d273d27944a --- /dev/null +++ b/pkgs/applications/misc/yaft/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + version = "0.2.9"; + name = "yaft-${version}"; + + src = fetchFromGitHub { + owner = "uobikiemukot"; + repo = "yaft"; + rev = "v${version}"; + sha256 = "0l1ig8wm545kpn4l7186rymny83jkahnjim290wsl7hsszfq1ckd"; + }; + + buildInputs = [ ncurses ]; + + installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ]; + + meta = { + homepage = https://github.com/uobikiemukot/yaft; + description = "Yet another framebuffer terminal"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4c71c6c8fa..b97b527998b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4531,6 +4531,8 @@ with pkgs; xwinmosaic = callPackage ../tools/X11/xwinmosaic {}; + yaft = callPackage ../applications/misc/yaft { }; + yarn = callPackage ../development/tools/yarn { }; yank = callPackage ../tools/misc/yank { }; From ace284ee9510a8058680425079ea7a3663f14281 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 31 Jan 2017 07:54:02 -0600 Subject: [PATCH 43/64] es: git-2015-04-11 -> 0.9.1 --- pkgs/shells/es/default.nix | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 037d1e1ec99..62883a1c545 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -1,34 +1,28 @@ -{ stdenv, fetchgit, readline, yacc, autoconf, automake, libtool }: +{ stdenv, fetchurl, readline, yacc }: let - version = "git-2015-04-11"; + version = "0.9.1"; in stdenv.mkDerivation { name = "es-${version}"; - src = fetchgit { - url = "git://github.com/wryun/es-shell"; - rev = "fdf29d5296ce3a0ef96d2b5952cff07878753975"; - sha256 = "12faa9b5ffwydgwyjp57zr19sqap2ma3crj6wd2rx1hv30dkll7p"; + src = fetchurl { + url = "https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"; + sha256 = "1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h"; }; - buildInputs = [ readline yacc libtool autoconf automake ]; - - preConfigure = - '' - aclocal - autoconf - libtoolize -qi - ''; - - configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man"; - - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/man/man1 + # The distribution tarball does not have a single top-level directory. + preUnpack = '' + mkdir $name + cd $name + sourceRoot=. ''; + buildInputs = [ readline yacc ]; + + configureFlags = [ "--with-readline" ]; + meta = with stdenv.lib; { description = "Es is an extensible shell"; longDescription = From a2e1aecc0c56205762e1982aecee977c59a35d8d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 31 Jan 2017 07:54:36 -0600 Subject: [PATCH 44/64] es: add ttuegel to maintainers --- pkgs/shells/es/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 62883a1c545..789ddaf4d9b 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; homepage = http://wryun.github.io/es-shell/; license = licenses.publicDomain; - maintainers = [ maintainers.sjmackenzie ]; + maintainers = with maintainers; [ sjmackenzie ttuegel ]; platforms = platforms.all; }; From a3517bf32129e989fb4a3cd932b8ca4945045dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 31 Jan 2017 16:14:25 +0100 Subject: [PATCH 45/64] lmdb: get rid of $out/man Why it's annoying: #22318. --- pkgs/development/libraries/lmdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 80019d52f4f..14c30a30812 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { checkPhase = "make test"; preInstall = '' - mkdir -p $out/{man/man1,bin,lib,include} + mkdir -p $out/{bin,lib,include} ''; meta = with stdenv.lib; { From 53bfe0cafebfd3ce5764859470e9042103b456a7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 31 Jan 2017 16:57:57 +0100 Subject: [PATCH 46/64] bitlbee: 3.5 -> 3.5.1 for multiple CVEs Fixes: * CVE-2016-10188 * CVE-2016-10189 * CVE-2017-5668 --- .../networking/instant-messengers/bitlbee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 8b0dda1694d..5ee93bd4df5 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.5"; + name = "bitlbee-3.5.1"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "06c371bjly38yrkvfwdh5rjfx9xfl7bszyhrlbldy0xk38c057al"; + sha256 = "0sgsn0fv41rga46mih3fyv65cvfa6rvki8x92dn7bczbi7yxfdln"; }; nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; From c6b0c8513d7c9a3c10237c9ce96548114f94067e Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Tue, 31 Jan 2017 21:28:09 +0530 Subject: [PATCH 47/64] consul: 0.7.0 -> 0.7.3 --- pkgs/servers/consul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index f0501fa57d6..25482b2b388 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-${version}"; - version = "0.7.0"; + version = "0.7.3"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "04h5y5vixjh9np9lsrk02ypbqwcq855h7l1jlnl1vmfq3sfqjds7"; + sha256 = "0ab84sm281ibl9h6zfk17mr7yc9vxpi8i2xb4kzi8bg43n05lj4d"; }; # Keep consul.ui for backward compatability From ca593a729346640d5063cfae6484b85596240ba4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 31 Jan 2017 17:00:13 +0100 Subject: [PATCH 48/64] libarchive: add patch to fix CVE-2017-5601 --- pkgs/development/libraries/libarchive/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 3ee35e5bf57..89e2762e3cc 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739"; }; + patches = [ + (fetchurl { + url = "https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch"; + sha256 = "1934krf5imc9rq1av6immpsfn77pglanhz1csq8j22h9ab87n5z6"; + }) + ]; + outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig ]; From 44cbb0f54dbef38c3cf96615f93b86961aac971b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 31 Jan 2017 17:16:53 +0100 Subject: [PATCH 49/64] tcpdump: 4.8.1 -> 4.9.0 for multiple CVEs Temporarily use the Debian mirros for the sources because upstream hasn't released the new version. See https://www.debian.org/security/2017/dsa-3775. Fixes: CVE-2016-7922, CVE-2016-7923, CVE-2016-7924, CVE-2016-7925, CVE-2016-7926, CVE-2016-7927, CVE-2016-7928, CVE-2016-7929, CVE-2016-7930, CVE-2016-7931, CVE-2016-7932, CVE-2016-7933, CVE-2016-7934, CVE-2016-7935, CVE-2016-7936, CVE-2016-7937, CVE-2016-7938, CVE-2016-7939, CVE-2016-7940, CVE-2016-7973, CVE-2016-7974, CVE-2016-7975, CVE-2016-7983, CVE-2016-7984, CVE-2016-7985, CVE-2016-7986, CVE-2016-7992, CVE-2016-7993, CVE-2016-8574, CVE-2016-8575, CVE-2017-5202, CVE-2017-5203, CVE-2017-5204, CVE-2017-5205, CVE-2017-5341, CVE-2017-5342, CVE-2017-5482, CVE-2017-5483, CVE-2017-5484, CVE-2017-5485, CVE-2017-5486. --- pkgs/tools/networking/tcpdump/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index f51f345d1dd..42cb3867e05 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.8.1"; + name = "tcpdump-${version}"; + version = "4.9.0"; src = fetchurl { - url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "0743ipl0l7ymjss3ybvvc5cbk9kb7s8yl4p3ramp5kwgqhg39r10"; + #url = "http://www.tcpdump.org/release/${name}.tar.gz"; + url = "mirror://debian/pool/main/t/tcpdump/tcpdump_${version}.orig.tar.gz"; + sha256 = "0pjsxsy8l71i813sa934cwf1ryp9xbr7nxwsvnzavjdirchq3sga"; }; buildInputs = [ libpcap ]; From fa1e8ffa761108c560c5222b594be7a8a2b7f7b8 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 31 Jan 2017 10:34:47 -0600 Subject: [PATCH 50/64] spotify: 1.0.47 -> 1.0.48 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 9e310d6e4e4..b678380f12d 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.47.13.gd8e05b1f-47"; + version = "1.0.48.103.g15edf1ec-94"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0079vq2nw07795jyqrjv68sc0vqjy6abjh6jjd5cg3hqlxdf4ckz"; + sha256 = "0rpwxgxv2ihfhlri98k4n87ynlcp569gm9q6hd8jg0vd2jgji8b3"; }; buildInputs = [ dpkg makeWrapper ]; From 73f07ecb28a6ae4ac195e351335d15717fba3511 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 31 Jan 2017 12:02:46 -0500 Subject: [PATCH 51/64] nix-exec: 4.1.5 -> 4.1.6 Closes #22316 --- pkgs/development/interpreters/nix-exec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index ad585f085db..296176148c7 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let - version = "4.1.5"; + version = "4.1.6"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "1npy1did5ysacshclpfxihgh5bc0i9jqmvgxi1fp8prhcdhall9m"; + sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; }; buildInputs = [ pkgconfig nix git ]; From f2961ac736e2010078f277e64927f9ca9181647b Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Tue, 31 Jan 2017 23:19:50 +0530 Subject: [PATCH 52/64] minio: 20161213 -> 20170125 --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index e7b6fff1b66..bc2bbb13c44 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-${shortVersion}"; - shortVersion = "20161213"; - longVersion = "2016-12-13T17:19:42Z"; + shortVersion = "20170125"; + longVersion = "2017-01-25T03-14-52Z"; src = fetchurl { url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "1x23arrah54q2zqhgpyag531mimvs0wx6ap0hdrn4mygy5dahrqs"; + sha256 = "0yh8fdgl50sza182kl4jly0apf0dw0ya954ky6j8a8hmdcmk6wzk"; }; buildInputs = [ go ]; From 551c52f1a24e20fb66546229c4a819cfbe806504 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 31 Jan 2017 20:10:49 +0000 Subject: [PATCH 53/64] feh: 2.17.1 -> 2.18.1 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 40fe178d625..5b385f2acbf 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -2,11 +2,11 @@ , curl, libexif, perlPackages }: stdenv.mkDerivation rec { - name = "feh-2.17.1"; + name = "feh-2.18.1"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "0lyq17kkmjxj3vxpmri56linr1bnfmx5568pgrcjgd3amnj1is59"; + sha256 = "1ck55rhh5ax1d9k9gy2crvyjwffh6028f4kxaisd8ymgbql40f2c"; }; outputs = [ "out" "doc" ]; From 887590e1d260bb5fba8ca1c5861d69b5987723ab Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 31 Jan 2017 18:41:23 +0800 Subject: [PATCH 54/64] wireshark: use cmake and move to gtk3/qt5 wireshark used to use autotools, but instead we now use cmake. The change alone brought to light a few missing required dependencies. Additionally, wireshark was using gtk2 and qt4, so that has changed to gtk3 and qt5. --- .../networking/sniffers/wireshark/default.nix | 65 ++++++++----------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 56fe9859caa..d3c3b278607 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares -, gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib -, zlib -, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null -, withQt ? false, qt4 ? null +{ stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares +, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib +, libssh, zlib, cmake, ecm +, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null +, withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: -assert withGtk -> !withQt && gtk2 != null; -assert withQt -> !withGtk && qt4 != null; +assert withGtk -> !withQt && gtk3 != null; +assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let version = "2.2.4"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; -in -stdenv.mkDerivation { +in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; src = fetchurl { @@ -25,45 +24,35 @@ stdenv.mkDerivation { }; buildInputs = [ - bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls + bison cmake ecm flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls geoip c-ares python glib zlib - ] ++ optional withQt qt4 - ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]) - ++ optionals stdenv.isLinux [ libcap libnl ] + ] ++ (optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])) + ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ]) + ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; - configureFlags = "--disable-usr-local --disable-silent-rules --with-ssl" - + (if withGtk then - " --with-gtk2 --without-gtk3 --without-qt" - else if withQt then - " --without-gtk2 --without-gtk3 --with-qt" - else " --disable-wireshark"); - - desktopItem = makeDesktopItem { - name = "Wireshark"; - exec = "wireshark"; - icon = "wireshark"; - comment = "Powerful network protocol analysis suite"; - desktopName = "Wireshark"; - genericName = "Network packet analyzer"; - categories = "Network;System"; - }; - postInstall = optionalString (withQt || withGtk) '' - mkdir -p "$out"/share/applications/ - mkdir -p "$out"/share/icons/ - cp "$desktopItem/share/applications/"* "$out/share/applications/" - cp image/wsicon.svg "$out"/share/icons/wireshark.svg + ${optionalString withGtk '' + install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop + ''} + ${optionalString withQt '' + install -Dm644 -t $out/share/applications ../wireshark.desktop + ''} + + substituteInPlace $out/share/applications/*.desktop \ + --replace "Exec=wireshark" "Exec=$out/bin/wireshark" + + install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg ''; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.wireshark.org/; description = "Powerful network protocol analyzer"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; longDescription = '' Wireshark (formerly known as "Ethereal") is a powerful network @@ -71,7 +60,7 @@ stdenv.mkDerivation { experts. It runs on UNIX, OS X and Windows. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ]; + platforms = platforms.unix; + maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b97b527998b..90e44c9819a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13273,6 +13273,7 @@ with pkgs; withGtk = false; inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration; }; + # The GTK UI is deprecated by upstream. You probably want the QT version. wireshark-gtk = wireshark-cli.override { withGtk = true; }; wireshark-qt = wireshark-cli.override { withQt = true; }; wireshark = wireshark-qt; From 10349e72b91962c838719d4859a5e7cf05f10946 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Jan 2017 22:37:18 +0100 Subject: [PATCH 55/64] nixos: drop unused 'haskellPackages' option from ihaskell service Closes https://github.com/NixOS/nixpkgs/issues/19039. --- nixos/modules/services/misc/ihaskell.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index d0e9b839e75..df7b9be0db5 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -20,18 +20,6 @@ in description = "Autostart an IHaskell notebook service."; }; - haskellPackages = mkOption { - default = pkgs.haskellPackages; - defaultText = "pkgs.haskellPackages"; - example = literalExample "pkgs.haskell.packages.ghc784"; - description = '' - haskellPackages used to build IHaskell and other packages. - This can be used to change the GHC version used to build - IHaskell and the packages listed in - extraPackages. - ''; - }; - extraPackages = mkOption { default = self: []; example = literalExample '' From 3b26c2f465c35019a4ab3f35a2c0f6584bd18727 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 31 Jan 2017 22:49:02 +0100 Subject: [PATCH 56/64] callHackage: update Hackage snapshot to a current version --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 95296108618..447fc1a94bd 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -6,6 +6,6 @@ fetchFromGitHub { owner = "commercialhaskell"; repo = "all-cabal-hashes"; - rev = "5c5b04af472eb6c2854b21cb52ee6324252280de"; - sha256 = "1cnr350044yrlg7wa09fmdarl7y9gkydh25lv94wcqg3w9cdv0fb"; + rev = "a7e72af80fb1e68d9a2c4a5927a253b71ed68239"; + sha256 = "1ppk5r7yllvibsgxgs7k9kb2dcwh4pphf0876hcdh392cal47h3x"; } From 5e57536ace8eefe6886ee3e98b3d089226ed1c5f Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Tue, 31 Jan 2017 22:27:09 +0100 Subject: [PATCH 57/64] pythonPackages.lpod: fix missing dependency --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11b24891fdb..773b3d66a13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8173,7 +8173,7 @@ in { # lpod library currently does not support Python 3.x disabled = isPy3k; - propagatedBuildInputs = with self; [ ]; + propagatedBuildInputs = with self; [ lxml docutils pillow ]; src = pkgs.fetchFromGitHub { owner = "lpod"; From e967068695c052f70a87a285ad60f796231da703 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 31 Jan 2017 20:10:18 -0500 Subject: [PATCH 58/64] nodePackages: Add ios-deploy, update the rest --- pkgs/development/node-packages/default-v6.nix | 8 + .../node-packages/node-packages-v4.nix | 1375 ++++++++++------- .../node-packages/node-packages-v6.nix | 1148 +++++++------- .../node-packages/node-packages.json | 1 + 4 files changed, 1390 insertions(+), 1142 deletions(-) diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 8e6aeac9683..27664385b61 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -45,4 +45,12 @@ nodePackages // { done ''; }); + + ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { + preRebuild = '' + tmp=$(mktemp -d) + ln -s /usr/bin/xcodebuild $tmp + export PATH="$PATH:$tmp" + ''; + }); } diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 8f5d178e734..72f0f0a24d9 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -3208,13 +3208,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-4.9.1" = { + "buffer-5.0.2" = { name = "buffer"; packageName = "buffer"; - version = "4.9.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz"; + sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d"; }; }; "cached-path-relative-1.0.0" = { @@ -4081,6 +4081,15 @@ let sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; }; }; + "array-shuffle-1.0.1" = { + name = "array-shuffle"; + packageName = "array-shuffle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz"; + sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; + }; + }; "castv2-client-1.2.0" = { name = "castv2-client"; packageName = "castv2-client"; @@ -4117,13 +4126,13 @@ let sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; }; }; - "fs-extended-0.2.1" = { - name = "fs-extended"; - packageName = "fs-extended"; - version = "0.2.1"; + "diveSync-0.3.0" = { + name = "diveSync"; + packageName = "diveSync"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extended/-/fs-extended-0.2.1.tgz"; - sha1 = "3910358127e9c72c8296c30142c7763b5f5e2d3a"; + url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz"; + sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; }; }; "got-1.2.2" = { @@ -4243,6 +4252,15 @@ let sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; }; }; + "xspfr-0.3.1" = { + name = "xspfr"; + packageName = "xspfr"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xspfr/-/xspfr-0.3.1.tgz"; + sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; + }; + }; "castv2-0.1.9" = { name = "castv2"; packageName = "castv2"; @@ -4441,6 +4459,15 @@ let sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; }; }; + "append-0.1.1" = { + name = "append"; + packageName = "append"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz"; + sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; + }; + }; "object-assign-1.0.0" = { name = "object-assign"; packageName = "object-assign"; @@ -5566,22 +5593,22 @@ let sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; }; }; - "cordova-common-1.5.1" = { + "cordova-common-2.0.0" = { name = "cordova-common"; packageName = "cordova-common"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz"; - sha1 = "6770de0d6200ad6f94a1abe8939b5bd9ece139e3"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.0.tgz"; + sha1 = "125097eb4b50b7353cec226ed21649192293ae97"; }; }; - "cordova-lib-6.4.0" = { + "cordova-lib-6.5.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.4.0.tgz"; - sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33"; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.5.0.tgz"; + sha1 = "f7630a04c29d6cdee980190b1d93fb1536ac453f"; }; }; "insight-0.8.4" = { @@ -5656,13 +5683,13 @@ let sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; }; }; - "elementtree-0.1.6" = { + "elementtree-0.1.7" = { name = "elementtree"; packageName = "elementtree"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; - sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz"; + sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; "glob-5.0.15" = { @@ -5728,13 +5755,13 @@ let sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; }; }; - "sax-0.3.5" = { + "sax-1.1.4" = { name = "sax"; packageName = "sax"; - version = "0.3.5"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; - sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; + sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; }; }; "base64-js-0.0.8" = { @@ -5764,31 +5791,31 @@ let sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030"; }; }; - "cordova-fetch-1.0.1" = { - name = "cordova-fetch"; - packageName = "cordova-fetch"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.1.tgz"; - sha1 = "3122ed3dca8e83eae0345f83f3a8cc33680bf769"; - }; - }; - "cordova-create-1.0.1" = { + "cordova-create-1.0.2" = { name = "cordova-create"; packageName = "cordova-create"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.1.tgz"; - sha1 = "f1810401807ceec436ece27241180a83c97f8212"; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.2.tgz"; + sha1 = "cb9bba9817c62a645bacb6e00da8cc50936a0fa5"; }; }; - "cordova-js-4.2.0" = { + "cordova-fetch-1.0.2" = { + name = "cordova-fetch"; + packageName = "cordova-fetch"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.2.tgz"; + sha1 = "b8f4903f39fe613888062552a96995413af16d35"; + }; + }; + "cordova-js-4.2.1" = { name = "cordova-js"; packageName = "cordova-js"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.0.tgz"; - sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980"; + url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.1.tgz"; + sha1 = "01ca186e14e63b01cb6d24e469750e481a038355"; }; }; "cordova-serve-1.0.1" = { @@ -5809,6 +5836,15 @@ let sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; }; }; + "elementtree-0.1.6" = { + name = "elementtree"; + packageName = "elementtree"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; + sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + }; + }; "init-package-json-1.9.4" = { name = "init-package-json"; packageName = "init-package-json"; @@ -5908,13 +5944,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.8.9" = { + "xcode-0.9.1" = { name = "xcode"; packageName = "xcode"; - version = "0.8.9"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz"; - sha1 = "ec6765f70e9dccccc9f6e9a5b9b4e7e814b4cf35"; + url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz"; + sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95"; }; }; "browserify-transform-tools-1.5.3" = { @@ -5953,6 +5989,15 @@ let sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; }; }; + "cordova-app-hello-world-3.11.0" = { + name = "cordova-app-hello-world"; + packageName = "cordova-app-hello-world"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; + sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; + }; + }; "dependency-ls-1.0.0" = { name = "dependency-ls"; packageName = "dependency-ls"; @@ -5998,31 +6043,22 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "cordova-app-hello-world-3.11.0" = { - name = "cordova-app-hello-world"; - packageName = "cordova-app-hello-world"; - version = "3.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; - sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; - }; - }; - "browserify-13.1.0" = { + "browserify-13.3.0" = { name = "browserify"; packageName = "browserify"; - version = "13.1.0"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz"; - sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; }; - "assert-1.3.0" = { - name = "assert"; - packageName = "assert"; - version = "1.3.0"; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; - sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; "compression-1.6.2" = { @@ -6034,13 +6070,13 @@ let sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"; }; }; - "express-4.14.0" = { + "express-4.14.1" = { name = "express"; packageName = "express"; - version = "4.14.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; - sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; + sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; }; }; "accepts-1.3.3" = { @@ -6124,13 +6160,13 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; - "content-disposition-0.5.1" = { + "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; - sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; + sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; }; }; "content-type-1.0.2" = { @@ -6196,13 +6232,13 @@ let sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; }; }; - "finalhandler-0.5.0" = { + "finalhandler-0.5.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; - sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; "fresh-0.3.0" = { @@ -6277,22 +6313,22 @@ let sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; }; }; - "send-0.14.1" = { + "send-0.14.2" = { name = "send"; packageName = "send"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; - sha1 = "a954984325392f51532a7760760e459598c89f7a"; + url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz"; + sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef"; }; }; - "serve-static-1.11.1" = { + "serve-static-1.11.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz"; - sha1 = "d6cce7693505f733c759de57befc1af76c0f0805"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz"; + sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7"; }; }; "type-is-1.6.14" = { @@ -6385,6 +6421,15 @@ let sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; }; }; + "sax-0.3.5" = { + name = "sax"; + packageName = "sax"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + }; + }; "npm-package-arg-4.2.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -8024,13 +8069,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.5.0" = { + "nan-2.5.1" = { name = "nan"; packageName = "nan"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; + sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; }; }; "jsonparse-0.0.6" = { @@ -8069,13 +8114,13 @@ let sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; }; }; - "faye-websocket-0.11.0" = { + "faye-websocket-0.11.1" = { name = "faye-websocket"; packageName = "faye-websocket"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz"; - sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50"; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz"; + sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; }; }; "eventemitter3-0.1.6" = { @@ -9035,13 +9080,13 @@ let sha1 = "8859936af0038741263053b39d0e76ca241e4034"; }; }; - "ignore-3.2.0" = { + "ignore-3.2.2" = { name = "ignore"; packageName = "ignore"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz"; - sha1 = "8d88f03c3002a0ac52114db25d2c673b0bf1e435"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz"; + sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410"; }; }; "inquirer-0.12.0" = { @@ -9152,13 +9197,13 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "js-tokens-3.0.0" = { + "js-tokens-3.0.1" = { name = "js-tokens"; packageName = "js-tokens"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz"; - sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"; + sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7"; }; }; "es6-map-0.1.4" = { @@ -9449,22 +9494,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.10.4" = { + "ajv-4.11.2" = { name = "ajv"; packageName = "ajv"; - version = "4.10.4"; + version = "4.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz"; - sha1 = "c0974dd00b3464984892d6010aa9c2c945933254"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz"; + sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"; }; }; - "ajv-keywords-1.5.0" = { + "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz"; - sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; + sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; }; }; "slice-ansi-0.0.4" = { @@ -10206,13 +10251,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.2" = { + "coffee-script-1.12.3" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; + sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; }; }; "jade-1.11.0" = { @@ -11655,6 +11700,15 @@ let sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; + "finalhandler-0.5.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; + sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + }; + }; "custom-event-1.0.1" = { name = "custom-event"; packageName = "custom-event"; @@ -13302,6 +13356,15 @@ let sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; }; }; + "express-4.14.0" = { + name = "express"; + packageName = "express"; + version = "4.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; + sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + }; + }; "follow-redirects-1.2.1" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -13608,6 +13671,24 @@ let sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; }; }; + "content-disposition-0.5.1" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; + sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; + }; + }; + "send-0.14.1" = { + name = "send"; + packageName = "send"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; + sha1 = "a954984325392f51532a7760760e459598c89f7a"; + }; + }; "retry-0.6.1" = { name = "retry"; packageName = "retry"; @@ -13770,13 +13851,13 @@ let sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; }; }; - "mailparser-0.6.1" = { + "mailparser-0.6.2" = { name = "mailparser"; packageName = "mailparser"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.1.tgz"; - sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; + url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz"; + sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; }; }; "imap-0.8.19" = { @@ -13896,13 +13977,13 @@ let sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "mimelib-0.2.19" = { + "mimelib-0.3.0" = { name = "mimelib"; packageName = "mimelib"; - version = "0.2.19"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz"; - sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee"; + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz"; + sha1 = "4b16d4b435403daf692bc227890c7165ff3de894"; }; }; "encoding-0.1.12" = { @@ -13923,6 +14004,15 @@ let sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; + "addressparser-1.0.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; + sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -13950,6 +14040,15 @@ let sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; }; }; + "nan-2.5.0" = { + name = "nan"; + packageName = "nan"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; + sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + }; + }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -14454,15 +14553,6 @@ let sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; }; }; - "addressparser-1.0.1" = { - name = "addressparser"; - packageName = "addressparser"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; - sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; - }; - }; "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; @@ -14544,15 +14634,6 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "JSONStream-1.2.1" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; - sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; - }; - }; "fstream-npm-1.2.0" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -14616,6 +14697,15 @@ let sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; }; }; + "node-gyp-3.5.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; + sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; + }; + }; "nopt-4.0.1" = { name = "nopt"; packageName = "nopt"; @@ -14688,15 +14778,6 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; - "write-file-atomic-1.2.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; - sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; - }; - }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -15057,6 +15138,15 @@ let sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; }; }; + "write-file-atomic-1.2.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; + sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; + }; + }; "form-data-2.0.0" = { name = "form-data"; packageName = "form-data"; @@ -15247,13 +15337,13 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; - "domino-1.0.27" = { + "domino-1.0.28" = { name = "domino"; packageName = "domino"; - version = "1.0.27"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz"; - sha1 = "26bc01f739707505c51456af7f59e3373369475d"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz"; + sha1 = "9ce3f6a9221a2c3288984b14ea191cd27b392f87"; }; }; "express-handlebars-3.0.0" = { @@ -15265,15 +15355,6 @@ let sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "finalhandler-0.5.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; - sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; - }; - }; "gelf-stream-0.2.4" = { name = "gelf-stream"; packageName = "gelf-stream"; @@ -16916,13 +16997,13 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "express-5.0.0-alpha.2" = { + "express-5.0.0-alpha.3" = { name = "express"; packageName = "express"; - version = "5.0.0-alpha.2"; + version = "5.0.0-alpha.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.2.tgz"; - sha1 = "fd54177f657b6a4c4540727702edd1cbaa3a6ac5"; + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz"; + sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db"; }; }; "express-json5-0.1.0" = { @@ -17006,58 +17087,13 @@ let sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; }; }; - "array-flatten-1.1.0" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz"; - sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; - }; - }; - "path-is-absolute-1.0.0" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; - }; - }; - "path-to-regexp-0.1.6" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz"; - sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36"; - }; - }; - "router-1.1.4" = { + "router-1.1.5" = { name = "router"; packageName = "router"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.1.4.tgz"; - sha1 = "5d449dde9d6e0ad5c3f53369064baf7798834a97"; - }; - }; - "array-flatten-2.0.0" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.0.0.tgz"; - sha1 = "24dd98b38b9194b59b2087ba40c21384d6b8a8dc"; - }; - }; - "setprototypeof-1.0.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.0.tgz"; - sha1 = "d5fafca01e1174d0079bd1bf881f09c8a339794c"; + url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz"; + sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387"; }; }; "raw-body-1.3.4" = { @@ -17339,13 +17375,13 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.1.10" = { + "csv-parse-1.2.0" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz"; - sha1 = "767340d0d1f26d05434c798b7132222c669189de"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz"; + sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425"; }; }; "stream-transform-0.1.1" = { @@ -17510,15 +17546,6 @@ let sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; }; }; - "js-yaml-3.6.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; - }; - }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -17528,13 +17555,13 @@ let sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; }; }; - "csso-2.2.1" = { + "csso-2.3.1" = { name = "csso"; packageName = "csso"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.2.1.tgz"; - sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2"; + url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz"; + sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9"; }; }; "clap-1.1.2" = { @@ -18095,15 +18122,6 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "node-gyp-3.5.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; - }; - }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -18185,22 +18203,40 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "enhanced-resolve-0.9.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "0.9.1"; + "acorn-dynamic-import-2.0.1" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"; - sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e"; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz"; + sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2"; }; }; - "interpret-0.6.6" = { - name = "interpret"; - packageName = "interpret"; - version = "0.6.6"; + "enhanced-resolve-3.0.3" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"; - sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz"; + sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62"; + }; + }; + "json-loader-0.5.4" = { + name = "json-loader"; + packageName = "json-loader"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz"; + sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; + }; + }; + "loader-runner-2.3.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"; + sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; }; }; "loader-utils-0.2.16" = { @@ -18212,58 +18248,49 @@ let sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; - "memory-fs-0.3.0" = { + "memory-fs-0.4.1" = { name = "memory-fs"; packageName = "memory-fs"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; - sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; }; }; - "node-libs-browser-0.7.0" = { + "node-libs-browser-2.0.0" = { name = "node-libs-browser"; packageName = "node-libs-browser"; - version = "0.7.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz"; - sha1 = "3e272c0819e308935e26674408d7af0e1491b83b"; + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz"; + sha1 = "a3a59ec97024985b46e958379646f96c4b616646"; }; }; - "tapable-0.1.10" = { + "tapable-0.2.6" = { name = "tapable"; packageName = "tapable"; - version = "0.1.10"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"; - sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4"; + url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz"; + sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d"; }; }; - "watchpack-0.2.9" = { + "watchpack-1.2.0" = { name = "watchpack"; packageName = "watchpack"; - version = "0.2.9"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz"; - sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz"; + sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb"; }; }; - "webpack-core-0.6.9" = { - name = "webpack-core"; - packageName = "webpack-core"; - version = "0.6.9"; + "webpack-sources-0.1.4" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz"; - sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; - }; - }; - "memory-fs-0.2.0" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"; - sha1 = "f2bb25368bc121e391c2520de92969caee0a0290"; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz"; + sha1 = "ccc2c817e08e5fa393239412690bb481821393cd"; }; }; "big.js-3.1.3" = { @@ -18293,15 +18320,6 @@ let sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "crypto-browserify-3.3.0" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz"; - sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"; - }; - }; "os-browserify-0.2.1" = { name = "os-browserify"; packageName = "os-browserify"; @@ -18320,42 +18338,6 @@ let sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86"; }; }; - "pbkdf2-compat-2.0.1" = { - name = "pbkdf2-compat"; - packageName = "pbkdf2-compat"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"; - sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288"; - }; - }; - "ripemd160-0.2.0" = { - name = "ripemd160"; - packageName = "ripemd160"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"; - sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce"; - }; - }; - "sha.js-2.2.6" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"; - sha1 = "17ddeddc5f722fb66501658895461977867315ba"; - }; - }; - "browserify-aes-0.4.0" = { - name = "browserify-aes"; - packageName = "browserify-aes"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz"; - sha1 = "067149b668df31c4b58533e02d01e806d8608e2c"; - }; - }; "setimmediate-1.0.5" = { name = "setimmediate"; packageName = "setimmediate"; @@ -18524,10 +18506,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz"; - sha1 = "78be031931f4b9012f6085e1544069c56dcba233"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz"; + sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e"; }; dependencies = [ sources."colors-0.6.0-1" @@ -19447,10 +19429,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "13.3.0"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; - sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz"; + sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38"; }; dependencies = [ (sources."JSONStream-1.3.0" // { @@ -19483,11 +19465,10 @@ in sources."pako-0.2.9" ]; }) - (sources."buffer-4.9.1" // { + (sources."buffer-5.0.2" // { dependencies = [ sources."base64-js-1.2.0" sources."ieee754-1.1.8" - sources."isarray-1.0.0" ]; }) sources."cached-path-relative-1.0.0" @@ -19782,13 +19763,14 @@ in castnow = nodeEnv.buildNodePackage { name = "castnow"; packageName = "castnow"; - version = "0.4.17"; + version = "0.4.18"; src = fetchurl { - url = "https://registry.npmjs.org/castnow/-/castnow-0.4.17.tgz"; - sha1 = "7d9ce3c5605b5aa74ae5348c826443374d5863a8"; + url = "https://registry.npmjs.org/castnow/-/castnow-0.4.18.tgz"; + sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8"; }; dependencies = [ sources."array-loop-1.0.0" + sources."array-shuffle-1.0.1" (sources."castv2-client-1.2.0" // { dependencies = [ (sources."castv2-0.1.9" // { @@ -19863,7 +19845,11 @@ in sources."ms-0.7.2" ]; }) - sources."fs-extended-0.2.1" + (sources."diveSync-0.3.0" // { + dependencies = [ + sources."append-0.1.1" + ]; + }) (sources."got-1.2.2" // { dependencies = [ sources."object-assign-1.0.0" @@ -20461,6 +20447,11 @@ in }) ]; }) + (sources."xspfr-0.3.1" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; @@ -20474,10 +20465,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; + sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; }; buildInputs = globalBuildInputs; meta = { @@ -20490,13 +20481,13 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-6.4.0.tgz"; - sha1 = "3fd9e8b9ad77a6a93ec76947704de21ac2991776"; + url = "https://registry.npmjs.org/cordova/-/cordova-6.5.0.tgz"; + sha1 = "e6ec81b17dd50c17c40b4b87330f7ced38fb0b47"; }; dependencies = [ - (sources."cordova-common-1.5.1" // { + (sources."cordova-common-2.0.0" // { dependencies = [ sources."ansi-0.3.1" (sources."bplist-parser-0.1.1" // { @@ -20505,9 +20496,9 @@ in ]; }) sources."cordova-registry-mapper-1.1.15" - (sources."elementtree-0.1.6" // { + (sources."elementtree-0.1.7" // { dependencies = [ - sources."sax-0.3.5" + sources."sax-1.1.4" ]; }) (sources."glob-5.0.15" // { @@ -20561,7 +20552,7 @@ in sources."unorm-1.4.1" ]; }) - (sources."cordova-lib-6.4.0" // { + (sources."cordova-lib-6.5.0" // { dependencies = [ (sources."aliasify-1.9.0" // { dependencies = [ @@ -20580,7 +20571,12 @@ in }) ]; }) - (sources."cordova-fetch-1.0.1" // { + (sources."cordova-create-1.0.2" // { + dependencies = [ + sources."cordova-app-hello-world-3.11.0" + ]; + }) + (sources."cordova-fetch-1.0.2" // { dependencies = [ sources."dependency-ls-1.0.0" sources."is-url-1.2.2" @@ -20624,14 +20620,9 @@ in }) ]; }) - (sources."cordova-create-1.0.1" // { + (sources."cordova-js-4.2.1" // { dependencies = [ - sources."cordova-app-hello-world-3.11.0" - ]; - }) - (sources."cordova-js-4.2.0" // { - dependencies = [ - (sources."browserify-13.1.0" // { + (sources."browserify-13.3.0" // { dependencies = [ (sources."JSONStream-1.3.0" // { dependencies = [ @@ -20639,7 +20630,7 @@ in sources."through-2.3.8" ]; }) - sources."assert-1.3.0" + sources."assert-1.4.1" (sources."browser-pack-6.0.2" // { dependencies = [ (sources."combine-source-map-0.7.2" // { @@ -20670,6 +20661,7 @@ in sources."isarray-1.0.0" ]; }) + sources."cached-path-relative-1.0.0" (sources."concat-stream-1.5.2" // { dependencies = [ sources."typedarray-0.0.6" @@ -20800,6 +20792,32 @@ in sources."domain-browser-1.1.7" sources."duplexer2-0.1.4" sources."events-1.1.1" + (sources."glob-7.1.1" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) (sources."has-1.0.1" // { dependencies = [ sources."function-bind-1.1.0" @@ -20838,7 +20856,6 @@ in }) (sources."module-deps-4.0.8" // { dependencies = [ - sources."cached-path-relative-1.0.0" (sources."detective-4.3.2" // { dependencies = [ sources."acorn-3.3.0" @@ -20975,7 +20992,7 @@ in sources."vary-1.1.0" ]; }) - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -20988,7 +21005,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -21001,7 +21018,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ sources."statuses-1.3.1" sources."unpipe-1.0.0" @@ -21025,7 +21042,7 @@ in }) sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ sources."destroy-1.0.4" (sources."http-errors-1.5.1" // { @@ -21035,11 +21052,11 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."statuses-1.3.1" ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" @@ -21657,7 +21674,7 @@ in }) sources."unorm-1.3.3" sources."valid-identifier-0.0.1" - (sources."xcode-0.8.9" // { + (sources."xcode-0.9.1" // { dependencies = [ sources."node-uuid-1.4.7" sources."pegjs-0.9.0" @@ -22170,7 +22187,7 @@ in (sources."hiredis-0.4.1" // { dependencies = [ sources."bindings-1.2.1" - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."json-rpc2-0.8.1" // { @@ -22187,7 +22204,7 @@ in sources."better-curry-1.6.0" ]; }) - (sources."faye-websocket-0.11.0" // { + (sources."faye-websocket-0.11.1" // { dependencies = [ (sources."websocket-driver-0.6.5" // { dependencies = [ @@ -23034,15 +23051,15 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.13.1"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz"; - sha1 = "564d2646b5efded85df96985332edd91a23bff25"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz"; + sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97"; }; dependencies = [ (sources."babel-code-frame-6.22.0" // { dependencies = [ - sources."js-tokens-3.0.0" + sources."js-tokens-3.0.1" ]; }) (sources."chalk-1.1.3" // { @@ -23195,7 +23212,7 @@ in ]; }) sources."globals-9.14.0" - sources."ignore-3.2.0" + sources."ignore-3.2.2" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { dependencies = [ @@ -23334,12 +23351,12 @@ in sources."strip-json-comments-2.0.1" (sources."table-3.8.3" // { dependencies = [ - (sources."ajv-4.10.4" // { + (sources."ajv-4.11.2" // { dependencies = [ sources."co-4.6.0" ]; }) - sources."ajv-keywords-1.5.0" + sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" (sources."string-width-2.0.0" // { dependencies = [ @@ -23599,7 +23616,7 @@ in }) (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -24074,7 +24091,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" @@ -24224,7 +24241,7 @@ in }) (sources."msgpack-1.0.2" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) ]; @@ -24814,6 +24831,22 @@ in }; production = true; }; + ios-deploy = nodeEnv.buildNodePackage { + name = "ios-deploy"; + packageName = "ios-deploy"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.1.tgz"; + sha1 = "e7dec9508bb464a1f2d546bb07fada41d2708e66"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "launch iOS apps iOS devices from the command line (Xcode 7)"; + homepage = "https://github.com/phonegap/ios-deploy#readme"; + license = "GPLv3"; + }; + production = true; + }; istanbul = nodeEnv.buildNodePackage { name = "istanbul"; packageName = "istanbul"; @@ -25132,10 +25165,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz"; - sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b"; + url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz"; + sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e"; }; dependencies = [ sources."bluebird-3.4.7" @@ -25286,7 +25319,7 @@ in }) (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -27201,7 +27234,7 @@ in sources."ms-0.7.2" ]; }) - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -27214,7 +27247,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -27227,7 +27260,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ sources."statuses-1.3.1" sources."unpipe-1.0.0" @@ -27251,7 +27284,7 @@ in }) sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ sources."destroy-1.0.4" (sources."http-errors-1.5.1" // { @@ -27261,11 +27294,11 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."statuses-1.3.1" ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" @@ -27330,7 +27363,7 @@ in }) (sources."v8-debug-0.7.7" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -27598,7 +27631,7 @@ in }) (sources."v8-profiler-5.6.5" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -28327,7 +28360,7 @@ in }) (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."mkdirp-0.5.1" // { @@ -28810,10 +28843,10 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.16.1"; + version = "0.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz"; - sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.16.2.tgz"; + sha1 = "3f77d608f1b0e89907af3f31e2c3eb8844a2b17b"; }; dependencies = [ sources."basic-auth-1.1.0" @@ -28995,7 +29028,24 @@ in sources."statuses-1.3.1" ]; }) - sources."serve-static-1.11.1" + (sources."serve-static-1.11.2" // { + dependencies = [ + (sources."send-0.14.2" // { + dependencies = [ + sources."destroy-1.0.4" + (sources."http-errors-1.5.1" // { + dependencies = [ + sources."inherits-2.0.3" + sources."setprototypeof-1.0.2" + ]; + }) + sources."mime-1.3.4" + sources."ms-0.7.2" + sources."statuses-1.3.1" + ]; + }) + ]; + }) (sources."type-is-1.6.14" // { dependencies = [ (sources."mime-types-2.1.14" // { @@ -29616,11 +29666,11 @@ in }) ]; }) - (sources."mailparser-0.6.1" // { + (sources."mailparser-0.6.2" // { dependencies = [ - (sources."mimelib-0.2.19" // { + (sources."mimelib-0.3.0" // { dependencies = [ - sources."addressparser-0.3.2" + sources."addressparser-1.0.1" ]; }) (sources."encoding-0.1.12" // { @@ -30117,7 +30167,7 @@ in (sources."config-0.4.15" // { dependencies = [ sources."js-yaml-0.3.7" - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" (sources."vows-0.8.1" // { dependencies = [ sources."eyes-0.1.8" @@ -30244,13 +30294,13 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz"; - sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4"; + url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; + sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; }; dependencies = [ - (sources."JSONStream-1.2.1" // { + (sources."JSONStream-1.3.0" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -30402,7 +30452,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."node-gyp-3.4.0" // { + (sources."node-gyp-3.5.0" // { dependencies = [ (sources."minimatch-3.0.3" // { dependencies = [ @@ -30415,58 +30465,6 @@ in ]; }) sources."nopt-3.0.6" - (sources."npmlog-3.1.2" // { - dependencies = [ - (sources."are-we-there-yet-1.1.2" // { - dependencies = [ - sources."delegates-1.0.0" - ]; - }) - sources."console-control-strings-1.1.0" - (sources."gauge-2.6.0" // { - dependencies = [ - sources."has-color-0.1.7" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - sources."wide-align-1.1.0" - ]; - }) - sources."set-blocking-2.0.0" - ]; - }) - (sources."path-array-1.0.1" // { - dependencies = [ - (sources."array-index-1.0.0" // { - dependencies = [ - (sources."debug-2.6.0" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."es6-symbol-3.1.0" // { - dependencies = [ - sources."d-0.1.1" - (sources."es5-ext-0.10.12" // { - dependencies = [ - sources."es6-iterator-2.0.0" - ]; - }) - ]; - }) - ]; - }) - ]; - }) ]; }) sources."nopt-4.0.1" @@ -30734,7 +30732,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-1.2.0" + sources."write-file-atomic-1.3.1" sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" @@ -31087,7 +31085,7 @@ in ]; }) sources."findit-1.2.0" - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" ]; buildInputs = globalBuildInputs; meta = { @@ -31911,9 +31909,9 @@ in sources."content-type-git+https://github.com/wikimedia/content-type.git#master" sources."core-js-2.4.1" sources."diff-1.4.0" - sources."domino-1.0.27" + sources."domino-1.0.28" sources."entities-1.1.1" - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -31925,7 +31923,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -31938,12 +31936,6 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { - dependencies = [ - sources."statuses-1.3.1" - sources."unpipe-1.0.0" - ]; - }) sources."fresh-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -31962,7 +31954,7 @@ in }) sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ sources."destroy-1.0.4" (sources."http-errors-1.5.1" // { @@ -31972,11 +31964,11 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."statuses-1.3.1" ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" @@ -32270,7 +32262,7 @@ in dependencies = [ (sources."dtrace-provider-0.8.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."mv-2.1.1" // { @@ -33310,10 +33302,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz"; - sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.3.tgz"; + sha1 = "1f3c2b81188de82482f64cf89d015f5428e4c4e5"; }; dependencies = [ (sources."connect-multiparty-1.2.5" // { @@ -34447,38 +34439,40 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - (sources."express-5.0.0-alpha.2" // { + (sources."express-5.0.0-alpha.3" // { dependencies = [ - (sources."accepts-1.2.13" // { + (sources."accepts-1.3.3" // { dependencies = [ (sources."mime-types-2.1.14" // { dependencies = [ sources."mime-db-1.26.0" ]; }) - sources."negotiator-0.5.3" + sources."negotiator-0.6.1" ]; }) - sources."array-flatten-1.1.0" - sources."content-disposition-0.5.0" + sources."array-flatten-2.1.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" - sources."cookie-0.1.3" + sources."cookie-0.3.1" sources."cookie-signature-1.0.6" (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" ]; }) - sources."depd-1.0.1" - sources."escape-html-1.0.2" + sources."depd-1.1.0" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.4.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) sources."fresh-0.3.0" - sources."merge-descriptors-1.0.0" + sources."merge-descriptors-1.0.1" sources."methods-1.1.2" (sources."on-finished-2.3.0" // { dependencies = [ @@ -34486,55 +34480,30 @@ in ]; }) sources."parseurl-1.3.1" - sources."path-is-absolute-1.0.0" - sources."path-to-regexp-0.1.6" - (sources."proxy-addr-1.0.10" // { + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + (sources."proxy-addr-1.1.3" // { dependencies = [ sources."forwarded-0.1.0" - sources."ipaddr.js-1.0.5" + sources."ipaddr.js-1.2.0" ]; }) - sources."qs-4.0.0" - sources."range-parser-1.0.3" - (sources."router-1.1.4" // { + sources."qs-6.2.0" + sources."range-parser-1.2.0" + (sources."router-1.1.5" // { dependencies = [ - sources."array-flatten-2.0.0" - sources."path-to-regexp-0.1.7" - sources."setprototypeof-1.0.0" + sources."setprototypeof-1.0.2" ]; }) - (sources."send-0.13.0" // { + (sources."send-0.14.2" // { dependencies = [ - sources."destroy-1.0.3" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."destroy-1.0.4" sources."mime-1.3.4" - sources."ms-0.7.1" - sources."statuses-1.2.1" - ]; - }) - (sources."serve-static-1.10.3" // { - dependencies = [ - sources."escape-html-1.0.3" - (sources."send-0.13.2" // { - dependencies = [ - sources."depd-1.1.0" - sources."destroy-1.0.4" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."mime-1.3.4" - sources."ms-0.7.1" - sources."statuses-1.2.1" - ]; - }) + sources."ms-0.7.2" + sources."statuses-1.3.1" ]; }) + sources."serve-static-1.11.2" (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" @@ -34545,8 +34514,8 @@ in }) ]; }) - sources."vary-1.0.1" sources."utils-merge-1.0.0" + sources."vary-1.1.0" ]; }) (sources."express-json5-0.1.0" // { @@ -34762,7 +34731,7 @@ in dependencies = [ (sources."dtrace-provider-0.8.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."mv-2.1.1" // { @@ -34905,12 +34874,12 @@ in }) (sources."fs-ext-0.5.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."crypt3-0.2.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) ]; @@ -34928,13 +34897,17 @@ in sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc"; - version = "0.1.11"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sloc/-/sloc-0.1.11.tgz"; - sha1 = "341f94d44fe9b977c9e2109b134aa92f6394d411"; + url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz"; + sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; }; dependencies = [ - sources."async-1.5.2" + (sources."async-2.1.4" // { + dependencies = [ + sources."lodash-4.17.4" + ]; + }) (sources."cli-table-0.3.1" // { dependencies = [ sources."colors-1.0.3" @@ -35007,7 +34980,7 @@ in (sources."csv-0.4.6" // { dependencies = [ sources."csv-generate-0.0.6" - sources."csv-parse-1.1.10" + sources."csv-parse-1.2.0" sources."stream-transform-0.1.1" sources."csv-stringify-0.0.8" ]; @@ -35052,7 +35025,7 @@ in }) (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) ]; @@ -35061,7 +35034,7 @@ in dependencies = [ (sources."dtrace-provider-0.6.0" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."mv-2.1.1" // { @@ -35264,10 +35237,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz"; - sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034"; + url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz"; + sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; dependencies = [ sources."sax-1.2.1" @@ -35276,7 +35249,7 @@ in sources."q-1.4.1" ]; }) - (sources."js-yaml-3.6.1" // { + (sources."js-yaml-3.7.0" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ @@ -35293,7 +35266,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."csso-2.2.1" // { + (sources."csso-2.3.1" // { dependencies = [ (sources."clap-1.1.2" // { dependencies = [ @@ -35782,10 +35755,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.0.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz"; - sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz"; + sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303"; }; dependencies = [ sources."async-2.1.4" @@ -35874,7 +35847,7 @@ in sources."whatwg-fetch-2.0.2" ]; }) - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ @@ -35887,7 +35860,7 @@ in ]; }) sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -35900,7 +35873,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ sources."statuses-1.3.1" sources."unpipe-1.0.0" @@ -35924,7 +35897,7 @@ in }) sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ sources."destroy-1.0.4" (sources."http-errors-1.5.1" // { @@ -35934,7 +35907,7 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."statuses-1.3.1" ]; }) @@ -36099,7 +36072,7 @@ in ]; }) sources."hasher-1.2.0" - sources."ignore-3.2.0" + sources."ignore-3.2.2" (sources."keen.io-0.1.3" // { dependencies = [ sources."underscore-1.5.2" @@ -36829,14 +36802,18 @@ in ]; }) sources."semver-5.3.0" - (sources."serve-static-1.11.1" // { + (sources."serve-static-1.11.2" // { dependencies = [ sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."parseurl-1.3.1" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ - sources."debug-2.2.0" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) sources."depd-1.1.0" sources."destroy-1.0.4" sources."etag-1.7.0" @@ -36848,7 +36825,7 @@ in ]; }) sources."mime-1.3.4" - sources."ms-0.7.1" + sources."ms-0.7.2" (sources."on-finished-2.3.0" // { dependencies = [ sources."ee-first-1.1.1" @@ -37448,22 +37425,39 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "1.14.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz"; - sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823"; + url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz"; + sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475"; }; dependencies = [ - sources."acorn-3.3.0" - sources."async-1.5.2" - sources."clone-1.0.2" - (sources."enhanced-resolve-0.9.1" // { + sources."acorn-4.0.4" + sources."acorn-dynamic-import-2.0.1" + (sources."ajv-4.11.2" // { dependencies = [ - sources."memory-fs-0.2.0" - sources."graceful-fs-4.1.11" + sources."co-4.6.0" + (sources."json-stable-stringify-1.0.1" // { + dependencies = [ + sources."jsonify-0.0.0" + ]; + }) ]; }) - sources."interpret-0.6.6" + sources."ajv-keywords-1.5.1" + (sources."async-2.1.4" // { + dependencies = [ + sources."lodash-4.17.4" + ]; + }) + (sources."enhanced-resolve-3.0.3" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."object-assign-4.1.1" + ]; + }) + sources."interpret-1.0.1" + sources."json-loader-0.5.4" + sources."loader-runner-2.3.0" (sources."loader-utils-0.2.16" // { dependencies = [ sources."big.js-3.1.3" @@ -37472,7 +37466,7 @@ in sources."object-assign-4.1.1" ]; }) - (sources."memory-fs-0.3.0" // { + (sources."memory-fs-0.4.1" // { dependencies = [ (sources."errno-0.1.4" // { dependencies = [ @@ -37497,7 +37491,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."node-libs-browser-0.7.0" // { + (sources."node-libs-browser-2.0.0" // { dependencies = [ sources."assert-1.4.1" (sources."browserify-zlib-0.1.4" // { @@ -37518,16 +37512,111 @@ in ]; }) sources."constants-browserify-1.0.0" - (sources."crypto-browserify-3.3.0" // { + (sources."crypto-browserify-3.11.0" // { dependencies = [ - sources."pbkdf2-compat-2.0.1" - sources."ripemd160-0.2.0" - sources."sha.js-2.2.6" - (sources."browserify-aes-0.4.0" // { + (sources."browserify-cipher-1.0.0" // { dependencies = [ - sources."inherits-2.0.3" + (sources."browserify-aes-1.0.6" // { + dependencies = [ + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + ]; + }) + (sources."browserify-des-1.0.0" // { + dependencies = [ + sources."cipher-base-1.0.3" + (sources."des.js-1.0.0" // { + dependencies = [ + sources."minimalistic-assert-1.0.0" + ]; + }) + ]; + }) + sources."evp_bytestokey-1.0.0" ]; }) + (sources."browserify-sign-4.0.0" // { + dependencies = [ + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + (sources."elliptic-6.3.2" // { + dependencies = [ + sources."brorand-1.0.6" + sources."hash.js-1.0.3" + ]; + }) + (sources."parse-asn1-5.0.0" // { + dependencies = [ + (sources."asn1.js-4.9.1" // { + dependencies = [ + sources."minimalistic-assert-1.0.0" + ]; + }) + (sources."browserify-aes-1.0.6" // { + dependencies = [ + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + ]; + }) + sources."evp_bytestokey-1.0.0" + ]; + }) + ]; + }) + (sources."create-ecdh-4.0.0" // { + dependencies = [ + sources."bn.js-4.11.6" + (sources."elliptic-6.3.2" // { + dependencies = [ + sources."brorand-1.0.6" + sources."hash.js-1.0.3" + ]; + }) + ]; + }) + (sources."create-hash-1.1.2" // { + dependencies = [ + sources."cipher-base-1.0.3" + sources."ripemd160-1.0.1" + sources."sha.js-2.4.8" + ]; + }) + sources."create-hmac-1.1.4" + (sources."diffie-hellman-5.0.2" // { + dependencies = [ + sources."bn.js-4.11.6" + (sources."miller-rabin-4.0.0" // { + dependencies = [ + sources."brorand-1.0.6" + ]; + }) + ]; + }) + sources."inherits-2.0.3" + sources."pbkdf2-3.0.9" + (sources."public-encrypt-4.0.0" // { + dependencies = [ + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + (sources."parse-asn1-5.0.0" // { + dependencies = [ + (sources."asn1.js-4.9.1" // { + dependencies = [ + sources."minimalistic-assert-1.0.0" + ]; + }) + (sources."browserify-aes-1.0.6" // { + dependencies = [ + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + ]; + }) + sources."evp_bytestokey-1.0.0" + ]; + }) + ]; + }) + sources."randombytes-2.0.3" ]; }) sources."domain-browser-1.1.7" @@ -37586,22 +37675,16 @@ in }) ]; }) - (sources."optimist-0.6.1" // { - dependencies = [ - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - ]; - }) + sources."source-map-0.5.6" (sources."supports-color-3.2.3" // { dependencies = [ sources."has-flag-1.0.0" ]; }) - sources."tapable-0.1.10" + sources."tapable-0.2.6" (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" - sources."source-map-0.5.6" sources."uglify-to-browserify-1.0.2" (sources."yargs-3.10.0" // { dependencies = [ @@ -37648,9 +37731,8 @@ in }) ]; }) - (sources."watchpack-0.2.9" // { + (sources."watchpack-1.2.0" // { dependencies = [ - sources."async-0.9.2" (sources."chokidar-1.6.1" // { dependencies = [ (sources."anymatch-1.3.0" // { @@ -37767,7 +37849,7 @@ in }) (sources."fsevents-1.0.17" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" (sources."node-pre-gyp-0.6.32" // { dependencies = [ (sources."nopt-3.0.6" // { @@ -38027,20 +38109,137 @@ in sources."graceful-fs-4.1.11" ]; }) - (sources."webpack-core-0.6.9" // { + (sources."webpack-sources-0.1.4" // { dependencies = [ - (sources."source-map-0.4.4" // { + sources."source-list-map-0.1.8" + ]; + }) + (sources."yargs-6.6.0" // { + dependencies = [ + sources."camelcase-3.0.0" + (sources."cliui-3.2.0" // { dependencies = [ - sources."amdefine-1.0.1" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."wrap-ansi-2.1.0" ]; }) - sources."source-list-map-0.1.8" + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + (sources."os-locale-1.4.0" // { + dependencies = [ + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + ]; + }) + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.4" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.11" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + ]; + }) + sources."which-module-1.0.0" + sources."y18n-3.2.1" + sources."yargs-parser-4.2.1" ]; }) ]; buildInputs = globalBuildInputs; meta = { - description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; + description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; license = "MIT"; }; @@ -38206,7 +38405,7 @@ in dependencies = [ (sources."loose-envify-1.3.1" // { dependencies = [ - sources."js-tokens-3.0.0" + sources."js-tokens-3.0.1" ]; }) ]; diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 7de48f6c175..59e73e58070 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -3190,13 +3190,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-4.9.1" = { + "buffer-5.0.2" = { name = "buffer"; packageName = "buffer"; - version = "4.9.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz"; + sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d"; }; }; "cached-path-relative-1.0.0" = { @@ -4063,6 +4063,15 @@ let sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; }; }; + "array-shuffle-1.0.1" = { + name = "array-shuffle"; + packageName = "array-shuffle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz"; + sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; + }; + }; "castv2-client-1.2.0" = { name = "castv2-client"; packageName = "castv2-client"; @@ -4099,13 +4108,13 @@ let sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; }; }; - "fs-extended-0.2.1" = { - name = "fs-extended"; - packageName = "fs-extended"; - version = "0.2.1"; + "diveSync-0.3.0" = { + name = "diveSync"; + packageName = "diveSync"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extended/-/fs-extended-0.2.1.tgz"; - sha1 = "3910358127e9c72c8296c30142c7763b5f5e2d3a"; + url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz"; + sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; }; }; "got-1.2.2" = { @@ -4225,6 +4234,15 @@ let sha1 = "17be93eaae3f3b779359c795b419705a8817e868"; }; }; + "xspfr-0.3.1" = { + name = "xspfr"; + packageName = "xspfr"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xspfr/-/xspfr-0.3.1.tgz"; + sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; + }; + }; "castv2-0.1.9" = { name = "castv2"; packageName = "castv2"; @@ -4423,6 +4441,15 @@ let sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; }; }; + "append-0.1.1" = { + name = "append"; + packageName = "append"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz"; + sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; + }; + }; "object-assign-1.0.0" = { name = "object-assign"; packageName = "object-assign"; @@ -5557,22 +5584,22 @@ let sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5"; }; }; - "cordova-common-1.5.1" = { + "cordova-common-2.0.0" = { name = "cordova-common"; packageName = "cordova-common"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.5.1.tgz"; - sha1 = "6770de0d6200ad6f94a1abe8939b5bd9ece139e3"; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.0.0.tgz"; + sha1 = "125097eb4b50b7353cec226ed21649192293ae97"; }; }; - "cordova-lib-6.4.0" = { + "cordova-lib-6.5.0" = { name = "cordova-lib"; packageName = "cordova-lib"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.4.0.tgz"; - sha1 = "a3ad3c366c60baf104701a67a7877af75555ed33"; + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.5.0.tgz"; + sha1 = "f7630a04c29d6cdee980190b1d93fb1536ac453f"; }; }; "insight-0.8.4" = { @@ -5647,13 +5674,13 @@ let sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; }; }; - "elementtree-0.1.6" = { + "elementtree-0.1.7" = { name = "elementtree"; packageName = "elementtree"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; - sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz"; + sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; "glob-5.0.15" = { @@ -5719,13 +5746,13 @@ let sha1 = "f0dcf5109a949e42a993ee3e8fb2070452817b51"; }; }; - "sax-0.3.5" = { + "sax-1.1.4" = { name = "sax"; packageName = "sax"; - version = "0.3.5"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; - sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; + sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; }; }; "base64-js-0.0.8" = { @@ -5755,31 +5782,31 @@ let sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030"; }; }; - "cordova-fetch-1.0.1" = { - name = "cordova-fetch"; - packageName = "cordova-fetch"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.1.tgz"; - sha1 = "3122ed3dca8e83eae0345f83f3a8cc33680bf769"; - }; - }; - "cordova-create-1.0.1" = { + "cordova-create-1.0.2" = { name = "cordova-create"; packageName = "cordova-create"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.1.tgz"; - sha1 = "f1810401807ceec436ece27241180a83c97f8212"; + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.0.2.tgz"; + sha1 = "cb9bba9817c62a645bacb6e00da8cc50936a0fa5"; }; }; - "cordova-js-4.2.0" = { + "cordova-fetch-1.0.2" = { + name = "cordova-fetch"; + packageName = "cordova-fetch"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.0.2.tgz"; + sha1 = "b8f4903f39fe613888062552a96995413af16d35"; + }; + }; + "cordova-js-4.2.1" = { name = "cordova-js"; packageName = "cordova-js"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.0.tgz"; - sha1 = "e89689ae1b69637cae7c2f4a800f4b10104db980"; + url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.1.tgz"; + sha1 = "01ca186e14e63b01cb6d24e469750e481a038355"; }; }; "cordova-serve-1.0.1" = { @@ -5800,6 +5827,15 @@ let sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; }; }; + "elementtree-0.1.6" = { + name = "elementtree"; + packageName = "elementtree"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz"; + sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; + }; + }; "init-package-json-1.9.4" = { name = "init-package-json"; packageName = "init-package-json"; @@ -5899,13 +5935,13 @@ let sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4"; }; }; - "xcode-0.8.9" = { + "xcode-0.9.1" = { name = "xcode"; packageName = "xcode"; - version = "0.8.9"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/xcode/-/xcode-0.8.9.tgz"; - sha1 = "ec6765f70e9dccccc9f6e9a5b9b4e7e814b4cf35"; + url = "https://registry.npmjs.org/xcode/-/xcode-0.9.1.tgz"; + sha1 = "5b4e71b71b03573ff0cdb48439103e8107da0f95"; }; }; "browserify-transform-tools-1.5.3" = { @@ -5944,6 +5980,15 @@ let sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; }; }; + "cordova-app-hello-world-3.11.0" = { + name = "cordova-app-hello-world"; + packageName = "cordova-app-hello-world"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; + sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; + }; + }; "dependency-ls-1.0.0" = { name = "dependency-ls"; packageName = "dependency-ls"; @@ -5989,31 +6034,22 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "cordova-app-hello-world-3.11.0" = { - name = "cordova-app-hello-world"; - packageName = "cordova-app-hello-world"; - version = "3.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.11.0.tgz"; - sha1 = "9214feb9dd713ca481a1cbabceeca60966c1c0cf"; - }; - }; - "browserify-13.1.0" = { + "browserify-13.3.0" = { name = "browserify"; packageName = "browserify"; - version = "13.1.0"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz"; - sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; }; - "assert-1.3.0" = { - name = "assert"; - packageName = "assert"; - version = "1.3.0"; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; - sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; "compression-1.6.2" = { @@ -6025,13 +6061,13 @@ let sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"; }; }; - "express-4.14.0" = { + "express-4.14.1" = { name = "express"; packageName = "express"; - version = "4.14.0"; + version = "4.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; - sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; + sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; }; }; "accepts-1.3.3" = { @@ -6115,13 +6151,13 @@ let sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; }; }; - "content-disposition-0.5.1" = { + "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; - sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; + sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; }; }; "content-type-1.0.2" = { @@ -6187,13 +6223,13 @@ let sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; }; }; - "finalhandler-0.5.0" = { + "finalhandler-0.5.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; - sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; }; }; "fresh-0.3.0" = { @@ -6268,22 +6304,22 @@ let sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; }; }; - "send-0.14.1" = { + "send-0.14.2" = { name = "send"; packageName = "send"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; - sha1 = "a954984325392f51532a7760760e459598c89f7a"; + url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz"; + sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef"; }; }; - "serve-static-1.11.1" = { + "serve-static-1.11.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz"; - sha1 = "d6cce7693505f733c759de57befc1af76c0f0805"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz"; + sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7"; }; }; "type-is-1.6.14" = { @@ -6376,6 +6412,15 @@ let sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"; }; }; + "sax-0.3.5" = { + name = "sax"; + packageName = "sax"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + }; + }; "npm-package-arg-4.2.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -8015,13 +8060,13 @@ let sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; }; }; - "nan-2.5.0" = { + "nan-2.5.1" = { name = "nan"; packageName = "nan"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; + sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; }; }; "jsonparse-0.0.6" = { @@ -8060,13 +8105,13 @@ let sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; }; }; - "faye-websocket-0.11.0" = { + "faye-websocket-0.11.1" = { name = "faye-websocket"; packageName = "faye-websocket"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz"; - sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50"; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz"; + sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; }; }; "eventemitter3-0.1.6" = { @@ -9026,13 +9071,13 @@ let sha1 = "8859936af0038741263053b39d0e76ca241e4034"; }; }; - "ignore-3.2.0" = { + "ignore-3.2.2" = { name = "ignore"; packageName = "ignore"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz"; - sha1 = "8d88f03c3002a0ac52114db25d2c673b0bf1e435"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz"; + sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410"; }; }; "inquirer-0.12.0" = { @@ -9143,13 +9188,13 @@ let sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; }; }; - "js-tokens-3.0.0" = { + "js-tokens-3.0.1" = { name = "js-tokens"; packageName = "js-tokens"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.0.tgz"; - sha1 = "a2f2a969caae142fb3cd56228358c89366957bd1"; + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"; + sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7"; }; }; "es6-map-0.1.4" = { @@ -9440,22 +9485,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.10.4" = { + "ajv-4.11.2" = { name = "ajv"; packageName = "ajv"; - version = "4.10.4"; + version = "4.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.10.4.tgz"; - sha1 = "c0974dd00b3464984892d6010aa9c2c945933254"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz"; + sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"; }; }; - "ajv-keywords-1.5.0" = { + "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz"; - sha1 = "c11e6859eafff83e0dafc416929472eca946aa2c"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; + sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; }; }; "slice-ansi-0.0.4" = { @@ -10197,13 +10242,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.12.2" = { + "coffee-script-1.12.3" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; + sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; }; }; "jade-1.11.0" = { @@ -11646,6 +11691,15 @@ let sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; + "finalhandler-0.5.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; + sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; + }; + }; "custom-event-1.0.1" = { name = "custom-event"; packageName = "custom-event"; @@ -13302,6 +13356,15 @@ let sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; }; }; + "express-4.14.0" = { + name = "express"; + packageName = "express"; + version = "4.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; + sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; + }; + }; "follow-redirects-1.2.1" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -13608,6 +13671,24 @@ let sha1 = "9b76c03d8ef514c7e4249a7bbce649eed39ef29f"; }; }; + "content-disposition-0.5.1" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; + sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; + }; + }; + "send-0.14.1" = { + name = "send"; + packageName = "send"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; + sha1 = "a954984325392f51532a7760760e459598c89f7a"; + }; + }; "retry-0.6.1" = { name = "retry"; packageName = "retry"; @@ -13770,13 +13851,13 @@ let sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; }; }; - "mailparser-0.6.1" = { + "mailparser-0.6.2" = { name = "mailparser"; packageName = "mailparser"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.1.tgz"; - sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; + url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz"; + sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; }; }; "imap-0.8.19" = { @@ -13896,13 +13977,13 @@ let sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "mimelib-0.2.19" = { + "mimelib-0.3.0" = { name = "mimelib"; packageName = "mimelib"; - version = "0.2.19"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz"; - sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee"; + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz"; + sha1 = "4b16d4b435403daf692bc227890c7165ff3de894"; }; }; "encoding-0.1.12" = { @@ -13923,6 +14004,15 @@ let sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; }; }; + "addressparser-1.0.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; + sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -13950,6 +14040,15 @@ let sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; }; }; + "nan-2.5.0" = { + name = "nan"; + packageName = "nan"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; + sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + }; + }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -14454,15 +14553,6 @@ let sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; }; }; - "addressparser-1.0.1" = { - name = "addressparser"; - packageName = "addressparser"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; - sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; - }; - }; "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; @@ -14544,15 +14634,6 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "JSONStream-1.2.1" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; - sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; - }; - }; "fstream-npm-1.2.0" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -14616,6 +14697,15 @@ let sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; }; }; + "node-gyp-3.5.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; + sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; + }; + }; "nopt-4.0.1" = { name = "nopt"; packageName = "nopt"; @@ -14688,15 +14778,6 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; - "write-file-atomic-1.2.0" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; - sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; - }; - }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -15057,6 +15138,15 @@ let sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; }; }; + "write-file-atomic-1.2.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz"; + sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; + }; + }; "form-data-2.0.0" = { name = "form-data"; packageName = "form-data"; @@ -15247,13 +15337,13 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; - "domino-1.0.27" = { + "domino-1.0.28" = { name = "domino"; packageName = "domino"; - version = "1.0.27"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-1.0.27.tgz"; - sha1 = "26bc01f739707505c51456af7f59e3373369475d"; + url = "https://registry.npmjs.org/domino/-/domino-1.0.28.tgz"; + sha1 = "9ce3f6a9221a2c3288984b14ea191cd27b392f87"; }; }; "express-handlebars-3.0.0" = { @@ -15265,15 +15355,6 @@ let sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; - "finalhandler-0.5.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; - sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; - }; - }; "gelf-stream-0.2.4" = { name = "gelf-stream"; packageName = "gelf-stream"; @@ -16916,13 +16997,13 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "express-5.0.0-alpha.2" = { + "express-5.0.0-alpha.3" = { name = "express"; packageName = "express"; - version = "5.0.0-alpha.2"; + version = "5.0.0-alpha.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.2.tgz"; - sha1 = "fd54177f657b6a4c4540727702edd1cbaa3a6ac5"; + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz"; + sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db"; }; }; "express-json5-0.1.0" = { @@ -17006,58 +17087,13 @@ let sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; }; }; - "array-flatten-1.1.0" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz"; - sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; - }; - }; - "path-is-absolute-1.0.0" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; - }; - }; - "path-to-regexp-0.1.6" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz"; - sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36"; - }; - }; - "router-1.1.4" = { + "router-1.1.5" = { name = "router"; packageName = "router"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.1.4.tgz"; - sha1 = "5d449dde9d6e0ad5c3f53369064baf7798834a97"; - }; - }; - "array-flatten-2.0.0" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.0.0.tgz"; - sha1 = "24dd98b38b9194b59b2087ba40c21384d6b8a8dc"; - }; - }; - "setprototypeof-1.0.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.0.tgz"; - sha1 = "d5fafca01e1174d0079bd1bf881f09c8a339794c"; + url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz"; + sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387"; }; }; "raw-body-1.3.4" = { @@ -17339,13 +17375,13 @@ let sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; }; }; - "csv-parse-1.1.10" = { + "csv-parse-1.2.0" = { name = "csv-parse"; packageName = "csv-parse"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.10.tgz"; - sha1 = "767340d0d1f26d05434c798b7132222c669189de"; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz"; + sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425"; }; }; "stream-transform-0.1.1" = { @@ -17510,15 +17546,6 @@ let sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3"; }; }; - "js-yaml-3.6.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"; - sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; - }; - }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -17528,13 +17555,13 @@ let sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; }; }; - "csso-2.2.1" = { + "csso-2.3.1" = { name = "csso"; packageName = "csso"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.2.1.tgz"; - sha1 = "51fbb5347e50e81e6ed51668a48490ae6fe2afe2"; + url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz"; + sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9"; }; }; "clap-1.1.2" = { @@ -18095,15 +18122,6 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; - "node-gyp-3.5.0" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; - }; - }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -18185,22 +18203,40 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "enhanced-resolve-0.9.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "0.9.1"; + "acorn-dynamic-import-2.0.1" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"; - sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e"; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz"; + sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2"; }; }; - "interpret-0.6.6" = { - name = "interpret"; - packageName = "interpret"; - version = "0.6.6"; + "enhanced-resolve-3.0.3" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"; - sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz"; + sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62"; + }; + }; + "json-loader-0.5.4" = { + name = "json-loader"; + packageName = "json-loader"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz"; + sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; + }; + }; + "loader-runner-2.3.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"; + sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; }; }; "loader-utils-0.2.16" = { @@ -18212,58 +18248,49 @@ let sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; - "memory-fs-0.3.0" = { + "memory-fs-0.4.1" = { name = "memory-fs"; packageName = "memory-fs"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; - sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; }; }; - "node-libs-browser-0.7.0" = { + "node-libs-browser-2.0.0" = { name = "node-libs-browser"; packageName = "node-libs-browser"; - version = "0.7.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz"; - sha1 = "3e272c0819e308935e26674408d7af0e1491b83b"; + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz"; + sha1 = "a3a59ec97024985b46e958379646f96c4b616646"; }; }; - "tapable-0.1.10" = { + "tapable-0.2.6" = { name = "tapable"; packageName = "tapable"; - version = "0.1.10"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"; - sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4"; + url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz"; + sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d"; }; }; - "watchpack-0.2.9" = { + "watchpack-1.2.0" = { name = "watchpack"; packageName = "watchpack"; - version = "0.2.9"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz"; - sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz"; + sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb"; }; }; - "webpack-core-0.6.9" = { - name = "webpack-core"; - packageName = "webpack-core"; - version = "0.6.9"; + "webpack-sources-0.1.4" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz"; - sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2"; - }; - }; - "memory-fs-0.2.0" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"; - sha1 = "f2bb25368bc121e391c2520de92969caee0a0290"; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz"; + sha1 = "ccc2c817e08e5fa393239412690bb481821393cd"; }; }; "big.js-3.1.3" = { @@ -18293,15 +18320,6 @@ let sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; }; }; - "crypto-browserify-3.3.0" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz"; - sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"; - }; - }; "os-browserify-0.2.1" = { name = "os-browserify"; packageName = "os-browserify"; @@ -18320,42 +18338,6 @@ let sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86"; }; }; - "pbkdf2-compat-2.0.1" = { - name = "pbkdf2-compat"; - packageName = "pbkdf2-compat"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"; - sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288"; - }; - }; - "ripemd160-0.2.0" = { - name = "ripemd160"; - packageName = "ripemd160"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"; - sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce"; - }; - }; - "sha.js-2.2.6" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"; - sha1 = "17ddeddc5f722fb66501658895461977867315ba"; - }; - }; - "browserify-aes-0.4.0" = { - name = "browserify-aes"; - packageName = "browserify-aes"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz"; - sha1 = "067149b668df31c4b58533e02d01e806d8608e2c"; - }; - }; "setimmediate-1.0.5" = { name = "setimmediate"; packageName = "setimmediate"; @@ -18524,10 +18506,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.5.tgz"; - sha1 = "78be031931f4b9012f6085e1544069c56dcba233"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz"; + sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e"; }; dependencies = [ sources."colors-0.6.0-1" @@ -19085,10 +19067,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "13.3.0"; + version = "14.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; - sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz"; + sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38"; }; dependencies = [ sources."JSONStream-1.3.0" @@ -19100,7 +19082,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."buffer-4.9.1" + sources."buffer-5.0.2" sources."cached-path-relative-1.0.0" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -19173,9 +19155,9 @@ in sources."pako-0.2.9" sources."base64-js-1.2.0" sources."ieee754-1.1.8" - sources."isarray-1.0.0" sources."typedarray-0.0.6" sources."core-util-is-1.0.2" + sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."date-now-0.1.4" @@ -19250,19 +19232,20 @@ in castnow = nodeEnv.buildNodePackage { name = "castnow"; packageName = "castnow"; - version = "0.4.17"; + version = "0.4.18"; src = fetchurl { - url = "https://registry.npmjs.org/castnow/-/castnow-0.4.17.tgz"; - sha1 = "7d9ce3c5605b5aa74ae5348c826443374d5863a8"; + url = "https://registry.npmjs.org/castnow/-/castnow-0.4.18.tgz"; + sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8"; }; dependencies = [ sources."array-loop-1.0.0" + sources."array-shuffle-1.0.1" sources."castv2-client-1.2.0" sources."chalk-1.0.0" sources."chromecast-player-0.2.3" sources."debounced-seeker-1.0.0" sources."debug-2.6.0" - sources."fs-extended-0.2.1" + sources."diveSync-0.3.0" sources."got-1.2.2" sources."internal-ip-1.2.0" sources."keypress-0.2.1" @@ -19303,6 +19286,7 @@ in sources."lodash-4.17.4" ]; }) + sources."xspfr-0.3.1" sources."xtend-4.0.1" sources."castv2-0.1.9" sources."protobufjs-3.8.2" @@ -19330,6 +19314,7 @@ in sources."wrap-fn-0.1.5" sources."co-3.1.0" sources."ms-0.7.2" + sources."append-0.1.1" sources."object-assign-1.0.0" (sources."meow-3.7.0" // { dependencies = [ @@ -19596,6 +19581,7 @@ in sources."typedarray-0.0.6" sources."graceful-readlink-1.0.1" sources."sax-1.2.1" + sources."underscore-1.6.0" ]; buildInputs = globalBuildInputs; meta = { @@ -19608,10 +19594,10 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz"; + sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db"; }; buildInputs = globalBuildInputs; meta = { @@ -19624,24 +19610,26 @@ in cordova = nodeEnv.buildNodePackage { name = "cordova"; packageName = "cordova"; - version = "6.4.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cordova/-/cordova-6.4.0.tgz"; - sha1 = "3fd9e8b9ad77a6a93ec76947704de21ac2991776"; + url = "https://registry.npmjs.org/cordova/-/cordova-6.5.0.tgz"; + sha1 = "e6ec81b17dd50c17c40b4b87330f7ced38fb0b47"; }; dependencies = [ - (sources."cordova-common-1.5.1" // { + (sources."cordova-common-2.0.0" // { dependencies = [ sources."q-1.4.1" sources."underscore-1.8.3" ]; }) - (sources."cordova-lib-6.4.0" // { + (sources."cordova-lib-6.5.0" // { dependencies = [ + sources."elementtree-0.1.6" sources."nopt-3.0.6" sources."semver-4.3.6" sources."shelljs-0.3.0" sources."unorm-1.3.3" + sources."sax-0.3.5" ]; }) (sources."insight-0.8.4" // { @@ -19658,7 +19646,7 @@ in sources."ansi-0.3.1" sources."bplist-parser-0.1.1" sources."cordova-registry-mapper-1.1.15" - sources."elementtree-0.1.6" + sources."elementtree-0.1.7" sources."glob-5.0.15" sources."minimatch-3.0.3" sources."osenv-0.1.4" @@ -19667,7 +19655,7 @@ in sources."shelljs-0.5.3" sources."unorm-1.4.1" sources."big-integer-1.6.17" - sources."sax-0.3.5" + sources."sax-1.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."once-1.4.0" @@ -19684,19 +19672,19 @@ in sources."util-deprecate-1.0.2" sources."lodash-3.10.1" sources."aliasify-1.9.0" - (sources."cordova-fetch-1.0.1" // { + (sources."cordova-create-1.0.2" // { + dependencies = [ + sources."shelljs-0.3.0" + ]; + }) + (sources."cordova-fetch-1.0.2" // { dependencies = [ sources."q-1.4.1" sources."shelljs-0.7.6" sources."glob-7.1.1" ]; }) - (sources."cordova-create-1.0.1" // { - dependencies = [ - sources."shelljs-0.3.0" - ]; - }) - sources."cordova-js-4.2.0" + sources."cordova-js-4.2.1" (sources."cordova-serve-1.0.1" // { dependencies = [ sources."q-1.4.1" @@ -19754,7 +19742,7 @@ in }) sources."tar-1.0.2" sources."valid-identifier-0.0.1" - sources."xcode-0.8.9" + sources."xcode-0.9.1" sources."browserify-transform-tools-1.5.3" sources."falafel-1.2.0" sources."through-2.3.8" @@ -19762,6 +19750,7 @@ in sources."foreach-2.0.5" sources."isarray-0.0.1" sources."object-keys-1.0.11" + sources."cordova-app-hello-world-3.11.0" (sources."dependency-ls-1.0.0" // { dependencies = [ sources."q-1.4.1" @@ -19772,10 +19761,13 @@ in sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" sources."resolve-1.2.0" - sources."cordova-app-hello-world-3.11.0" - sources."browserify-13.1.0" + (sources."browserify-13.3.0" // { + dependencies = [ + sources."glob-7.1.1" + ]; + }) sources."JSONStream-1.3.0" - sources."assert-1.3.0" + sources."assert-1.4.1" sources."browser-pack-6.0.2" (sources."browser-resolve-1.11.2" // { dependencies = [ @@ -19789,6 +19781,7 @@ in sources."isarray-1.0.0" ]; }) + sources."cached-path-relative-1.0.0" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -19891,7 +19884,6 @@ in sources."lexical-scope-1.2.0" sources."astw-2.0.0" sources."stream-splicer-2.0.0" - sources."cached-path-relative-1.0.0" (sources."detective-4.3.2" // { dependencies = [ sources."acorn-3.3.0" @@ -19912,7 +19904,7 @@ in sources."indexof-0.0.1" sources."chalk-1.1.3" sources."compression-1.6.2" - sources."express-4.14.0" + sources."express-4.14.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -19930,7 +19922,7 @@ in sources."mime-db-1.26.0" sources."ms-0.7.1" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -19938,7 +19930,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - sources."finalhandler-0.5.0" + sources."finalhandler-0.5.1" sources."fresh-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -19948,8 +19940,12 @@ in sources."proxy-addr-1.1.3" sources."qs-6.2.0" sources."range-parser-1.2.0" - sources."send-0.14.1" - sources."serve-static-1.11.1" + (sources."send-0.14.2" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) + sources."serve-static-1.11.2" sources."type-is-1.6.14" sources."utils-merge-1.0.0" sources."statuses-1.3.1" @@ -20332,10 +20328,10 @@ in sources."destroy-1.0.3" sources."mime-1.2.11" sources."bindings-1.2.1" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."jsonparse-0.0.6" sources."es5class-2.3.1" - sources."faye-websocket-0.11.0" + sources."faye-websocket-0.11.1" sources."eventemitter3-0.1.6" sources."better-curry-1.6.0" sources."websocket-driver-0.6.5" @@ -20740,10 +20736,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.13.1"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.13.1.tgz"; - sha1 = "564d2646b5efded85df96985332edd91a23bff25"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz"; + sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97"; }; dependencies = [ sources."babel-code-frame-6.22.0" @@ -20758,7 +20754,7 @@ in sources."file-entry-cache-2.0.0" sources."glob-7.1.1" sources."globals-9.14.0" - sources."ignore-3.2.0" + sources."ignore-3.2.2" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" sources."is-my-json-valid-2.15.0" @@ -20785,7 +20781,7 @@ in }) sources."text-table-0.2.0" sources."user-home-2.0.0" - sources."js-tokens-3.0.0" + sources."js-tokens-3.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -20885,8 +20881,8 @@ in sources."interpret-1.0.1" sources."rechoir-0.6.2" sources."resolve-1.2.0" - sources."ajv-4.10.4" - sources."ajv-keywords-1.5.0" + sources."ajv-4.11.2" + sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" sources."co-4.6.0" sources."os-homedir-1.0.2" @@ -21057,7 +21053,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."node-pre-gyp-0.6.32" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -21279,7 +21275,7 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ @@ -21355,7 +21351,7 @@ in sources."sax-1.2.1" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" - sources."nan-2.5.0" + sources."nan-2.5.1" ]; buildInputs = globalBuildInputs; meta = { @@ -21669,6 +21665,22 @@ in }; production = true; }; + ios-deploy = nodeEnv.buildNodePackage { + name = "ios-deploy"; + packageName = "ios-deploy"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.1.tgz"; + sha1 = "e7dec9508bb464a1f2d546bb07fada41d2708e66"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "launch iOS apps iOS devices from the command line (Xcode 7)"; + homepage = "https://github.com/phonegap/ios-deploy#readme"; + license = "GPLv3"; + }; + production = true; + }; istanbul = nodeEnv.buildNodePackage { name = "istanbul"; packageName = "istanbul"; @@ -21885,10 +21897,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.4.0.tgz"; - sha1 = "bf5edbccabb8579cb68ae699871f3e79608ec94b"; + url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz"; + sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e"; }; dependencies = [ sources."bluebird-3.4.7" @@ -22013,7 +22025,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."node-pre-gyp-0.6.32" sources."mkdirp-0.5.1" sources."nopt-3.0.6" @@ -22912,7 +22924,7 @@ in sources."async-0.9.2" sources."biased-opener-0.2.8" sources."debug-2.6.0" - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ sources."debug-2.2.0" sources."ms-0.7.1" @@ -23008,7 +23020,7 @@ in sources."ms-0.7.2" sources."accepts-1.3.3" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" @@ -23016,7 +23028,7 @@ in sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - (sources."finalhandler-0.5.0" // { + (sources."finalhandler-0.5.1" // { dependencies = [ sources."debug-2.2.0" sources."ms-0.7.1" @@ -23031,13 +23043,16 @@ in sources."proxy-addr-1.1.3" sources."qs-6.2.0" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" sources."type-is-1.6.14" sources."utils-merge-1.0.0" sources."vary-1.1.0" @@ -23066,7 +23081,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."truncate-1.0.5" - sources."nan-2.5.0" + sources."nan-2.5.1" (sources."node-pre-gyp-0.6.32" // { dependencies = [ sources."rimraf-2.5.4" @@ -23435,7 +23450,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."node-pre-gyp-0.6.32" sources."mkdirp-0.5.1" sources."nopt-3.0.6" @@ -23634,10 +23649,10 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.16.1"; + version = "0.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.16.1.tgz"; - sha1 = "eff4162e6e08ef7e2ae9b17ad99571876f7d895d"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.16.2.tgz"; + sha1 = "3f77d608f1b0e89907af3f31e2c3eb8844a2b17b"; }; dependencies = [ sources."basic-auth-1.1.0" @@ -23771,7 +23786,12 @@ in sources."proxy-addr-1.1.3" sources."range-parser-1.2.0" sources."send-0.14.1" - sources."serve-static-1.11.1" + (sources."serve-static-1.11.2" // { + dependencies = [ + sources."send-0.14.2" + sources."ms-0.7.2" + ]; + }) sources."utils-merge-1.0.0" sources."negotiator-0.6.1" sources."forwarded-0.1.0" @@ -23998,7 +24018,7 @@ in sources."punycode-1.4.1" sources."nodemailer-1.11.0" sources."poplib-0.1.7" - sources."mailparser-0.6.1" + sources."mailparser-0.6.2" (sources."imap-0.8.19" // { dependencies = [ sources."readable-stream-1.1.14" @@ -24029,9 +24049,9 @@ in sources."minimist-0.0.10" ]; }) - (sources."mimelib-0.2.19" // { + (sources."mimelib-0.3.0" // { dependencies = [ - sources."addressparser-0.3.2" + sources."addressparser-1.0.1" ]; }) sources."encoding-0.1.12" @@ -24167,7 +24187,7 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" @@ -24232,13 +24252,13 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.1.tgz"; - sha1 = "76d8f1f32a87619f000e0e25a0e6be90561484d4"; + url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; + sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; }; dependencies = [ - sources."JSONStream-1.2.1" + sources."JSONStream-1.3.0" sources."abbrev-1.0.9" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" @@ -24276,10 +24296,9 @@ in sources."lodash.without-4.4.0" sources."mississippi-1.2.0" sources."mkdirp-0.5.1" - (sources."node-gyp-3.4.0" // { + (sources."node-gyp-3.5.0" // { dependencies = [ sources."nopt-3.0.6" - sources."npmlog-3.1.2" ]; }) sources."nopt-4.0.1" @@ -24290,11 +24309,7 @@ in sources."npm-package-arg-4.2.0" sources."npm-registry-client-7.4.5" sources."npm-user-validate-0.1.5" - (sources."npmlog-4.0.2" // { - dependencies = [ - sources."gauge-2.7.2" - ]; - }) + sources."npmlog-4.0.2" sources."once-1.4.0" sources."opener-1.4.2" sources."osenv-0.1.4" @@ -24335,7 +24350,7 @@ in sources."validate-npm-package-name-2.2.2" sources."which-1.2.12" sources."wrappy-1.0.2" - sources."write-file-atomic-1.2.0" + sources."write-file-atomic-1.3.1" sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" @@ -24385,13 +24400,14 @@ in sources."stream-shift-1.0.0" sources."xtend-4.0.1" sources."minimist-0.0.8" - sources."path-array-1.0.1" + sources."is-builtin-module-1.0.0" + sources."builtin-modules-1.1.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" + sources."gauge-2.7.2" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."has-color-0.1.7" + sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -24399,16 +24415,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."array-index-1.0.0" - sources."debug-2.6.0" - sources."es6-symbol-3.1.0" - sources."ms-0.7.2" - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" - sources."is-builtin-module-1.0.0" - sources."builtin-modules-1.1.1" - sources."supports-color-0.2.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.7" @@ -24545,7 +24551,7 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.12.2" + sources."coffee-script-1.12.3" sources."underscore-1.4.4" sources."underscore.string-2.3.3" sources."request-2.79.0" @@ -25049,13 +25055,12 @@ in sources."content-type-git+https://github.com/wikimedia/content-type.git#master" sources."core-js-2.4.1" sources."diff-1.4.0" - sources."domino-1.0.27" + sources."domino-1.0.28" sources."entities-1.1.1" - (sources."express-4.14.0" // { + (sources."express-4.14.1" // { dependencies = [ sources."content-type-1.0.2" sources."debug-2.2.0" - sources."finalhandler-0.5.0" sources."qs-6.2.0" sources."ms-0.7.1" ]; @@ -25131,7 +25136,7 @@ in sources."isarray-0.0.1" sources."string_decoder-0.10.31" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" @@ -25144,13 +25149,16 @@ in sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.3" sources."range-parser-1.2.0" - (sources."send-0.14.1" // { + (sources."send-0.14.2" // { dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) ]; }) - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" sources."utils-merge-1.0.0" sources."forwarded-0.1.0" sources."ipaddr.js-1.2.0" @@ -25292,7 +25300,7 @@ in sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" sources."moment-2.17.1" - sources."nan-2.5.0" + sources."nan-2.5.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -25659,10 +25667,10 @@ in peerflix-server = nodeEnv.buildNodePackage { name = "peerflix-server"; packageName = "peerflix-server"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.2.tgz"; - sha1 = "92d39be205b36a0986001a1d9ea34e3927937ab6"; + url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.3.tgz"; + sha1 = "1f3c2b81188de82482f64cf89d015f5428e4c4e5"; }; dependencies = [ sources."connect-multiparty-1.2.5" @@ -26313,13 +26321,12 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - sources."express-5.0.0-alpha.2" + sources."express-5.0.0-alpha.3" sources."express-json5-0.1.0" (sources."body-parser-1.16.0" // { dependencies = [ sources."bytes-2.4.0" sources."debug-2.6.0" - sources."depd-1.1.0" sources."iconv-lite-0.4.15" sources."qs-6.2.1" sources."raw-body-2.2.0" @@ -26328,19 +26335,12 @@ in }) (sources."compression-1.6.2" // { dependencies = [ - sources."accepts-1.3.3" sources."bytes-2.3.0" - sources."vary-1.1.0" - sources."negotiator-0.6.1" ]; }) sources."commander-2.9.0" sources."js-yaml-3.7.0" - (sources."cookies-0.6.2" // { - dependencies = [ - sources."depd-1.1.0" - ]; - }) + sources."cookies-0.6.2" (sources."request-2.79.0" // { dependencies = [ sources."qs-6.3.0" @@ -26359,12 +26359,7 @@ in sources."JSONStream-1.3.0" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" - (sources."http-errors-1.5.1" // { - dependencies = [ - sources."setprototypeof-1.0.2" - sources."statuses-1.3.1" - ]; - }) + sources."http-errors-1.5.1" (sources."readable-stream-1.1.14" // { dependencies = [ sources."isarray-0.0.1" @@ -26372,63 +26367,50 @@ in }) sources."fs-ext-0.5.0" sources."crypt3-0.2.0" - sources."accepts-1.2.13" - sources."array-flatten-1.1.0" - sources."content-disposition-0.5.0" + sources."accepts-1.3.3" + sources."array-flatten-2.1.1" + sources."content-disposition-0.5.2" sources."content-type-1.0.2" - sources."cookie-0.1.3" + sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."debug-2.2.0" - sources."depd-1.0.1" - sources."escape-html-1.0.2" + sources."depd-1.1.0" + sources."encodeurl-1.0.1" + sources."escape-html-1.0.3" sources."etag-1.7.0" - sources."finalhandler-0.4.0" + sources."finalhandler-0.5.1" sources."fresh-0.3.0" - sources."merge-descriptors-1.0.0" + sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" - sources."path-is-absolute-1.0.0" - sources."path-to-regexp-0.1.6" - sources."proxy-addr-1.0.10" - sources."qs-4.0.0" - sources."range-parser-1.0.3" - (sources."router-1.1.4" // { + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."proxy-addr-1.1.3" + sources."qs-6.2.0" + sources."range-parser-1.2.0" + sources."router-1.1.5" + (sources."send-0.14.2" // { dependencies = [ - sources."array-flatten-2.0.0" - sources."path-to-regexp-0.1.7" - ]; - }) - (sources."send-0.13.0" // { - dependencies = [ - sources."http-errors-1.3.1" - ]; - }) - (sources."serve-static-1.10.3" // { - dependencies = [ - sources."escape-html-1.0.3" - sources."send-0.13.2" - sources."depd-1.1.0" - sources."destroy-1.0.4" - sources."http-errors-1.3.1" + sources."ms-0.7.2" ]; }) + sources."serve-static-1.11.2" sources."type-is-1.6.14" - sources."vary-1.0.1" sources."utils-merge-1.0.0" + sources."vary-1.1.0" sources."mime-types-2.1.14" - sources."negotiator-0.5.3" + sources."negotiator-0.6.1" sources."mime-db-1.26.0" sources."ms-0.7.1" + sources."statuses-1.3.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.0.5" - sources."setprototypeof-1.0.0" - sources."destroy-1.0.3" + sources."ipaddr.js-1.2.0" + sources."setprototypeof-1.0.2" + sources."destroy-1.0.4" sources."mime-1.3.4" - sources."statuses-1.2.1" - sources."inherits-2.0.3" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" @@ -26512,7 +26494,7 @@ in sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" sources."moment-2.17.1" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."ncp-2.0.0" sources."rimraf-2.4.5" (sources."glob-6.0.4" // { @@ -26521,6 +26503,7 @@ in ]; }) sources."inflight-1.0.6" + sources."inherits-2.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -26579,16 +26562,17 @@ in sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc"; - version = "0.1.11"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sloc/-/sloc-0.1.11.tgz"; - sha1 = "341f94d44fe9b977c9e2109b134aa92f6394d411"; + url = "https://registry.npmjs.org/sloc/-/sloc-0.2.0.tgz"; + sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c"; }; dependencies = [ - sources."async-1.5.2" + sources."async-2.1.4" sources."cli-table-0.3.1" sources."commander-2.9.0" sources."readdirp-2.1.0" + sources."lodash-4.17.4" sources."colors-1.0.3" sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" @@ -26694,7 +26678,7 @@ in sources."dtrace-provider-0.6.0" sources."precond-0.2.3" sources."csv-generate-0.0.6" - sources."csv-parse-1.1.10" + sources."csv-parse-1.2.0" sources."stream-transform-0.1.1" sources."csv-stringify-0.0.8" sources."asn1-0.1.11" @@ -26702,7 +26686,7 @@ in sources."wrappy-1.0.2" sources."extsprintf-1.2.0" sources."core-util-is-1.0.2" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" sources."mkdirp-0.5.1" @@ -26794,19 +26778,19 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.1"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz"; - sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034"; + url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz"; + sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; dependencies = [ sources."sax-1.2.1" sources."coa-1.0.1" - sources."js-yaml-3.6.1" + sources."js-yaml-3.7.0" sources."colors-1.1.2" sources."whet.extend-0.9.9" sources."mkdirp-0.5.1" - sources."csso-2.2.1" + sources."csso-2.3.1" sources."q-1.4.1" sources."argparse-1.0.9" sources."esprima-2.7.3" @@ -27057,10 +27041,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.0.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.0.1.tgz"; - sha1 = "83b852a8811f4c8f1446fd4f53b19a541c327418"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz"; + sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303"; }; dependencies = [ sources."async-2.1.4" @@ -27071,12 +27055,12 @@ in sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" sources."diff2html-2.0.12" - sources."express-4.14.0" + sources."express-4.14.1" sources."express-session-1.14.2" sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.2.0" + sources."ignore-3.2.2" sources."keen.io-0.1.3" sources."knockout-3.4.1" sources."lodash-4.17.4" @@ -27141,7 +27125,7 @@ in }) sources."rimraf-2.5.4" sources."semver-5.3.0" - sources."serve-static-1.11.1" + sources."serve-static-1.11.2" sources."signals-1.0.0" sources."snapsvg-0.4.0" (sources."socket.io-1.7.2" // { @@ -27213,11 +27197,11 @@ in sources."abbrev-1.0.9" sources."accepts-1.3.3" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" sources."etag-1.7.0" - sources."finalhandler-0.5.0" + sources."finalhandler-0.5.1" sources."fresh-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" @@ -27225,7 +27209,11 @@ in sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.3" sources."range-parser-1.2.0" - sources."send-0.14.1" + (sources."send-0.14.2" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."utils-merge-1.0.0" sources."vary-1.1.0" sources."negotiator-0.6.1" @@ -27811,48 +27799,51 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "1.14.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz"; - sha1 = "54f1ffb92051a328a5b2057d6ae33c289462c823"; + url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz"; + sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475"; }; dependencies = [ - sources."acorn-3.3.0" - sources."async-1.5.2" - sources."clone-1.0.2" - (sources."enhanced-resolve-0.9.1" // { - dependencies = [ - sources."memory-fs-0.2.0" - ]; - }) - sources."interpret-0.6.6" + sources."acorn-4.0.4" + sources."acorn-dynamic-import-2.0.1" + sources."ajv-4.11.2" + sources."ajv-keywords-1.5.1" + sources."async-2.1.4" + sources."enhanced-resolve-3.0.3" + sources."interpret-1.0.1" + sources."json-loader-0.5.4" + sources."loader-runner-2.3.0" sources."loader-utils-0.2.16" - sources."memory-fs-0.3.0" + sources."memory-fs-0.4.1" sources."mkdirp-0.5.1" - sources."node-libs-browser-0.7.0" - sources."optimist-0.6.1" + sources."node-libs-browser-2.0.0" + sources."source-map-0.5.6" sources."supports-color-3.2.3" - sources."tapable-0.1.10" + sources."tapable-0.2.6" (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" + sources."yargs-3.10.0" ]; }) - (sources."watchpack-0.2.9" // { + sources."watchpack-1.2.0" + sources."webpack-sources-0.1.4" + (sources."yargs-6.6.0" // { dependencies = [ - sources."async-0.9.2" - ]; - }) - (sources."webpack-core-0.6.9" // { - dependencies = [ - sources."source-map-0.4.4" + sources."camelcase-3.0.0" + sources."cliui-3.2.0" ]; }) + sources."co-4.6.0" + 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" sources."big.js-3.1.3" sources."emojis-list-2.1.0" sources."json5-0.5.1" - sources."object-assign-4.1.1" sources."errno-0.1.4" sources."readable-stream-2.2.2" sources."prr-0.0.0" @@ -27869,7 +27860,7 @@ in sources."buffer-4.9.1" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.3.0" + sources."crypto-browserify-3.11.0" sources."domain-browser-1.1.7" sources."events-1.1.1" sources."https-browserify-0.0.1" @@ -27897,31 +27888,47 @@ in sources."base64-js-1.2.0" sources."ieee754-1.1.8" sources."date-now-0.1.4" - sources."pbkdf2-compat-2.0.1" - sources."ripemd160-0.2.0" - sources."sha.js-2.2.6" - sources."browserify-aes-0.4.0" + sources."browserify-cipher-1.0.0" + sources."browserify-sign-4.0.0" + sources."create-ecdh-4.0.0" + sources."create-hash-1.1.2" + sources."create-hmac-1.1.4" + sources."diffie-hellman-5.0.2" + sources."pbkdf2-3.0.9" + sources."public-encrypt-4.0.0" + sources."randombytes-2.0.3" + sources."browserify-aes-1.0.6" + sources."browserify-des-1.0.0" + sources."evp_bytestokey-1.0.0" + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.3" + sources."des.js-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + sources."elliptic-6.3.2" + sources."parse-asn1-5.0.0" + sources."brorand-1.0.6" + sources."hash.js-1.0.3" + sources."asn1.js-4.9.1" + sources."ripemd160-1.0.1" + sources."sha.js-2.4.8" + sources."miller-rabin-4.0.0" sources."builtin-status-codes-3.0.0" sources."to-arraybuffer-1.0.1" sources."xtend-4.0.1" sources."setimmediate-1.0.5" sources."querystring-0.2.0" sources."indexof-0.0.1" - sources."wordwrap-0.0.3" sources."has-flag-1.0.0" - sources."source-map-0.5.6" sources."uglify-to-browserify-1.0.2" - sources."yargs-3.10.0" sources."camelcase-1.2.1" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) + sources."cliui-2.1.0" sources."decamelize-1.2.0" sources."window-size-0.1.0" sources."center-align-0.1.3" sources."right-align-0.1.3" + sources."wordwrap-0.0.2" sources."align-text-0.1.4" sources."lazy-cache-1.0.4" sources."kind-of-3.1.0" @@ -27972,7 +27979,7 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."nan-2.5.0" + sources."nan-2.5.1" sources."node-pre-gyp-0.6.32" sources."nopt-3.0.6" sources."npmlog-4.0.2" @@ -28096,11 +28103,44 @@ in sources."uid-number-0.0.6" sources."ms-0.7.1" sources."source-list-map-0.1.8" - sources."amdefine-1.0.1" + sources."get-caller-file-1.0.2" + sources."os-locale-1.4.0" + sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."which-module-1.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-4.2.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + sources."wrap-ansi-2.1.0" + sources."lcid-1.0.0" + sources."invert-kv-1.0.0" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."normalize-package-data-2.3.5" + sources."path-type-1.1.0" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" ]; buildInputs = globalBuildInputs; meta = { - description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; + description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; license = "MIT"; }; @@ -28216,7 +28256,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."loose-envify-1.3.1" - sources."js-tokens-3.0.0" + sources."js-tokens-3.0.1" sources."builtin-modules-1.1.1" sources."ci-info-1.0.0" sources."currently-unhandled-0.4.1" diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8c1c9515926..999582950ea 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -22,6 +22,7 @@ , "gulp" , "hipache" , "htmlhint" +, "ios-deploy" , "istanbul" , "jayschema" , "jshint" From 8ba82f28bc00722d211b3c2990bd71d195d65386 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Tue, 31 Jan 2017 19:03:12 -0500 Subject: [PATCH 59/64] compcert: adding clightgen to the build clightgen is a tool for coverting C to C-light. This patch enable the build of this tool which is added to $out/bin/. --- pkgs/development/compilers/compcert/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index f5554ee0ce3..20d4a430ac4 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace ./configure --replace pl2 pl3 substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' - ./configure -prefix $out -toolprefix ${tools}/bin/ '' + + ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); installTargets = "documentation install"; From 0860b8d5d1aa5058d5059c1d3e09141d1f5b7ef8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 31 Jan 2017 03:00:11 +0000 Subject: [PATCH 60/64] luaPackages.luazlib: fix on darwin --- pkgs/top-level/lua-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ecf6d11547d..7d4c5718343 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -251,20 +251,22 @@ let buildInputs = [ zlib ]; + preConfigure = "substituteInPlace Makefile --replace gcc cc --replace '-llua' ''"; + preBuild = '' makeFlagsArray=( ${platformString} LUAPATH="$out/share/lua/${lua.luaversion}" LUACPATH="$out/lib/lua/${lua.luaversion}" INCDIR="-I${lua}/include" - LIBDIR="-L$out/lib"); + LIBDIR="-L${lua}/lib"); ''; preInstall = "mkdir -p $out/lib/lua/${lua.luaversion}"; meta = with stdenv.lib; { homepage = https://github.com/brimworks/lua-zlib; - hydraPlatforms = platforms.linux; + hydraPlatforms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.koral ]; }; From 7ace1b1ced7d160b8c6a8f44b154e30b3affb300 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 31 Jan 2017 20:13:24 +0000 Subject: [PATCH 61/64] luaPackages.luazlib: 0.4 -> 1.1 --- pkgs/top-level/lua-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 7d4c5718343..badbeaafed9 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -242,11 +242,11 @@ let luazlib = buildLuaPackage rec { name = "zlib-${version}"; - version = "0.4"; + version = "1.1"; src = fetchzip { url = "https://github.com/brimworks/lua-zlib/archive/v${version}.tar.gz"; - sha256 = "1pgxnjc0gvk25wsr69nsm60y5ad86z1nlq7mzj3ckygzkgi782dd"; + sha256 = "1520lk4xpf094xn2zallqgqhs0zb4w61l49knv9y8pmhkdkxzzgy"; }; buildInputs = [ zlib ]; From 6a04086683c0e5d7c4e372c0c62dd32fd7f64eea Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Feb 2017 07:38:28 +0000 Subject: [PATCH 62/64] ocamlPackages.menhir: 20161115 -> 20170101 --- pkgs/development/ocaml-modules/menhir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 9592e9a68d8..e7e29c73a6b 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20161115" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170101" else "20140422" }@args: let sha256 = if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20161115" then "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k" + else if version == "20170101" then "0ika46i9gn3sjvspa62fb5dnr20k783vg5fj30649q0ialv6yscr" else throw ("menhir: unknown version " ++ version); in From f4e67389ccf51c0d3a240f571724516ea9608926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 1 Feb 2017 10:45:17 +0100 Subject: [PATCH 63/64] buildStackProject: set GIT_SSL_CAINFO and LANG --- pkgs/development/haskell-modules/generic-stack-builder.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 13a939fcce9..cf1e189a38d 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -27,6 +27,12 @@ stdenv.mkDerivation (args // { LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs); # ^^^ Internally uses `getOutput "lib"` (equiv. to getLib) + # Non-NixOS git needs cert + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + # Fixes https://github.com/commercialhaskell/stack/issues/2358 + LANG = "en_US.UTF-8"; + preferLocalBuild = true; configurePhase = args.configurePhase or '' From 05ee54782ea783d876b7661838b1ed78fa1257e7 Mon Sep 17 00:00:00 2001 From: 3noch Date: Thu, 26 Jan 2017 21:22:06 -0500 Subject: [PATCH 64/64] Add callCabal2nix to haskell packages Closes https://github.com/NixOS/nixpkgs/pull/22191. --- pkgs/development/haskell-modules/default.nix | 38 +++++++++++++------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index ef73e47f537..cf30a7699ed 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -55,18 +55,26 @@ let inherit packages; }; - hackage2nix = name: version: pkgs.stdenv.mkDerivation { - name = "cabal2nix-${name}-${version}"; - buildInputs = [ pkgs.cabal2nix ]; - phases = ["installPhase"]; - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; - installPhase = '' - export HOME="$TMP" - mkdir $out - hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${all-cabal-hashes}/${name}/${version}/${name}.json) - cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${all-cabal-hashes}/${name}/${version}/${name}.cabal >$out/default.nix - ''; + haskellSrc2nix = { name, src, sha256 ? null }: + let + sha256Arg = if isNull sha256 then "" else ''--sha256="${sha256}"''; + in pkgs.stdenv.mkDerivation { + name = "cabal2nix-${name}"; + buildInputs = [ pkgs.cabal2nix ]; + phases = ["installPhase"]; + LANG = "en_US.UTF-8"; + LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; + installPhase = '' + export HOME="$TMP" + mkdir -p "$out" + cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix" + ''; + }; + + hackage2nix = name: version: haskellSrc2nix { + name = "${name}-${version}"; + sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")''; + src = "${all-cabal-hashes}/${name}/${version}/${name}.cabal"; }; in @@ -76,6 +84,12 @@ let callHackage = name: version: self.callPackage (hackage2nix name version); + # Creates a Haskell package from a source package by calling cabal2nix on the source. + callCabal2nix = src: self.callPackage (haskellSrc2nix { + inherit src; + name = src.name; + }); + ghcWithPackages = selectFrom: withPackages (selectFrom self); ghcWithHoogle = selectFrom: