diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-09 15:12:32 +0200 |
| commit | 0aa59a08d65461149552f68c638655ed2b474510 (patch) | |
| tree | 95b176cf0459529707be2f16d6b87eb96fd4e01a | |
| parent | 2cf343fc96b82772b9ab3700fe43eb142d100179 (diff) | |
| parent | 2ab846211c52e3d7bb26b0888c9777598e921591 (diff) | |
| download | nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.gz nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.bz2 nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.lz nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.xz nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.tar.zst nixpkgs-0aa59a08d65461149552f68c638655ed2b474510.zip | |
Merge master into staging
165 files changed, 3652 insertions, 2051 deletions
diff --git a/doc/overrides.css b/doc/overrides.css index dd11eab82a8..4c7d4a31be2 100644 --- a/doc/overrides.css +++ b/doc/overrides.css @@ -1,4 +1,5 @@ - +.docbook .xref img[src^=images\/callouts\/], +.screen img, .programlisting img { width: 1em; } diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index c4bd6c57ffd..d6f33ccd1cd 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -112,7 +112,7 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co <varname>BASEBRANCH</varname> the base branch of the pull-request.</para> </callout> - <callout arearefs='reviewing-rebase-3'> + <callout arearefs='reviewing-rebase-4'> <para>Rebasing the pull-request changes to the nixos-unstable branch.</para> </callout> diff --git a/lib/default.nix b/lib/default.nix index 59b3d2159da..c292ed33e1d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -74,7 +74,7 @@ let inherit (lists) singleton foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists - reverseList listDfs toposort sort compareLists take drop sublist + reverseList listDfs toposort sort naturalSort compareLists take drop sublist last init crossLists unique intersectLists subtractLists mutuallyExclusive; inherit (strings) concatStrings concatMapStrings concatImapStrings diff --git a/lib/lists.nix b/lib/lists.nix index 424d2c57f55..5ec97f5a07f 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -1,7 +1,9 @@ # General list operations. { lib }: with lib.trivial; - +let + inherit (lib.strings) toInt; +in rec { inherit (builtins) head tail length isList elemAt concatLists filter elem genList; @@ -409,6 +411,25 @@ rec { then compareLists cmp (tail a) (tail b) else rel; + /* Sort list using "Natural sorting". + Numeric portions of strings are sorted in numeric order. + + Example: + naturalSort ["disk11" "disk8" "disk100" "disk9"] + => ["disk8" "disk9" "disk11" "disk100"] + naturalSort ["10.46.133.149" "10.5.16.62" "10.54.16.25"] + => ["10.5.16.62" "10.46.133.149" "10.54.16.25"] + naturalSort ["v0.2" "v0.15" "v0.0.9"] + => [ "v0.0.9" "v0.2" "v0.15" ] + */ + naturalSort = lst: + let + vectorise = s: map (x: if isList x then toInt (head x) else x) (builtins.split "(0|[1-9][0-9]*)" s); + prepared = map (x: [ (vectorise x) x ]) lst; # remember vectorised version for O(n) regex splits + less = a: b: (compareLists compare (head a) (head b)) < 0; + in + map (x: elemAt x 1) (sort less prepared); + /* Return the first (at most) N elements of a list. Example: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 89ea065f024..7ea5bb2d106 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1196,6 +1196,11 @@ github = "ElvishJerricco"; name = "Will Fancher"; }; + endgame = { + email = "jack@jackkelly.name"; + github = "endgame"; + name = "Jack Kelly"; + }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; @@ -2495,6 +2500,11 @@ github = "mschristiansen"; name = "Mikkel Christiansen"; }; + msiedlarek = { + email = "mikolaj@siedlarek.pl"; + github = "msiedlarek"; + name = "Mikołaj Siedlarek"; + }; mstarzyk = { email = "mstarzyk@gmail.com"; github = "mstarzyk"; @@ -2644,6 +2654,11 @@ github = "nthorne"; name = "Niklas Thörne"; }; + nyanloutre = { + email = "paul@nyanlout.re"; + github = "nyanloutre"; + name = "Paul Trehiou"; + }; nyarly = { email = "nyarly@gmail.com"; github = "nyarly"; @@ -3258,6 +3273,11 @@ github = "sengaya"; name = "Thilo Uttendorfer"; }; + sephalon = { + email = "me@sephalon.net"; + github = "sephalon"; + name = "Stefan Wiehler"; + }; sepi = { email = "raffael@mancini.lu"; github = "sepi"; diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 959bd86759b..61f9ec8ba99 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -58,6 +58,9 @@ following incompatible changes:</para> <itemizedlist> <listitem> <para> + The <literal>clementine</literal> package points now to the free derivation. + <literal>clementineFree</literal> is removed now and <literal>clementineUnfree</literal> + points to the package which is bundled with the unfree <literal>libspotify</literal> package. </para> </listitem> </itemizedlist> diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c5dee2ca97a..3594f57595c 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -305,6 +305,7 @@ hass = 286; monero = 287; ceph = 288; + duplicati = 289; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -578,6 +579,7 @@ hass = 286; monero = 287; ceph = 288; + duplicati = 289; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3a8b1014553..2f9b1083ef1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -86,6 +86,7 @@ ./programs/freetds.nix ./programs/gnupg.nix ./programs/gphoto2.nix + ./programs/iftop.nix ./programs/java.nix ./programs/kbdlight.nix ./programs/less.nix @@ -159,6 +160,7 @@ ./services/audio/ympd.nix ./services/backup/bacula.nix ./services/backup/borgbackup.nix + ./services/backup/duplicati.nix ./services/backup/crashplan.nix ./services/backup/crashplan-small-business.nix ./services/backup/mysql-backup.nix diff --git a/nixos/modules/programs/iftop.nix b/nixos/modules/programs/iftop.nix new file mode 100644 index 00000000000..a98a9a8187d --- /dev/null +++ b/nixos/modules/programs/iftop.nix @@ -0,0 +1,18 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.iftop; +in { + options = { + programs.iftop.enable = mkEnableOption "iftop + setcap wrapper"; + }; + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.iftop ]; + security.wrappers.iftop = { + source = "${pkgs.iftop}/bin/iftop"; + capabilities = "cap_net_raw+p"; + }; + }; +} diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix index c0283c9e686..d39103a5805 100644 --- a/nixos/modules/programs/less.nix +++ b/nixos/modules/programs/less.nix @@ -6,7 +6,7 @@ let cfg = config.programs.less; - configFile = '' + configText = if (cfg.configFile != null) then (builtins.readFile cfg.configFile) else '' #command ${concatStringsSep "\n" (mapAttrsToList (command: action: "${command} ${action}") cfg.commands) @@ -25,7 +25,7 @@ let ''; lessKey = pkgs.runCommand "lesskey" - { src = pkgs.writeText "lessconfig" configFile; } + { src = pkgs.writeText "lessconfig" configText; } "${pkgs.less}/bin/lesskey -o $out $src"; in @@ -37,6 +37,19 @@ in enable = mkEnableOption "less"; + configFile = mkOption { + type = types.nullOr types.path; + default = null; + example = literalExample "$${pkgs.my-configs}/lesskey"; + description = '' + Path to lesskey configuration file. + + <option>configFile</option> takes precedence over <option>commands</option>, + <option>clearDefaultCommands</option>, <option>lineEditingKeys</option>, and + <option>envVariables</option>. + ''; + }; + commands = mkOption { type = types.attrsOf types.str; default = {}; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index e1cad03e66e..f2bdfcf885e 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -386,7 +386,7 @@ let ${optionalString (cfg.enableGnomeKeyring) "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} ${optionalString (config.virtualisation.lxc.lxcfs.enable) - "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"} + "session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all"} ''); }; diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix new file mode 100644 index 00000000000..9772ca4d20a --- /dev/null +++ b/nixos/modules/services/backup/duplicati.nix @@ -0,0 +1,40 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.duplicati; +in +{ + options = { + services.duplicati = { + enable = mkEnableOption "Duplicati"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.duplicati ]; + + systemd.services.duplicati = { + description = "Duplicati backup"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "duplicati"; + Group = "duplicati"; + ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=any --webservice-port=8200 --server-datafolder=/var/lib/duplicati"; + Restart = "on-failure"; + }; + }; + + users.extraUsers.duplicati = { + uid = config.ids.uids.duplicati; + home = "/var/lib/duplicati"; + createHome = true; + group = "duplicati"; + }; + users.extraGroups.duplicati.gid = config.ids.gids.duplicati; + + }; +} + diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index dee877f1c11..938a8a1fe33 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -9,15 +9,16 @@ let serverName = if vhostConfig.serverName != null then vhostConfig.serverName else vhostName; + acmeDirectory = config.security.acme.directory; in vhostConfig // { inherit serverName; } // (optionalAttrs vhostConfig.enableACME { - sslCertificate = "/var/lib/acme/${serverName}/fullchain.pem"; - sslCertificateKey = "/var/lib/acme/${serverName}/key.pem"; + sslCertificate = "${acmeDirectory}/${serverName}/fullchain.pem"; + sslCertificateKey = "${acmeDirectory}/${serverName}/key.pem"; }) // (optionalAttrs (vhostConfig.useACMEHost != null) { - sslCertificate = "/var/lib/acme/${vhostConfig.useACMEHost}/fullchain.pem"; - sslCertificateKey = "/var/lib/acme/${vhostConfig.useACMEHost}/key.pem"; + sslCertificate = "${acmeDirectory}/${vhostConfig.useACMEHost}/fullchain.pem"; + sslCertificateKey = "${acmeDirectory}/${vhostConfig.useACMEHost}/key.pem"; }) ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index c7d56790fa0..e754a1e8718 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -191,7 +191,7 @@ let if out=$(ip addr add "${cidr}" dev "${i.name}" 2>&1); then echo "done" elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then - echo "failed" + echo "'ip addr add "${cidr}" dev "${i.name}"' failed: $out" exit 1 fi '' @@ -212,7 +212,7 @@ let if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" 2>&1); then echo "done" elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then - echo "failed" + echo "'ip route add "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out" exit 1 fi '' diff --git a/nixos/release.nix b/nixos/release.nix index c84853a142c..4fd77e6471c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -295,6 +295,7 @@ in rec { tests.hound = callTest tests/hound.nix {}; tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {}; tests.i3wm = callTest tests/i3wm.nix {}; + tests.iftop = callTest tests/iftop.nix {}; tests.initrd-network-ssh = callTest tests/initrd-network-ssh {}; tests.installer = callSubTests tests/installer.nix {}; tests.influxdb = callTest tests/influxdb.nix {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 3a2c6516476..65c314e22e1 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -151,11 +151,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec { $machine->screenshot("sandbox_info"); - $machine->succeed(ru "${xdo "submit-url" '' + $machine->succeed(ru "${xdo "find-window" '' search --sync --onlyvisible --name "sandbox status" windowfocus --sync ''}"); - $machine->succeed(ru "${xdo "submit-url" '' + $machine->succeed(ru "${xdo "copy-sandbox-info" '' key --delay 1000 Ctrl+a Ctrl+c ''}"); @@ -166,6 +166,26 @@ mapAttrs (channel: chromiumPkg: makeTest rec { && $clipboard =~ /network namespaces.*yes/mi && $clipboard =~ /seccomp.*sandbox.*yes/mi && $clipboard =~ /you are adequately sandboxed/mi; + + $machine->sleep(1); + $machine->succeed(ru "${xdo "find-window-after-copy" '' + search --onlyvisible --name "sandbox status" + ''}"); + + my $clipboard = $machine->succeed(ru "echo void | ${pkgs.xclip}/bin/xclip -i"); + $machine->succeed(ru "${xdo "copy-sandbox-info" '' + key --delay 1000 Ctrl+a Ctrl+c + ''}"); + + my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o"); + die "copying twice in a row does not work properly: $clipboard" + unless $clipboard =~ /namespace sandbox.*yes/mi + && $clipboard =~ /pid namespaces.*yes/mi + && $clipboard =~ /network namespaces.*yes/mi + && $clipboard =~ /seccomp.*sandbox.*yes/mi + && $clipboard =~ /you are adequately sandboxed/mi; + + $machine->screenshot("afer_copy_from_chromium"); }; $machine->shutdown; diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix new file mode 100644 index 00000000000..21ff3cafed7 --- /dev/null +++ b/nixos/tests/iftop.nix @@ -0,0 +1,30 @@ +import ./make-test.nix ({ pkgs, lib, ... }: + +with lib; + +{ + name = "iftop"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ]; + + nodes = { + withIftop = { + imports = [ ./common/user-account.nix ]; + + programs.iftop.enable = true; + }; + withoutIftop = { + imports = [ ./common/user-account.nix ]; + }; + }; + + testScript = '' + subtest "machine with iftop enabled", sub { + $withIftop->start; + $withIftop->succeed("su -l alice -c 'iftop -t -s 1'"); + }; + subtest "machine without iftop", sub { + $withoutIftop->start; + $withoutIftop->mustFail("su -l alice -c 'iftop -t -s 1'"); + }; + ''; +}) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 92a33035c82..b8ff3daec60 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -76,6 +76,8 @@ let enableParallelBuilding = true; + passthru.unfree = unfree; + meta = with stdenv.lib; { homepage = http://www.clementine-player.org; description = "A multiplatform music player"; @@ -85,8 +87,8 @@ let }; }; - # Spotify blob for Clementine - blob = stdenv.mkDerivation { + # Unfree Spotify blob for Clementine + unfree = stdenv.mkDerivation { name = "clementine-blob-${version}"; # Use the same patches and sources as Clementine inherit src nativeBuildInputs postPatch; @@ -95,7 +97,7 @@ let ./clementine-spotify-blob.patch ]; - buildInputs = buildInputs ++ [ libspotify ]; + buildInputs = buildInputs ++ [ libspotify makeWrapper gst_plugins ]; # Only build and install the Spotify blob preBuild = '' cd ext/clementine-spotifyblob @@ -104,6 +106,15 @@ let mkdir -p $out/libexec/clementine mv $out/bin/clementine-spotifyblob $out/libexec/clementine rmdir $out/bin + + makeWrapper ${free}/bin/clementine $out/bin/clementine \ + --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + + mkdir -p $out/share + for dir in applications icons kde4; do + ln -s "$free/share/$dir" "$out/share/$dir" + done ''; enableParallelBuilding = true; meta = with stdenv.lib; { @@ -116,34 +127,4 @@ let }; }; -in - -with stdenv.lib; - -runCommand "clementine-${version}" -{ - inherit blob free; - buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks - dontPatchELF = true; - dontStrip = true; - meta = { - description = "A multiplatform music player" - + " (" + (optionalString withSpotify "with Spotify, ") - + "with gstreamer plugins: " - + concatStrings (intersperse ", " (map (x: x.name) gst_plugins)) - + ")"; - license = licenses.gpl3Plus; - inherit (free.meta) homepage platforms maintainers; - }; -} -'' - mkdir -p $out/bin - makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \ - ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - - mkdir -p $out/share - for dir in applications icons kde4; do - ln -s "$free/share/$dir" "$out/share/$dir" - done -'' +in free diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix new file mode 100644 index 00000000000..0383af06795 --- /dev/null +++ b/pkgs/applications/audio/crip/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, fetchurl +, makeWrapper + +, perl +, perlPackages + +, cdparanoia +, coreutils +, eject +, flac +, gnugrep +, nano +, sox +, vorbis-tools +, vorbisgain +, which +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "crip-3.9"; + src = fetchurl { + url = "http://bach.dynet.com/crip/src/${name}.tar.gz"; + sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz"; + }; + + buildInputs = [ perl perlPackages.CDDB_get ]; + nativeBuildInputs = [ makeWrapper ]; + + toolDeps = makeBinPath [ + cdparanoia + coreutils + eject + flac + gnugrep + sox + vorbis-tools + vorbisgain + which + ]; + + scripts = [ "crip" "editcomment" "editfilenames" ]; + + installPhase = '' + mkdir -p $out/bin/ + + for script in ${escapeShellArgs scripts}; do + cp $script $out/bin/ + + substituteInPlace $out/bin/$script \ + --replace '$editor = "vim";' '$editor = "${nano}/bin/nano";' + + wrapProgram $out/bin/$script \ + --set PERL5LIB "${makePerlPath [ perlPackages.CDDB_get ]}" \ + --set PATH "${toolDeps}" + done + ''; + + meta = { + homepage = http://bach.dynet.com/crip/; + description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; + license = stdenv.lib.licenses.gpl1; + platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.endgame ]; + }; +} diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 25704d26280..4266b8c69bb 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { name = "freewheeling-${version}"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; rev = "v${version}"; - sha256 = "01hmp0jxzxpb5sl0x91hdlwmbw9n4yffrpra4f89s4n8cixrz3d9"; + sha256 = "1xflbbnjdibjmyxb1zq8liylaw5k03nnl1z3272jh204pqh17ri9"; }; nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3c557438823..84ba32c4125 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -104,9 +104,9 @@ let }) (attrs: { postFixup = (attrs.postFixup or "") + '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv - chmod +x $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv + chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv ''; }); @@ -239,12 +239,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1yxjvsp89mkk7gghbz5lqh7bbqi6l1ihg876c60bhqg0f5m98zcg"; /* updated by script */ + sha256 = "1mwajah0qghkw2f4hap5f35x826h8318a0bjbn9lpknffgfi0zc3"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -265,12 +265,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "073wwhg58hkd8w4jazvwngl78gbhnmilm63jhpirr98jk7i7a4mq"; /* updated by script */ + sha256 = "0r008q3dn30zbn9zzyjj6pz3myxrb9i1s96kinj9vy0cj7gb0aai"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -278,12 +278,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "124rzc46f4bqyhllwyb26lkavh7zwbj62axrwhif34rayl2rcmpm"; /* updated by script */ + sha256 = "08dlyf2zfgcbbbnadx5x0n877diyglg9h7h39njcw4ajh4aninyq"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -291,12 +291,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "10r3z37mhr8daxi14k011bhx3pxpx3lsj7jvikwll4wjlv1znhiw"; /* updated by script */ + sha256 = "1483w692n29v22f5vchh8fbizwn74wlznd5pvlscxs4ly9af7935"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -304,12 +304,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2017.3.6"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1mcq8n7rd074aghmiyqf1yg3qvs28w97kk4dygj2a46y3s1ha4cd"; /* updated by script */ + sha256 = "00g86fggh8wfm02k9wwn33yqmbfr2b1x3vnvyn9gdpycdk46lqgw"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PS2017.3"; @@ -317,12 +317,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "027w73qrrj7aml2kdj3sx890q7jyj2jfnsg0pivi7i4kh8i11204"; /* updated by script */ + sha256 = "0f3chibs7lp3kgkd0ah6d7z1lf3n4scalmadpxcn0fd6bap5mnjb"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -330,12 +330,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.3.4"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0040ryx7kj64vwc10gvns43f1c97dvrgnwlmdm1m1506ldvaw0si"; /* updated by script */ + sha256 = "0lq5bqnfxj02sbd4yaf3ma6nps7cnf0d11dzqjv9m6b41y55dp0k"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -369,12 +369,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.3.5"; /* updated by script */ + version = "2018.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "123v4m8p7acndj8p8frn1bjvycijlx904pa84ka9pv18c90qiym9"; /* updated by script */ + sha256 = "1lx852gycrzajh58k1r2wfpwwjna6y3fsd5srw5fgzw58f120vn4"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index a8b38012a13..7a6fa1961e2 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.21.1"; + version = "1.22.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0c5wh6i4yl601hg0r1c8y25lz7j2p4vhisdnvnx9nzd6v4ib27cj"; - "x86_64-linux" = "19i0wkl0qccq2cm10khy0xxb53a6g2m061g71y54s4cxb4wimc9l"; - "x86_64-darwin" = "0d1ws4c3n80gypiarqbylyipg273ssc0m29jnrg7hx1mcy5ljb1i"; + "i686-linux" = "1w1ywf21vcwmfq5ngag1y076nxbdqg3qav90ilxgd3dkv5j6fkjr"; + "x86_64-linux" = "14phpsrkkv09dgr7phqhgjzfhm3zzbh3w2yhyng0cj3vwzysikcs"; + "x86_64-darwin" = "0fqsr4ramanl7v1damf01zkmg75s9nlfkj6298h9sjvhc93pfcll"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 6eb7fba646c..7b79cd062a8 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchFromGitHub, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools - , qtlocation, qtsensors, doxygen, cups, makeWrapper + , qtlocation, qtsensors, doxygen, cups, makeWrapper, qtimageformats }: stdenv.mkDerivation rec { name = "OpenOrienteering-Mapper-${version}"; - version = "0.8.1"; + version = "0.8.1.2"; - buildInputs = [ gdal qtbase qttools qtlocation qtsensors clipper zlib proj doxygen cups]; + buildInputs = [ gdal qtbase qttools qtlocation qtimageformats + qtsensors clipper zlib proj doxygen cups]; nativeBuildInputs = [ cmake makeWrapper ninja ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "10viw8bddl76mc2gh84jsl7h237yzvh4nim61pbd63vg1hlqisi6"; + sha256 = "0f7zxzl2n46qy86k6n3f6a7l1nhba58i28l8ngp3drf74qffaa33"; }; cmakeFlags = @@ -48,19 +49,20 @@ stdenv.mkDerivation rec { # Fixes "This application failed to start because it could not find or load the Qt # platform plugin "cocoa"." wrapProgram $out/Mapper.app/Contents/MacOS/Mapper \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms \ + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} mkdir -p $out/bin ln -s $out/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper ''; - meta = { + meta = with stdenv.lib; { description = '' OpenOrienteering Mapper is an orienteering mapmaking program and provides a free alternative to the existing proprietary solution. ''; homepage = https://www.openorienteering.org/apps/mapper/; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; darwin; - maintainers = with stdenv.lib.maintainers; [mpickering]; + license = licenses.gpl3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [mpickering]; }; } diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 8c3a8bc894b..675c4e6a49e 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,12 +18,12 @@ }: stdenv.mkDerivation rec { - version = "3.6.1"; + version = "3.8.1"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44"; + sha256 = "1irms980d7acdqrfn8isw55vgc4d9n26ff86887vk7xfvxs0ayla"; }; name = "nomacs-${version}"; @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */ImageLounge) ''; - patches = [./fix-appdata-install.patch]; - nativeBuildInputs = [cmake pkgconfig wrapGAppsHook]; diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch deleted file mode 100644 index cdeed56f496..00000000000 --- a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake -index 3521056a..34f99ed9 100644 ---- a/cmake/UnixBuildTarget.cmake -+++ b/cmake/UnixBuildTarget.cmake -@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) - # manpage - install(FILES Readme/nomacs.1 DESTINATION share/man/man1) - # appdata --install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/) -+install(FILES nomacs.appdata.xml DESTINATION share/appdata/) - - # "make dist" target - string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME) diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 89bc171d295..9b16485cfa7 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -16,7 +16,7 @@ mkDerivation { platforms = platforms.linux; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - propagatedBuildInputs = [ + buildInputs = [ # qt qtwebkit # kde @@ -32,11 +32,17 @@ mkDerivation { ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = - let k3bPath = lib.makeBinPath [ - cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode - vcdimager - ]; + let + binPath = lib.makeBinPath [ + cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode + vcdimager flac + ]; + libraryPath = lib.makeLibraryPath [ + cdparanoia + ]; in '' - wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}" + wrapProgram "$out/bin/k3b" \ + --prefix PATH : "${binPath}" \ + --prefix LD_LIBRARY_PATH : ${libraryPath} ''; } diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index 7781f0df853..661a00a0661 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qt4, qmake4Hook }: -let version = "0.6.1"; in +let version = "0.6.4"; in stdenv.mkDerivation { name = "confclerk-${version}"; src = fetchurl { url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; - sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g"; + sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; }; buildInputs = [ qt4 ]; diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix index 8540c39d133..7852e6eb790 100644 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ b/pkgs/applications/misc/electrum-ltc/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { name = "electrum-ltc-${version}"; - version = "3.0.6.2"; + version = "3.1.2.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "1bay4vfkanxsa8pj8n99sj55yc59s84nns97lbvagyp0p0lclia7"; + sha256 = "0sdql4k8g3py941rzdskm3k4hkwam4hzvg4qlvs0b5pw139mri86"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 9b8628d1527..5f219dc4752 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, - pango, gsettings-desktop-schemas, +{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, + pango, gsettings-desktop-schemas, gobjectIntrospection, wrapGAppsHook, # Optional packages: enableOSM ? true, osm-gps-map }: @@ -10,14 +10,12 @@ in buildPythonApplication rec { version = "4.2.8"; name = "gramps-${version}"; - buildInputs = [ intltool gtk3 ] + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ intltool gtk3 gobjectIntrospection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map ; - # Currently broken - doCheck = false; - src = fetchFromGitHub { owner = "gramps-project"; repo = "gramps"; @@ -25,7 +23,7 @@ in buildPythonApplication rec { sha256 = "17y6rjvvcz7lwjck4f5nmhnn07i9k5vzk5dp1jk7j3ldxjagscsd"; }; - pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ]; + pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; # Same installPhase as in buildPythonApplication but without --old-and-unmanageble # install flag. @@ -51,13 +49,6 @@ in buildPythonApplication rec { runHook postInstall ''; - # gobjectIntrospection package, wrap accordingly - preFixup = '' - wrapProgram $out/bin/gramps \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - meta = with stdenv.lib; { description = "Genealogy software"; homepage = http://gramps-project.org; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 8451c783aac..4fa3b4ee435 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "17.12"; + version = "18.03.1"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f"; + sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 060d4899f4c..7448b8e6648 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: +{ stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: -stdenv.mkDerivation { - name = "pcmanx-gtk2-1.3"; - src = fetchurl { - url = "https://github.com/pcman-bbs/pcmanx/archive/1.3.tar.gz"; - sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; +stdenv.mkDerivation rec { + name = "pcmanx-gtk2-${version}"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "pcman-bbs"; + repo = "pcmanx"; + rev = version; + sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -12,6 +16,8 @@ stdenv.mkDerivation { preConfigure = '' ./autogen.sh + # libtoolize generates configure script which uses older version of automake, we need to autoreconf it + cd libltdl; autoreconf; cd .. ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 3a2ec62222f..90908c67b4e 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, qt5 }: let - version = "1.10.01"; + version = "1.40.13"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; src = fetchurl { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; - sha256 = "0pgj8rsk9yxvls7yjpzblzbci2vvd0mlf9c7wdbjhwf6qyi7dfi3"; + sha256 = "0d6b9ls742nghzg5y97dx7myvv8i88f0s27lhr52yy4833hdxdwn"; }; buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 411fd756579..936b1a389f1 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchPypi, pythonPackages }: +{ lib, buildPythonApplication, fetchPypi, pythonPackages, ffmpeg }: buildPythonApplication rec { version = "1.4.0"; @@ -20,6 +20,8 @@ buildPythonApplication rec { blinker ]; + makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ]; + # No tests included doCheck = false; diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix new file mode 100644 index 00000000000..049a9eff347 --- /dev/null +++ b/pkgs/applications/misc/todiff/default.nix @@ -0,0 +1,23 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + name = "todiff-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Ekleog"; + repo = "todiff"; + rev = version; + sha256 = "0n3sifinwhny651q1v1a6y9ybim1b0nd5s1z26sigjdhdvxckn65"; + }; + + cargoSha256 = "0mxdpn98fvmxrp656vwxvzl9vprz5mvqj7d1hvvs4gsjrsiyp0fy"; + + meta = with stdenv.lib; { + description = "Human-readable diff for todo.txt files"; + homepage = "https://github.com/Ekleog/todiff"; + maintainers = with maintainers; [ ekleog ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 078fa0885b7..8f07415db5f 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -132,7 +132,7 @@ let else for res in 16 32 48 64 128; do mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" - ln -s "${browser}/lib/${browserName}/browser/chrome/icons/default/default''${res}.png" \ + ln -s "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" \ "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" done fi diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix new file mode 100644 index 00000000000..7142ba6140b --- /dev/null +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -0,0 +1,61 @@ +{stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook, makeWrapper +,help2man, lua5, luafilesystem, luajit, sqlite +,webkitgtk, gtk3, gst_all_1}: + +let + lualibs = [luafilesystem]; + getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; + getLuaPath = lib : getPath lib "lua"; + getLuaCPath = lib : getPath lib "so"; + luaPath = stdenv.lib.concatStringsSep ";" (map getLuaPath lualibs); + luaCPath = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs); + +in stdenv.mkDerivation rec { + + name = "luakit-${version}"; + version = "2017.08.10"; + src = fetchFromGitHub { + owner = "luakit"; + repo = "luakit"; + rev = "${version}"; + sha256 = "09z88b50vf2y64vj79cymknyzk3py6azv4r50jng4cw9jx2ray7r"; + }; + + nativeBuildInputs = [pkgconfig help2man wrapGAppsHook makeWrapper]; + + buildInputs = [webkitgtk lua5 luafilesystem luajit sqlite gtk3 + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + ]; + + postPatch = + #Kind of ugly seds here. There must be a better solution. + '' + patchShebangs ./build-utils + sed -i "2 s|require \"lib.lousy.util\"|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/docgen/gen.lua; + sed -i "3 s|require \"lib.markdown\"|dofile(\"./lib/markdown.lua\")|" ./build-utils/docgen/gen.lua; + sed -i "1,2 s|require(\"lib.lousy.util\")|dofile(\"./lib/lousy/util.lua\")|" ./build-utils/find_files.lua; + ''; + + buildPhase = '' + make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out PREFIX=$out USE_GTK3=1 + ''; + + installPhase = let + luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua"; + in '' + make DEVELOPMENT_PATHS=0 INSTALLDIR=$out PREFIX=$out XDGPREFIX=$out/etc/xdg USE_GTK3=1 install + wrapProgram $out/bin/luakit \ + --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \ + --set LUA_PATH '${luaKitPath};${luaPath};' \ + --set LUA_CPATH '${luaCPath};' + ''; + + meta = with stdenv.lib; { + description = "Fast, small, webkit based browser framework extensible in Lua"; + homepage = "http://luakit.org"; + license = licenses.gpl3; + platforms = platforms.linux; # Only tested linux + }; +} diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix new file mode 100644 index 00000000000..7fd4cd9fa82 --- /dev/null +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -0,0 +1,28 @@ +{ darwin, fetchFromGitHub, rustPlatform, stdenv }: + +with rustPlatform; + +buildRustPackage rec { + name = "click-${version}"; + version = "0.3.1"; + rev = "b5dfb4a8f8344330a098cb61523695dfe0fd296a"; + + src = fetchFromGitHub { + owner = "databricks"; + repo = "click"; + sha256 = "0a2hq4hcxkkx7gs5dv7sr3j5jy2dby4r6y090z7zl2xy5wydr7bi"; + inherit rev; + }; + + cargoSha256 = "03vgbkv9xsnx44vivbbhjgxv9drp0yjnimgy6hwm32x74r00k3hj"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + meta = with stdenv.lib; { + description = ''The "Command Line Interactive Controller for Kubernetes"''; + homepage = https://github.com/databricks/click; + license = [ licenses.asl20 ]; + maintainers = [ maintainers.mbode ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index df0b6f39ca5..c47ce04f1f7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.2.15"; - sha256Hash = "18srw7g8h5zmc0plzqd03aijaylrsfaybraw97b1w9hj4lf2bl92"; + version = "1.2.17"; + sha256Hash = "1lswjn3rnrbps1pd2xhnhggcn1z0i7y71dpr0v9wb1yc8qhh4pi0"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "310557"; archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk"; diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix new file mode 100644 index 00000000000..762c6222b58 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk3, gmime, gnutls, + webkitgtk, libesmtp, openssl, libnotify, enchant, gpgme, + libcanberra-gtk3, libsecret, gtksourceview, gobjectIntrospection, + hicolor-icon-theme, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "balsa-${version}"; + version = "2.5.5"; + + src = fetchurl { + url = "https://pawsa.fedorapeople.org/balsa/${name}.tar.bz2"; + sha256 = "0p4w81wvdxqhynkninzglsgqk6920x1zif2zmw8bml410lav2azz"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + gobjectIntrospection + hicolor-icon-theme + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + gmime + gnutls + webkitgtk + openssl + libnotify + enchant + gpgme + libcanberra-gtk3 + gtksourceview + libsecret + libesmtp + ]; + + configureFlags = [ + "--with-canberra" + "--with-gpgme" + "--with-gtksourceview" + "--with-libsecret" + "--with-ssl" + "--with-unique" + "--without-gnome" + ]; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://pawsa.fedorapeople.org/balsa/; + description = "An e-mail client for GNOME"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index cd4de0ecd56..95bdb6cb581 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "inboxer-${version}"; - version = "1.0.3"; + version = "1.0.4"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "1k2wgvs17lfxqmk0v7g8cf34h5ahr41vaibgb4a6ixay41hfx06d"; + sha256 = "0i6qmrnga80q8s6dabfgh0fcdnc2wpj948za04zi1ajv4fjwjh0n"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 20e8071b121..d89219cce5f 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ++ optionals (!stdenv.isDarwin) [ gdb man ]; # test dependencies postPatch = '' + patchShebangs configure + find test/ -type f -exec \ sed -i \ -e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \ diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index d58680d15d5..22bfddc5b57 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sylpheed-${version}"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "http://sylpheed.sraoss.jp/sylpheed/v3.6/${name}.tar.bz2"; - sha256 = "0idk9nz3d200l2bxc38vnxlx0wcslrvncy9lk50vz7dl8c5sg97b"; + url = "http://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; + sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 424c1926f35..d8ff5f3100a 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.5"; + version = "2.4.6"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1mvgy67rvnwj2kbc43s4il81jvz5ai0bx2j3j2js7x50zclyrcmk"; + sha256 = "1znmjg40pf81ks9lnm6ilx0cy32xan5g19gbqkkhj35whb95z5lf"; }; cmakeFlags = [ diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index ddcfbf00bf9..3fc84228efe 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.17.11"; + version = "2.18.1"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1p50bzkwq5hrwal6i679yrkdqkh5hk4bb9l9gdff2x2i761v9y9b"; + sha256 = "0wcihlgaif79r0fa47kq77igxzq0lpyn74414v9n6k9rl5nj8x1a"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 796b36c9173..7a9dcc23192 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -70,6 +70,9 @@ mkDerivation (common "tamarin-prover" src // { postInstall = '' wrapProgram $out/bin/tamarin-prover \ --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]} + # so that the package can be used as a vim plugin to install syntax coloration + install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim + install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim ''; checkPhase = "./dist/build/tamarin-prover/tamarin-prover test"; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 177f8ca2564..ef539ac9c8d 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -3,14 +3,13 @@ , gmp, mpfr, glog, google-gflags, libjpeg_turbo }: stdenv.mkDerivation rec { - name = "openmvs-unstable-2017-05-01"; + name = "openmvs-unstable-2018-05-26"; src = fetchFromGitHub { owner = "cdcseacave"; repo = "openmvs"; - - rev = "a3b360016660a1397f6eb6c070c2c19bbb4c7590"; - sha256 = "170ff4ipix2kqq5rhb1yrrcvc79im9qgp5hiwsdr23xxzdl21221"; + rev = "939033c55b50478339084431aac2c2318041afad"; + sha256 = "12dgkwwfdp24581y3i41gsd1k9hq0aw917q0ja5s0if4qbmc8pni"; }; buildInputs = [ eigen opencv ceres-solver cgal boost vcg gmp mpfr glog google-gflags libjpeg_turbo ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b336f72c7ac..de2c67ddc59 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.16.3"; + version = "2.17.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn"; + sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch index bf36b2d321f..ab5bb3c3a6c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch +++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch @@ -2,19 +2,19 @@ This patch does two things: (1) use the right name for `docbook2texi', and (2) make sure `gitman.info' isn't produced since it's broken (duplicate node names). -diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile ---- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200 -+++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200 -@@ -101,7 +101,7 @@ +diff --git a/Documentation/Makefile b/Documentation/Makefile +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -122,7 +122,7 @@ MAKEINFO = makeinfo INSTALL_INFO = install-info -DOCBOOK2X_TEXI = docbook2x-texi +DOCBOOK2X_TEXI = docbook2texi DBLATEX = dblatex - ifndef PERL_PATH - PERL_PATH = /usr/bin/perl -@@ -205,7 +205,7 @@ + ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex + DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty +@@ -240,7 +240,7 @@ man5: $(DOC_MAN5) man7: $(DOC_MAN7) @@ -23,7 +23,7 @@ diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile pdf: user-manual.pdf -@@ -221,10 +221,9 @@ +@@ -256,10 +256,9 @@ install-info: info $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 9a484262b7b..6b93d061a3b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,22 +1,20 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index 8060ea35c..c81067a19 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. +@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'. specify a full pathname of a sendmail-like program instead; the program must support the `-i` option. Default value can be specified by the `sendemail.smtpServer` configuration - option; the built-in default is to search for `sendmail` in - `/usr/sbin`, `/usr/lib` and $PATH if such program is -+ option; the built-in default is to search in $PATH if such program is ++ option; the built-in default is to search in $PATH if such program is available, falling back to `localhost` otherwise. --smtp-server-port=<port>:: diff --git a/git-send-email.perl b/git-send-email.perl -index edcc6d346..8e357aeab 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { +@@ -944,8 +944,7 @@ if (defined $reply_to) { } if (!defined $smtp_server) { diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch index 29d537db25f..0a581a61d46 100644 --- a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch +++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch @@ -1,7 +1,7 @@ -diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile ---- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200 -+++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200 -@@ -2319,8 +2319,7 @@ +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -2609,8 +2609,7 @@ { test "$$bindir/" = "$$execdir/" || \ for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ $(RM) "$$execdir/$$p" && \ diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 7130e057d97..64e700273d1 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, python2, git }: let - name = "stgit-0.17.1"; + name = "stgit-${version}"; + version = "0.18"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://download.gna.org/stgit/${name}.tar.gz"; - sha256 = "1pka0ns9x0kabn036zsf0mwmwiynckhnva51kgxsch9fqah6acyl"; + url = "https://github.com/ctmarinas/stgit/archive/v${version}.tar.gz"; + sha256 = "19fk6vw3pgp2a98wpd4j3kyiyll5dy9bi4921wq1mrky0l53mj00"; }; buildInputs = [ python2 git ]; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 324bbf690d5..18fb672226f 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,4 +1,4 @@ -{lib, python2Packages, git, mercurial, coreutils}: +{lib, python2Packages, fetchFromGitHub, fetchurl, git, mercurial, coreutils}: with python2Packages; buildPythonApplication rec { @@ -12,11 +12,30 @@ buildPythonApplication rec { buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; - src = fetchPypi { - inherit pname version; - sha256 = "b997c99b8bbb865988202d2f005cdaabb2598b07dad891c302a147a5871a4a95"; + # PyPI source is currently missing tests. Thus, use GitHub instead. + # See: https://github.com/kynan/nbstripout/issues/73 + # Use PyPI again after it has been fixed in a release. + src = fetchFromGitHub { + owner = "kynan"; + repo = pname; + rev = version; + sha256 = "1jifqmszjzyaqzaw2ir83k5fdb04iyxdad4lclawpb42hbink9ws"; }; + patches = [ + ( + # Fix git diff tests by using --no-index. + # See: https://github.com/kynan/nbstripout/issues/74 + # + # Remove this patch once the pull request has been merged and a new + # release made. + fetchurl { + url = "https://github.com/jluttine/nbstripout/commit/03e28424fb788dd09a95e99814977b0d0846c0b4.patch"; + sha256 = "09myfb77a2wh8lqqs9fcpam97vmaw8b7zbq8n5gwn6d80zbl7dn0"; + } + ) + ]; + # for some reason, darwin uses /bin/sh echo native instead of echo binary, so # force using the echo binary postPatch = '' diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 5c6e65915da..eae72739ec2 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.1.3"; + version = "0.2.1"; src = fetchFromGitHub { owner = "sit-it"; repo = "sit"; rev = "v${version}"; - sha256 = "1ysy1lhb7fxy02a3c9xk2awa49svnfa8bqcz2aj4x56r2f8vhj0h"; + sha256 = "1gcw5fqaqpxl2xgry0w8750g2msrk884zj1slym6r3nj7s2m9j22"; }; - cargoSha256 = "1y8a8a9jn9f374sy5fs1snmpiqyckqc0aw7idwnpfr912c1zzrxw"; + cargoSha256 = "0hb82j97m8vw8m6gpb6s3bbi31xxv9nqh3aq7hkbmp1pqc02sg3q"; meta = with stdenv.lib; { description = "SCM-agnostic, file-based, offline-first, immutable issue tracker"; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index e9f172aad76..031202ad646 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.6.2"; + version = "3.6.8"; src = fetchurl { - sha256 = "0n7bhwkzknjpp54h54hxv1s8nsmmb7cwwf1aqpbcsnd7y6cv28nm"; + sha256 = "0agp97g79mlqcwfz2xk5rdxw4kx0hm92xikdspbpxlfji1mkh10p"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 8f456a2a49a..53372103457 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; + sha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index cca9f1c6ac5..86c91347f25 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "sxhkd-${version}"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "baskerville"; repo = "sxhkd"; rev = version; - sha256 = "0vnm0d2ckijsp8kc2v8jz4raamb487vg62v58v01a3rb9gzzgl06"; + sha256 = "0cw547x7vky55k3ksrmzmrra4zhslqcwq9xw0y4cmbvy4s1qf64v"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 8815bf68838..528055a5e80 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, bash, which, withFont ? "" }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "2.0.0"; name = "nerdfonts-${version}"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "nerd-fonts"; rev = version; - sha256 = "0h12d33wnhs5w8r3h1gqil98442vf7a13ms3nwldsam4naapsqxz"; + sha256 = "09i467hyskvzj2wn5sj6shvc9pb0a0rx5iknjkkkbg1ng3bla7nm"; }; dontPatchShebangs = true; buildInputs = [ which ]; diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix new file mode 100644 index 00000000000..b35f537c06b --- /dev/null +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchzip }: + +let + version = "2.100"; +in fetchzip rec { + name = "scheherazade-${version}"; + + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/README.txt -d $out/share/doc/${name} + unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation + ''; + + sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; + + meta = with stdenv.lib; { + homepage = https://software.sil.org/scheherazade/; + description = "A font designed in a similar style to traditional Naskh typefaces"; + longDescription = '' + Scheherazade, named after the heroine of the classic Arabian Nights tale, + is designed in a similar style to traditional typefaces such as Monotype + Naskh, extended to cover the Unicode Arabic repertoire through Unicode + 8.0. + + Scheherazade provides a “simplified” rendering of Arabic script, using + basic connecting glyphs but not including a wide variety of additional + ligatures or contextual alternates (only the required lam-alef + ligatures). This simplified style is often preferred for clarity, + especially in non-Arabic languages, but may not be considered appropriate + in situations where a more elaborate style of calligraphy is preferred. + + This package contains the regular and bold styles for the Scheherazade + font family, along with documentation. + ''; + downloadPage = "https://software.sil.org/scheherazade/download/"; + license = licenses.ofl; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index bbcc55f9bc5..93676b79089 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180311"; + name = "osinfo-db-20180325"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0pzm9vsr2f5943nlp2ljm19czcys5pvq6hjxh0ja2vx74pwhylb6"; + sha256 = "0lma4szxwg5vzb23p3hplllz9yi77x57dzijsz6n4qa399wzv8rs"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index c68b8b7d9bd..9d82d439c82 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mate-themes-${version}"; - version = "3.22.15"; + version = "3.22.16"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0cmlbj6vlkavdirc5xnsgwmy0m11bj9yrbv1dkq46n1s23rvv6wg"; + sha256 = "1k8qp2arjv4vj8kyjhjgyj5h46jy0darlfh48l5h25623z1firdj"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 9472384020b..de3126371bf 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20180204"; + version = "20180319"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "1nh4yznabwpp9k6flk9562w87d6sxk1fwwpk4d3knwy25iyn3mwq"; + sha256 = "181cskxamq9vkrmb2c78v6hpknrzzp49vkzp53r9pisf5j0p7220"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 604474e01fe..5ffb7b92b26 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,13 +7,13 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b1036.1"; + version = "152b1136.20"; name = pname + "-" + version; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; - sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; + sha256 = "0sqr8f3z062kwcxh3dxnan45ldas438blbc69z0pypbhc8c2sk2b"; } else throw "unsupported system: ${stdenv.system}"; diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index 390d37dd245..de5b8505527 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "polyml-${version}"; - version = "5.7"; + version = "5.7.1"; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure.ac --replace stdc++ c++ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "polyml"; repo = "polyml"; rev = "v${version}"; - sha256 = "10nsljmcl0zjbcc7ifc991ypwfwq5gh4rcp5rg4nnb706c6bs16y"; + sha256 = "0j0wv3ijfrjkfngy7dswm4k1dchk3jak9chl5735dl8yrl8mq755"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 2d8a051a811..d94179e16fe 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -4,13 +4,13 @@ with lib; mkDerivation rec { pname = "psc-package"; - version = "0.3.2-pre"; + version = "0.3.2"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "0vriyvq0mad3px4lhbqg6xrym2z6wnhr81101mx8cg1lgql1wgwk"; + sha256 = "1zpzcyh82xl0grvgcj8b7yzh053i9z94kbym5qrv413pcx7w50cm"; }; isLibrary = false; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 9b488bab5b3..44d96bc4ad1 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,16 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.23.0"; + version = "1.24.1"; - # fetch hashes by running `print-hashes.sh 1.23.0` + # fetch hashes by running `print-hashes.sh 1.24.1` hashes = { - i686-unknown-linux-gnu = "dc5bd0ef47e1036c8ca64676d8967102cb86ce4bf50b90a9845951c3e940423f"; - x86_64-unknown-linux-gnu = "9a34b23a82d7f3c91637e10ceefb424539dcfa327c2dcd292ff10c047b1fdc7e"; - armv7-unknown-linux-gnueabihf = "587027899267f1961520438c2c7f6775fe224160d43ddf07332b9b943a26b08e"; - aarch64-unknown-linux-gnu = "38379fbd976d2286cb73f21466db40a636a583b9f8a80af5eea73617c7912bc7"; - i686-apple-darwin = "4709eb1ad2fb871fdaee4b3449569cef366b0d170453cf17484a12286564f2ad"; - x86_64-apple-darwin = "9274e977322bb4b153f092255ac9bd85041142c73eaabf900cb2ef3d3abb2eba"; + i686-unknown-linux-gnu = "a483576bb2ab237aa1ef62b66c0814f934afd8129d7c9748cb9a75da4a678c98"; + x86_64-unknown-linux-gnu = "4567e7f6e5e0be96e9a5a7f5149b5452828ab6a386099caca7931544f45d5327"; + armv7-unknown-linux-gnueabihf = "1169ab005b771c4befcdab536347a90242cae544b6b76eccd0f76796b61a534c"; + aarch64-unknown-linux-gnu = "64bb25a9689b18ddadf025b90d9bdb150b809ebfb74432dc69cc2e46120adbb2"; + i686-apple-darwin = "c96f7579e2406220895da80a989daaa194751c141e112ebe95761f2ed4ecb662"; + x86_64-apple-darwin = "9d4aacdb5849977ea619d399903c9378163bd9c76ea11dac5ef6eca27849f501"; }; platform = diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index fd19a38ead2..3f189249cca 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,11 +7,11 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.24.1"; - cargoVersion = "0.24.0"; + version = "1.25.0"; + cargoVersion = "0.26.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "1vv10x2h9kq7fxh2v01damdq8pvlp5acyh1kzcda9sfjx12kv99y"; + sha256 = "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf"; }; in rec { rustc = callPackage ./rustc.nix { diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 23ae8ba06bb..fb1798ab819 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -4,11 +4,11 @@ , swingSupport ? true }: let - version = "8.21.0.1"; - openjdk = "8.0.131"; + version = "8.28.0.1"; + openjdk = "8.0.163"; - sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p"; - sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7"; + sha256_linux = "1z8s3a948nvv92wybnhkyr27ipibcy45k0zv5h5gp37ynd91df45"; + sha256_darwin = "0i0prjijsgg0yyycplpp9rlfl428126rqz7bb31pchrhi6jhk699"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 7aac606fdfb..b35f6032d5a 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "clojure-${version}"; - version = "1.9.0.329"; + version = "1.9.0.358"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1g1mi75285z977vrqbihmmmrmdcnznxbw3r6wkzh571sc1yyrlrj"; + sha256 = "0fi5kni6rdqjy6qgklf4xf7p1pgbsrdwd17iy6lrlg2vb8n8nksp"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index edbb26a3bdd..7cb9b4dea7f 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -338,18 +338,18 @@ let in { php56 = generic { - version = "5.6.34"; - sha256 = "1kgjgkabhrm8ksmh6j3m59vm85n401mcn7inh03hnjzfijflk7z1"; + version = "5.6.35"; + sha256 = "14ivsxdny0s7qm9pf773pafs8xzlzzpmaz039lwymn11rblsfy7f"; }; php70 = generic { - version = "7.0.28"; - sha256 = "0zrw0saqlfv60f3nmff7288wqfhdsfiqns4ys3ii0drzc6s92m5f"; + version = "7.0.29"; + sha256 = "1g1z1nhnmq0idsb9rfb46cdddfimaacw3yal291i2ypzqpal54cq"; }; php71 = generic { - version = "7.1.15"; - sha256 = "1gfw3ab9pvv034l9xk7ry23xsdz9vcwksrvmzkjmsj79713sa5z1"; + version = "7.1.16"; + sha256 = "1rg7n12rd2v1p2yar615kqcdxpvphw3p89lpgajjgwy0qzwjm3il"; }; php72 = generic { diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index da271db2ff0..392b4bf3605 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -7,7 +7,7 @@ with pythonPackages; stdenv.mkDerivation rec { name = "renpy-${version}"; - version = "6.99.14"; + version = "6.99.14.2"; meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2"; - sha256 = "00r1l9rd9wj8zfh279n7sak894xxhxqp3rcwg41g0md8yfiysc4h"; + sha256 = "1cjaly5igks18lmmssph4d6b5q1b8qfav2s7x2agx1gybxyghv9n"; }; patches = [ diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 77e0cb7735d..1e2017ef0e7 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -12,11 +12,11 @@ assert runTests -> google-gflags != null; stdenv.mkDerivation rec { name = "ceres-solver-${version}"; - version = "1.12.0"; + version = "1.14.0"; src = fetchurl { url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; - sha256 = "15f8mwhcy9f5qggcc9dqwl5y687ykvmlidr686aqdq0ia7azwnvl"; + sha256 = "13lfxy8x58w8vprr0nkbzziaijlh0vvqshgahvcgw0mrqdgh0i27"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 158ae2539d3..4e7488f7eb3 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "chromaprint-${version}"; - version = "1.4.3"; + version = "1.3.2"; src = fetchurl { - url = "https://github.com/acoustid/chromaprint/releases/download/v${version}/${name}.tar.gz"; - sha256 = "10kz8lncal4s2rp2rqpgc6xyjp0jzcrihgkx7chf127vfs5n067a"; + url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; + sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index 6c73bd01603..81df7e86319 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.27.1"; + version = "0.28.3"; name = "cmark-${version}"; src = fetchFromGitHub { owner = "jgm"; repo = "cmark"; rev = version; - sha256 = "06miwq3rl2bighkn6iq7bdwzmvcqa53qwpa0pqjqa8yn44j8ijj8"; + sha256 = "1lal6n6q7l84njgdcq1xbfxan56qlvr8xaw9m2jbd0jk4y2wkczg"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 4aa1f279886..89a34a98890 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -4,12 +4,12 @@ { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { name = "easyloggingpp-${version}"; - version = "9.96.1"; + version = "9.96.2"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "1x5wwm62l1231sgxfwx8mj7fc8452j3f509jyxa9wd2krkpvqxmy"; + sha256 = "0qhf93i2ks9v6rk6n4v3fn7xrkqdwgs6rm6wd0gx9sm2wlq4ancd"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 94cc7688cc8..2977293fefa 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -1,14 +1,48 @@ -{stdenv, fetchurl, gmp, mpir, mpfr, openblas, ntl}: +{ stdenv +, fetchurl +, fetchpatch +, gmp +, mpir +, mpfr +, ntl +, openblas ? null +, withBlas ? true +}: + +assert withBlas -> openblas != null; + stdenv.mkDerivation rec { name = "flint-${version}"; - version = "2.5.2"; - # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + version = "2.5.2"; # remove libflint.so.MAJOR patch when updating src = fetchurl { url = "http://www.flintlib.org/flint-${version}.tar.gz"; sha256 = "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb"; }; - buildInputs = [gmp mpir mpfr openblas ntl]; - configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-blas=${openblas} --with-ntl=${ntl}"; + buildInputs = [ + gmp + mpir + mpfr + ntl + ] ++ stdenv.lib.optionals withBlas [ + openblas + ]; + configureFlags = [ + "--with-gmp=${gmp}" + "--with-mpir=${mpir}" + "--with-mpfr=${mpfr}" + "--with-ntl=${ntl}" + ] ++ stdenv.lib.optionals withBlas [ + "--with-blas=${openblas}" + ]; + patches = [ + (fetchpatch { + # Always produce libflint.so.MAJOR; will be included in the next flint version + # See https://github.com/wbhart/flint2/pull/347 + url = "https://github.com/wbhart/flint2/commit/49fbcd8f736f847d3f9667f9f7d5567ef4550ecb.patch"; + sha256 = "09w09bpq85kjf752bd3y3i5lvy59b8xjiy7qmrcxzibx2a21pj73"; + }) + ]; + doCheck = true; meta = { inherit version; description = ''Fast Library for Number Theory''; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index d764121e8d6..b097e5cbb64 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -6,11 +6,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.70"; + version = "1.00.80"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "1ydh0c89nb6wh6wakbkqad7mdwpymygvgbcrk8c2mp7abgv1jqzp"; + sha256 = "17s15avxcyhfk0zsj8rggizhpd2j2sa41w5xlnshzd2r3piqyl6k"; }; configureFlags = [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 54174e7cfe4..562d79b0092 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.2.3"; + version = "2.2.4"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "a328d63d476b3653f5a25b5f7971e87a15cdf8860ab0729d4b1157ba988b8d0b"; + sha256 = "0y1237m2wilxgrsd0cdjpbf1zj9z954sd8518g53hlmkmk8v27j4"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 608c6e7eacd..673eb1e52c4 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -32,6 +32,8 @@ in stdenv.mkDerivation rec { patches = [ ./3.x-nix_share_path.patch ]; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + enableParallelBuilding = true; doCheck = stdenv.isLinux; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 36343faa0f9..8c204ba4006 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "18.03"; + version = "18.03.1"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1d4zqik9sm8fsr26w5jsp0rgczlh5vh3gwknxy4g3gd6pqri4igv"; + sha256 = "183gcb6h81blgvssfl5lxsv8h5izkgg6b86z0jy9g699adgkchq2"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index 06a98bcdceb..b23701837fa 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmowgli-0.9.50"; + name = "libmowgli-${version}"; + version = "2.1.3"; src = fetchurl { - url = "http://distfiles.atheme.org/${name}.tar.bz2"; - sha256 = "0wbnpd2rzk5jg6pghgxyx7brjrdmsyg4p0mm9blwmrdrj5ybxx9z"; + url = "https://github.com/atheme/libmowgli-2/archive/v${version}.tar.gz"; + sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp"; }; meta = { diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index df160f3405a..ec4fa6b7427 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "0qy5hsglrdwzlb1x83v40pnm52hrjbdrc5zardp89i3vwcdzkrq8"; + sha256 = "1qjpicbjsj9gf8s00ma0d6kw6qfnc29fhrqdkvq8427wfffj654r"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 396bd09921f..2d5fa20c7cf 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.33"; + rev = "0.6.34"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "1vf8mwqzjjqkd5ir71h4lifybibs5nhqgfgq5zzlazby02zx2yiz"; + sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7"; }; cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true"; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index 7ed2d2fd630..d225831f702 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng, libX11, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libjpeg, libpng, libX11, zlib }: stdenv.mkDerivation rec { name = "libxcomp-${version}"; - version = "3.5.0.33"; + version = "3.5.99.16"; src = fetchurl { - sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74"; + sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libjpeg libpng libX11 zlib ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; preAutoreconf = '' cd nxcomp/ + sed -i 's|/src/.libs/libXcomp.a|/src/.libs/libXcomp.la|' test/Makefile.am ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 9fcc9c70a9b..57321522736 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.11"; + name = "matio-1.5.12"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "02ygr7bslzvn6mhxvapz57bh4d448xjf3ds82g1cvhn9al6fvk0c"; + sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index f8cbc867b2b..1ab6661db5b 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "1b13nzf9xh1iv0k8z7sdfs9ya2ykf0gzjiixpb1qn3bydck6ppdm"; + sha256 = "1xqpc1qlvghprwih99immsjh3ba08lg754cf5icnmpkwh9nlh6p2"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/development/libraries/ptex/default.nix index d40ae856495..f300a571b0c 100644 --- a/pkgs/development/libraries/ptex/default.nix +++ b/pkgs/development/libraries/ptex/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ptex-${version}"; - version = "2.1.28"; + version = "2.1.33"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "1h6gb3mpis4m6ph7h9q764w50f9jrar3jz2ja76rn5czy6wn318x"; + sha256 = "15ijjq3w7hwgm4mqah0x4jzjy3v2nnmmv28lbqzmxzcxjgh4sjkn"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index d96241a0808..8c985ce6fa9 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -105,6 +105,7 @@ , "vue-cli" , "webdrvr" , "webpack" +, "webtorrent-cli" , "web-ext" , "wring" , "yarn" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 5071b4edeab..f34a9007cfb 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -94,22 +94,22 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "@types/node-8.10.1" = { + "@types/node-8.10.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.1"; + version = "8.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.1.tgz"; - sha512 = "0idg6lra5659kj2sbfhfp209bsxbg7s2gxkg6pa566grjw498iida3f0w1dd2cbzh1zw7q6zdww3q19ikq789mbqkqpx990wx84iyjz"; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.2.tgz"; + sha512 = "3dgs153wi114p04cncpgpfljrl3d6c201r2vi4bsz5kqp26m7n2ngfzy982qlhr67r0wapy62bnv7n5nrs52niv8kmjpc6vm7ajz983"; }; }; - "@types/node-9.6.1" = { + "@types/node-9.6.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.6.1"; + version = "9.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.1.tgz"; - sha512 = "2sxvv78fkmdrpqq04pkyq69fkny1xj1abcp8ajkmmmfn1cs3jdiir545s9h1gsnxzls1iiigbzj8dlkimlqdfpbgdlm8h6pj2mlf2f7"; + url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; + sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; }; }; "@types/request-2.47.0" = { @@ -544,6 +544,15 @@ let sha1 = "48566d5fa55a921d80187ad946f7e8f7555902a1"; }; }; + "airplay-js-0.3.0" = { + name = "airplay-js"; + packageName = "airplay-js"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/airplay-js/-/airplay-js-0.3.0.tgz"; + sha1 = "16bac2ef91b31249382924bfdeeabaddc9db7398"; + }; + }; "airplay-protocol-2.0.2" = { name = "airplay-protocol"; packageName = "airplay-protocol"; @@ -1615,13 +1624,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.218.1" = { + "aws-sdk-2.221.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.218.1"; + version = "2.221.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.218.1.tgz"; - sha1 = "b4cf742cc0853bd7c868b388cbf0b4a1ef1abc12"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.221.1.tgz"; + sha1 = "437b6a4a0c9ce74fdd10c16d97b5247ff9c2cd35"; }; }; "aws-sign-0.2.0" = { @@ -2578,6 +2587,15 @@ let sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; }; }; + "binary-search-1.3.3" = { + name = "binary-search"; + packageName = "binary-search"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-search/-/binary-search-1.3.3.tgz"; + sha512 = "38zf62278y5pi773rqfsjrn9iknwhx25v4jhjc2gv8yi8hs2k8bjqg52yc07az2ipl53iid2d39r827z4jb6854x0z95m7hgfkwmy2g"; + }; + }; "binaryheap-0.0.3" = { name = "binaryheap"; packageName = "binaryheap"; @@ -2623,6 +2641,15 @@ let sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457"; }; }; + "bitfield-2.0.0" = { + name = "bitfield"; + packageName = "bitfield"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield/-/bitfield-2.0.0.tgz"; + sha512 = "27y12y6a0jj5yrb5m8k7fp5czr6cj2x15rmd3d10q4s22i2fw23v5c731ciy9sndjic7hcgblkjc3ilayh7lpv0m4zp8f53hw6kh4z3"; + }; + }; "bitfield-rle-2.1.0" = { name = "bitfield-rle"; packageName = "bitfield-rle"; @@ -2659,6 +2686,33 @@ let sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; + "bittorrent-dht-8.2.0" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.2.0.tgz"; + sha512 = "291qfv5f3w3d7zcq9xyjplpnaaahy7mzj664w5g9w1zgiwv3dikl38r8wx0rdb3afsv5ih0ghrzc2r1k19c52axsagnpsc10hihlkii"; + }; + }; + "bittorrent-peerid-1.2.0" = { + name = "bittorrent-peerid"; + packageName = "bittorrent-peerid"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-peerid/-/bittorrent-peerid-1.2.0.tgz"; + sha1 = "9f675612f0e6afc6ef3450dfba51ff7238abf371"; + }; + }; + "bittorrent-protocol-2.4.0" = { + name = "bittorrent-protocol"; + packageName = "bittorrent-protocol"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.0.tgz"; + sha512 = "3xggi5fxwkzkkgy3z7v5b9w7fk2bjan077b4s9rvqfp7cmnw6l96p36qlkqgp38rd57lzdlkay42dkqhcb8r7gzszp5598nviy0p4mb"; + }; + }; "bittorrent-tracker-7.7.0" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; @@ -2668,6 +2722,15 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; + "bittorrent-tracker-9.7.0" = { + name = "bittorrent-tracker"; + packageName = "bittorrent-tracker"; + version = "9.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.7.0.tgz"; + sha512 = "06jp495xv047v5n3wclbga8laqmgjis5wjwhc7ggq2qx4xszp395mg2v0147p7v0ybpw5bpvdfhr1zp12barvn2lgj9f0c9iji4jr5r"; + }; + }; "bl-0.8.2" = { name = "bl"; packageName = "bl"; @@ -2758,6 +2821,15 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; + "block-stream2-1.1.0" = { + name = "block-stream2"; + packageName = "block-stream2"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/block-stream2/-/block-stream2-1.1.0.tgz"; + sha1 = "c738e3a91ba977ebb5e1fef431e13ca11d8639e2"; + }; + }; "bluebird-2.9.34" = { name = "bluebird"; packageName = "bluebird"; @@ -3136,13 +3208,13 @@ let sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; }; }; - "browserify-aes-1.1.1" = { + "browserify-aes-1.2.0" = { name = "browserify-aes"; packageName = "browserify-aes"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz"; - sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah"; + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v"; }; }; "browserify-cache-api-3.0.1" = { @@ -3190,6 +3262,15 @@ let sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; }; }; + "browserify-package-json-1.0.1" = { + name = "browserify-package-json"; + packageName = "browserify-package-json"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-package-json/-/browserify-package-json-1.0.1.tgz"; + sha1 = "98dde8aa5c561fd6d3fe49bbaa102b74b396fdea"; + }; + }; "browserify-rsa-4.0.1" = { name = "browserify-rsa"; packageName = "browserify-rsa"; @@ -3424,6 +3505,15 @@ let sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288"; }; }; + "bufferutil-3.0.4" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.4.tgz"; + sha512 = "1q344kiig9b8ssskrp7r77kf3xk516bfcjlilgz0a8q5zflz35rnp8im2kx1y9smcp23hw2q1aqsi39i6cb7svzf40a7dk6h4ds54pf"; + }; + }; "bufferview-1.0.1" = { name = "bufferview"; packageName = "bufferview"; @@ -4180,6 +4270,15 @@ let sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d"; }; }; + "chromecasts-1.9.1" = { + name = "chromecasts"; + packageName = "chromecasts"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chromecasts/-/chromecasts-1.9.1.tgz"; + sha512 = "38g6qhcppxzh5fsrnvvfjnvzjiwdxsz0nsshi55prij4ifj6har7dqs6fzflqimdmkd24vgclkrgb8i96hrpm4hnfy91bp0wzpfzicy"; + }; + }; "chromium-pickle-js-0.2.0" = { name = "chromium-pickle-js"; packageName = "chromium-pickle-js"; @@ -4189,6 +4288,15 @@ let sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; }; }; + "chunk-store-stream-2.1.0" = { + name = "chunk-store-stream"; + packageName = "chunk-store-stream"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chunk-store-stream/-/chunk-store-stream-2.1.0.tgz"; + sha512 = "1c9rhwy0ac18jk67fwhgdavc4ax76i7q8qmidj2b3qqdvq9i6ir8w53ylnw7invy7msxzs0538smkvsp47hf30jh0q4xp6n6a95ymcr"; + }; + }; "ci-info-1.1.3" = { name = "ci-info"; packageName = "ci-info"; @@ -4612,6 +4720,15 @@ let sha512 = "2kg2ysl15s9cxgj62p43gzagfqf3kk2zqj4i6g3ckxs2b0fvx71blw7qy7v7gmy2pi9z9jsrc81v43kz7khagrvhlpwyv55vzibxbh6"; }; }; + "closest-to-2.0.0" = { + name = "closest-to"; + packageName = "closest-to"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/closest-to/-/closest-to-2.0.0.tgz"; + sha1 = "bb2a860edb7769b62d04821748ae50da24dbefaa"; + }; + }; "cmd-shim-2.0.2" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -6071,6 +6188,15 @@ let sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; }; }; + "create-torrent-3.30.0" = { + name = "create-torrent"; + packageName = "create-torrent"; + version = "3.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.30.0.tgz"; + sha512 = "15hphpabh12fwvjbaihwjr1sqzj6c4lzcms4jbyy0s2jk1rirrg3cb9743g2a8jw2ihz15yfw0dxqwnc6n5nixiazdg7hwaj8d5nfmi"; + }; + }; "cron-1.3.0" = { name = "cron"; packageName = "cron"; @@ -6692,15 +6818,6 @@ let sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; }; }; - "deasync-0.1.12" = { - name = "deasync"; - packageName = "deasync"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.12.tgz"; - sha512 = "1vnaqczk6nr30xzzf6qxsaa2fj00z80rr6xrb7mxwn0d41zdwrgffk5vizwf6b17bps2zdr4f87s2mdmnixhsfh41vrh185ixi9r5l2"; - }; - }; "debounce-1.1.0" = { name = "debounce"; packageName = "debounce"; @@ -7412,6 +7529,15 @@ let sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; }; }; + "dlnacasts-0.1.0" = { + name = "dlnacasts"; + packageName = "dlnacasts"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dlnacasts/-/dlnacasts-0.1.0.tgz"; + sha1 = "f805211dcac74f6bb3a4d5d5541ad783b1b67d22"; + }; + }; "dns-discovery-5.6.1" = { name = "dns-discovery"; packageName = "dns-discovery"; @@ -7457,13 +7583,13 @@ let sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; - "dns-packet-4.1.1" = { + "dns-packet-4.2.0" = { name = "dns-packet"; packageName = "dns-packet"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.1.1.tgz"; - sha512 = "09adhjnzfiilwrksrckjrxcfi54gy5xgcsvkq24r98j0xh1asvl5iywj4p37s4l7drgysmdlkv95iki5c554gviaj4738fnlhgn42v3"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; + sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf"; }; }; "dns-socket-1.6.3" = { @@ -7853,6 +7979,15 @@ let sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; }; }; + "ecstatic-3.2.0" = { + name = "ecstatic"; + packageName = "ecstatic"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.0.tgz"; + sha512 = "2sjxkrzsvswqsxb6jrq3p75g53szmx1hwwd5yhpkkx4857avz4yr0dvfqkshhxnx88an2gw00j6crbkc39q48zlpmplyzcwzp3sb20s"; + }; + }; "editions-1.3.4" = { name = "editions"; packageName = "editions"; @@ -8889,6 +9024,15 @@ let sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73"; }; }; + "executable-4.1.1" = { + name = "executable"; + packageName = "executable"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"; + sha512 = "0p56mwdi80mzj4q8yb6s1abff3dwpl1s887jarp0fx3x3gz92qahnn28yqn0r351wflqsw4cqa4383965pm0pbgxwhhgf7p23vkn87j"; + }; + }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -9546,6 +9690,15 @@ let sha512 = "1vldkz70kikg8b3ac8l686hm1aplkwqmllm9lg32cvy50hqzcqhari8pl2c41zsvl3bpzzfv7v8db0j91c0qd9vx8wz4w2nhsv9d4w3"; }; }; + "filestream-4.1.3" = { + name = "filestream"; + packageName = "filestream"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/filestream/-/filestream-4.1.3.tgz"; + sha1 = "948fcaade8221f715f5ecaddc54862faaacc9325"; + }; + }; "fill-range-2.2.3" = { name = "fill-range"; packageName = "fill-range"; @@ -9843,6 +9996,15 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; + "flatten-1.0.2" = { + name = "flatten"; + packageName = "flatten"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz"; + sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; + }; + }; "fluent-ffmpeg-2.1.2" = { name = "fluent-ffmpeg"; packageName = "fluent-ffmpeg"; @@ -10185,13 +10347,13 @@ let sha1 = "2a7db7ef59a5ec548cce8564066508224c9b0457"; }; }; - "fs-chunk-store-1.6.5" = { + "fs-chunk-store-1.7.0" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; - version = "1.6.5"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; - sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.7.0.tgz"; + sha512 = "13w7dc43h1mv5a43zps5rwsgvlgpd1pj8rwlhmp1fsbyddysv2zy6d8xyaf9hllnqx3ykw62yv1j5z1y79kvyi6hjgymn9cj2cwj61a"; }; }; "fs-ext-0.6.0" = { @@ -12436,13 +12598,13 @@ let sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47"; }; }; - "insert-module-globals-7.0.5" = { + "insert-module-globals-7.0.6" = { name = "insert-module-globals"; packageName = "insert-module-globals"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.5.tgz"; - sha512 = "3fk0jxs2s9i64hqs1y6ncl81nddpb2kr58myi8805mg9j3xgmn5svxmk8xwvm2358snahh9r0k1zmpv6512sq383zp4m6sc5an6s162"; + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.6.tgz"; + sha512 = "3vjhls34i9vc0mm5cxlw6zbp1an494z9kbrrmj4hbv32fw0hx22nfpaj7j8i7lwkqa1sdqidxcfkga1630ya454h8h2ppbbl9s24ys7"; }; }; "insight-0.8.4" = { @@ -12679,6 +12841,15 @@ let sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; }; }; + "is-ascii-1.0.0" = { + name = "is-ascii"; + packageName = "is-ascii"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ascii/-/is-ascii-1.0.0.tgz"; + sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; + }; + }; "is-binary-path-1.0.1" = { name = "is-binary-path"; packageName = "is-binary-path"; @@ -12850,6 +13021,15 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; + "is-file-1.0.0" = { + name = "is-file"; + packageName = "is-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-file/-/is-file-1.0.0.tgz"; + sha1 = "28a44cfbd9d3db193045f22b65fce8edf9620596"; + }; + }; "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; @@ -14047,6 +14227,15 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; + "junk-2.1.0" = { + name = "junk"; + packageName = "junk"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/junk/-/junk-2.1.0.tgz"; + sha1 = "f431b4b7f072dc500a5f10ce7f4ec71930e70134"; + }; + }; "just-detect-adblock-1.0.0" = { name = "just-detect-adblock"; packageName = "just-detect-adblock"; @@ -14669,6 +14858,15 @@ let sha512 = "0r82qh90jnyg6hlqn2yni36q942y4qn6rc0rydmbsy7x1lr00a0pddw2lg8xixcjh6wnrsfb5q76m51fac7vanrz0cawsw6azy78m4g"; }; }; + "load-ip-set-1.3.1" = { + name = "load-ip-set"; + packageName = "load-ip-set"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-1.3.1.tgz"; + sha1 = "cfd050c6916e7ba0ca85d0b566e7854713eb495e"; + }; + }; "load-json-file-1.1.0" = { name = "load-json-file"; packageName = "load-json-file"; @@ -15893,6 +16091,15 @@ let sha512 = "3av1cblh8aix05jyfib9mhm57qx8fnkxgxs2g493mdm4815pisrn8rzgf9yxjiww6psa619aa8l62xigrbwfcag741bgls227f82blc"; }; }; + "mdns-js-0.5.0" = { + name = "mdns-js"; + packageName = "mdns-js"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz"; + sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87"; + }; + }; "mdns-js-1.0.1" = { name = "mdns-js"; packageName = "mdns-js"; @@ -15902,6 +16109,15 @@ let sha512 = "0z9rixsyb1m6w2qjqimn0ga0qdcpnxnm0ci7zd0svzd9kivqds0zczf7r32064r8c32m94cs3lrcvwvg21d7x2s38f28r5874rjs0bp"; }; }; + "mdns-js-packet-0.2.0" = { + name = "mdns-js-packet"; + packageName = "mdns-js-packet"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz"; + sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616"; + }; + }; "mdurl-1.0.1" = { name = "mdurl"; packageName = "mdurl"; @@ -15920,6 +16136,15 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; + "mediasource-2.1.3" = { + name = "mediasource"; + packageName = "mediasource"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mediasource/-/mediasource-2.1.3.tgz"; + sha1 = "27a9c1aac51bfb6eba96af2d13a84d0b2a8eac68"; + }; + }; "mediawiki-title-0.6.5" = { name = "mediawiki-title"; packageName = "mediawiki-title"; @@ -15956,6 +16181,15 @@ let sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608"; }; }; + "memory-chunk-store-1.3.0" = { + name = "memory-chunk-store"; + packageName = "memory-chunk-store"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-chunk-store/-/memory-chunk-store-1.3.0.tgz"; + sha512 = "0sgs9s743559yps61abf9vnw58jgcig5rj15y47q4dsv7bjfj4i138ycgwd384nsqnbbri9p8xm4jq986bkirhi5qmid1wafaj0xfz8"; + }; + }; "memory-fs-0.3.0" = { name = "memory-fs"; packageName = "memory-fs"; @@ -16235,6 +16469,15 @@ let sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; + "mime-2.2.2" = { + name = "mime"; + packageName = "mime"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.2.2.tgz"; + sha512 = "2ahs0dpq95sf8rrpc024h6jqrvknjnj5v046k755kz6br3pr371y9j9df0srgfszdqviaw4fc6vgngbyik866272hmckw1qif1w7cq3"; + }; + }; "mime-db-1.12.0" = { name = "mime-db"; packageName = "mime-db"; @@ -16622,15 +16865,6 @@ let sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; }; }; - "moment-2.21.0" = { - name = "moment"; - packageName = "moment"; - version = "2.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz"; - sha512 = "02hkdlhchyx4dqrh4q7p3c0xggpygcf0pimjvm66sib8z87wkbndici8vp2r39b472zpmybrf85y2c92lbw3hng9j2kfifl33l7f9jc"; - }; - }; "moment-2.22.0" = { name = "moment"; packageName = "moment"; @@ -16721,6 +16955,24 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; + "mp4-box-encoding-1.1.3" = { + name = "mp4-box-encoding"; + packageName = "mp4-box-encoding"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.3.tgz"; + sha512 = "0ma1r4wxwlnxb4xjmq6gga6m4ilsarrcvgj4yrjhngbh5l6gng87i4nakbkm4iqxbnchw75ybivhlfhx8bn4qm525qxirs7gh77i8c9"; + }; + }; + "mp4-stream-2.0.3" = { + name = "mp4-stream"; + packageName = "mp4-stream"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mp4-stream/-/mp4-stream-2.0.3.tgz"; + sha512 = "3d7vh2ks36h25fkh19jfzvw8flk9f0lz8brnpj57wlwfcwx8hsw5fdr2dxr2brpxvcdv4mhfyd7g82y1n1229scchlaj6cv9wiy1p74"; + }; + }; "mpath-0.1.1" = { name = "mpath"; packageName = "mpath"; @@ -16838,13 +17090,13 @@ let sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-2.3.2" = { + "ms-rest-2.3.3" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.2.tgz"; - sha512 = "04bv4p3b4k2qz7h4yqhk163fm69yhip62hph9xa6ncx5icw06jkhyjgsag12f83l2d3f95541qfdpynv388s0jjyqn57d52l6nvbhp3"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.3.tgz"; + sha512 = "2qrwz9q47d6988i8kf97zl0974msgia3qzcah3rl6gld0n99pzdnlbz2cnqbhcj7yql2jbfm682qalzfazphxl90liyl82mzvz7z3jb"; }; }; "ms-rest-azure-1.15.7" = { @@ -17283,13 +17535,13 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "natives-1.1.2" = { + "natives-1.1.3" = { name = "natives"; packageName = "natives"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.2.tgz"; - sha512 = "246d44jpalvlcvk1ig1b2qc05fsgq8gy926xcl86bdnx663k8bh7pi4ny1pa7xr0bxydm33rhkvwzz3fjrrr7pkrjx0pmj44x5l1d75"; + url = "https://registry.npmjs.org/natives/-/natives-1.1.3.tgz"; + sha512 = "3pbpfnk3183j5mwxprr19bzahf7lxarcka2bad0mhcywnjlj63i55phbxyk0pn4l4v7nj3wv4gjrzdk7xfxxfrjl5rvqf0qbrhr5485"; }; }; "natural-compare-1.4.0" = { @@ -17518,6 +17770,15 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; + "next-event-1.0.0" = { + name = "next-event"; + packageName = "next-event"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-event/-/next-event-1.0.0.tgz"; + sha1 = "e7778acde2e55802e0ad1879c39cf6f75eda61d8"; + }; + }; "next-line-1.1.0" = { name = "next-line"; packageName = "next-line"; @@ -17581,13 +17842,13 @@ let sha512 = "01a44qwlfiqbz8hlpp7yywzw9xj04h937jnzmb94dany3bsh8z3shcn1579m0702h8ah3nayb17z63ahldj9rb6k75waf7qkamawgzh"; }; }; - "node-cache-4.1.1" = { + "node-cache-4.2.0" = { name = "node-cache"; packageName = "node-cache"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz"; - sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; + url = "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz"; + sha512 = "0xw45nif5bibga7jbx0n2fv7h0jz3l4lp6ra8gfri1f7kzq0kc31q9i5zpvhi6j63785gynl2m02h8l30x04pn8raw4sjzvyzmnxd51"; }; }; "node-elm-compiler-4.3.3" = { @@ -17725,6 +17986,15 @@ let sha512 = "0wfkdalwxzyyivqxiwiba5j8pyis83lhipiwck2xrbks3w0x1ldf12fgnzx61kq64sdmzpczqwb7588ggh5drj64ymj88vwdbca0bd9"; }; }; + "node-ssdp-2.9.1" = { + name = "node-ssdp"; + packageName = "node-ssdp"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-ssdp/-/node-ssdp-2.9.1.tgz"; + sha1 = "2d6ba8e7eff9bf5b338564f91f7ac5d5cdddc55b"; + }; + }; "node-static-0.7.10" = { name = "node-static"; packageName = "node-static"; @@ -17815,6 +18085,15 @@ let sha1 = "7525a2875677ea534784a5e10ac78956139614df"; }; }; + "nodebmc-0.0.7" = { + name = "nodebmc"; + packageName = "nodebmc"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/nodebmc/-/nodebmc-0.0.7.tgz"; + sha1 = "fae179165265509302cefbebeabd29bd4035184d"; + }; + }; "nodemailer-0.3.35" = { name = "nodemailer"; packageName = "nodemailer"; @@ -18031,13 +18310,13 @@ let sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; - "npm-5.7.1" = { + "npm-6.0.0-next.0" = { name = "npm"; packageName = "npm"; - version = "5.7.1"; + version = "6.0.0-next.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.7.1.tgz"; - sha512 = "147xlh1d389j8yilssidlk7w8qgp1354y5p2bhv30a0m74vmfbl48859yfidij4ixbf0dhdmzkg6zz6viik2cskkrz4nw56zsz2nn5g"; + url = "https://registry.npmjs.org/npm/-/npm-6.0.0-next.0.tgz"; + sha512 = "06yn34ji94fcadvnj3mafxlv8hnin0mgrdpdjplk33nkjc8niq5kr1kfwikqxj36kyzwdcz8a27599sakryvgvb14mqjabc525ik35x"; }; }; "npm-bundled-1.0.3" = { @@ -19004,6 +19283,15 @@ let sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; }; }; + "package-json-versionify-1.0.4" = { + name = "package-json-versionify"; + packageName = "package-json-versionify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json-versionify/-/package-json-versionify-1.0.4.tgz"; + sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; + }; + }; "pad-0.0.5" = { name = "pad"; packageName = "pad"; @@ -19707,6 +19995,15 @@ let sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; }; }; + "piece-length-1.0.0" = { + name = "piece-length"; + packageName = "piece-length"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/piece-length/-/piece-length-1.0.0.tgz"; + sha1 = "4db7167157fd69fef14caf7262cd39f189b24508"; + }; + }; "pify-2.3.0" = { name = "pify"; packageName = "pify"; @@ -19851,6 +20148,15 @@ let sha512 = "12n868myk28as4ivyihfw9ai50y0vc1jrr77r55drlidyi7qpwlm23aj9n05qqlzhs544yah6p535b5hiayh6xykf81q68wg8f2z60s"; }; }; + "plist-with-patches-0.5.1" = { + name = "plist-with-patches"; + packageName = "plist-with-patches"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz"; + sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d"; + }; + }; "pluralize-1.2.1" = { name = "pluralize"; packageName = "pluralize"; @@ -19986,6 +20292,15 @@ let sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; + "prebuild-install-2.5.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.1.tgz"; + sha512 = "013s09xwdppxw3n9h0vz22br6q1dc5rkh8pk9nk3xl0pqsv495qj1y8k5srgmgm7692q1hlyj08nrfbr9nr232bsrkcvhbkm8pzsdfw"; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -20931,15 +21246,6 @@ let sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6"; }; }; - "random-access-file-1.8.1" = { - name = "random-access-file"; - packageName = "random-access-file"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; - sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; - }; - }; "random-access-file-2.0.1" = { name = "random-access-file"; packageName = "random-access-file"; @@ -21039,6 +21345,15 @@ let sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; + "range-slice-stream-1.2.0" = { + name = "range-slice-stream"; + packageName = "range-slice-stream"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/range-slice-stream/-/range-slice-stream-1.2.0.tgz"; + sha1 = "01ba954276052b783900e63d6118d8fcf3875d7f"; + }; + }; "raven-2.4.2" = { name = "raven"; packageName = "raven"; @@ -21291,13 +21606,13 @@ let sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; }; }; - "readable-stream-2.3.5" = { + "readable-stream-2.3.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; - sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm"; }; }; "readdirp-2.1.0" = { @@ -21345,6 +21660,15 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; + "record-cache-1.0.1" = { + name = "record-cache"; + packageName = "record-cache"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.1.tgz"; + sha512 = "3a25qmwmlljwlcc1zpn80lrq3hmwwaykiac95q2gcm1im4wchk9mdhbgak2lidqijaf6mil2rp5sbm0zfzvvh39nz1lmlz72sll39iy"; + }; + }; "recursive-readdir-2.2.2" = { name = "recursive-readdir"; packageName = "recursive-readdir"; @@ -21588,6 +21912,15 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; + "render-media-2.12.0" = { + name = "render-media"; + packageName = "render-media"; + version = "2.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/render-media/-/render-media-2.12.0.tgz"; + sha512 = "1y1njral1kn6s6g797ji5pl475zcmvcmrgdnv1vliq8q33vw3b4i4i5fsx9yj2ap7jdpb461507wpijixf56rc5q4r97542zvzxq0by"; + }; + }; "render-readme-1.3.1" = { name = "render-readme"; packageName = "render-readme"; @@ -22119,6 +22452,15 @@ let sha512 = "1jzs29b3g9xx5408i8gzyflx0wajfa1ai9sgm63pbvkaas0351j9y92kxq06x8dhg7w829skizs88cdlf156zfm1yk5brbbb0spb6vv"; }; }; + "run-parallel-limit-1.0.4" = { + name = "run-parallel-limit"; + packageName = "run-parallel-limit"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.4.tgz"; + sha512 = "2y7d7x3kwlwgyqvhlklxl08rkc63c2ww0jf8pcwlnw4nl2k3wcbkid5fwg130cbkwzslv8c4xrrxccng4yqib8dbcgivyq0h855k4yf"; + }; + }; "run-queue-1.0.3" = { name = "run-queue"; packageName = "run-queue"; @@ -22956,6 +23298,15 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; + "simple-peer-9.0.0" = { + name = "simple-peer"; + packageName = "simple-peer"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.0.0.tgz"; + sha512 = "1fwihnw60ayp1hyj2rp40cshqhi32rj1gjhr060awg35rk762z9a4d15zapvxi76bmdhgs3vs8lv7xmdqxbabg8d3z1xlkq5vnhq0d1"; + }; + }; "simple-plist-0.2.1" = { name = "simple-plist"; packageName = "simple-plist"; @@ -22992,6 +23343,15 @@ let sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; + "simple-websocket-7.0.2" = { + name = "simple-websocket"; + packageName = "simple-websocket"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-7.0.2.tgz"; + sha512 = "2x42bhq5w7k053k2jdhvhd2p7lmr407fkb7fwi0k7glaggf6hb452704yh1zvx83mrhdvyscmpyp971p2slmisiffmfvd6cl5md423h"; + }; + }; "simplediff-0.1.1" = { name = "simplediff"; packageName = "simplediff"; @@ -23244,13 +23604,13 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "snyk-1.70.3" = { + "snyk-1.71.0" = { name = "snyk"; packageName = "snyk"; - version = "1.70.3"; + version = "1.71.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.70.3.tgz"; - sha1 = "53c98949d27bf57905eeb7beed94d360a24fff55"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.71.0.tgz"; + sha1 = "842cfed35ffac591ac34824ce0f1467655c5f8f1"; }; }; "snyk-config-1.0.1" = { @@ -23262,13 +23622,13 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; - "snyk-go-plugin-1.4.5" = { + "snyk-go-plugin-1.4.6" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.5.tgz"; - sha512 = "0m7m3yjv33vq1p6gwn30vxmacrahvw08j432pva601fm2b48j9f5hq8v6zdrzna2yw6xqg1dnhd7gxskpivvl4rzs3fji23yfvxgqxs"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.6.tgz"; + sha512 = "3002f73liv15dpg1ls92j4m50374z69p9ic74zpqmr8mjlxcdv09gcxkdmg0bdkzlj3s02bpmdj7vrkw5jb2k2f6zbrr5g4d18pjy8n"; }; }; "snyk-gradle-plugin-1.2.0" = { @@ -24261,6 +24621,24 @@ let sha1 = "bbf6b39f5f43ec30bc71babcb37557acecf34353"; }; }; + "stream-to-blob-1.0.0" = { + name = "stream-to-blob"; + packageName = "stream-to-blob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-blob/-/stream-to-blob-1.0.0.tgz"; + sha1 = "9f7a1ada39e16ea282ebb7e4cda307edabde658d"; + }; + }; + "stream-to-blob-url-2.1.0" = { + name = "stream-to-blob-url"; + packageName = "stream-to-blob-url"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-to-blob-url/-/stream-to-blob-url-2.1.0.tgz"; + sha1 = "c341d10502ec51250607327258ec2f586b07d626"; + }; + }; "stream-to-promise-2.2.0" = { name = "stream-to-promise"; packageName = "stream-to-promise"; @@ -24297,6 +24675,15 @@ let sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f"; }; }; + "stream-with-known-length-to-buffer-1.0.1" = { + name = "stream-with-known-length-to-buffer"; + packageName = "stream-with-known-length-to-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-with-known-length-to-buffer/-/stream-with-known-length-to-buffer-1.0.1.tgz"; + sha512 = "07gzjgqphsbkfbc3f594kfja4kwr0sa8ss7arj47znz5wy5m2sw3qkfzgfxpaaijiliwbr3wny331q83kj55j72jsgm0jbsad5m8mdf"; + }; + }; "streamline-0.10.17" = { name = "streamline"; packageName = "streamline"; @@ -24477,6 +24864,15 @@ let sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; }; }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + }; + }; "stringify-entities-1.3.1" = { name = "stringify-entities"; packageName = "stringify-entities"; @@ -25522,6 +25918,15 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; + "torrent-discovery-8.4.0" = { + name = "torrent-discovery"; + packageName = "torrent-discovery"; + version = "8.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.0.tgz"; + sha512 = "39hhpi3mzygr52pgdah0fvll7mdgmchilxshqjykypiz9167p476sjph4w1qbv98254ij6kdwn9b0j4bwqkcbnr3mspmjh1sm5n8fak"; + }; + }; "torrent-piece-1.1.1" = { name = "torrent-piece"; packageName = "torrent-piece"; @@ -25909,6 +26314,15 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; + "typedarray-to-buffer-3.1.5" = { + name = "typedarray-to-buffer"; + packageName = "typedarray-to-buffer"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "3cvrfgjsyvnh9fdyixjzx9mwkfcjfyhgsjizzxzmrsvb1pwch0y58crjh7p6b0ml9nl7jr55nx5dyslq3jn15qz555fl3a4qdfbrnyd"; + }; + }; "typescript-2.7.2" = { name = "typescript"; packageName = "typescript"; @@ -26134,6 +26548,15 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; + "uint64be-1.0.1" = { + name = "uint64be"; + packageName = "uint64be"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-1.0.1.tgz"; + sha1 = "1f7154202f2a1b8af353871dda651bf34ce93e95"; + }; + }; "uint64be-2.0.2" = { name = "uint64be"; packageName = "uint64be"; @@ -26593,6 +27016,24 @@ let sha1 = "458f17820d37820dc60e20b86d94391b00123158"; }; }; + "upnp-device-client-1.0.2" = { + name = "upnp-device-client"; + packageName = "upnp-device-client"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/upnp-device-client/-/upnp-device-client-1.0.2.tgz"; + sha1 = "91f84705f2349bf89082855fff4e3006ac435337"; + }; + }; + "upnp-mediarenderer-client-1.2.4" = { + name = "upnp-mediarenderer-client"; + packageName = "upnp-mediarenderer-client"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/upnp-mediarenderer-client/-/upnp-mediarenderer-client-1.2.4.tgz"; + sha1 = "0c63a51802082b6b03b596c475cc64fc1e0877c8"; + }; + }; "upper-case-1.1.3" = { name = "upper-case"; packageName = "upper-case"; @@ -26638,6 +27079,15 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; + "url-join-2.0.5" = { + name = "url-join"; + packageName = "url-join"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz"; + sha1 = "5af22f18c052a000a48d7b82c5e9c2e2feeda728"; + }; + }; "url-parse-lax-1.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -26701,6 +27151,24 @@ let sha512 = "1vqmf9ng5navlr0kvklslvzbqym47sbqblc3i74ln0hswdyd0yx86fj3cnhb2pjjyy3cqs1mq9ywkz92j5x7km2iv1g2jkfkki0f2p0"; }; }; + "ut_metadata-3.2.0" = { + name = "ut_metadata"; + packageName = "ut_metadata"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.0.tgz"; + sha512 = "3c8a0bnic4symhd8m0gy22adlj8pkmiclsxbr6j979fwabrj0z74xp2bknfqp57vndr4f79d4mnhygrbvp69xdn911j0q6ljgd1bw8i"; + }; + }; + "ut_pex-1.2.0" = { + name = "ut_pex"; + packageName = "ut_pex"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ut_pex/-/ut_pex-1.2.0.tgz"; + sha512 = "3b2f0jrvzj2rij8wi7jwy4r7ijqsfv8a9qjqf67gxmlfmyglz8hr51d8f10hdyx1di88a0f3kba1jp583a643mxjfxlaq1dsxy96a10"; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -27097,6 +27565,15 @@ let sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; }; }; + "videostream-2.4.2" = { + name = "videostream"; + packageName = "videostream"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/videostream/-/videostream-2.4.2.tgz"; + sha1 = "9560254d00fabdc40955c1a3c282057d8db1d115"; + }; + }; "vinyl-0.4.6" = { name = "vinyl"; packageName = "vinyl"; @@ -27160,6 +27637,15 @@ let sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239"; }; }; + "vlc-command-1.1.1" = { + name = "vlc-command"; + packageName = "vlc-command"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.1.tgz"; + sha1 = "349b85def831f980cd6eec560b1990fd989eaf92"; + }; + }; "vm-browserify-0.0.4" = { name = "vm-browserify"; packageName = "vm-browserify"; @@ -27214,13 +27700,22 @@ let sha512 = "1ikdzcmqhhk38d5kz8izbydm4bwh0hik4n6nwnklb0ygyynqasajzaycxg4cwzy72xag5izw12qknvm4irbz6gws8n7kkz5wj7cg89y"; }; }; - "vscode-languageclient-4.0.0" = { + "vscode-jsonrpc-3.6.1" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.1.tgz"; + sha512 = "1npkazmy51c215nfgg2jiidabqh8kxd87my3xw19jq413h8lbchxc40wacl5g6gxyijvlc40b2fail6nlgb6rmzsfhjv47n2w7zwipq"; + }; + }; + "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.0.tgz"; - sha512 = "26vnna1pgmd2l4al7p76v5jqv5jnbljan1wjqywnn1h4wypx3bilgfnir5xmyj356hyvcikihbj7m030blp0nn9a7cmdmwrws110vf1"; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-4.0.1.tgz"; + sha512 = "28c35r5m72hcg1g7lbrilwj29403sl9mq13w5zkl97cqx8hg2p1pw6gxjnysqjwg2rdy9hs2mb925krhvs24cp3y24lfck97xk83yyi"; }; }; "vscode-languageserver-3.5.1" = { @@ -27268,13 +27763,13 @@ let sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; }; }; - "vscode-languageserver-types-3.6.1" = { + "vscode-languageserver-types-3.7.1" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.6.1"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.1.tgz"; - sha512 = "2ci0g6n2903n20zdbgjbvj3wxn7fh09f9pmbgnwyjjnxwfvmgni244v0k5y31jlv351bdk8cqk4p81wdb9qkyfchxwwqn8lr25vg61n"; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.7.1.tgz"; + sha512 = "3msj9sf465hb8j4x9diw4qadgf4h8vks2avw2p42pp5d70v9m1f515mblbwmxh17h1321ivsa63pph8q96fx1kh70vp57j0px9rzlby"; }; }; "vscode-uri-1.0.3" = { @@ -27385,6 +27880,15 @@ let sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m"; }; }; + "webtorrent-0.98.24" = { + name = "webtorrent"; + packageName = "webtorrent"; + version = "0.98.24"; + src = fetchurl { + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.98.24.tgz"; + sha512 = "1jf65qy9fq5ngb1sv296r6wbahjwac8vkdddpfhwmyvmbxabfyn8vz09d5di8sy69d4w0kyi74kjx09v7rd954cg135kr9smyy615yk"; + }; + }; "whatwg-fetch-2.0.4" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; @@ -27475,6 +27979,15 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; + "which-pm-runs-1.0.0" = { + name = "which-pm-runs"; + packageName = "which-pm-runs"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; + sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; + }; + }; "wide-align-1.1.2" = { name = "wide-align"; packageName = "wide-align"; @@ -27583,6 +28096,15 @@ let sha1 = "93ad116b2696da87d58f7265a8fcea5254a965d5"; }; }; + "winreg-1.2.4" = { + name = "winreg"; + packageName = "winreg"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/winreg/-/winreg-1.2.4.tgz"; + sha1 = "ba065629b7a925130e15779108cf540990e98d1b"; + }; + }; "winser-0.1.6" = { name = "winser"; packageName = "winser"; @@ -27835,6 +28357,24 @@ let sha512 = "2887c18dlvnvc62pqgwhihzxnnj9mzbnjqa0gqg3n94k5b6fx6nm1wggisy2bg3mi7dl81vk11i49wl319yfvh255w2nrbhydmqnxcy"; }; }; + "ws-4.1.0" = { + name = "ws"; + packageName = "ws"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz"; + sha512 = "1ldy8hddsvy7lb045cx4jrnx09962j98zp7y16f64gkw8z99ww61w91mjhrm85bqpsf3b158yhfh6yf01g1a2zrgm6v9bkx87r7ys34"; + }; + }; + "ws-5.1.1" = { + name = "ws"; + packageName = "ws"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz"; + sha512 = "01whkym8fx8qjmx8s548zzw3ba05x8canb59v5yzidbwxdm7w1kfcfqhzzrxni1r9idqgla5ll5d3kp6fmk1sdn0k7d9lwvj2zarsvc"; + }; + }; "wtf-8-1.0.0" = { name = "wtf-8"; packageName = "wtf-8"; @@ -28457,6 +28997,15 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; + "zero-fill-2.2.3" = { + name = "zero-fill"; + packageName = "zero-fill"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/zero-fill/-/zero-fill-2.2.3.tgz"; + sha1 = "a3def06ba5e39ae644850bb4ca2ad4112b4855e9"; + }; + }; "zip-1.2.0" = { name = "zip"; packageName = "zip"; @@ -28499,10 +29048,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.11.0.tgz"; - sha512 = "0ix07a7vxyrlkplb3wxfpflg7yhcb9csh1k8410rjkrqmshviiiw8iwysf36936mrm5qz66v8mx5r9r7ky46zwi82mgdn66w0ag0865"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.12.0.tgz"; + sha512 = "1sk9p5lng0hwngvzbz28nwaamf73hyz4pa14fxzmwq11syjfiw8b3p95vig8sabn2zfwi8ddginhg5rvf10a5rgpq3cy608yy7qk21z"; }; dependencies = [ sources."JSV-4.0.2" @@ -28530,7 +29079,6 @@ in sources."babel-types-6.26.0" sources."babylon-6.18.0" sources."balanced-match-1.0.0" - sources."bindings-1.2.1" sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."chmodr-1.0.2" @@ -28539,7 +29087,6 @@ in sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-js-2.5.4" - sources."deasync-0.1.12" sources."debug-2.6.9" sources."detect-indent-4.0.0" sources."ejs-2.5.7" @@ -28585,7 +29132,6 @@ in sources."mkdirp-0.5.1" sources."moment-2.20.1" sources."ms-2.0.0" - sources."nan-2.10.0" sources."node.extend-2.0.0" sources."nomnom-1.8.1" sources."number-is-nan-1.0.1" @@ -28754,7 +29300,7 @@ in dependencies = [ sources."@types/caseless-0.12.1" sources."@types/form-data-2.2.1" - sources."@types/node-8.10.1" + sources."@types/node-8.10.2" sources."@types/request-2.47.0" sources."@types/tough-cookie-2.3.2" sources."@types/uuid-3.4.3" @@ -29034,7 +29580,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.22.0" - (sources."ms-rest-2.3.2" // { + (sources."ms-rest-2.3.3" // { dependencies = [ sources."extend-3.0.1" sources."request-2.85.0" @@ -29044,10 +29590,10 @@ in }) (sources."ms-rest-azure-2.5.5" // { dependencies = [ - sources."@types/node-9.6.1" + sources."@types/node-9.6.2" (sources."adal-node-0.1.28" // { dependencies = [ - sources."@types/node-8.10.1" + sources."@types/node-8.10.2" ]; }) sources."async-2.6.0" @@ -29142,8 +29688,8 @@ in dependencies = [ sources."caseless-0.11.0" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."then-request-2.2.0" @@ -29268,7 +29814,7 @@ in sources."minimist-1.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."natives-1.1.2" + sources."natives-1.1.3" sources."normalize-package-data-2.4.0" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -29350,7 +29896,7 @@ in sources."resolve-1.1.7" ]; }) - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" sources."browserify-rsa-4.0.1" @@ -29402,7 +29948,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - sources."insert-module-globals-7.0.5" + sources."insert-module-globals-7.0.6" sources."is-buffer-1.1.6" sources."isarray-2.0.4" sources."json-stable-stringify-0.0.1" @@ -29443,9 +29989,10 @@ in sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.5" // { + (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" + sources."string_decoder-1.1.1" ]; }) sources."resolve-1.6.0" @@ -29530,7 +30077,7 @@ in sources."boom-0.3.8" sources."brace-expansion-1.1.11" sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-0.1.1" @@ -29586,7 +30133,7 @@ in sources."flatten-0.0.1" sources."forever-agent-0.2.0" sources."form-data-0.0.10" - (sources."fs-chunk-store-1.6.5" // { + (sources."fs-chunk-store-1.7.0" // { dependencies = [ sources."mkdirp-0.5.1" ]; @@ -29677,7 +30224,6 @@ in (sources."peerflix-0.34.0" // { dependencies = [ sources."bencode-0.7.0" - sources."buffer-alloc-unsafe-0.1.1" sources."debug-3.1.0" sources."end-of-stream-0.1.5" sources."get-stdin-5.0.1" @@ -29687,9 +30233,9 @@ in sources."object-assign-4.1.1" sources."once-1.2.0" sources."parse-torrent-file-2.1.4" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."thirty-two-0.0.2" sources."thunky-1.0.2" sources."ultron-1.0.2" @@ -29716,7 +30262,8 @@ in sources."qap-3.3.1" sources."qs-0.5.6" sources."query-string-1.0.1" - sources."random-access-file-1.8.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" @@ -29772,8 +30319,8 @@ in (sources."srt2vtt-1.3.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."stream-transcoder-0.0.5" @@ -30015,7 +30562,7 @@ in sources."isarray-1.0.0" ]; }) - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" sources."browserify-rsa-4.0.1" @@ -30189,7 +30736,7 @@ in sources."init-package-json-1.10.3" sources."inline-source-map-0.6.2" sources."inquirer-0.10.1" - (sources."insert-module-globals-7.0.5" // { + (sources."insert-module-globals-7.0.6" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -30322,7 +30869,11 @@ in sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" sources."read-package-json-2.0.13" - sources."readable-stream-2.3.5" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."string_decoder-1.1.1" + ]; + }) sources."readline2-1.0.1" sources."rechoir-0.6.2" sources."registry-url-3.1.0" @@ -30604,7 +31155,7 @@ in ]; }) sources."dns-discovery-5.6.1" - sources."dns-packet-4.1.1" + sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" @@ -30768,7 +31319,7 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -30799,7 +31350,7 @@ in sources."stream-parser-0.3.1" sources."stream-shift-1.0.0" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-4.0.0" (sources."subcommand-2.1.0" // { @@ -31050,8 +31601,8 @@ in (sources."fs-blob-store-5.2.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."inherits-2.0.3" @@ -31101,9 +31652,9 @@ in dependencies = [ sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."split2-2.2.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."through2-2.0.3" ]; }) @@ -31140,8 +31691,8 @@ in dependencies = [ sources."bl-1.2.2" sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."through-2.3.8" @@ -31171,10 +31722,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.7.tgz"; - sha512 = "07fvd6djvw50nbjimxyvl9jv86lky0wz6v5mrj8q4fgdpwgb70636bgsg13plj83jl33lk9mk7ixmidp85zikv4w4cwnli53hi4r8vi"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.8.tgz"; + sha512 = "3bahinp16ajfxy06ihrl022906h6zdxhsgmwh28k1p04blzqzgddbryx4l1a8ncg5fdjlj7ka9k3f6lam68fanjw4093hgyns7iclf4"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -31183,7 +31734,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.218.1" + sources."aws-sdk-2.221.1" sources."aws-sign2-0.7.0" sources."aws4-1.6.0" sources."base64-js-1.2.3" @@ -31428,7 +31979,7 @@ in }) ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -31445,7 +31996,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."supports-color-4.2.0" @@ -31819,7 +32370,7 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."regexpp-1.1.0" sources."require-uncached-1.0.3" sources."resolve-from-1.0.1" @@ -31836,7 +32387,7 @@ in sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" (sources."strip-ansi-4.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -32002,7 +32553,7 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."pseudomap-1.0.2" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."regexpp-1.1.0" sources."require-uncached-1.0.3" sources."resolve-1.6.0" @@ -32020,7 +32571,7 @@ in sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" (sources."supports-color-3.2.3" // { @@ -32206,7 +32757,7 @@ in sources."qs-6.5.1" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.85.0" @@ -32221,7 +32772,7 @@ in sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.0" sources."sshpk-1.14.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -32406,7 +32957,7 @@ in ]; }) sources."read-1.0.7" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -32419,7 +32970,7 @@ in sources."set-immediate-shim-1.0.1" sources."shush-1.0.0" sources."stack-trace-0.0.10" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-json-comments-0.1.3" sources."tape-2.3.3" sources."through-2.3.8" @@ -32744,8 +33295,8 @@ in (sources."gulp-util-3.0.8" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."gulplog-1.0.0" @@ -32841,7 +33392,7 @@ in sources."ms-2.0.0" sources."multipipe-0.1.2" sources."nanomatch-1.2.9" - sources."natives-1.1.2" + sources."natives-1.1.3" sources."object-assign-3.0.0" sources."object-copy-0.1.0" sources."object-visit-1.0.1" @@ -33324,7 +33875,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -33353,7 +33904,7 @@ in sources."statuses-1.5.0" sources."string-template-0.2.1" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" sources."superagent-3.8.2" sources."supports-color-5.3.0" @@ -33569,7 +34120,7 @@ in sources."thriftrw-3.11.2" sources."type-detect-4.0.8" sources."typescript-2.7.2" - sources."vscode-jsonrpc-3.6.0" + sources."vscode-jsonrpc-3.6.1" (sources."vscode-languageserver-3.5.1" // { dependencies = [ sources."vscode-jsonrpc-3.5.0" @@ -33577,7 +34128,7 @@ in ]; }) sources."vscode-languageserver-protocol-3.5.1" - sources."vscode-languageserver-types-3.6.1" + sources."vscode-languageserver-types-3.7.1" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" sources."xorshift-0.2.1" @@ -33861,11 +34412,11 @@ in sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."superagent-3.8.2" sources."uri-js-3.0.2" sources."util-deprecate-1.0.2" @@ -34259,7 +34810,7 @@ in sources."source-map-0.5.7" ]; }) - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" sources."browserify-rsa-4.0.1" @@ -34430,7 +34981,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - (sources."insert-module-globals-7.0.5" // { + (sources."insert-module-globals-7.0.6" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -34605,9 +35156,10 @@ in ]; }) sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.5" // { + (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" + sources."string_decoder-1.1.1" ]; }) sources."readdirp-2.1.0" @@ -35159,7 +35711,7 @@ in sources."read-cmd-shim-1.0.1" sources."read-pkg-3.0.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -35189,7 +35741,7 @@ in sources."split-1.0.1" sources."split2-2.2.0" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" sources."strip-eof-1.0.0" @@ -35479,7 +36031,7 @@ in }) ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" @@ -35487,7 +36039,7 @@ in sources."replace-ext-1.0.0" sources."safe-buffer-5.1.1" sources."stream-shift-1.0.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-bom-2.0.0" sources."strip-bom-stream-1.0.0" sources."through2-2.0.3" @@ -35716,7 +36268,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -35741,7 +36293,7 @@ in sources."sprintf-js-1.0.3" sources."sshpk-1.14.1" sources."statuses-1.5.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."to-array-0.1.4" sources."tough-cookie-2.3.4" @@ -35883,7 +36435,7 @@ in ]; }) sources."range-parser-1.2.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -35908,7 +36460,7 @@ in sources."split-0.3.3" sources."statuses-1.3.1" sources."stream-combiner-0.0.4" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."through-2.3.8" sources."unix-crypt-td-js-1.0.0" sources."unpipe-1.0.0" @@ -36044,11 +36596,11 @@ in sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."safe-buffer-5.1.1" sources."slash-1.0.0" sources."sprintf-js-1.0.3" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."superagent-3.8.2" sources."uri-js-3.0.2" sources."util-deprecate-1.0.2" @@ -36193,7 +36745,7 @@ in sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."request-2.85.0" sources."retry-0.10.1" sources."rimraf-2.2.8" @@ -36211,7 +36763,7 @@ in sources."sshpk-1.14.1" sources."ssri-5.3.0" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-3.1.15" @@ -36329,7 +36881,7 @@ in sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."request-2.85.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -36339,7 +36891,7 @@ in sources."sntp-2.1.0" sources."sshpk-1.14.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-2.2.1" @@ -36573,7 +37125,7 @@ in sources."rc-1.2.6" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.81.0" @@ -36602,7 +37154,7 @@ in }) sources."statuses-1.4.0" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -36719,7 +37271,7 @@ in sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."sax-1.2.4" @@ -36727,7 +37279,7 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."tar-4.4.1" @@ -36963,7 +37515,7 @@ in sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" sources."rc-1.2.6" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-not-1.0.2" sources."registry-auth-token-3.3.2" @@ -37012,7 +37564,7 @@ in sources."static-extend-0.1.2" sources."stream-combiner-0.0.4" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -37379,7 +37931,7 @@ in ]; }) sources."rc-1.2.6" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."request-2.85.0" @@ -37404,7 +37956,7 @@ in sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" @@ -37535,7 +38087,7 @@ in sources."ms-0.1.0" sources."muri-0.3.1" sources."nan-1.0.0" - sources."natives-1.1.2" + sources."natives-1.1.3" (sources."net-ping-1.1.7" // { dependencies = [ sources."nan-2.3.5" @@ -37705,7 +38257,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" - sources."natives-1.1.2" + sources."natives-1.1.3" sources."ncp-0.4.2" sources."nopt-2.2.1" (sources."npm-registry-client-0.2.27" // { @@ -37732,7 +38284,7 @@ in sources."proto-list-1.2.4" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."request-2.85.0" sources."retry-0.6.0" sources."rimraf-2.6.2" @@ -37744,7 +38296,7 @@ in sources."sntp-2.1.0" sources."sshpk-1.14.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" (sources."tar-0.1.17" // { @@ -37972,7 +38524,7 @@ in sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -38000,7 +38552,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."slide-1.1.6" - (sources."snyk-1.70.3" // { + (sources."snyk-1.71.0" // { dependencies = [ sources."async-0.9.2" sources."camelcase-3.0.0" @@ -38025,7 +38577,7 @@ in sources."debug-2.6.9" ]; }) - sources."snyk-go-plugin-1.4.5" + sources."snyk-go-plugin-1.4.6" sources."snyk-gradle-plugin-1.2.0" (sources."snyk-module-1.8.1" // { dependencies = [ @@ -38078,7 +38630,7 @@ in sources."stream-shift-1.0.0" sources."string-length-1.0.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" sources."strip-eof-1.0.0" @@ -38299,10 +38851,10 @@ in ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; - version = "1.0.32"; + version = "1.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.32.tgz"; - sha512 = "2hdrvr25l7lv0plz31dqgnrr0qli6332z69ywwns4mxmmyk3mc1s7rjdsgf201rw11nqhwbhj2w7n0zijqldbwi5chdnma667lihcyc"; + url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.34.tgz"; + sha512 = "216lq2hh4mmk0lzkn381p0l4lgr84xmv6jdjc42yry1yb695zy7bs36n40dmvc81afgsnc51b1rcbn51438ysk59w0drrxd8x43zykr"; }; dependencies = [ sources."async-2.6.0" @@ -38321,10 +38873,10 @@ in sources."path-is-absolute-1.0.1" sources."pegjs-0.10.0" sources."vscode-jsonrpc-3.6.0" - sources."vscode-languageclient-4.0.0" + sources."vscode-languageclient-4.0.1" sources."vscode-languageserver-4.0.0" sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.6.1" + sources."vscode-languageserver-types-3.7.1" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -38579,8 +39131,8 @@ in sources."isarray-1.0.0" sources."minimist-0.0.8" sources."ms-0.7.3" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."set-blocking-2.0.0" @@ -38673,7 +39225,7 @@ in sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-0.1.1" @@ -38713,7 +39265,7 @@ in sources."figures-1.7.0" sources."find-up-1.1.2" sources."flatten-0.0.1" - (sources."fs-chunk-store-1.6.5" // { + (sources."fs-chunk-store-1.7.0" // { dependencies = [ sources."mkdirp-0.5.1" ]; @@ -38812,7 +39364,8 @@ in sources."plist-1.2.0" sources."process-nextick-args-2.0.0" sources."pump-1.0.3" - sources."random-access-file-1.8.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" @@ -38820,7 +39373,7 @@ in sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."redent-1.0.0" sources."repeating-2.0.1" sources."restore-cursor-1.0.1" @@ -38854,7 +39407,7 @@ in sources."stream-buffers-2.2.0" sources."string-width-1.0.2" sources."string2compact-1.2.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -38869,15 +39422,14 @@ in sources."bencode-0.8.0" sources."isarray-1.0.0" sources."minimist-1.2.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."torrent-piece-1.1.1" (sources."torrent-stream-1.0.4" // { dependencies = [ sources."bencode-0.7.0" - sources."buffer-alloc-unsafe-0.1.1" sources."end-of-stream-0.1.5" sources."isarray-0.0.1" sources."magnet-uri-4.2.3" @@ -38951,7 +39503,7 @@ in sources."boom-0.3.8" sources."brace-expansion-1.1.11" sources."buffer-alloc-1.1.0" - sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-equal-0.0.1" sources."buffer-equals-1.0.4" sources."buffer-fill-0.1.1" @@ -39035,7 +39587,7 @@ in sources."form-data-0.0.10" sources."forwarded-0.1.2" sources."fresh-0.3.0" - (sources."fs-chunk-store-1.6.5" // { + (sources."fs-chunk-store-1.7.0" // { dependencies = [ sources."mkdirp-0.5.1" ]; @@ -39122,7 +39674,8 @@ in sources."proxy-addr-1.0.10" sources."pump-1.0.3" sources."qs-6.5.1" - sources."random-access-file-1.8.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" @@ -39207,17 +39760,14 @@ in (sources."torrent-stream-1.0.4" // { dependencies = [ sources."bencode-0.8.0" - sources."buffer-alloc-unsafe-0.1.1" - sources."debug-2.6.9" sources."end-of-stream-0.1.5" sources."isarray-1.0.0" sources."minimist-1.2.0" sources."mkdirp-0.3.5" - sources."ms-2.0.0" sources."once-1.3.3" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."ultron-1.1.1" ]; }) @@ -39474,7 +40024,7 @@ in sources."process-nextick-args-2.0.0" ]; }) - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cache-api-3.0.1" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" @@ -39576,7 +40126,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - (sources."insert-module-globals-7.0.5" // { + (sources."insert-module-globals-7.0.6" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -39655,10 +40205,10 @@ in sources."randomfill-1.0.4" sources."read-1.0.7" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.5" // { + (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" ]; }) sources."readdirp-2.1.0" @@ -40012,7 +40562,7 @@ in ]; }) sources."rc-1.2.6" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" sources."request-2.81.0" @@ -40042,7 +40592,7 @@ in }) sources."statuses-1.5.0" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" @@ -40974,7 +41524,7 @@ in }) (sources."render-readme-1.3.1" // { dependencies = [ - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."source-map-0.6.1" ]; }) @@ -41005,7 +41555,7 @@ in sources."srcset-1.0.0" sources."sshpk-1.14.1" sources."statuses-1.3.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."supports-color-5.3.0" sources."through-2.3.8" @@ -41061,11 +41611,11 @@ in sources."lodash-4.17.5" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -41134,7 +41684,7 @@ in sources."precond-0.2.3" sources."process-nextick-args-2.0.0" sources."qs-3.1.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" (sources."restify-4.0.3" // { dependencies = [ sources."lru-cache-2.7.3" @@ -41188,7 +41738,7 @@ in ]; }) sources."stream-transform-0.1.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."util-deprecate-1.0.2" @@ -41487,10 +42037,10 @@ in sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" sources."prr-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."resolve-from-2.0.0" sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."tapable-0.2.8" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -41829,7 +42379,7 @@ in sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."restore-cursor-1.0.1" @@ -41844,7 +42394,7 @@ in sources."sort-keys-1.1.2" sources."string-template-1.0.0" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" @@ -41920,10 +42470,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.17"; + version = "1.4.18"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.17.tgz"; - sha512 = "1qy7j5zv8kvk5c9y4pjh0x8m243yhc1prv9s3kqbbpsxkgapdk8ap6dwa3nhh93cj5v1mb29jnfqqy20lypwvy8j8z3436vdckhc480"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.18.tgz"; + sha512 = "3mdb4qpdmm6n3c34z8pkrn3yx2nxyvqszw3rb24lcf8mbpbx2d534bpb3mcg2lg4lxsysijp652pkwbxd492sm7z9bz296r8cgppmqm"; }; dependencies = [ sources."abbrev-1.1.1" @@ -42022,16 +42572,8 @@ in sources."editions-1.3.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.1.5" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."engine.io-client-3.1.6" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."engine.io-3.2.0" + sources."engine.io-client-3.2.1" sources."engine.io-parser-2.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -42130,13 +42672,13 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.21.0" + sources."moment-2.22.0" sources."ms-2.0.0" sources."negotiator-0.6.1" - sources."node-cache-4.1.1" + sources."node-cache-4.2.0" sources."nopt-1.0.10" sources."normalize-package-data-2.4.0" - sources."npm-5.7.1" + sources."npm-6.0.0-next.0" sources."npm-package-arg-6.0.0" (sources."npm-registry-client-8.5.1" // { dependencies = [ @@ -42145,8 +42687,8 @@ in sources."extend-3.0.1" sources."form-data-2.3.2" sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."npm-run-path-2.0.2" @@ -42225,19 +42767,16 @@ in sources."slide-1.1.6" sources."snapsvg-0.5.1" sources."sntp-2.1.0" - (sources."socket.io-2.0.4" // { + (sources."socket.io-2.1.0" // { dependencies = [ sources."component-emitter-1.2.1" + sources."debug-3.1.0" sources."isarray-2.0.1" ]; }) sources."socket.io-adapter-1.1.1" - sources."socket.io-client-2.0.4" - (sources."socket.io-parser-3.1.3" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) + sources."socket.io-client-2.1.0" + sources."socket.io-parser-3.2.0" sources."spdx-correct-3.0.0" sources."spdx-exceptions-2.1.0" sources."spdx-expression-parse-3.0.0" @@ -42263,8 +42802,8 @@ in sources."form-data-2.3.2" sources."formidable-1.2.1" sources."isarray-1.0.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) (sources."temp-0.8.3" // { @@ -42287,7 +42826,6 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.2.1" - sources."uws-9.14.0" sources."validate-npm-package-license-3.0.3" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" @@ -42554,7 +43092,7 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."read-metadata-1.0.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" sources."repeat-string-1.6.1" (sources."request-2.85.0" // { @@ -42578,7 +43116,7 @@ in sources."sshpk-1.14.1" sources."stat-mode-0.2.2" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-4.0.0" sources."strip-dirs-2.1.0" @@ -42784,10 +43322,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.4.1.tgz"; - sha512 = "2zmid39lsiz55wvivhnza1i1w8561z3fn30bs3jii5n10q5462p7yqrk5y5bf7j612g2mflygsy1lyvxc0dhxxhb75a7380q5r0kdc8"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz"; + sha512 = "3m4zqjmw0byxpxxx35zfrpng2sawkk71mna6b7b5vx1ba534kvsrs3i6332vz7m0dskp9k8ywqv545kg8x7xnv8xvl6x709yjrdjsp8"; }; dependencies = [ sources."acorn-5.5.3" @@ -42830,7 +43368,7 @@ in ]; }) sources."brorand-1.1.0" - sources."browserify-aes-1.1.1" + sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.0" sources."browserify-des-1.0.0" sources."browserify-rsa-4.0.1" @@ -43033,7 +43571,7 @@ in sources."querystring-es3-0.2.1" sources."randombytes-2.0.6" sources."randomfill-1.0.4" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" @@ -43104,7 +43642,7 @@ in sources."stream-each-1.2.2" sources."stream-http-2.8.1" sources."stream-shift-1.0.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."tapable-1.0.0" sources."through2-2.0.3" sources."timers-browserify-2.0.6" @@ -43173,6 +43711,261 @@ in production = true; bypassCache = false; }; + webtorrent-cli = nodeEnv.buildNodePackage { + name = "webtorrent-cli"; + packageName = "webtorrent-cli"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.11.0.tgz"; + sha512 = "04agjsk7s1fdmiy195shkjqxswpkadyg08vgj4pqxpwy6d5d4kbngz3gmg9vvnm2z9hi2sdc6ryx0r59nws7xjkifi3grzfkxzz1c06"; + }; + dependencies = [ + sources."addr-to-ip-port-1.4.3" + (sources."airplay-js-0.3.0" // { + dependencies = [ + sources."semver-5.1.1" + sources."xmlbuilder-0.4.3" + ]; + }) + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."ascli-0.3.0" + sources."async-limiter-1.0.0" + sources."balanced-match-1.0.0" + sources."bencode-2.0.0" + sources."binary-search-1.3.3" + sources."bindings-1.3.0" + sources."bitfield-2.0.0" + sources."bittorrent-dht-8.2.0" + sources."bittorrent-peerid-1.2.0" + sources."bittorrent-protocol-2.4.0" + sources."bittorrent-tracker-9.7.0" + sources."bl-1.2.2" + sources."blob-to-buffer-1.2.7" + sources."block-stream2-1.1.0" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + sources."browserify-package-json-1.0.1" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-equals-1.0.4" + sources."buffer-fill-0.1.1" + sources."buffer-from-1.0.0" + sources."buffer-indexof-1.1.1" + sources."bufferutil-3.0.4" + sources."bufferview-1.0.1" + sources."bytebuffer-3.5.5" + sources."castv2-0.1.9" + sources."castv2-client-1.2.0" + sources."chownr-1.0.1" + sources."chromecasts-1.9.1" + sources."chunk-store-stream-2.1.0" + sources."clivas-0.2.0" + sources."closest-to-2.0.0" + sources."code-point-at-1.1.0" + sources."colour-0.7.1" + sources."compact2string-1.4.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."create-torrent-3.30.0" + sources."debug-2.6.9" + sources."decompress-response-3.3.0" + sources."deep-extend-0.4.2" + sources."defined-1.0.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."dlnacasts-0.1.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."ecstatic-3.2.0" + sources."elementtree-0.1.7" + sources."end-of-stream-1.4.1" + sources."executable-4.1.1" + sources."expand-template-1.1.0" + sources."filestream-4.1.3" + sources."flatten-1.0.2" + sources."fs-chunk-store-1.7.0" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-browser-rtc-1.0.2" + sources."get-stdin-5.0.1" + sources."github-from-package-0.0.0" + sources."glob-7.1.2" + sources."has-unicode-2.0.1" + sources."he-1.1.1" + sources."immediate-chunk-store-1.0.8" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ip-1.1.5" + sources."ip-set-1.0.1" + sources."ipaddr.js-1.6.0" + sources."is-ascii-1.0.0" + sources."is-file-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."junk-2.1.0" + sources."k-bucket-4.0.0" + sources."k-rpc-4.3.1" + sources."k-rpc-socket-1.8.0" + sources."last-one-wins-1.0.4" + sources."load-ip-set-1.3.1" + sources."long-2.4.0" + sources."lru-3.1.0" + sources."magnet-uri-5.1.7" + sources."mdns-js-0.5.0" + sources."mdns-js-packet-0.2.0" + sources."mediasource-2.1.3" + sources."memory-chunk-store-1.3.0" + sources."mime-1.6.0" + sources."mimic-response-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."moment-2.22.0" + sources."mp4-box-encoding-1.1.3" + sources."mp4-stream-2.0.3" + sources."ms-2.0.0" + (sources."multicast-dns-6.2.3" // { + dependencies = [ + sources."thunky-1.0.2" + ]; + }) + sources."multistream-2.1.0" + sources."nan-2.10.0" + sources."netmask-1.0.6" + sources."network-address-1.1.2" + sources."next-event-1.0.0" + sources."node-abi-2.3.0" + sources."node-ssdp-2.9.1" + sources."nodebmc-0.0.7" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."open-0.0.5" + sources."optjs-3.2.2" + sources."os-homedir-1.0.2" + sources."package-json-versionify-1.0.4" + sources."parse-torrent-5.8.3" + sources."parse-torrent-file-4.1.0" + sources."path-is-absolute-1.0.1" + sources."piece-length-1.0.0" + sources."pify-2.3.0" + sources."plist-with-patches-0.5.1" + sources."prebuild-install-2.5.1" + sources."prettier-bytes-1.0.4" + sources."process-nextick-args-2.0.0" + sources."protobufjs-3.8.2" + sources."pump-3.0.0" + sources."qap-3.3.1" + sources."random-access-file-2.0.1" + sources."random-access-storage-1.1.1" + sources."random-iterate-1.0.1" + sources."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."range-slice-stream-1.2.0" + sources."rc-1.2.6" + sources."readable-stream-2.3.6" + sources."record-cache-1.0.1" + (sources."render-media-2.12.0" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."rimraf-2.6.2" + sources."run-parallel-1.1.8" + sources."run-parallel-limit-1.0.4" + sources."run-series-1.1.6" + sources."rusha-0.8.13" + sources."safe-buffer-5.1.1" + sources."sax-1.1.4" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."simple-concat-1.0.0" + sources."simple-get-2.7.0" + sources."simple-peer-9.0.0" + sources."simple-sha1-2.1.0" + (sources."simple-websocket-7.0.2" // { + dependencies = [ + sources."ws-4.1.0" + ]; + }) + sources."speedometer-1.0.0" + sources."split-1.0.1" + sources."stream-to-blob-1.0.0" + sources."stream-to-blob-url-2.1.0" + sources."stream-with-known-length-to-buffer-1.0.1" + sources."string-width-1.0.2" + sources."string2compact-1.2.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + (sources."tar-fs-1.16.0" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."tar-stream-1.5.5" + sources."thirty-two-1.0.2" + sources."through-2.3.8" + sources."thunky-0.1.0" + sources."to-arraybuffer-1.0.1" + (sources."torrent-discovery-8.4.0" // { + dependencies = [ + sources."minimist-1.2.0" + sources."pump-2.0.1" + ]; + }) + sources."torrent-piece-1.1.1" + sources."tunnel-agent-0.6.0" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + sources."uint64be-1.0.1" + sources."uniq-1.0.1" + sources."unordered-array-remove-1.0.2" + sources."upnp-device-client-1.0.2" + sources."upnp-mediarenderer-client-1.2.4" + sources."url-join-2.0.5" + sources."ut_metadata-3.2.0" + sources."ut_pex-1.2.0" + sources."util-deprecate-1.0.2" + sources."videostream-2.4.2" + sources."vlc-command-1.1.1" + (sources."webtorrent-0.98.24" // { + dependencies = [ + sources."debug-3.1.0" + sources."mime-2.2.2" + sources."minimist-0.0.8" + sources."thunky-1.0.2" + ]; + }) + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.2" + sources."winreg-1.2.4" + sources."wrappy-1.0.2" + sources."ws-5.1.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xmldom-0.1.27" + sources."xtend-4.0.1" + sources."zero-fill-2.2.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "WebTorrent, the streaming torrent client. For the command line."; + homepage = https://webtorrent.io/; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; @@ -43184,7 +43977,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-9.6.1" + sources."@types/node-9.6.2" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.5.3" @@ -43858,7 +44651,7 @@ in sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."readline2-1.0.1" sources."rechoir-0.6.2" @@ -43966,7 +44759,7 @@ in }) sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - (sources."snyk-1.70.3" // { + (sources."snyk-1.71.0" // { dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -43988,7 +44781,7 @@ in sources."debug-2.6.9" ]; }) - sources."snyk-go-plugin-1.4.5" + sources."snyk-go-plugin-1.4.6" sources."snyk-gradle-plugin-1.2.0" (sources."snyk-module-1.8.1" // { dependencies = [ @@ -44068,7 +44861,7 @@ in }) sources."string-length-1.0.1" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringify-entities-1.3.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" @@ -44623,7 +45416,7 @@ in sources."strip-bom-3.0.0" ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readline2-1.0.1" sources."redent-1.0.0" sources."registry-auth-token-3.3.2" @@ -44665,7 +45458,7 @@ in sources."strict-uri-encode-1.1.0" sources."string-length-1.0.1" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index cef612b9edf..17e1b8ba858 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -49,13 +49,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-9.6.1" = { + "@types/node-9.6.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.6.1"; + version = "9.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.1.tgz"; - sha512 = "2sxvv78fkmdrpqq04pkyq69fkny1xj1abcp8ajkmmmfn1cs3jdiir545s9h1gsnxzls1iiigbzj8dlkimlqdfpbgdlm8h6pj2mlf2f7"; + url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; + sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; }; }; "@types/superagent-3.5.6" = { @@ -1039,13 +1039,13 @@ let sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; }; }; - "cli-spinners-1.1.0" = { + "cli-spinners-1.3.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "1.1.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz"; - sha1 = "f1847b168844d917a671eb9d147e3df497c90d06"; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.0.tgz"; + sha512 = "36fw6sfxv4nwbywjns5fvwflfdimmngjc44ri9xhmqq8cb64b0p19fk30m7ywhr9m9bac8a9jnkb22bs2h0bskv6y5spnqny6mzf6ka"; }; }; "cli-table-0.3.1" = { @@ -1957,13 +1957,13 @@ let sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; }; }; - "dns-packet-4.1.1" = { + "dns-packet-4.2.0" = { name = "dns-packet"; packageName = "dns-packet"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.1.1.tgz"; - sha512 = "09adhjnzfiilwrksrckjrxcfi54gy5xgcsvkq24r98j0xh1asvl5iywj4p37s4l7drgysmdlkv95iki5c554gviaj4738fnlhgn42v3"; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-4.2.0.tgz"; + sha512 = "05pqsdg5q8r1i9z4dnii6sr7i3b6ir4gay5h3xk18jraa2w3201wfw6mz53dn494dqd19djdfbp78p6v70kia4862sbj5g4jwm40zbf"; }; }; "dns-socket-1.6.3" = { @@ -2299,13 +2299,13 @@ let sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; }; }; - "external-editor-2.1.0" = { + "external-editor-2.2.0" = { name = "external-editor"; packageName = "external-editor"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz"; - sha512 = "366albydy3glqs8h6y7rdpdhmyffn7vaig5snw8cb1zmn22mgvfywr08jfbmqjiqc9pyjyaaqv6xz5sfy2j1y18590l4f8mji7j53hk"; + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; + sha512 = "3sf897ajmkcp0j6rgd0jy6k95s9ck3j305yrr00kmckl8qdhswhbdd5g4m2fai03x8phs1vw2ahf9v7ym5ji4zfxydxyamiy61glabd"; }; }; "extglob-0.3.2" = { @@ -4261,15 +4261,6 @@ let sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; }; }; - "log-symbols-2.2.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; - sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm"; - }; - }; "lodash.uniqby-4.5.0" = { name = "lodash.uniqby"; packageName = "lodash.uniqby"; @@ -4279,6 +4270,15 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "093j1mha2zwbfkb6cvxr94l1dsx44607vvyxadxki3j69s40n2f6x6iqs6f9rzpvvqd8anclsqdlrm3klkwxixm4k2fl8bjr4b01qjm"; + }; + }; "longest-1.0.1" = { name = "longest"; packageName = "longest"; @@ -5629,13 +5629,13 @@ let sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; }; }; - "readable-stream-2.3.5" = { + "readable-stream-2.3.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; - sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "0mj9b6190amln9rg89x5pq2n195s3v0gzicpdamv1kbabg69aw5m71l34jsjn7bqil7405l6l35x9ijnb3h4jz5vx2i00l8sl1ll2xm"; }; }; "readdirp-2.1.0" = { @@ -6466,13 +6466,13 @@ let sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; }; - "string_decoder-1.0.3" = { + "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.0.3"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; }; }; "stringstream-0.0.5" = { @@ -7574,7 +7574,7 @@ in sources."chalk-1.1.3" ]; }) - sources."@types/node-9.6.1" + sources."@types/node-9.6.2" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -7611,7 +7611,7 @@ in sources."escape-string-regexp-1.0.5" sources."event-emitter-0.3.5" sources."extend-3.0.1" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."figures-2.0.0" sources."form-data-2.3.2" sources."formidable-1.2.1" @@ -7655,7 +7655,7 @@ in sources."pseudomap-1.0.2" sources."qs-6.5.1" sources."raf-3.3.2" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" sources."rx-lite-4.0.8" @@ -7669,7 +7669,7 @@ in sources."snabbdom-selector-1.2.1" sources."sorted-immutable-list-1.1.0" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."superagent-3.8.2" sources."supports-color-2.0.0" @@ -7835,7 +7835,7 @@ in ]; }) sources."dns-discovery-5.6.1" - sources."dns-packet-4.1.1" + sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" @@ -7999,7 +7999,7 @@ in sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."read-1.0.7" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" @@ -8030,7 +8030,7 @@ in sources."stream-parser-0.3.1" sources."stream-shift-1.0.0" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-4.0.0" (sources."subcommand-2.1.0" // { @@ -8273,7 +8273,7 @@ in sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" sources."qs-6.5.1" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."request-2.85.0" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" @@ -8283,7 +8283,7 @@ in sources."sntp-2.1.0" sources."sshpk-1.14.1" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."tar-2.2.1" @@ -8383,7 +8383,7 @@ in sources."minimist-1.2.0" ]; }) - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."rimraf-2.6.2" sources."safe-buffer-5.1.1" sources."sax-1.2.4" @@ -8391,7 +8391,7 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."string-width-1.0.2" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."tar-4.4.1" @@ -8412,10 +8412,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "1.37.3"; + version = "1.38.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-1.37.3.tgz"; - sha1 = "592f62fb50633506494bd683a0533a95520ef968"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-1.38.2.tgz"; + sha1 = "f0a9312db086d1446261575a69e05bdd545743aa"; }; buildInputs = globalBuildInputs; meta = { @@ -8467,11 +8467,11 @@ in sources."lodash-4.17.5" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" sources."set-immediate-shim-1.0.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -8534,7 +8534,7 @@ in sources."chalk-2.3.2" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" - sources."cli-spinners-1.1.0" + sources."cli-spinners-1.3.0" sources."cli-width-2.2.0" sources."cliui-2.1.0" sources."clone-1.0.4" @@ -8589,7 +8589,7 @@ in sources."esprima-4.0.0" sources."extend-3.0.1" sources."extend-shallow-2.0.1" - sources."external-editor-2.1.0" + sources."external-editor-2.2.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -8705,7 +8705,7 @@ in sources."punycode-1.4.1" sources."qs-6.5.1" sources."read-metadata-1.0.0" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" sources."repeat-string-1.6.1" (sources."request-2.85.0" // { @@ -8729,7 +8729,7 @@ in sources."sshpk-1.14.1" sources."stat-mode-0.2.2" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-4.0.0" sources."strip-dirs-2.1.0" @@ -9095,8 +9095,8 @@ in sources."ee-first-1.1.1" sources."isarray-1.0.0" sources."on-finished-2.3.0" - sources."readable-stream-2.3.5" - sources."string_decoder-1.0.3" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) sources."mute-stream-0.0.5" @@ -9175,7 +9175,7 @@ in ]; }) sources."rc-1.2.6" - sources."readable-stream-2.3.5" + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."readline2-1.0.1" sources."reduce-component-1.0.1" @@ -9246,7 +9246,7 @@ in sources."streamsearch-0.1.2" sources."string-3.3.3" sources."string-width-2.1.1" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -9381,4 +9381,4 @@ in production = true; bypassCache = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 80e34ecd06a..000ff8285c5 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -4,8 +4,8 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "0.8.1"; - sha256 = "1bjhgwmshlaz9xncrrkknys7prigf8vlg1kqvfx9l8kn92mlf10b"; + version = "0.8.2"; + sha256 = "1zpg079v89mz2dpnh59f9hk5r03wl26skfn43llrv3kg24abjfpf"; buildInputs = [ jbuilder ]; buildPhase = "jbuilder build -p alcotest"; inherit (jbuilder) installPhase; diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 7e9ba518251..b13eda071f6 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -2,10 +2,10 @@ buildOcaml rec { name = "bitstring"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = http://github.com/xguerin/bitstring/archive/v2.1.0.tar.gz; - sha256 = "0miw4banfpmx4kxrckpqr57b1fcmsqdmspyjx6gqjd4kghm4l7xj"; + url = http://github.com/xguerin/bitstring/archive/v2.1.1.tar.gz; + sha256 = "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8"; }; patches = [ ./camlp4-git.patch ./srcdir.patch ]; diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index 95001215814..8192fced97b 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "comparelib"; - version = "109.60.00"; + version = "113.00.00"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/comparelib/archive/${version}.tar.gz"; - sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e"; + sha256 = "02l343drgi4200flfx73nzdk61zajwidsqjk9n80b2d37lvhazlf"; }; propagatedBuildInputs = [ type_conv ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index ef930007aff..214721fa090 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -6,7 +6,7 @@ let mkpath = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; - version = "1.3"; + version = "1.4"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "c-cube"; repo = "ocaml-containers"; rev = "${version}"; - sha256 = "1gjs9d6759zpgp68djv296zwmvhdc6dqfb27aip7dhj6ic2bwgil"; + sha256 = "1wbarxphdrxvy7qsdp4p837h1zrv0z83pgs5lbz2h3kdnyvz2f1i"; }; buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit qcheck ]; diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 976ff697c98..0f5380f9a41 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-cstruct-${version}"; - version = "3.0.2"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz"; - sha256 = "03caxcyzfjmbnnwa15zy9s1ckkl4sc834d1qkgi4jcs3zqchvd8z"; + sha256 = "1x4jxsvd1lrfibnjdjrkfl7hqsc48rljnwbap6faanj9qhwwa6v2"; }; unpackCmd = "tar -xjf $curSrc"; diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 575ca45624f..6058c87e7bd 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-expat-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-expat"; rev = "v${version}"; - sha256 = "0rb47v08ra2hhh73p3d8sl4sizqwiwc37gnkl22b23sbwbjrpbz0"; + sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q"; }; prePatch = '' diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index 716e31b2bfe..c9a40b61437 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -1,14 +1,14 @@ {stdenv, buildOcaml, fetchurl}: buildOcaml rec { - version = "109.35.02"; + version = "112.35.00"; name = "herelib"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz"; - sha256 = "7f8394169cb63f6d41e91c9affa1b8ec240d5f6e9dfeda3fbb611df521d4b05a"; + sha256 = "03rrlpjmnd8d1rzzmd112355m7a5bwn3vf90xkbc6gkxlad9cxbs"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 573de26096c..492bb9c67cd 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip -, gnutls, nettle }: +, gnutls, nettle, fetchpatch +}: let version = "4.1.5"; in @@ -11,6 +12,12 @@ stdenv.mkDerivation { sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm"; }; + patches = [ (fetchpatch { + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocamlnet/ocamlnet.4.1.5/files/netgzip.patch"; + sha256 = "1say7zzgk24qcy9m91gcfgvz4fv7nksx4j5qnbxyq8wqw0g88ba0"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix index d8ce0dbc7ea..2b821cd6dd6 100644 --- a/pkgs/development/ocaml-modules/pa_bench/default.nix +++ b/pkgs/development/ocaml-modules/pa_bench/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "pa_bench"; - version = "112.06.00"; + version = "113.00.00"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/pa_bench/archive/${version}.tar.gz"; - sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870"; + sha256 = "1cd6291gdnk6h8ziclg6x3if8z5xy67nfz9gx8sx4k2cwv0j29k5"; }; buildInputs = [ pa_ounit ]; diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix index fa9a9f8f86a..1ab1c5fa7bc 100644 --- a/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "pipebang"; - version = "110.01.00"; + version = "113.00.00"; minimumSupportedOcamlVersion = "4.00"; src = fetchurl { url = "https://github.com/janestreet/pipebang/archive/${version}.tar.gz"; - sha256 = "a8858d9607c15cdf0a775196be060c8d91de724fc80a347d7a76ef1d38329096"; + sha256 = "0acm2y8wxvnapa248lkgm0vcc44hlwhrjxqkx1awjxzcmarnxhfk"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix index 52c28efcb49..2dc7ef2b13e 100644 --- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ppx_derivers-${version}"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "diml"; repo = "ppx_derivers"; rev = version; - sha256 = "049yy9706lv1li6a1bibkz1qq2ixxbdyhf4f5w9pv71jc3dlpfy8"; + sha256 = "0bnhihl1w31as5w2czly1v3d6pbir9inmgsjg2cj6aaj9v1dzd85"; }; buildInputs = [ ocaml findlib jbuilder ]; diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index b680bcdd48c..5d27dc35396 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -2,7 +2,7 @@ buildOcaml rec { name = "ppx_tools_versioned"; - version = "5.0.1"; + version = "5.1"; minimumSupportedOcamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildOcaml rec { owner = "let-def"; repo = "ppx_tools_versioned"; rev = version; - sha256 = "1rpbxbhk3k7f61h7lr4qkllkc12gjpq0rg52q7i6hcrg2dxkhwh6"; + sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624"; }; propagatedBuildInputs = [ ocaml-migrate-parsetree ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 3886af37512..b24d799cf28 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ssl-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchzip { url = "https://github.com/savonet/ocaml-ssl/releases/download/${version}/ocaml-ssl-${version}.tar.gz"; - sha256 = "01sy3f94b463ff7dmkfsv67jh8g8h20wh7npjwqilniif7lgf4l3"; + sha256 = "0j5zvsx51dg5r7sli7bakv7gfd29z890h0xzi876pg9vywwz9w7l"; }; buildInputs = [which ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index 42771d1e35f..129f9dd7289 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-stdint-${version}"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "andrenth"; repo = "ocaml-stdint"; rev = version; - sha256 = "18nh23yx4ghgq7mjf4mdyq8kj1fdw5d0abw919s8n4mv21cmpwia"; + sha256 = "1xjzqq13m7cqrfwa6vcwxirm17w8bx025dgnjqjgd3k2lxfgd1j7"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index c2e5a1fc929..6b27f00fb15 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, ocamlbuild, opam }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-uchar-0.0.1"; + name = "ocaml${ocaml.version}-uchar-0.0.2"; src = fetchurl { - url = https://github.com/ocaml/uchar/releases/download/v0.0.1/uchar-0.0.1.tbz; - sha256 = "0ficw1x7ymbd6m8hqw3w1aycwm1hbwd6bad3c5pspwnzh3qlikhi"; + url = https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz; + sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index 5daa505429e..924ce07c8e7 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -7,15 +7,14 @@ buildPythonPackage rec { pname = "cached-property"; - version = "1.4.0"; + version = "1.4.2"; # conftest.py is missing in PyPI tarball - # https://github.com/pydanny/cached-property/pull/87 src = fetchFromGitHub { owner = "pydanny"; repo = pname; rev = version; - sha256 = "0w7709grs4yqhfbnn7lva2fgyphvh43xcfqhi95lhh8sjad3xwkw"; + sha256 = "0gjmgfilhljkx2b60cjikwh55jg2jwxhwi8hgkrzdnzk465ywhrw"; }; checkInputs = [ pytest freezegun ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix new file mode 100644 index 00000000000..b5ac0f7b7b1 --- /dev/null +++ b/pkgs/development/python-modules/py3status/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, requests +, pytz +, tzlocal + +, file +, acpi +, coreutils +, alsaUtils +, i3 +, procps +, lm_sensors +, libnotify +, xorg +}: + +buildPythonPackage rec { + pname = "py3status"; + version = "3.8"; + src = fetchPypi { + inherit pname version; + sha256 = "1izjpf9q768m3j95y328vbdh7rycglqlslyd777b12c13i6zs6cb"; + }; + doCheck = false; + propagatedBuildInputs = [ pytz requests tzlocal ]; + buildInputs = [ file ]; + prePatch = '' + sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py + sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py + sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py + sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py + sed -i -e "s|'amixer|'${alsaUtils}/bin/amixer|" py3status/modules/volume_status.py + sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py + sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py + sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py + sed -i -e "s|'setxkbmap|'${xorg.setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py + sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py + ''; + + meta = with stdenv.lib; { + description = "Extensible i3status wrapper"; + license = licenses.bsd3; + homepage = https://github.com/ultrabug/py3status; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 02f44f4bf70..6019235c47b 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.82"; + version = "1.83"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0kk9injrxbv4mmmjswrh1kidal6l0sdzbp40kv8vwf5aiv8jjaz0"; + sha256 = "14d4afjz0jshwpqryvwvzrs3rrqnd7cgg3x19awgy116591ibd83"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index e59633a8571..eedea46f076 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "0w6j9isrcr1iqrwjlpv73l09wyqknd426almnpnzmqd1m10wwxsz"; + sha256 = "1pqw70qghzp6k0wal9nzqrd6wis0ha23i06s04l6wrf6kkc77ski"; }; patchPhase = '' diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 78195e994c9..2ea87fe6d7f 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -8,18 +8,18 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" let - uhdVer = "003_010_003_000"; - ImgVer = stdenv.lib.replaceStrings ["_"] ["."] uhdVer; + uhdVer = "v" + version; + ImgVer = "uhd-images_3.11.0.git-227-g9277fc58.tar.xz"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz - # and xxx.yyy.zzz. Hrmpf... - version = "3.10.3.0"; + # and xxx.yyy.zzz. Hrmpf... style keeps changing + version = "3.11.0.0"; # Firmware images are downloaded (pre-built) from: # http://files.ettus.com/binaries/images/ uhdImagesSrc = fetchurl { - url = "http://files.ettus.com/binaries/images/uhd-images_${ImgVer}-release.tar.gz"; - sha256 = "198awvw6zsh19ydgx5qry5yc6yahdval9wjrsqbyj51pnr6s5qvy"; + url = "http://files.ettus.com/binaries/images/${ImgVer}"; + sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z"; }; in stdenv.mkDerivation { @@ -28,19 +28,24 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "release_${uhdVer}"; - sha256 = "1aj8qizbyz4shwawj3qlhl6pyyda59hhgm9cwrj7s5kfdi4vdlc3"; + rev = "${uhdVer}"; + sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q"; }; enableParallelBuilding = true; - cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"; + # ABI differences GCC 7.1 + # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 + + cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ + [ (stdenv.lib.optionalString stdenv.isArm "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ]; # Build only the host software preConfigure = "cd host"; + patches = if stdenv.isArm then ./neon.patch else null; postPhases = [ "installFirmware" ]; @@ -60,6 +65,6 @@ in stdenv.mkDerivation { homepage = https://uhd.ettus.com/; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor fpletz ]; + maintainers = with maintainers; [ bjornfor fpletz tomberek ]; }; } diff --git a/pkgs/development/tools/misc/uhd/neon.patch b/pkgs/development/tools/misc/uhd/neon.patch new file mode 100644 index 00000000000..18ec59c1d64 --- /dev/null +++ b/pkgs/development/tools/misc/uhd/neon.patch @@ -0,0 +1,19 @@ +Description: When building for armhf, enable NEON + NEON is part of the armhf baseline, so this will always be enabled on + armhf. +Author: Paul Tagliamonte <paultag@debian.org> +Bug-Debian: https://bugs.debian.org/873608 +Origin: vendor +Last-Update: 2017-08-29 + +--- uhd-3.10.2.0.orig/host/lib/convert/CMakeLists.txt ++++ uhd-3.10.2.0/host/lib/convert/CMakeLists.txt +@@ -67,6 +67,8 @@ IF(HAVE_ARM_NEON_H AND (${CMAKE_SIZEOF_V + ${CMAKE_CURRENT_SOURCE_DIR}/convert_with_neon.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/convert_neon.S + ) ++ ++ SET ( CMAKE_CXX_FLAGS "-mfpu=neon" ) + ENDIF() + + ######################################################################## diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index b6e439e4e17..3f42e71e778 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib }: let - version = "0.11.0"; + version = "0.12.0"; in stdenv.mkDerivation { name = "ocamlbuild-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "0c8lv15ngmrc471jmkv0jp3d573chibwnjlavps047d9hd8gwxak"; + sha256 = "1shyim50ms0816fphc4mk0kldcx3pnba2i6m10q0cbm18m9d7chq"; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 2876464ab50..df480903d15 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -10,9 +10,16 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + configurePhase = '' + substituteInPlace src/ocamlify.ml --replace 'OCamlifyConfig.version' '"0.0.2"' + ''; + + buildPhase = "ocamlbuild src/ocamlify.native"; + + installPhase = '' + mkdir -p $out/bin + mv _build/src/ocamlify.native $out/bin/ocamlify + ''; dontStrip = true; diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/development/tools/parsing/peg/default.nix index 1706b5448e1..3a273e1ddbf 100644 --- a/pkgs/development/tools/parsing/peg/default.nix +++ b/pkgs/development/tools/parsing/peg/default.nix @@ -1,20 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "peg-0.1.4"; + name = "peg-0.1.18"; src = fetchurl { url = "${meta.homepage}/${name}.tar.gz"; - sha256 = "01agf4fbqv0r1xyqvj0va8kcrh3f2ka59f1aqvzfrabn7n5p8ik4"; + sha256 = "114h1y4k8fwcq9m0hfk33dsp7ah8zxzjjzlk71x4iirzczfkn690"; }; preBuild="makeFlagsArray+=( PREFIX=$out )"; - preInstall='' - mkdir -pv $out/bin $out/share/man/man1 - cp -pv *.1 $out/share/man/man1 - ''; - meta = { homepage = http://piumarta.com/software/peg/; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 39f26ed97cc..cc56e57794a 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,7 +6,7 @@ let allSpecs = { "x86_64-linux" = { system = "linux64"; - sha256 = "1m119kbsr6gm8a37q92rflp5mp3fjzw8cy4r5j4bnihkai7khq94"; + sha256 = "1pryrz4ry0pk6kawvj8sxhpqh6c6npxhm187412y2l598dcf9pwl"; }; "x86_64-darwin" = { @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.36"; + version = "2.37"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index eb626d0aa58..f6687f4e432 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,21 +1,29 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, sqlite }: buildGoPackage rec { name = "textql-${version}"; version = "2.0.3"; - rev = "${version}"; goPackagePath = "github.com/dinedal/textql"; src = fetchFromGitHub { - inherit rev; - owner = "dinedal"; - repo = "textql"; + owner = "dinedal"; + repo = "textql"; + rev = version; sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; }; + postInstall = '' + install -Dm644 -t $out/share/man/man1 ${src}/man/textql.1 + ''; + + # needed for tests + nativeBuildInputs = [ sqlite ]; + goDeps = ./deps.nix; + doCheck = true; + meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; homepage = https://github.com/dinedal/textql; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 03db11df5e4..df46cf3ab92 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -18,11 +18,11 @@ let runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.14.9"; + version = "5.15.0"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "0hq9pcfw1ic2acaknwp2d5yphg901dmk7d4n7ikx42nya8p39c6j"; + sha256 = "17pxgxpss5jxzpmcim7hkyyj0fgyxwdiyxb2idpsna2hmhaipyxa"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix new file mode 100644 index 00000000000..6bbb58c1a18 --- /dev/null +++ b/pkgs/games/enyo-doom/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab, cmake, qtbase }: + +stdenv.mkDerivation rec { + name = "enyo-doom-${version}"; + version = "1.05"; + + src = fetchFromGitLab { + owner = "sdcofer70"; + repo = "enyo-doom"; + rev = version; + sha256 = "1bmpgqwcp7640dbq1w8bkbk6mkn4nj5yxkvmjrl5wnlg0m1g0jr7"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase ]; + + enableParallelBuilding = true; + + meta = { + homepage = "https://gitlab.com/sdcofer70/enyo-doom"; + description = "Frontend for Doom engines"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.tadfisher ]; + }; +} diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index d0a8469dd1d..78fdb32b436 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "1m29s6shnp7c9qh7pzdbvhy7i5awyzn1hr39xkinrpwgvsxa0lgy"; + sha256 = "0zq8xdg0k92p3s4j9x76591zaqz7k9ra69q008m209vdfffjvly2"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index 7e31202754a..b84e7dd3af6 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${project}-${version}"; project = "rocksndiamonds"; - version = "4.0.1.3"; + version = "4.0.1.4"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz"; - sha256 = "0y8w96hav7k5qwpm6rvzn3g4czfpsc58dix3x98anqii9l6vwrdd"; + sha256 = "0rvi4crfh4rfczpsflzcfj6nqrg49mhm163k6ms9gxz97xj2jp3g"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 5fcb5063bbc..1c145f6d71c 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -3,12 +3,12 @@ assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "terraria-server-${version}"; - version = "1.3.1.1"; + version = "1.3.5.3"; urlVersion = lib.replaceChars ["."] [""] version; src = fetchurl { url = "http://terraria.org/server/terraria-server-${urlVersion}.zip"; - sha256 = "0bwh0na0dy6cjc1xchd5sp3c7av50q38hk03219dmqd72n9p44rq"; + sha256 = "0l7j2n6ip4hxph7dfal7kzdm3dqnm1wba6zc94gafkh97wr35ck3"; }; buildInputs = [ file unzip ]; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index d17c0f295e8..663da1eb114 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.4"; + version = "3.5"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4"; + sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - sha256 = "11cdymdd0qf8khhrakzj7qz12gx19h2a30r8bimbx6rriqryhlc2"; + sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 3198086ffb6..a14a32bc026 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,5 @@ # TODO check that no license information gets lost -{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip +{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby , which, fetchgit, llvmPackages, rustPlatform , xkb_switch, rustracerd, fzf, skim , python3, boost, icu, ncurses @@ -52,39 +52,49 @@ rec { # Update with vimUtils.vimPlugins.pluginnames2Nix command # aliasess - "sourcemap.vim" = sourcemap; - Colour_Sampler_Pack = Colour-Sampler-Pack; - Gundo = gundo-vim; # backwards compat, added 2015-10-03 - YouCompleteMe = youcompleteme; airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 calendar = calendar-vim; coffee-script = vim-coffee-script; coffeeScript = coffee-script; # backwards compat, added 2014-10-18 - colors-solarized = Solarized; + Solarized = vim-colors-solarized; + solarized = vim-colors-solarized; + caw = caw-vim; colorsamplerpack = Colour_Sampler_Pack; + Colour_Sampler_Pack = Colour-Sampler-Pack; command_T = command-t; # backwards compat, added 2014-10-18 + commentary = vim-commentary; committia = committia-vim-git; concealedyank = concealedyank-vim; context-filetype = context_filetype-vim; + Cosco = cosco-vim; css_color_5056 = vim-css-color; + CSApprox = csapprox; + csv = csv-vim; ctrlp = ctrlp-vim; cute-python = vim-cute-python-git; denite = denite-nvim; easy-align = vim-easy-align; + easygit = vim-easygit; easymotion = vim-easymotion; echodoc = echodoc-vim; eighties = vim-eighties; - ghc-mod-vim = ghcmod; - gist-vim = Gist; + extradite = vim-extradite; + fugitive = vim-fugitive; + ghc-mod-vim = ghcmod-vim; + ghcmod = ghcmod-vim; + goyo = goyo-vim; + Gist = gist-vim; gitgutter = vim-gitgutter; gundo = gundo-vim; + Gundo = gundo-vim; # backwards compat, added 2015-10-03 haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 haskellConcealPlus = vim-haskellConcealPlus; haskellconceal = vim-haskellconceal; hier = vim-hier; hlint-refactor = hlint-refactor-vim; - hoogle = Hoogle; + hoogle = vim-hoogle; + Hoogle = vim-hoogle; ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; mayansmoke = mayansmoke-git; @@ -95,36 +105,57 @@ rec { neomru = neomru-vim; neosnippet = neosnippet-vim; neoyank = neoyank-vim-git; - nerdcommenter = The_NERD_Commenter; - nerdtree = The_NERD_tree; + The_NERD_Commenter = nerdcommenter; + The_NERD_tree = nerdtree; open-browser = open-browser-vim; + pathogen = vim-pathogen; peskcolor = peskcolor-vim-git; polyglot = vim-polyglot; + prettyprint = vim-prettyprint; quickrun = vim-quickrun; + rainbow_parentheses = rainbow_parentheses-vim; repeat = vim-repeat; + riv = riv-vim; rhubarb = vim-rhubarb; + sensible = vim-sensible; signature = vim-signature; + snipmate = vim-snipmate; + sourcemap = sourcemap-vim; + "sourcemap.vim" = sourcemap-vim; + surround = vim-surround; + sleuth = vim-sleuth; solidity = vim-solidity; stylish-haskell = vim-stylish-haskell; stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 - supertab = Supertab; - syntastic = Syntastic; + Supertab = supertab; + Syntastic = syntastic; + SyntaxRange = vim-SyntaxRange; + table-mode = vim-table-mode; + taglist = taglist-vim; tabpagebuffer = tabpagebuffer-vim; - tabular = Tabular; - tagbar = Tagbar; + tabpagecd = vim-tabpagecd; + Tabular = tabular; + Tagbar = tagbar; thumbnail = thumbnail-vim; + tlib = tlib_vim; tmux-navigator = vim-tmux-navigator; tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = tslime-vim; unite = unite-vim; + Ultisnips = ultisnips; vim-grepper = vim-grepper-git; vim-test = vim-test-git; vimproc = vimproc-vim; vimshell = vimshell-vim; + vinegar = vim-vinegar; watchdogs = vim-watchdogs; - webapi-vim = WebAPI; + WebAPI = webapi-vim; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 - yankring = YankRing; + yankring = YankRing-vim; + Yankring = YankRing-vim; + YouCompleteMe = youcompleteme; + xterm-color-table = xterm-color-table-vim; + zeavim = zeavim-vim; # do not auto-update this one, as the name clashes with vim-snippets vim-docbk-snippets = buildVimPluginFrom2Nix { @@ -175,406 +206,378 @@ rec { }; # --- generated packages bellow this line --- - - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CSApprox-2013-07-26"; + vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-auto-save-2017-11-08"; src = fetchgit { - url = "git://github.com/godlygeek/csapprox"; - rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; - sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; + url = "https://github.com/907th/vim-auto-save"; + rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; + sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; }; dependencies = []; }; - CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2017-03-15"; + vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-autoformat-2018-03-02"; src = fetchgit { - url = "git://github.com/chrisbra/CheckAttach"; - rev = "b583efd45e03902438a55299623390a0f9253513"; - sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34"; + url = "https://github.com/Chiel92/vim-autoformat"; + rev = "e63b4e957ad034494b1495d4b4ac1a18503cba79"; + sha256 = "1p64q9a7wqppy1zj70xki86zs5wwxbf9x0wdd4fsg0w741ga9wdf"; }; dependencies = []; }; - Cosco = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Cosco-2018-02-15"; + ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-py-matcher-2017-11-01"; src = fetchgit { - url = "git://github.com/lfilho/cosco.vim"; - rev = "434dc68b93b8f42babe1887a269145ce39c97edf"; - sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv"; + url = "https://github.com/FelikZ/ctrlp-py-matcher"; + rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; + sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; }; dependencies = []; }; - Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2016-10-10"; + ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-cmatcher-2015-10-15"; src = fetchgit { - url = "git://github.com/mattn/gist-vim"; - rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; - sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; + url = "https://github.com/JazzCore/ctrlp-cmatcher"; + rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; + sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; }; dependencies = []; - + buildInputs = [ python ]; + buildPhase = '' + patchShebangs . + ./install.sh + ''; }; - Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Hoogle-2018-03-04"; + zeavim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "zeavim-vim-2018-03-22"; src = fetchgit { - url = "git://github.com/Twinside/vim-hoogle"; - rev = "871d104c92e33cb238506f2805f1652561978cc8"; - sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; + url = "https://github.com/KabbAmine/zeavim.vim"; + rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa"; + sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj"; }; dependencies = []; }; - Solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Solarized-2011-05-09"; + vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-nix-2018-03-27"; src = fetchgit { - url = "git://github.com/altercation/vim-colors-solarized"; - rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; + url = "https://github.com/LnL7/vim-nix"; + rev = "397df60e143e26418ed08a9a984013d62442cad6"; + sha256 = "0s0sclf01m4jjql8r10s9277yrpwkn18zn2dk62nz3dvhcvd26ai"; }; dependencies = []; }; - Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2017-11-14"; + vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-actions-2018-01-18"; src = fetchgit { - url = "git://github.com/ervandew/supertab"; - rev = "40fe711e088e2ab346738233dd5adbb1be355172"; - sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + url = "https://github.com/MarcWeber/vim-addon-actions"; + rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; + sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2018-02-20"; + vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-async-2017-03-20"; src = fetchgit { - url = "git://github.com/scrooloose/syntastic"; - rev = "b7b473b2688827dcd7d8c801197b8bfc31b20dc4"; - sha256 = "11nwzgb5s75z348px81mmxh681rs25ccls9x5z8f36i7ykq46j1x"; + url = "https://github.com/MarcWeber/vim-addon-async"; + rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; + sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; }; - dependencies = []; + dependencies = ["vim-addon-signs"]; }; - SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "SyntaxRange-2018-03-09"; + vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-background-cmd-2015-12-11"; src = fetchgit { - url = "git://github.com/inkarkat/vim-SyntaxRange"; - rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; - sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; + url = "https://github.com/MarcWeber/vim-addon-background-cmd"; + rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; + sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils"]; }; - Tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tabular-2016-05-04"; + vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-commenting-2013-06-10"; src = fetchgit { - url = "git://github.com/godlygeek/tabular"; - rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; - sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; + url = "https://github.com/MarcWeber/vim-addon-commenting"; + rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; + sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; }; dependencies = []; }; - Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-12-17"; + vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-completion-2015-02-10"; src = fetchgit { - url = "git://github.com/majutsushi/tagbar"; - rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; - sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9"; + url = "https://github.com/MarcWeber/vim-addon-completion"; + rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; + sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; }; - dependencies = []; + dependencies = ["tlib"]; }; - The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2018-03-03"; + vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-errorformats-2014-11-05"; src = fetchgit { - url = "git://github.com/scrooloose/nerdcommenter"; - rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1"; - sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4"; + url = "https://github.com/MarcWeber/vim-addon-errorformats"; + rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; + sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; }; dependencies = []; }; - The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2018-03-13"; + vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-goto-thing-at-cursor-2012-01-11"; src = fetchgit { - url = "git://github.com/scrooloose/nerdtree"; - rev = "a172d7cfcb4fe9b927dcc24184204fc89d826301"; - sha256 = "1nfk1j2n2jgrdhcahva1kq3qjj4fdn1x20xxvgl88v3j3fj62n0f"; + url = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; + rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; + sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; }; - dependencies = []; + dependencies = ["tlib"]; }; - UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2017-06-30"; + vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-local-vimrc-2015-03-19"; src = fetchgit { - url = "git://github.com/SirVer/ultisnips"; - rev = "423f264e753cec260b4f14455126e6db7ba429af"; - sha256 = "19g3k0nqzizv39rxwgkca9n2gsd19z2wwsmicr0zcgnf50nhkznh"; + url = "https://github.com/MarcWeber/vim-addon-local-vimrc"; + rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; + sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; }; dependencies = []; }; - VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner-2018-02-17"; + vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-manager-2017-05-07"; src = fetchgit { - url = "git://github.com/vimoutliner/vimoutliner"; - rev = "ec4dc9bd932a0cce476a3f8f0a78ca61ff94188c"; - sha256 = "0fj3ya7n9wfbnkcdwp9kggm8c3p5jm3iwzbk4gdqjmhqkvdfz5rk"; + url = "https://github.com/MarcWeber/vim-addon-manager"; + rev = "2434225ae48e608c2b6ac86c8da1c62209da746f"; + sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb"; }; dependencies = []; - + buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; }; - WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2018-02-08"; + vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-mru-2013-08-08"; src = fetchgit { - url = "git://github.com/mattn/webapi-vim"; - rev = "6459fbdd7fd38c4630fb49e9c687946633b58849"; - sha256 = "0ndskj9rw526kgl1y645w1gqmsdw3268ps1armccadjj9d8flkdi"; - }; - dependencies = []; - - }; - - YankRing = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "YankRing"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=23487"; - name = "yankring_190.zip"; - sha256 = "0nnxpsfjp2p9jvs3y5ynnd5s56snz9927zdp9bgmay2jgxfmp0si"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - homepage = "http://www.vim.org/scripts/script.php?script_id=1234"; + url = "https://github.com/MarcWeber/vim-addon-mru"; + rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; + sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; }; + dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; - sourceRoot = "."; }; - caw = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "caw-2018-01-01"; + vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-mw-utils-2018-03-09"; src = fetchgit { - url = "git://github.com/tyru/caw.vim"; - rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42"; - sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari"; + url = "https://github.com/MarcWeber/vim-addon-mw-utils"; + rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2"; + sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f"; }; dependencies = []; }; - clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clang_complete-2018-01-18"; - src = fetchgit { - url = "git://github.com/Rip-Rip/clang_complete"; - rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; - sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; - }; - dependencies = []; - # In addition to the arguments you pass to your compiler, you also need to - # specify the path of the C++ std header (if you are using C++). - # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). - # The linked ruby code shows generates the required '.clang_complete' for cmake based projects - # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile') - preFixup = '' - substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ - --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" - ''; - }; - - commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "commentary-2017-10-09"; + vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-nix-2017-09-11"; src = fetchgit { - url = "git://github.com/tpope/vim-commentary"; - rev = "89f43af18692d22ed999c3097e449f12fdd8b299"; - sha256 = "0nqm4s00c607r58fz29n67r2z5p5r9qayl5y1chy8bcrl59m17a2"; + url = "https://github.com/MarcWeber/vim-addon-nix"; + rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; + sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; }; - dependencies = []; + dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; }; - csv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csv-2018-01-03"; + vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-other-2014-07-15"; src = fetchgit { - url = "git://github.com/chrisbra/csv.vim"; - rev = "a50b977fa25a854e7d099198bfa65e2dc680898b"; - sha256 = "02a6289rbjw8r0l668ala5abfr2rls3slrnk4yrsfc6ka550zj9y"; + url = "https://github.com/MarcWeber/vim-addon-other"; + rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; + sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; }; - dependencies = []; + dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; }; - ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-cmatcher-2015-10-15"; + vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-php-manual-2015-01-01"; src = fetchgit { - url = "git://github.com/JazzCore/ctrlp-cmatcher"; - rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; - sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; + url = "https://github.com/MarcWeber/vim-addon-php-manual"; + rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; + sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; }; dependencies = []; - buildInputs = [ python ]; - buildPhase = '' - patchShebangs . - ./install.sh - ''; + }; - ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2017-11-01"; + vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-signs-2013-04-19"; src = fetchgit { - url = "git://github.com/FelikZ/ctrlp-py-matcher"; - rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; - sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; + url = "https://github.com/MarcWeber/vim-addon-signs"; + rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; + sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; }; dependencies = []; }; - ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-z-2015-10-17"; + vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-sql-2017-02-11"; src = fetchgit { - url = "git://github.com/amiorin/ctrlp-z"; - rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; - sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + url = "https://github.com/MarcWeber/vim-addon-sql"; + rev = "048a139af36829fce670c8ff80d3aad927557ee6"; + sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; }; - dependencies = []; + dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; }; - easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "easygit-2017-08-11"; + vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-syntax-checker-2017-06-26"; src = fetchgit { - url = "git://github.com/chemzqm/vim-easygit"; - rev = "8f66da54da627395309548efee6d8705b7f50768"; - sha256 = "013jl330k9yjcvzzqhwz93adm4349gkl3q1c55m1zfkg3afmvnwd"; + url = "https://github.com/MarcWeber/vim-addon-syntax-checker"; + rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; + sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "extradite-2015-09-22"; + vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-toggle-buffer-2012-01-13"; src = fetchgit { - url = "git://github.com/int3/vim-extradite"; - rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; - sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; + url = "https://github.com/MarcWeber/vim-addon-toggle-buffer"; + rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; + sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; }; - dependencies = []; + dependencies = ["vim-addon-mw-utils" "tlib"]; }; - forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "forms-2012-11-28"; + vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-xdebug-2014-08-29"; src = fetchgit { - url = "git://github.com/megaannum/forms"; - rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; - sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; + url = "https://github.com/MarcWeber/vim-addon-xdebug"; + rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; + sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; }; - dependencies = ["self"]; + dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; }; - fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2018-03-14"; + tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tsuquyomi-2018-03-23"; src = fetchgit { - url = "git://github.com/tpope/vim-fugitive"; - rev = "3e0bd86b99c50691f830d9e25a4bbe2a88078f8f"; - sha256 = "1prfb0m61r499i35qn1ql2pag5w64mhpkby4wbbvlpm50xwq8w9b"; + url = "https://github.com/Quramy/tsuquyomi"; + rev = "94f10d312134fc59b53b2e821d3315320f694cf0"; + sha256 = "1f084y9vv8rkb2d0ig6lc40sbdchpfc68fkxlvaky4jk1l1l89ay"; }; dependencies = []; }; - ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2016-06-19"; + clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "clang_complete-2018-01-18"; src = fetchgit { - url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; - sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; + url = "https://github.com/Rip-Rip/clang_complete"; + rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; + sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; }; dependencies = []; - + # In addition to the arguments you pass to your compiler, you also need to + # specify the path of the C++ std header (if you are using C++). + # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). + # The linked ruby code shows generates the required '.clang_complete' for cmake based projects + # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 + # as an alternative you can execute the following command: + # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile') + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ + --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" + ''; }; - vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2017-11-08"; + riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "riv-vim-2018-01-21"; src = fetchgit { - url = "https://github.com/907th/vim-auto-save"; - rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; - sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; + url = "https://github.com/Rykka/riv.vim"; + rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09"; + sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j"; }; dependencies = []; }; - vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2018-03-02"; + deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-nvim-2018-04-07"; src = fetchgit { - url = "https://github.com/Chiel92/vim-autoformat"; - rev = "e63b4e957ad034494b1495d4b4ac1a18503cba79"; - sha256 = "1p64q9a7wqppy1zj70xki86zs5wwxbf9x0wdd4fsg0w741ga9wdf"; + url = "https://github.com/Shougo/deoplete.nvim"; + rev = "34ca8838dfd9600b0a777ecaafafb1e61c8f385b"; + sha256 = "0zca5sm05lix94jmwl88i89d7w7sbd5bz01vfaqq42g2w6yqz4x4"; }; dependencies = []; }; - vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-02-25"; + ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ultisnips-2018-04-08"; src = fetchgit { - url = "https://github.com/LnL7/vim-nix"; - rev = "36c5feb514930e8fb8e2f4567d6b0d9e806fc2eb"; - sha256 = "1v0vm0h5j6zzwhm5gw3xcmckswma3a5kxyli34i8hy14yli0ff3d"; + url = "https://github.com/SirVer/ultisnips"; + rev = "1e35bb3802f4b381b3ec067148f4868bf7536492"; + sha256 = "1qxzvpz7dp8786wfzrm837gy27ig1s8w6i1va29arns16wnhil3f"; }; dependencies = []; }; - tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2018-03-02"; + vim-hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-hoogle-2018-03-04"; src = fetchgit { - url = "https://github.com/Quramy/tsuquyomi"; - rev = "064f5a2ccaf642681634cf06b8ce45751e1d0475"; - sha256 = "12pik378p5c2w219yg8pb8lrdkhxvk0mvkji9dhh0h5v9yzk5x4z"; + url = "https://github.com/Twinside/vim-hoogle"; + rev = "871d104c92e33cb238506f2805f1652561978cc8"; + sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; }; dependencies = []; }; - deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-02-28"; + vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gitgutter-2018-03-26"; src = fetchgit { - url = "https://github.com/Shougo/deoplete.nvim"; - rev = "642f9e9b0ed9457734d974aeb9417192077b7551"; - sha256 = "1si07fw1ckgdl74xx0bq6hhd0nyi67gkjanqz4v317zpmzhcvi76"; + url = "https://github.com/airblade/vim-gitgutter"; + rev = "3724e1c207c980b5de914b4857e8b44dc3551506"; + sha256 = "0p9jnsvm59cddcklx5rv5x87pifhxphdcc892ip4vj7pb3mlppmh"; }; dependencies = []; }; Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2017-11-22"; + name = "Spacegray-vim-2018-04-07"; src = fetchgit { url = "https://github.com/ajh17/Spacegray.vim"; - rev = "9a952cee86397ce28aef890209ccee2397d9a32e"; - sha256 = "0ddxkmqcjns0vznqcwji835kkn8pps93kyksx34b57ssr1qq28d1"; + rev = "255a6086aa5af07e38e441964623029a39fa17c1"; + sha256 = "0pfwmazcmsz9wdjmbw6hjcvbsd9j99jrjxw81xy1s6vqxmlhi8gj"; }; dependencies = []; @@ -591,6 +594,17 @@ rec { }; + vim-colors-solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-colors-solarized-2011-05-09"; + src = fetchgit { + url = "https://github.com/altercation/vim-colors-solarized"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; + }; + dependencies = []; + + }; + vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-closetag-2018-03-09"; src = fetchgit { @@ -602,6 +616,28 @@ rec { }; + ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-z-2015-10-17"; + src = fetchgit { + url = "https://github.com/amiorin/ctrlp-z"; + rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; + sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + }; + dependencies = []; + + }; + + vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-logreview-2017-07-08"; + src = fetchgit { + url = "https://github.com/andreshazard/vim-logreview"; + rev = "b7b66ab338e904127d796af49235b8c29742f18f"; + sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; + }; + dependencies = []; + + }; + peskcolor-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "peskcolor-vim-git-2016-06-11"; src = fetchgit { @@ -647,11 +683,11 @@ rec { }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2018-01-24"; + name = "clighter8-2018-03-17"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "314ab6887cfe785146b86d754441904a927f7999"; - sha256 = "1j2lfx10r978348nycw5mpg2ahwiqcgqml2g2vps5yy9x891fzya"; + rev = "4313362e34fd3ba8fe224879cf6b7d19220e21f3"; + sha256 = "1h7qpa8i1phnyvflzfnlmv7xz3gssr1n2rqgz24p1c15dyls2p7w"; }; dependencies = []; preFixup = '' @@ -661,11 +697,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-03-18"; + name = "neomake-2018-04-08"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "b225234f71983ed95aac6efb8e4c43ee950a4f20"; - sha256 = "19v0c710yyjd0rlhz43frsh1kcdnj602xz7flqfpv6kbcr5lsq22"; + rev = "2363dc4141930ad1bc3ddbdaf76fc22bd4b7568b"; + sha256 = "1navsxwfws5acc96mhfqfk7vkns3a6r7ms21qp77ry20v57r0yxl"; }; dependencies = []; @@ -705,22 +741,22 @@ rec { }; denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-extra-2017-11-03"; + name = "denite-extra-2018-03-18"; src = fetchgit { url = "https://github.com/chemzqm/denite-extra"; - rev = "2cea3e857b51fcde425339adeec12854e6cecbb6"; - sha256 = "1qa0ajs6vix0vvm1z7rhxq9bfx4aggq97gxghrxpvsc059c7w9wv"; + rev = "c48443ba1a27375b8a3c04b7b0a5b2c96c7ff62b"; + sha256 = "142s6c4af7h0jrnyl0smflg2wmkwsvhvly04rci3p54x59w7xdc5"; }; dependencies = []; }; denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-git-2017-11-02"; + name = "denite-git-2018-03-20"; src = fetchgit { url = "https://github.com/chemzqm/denite-git"; - rev = "d40026c9b2c0e53ecdd3883d26260f19c74c7dfe"; - sha256 = "0c9602pj67hqfkyvanz5gw1s6vlf8q7s9r55g4dws5aakvjbqc0g"; + rev = "d1feb1470f667a5086ae45136642cefa5fc74810"; + sha256 = "001mwa6691a46lv9m9w8gb2syxgsny6ifv4l80f1chb7hjkblkhh"; }; dependencies = []; @@ -737,6 +773,50 @@ rec { }; + sourcemap-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sourcemap-vim-2012-09-19"; + src = fetchgit { + url = "https://github.com/chikatoike/sourcemap.vim"; + rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; + sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; + }; + dependencies = []; + + }; + + CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "CheckAttach-2017-03-15"; + src = fetchgit { + url = "https://github.com/chrisbra/CheckAttach"; + rev = "b583efd45e03902438a55299623390a0f9253513"; + sha256 = "0j1nx8ryrlixisd8z2d24k1xk2yrqk4i0ar8m4vq3jlr74309a34"; + }; + dependencies = []; + + }; + + csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "csv-vim-2018-03-14"; + src = fetchgit { + url = "https://github.com/chrisbra/csv.vim"; + rev = "0b4c23fde82443ed4015ec90953d5a64e7c26266"; + sha256 = "0718vnccs6flla713f8mrwpw6r56w3rr5yr544rsc97p4p4m2vvg"; + }; + dependencies = []; + + }; + + sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sparkup-2012-06-10"; + src = fetchgit { + url = "https://github.com/chrisgeo/sparkup"; + rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; + sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; + }; + dependencies = []; + + }; + vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-sort-motion-2018-03-05"; src = fetchgit { @@ -760,33 +840,55 @@ rec { }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2017-03-31"; + name = "spacevim-2018-03-29"; src = fetchgit { url = "https://github.com/ctjhoa/spacevim"; - rev = "f4cd52c1746021bb3278c6a085e8d07f1c1a9258"; - sha256 = "0y146z0w1cbqwzw84k479a5hxs1phg1s11fqfvszn8928fsm8c4d"; + rev = "30142a518ba77feb22791b5cb2387d88b70c58f2"; + sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2018-02-10"; + name = "ctrlp-vim-2018-04-03"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "35c9b961c916e4370f97cb74a0ba57435a3dbc25"; - sha256 = "08g1w7lfxpp0b175fkyyb8njpz7jwysfba0s20873f2frj6c77rc"; + rev = "c13c1249fd3bf99c44eb80dfabd7eb7ea0fe09bd"; + sha256 = "1x5ykqx9g1hxi7fk7cg9hnh9778fpr65bkinbykqc306dbnrdy4g"; + }; + dependencies = []; + + }; + + vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim2hs-2014-04-16"; + src = fetchgit { + url = "https://github.com/dag/vim2hs"; + rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; + sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; + }; + dependencies = []; + + }; + + quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "quickfixstatus-2011-09-02"; + src = fetchgit { + url = "https://github.com/dannyob/quickfixstatus"; + rev = "fd3875b914fc51bbefefa8c4995588c088163053"; + sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; }; dependencies = []; }; agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2017-11-21"; + name = "agda-vim-2018-03-16"; src = fetchgit { url = "https://github.com/derekelkins/agda-vim"; - rev = "13e3b24aeb8677205ff43a79c6c7e090a602b31a"; - sha256 = "17vp11x1w9bibl5ibsvhw5m5ma2r8pzddshgxdvfg22wprx0kcp0"; + rev = "911a9695f550b47e4dedbe8a3dd1b6a9a745fe52"; + sha256 = "1bmi3d39hllrsnsy37dxhziffvs9qzns631gd9psk6xgcchkan7n"; }; dependencies = []; @@ -803,6 +905,17 @@ rec { }; + vim-table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-table-mode-2018-03-22"; + src = fetchgit { + url = "https://github.com/dhruvasagar/vim-table-mode"; + rev = "e646bee5c45201b52f8f879eddf84b5c2e360e98"; + sha256 = "1kaszrik5mqrvavl0lzfy9i0r3b2vf1jmjxp23azy0jfanflrxwa"; + }; + dependencies = []; + + }; + vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jade-2017-04-07"; src = fetchgit { @@ -826,11 +939,11 @@ rec { }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-03-19"; + name = "vim-2018-04-08"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "0743d3d7b3769d012827bc8d1e5375164791cc2f"; - sha256 = "0fxkwvz3a8gpcg958hikpkn8rrhivb40yybvm1lrab5vzzbpphb3"; + rev = "2d7c4af46938d01192ea35899467ebbdf8dbcf3f"; + sha256 = "0wfj5g0vnn3fnz793sllsbm30h6wzyb57g14b7wzfc9s2mxjlw05"; }; dependencies = []; @@ -847,6 +960,17 @@ rec { }; + ghcmod-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ghcmod-vim-2016-06-19"; + src = fetchgit { + url = "https://github.com/eagletmt/ghcmod-vim"; + rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; + sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; + }; + dependencies = []; + + }; + neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "neco-ghc-2017-08-17"; src = fetchgit { @@ -892,11 +1016,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2018-03-20"; + name = "vim-elixir-2018-03-30"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "99022e6a7df9581109a26a369eb12d87eeabb2dc"; - sha256 = "1gs9f0mgp17iib7pxc79gjifwr8qzvl48ybjp985qvlbf5bq0n9z"; + rev = "0d5f2b472fe4abb8b34de9f099f2ef770b449fc9"; + sha256 = "1afr4iwrzpmrjca0vxkk2zx1nsndp1fhprikdhhanr8060nhbmyy"; }; dependencies = []; @@ -925,11 +1049,11 @@ rec { }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2018-03-04"; + name = "vim-localvimrc-2018-04-05"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "632d27c6c29bb2f05131c4bd2c804b9bf6068d57"; - sha256 = "1xj9qvpvhzi31wj0wp0i67j233vzaj3zpplpacszki31bsai263f"; + rev = "736f9712dd2eb8a7a3ae15d61611db9b5a66c648"; + sha256 = "09r8hvvm8fdr5rlrgfwnhjkk967dfmis8vgi3d45c9svhsybhkja"; }; dependencies = []; @@ -957,6 +1081,17 @@ rec { pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; }; + supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "supertab-2017-11-14"; + src = fetchgit { + url = "https://github.com/ervandew/supertab"; + rev = "40fe711e088e2ab346738233dd5adbb1be355172"; + sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + }; + dependencies = []; + + }; + YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "YUNOcommit-vim-2014-11-26"; src = fetchgit { @@ -969,11 +1104,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-03-20"; + name = "vim-go-2018-04-08"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "37e2587aa82fc7a7106a95e86fa54ae54ecb744b"; - sha256 = "00sgij05fs0mqvd1cw4rrym0zv8h45kfiihijwmrlw72jqhys919"; + rev = "0724aaa33ce33229e2c86e436596d31bb69ab292"; + sha256 = "15mkzhnphisrgn4r150q186hlnplwjmmxlk3pgr52fh1qxmk374y"; }; dependencies = []; @@ -1012,6 +1147,50 @@ rec { }; + vim-snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-snipmate-2017-04-20"; + src = fetchgit { + url = "https://github.com/garbas/vim-snipmate"; + rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; + sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + + }; + + vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vundle-2018-02-02"; + src = fetchgit { + url = "https://github.com/gmarik/vundle"; + rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; + sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; + }; + dependencies = []; + + }; + + csapprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "csapprox-2013-07-26"; + src = fetchgit { + url = "https://github.com/godlygeek/csapprox"; + rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; + sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; + }; + dependencies = []; + + }; + + tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tabular-2016-05-04"; + src = fetchgit { + url = "https://github.com/godlygeek/tabular"; + rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; + sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; + }; + dependencies = []; + + }; + vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-codefmt-2017-03-04"; src = fetchgit { @@ -1056,6 +1235,17 @@ rec { }; + xterm-color-table-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "xterm-color-table-vim-2013-12-31"; + src = fetchgit { + url = "https://github.com/guns/xterm-color-table.vim"; + rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; + sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; + }; + dependencies = []; + + }; + vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jsdoc-2017-12-18"; src = fetchgit { @@ -1078,6 +1268,17 @@ rec { }; + vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-snippets-2018-04-02"; + src = fetchgit { + url = "https://github.com/honza/vim-snippets"; + rev = "3733ca9f1dae9b38d68eb9aaadf41dc9a9c9a01c"; + sha256 = "0jxbh3y262m7zs2hzbz5vjd5aqch3fzcnpgkvp8zfj3jyg3mwdsp"; + }; + dependencies = []; + + }; + idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "idris-vim-2017-12-04"; src = fetchgit { @@ -1089,12 +1290,34 @@ rec { }; + vim-SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-SyntaxRange-2018-03-09"; + src = fetchgit { + url = "https://github.com/inkarkat/vim-SyntaxRange"; + rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; + sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; + }; + dependencies = []; + + }; + + vim-extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-extradite-2015-09-22"; + src = fetchgit { + url = "https://github.com/int3/vim-extradite"; + rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; + sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; + }; + dependencies = []; + + }; + calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2017-12-14"; + name = "calendar-vim-2018-03-12"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim"; - rev = "25009a8eeae8ecca0c0d74f06f62ad82d2557c1c"; - sha256 = "0kswc92frzsgsd2qzajxdndkyd2yxh8gmcxib5a3by8sg27qvi8p"; + rev = "1aee272cc37670b4f96c5d75975ae8af3bd8809e"; + sha256 = "1mr7yb07aycpc9famb0kq71sb4xyw87zgnkn0gk9i96pcjaab5fs"; }; dependencies = []; @@ -1122,6 +1345,17 @@ rec { }; + vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-cursorword-2017-10-19"; + src = fetchgit { + url = "https://github.com/itchyny/vim-cursorword"; + rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; + sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; + }; + dependencies = []; + + }; + vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-gitbranch-2017-05-28"; src = fetchgit { @@ -1145,11 +1379,11 @@ rec { }; vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-test-git-2018-03-08"; + name = "vim-test-git-2018-03-25"; src = fetchgit { url = "https://github.com/janko-m/vim-test.git"; - rev = "3760d79934bb95c782611601187067730e108a26"; - sha256 = "06l4h66vzk4h628q45g3z529m3db28d5qfiabwr6l6x9sph5ha82"; + rev = "b62628512d57059af40d29edaec09716f947ac98"; + sha256 = "0c6yf5sk12gyn39jdpg26fsnb996fmiwmqs2p9mry93f4xsb6ciq"; }; dependencies = []; @@ -1276,6 +1510,17 @@ rec { }; + goyo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "goyo-vim-2017-06-01"; + src = fetchgit { + url = "https://github.com/junegunn/goyo.vim"; + rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; + sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; + }; + dependencies = []; + + }; + limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "limelight-vim-2016-06-24"; src = fetchgit { @@ -1287,6 +1532,28 @@ rec { }; + vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-easy-align-2017-06-03"; + src = fetchgit { + url = "https://github.com/junegunn/vim-easy-align"; + rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; + sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; + }; + dependencies = []; + + }; + + vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-dashboard-2017-08-08"; + src = fetchgit { + url = "https://github.com/junegunn/vim-github-dashboard"; + rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; + sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; + }; + dependencies = []; + + }; + vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-peekaboo-2017-03-20"; src = fetchgit { @@ -1342,6 +1609,61 @@ rec { }; + vim-tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-tabpagecd-2013-11-29"; + src = fetchgit { + url = "https://github.com/kana/vim-tabpagecd"; + rev = "8b71a03a037608fa5918f5096812577cec6355e4"; + sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; + }; + dependencies = []; + + }; + + vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-coffee-script-2018-02-27"; + src = fetchgit { + url = "https://github.com/kchmck/vim-coffee-script"; + rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; + sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; + }; + dependencies = []; + + }; + + rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "rainbow_parentheses-vim-2013-03-04"; + src = fetchgit { + url = "https://github.com/kien/rainbow_parentheses.vim"; + rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; + sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; + }; + dependencies = []; + + }; + + vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signature-2018-04-04"; + src = fetchgit { + url = "https://github.com/kshenoy/vim-signature"; + rev = "968622e98238dd7cbd32fc5f4faa60c6b5aed6d8"; + sha256 = "0cwkb28zszf4sd5i0mcg6bjamjxxkxsr1plx79pwai5ckcgc2x72"; + }; + dependencies = []; + + }; + + vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gista-2017-02-20"; + src = fetchgit { + url = "https://github.com/lambdalisue/vim-gista"; + rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; + sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; + }; + dependencies = []; + + }; + latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "latex-box-2015-06-01"; src = fetchgit { @@ -1376,11 +1698,22 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-03-20"; + name = "vimtex-2018-04-07"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "17d809706edcb277f1ee7fa5e33aff3619926fe4"; - sha256 = "0hq9zyrr1c5myi7llh9s2s7qchzsvyz8gdiq6y5r44idwa53na2w"; + rev = "0c0b44198407a861d2ad42eaed9e81f76e1a537f"; + sha256 = "0cs3vfvzvs5h9b0w1wziapcl2dfcmgyysrspz41wddaz68v1lqn0"; + }; + dependencies = []; + + }; + + cosco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "cosco-vim-2018-02-15"; + src = fetchgit { + url = "https://github.com/lfilho/cosco.vim"; + rev = "434dc68b93b8f42babe1887a269145ce39c97edf"; + sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv"; }; dependencies = []; @@ -1435,27 +1768,93 @@ rec { }; vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2018-03-08"; + name = "vim-highlightedyank-2018-03-29"; src = fetchgit { url = "https://github.com/machakann/vim-highlightedyank"; - rev = "775326f9cf63098a347cea842bb6069590771371"; - sha256 = "1414acj3ma7iydkr8vgysblmbcizflm9ivwhikanj1klyj0jm2rl"; + rev = "c519c67245f6d15f18d3cd6550cc2c2471e357dc"; + sha256 = "002s015rn4n02xg8fwd8kklbprjx7aibmgrnikvgsvs9g1rj3wq4"; + }; + dependencies = []; + + }; + + tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tagbar-2017-12-17"; + src = fetchgit { + url = "https://github.com/majutsushi/tagbar"; + rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; + sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9"; + }; + dependencies = []; + + }; + + vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jsbeautify-2018-01-31"; + src = fetchgit { + url = "https://github.com/maksimr/vim-jsbeautify"; + rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; + sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; }; dependencies = []; }; Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Jenkinsfile-vim-syntax-2018-03-05"; + name = "Jenkinsfile-vim-syntax-2018-04-03"; src = fetchgit { url = "https://github.com/martinda/Jenkinsfile-vim-syntax"; - rev = "6d8957428ef53620f00c1ec74d08712f41515085"; - sha256 = "1pn33lvv5cls45vd8g1cm2fi0cm1lzwnsqcacgxcv67l25mg5979"; + rev = "45418b171e06f63e0814cac6a656832384708aba"; + sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p"; + }; + dependencies = []; + + }; + + gist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gist-vim-2016-10-10"; + src = fetchgit { + url = "https://github.com/mattn/gist-vim"; + rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; + sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; + }; + dependencies = []; + + }; + + webapi-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "webapi-vim-2018-03-14"; + src = fetchgit { + url = "https://github.com/mattn/webapi-vim"; + rev = "252250381a9509257bfb06b9f95441e41e3e23b5"; + sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a"; + }; + dependencies = []; + + }; + + undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "undotree-2017-10-26"; + src = fetchgit { + url = "https://github.com/mbbill/undotree"; + rev = "cdbb9022b8972d3e156b8d60af33bf795625b058"; + sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253"; }; dependencies = []; }; + forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "forms-2012-11-28"; + src = fetchgit { + url = "https://github.com/megaannum/forms"; + rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; + sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; + }; + dependencies = ["self"]; + + }; + self = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "self-2014-05-28"; src = fetchgit { @@ -1479,33 +1878,44 @@ rec { }; vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grepper-git-2018-03-06"; + name = "vim-grepper-git-2018-03-26"; src = fetchgit { url = "https://github.com/mhinz/vim-grepper.git"; - rev = "46d78f293b12d8ba743f68ce4fb69881a64d30b2"; - sha256 = "19pbsv8i58r2z5a2yvn8f8v7gjz82nn8mw0hhfzwg5nlj0nn5kx3"; + rev = "635c14284aea79117f2cc9d07c18c8f6da23d85b"; + sha256 = "09qg5x36dl9z2hdrbw85kwldfhkgcvw6rpzar380v2a3l762l2nl"; + }; + dependencies = []; + + }; + + vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signify-2018-03-26"; + src = fetchgit { + url = "https://github.com/mhinz/vim-signify"; + rev = "e76d00ccc00beb58d2278e6c63213ef4d365cace"; + sha256 = "018z1bgjil4is8rxxmxwvnbamhdnrir0big0giw7a7qf224z04bv"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-02-28"; + name = "vim-startify-2018-04-03"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "226cafe0a0e42339919577c7388f7acdc554127b"; - sha256 = "1w6ycxha9mcrf5q9f5zr627fg70gmabbd5b4yd8pnhbrsfjyvrf8"; + rev = "113655717e3ee1c4bc39e5d1093719a8e5750ee0"; + sha256 = "16bga9xrz4wga7h7spc9rsdj7m7hh2fqr23xnqflw1rx95c18avr"; }; dependencies = []; }; vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-object-2017-03-23"; + name = "vim-indent-object-2018-04-08"; src = fetchgit { url = "https://github.com/michaeljsmith/vim-indent-object"; - rev = "41d700f14b3decccdde421fbfe49e95a084a2f89"; - sha256 = "12mi4n5abfxx7xjl46aw400acgrjf1fxjgzak763l874y0whf5v2"; + rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; + sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; }; dependencies = []; @@ -1547,6 +1957,17 @@ rec { }; + gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gruvbox-2018-02-25"; + src = fetchgit { + url = "https://github.com/morhetz/gruvbox"; + rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86"; + sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi"; + }; + dependencies = []; + + }; + hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "hlint-refactor-vim-2015-12-05"; src = fetchgit { @@ -1580,6 +2001,17 @@ rec { }; + vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-easygit-2018-04-02"; + src = fetchgit { + url = "https://github.com/neoclide/vim-easygit"; + rev = "db10f7bbe0106c7b74875d4530f0c20e6aceee51"; + sha256 = "194mgkyqxn4s8mj8gwkjznixm7kbpzhawr6f0bphk6bc5llphnkr"; + }; + dependencies = []; + + }; + haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "haskell-vim-2018-01-25"; src = fetchgit { @@ -1614,6 +2046,17 @@ rec { ''; }; + vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-iced-coffee-script-2013-12-27"; + src = fetchgit { + url = "https://github.com/noc7c9/vim-iced-coffee-script"; + rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; + sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; + }; + dependencies = []; + + }; + shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "shabadou-vim-2016-07-19"; src = fetchgit { @@ -1647,23 +2090,34 @@ rec { }; + vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-javascript-2018-04-06"; + src = fetchgit { + url = "https://github.com/pangloss/vim-javascript"; + rev = "c99c96bdf12b5a5749c9bbdb977b070e14c15eb3"; + sha256 = "1lyiy7vfkliw91j6mvq77n4221fws6hkv0az362r32114d97309l"; + }; + dependencies = []; + + }; + vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-markdown-2018-03-19"; + name = "vim-markdown-2018-03-23"; src = fetchgit { url = "https://github.com/plasticboy/vim-markdown"; - rev = "45852fa3e937150aae93efb3dc10f4370b4763a9"; - sha256 = "131njs5pw72sknb6kb64g86biw4zmfaibcvm25kbwhxqkl27wxhn"; + rev = "8ace66328c7a2f416671b863cd842712d36c53cc"; + sha256 = "09pcxwwblq2bwdrq6qa42hw7sllgym42n7gb8igg6p9krkwvjx7s"; }; dependencies = []; }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2018-03-17"; + name = "python-mode-2018-03-31"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "585b369e9cc4710432ae50466f8292725211c2ff"; - sha256 = "03lp9fk6vzagxqiv6lw3p4063hf5ipjss1m7wvhcwkxm8x1i605v"; + rev = "339945dc9232aaa336324a473a162d74c8d349e0"; + sha256 = "1h6znlxagvhv9k0vzaspp9ddq7kbdd3c9gscs12y15qxsz5rcali"; }; dependencies = []; @@ -1681,11 +2135,22 @@ rec { }; purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2018-03-11"; + name = "purescript-vim-2018-03-31"; src = fetchgit { url = "https://github.com/raichoo/purescript-vim"; - rev = "bd19dedebc7420565b8aec111e59217da838db59"; - sha256 = "1h7fh5kfs4s735gj2nc7dvsir5fzvg49ajvcg35filwlx13r9nvj"; + rev = "8528d2a4a84f428aefad5882212c34db5c852699"; + sha256 = "0dkh1cm9z644x5cj9dxwdkyb0r9sji71jv35cyy7z0aj9b8x2jbf"; + }; + dependencies = []; + + }; + + vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pencil-2017-06-14"; + src = fetchgit { + url = "https://github.com/reedes/vim-pencil"; + rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; + sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; }; dependencies = []; @@ -1714,11 +2179,11 @@ rec { }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2018-02-24"; + name = "vim-grammarous-2018-04-08"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "c039e40bc9124a2467376da2434a46cd216c49c6"; - sha256 = "1mg3nqm4klimnljd642cd3z7nvhbrg1va09d7bnxcp6flyabpbfh"; + rev = "42193a96aca0bcb4cd6ae1cb6fb2cc815ea92138"; + sha256 = "1fkjcc13v734bmgdimhkaf69xs8maqf0xylcbq424y4wfc8xhirq"; }; dependencies = []; # use `:GrammarousCheck` to initialize checking @@ -1745,11 +2210,11 @@ rec { }; vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-puppet-2018-03-03"; + name = "vim-puppet-2018-03-26"; src = fetchgit { url = "https://github.com/rodjek/vim-puppet"; - rev = "921ccf81b5e11b40a49c458469ffa46c0d0560f8"; - sha256 = "0c1lnxn2ja68p8vhvv5gzg3m79aiazpfagmjnydfndv1dvbww39a"; + rev = "e3eae632cf7f585fef2ede61fa7c5eb36fa94a6a"; + sha256 = "1dsr5rfmhz73dksxc8r2z6k881fmili9bb9a8hlbymm5xsq25a6a"; }; dependencies = []; @@ -1789,22 +2254,55 @@ rec { }; vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-devicons-2018-03-10"; + name = "vim-devicons-2018-03-14"; src = fetchgit { url = "https://github.com/ryanoasis/vim-devicons"; - rev = "d9a8fef7e9ffa19516ed42634e9fcd37e9e2cf48"; - sha256 = "0vwbjxg0ai627v2mynbklvldxn5dllj3wfhhhlyqgdrn4ls6l5nc"; + rev = "390b0142f1b6f02bdecc4867009e83c9ecc01db2"; + sha256 = "1pzvhdcgyp85xx858a7i357d3xymrd0y2afwfpnsrhz35fsaw96z"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2018-03-13"; + name = "neoformat-2018-04-07"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "9ab966a6def98bab5cd88bcdd9b376da3ce471b4"; - sha256 = "1d745zhmx8ghh9s09kwpmxflgff5lgczcg3gzb46gk7vq7y6s47d"; + rev = "77c2c007508823f353f75a6b525d63ae21e55e82"; + sha256 = "1xrvbkc8y40dgyiq5jnp0nhg19mh7m7v902hb9z3lkl6fsbcwbmb"; + }; + dependencies = []; + + }; + + nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nerdcommenter-2018-03-03"; + src = fetchgit { + url = "https://github.com/scrooloose/nerdcommenter"; + rev = "e679d8a34193d1ac93b98ed792cdde7c9b1104a1"; + sha256 = "0if71mcrc7cm8xr4m2zjcm2k4wkfhxyh6phfc0k13s8h392wb7v4"; + }; + dependencies = []; + + }; + + nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nerdtree-2018-04-02"; + src = fetchgit { + url = "https://github.com/scrooloose/nerdtree"; + rev = "a0e49c9b117d68dbc3e308b79529f8a3ab18e0f8"; + sha256 = "16ib92gfh87kgbk3z6dwgha1szjgpmcp15b5pajzzq9s7hrqfbp1"; + }; + dependencies = []; + + }; + + syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "syntastic-2018-04-08"; + src = fetchgit { + url = "https://github.com/scrooloose/syntastic"; + rev = "e3a819c7cb3bf4397b0693303a247439668726f1"; + sha256 = "150bzrp738pdasss98x543fafqs3dvdfsj00m1lg3dzrb35vb79d"; }; dependencies = []; @@ -1822,44 +2320,44 @@ rec { }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2018-02-06"; + name = "vim-polyglot-2018-04-03"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "96c5c20e418fa95b7137b6ef418946f25de91b1b"; - sha256 = "0izqrl6rgfy9rva6qlyib9w3vwdva290cajnyblmxff3gfql1vrj"; + rev = "cab6866e21341cab7419cdb4ae1fd18437d31bb0"; + sha256 = "17mizznm80yj5vz6vajwix8m8xmsn552lph5vmic5dpg7bcny6m6"; }; dependencies = []; }; context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "context_filetype-vim-2018-02-06"; + name = "context_filetype-vim-2018-04-01"; src = fetchgit { url = "https://github.com/shougo/context_filetype.vim"; - rev = "514b50f812904f063736cda3c787db7d9b290151"; - sha256 = "1xb7lcvriyadrzz93vps9hsa2x8vi8lbwfzk2gm2l3i90mf9xddq"; + rev = "9ed76080795ef76f52b8c9ae4432df7cd81abc5a"; + sha256 = "137ki4104j4ch54k9n1l1xd75vbxqssi1fdckzv8kd07m5i159i2"; }; dependencies = []; }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-02-28"; + name = "denite-nvim-2018-04-07"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "b16579be4431a7eb708deb17d73ec641a8c89a54"; - sha256 = "0kabnbqc4j2mgf5m5h0i3yy9pbpk3igrmcwmpq1vs4c4nb1bgkiy"; + rev = "0f8d216b6bcb4be708dce1adfe1a789fff57ca07"; + sha256 = "0bjz13gfzngcgabhnrd34zqg45wwjlgwkchv88p37k92pjgym063"; }; dependencies = []; }; echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "echodoc-vim-2018-02-18"; + name = "echodoc-vim-2018-03-26"; src = fetchgit { url = "https://github.com/shougo/echodoc.vim"; - rev = "ba85a728a6628fa22f1e4088637a005f21338cd5"; - sha256 = "119azfkrplr6a14wypaw27rff332ji1rhnw1lfrzq9nir7kfd4p6"; + rev = "f1f711bc814165cf5b09b56fd5d733917ed1c015"; + sha256 = "0l0sm862fbr8p8m4wykx1riidxgp233cq6r2zdm2l7gvmqyj3zcr"; }; dependencies = []; @@ -1888,11 +2386,11 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2018-01-28"; + name = "neocomplete-vim-2018-03-28"; src = fetchgit { url = "https://github.com/shougo/neocomplete.vim"; - rev = "1401a1c6ab56546c55804ba09e6c9fe87654e954"; - sha256 = "01s2cx1cd4j16pb6ixrx9z8h4dsj2dvlxfly2gzm9khpsgsx454h"; + rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3"; + sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8"; }; dependencies = []; @@ -1921,11 +2419,11 @@ rec { }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2018-03-12"; + name = "neosnippet-snippets-2018-04-04"; src = fetchgit { url = "https://github.com/shougo/neosnippet-snippets"; - rev = "4aaa1713c88a74e340a97afa80d0b935f60bfecd"; - sha256 = "10i2b9b8la3ia2f0nkg2bfjz54h0b1slqn1jrb7a8iwg5jmsn7yh"; + rev = "04458823b3d1c4ffdb6c49a2fd25a36d55ed4dc4"; + sha256 = "095zfy6c11ddcrrpv48g1n39lcrnnkivyz66rbk36hy6kwjqqs5q"; }; dependencies = []; @@ -1943,11 +2441,11 @@ rec { }; neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoyank-vim-git-2017-12-19"; + name = "neoyank-vim-git-2018-03-26"; src = fetchgit { url = "https://github.com/shougo/neoyank.vim.git"; - rev = "5d6e6f80e1920fc38ab5cf779c424a1fdb49202d"; - sha256 = "0l2gfwyiyzppb0hs9sx3x7ndq9zzinppzqq3njwjzd1qgfv29jpq"; + rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef"; + sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928"; }; dependencies = []; @@ -2016,11 +2514,11 @@ rec { }; alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2018-02-03"; + name = "alchemist-vim-2018-03-22"; src = fetchgit { url = "https://github.com/slashmili/alchemist.vim"; - rev = "1bc6ac4405f0b7bbf5dd963313f103f1416f27cb"; - sha256 = "0ff83xknlkb2rdhvpp75nclilb4mlmkr86lp9jwb52dc0a6l2g8i"; + rev = "fdc880663e0d76d29d6310553ae12d51565f692d"; + sha256 = "03p5cw5j1j6v3x9gg61d95qzcijj1q0yqz5qdkjgll0fp507j8ak"; }; dependencies = []; @@ -2059,23 +2557,67 @@ rec { }; + vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-multiple-cursors-2018-04-08"; + src = fetchgit { + url = "https://github.com/terryma/vim-multiple-cursors"; + rev = "f019fcd0d8c5d8a6c3a5993e476ce3be420cdc6e"; + sha256 = "1x3x20lhz9ficzspab5wphavh9kap3h3z1880n99rg3wdf3x9nry"; + }; + dependencies = []; + + }; + vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimpreviewpandoc-2016-03-07"; + name = "vimpreviewpandoc-2018-04-02"; src = fetchgit { url = "https://github.com/tex/vimpreviewpandoc"; - rev = "b109d41ad6478df5ec7f1311950c6efca66f36e4"; - sha256 = "1gx326xarjs3qjygpkrknncad90crjqfx8v6pir4r7k1hl7dfxc4"; + rev = "83b0958b570dace55166f565e2d88c468d99d854"; + sha256 = "1fa8624wxry53x62xjmglgm6kwppfcg50ifbzms555bfjsd4fxn8"; + }; + dependencies = []; + + }; + + vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ft-diff_fold-2013-02-10"; + src = fetchgit { + url = "https://github.com/thinca/vim-ft-diff_fold"; + rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; + sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; + }; + dependencies = []; + + }; + + vim-prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-prettyprint-2016-07-16"; + src = fetchgit { + url = "https://github.com/thinca/vim-prettyprint"; + rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; + sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; }; dependencies = []; }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2018-02-21"; + name = "vim-quickrun-2018-04-09"; src = fetchgit { url = "https://github.com/thinca/vim-quickrun"; - rev = "8d864e7feb7ac9dded84808f76fcb3fcd3ed8ae3"; - sha256 = "0m2l1ajgagryaff3gaw91930y5p5ni1s2s4gnahwvqyiq3jdxaxh"; + rev = "852986606abdf34c8bfc0d7c60ac7d6811bcf723"; + sha256 = "0j36b20wp7r2yjpmhxjbblw2zq6s3vjdz0nagy32wcf7q6vnkx5h"; + }; + dependencies = []; + + }; + + vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-scouter-2014-08-10"; + src = fetchgit { + url = "https://github.com/thinca/vim-scouter"; + rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; + sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; }; dependencies = []; @@ -2104,33 +2646,77 @@ rec { }; vim-solidity = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-solidity-2018-02-11"; + name = "vim-solidity-2018-03-12"; src = fetchgit { url = "https://github.com/tomlion/vim-solidity"; - rev = "46b87988e196abe646516932427253a838f7fff8"; - sha256 = "0djqqxlh314n6yhn5m2min3nl435n4qcjgsyca7qbz4wvgmbwnlk"; + rev = "2484882da8f2b73336c45c534e407053254a273d"; + sha256 = "0v3r6k3dirfs726301hy693y274hc8adi6nkpavmaqgy16k31v8d"; + }; + dependencies = []; + + }; + + tlib_vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tlib_vim-2018-04-08"; + src = fetchgit { + url = "https://github.com/tomtom/tlib_vim"; + rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; + sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; + }; + dependencies = []; + + }; + + vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-commentary-2018-04-06"; + src = fetchgit { + url = "https://github.com/tpope/vim-commentary"; + rev = "296d99b353261191adb7a356ee3fefbce8e6096b"; + sha256 = "1n29rbgm2464byncmgxbvyizmag1gzswg00nfg2387nwprmpg7zj"; }; dependencies = []; }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-03-18"; + name = "vim-dispatch-2018-04-01"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "4104901e9d6a304a5022b780f8e20d3becc7da93"; - sha256 = "1n01g7q6cvdjz3fw7pfmx2r8kzhilxprd25nfj9zj01mbxbkz3mc"; + rev = "b80fd418082471e5b1150a97e8cab53035ffe502"; + sha256 = "0yvvm5sdv6vji3xn6x0cci5d0mcv3srgfw2bgrszbkdr0r02xs5s"; }; dependencies = []; }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2018-02-18"; + name = "vim-eunuch-2018-03-16"; src = fetchgit { url = "https://github.com/tpope/vim-eunuch"; - rev = "b62f7d4d4dcb6bdb840441c11435aa4361ec0454"; - sha256 = "0h6q4jjqb9b0cdbg0ymm5kfw1a2b4m83fqdfw61637rd6i0ganks"; + rev = "0971b4cb5c0865d3dd0316f725cd4236ff75b828"; + sha256 = "1lw2ycgxypp0j8kyvlgn8hivqf1dj9rfrx8n7zgayy5w756g45cy"; + }; + dependencies = []; + + }; + + vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-fugitive-2018-04-06"; + src = fetchgit { + url = "https://github.com/tpope/vim-fugitive"; + rev = "b680699450805e01960184b60a2cf0d3a71088cf"; + sha256 = "1ixsmdn2yarb8yz5n0kdcjsif94r3myhv03l5a3f2lasly6hlk6m"; + }; + dependencies = []; + + }; + + vim-pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pathogen-2018-04-05"; + src = fetchgit { + url = "https://github.com/tpope/vim-pathogen"; + rev = "06da921608b971fb47603671bcafdb2843992eb3"; + sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi"; }; dependencies = []; @@ -2158,6 +2744,28 @@ rec { }; + vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-sensible-2018-01-22"; + src = fetchgit { + url = "https://github.com/tpope/vim-sensible"; + rev = "2d60332fa5b2b1ea346864245569df426052865a"; + sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb"; + }; + dependencies = []; + + }; + + vim-sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-sleuth-2018-03-30"; + src = fetchgit { + url = "https://github.com/tpope/vim-sleuth"; + rev = "3b9df28c39f93c5ec8179d958900be1d0100b536"; + sha256 = "10rba71hmmbgv5kfsl0lmj59z1nz7b2rr6p0dmww82zp6cyzy5j0"; + }; + dependencies = []; + + }; + vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-speeddating-2017-05-24"; src = fetchgit { @@ -2169,6 +2777,28 @@ rec { }; + vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-surround-2016-06-01"; + src = fetchgit { + url = "https://github.com/tpope/vim-surround"; + rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313"; + sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46"; + }; + dependencies = []; + + }; + + vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-vinegar-2018-04-03"; + src = fetchgit { + url = "https://github.com/tpope/vim-vinegar"; + rev = "97f3fbc9596f3997ebf8e30bfdd00ebb34597722"; + sha256 = "0y2nzvn4xxbgyjmm4mirwak4hnzka2g3w8xm64f1smh4cb3jn0yf"; + }; + dependencies = []; + + }; + hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "hasksyn-2014-09-03"; src = fetchgit { @@ -2191,6 +2821,17 @@ rec { }; + caw-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "caw-vim-2018-01-01"; + src = fetchgit { + url = "https://github.com/tyru/caw.vim"; + rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42"; + sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari"; + }; + dependencies = []; + + }; + open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "open-browser-vim-2018-03-11"; src = fetchgit { @@ -2202,12 +2843,23 @@ rec { }; + neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-look-2018-01-21"; + src = fetchgit { + url = "https://github.com/ujihisa/neco-look"; + rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c"; + sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj"; + }; + dependencies = []; + + }; + youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-03-19"; + name = "youcompleteme-2018-04-03"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "788c293aee78c6ab60cbc06bbc3339e7b2bff98f"; - sha256 = "1a7dgk04lgai51s9yjxzc87cdmm9wix2fx4kfm95s02qm2dnryci"; + rev = "e8477c16b604303383d36793dfb7e8bbe22097bf"; + sha256 = "07pycgjzykncmwm7cj394gw6l9zxmjcd6nr21hirbkw1a7g4r3r3"; }; dependencies = []; buildPhase = '' @@ -2228,12 +2880,23 @@ rec { }; }; + vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-airline-2018-04-08"; + src = fetchgit { + url = "https://github.com/vim-airline/vim-airline"; + rev = "d66b507b020b1f14f08bc7a6503573930b28a476"; + sha256 = "1cdw628gs547p41yqyf3liy4i03czw9cgfbcq85w3ad2v2c9cc3p"; + }; + dependencies = []; + + }; + vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2018-01-05"; + name = "vim-airline-themes-2018-03-24"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "4b7f77e770a2165726072a2b6f109f2457783080"; - sha256 = "02wbch9mbj0slafd5jrklmyawrxpisf8c3f5c72gq30j8hlyb86n"; + rev = "b0fca80555b8249f3c62271b7635542a7de22363"; + sha256 = "1ap7b7v1v3n4hpnj2w24w0dli2sliphvpyfhkdbhbq4c30znm1pk"; }; dependencies = []; @@ -2272,6 +2935,17 @@ rec { }; + vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ruby-2018-04-01"; + src = fetchgit { + url = "https://github.com/vim-ruby/vim-ruby"; + rev = "71f5df78a45c5458da793b2c897ff5dcdcd9a819"; + sha256 = "1nblkhb1yp3q0rfq43l9968inn1z26vngf28n23y161ncfmq674y"; + }; + dependencies = []; + + }; + Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Colour-Sampler-Pack-2012-11-29"; src = fetchgit { @@ -2316,6 +2990,17 @@ rec { }; + YankRing-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "YankRing-vim-2015-07-28"; + src = fetchgit { + url = "https://github.com/vim-scripts/YankRing.vim"; + rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; + sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw"; + }; + dependencies = []; + + }; + a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "a-vim-2010-11-06"; src = fetchgit { @@ -2360,6 +3045,17 @@ rec { }; + matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "matchit-zip-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/matchit.zip"; + rev = "ced6c409c9beeb0b4142d21906606bd194411d1d"; + sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm"; + }; + dependencies = []; + + }; + mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "mayansmoke-git-2010-10-17"; src = fetchgit { @@ -2393,6 +3089,17 @@ rec { }; + taglist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "taglist-vim-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/taglist.vim"; + rev = "53041fbc45398a9af631a20657e109707a455339"; + sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd"; + }; + dependencies = []; + + }; + wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "wombat256-vim-2010-10-17"; src = fetchgit { @@ -2404,23 +3111,45 @@ rec { }; + vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimoutliner-2018-03-21"; + src = fetchgit { + url = "https://github.com/vimoutliner/vimoutliner"; + rev = "85975d25863d860d6e84e4980b7551618b527536"; + sha256 = "0m8v6m4gi1643wh4x434yx440sa58h9fsv9ffz1my8syc412f7jx"; + }; + dependencies = []; + + }; + + vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimwiki-2018-04-08"; + src = fetchgit { + url = "https://github.com/vimwiki/vimwiki"; + rev = "86a8604c4e127fa397c513471250c05b305244d3"; + sha256 = "195sysniq25azydxlahik9ybgg7gz9w7z7yc4fwr0s2hzlnk6ir0"; + }; + dependencies = []; + + }; + ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-03-10"; + name = "ale-2018-04-08"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "05d39bc1a9eb79ff6f36b190b4612ff052812e7e"; - sha256 = "0p8pllh93bd43051rjcw9jamkmldb0rc3x8llw010m05jgrkngda"; + rev = "2f2dcb84444f440ceb4b35010b861738216525f6"; + sha256 = "1yrqlg44wqhsnrrbp6f3j2v8fi4sg2hv4j8c1sb1grqj1f306gca"; }; dependencies = []; }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2018-01-28"; + name = "vim-wakatime-2018-04-05"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "dadf0bc9697a3eea043190e9ccfe4fb2e53a20ca"; - sha256 = "0fimkkkxii0g12xfbq8vs0i50ffincsbpz96x55q0j7gnlxbhwfr"; + rev = "e0e7621f18a8763b851b0feb4a735633bf147cf7"; + sha256 = "1xnrcxd7r08hqrv2fnv8x8p60nx2flh2pfcr4pkkscr0ilinakwz"; }; dependencies = []; buildInputs = [ python ]; @@ -2485,6 +3214,17 @@ rec { }; + vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-latex-live-preview-2017-11-09"; + src = fetchgit { + url = "https://github.com/xuhdev/vim-latex-live-preview"; + rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; + sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; + }; + dependencies = []; + + }; + nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "nim-vim-2018-02-27"; src = fetchgit { @@ -2504,7 +3244,7 @@ rec { sha256 = "0rfxzryccrq3dnjgb9aljzrmfjk7p8l2qdjkl8ar4bh2hmz8vn5y"; }; dependencies = []; - buildInputs = [ python3 ]; + buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -2514,11 +3254,11 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2018-02-25"; + name = "deoplete-jedi-2018-04-07"; src = fetchgit { url = "https://github.com/zchee/deoplete-jedi"; - rev = "0410de74239b79d9fc21fe1076e46a97aa0d44cc"; - sha256 = "0bp4d5q5y72bhmrwcczz6g1z53n372qydbsxjl7r2amaiy0l3yl0"; + rev = "eb777b50b7d218a23464c7d58c8573b5223d52f4"; + sha256 = "1j2jfvgzj2y7pp8z441rs8ffbn1hmiwa7h556kf6mjlmyzs5cfma"; }; dependencies = []; @@ -2534,763 +3274,4 @@ rec { dependencies = []; }; - - goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-2017-06-01"; - src = fetchgit { - url = "git://github.com/junegunn/goyo.vim"; - rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; - sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; - }; - dependencies = []; - - }; - - gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gruvbox-2018-02-25"; - src = fetchgit { - url = "git://github.com/morhetz/gruvbox"; - rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86"; - sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi"; - }; - dependencies = []; - - }; - - maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "maktaba-2017-12-29"; - src = fetchgit { - url = "git://github.com/google/vim-maktaba"; - rev = "6e3be879bcf2d4e3c5bb56653e5eda9e08b84982"; - sha256 = "1nbpn6pcphrakd4icl24l4a68hjcq4a0aaq6kdwrvlsd1c3lk4dm"; - }; - dependencies = []; - - }; - - matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "matchit-zip"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=8196"; - name = "matchit.zip"; - sha256 = "1bbm8j1bhb70kagwdimwy9vcvlrz9ax5bk2a7wrmn4cy87f9xj4l"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - homepage = "http://www.vim.org/scripts/script.php?script_id=39"; - }; - - unpackPhase = '' - ( - sourceRoot=d - mkdir $sourceRoot; cd $sourceRoot; - unzip $src - ) - ''; - }; - - neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-look-2018-01-21"; - src = fetchgit { - url = "git://github.com/ujihisa/neco-look"; - rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c"; - sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj"; - }; - dependencies = []; - - }; - - pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pathogen-2018-03-14"; - src = fetchgit { - url = "git://github.com/tpope/vim-pathogen"; - rev = "f4fd6044e37a4e255f2ea934e9e1ebc7bfe70f70"; - sha256 = "1fjnfr8zjk39xvv64qg7ydic87gmg547siqplxgdv9a0vkk0p7jd"; - }; - dependencies = []; - - }; - - prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "prettyprint-2016-07-16"; - src = fetchgit { - url = "git://github.com/thinca/vim-prettyprint"; - rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; - sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; - }; - dependencies = []; - - }; - - quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "quickfixstatus-2011-09-02"; - src = fetchgit { - url = "git://github.com/dannyob/quickfixstatus"; - rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; - }; - dependencies = []; - - }; - - rainbow_parentheses = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow_parentheses-2013-03-04"; - src = fetchgit { - url = "git://github.com/kien/rainbow_parentheses.vim"; - rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; - }; - dependencies = []; - - }; - - riv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "riv-2018-01-21"; - src = fetchgit { - url = "git://github.com/Rykka/riv.vim"; - rev = "454fef3402c8b8b2c2036232a9e9b798f5e35d09"; - sha256 = "1n5m4y03bfabhr6inmgwhwc4ayaafavsrqagklzjwfx1cv3r9f2j"; - }; - dependencies = []; - - }; - - sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible-2018-01-22"; - src = fetchgit { - url = "git://github.com/tpope/vim-sensible"; - rev = "2d60332fa5b2b1ea346864245569df426052865a"; - sha256 = "1psv8r3xshcg5c09i8h2qff6jp62anjmsa24qzvbc71ass5bqxyb"; - }; - dependencies = []; - - }; - - sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sleuth-2017-10-24"; - src = fetchgit { - url = "git://github.com/tpope/vim-sleuth"; - rev = "d56a4302358359ddf9845252addf637a5e6bd6d5"; - sha256 = "1klp2lqsql90v156kih0mnm0j957pc4r0zy5y6srww2q3wkkjgr2"; - }; - dependencies = []; - - }; - - snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2017-04-20"; - src = fetchgit { - url = "git://github.com/garbas/vim-snipmate"; - rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; - sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - sourcemap = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap-2012-09-19"; - src = fetchgit { - url = "git://github.com/chikatoike/sourcemap.vim"; - rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; - }; - dependencies = []; - - }; - - sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sparkup-2012-06-10"; - src = fetchgit { - url = "git://github.com/chrisgeo/sparkup"; - rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; - sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; - }; - dependencies = []; - - }; - - surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround-2016-06-01"; - src = fetchgit { - url = "git://github.com/tpope/vim-surround"; - rev = "e49d6c2459e0f5569ff2d533b4df995dd7f98313"; - sha256 = "1v0q2f1n8ngbja3wpjvqp2jh89pb5ij731qmm18k41nhgz6hhm46"; - }; - dependencies = []; - - }; - - table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2018-03-17"; - src = fetchgit { - url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "d0a640518957417ce689411d807dff3bf9eca194"; - sha256 = "1b6mka45lhb7n06pjxg697ha63gg4vw6zgj0v037w1izj619xa33"; - }; - dependencies = []; - - }; - - tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tabpagecd-2013-11-29"; - src = fetchgit { - url = "git://github.com/kana/vim-tabpagecd"; - rev = "8b71a03a037608fa5918f5096812577cec6355e4"; - sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; - }; - dependencies = []; - - }; - - taglist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "taglist"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=19574"; - name = "taglist_46.zip"; - sha256 = "18cbv462vwg7vip2p99qlahm99hswav96cj4ki227kyi05q2lkjj"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - homepage = "http://www.vim.org/scripts/script.php?script_id=273"; - }; - - setSourceRoot = '' - export sourceRoot=taglist - mkdir taglist - mv doc taglist - mv plugin taglist - ''; - }; - - tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2017-08-13"; - src = fetchgit { - url = "git://github.com/tomtom/tlib_vim"; - rev = "c96db6151fde9d06a8fed71b7df05c6dbb3f14fe"; - sha256 = "1dhvf1v2mkmq8aifwq57ylm7nnk3zz3hna33q2gj6p7v70vay7v8"; - }; - dependencies = []; - - }; - - undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2017-10-26"; - src = fetchgit { - url = "git://github.com/mbbill/undotree"; - rev = "cdbb9022b8972d3e156b8d60af33bf795625b058"; - sha256 = "0y62hp8k2kbrq0jhxj850f706rqjv2dkd7dxhz458mrsdk60f253"; - }; - dependencies = []; - - }; - - vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions-2018-01-18"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-actions"; - rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; - sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async-2017-03-20"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-async"; - rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; - sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; - }; - dependencies = ["vim-addon-signs"]; - - }; - - vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-background-cmd-2015-12-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-background-cmd"; - rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; - sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; - }; - dependencies = ["vim-addon-mw-utils"]; - - }; - - vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-commenting-2013-06-10"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-commenting"; - rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; - }; - dependencies = []; - - }; - - vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-completion-2015-02-10"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-completion"; - rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; - sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-errorformats-2014-11-05"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-errorformats"; - rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; - }; - dependencies = []; - - }; - - vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-goto-thing-at-cursor-2012-01-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; - rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-local-vimrc-2015-03-19"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; - rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; - sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; - }; - dependencies = []; - - }; - - vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager-2017-05-07"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-manager"; - rev = "2434225ae48e608c2b6ac86c8da1c62209da746f"; - sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb"; - }; - dependencies = []; - buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; - }; - - vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mru-2013-08-08"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mru"; - rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; - }; - dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; - - }; - - vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mw-utils-2018-03-09"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mw-utils"; - rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2"; - sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f"; - }; - dependencies = []; - - }; - - vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix-2017-09-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-nix"; - rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; - sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; - }; - dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-other-2014-07-15"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-other"; - rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; - }; - dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; - - }; - - vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-php-manual-2015-01-01"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-php-manual"; - rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; - sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; - }; - dependencies = []; - - }; - - vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-signs-2013-04-19"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-signs"; - rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; - }; - dependencies = []; - - }; - - vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql-2017-02-11"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-sql"; - rev = "048a139af36829fce670c8ff80d3aad927557ee6"; - sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; - }; - dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; - - }; - - vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker-2017-06-26"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; - rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; - sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-toggle-buffer-2012-01-13"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; - rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-xdebug-2014-08-29"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-xdebug"; - rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; - }; - dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; - - }; - - vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-03-20"; - src = fetchgit { - url = "git://github.com/vim-airline/vim-airline"; - rev = "b9f55455fb50234b3f2ac86f5d70607efade31bd"; - sha256 = "1yqx5mabanykaqrmgnppw870k25qs59vh5wpcwghwf2qf033mfll"; - }; - dependencies = []; - - }; - - vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2018-02-27"; - src = fetchgit { - url = "git://github.com/kchmck/vim-coffee-script"; - rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; - sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; - }; - dependencies = []; - - }; - - vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-cursorword-2017-10-19"; - src = fetchgit { - url = "git://github.com/itchyny/vim-cursorword"; - rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; - sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; - }; - dependencies = []; - - }; - - vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2017-06-03"; - src = fetchgit { - url = "git://github.com/junegunn/vim-easy-align"; - rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; - sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; - }; - dependencies = []; - - }; - - vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ft-diff_fold-2013-02-10"; - src = fetchgit { - url = "git://github.com/thinca/vim-ft-diff_fold"; - rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; - sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; - }; - dependencies = []; - - }; - - vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2017-02-20"; - src = fetchgit { - url = "git://github.com/lambdalisue/vim-gista"; - rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; - sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; - }; - dependencies = []; - - }; - - vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2018-03-16"; - src = fetchgit { - url = "git://github.com/airblade/vim-gitgutter"; - rev = "37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"; - sha256 = "0l7sz77ymy5g6j7ads70r3xhvaymwmvlqi7hy1k40giq4dxzivv7"; - }; - dependencies = []; - - }; - - vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dashboard-2017-08-08"; - src = fetchgit { - url = "git://github.com/junegunn/vim-github-dashboard"; - rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; - sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; - }; - dependencies = []; - - }; - - vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-iced-coffee-script-2013-12-27"; - src = fetchgit { - url = "git://github.com/noc7c9/vim-iced-coffee-script"; - rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; - }; - dependencies = []; - - }; - - vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-javascript-2018-03-04"; - src = fetchgit { - url = "git://github.com/pangloss/vim-javascript"; - rev = "3e0b1af8c2b2b613add52d782b29f325c6a414e3"; - sha256 = "1rxds6sswnm7xyy39ljwhykb3r6jd9jsm1lbhhw2r226d56pj15w"; - }; - dependencies = []; - - }; - - vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsbeautify-2018-01-31"; - src = fetchgit { - url = "git://github.com/maksimr/vim-jsbeautify"; - rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; - sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; - }; - dependencies = []; - - }; - - vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2017-11-09"; - src = fetchgit { - url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; - sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; - }; - dependencies = []; - - }; - - vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-logreview-2017-07-08"; - src = fetchgit { - url = "git://github.com/andreshazard/vim-logreview"; - rev = "b7b66ab338e904127d796af49235b8c29742f18f"; - sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; - }; - dependencies = []; - - }; - - vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2018-03-20"; - src = fetchgit { - url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "13232e4b544775cf2b039571537b0e630406f801"; - sha256 = "0ib0gj5ybmlb4lajhl1pc41kgfxaj19z22jsxc5sr0q67xwfpki4"; - }; - dependencies = []; - - }; - - vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pencil-2017-06-14"; - src = fetchgit { - url = "git://github.com/reedes/vim-pencil"; - rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; - sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; - }; - dependencies = []; - - }; - - vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ruby-2018-03-02"; - src = fetchgit { - url = "git://github.com/vim-ruby/vim-ruby"; - rev = "15e32500f58c3bb66eb6b1eb4af57d86263895c0"; - sha256 = "15lhg4wdrx7989rbawpa2jlfrfnhf5km76g8ld5b2c2gqixxy4aj"; - }; - dependencies = []; - - }; - - vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scouter-2014-08-10"; - src = fetchgit { - url = "git://github.com/thinca/vim-scouter"; - rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; - sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; - }; - dependencies = []; - - }; - - vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2018-02-28"; - src = fetchgit { - url = "git://github.com/kshenoy/vim-signature"; - rev = "21b03ff51d08775a44417db14bf6dee690723d06"; - sha256 = "1v36zkr8jkhhfsdli6rvrz3akcr8bmfqyrkxb2izb0c250b9swrg"; - }; - dependencies = []; - - }; - - vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-02-21"; - src = fetchgit { - url = "git://github.com/mhinz/vim-signify"; - rev = "26ed57e0fe7a28c8763920e946b2225ec577df3f"; - sha256 = "0xkmyzm79gay1cga9znlsdk3mwc6smavv7xg5x6gr8a17wjipmlm"; - }; - dependencies = []; - - }; - - vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2018-03-05"; - src = fetchgit { - url = "git://github.com/honza/vim-snippets"; - rev = "f02955d40b64c9db6f6bdeee40d0f44a00c58865"; - sha256 = "0ylbvr88xh1lw4lbiiwg617wp4r25d32wl4rsb7s2c5isy6aimki"; - }; - dependencies = []; - - }; - - vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2018-03-10"; - src = fetchgit { - url = "git://github.com/ryanoasis/vim-devicons"; - rev = "d9a8fef7e9ffa19516ed42634e9fcd37e9e2cf48"; - sha256 = "0vwbjxg0ai627v2mynbklvldxn5dllj3wfhhhlyqgdrn4ls6l5nc"; - }; - dependencies = []; - - }; - - vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim2hs-2014-04-16"; - src = fetchgit { - url = "git://github.com/dag/vim2hs"; - rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; - }; - dependencies = []; - - }; - - vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2018-03-18"; - src = fetchgit { - url = "git://github.com/vimwiki/vimwiki"; - rev = "16b9e45b03baa377cee807f2bef7d97682e8bad6"; - sha256 = "1ja3rspabsva6ja4jrbl19mck5k8lvss82sl3l2wgc8cv8ya1kkq"; - }; - dependencies = []; - - }; - - vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vinegar-2017-12-28"; - src = fetchgit { - url = "git://github.com/tpope/vim-vinegar"; - rev = "44bc76a6abf6aeafa4d0808288bb4fcc9a2e98f8"; - sha256 = "1h612j0w0kz2f8575r63dzdi65fhq77dp7rhziixs3pkq54pqcsg"; - }; - dependencies = []; - - }; - - vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2018-02-02"; - src = fetchgit { - url = "git://github.com/gmarik/vundle"; - rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; - sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; - }; - dependencies = []; - - }; - - xterm-color-table = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "xterm-color-table-2013-12-31"; - src = fetchgit { - url = "git://github.com/guns/xterm-color-table.vim"; - rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; - sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; - }; - dependencies = []; - - }; - - zeavim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zeavim-2017-12-20"; - src = fetchgit { - url = "git://github.com/KabbAmine/zeavim.vim"; - rev = "88f81078059d98d7637a93b90730897a3af231a4"; - sha256 = "1p43f6bbs9fcvvp1i90kzx1xj7k6c5w3ajf9wlrplpkz6hsiv2wv"; - }; - dependencies = []; - - }; - } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 577b30bf7b2..42de002d1ea 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,39 +1,11 @@ -"CSApprox" -"CheckAttach" -"Cosco" -"Gist" -"Hoogle" -"Solarized" -"Supertab" -"Syntastic" -"SyntaxRange" -"Tabular" -"Tagbar" -"The_NERD_Commenter" -"The_NERD_tree" -"UltiSnips" -"VimOutliner" -"WebAPI" -"YankRing" -"caw" -"clang_complete" -"commentary" -"csv" -"ctrlp-cmatcher" -"ctrlp-py-matcher" -"ctrlp-z" -"easygit" -"extradite" -"fugitive" -"ghcmod" "github:907th/vim-auto-save" -"github:Chiel92/vim-autoformat" -"github:LnL7/vim-nix" -"github:Quramy/tsuquyomi" -"github:Shougo/deoplete.nvim" +"github:airblade/vim-gitgutter" "github:ajh17/Spacegray.vim" "github:albfan/nerdtree-git-plugin" +"github:altercation/vim-colors-solarized" "github:alvan/vim-closetag" +"github:amiorin/ctrlp-z" +"github:andreshazard/vim-logreview" "github:andsild/peskcolor.vim.git" "github:andviro/flake8-vim" "github:ap/vim-css-color" @@ -45,17 +17,26 @@ "github:cespare/vim-toml" "github:chemzqm/denite-extra" "github:chemzqm/denite-git" +"github:Chiel92/vim-autoformat" "github:chikatoike/concealedyank.vim" +"github:chikatoike/sourcemap.vim" +"github:chrisbra/CheckAttach" +"github:chrisbra/csv.vim" +"github:chrisgeo/sparkup" "github:christoomey/vim-sort-motion" "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" "github:ctrlpvim/ctrlp.vim" +"github:dag/vim2hs" +"github:dannyob/quickfixstatus" "github:derekelkins/agda-vim" "github:derekwyatt/vim-scala" +"github:dhruvasagar/vim-table-mode" "github:digitaltoad/vim-jade" "github:dleonard0/pony-vim-syntax" "github:dracula/vim" "github:drmingdrmer/xptemplate" +"github:eagletmt/ghcmod-vim" "github:eagletmt/neco-ghc" "github:editorconfig/editorconfig-vim" "github:ehamberg/vim-cute-python.git" @@ -66,24 +47,36 @@ "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" "github:ensime/ensime-vim" +"github:ervandew/supertab" "github:esneider/YUNOcommit.vim" "github:fatih/vim-go" +"github:FelikZ/ctrlp-py-matcher" "github:flazz/vim-colorschemes" "github:floobits/floobits-neovim" "github:frigoeu/psc-ide-vim" +"github:garbas/vim-snipmate" +"github:gmarik/vundle" +"github:godlygeek/csapprox" +"github:godlygeek/tabular" "github:google/vim-codefmt" "github:google/vim-jsonnet" "github:google/vim-maktaba" "github:gregsexton/gitv" +"github:guns/xterm-color-table.vim" "github:heavenshell/vim-jsdoc" "github:hecal3/vim-leader-guide" +"github:honza/vim-snippets" "github:idris-hackers/idris-vim" +"github:inkarkat/vim-SyntaxRange" +"github:int3/vim-extradite" "github:itchyny/calendar.vim" "github:itchyny/lightline.vim" "github:itchyny/thumbnail.vim" +"github:itchyny/vim-cursorword" "github:itchyny/vim-gitbranch" "github:ivanov/vim-ipython" "github:janko-m/vim-test.git" +"github:JazzCore/ctrlp-cmatcher" "github:jceb/vim-hier" "github:jceb/vim-orgmode" "github:jeetsukumaran/vim-buffergator" @@ -95,57 +88,106 @@ "github:jonbri/vim-colorstepper" "github:joonty/vim-xdebug" "github:junegunn/fzf.vim" +"github:junegunn/goyo.vim" "github:junegunn/limelight.vim" +"github:junegunn/vim-easy-align" +"github:junegunn/vim-github-dashboard" "github:junegunn/vim-peekaboo" "github:justincampbell/vim-eighties" +"github:KabbAmine/zeavim.vim" "github:kana/vim-niceblock" "github:kana/vim-operator-replace" "github:kana/vim-operator-user" +"github:kana/vim-tabpagecd" +"github:kchmck/vim-coffee-script" +"github:kien/rainbow_parentheses.vim" +"github:kshenoy/vim-signature" +"github:lambdalisue/vim-gista" "github:latex-box-team/latex-box" "github:leafgarland/typescript-vim" "github:lepture/vim-jinja" "github:lervag/vimtex" +"github:lfilho/cosco.vim" +"github:LnL7/vim-nix" "github:lokaltog/vim-easymotion" "github:ludovicchabant/vim-lawrencium" "github:luochen1990/rainbow" "github:lyokha/vim-xkbswitch" "github:machakann/vim-highlightedyank" +"github:majutsushi/tagbar" +"github:maksimr/vim-jsbeautify" +"github:MarcWeber/vim-addon-actions" +"github:MarcWeber/vim-addon-async" +"github:MarcWeber/vim-addon-background-cmd" +"github:MarcWeber/vim-addon-commenting" +"github:MarcWeber/vim-addon-completion" +"github:MarcWeber/vim-addon-errorformats" +"github:MarcWeber/vim-addon-goto-thing-at-cursor" +"github:MarcWeber/vim-addon-local-vimrc" +"github:MarcWeber/vim-addon-manager" +"github:MarcWeber/vim-addon-mru" +"github:MarcWeber/vim-addon-mw-utils" +"github:MarcWeber/vim-addon-nix" +"github:MarcWeber/vim-addon-other" +"github:MarcWeber/vim-addon-php-manual" +"github:MarcWeber/vim-addon-signs" +"github:MarcWeber/vim-addon-sql" +"github:MarcWeber/vim-addon-syntax-checker" +"github:MarcWeber/vim-addon-toggle-buffer" +"github:MarcWeber/vim-addon-xdebug" "github:martinda/Jenkinsfile-vim-syntax" +"github:mattn/gist-vim" +"github:mattn/webapi-vim" +"github:mbbill/undotree" "github:megaannum/forms" "github:megaannum/self" "github:mfukar/robotframework-vim" "github:mhinz/vim-grepper.git" +"github:mhinz/vim-signify" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" "github:mileszs/ack.vim" "github:mindriot101/vim-yapf" "github:mkasa/lushtags" +"github:morhetz/gruvbox" "github:mpickering/hlint-refactor-vim" "github:nathanaelkane/vim-indent-guides" "github:nbouscal/vim-stylish-haskell" +"github:neoclide/vim-easygit" "github:neovimhaskell/haskell-vim" "github:nixprime/cpsm" +"github:noc7c9/vim-iced-coffee-script" "github:osyo-manga/shabadou.vim" "github:osyo-manga/vim-textobj-multiblock" "github:osyo-manga/vim-watchdogs" +"github:pangloss/vim-javascript" "github:plasticboy/vim-markdown" "github:python-mode/python-mode" +"github:Quramy/tsuquyomi" "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" +"github:reedes/vim-pencil" "github:reedes/vim-wordy" "github:rhysd/committia.vim.git" "github:rhysd/vim-grammarous" "github:rhysd/vim-operator-surround" +"github:Rip-Rip/clang_complete" "github:rodjek/vim-puppet" "github:roxma/nvim-cm-racer" "github:roxma/nvim-completion-manager" "github:rust-lang/rust.vim" "github:ryanoasis/vim-devicons" +"github:ryanoasis/vim-devicons" +"github:Rykka/riv.vim" "github:sbdchd/neoformat" +"github:scrooloose/nerdcommenter" +"github:scrooloose/nerdtree" +"github:scrooloose/syntastic" "github:sebastianmarkow/deoplete-rust" "github:sheerun/vim-polyglot" "github:shougo/context_filetype.vim" "github:shougo/denite.nvim" +"github:Shougo/deoplete.nvim" "github:shougo/echodoc.vim" "github:shougo/neco-syntax" "github:shougo/neco-vim" @@ -159,41 +201,64 @@ "github:shougo/unite.vim" "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" +"github:SirVer/ultisnips" "github:sjl/gundo.vim" "github:slashmili/alchemist.vim" "github:t9md/vim-smalls" "github:takac/vim-hardtime" "github:terryma/vim-expand-region" +"github:terryma/vim-multiple-cursors" "github:tex/vimpreviewpandoc" +"github:thinca/vim-ft-diff_fold" +"github:thinca/vim-prettyprint" "github:thinca/vim-quickrun" +"github:thinca/vim-scouter" "github:thinca/vim-themis" "github:tomasr/molokai" "github:tomlion/vim-solidity" +"github:tomtom/tlib_vim" +"github:tpope/vim-commentary" "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" +"github:tpope/vim-fugitive" +"github:tpope/vim-pathogen" "github:tpope/vim-repeat" "github:tpope/vim-rhubarb" +"github:tpope/vim-sensible" +"github:tpope/vim-sleuth" "github:tpope/vim-speeddating" +"github:tpope/vim-surround" +"github:tpope/vim-vinegar" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" +"github:Twinside/vim-hoogle" +"github:tyru/caw.vim" "github:tyru/open-browser.vim" +"github:ujihisa/neco-look" "github:valloric/youcompleteme" +"github:vim-airline/vim-airline" "github:vim-airline/vim-airline-themes" +"github:vimoutliner/vimoutliner" "github:vim-pandoc/vim-pandoc" "github:vim-pandoc/vim-pandoc-after" "github:vim-pandoc/vim-pandoc-syntax" -"github:vim-scripts/Colour-Sampler-Pack" -"github:vim-scripts/Improved-AnsiEsc" -"github:vim-scripts/Rename" -"github:vim-scripts/ReplaceWithRegister" -"github:vim-scripts/a.vim" +"github:vim-ruby/vim-ruby" "github:vim-scripts/align" "github:vim-scripts/argtextobj.vim" +"github:vim-scripts/a.vim" "github:vim-scripts/changeColorScheme.vim" +"github:vim-scripts/Colour-Sampler-Pack" +"github:vim-scripts/Improved-AnsiEsc" +"github:vim-scripts/matchit.zip" "github:vim-scripts/mayansmoke.git" "github:vim-scripts/random.vim" +"github:vim-scripts/Rename" +"github:vim-scripts/ReplaceWithRegister" "github:vim-scripts/tabmerge" +"github:vim-scripts/taglist.vim" "github:vim-scripts/wombat256.vim" +"github:vim-scripts/YankRing.vim" +"github:vimwiki/vimwiki" "github:w0rp/ale" "github:wakatime/vim-wakatime" "github:wellle/targets.vim" @@ -201,73 +266,8 @@ "github:wincent/command-t" "github:xolox/vim-easytags" "github:xolox/vim-misc" +"github:xuhdev/vim-latex-live-preview" "github:zah/nim.vim" "github:zchee/deoplete-go" "github:zchee/deoplete-jedi" "github:zig-lang/zig.vim" -"goyo" -"gruvbox" -"matchit.zip" -"neco-look" -"pathogen" -"prettyprint" -"quickfixstatus" -"rainbow_parentheses" -"riv" -"sensible" -"sleuth" -"snipmate" -"sourcemap" -"sparkup" -"surround" -"table-mode" -"tabpagecd" -"taglist" -"tlib" -"undotree" -"vim-addon-actions" -"vim-addon-async" -"vim-addon-background-cmd" -"vim-addon-commenting" -"vim-addon-completion" -"vim-addon-errorformats" -"vim-addon-goto-thing-at-cursor" -"vim-addon-local-vimrc" -"vim-addon-manager" -"vim-addon-mru" -"vim-addon-mw-utils" -"vim-addon-nix" -"vim-addon-other" -"vim-addon-php-manual" -"vim-addon-signs" -"vim-addon-sql" -"vim-addon-syntax-checker" -"vim-addon-toggle-buffer" -"vim-addon-xdebug" -"vim-airline" -"vim-coffee-script" -"vim-cursorword" -"vim-easy-align" -"vim-ft-diff_fold" -"vim-gista" -"vim-gitgutter" -"vim-github-dashboard" -"vim-iced-coffee-script" -"vim-javascript" -"vim-jsbeautify" -"vim-latex-live-preview" -"vim-logreview" -"vim-multiple-cursors" -"vim-pencil" -"vim-ruby" -"vim-scouter" -"vim-signature" -"vim-signify" -"vim-snippets" -"vim-webdevicons" -"vim2hs" -"vimwiki" -"vinegar" -"vundle" -"xterm-color-table" -"zeavim" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm index ea360765925..c3a210a642d 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/cpsm @@ -4,6 +4,7 @@ cmake boost icu + ncurses ]; buildPhase = '' patchShebangs . diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip deleted file mode 100644 index cc9d3fb7264..00000000000 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip +++ /dev/null @@ -1,7 +0,0 @@ - unpackPhase = '' - ( - sourceRoot=d - mkdir $sourceRoot; cd $sourceRoot; - unzip $src - ) - ''; diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix new file mode 100644 index 00000000000..d56253c6ced --- /dev/null +++ b/pkgs/os-specific/linux/gpu-switch/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gpu-switch-unstable-${version}"; + version = "2017-04-28"; + src = fetchFromGitHub { + owner = "0xbb"; + repo = "gpu-switch"; + rev = "a365f56d435c8ef84c4dd2ab935ede4992359e31"; + sha256 = "1jnh43nijkqd83h7piq7225ixziggyzaalabgissyxdyz6szcn0r"; + }; + installPhase = '' + mkdir -p $out/bin + cp gpu-switch $out/bin/ + ''; + meta = with lib; { + description = "Application that allows to switch between the graphic cards of dual-GPU MacBook Pro models"; + homepage = https://github.com/0xbb/gpu-switch; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.msiedlarek ]; + }; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4eaa7bcf666..f8c4b95bb61 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -32,7 +32,6 @@ with stdenv.lib; # Debugging. DEBUG_KERNEL y DYNAMIC_DEBUG y - BACKTRACE_SELF_TEST n DEBUG_DEVRES n DEBUG_STACK_USAGE n DEBUG_STACKOVERFLOW n @@ -641,43 +640,46 @@ with stdenv.lib; # This menu disables all/most of them on >= 4.16 RUNTIME_TESTING_MENU? n # For older kernels, painstakingly disable each symbol. - ARM_KPROBES_TEST? n - ASYNC_RAID6_TEST? n - ATOMIC64_SELFTEST? n - BACKTRACE_SELF_TEST? n + ${optionalString (versionOlder version "4.16") '' + ARM_KPROBES_TEST? n + ASYNC_RAID6_TEST? n + ATOMIC64_SELFTEST? n + BACKTRACE_SELF_TEST? n + INTERVAL_TREE_TEST? n + PERCPU_TEST? n + RBTREE_TEST? n + TEST_BITMAP? n + TEST_BPF? n + TEST_FIRMWARE? n + TEST_HASH? n + TEST_HEXDUMP? n + TEST_KMOD? n + TEST_KSTRTOX? n + TEST_LIST_SORT? n + TEST_LKM? n + TEST_PARMAN? n + TEST_PRINTF? n + TEST_RHASHTABLE? n + TEST_SORT? n + TEST_STATIC_KEYS? n + TEST_STRING_HELPERS? n + TEST_UDELAY? n + TEST_USER_COPY? n + TEST_UUID? n + ''} + CRC32_SELFTEST? n CRYPTO_TEST? n DRM_DEBUG_MM_SELFTEST? n EFI_TEST? n GLOB_SELFTEST? n - INTERVAL_TREE_TEST? n LNET_SELFTEST? n LOCK_TORTURE_TEST? n MTD_TESTS? n NOTIFIER_ERROR_INJECTION? n - PERCPU_TEST? n - RBTREE_TEST? n RCU_PERF_TEST? n RCU_TORTURE_TEST? n TEST_ASYNC_DRIVER_PROBE? n - TEST_BITMAP? n - TEST_BPF? n - TEST_FIRMWARE? n - TEST_HASH? n - TEST_HEXDUMP? n - TEST_KMOD? n - TEST_KSTRTOX? n - TEST_LIST_SORT? n - TEST_LKM? n - TEST_PARMAN? n - TEST_PRINTF? n - TEST_RHASHTABLE? n - TEST_SORT? n - TEST_STATIC_KEYS? n - TEST_STRING_HELPERS? n - TEST_UDELAY? n - TEST_USER_COPY? n - TEST_UUID? n WW_MUTEX_SELFTEST? n XZ_DEC_TEST? n diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 1b8c3f76155..2b44ff51ad0 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -77,6 +77,7 @@ let generateConfig = ./generate-config.pl; kernelConfig = kernelConfigFun config; + passAsFile = [ "kernelConfig" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ] @@ -104,7 +105,7 @@ let # Create the config file. echo "generating kernel configuration..." - echo "$kernelConfig" > "$buildRoot/kernel-config" + ln -s "$kernelConfigPath" "$buildRoot/kernel-config" DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig ''; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a53786ebcbd..46486e0ff58 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.32"; + version = "4.14.33"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "105n8c7yq576xlrqr5pm1x5m8wwnrzhfmyqcn51rl233qsz7j2fb"; + sha256 = "0c88p5vly63jsz62ff7971zl6vqzzbv5q519gi8z17ld66sf5063"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index bc22563bed9..e58f44ea6a0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.15.15"; + version = "4.15.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pys0gcc1x01scfqc1d25k64bqf264vfn3pybfcnmvkggvpyhmhb"; + sha256 = "00y5b00f90pq3il5jdzigx8k32i9ksrinavqa991xday5mcz5np7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 26b69f896c9..eb219ce0e0f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16"; + version = "4.16.1"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1f91pf3lq3kmbg82k4v8bwxcl4r4iaixrx6nsmrh4flz7j7drxk3"; + sha256 = "1hv00176njm4g9m1aj92lvhwqn75c46qwsglsmx95ivbr9qc58av"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0b05387472e..b5974854112 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.126"; + version = "4.4.127"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0n6dk6pdaf5bsgfr1vkv2xy2zhgrnffrgnivqpkj94d8rp2g9j79"; + sha256 = "1gscsvijik24p0skhjnhqxlvzj3kfy5cmn3x9wn6ka687hwjb3qa"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index c46c0eb3747..86ddcf99dbe 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.92"; + version = "4.9.93"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0r3fg3za68p6ls40svryqxixmlia2ql3hqnd1kvvrdw6wqgap382"; + sha256 = "00srda6plvirmrr0bjgiksf00ssiigf5cqi4giy4mij5r6v8mxsq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index c19809bcdbd..82b0b44bfc0 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.15"; + version = "4.15.16"; revision = "a"; - sha256 = "08jsdnkfqcigcr87yhszbnz8gh62vdmxdwlr38gjxximv95k1gf7"; + sha256 = "0jxf01gf5rh6kwxcsv6mwlhq3wva2ps0ayrx40zwrdhkqy03w79x"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 2e2ef610de6..1b15edcc923 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,29 +1,26 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, perl, docbook2x -, docbook_xml_dtd_45, python3Packages +, docbook_xml_dtd_45, python3Packages, pam # Optional Dependencies , libapparmor ? null, gnutls ? null, libselinux ? null, libseccomp ? null -, cgmanager ? null, libnih ? null, dbus ? null, libcap ? null, systemd ? null +, libcap ? null, systemd ? null }: -let - enableCgmanager = cgmanager != null && libnih != null && dbus != null; -in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1xpghrinxhm2072fwmn42pxhjwh7qx6cbsipw4s6g38a8mkklrk8"; + sha256 = "12ldpkd17cy6fg7z1icr91cfs86jkkrsj61b6wdj0l7h4x624c32"; }; nativeBuildInputs = [ autoreconfHook pkgconfig perl docbook2x python3Packages.wrapPython ]; buildInputs = [ - libapparmor gnutls libselinux libseccomp cgmanager libnih dbus libcap + pam libapparmor gnutls libselinux libseccomp libcap python3Packages.python python3Packages.setuptools systemd ]; @@ -37,15 +34,8 @@ stdenv.mkDerivation rec { XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; - # FIXME - # glibc 2.25 moved major()/minor() to <sys/sysmacros.h>. - # this commit should detect this: https://github.com/lxc/lxc/pull/1388/commits/af6824fce9c9536fbcabef8d5547f6c486f55fdf - # However autotools checks if mkdev is still defined in <sys/types.h> runs before - # checking if major()/minor() is defined there. The mkdev check succeeds with - # a warning and the check which should set MAJOR_IN_SYSMACROS is skipped. - NIX_CFLAGS_COMPILE = [ "-DMAJOR_IN_SYSMACROS" ]; - configureFlags = [ + "--enable-pam" "--localstatedir=/var" "--sysconfdir=/etc" "--disable-api-docs" diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 4f62b7eb128..6f7dd2f56ff 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse , enableDebugBuild ? false }: with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-2.0.8"; + name = "lxcfs-3.0.0"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "04dzn6snqgw0znf7a7qdm64400jirip6q8amcx5fmz4705qdqahc"; + sha256 = "0fsy2h7b5dkzvfm6m8vqzhnji42cszdn0b3ndnaxiwv3402ccmvk"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; - buildInputs = [ fuse pam ]; + buildInputs = [ fuse ]; preConfigure = stdenv.lib.optionalString enableDebugBuild '' sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 57899d6f893..11a97d420a8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -17,11 +17,13 @@ in rec { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "390.25"; - sha256_32bit = "0fkbpx01l46pprrd4nlc2y6hfmkb55ddlwm1r84kr6j08qmmb0qi"; - sha256_64bit = "0whsls1mm6vkll5qmxnyz8vjgspp1rmqpsampgi83k62n514c08r"; - settingsSha256 = "1jhbr68z36s3fr9vx3ga2f6yrzlwpc0j5mw8h12g65p7wdsbk6y7"; - persistencedSha256 = "033azbhi50f1b0lw759sncgf7ckh2m2c0khj5v15sch9kl1fzk8i"; + version = "390.48"; + sha256_32bit = "1y6n2hfz9vd0h7gd31fgxcl76s5pjf8afwqyq5slqpcxpd78j5ai"; + sha256_64bit = "16a3blvizcksmaxr644s857yanw3i3vcvqvn7qnwbsbqpmxga09c"; + settingsSha256 = "058xaiw5g0kxrvc3lvy4424fqbjkvmsznj2v73cgbm25i1m83krl"; + persistencedSha256 = "0y86bhzl42lqyrbibqzf8a8yd49zbq3ryb78vgsl13i44f9sl79k"; + + patches = [ ./fix_missing_symbol.patch ]; }; beta = stable; # not enough interest to maintain beta ATM diff --git a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch new file mode 100644 index 00000000000..ea783b4f011 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch @@ -0,0 +1,19 @@ +https://devtalk.nvidia.com/default/topic/1030082/linux/kernel-4-16-rc1-breaks-latest-drivers-unknown-symbol-swiotlb_map_sg_attrs-/ +--- a/kernel/common/inc/nv-linux.h~ 2018-01-25 06:09:41.000000000 +0100 ++++ b/kernel/common/inc/nv-linux.h 2018-03-05 13:58:17.746725638 +0100 +@@ -1209,6 +1209,7 @@ static inline NvU32 nv_alloc_init_flags( + static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev) + { + NvBool swiotlb_in_use = NV_FALSE; ++#if 0 + #if defined(CONFIG_SWIOTLB) + #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT) + /* +@@ -1251,7 +1252,7 @@ static inline NvBool nv_dma_maps_swiotlb + swiotlb_in_use = (swiotlb == 1); + #endif + #endif +- ++#endif + return swiotlb_in_use; + } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d382eb74b26..31b0cdfea8a 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -187,9 +187,11 @@ in { spl = splUnstable; }; + # TODO: Remove this module before 18.09 + # also remove boot.zfs.enableLegacyCrypto zfsLegacyCrypto = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.16"; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-02-01"; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index fe028cf812e..b0460f21bfa 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.3"; + version = "17.11.5"; src = fetchurl { url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; - sha256 = "1x3i6z03d9m46fvj1cslrapm1drvgyqch9pn4xf23kvbz4gkhaps"; + sha256 = "07ghyyz12k4rksm06xf7dshwp1ndm13zphdbqja99401q4xwbx9r"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 25b333a4618..76f1bd91e33 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0srrw726qpwg69v75dwbxab9hk73x1wia4rcnmf7g5qr2k3h7swg"; + sha256 = "0xpd8k7ahwrwabz05zbjmg54dmd4hm5hkbfn8m1ws6y4f7qm4inv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index b8eb21e492b..1abe9512f58 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "oidentd-2.0.8"; + name = "oidentd-${version}"; + version = "2.2.2"; CFLAGS = [ "--std=gnu89" ]; src = fetchurl { - url = "mirror://sourceforge/ojnk/${name}.tar.gz"; - sha256 = "0vzv2086rrxcaavrm3js7aqvyc0grgaqy78x61d8s7r8hz8vwk55"; + url = "https://ftp.janikrabe.com/pub/oidentd/releases/${version}/${name}.tar.gz"; + sha256 = "1svj7ymljp4s17d7jlx6602n9081714qsj5yymmv1s9wagzjqyn9"; }; meta = { diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index fc43e949269..34d242b92a8 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.716"; + version = "0.8.823"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0i770f4h06jf76977y3cp9l5n5csnb9wzpskndc7mgk0h02m7nrc"; + sha256 = "0hicz21dvcakqkxix70akc3rrz570j3g0a512pqrr3bdq7ay0dkk"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4c7d1649832..3cf46053969 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,20 +26,16 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.26.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "1rm15qj743k376skjxyyfmzwajx3rb8z2inzc4309kl98jfw3cw0"; + sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3"; }; patches = [ - (fetchpatch { # Update pynacl dependency - url = "https://github.com/matrix-org/synapse/pull/2888.patch"; - sha256 = "0gr9vwv02ps17d6pzassp9xmj1qbdgxwn1z4kckx4x964zzhyn4f"; - }) ./matrix-synapse.patch ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 4668702fcee..e326aff0d7e 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.6"; + version = "1.5.7"; name = "memcached-${version}"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "00szy9d4szaixi260dcd4846zci04y0sd47ia2lzg0bxkn2ywxcn"; + sha256 = "0ijfiy1w4hk3j8hhra6kablq8kjabvcdvsl8cwd4drvszjl0ddsv"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 559af3bdbef..a952dbada66 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -3,11 +3,11 @@ , ldns, libedit, yasm, which, lua, libopus, libsndfile }: stdenv.mkDerivation rec { - name = "freeswitch-1.6.19"; + name = "freeswitch-1.6.20"; src = fetchurl { url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; - sha256 = "019n16yyzk9yp6h7iwsg30h62zj5vqvigr5cl8pjik4106xzcjyr"; + sha256 = "0hqz68abs5x5vzf1mndcvdi35nrhmnklzdrnrk8dyvzvz67hp2ah"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 04e6e97c54e..e7114b957dc 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.5153"; + version = "2.0.0.5163"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1zdsba5bpi87dhsa62qbpj55wbakl6w380pijs8qxn80bvapv3xy"; + sha256 = "037rs0cb7dfiblfy02x2l4amv9dmx1wiz5pa97vpczfgk5gq99y3"; }; buildInputs = [ diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 25fee035cd5..60462f83d10 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.2.13"; + version = "10.2.14"; src = fetchurl { url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "0ly7dxc7rk327liya4kalgsw8irlxl0pl8gq0agdl18a63cpwbi7"; + sha256 = "0zizf3q0hdkmsn6rpwdbfm5xkj21cwpnnzq9knjfpwcadqnyqhrl"; name = "mariadb-${version}.tar.gz"; }; diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 24f0610cba3..1f612116ae3 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "0jlaxkj33dgr2hgh0f861ja1z53kqw0g1syinl2sacsna2i9pdxy"; + sha256 = "0hx7bzxmjv0rsvv6b77gpmwhw4ajy8sgjbmrg7hj3dc51kiyiai0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index 9831d7dabce..939976b0a26 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "shaarli-material-${version}"; - version = "0.9.1"; + version = "0.9.5"; src = fetchFromGitHub { owner = "kalvn"; repo = "Shaarli-Material"; rev = "v${version}"; - sha256 = "0x8d9425n3jrwzsyxclbxfspvi91v1klq8r3m6wcj81kys7vmzgh"; + sha256 = "1bxw74ksvfv46995iwc7jhvl78hd84lcq3h9iyxvs8gpkhkapv55"; }; patchPhase = '' for f in material/*.html do substituteInPlace $f \ - --replace '.min.css"' '.min.css#"' \ - --replace '.min.js"' '.min.js#"' \ + --replace '.min.css?v={$version_hash}"' '.min.css#"' \ + --replace '.min.js?v={$version_hash}"' '.min.js#"' \ --replace '.png"' '.png#"' done ''; diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index 608a9e5a65b..c39c378d221 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, autoreconfHook, libxcomp }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxcomp }: stdenv.mkDerivation rec { name = "nxproxy-${version}"; - version = "3.5.0.33"; + version = "3.5.99.16"; src = fetchurl { - sha256 = "17qjsd6v2ldpfmyjrkdnlq4qk05hz5l6qs54g8h0glzq43w28f74"; + sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libxcomp ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; preAutoreconf = '' cd nxproxy/ + sed -i 's|-L\$(top_srcdir)/../nxcomp/src/.libs ||' src/Makefile.am ''; makeFlags = [ "exec_prefix=$(out)" ]; diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix new file mode 100644 index 00000000000..d36ef7ea64f --- /dev/null +++ b/pkgs/tools/backup/duplicati/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip, mono, sqlite, makeWrapper }: + +stdenv.mkDerivation rec { + name = "duplicati-${version}"; + version = "2.0.3.3"; + channel = "beta"; + build_date = "2018-04-02"; + + src = fetchzip { + url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; + sha256 = "0hwdpsgrvm3gq648mg9g0z0rk49g71dd8r5i1a8w83pwdqv0hn9c"; + stripRoot = false; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,share/${name}} + cp -r * $out/share/${name} + makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \ + --add-flags "$out/share/${name}/Duplicati.CommandLine.exe" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + sqlite ]} + makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \ + --add-flags "$out/share/${name}/Duplicati.Server.exe" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ + sqlite ]} + ''; + + meta = with stdenv.lib; { + description = "A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers"; + homepage = https://www.duplicati.com/; + license = licenses.lgpl21; + maintainers = with maintainers; [ nyanloutre ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 30546865bcc..0223375a088 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }: stdenv.mkDerivation rec { - name = "dcraw-9.26.0"; + name = "dcraw-9.27.0"; src = fetchurl { url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; - sha256 = "18zvzaxjq1yaj90xm8bwb30lqbjyjyp002bp175dayh3kr91syc5"; + sha256 = "16bhk3pl5kb9ikv367szl8m92nx85rqypz5im8x3sakm357wrn61"; }; buildInputs = [ libjpeg lcms2 gettext jasper ]; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 0941b3eabf9..3ab2232e26c 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { - name = "icoutils-0.32.2"; + name = "icoutils-0.32.3"; src = fetchurl { url = "mirror://savannah/icoutils/${name}.tar.bz2"; - sha256 = "1g8ihxw24gbiy189h36w16lbyfq7fn260qkbc85n9jqrvkxsz4p8"; + sha256 = "1q66cksms4l62y0wizb8vfavhmf7kyfgcfkynil3n99s0hny1aqp"; }; buildInputs = [ makeWrapper libpng perl ]; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1c135cd36f4..42fcc842ad5 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -21,12 +21,12 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "openssh-${version}"; - version = if hpnSupport then "7.5p1" else "7.6p1"; + version = if hpnSupport then "7.6p1" else "7.6p1"; src = if hpnSupport then fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_5_P1.tar.gz"; - sha256 = "1hasdcfjl6xf5nbbbvqyyq5v7ad10nywrq89j7naxz9wln58nhnn"; + url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_6_P1.tar.gz"; + sha256 = "15b1zjk9f3jlxji1vpqfla40cnzy8hv2clk925cvpgz7lqgv4a1d"; } else fetchurl { diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 4bdc630efd7..8c0c4a6c566 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, unzip, nettools, pythonPackages }: +{ fetchurl, lib, unzip, nettools, pythonPackages, texinfo }: # FAILURES: The "running build_ext" phase fails to compile Twisted # plugins, because it tries to write them into Twisted's (immutable) @@ -15,7 +15,9 @@ pythonPackages.buildPythonApplication rec { sha256 = "0x9f1kjym1188fp6l5sqy0zz8mdb4xw861bni2ccv26q482ynbks"; }; - patchPhase = '' + outputs = [ "out" "doc" "info" ]; + + postPatch = '' sed -i "src/allmydata/util/iputil.py" \ -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" @@ -30,6 +32,24 @@ pythonPackages.buildPythonApplication rec { sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py ''; + # Remove broken and expensive tests. + preConfigure = '' + ( + cd src/allmydata/test + + # Buggy? + rm cli/test_create.py test_backupdb.py + + # These require Tor and I2P. + rm test_connections.py test_iputil.py test_hung_server.py test_i2p_provider.py test_tor_provider.py + + # Expensive + rm test_system.py + ) + ''; + + nativeBuildInputs = with pythonPackages; [ sphinx texinfo ]; + buildInputs = with pythonPackages; [ unzip numpy mock ]; # The `backup' command requires `sqlite3'. @@ -39,16 +59,23 @@ pythonPackages.buildPythonApplication rec { service-identity pyyaml ]; + # Install the documentation. postInstall = '' - # Install the documentation. - mkdir -p "$out/share/doc/${name}" - cp -rv "docs/"* "$out/share/doc/${name}" - find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; + ( + cd docs + + make singlehtml + mkdir -p "$doc/share/doc/${name}" + cp -rv _build/singlehtml/* "$doc/share/doc/${name}" + + make info + mkdir -p "$info/share/info" + cp -rv _build/texinfo/*.info "$info/share/info" + ) ''; checkPhase = '' - # Still broken. ~ C. - # trial allmydata + trial --rterrors allmydata ''; meta = { diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix new file mode 100644 index 00000000000..c12b82a61e1 --- /dev/null +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -0,0 +1,32 @@ +{ pkgs, stdenv, fetchFromGitHub, mypy, python3 }: +let self = stdenv.mkDerivation rec { + name = "nix-pin-${version}"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "timbertson"; + repo = "nix-pin"; + rev = "version-0.1.2"; + sha256 = "1zwfb5198qzbjwivgiaxbwva9frgrrqaj92nw8vz95yi08pijssh"; + }; + buildInputs = [ python3 mypy ]; + buildPhase = '' + mypy bin/* + ''; + installPhase = '' + mkdir "$out" + cp -r bin share "$out" + ''; + passthru = { + callWithPins = path: args: + import "${self}/share/nix/call.nix" { + inherit pkgs path args; + }; + }; + meta = with stdenv.lib; { + homepage = "https://github.com/timbertson/nix-pin"; + description = "nixpkgs development utility"; + license = licenses.mit; + maintainers = [ maintainers.timbertson ]; + platforms = platforms.all; + }; +}; in self diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix new file mode 100644 index 00000000000..88b5c147f30 --- /dev/null +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, unzip, libusb }: + +let + arch = if stdenv.system == "i686-linux" then "32" + else if stdenv.system == "x86_64-linux" then "64" + else throw "Unsupported system: ${stdenv.system}"; +in +stdenv.mkDerivation rec { + name = "pcsc-scm-scl-${version}"; + version = "2.09"; + + src = fetchurl { + url = "http://files.identiv.com/products/smart-card-readers/contactless/scl010-011/Linux_Driver_Ver${version}.zip"; + sha256 = "0ik26sxgqgsqplksl87z61vwmx51k7plaqmrkdid7xidgfhfxr42"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = '' + echo ${stdenv.system} + unzip $src + tar xf "Linux Driver Ver${version}/sclgeneric_${version}_linux_${arch}bit.tar.gz" + cd sclgeneric_${version}_linux_${arch}bit; export sourceRoot=`pwd` + ''; + + # Add support for SCL011 nPA (subsidized model for German eID) + patches = [ ./eid.patch ]; + + installPhase = '' + mkdir -p $out/pcsc/drivers + cp -r proprietary/*.bundle $out/pcsc/drivers + ''; + + libPath = stdenv.lib.makeLibraryPath [ libusb ]; + + fixupPhase = '' + patchelf --set-rpath $libPath \ + $out/pcsc/drivers/SCLGENERIC.bundle/Contents/Linux/libSCLGENERIC.so.${version}; + ''; + + meta = with stdenv.lib; { + description = "SCM Microsystems SCL011 chipcard reader user space driver"; + homepage = http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630; + downloadPage = https://support.identiv.com/scl010-scl011/; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ sephalon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/pcsc-scm-scl011/eid.patch b/pkgs/tools/security/pcsc-scm-scl011/eid.patch new file mode 100644 index 00000000000..6e7ffd60f72 --- /dev/null +++ b/pkgs/tools/security/pcsc-scm-scl011/eid.patch @@ -0,0 +1,28 @@ +diff --git a/proprietary/SCLGENERIC.bundle/Contents/Info.plist b/proprietary/SCLGENERIC.bundle/Contents/Info.plist +index 412d6b9..5d1c6cc 100755 +--- a/proprietary/SCLGENERIC.bundle/Contents/Info.plist ++++ b/proprietary/SCLGENERIC.bundle/Contents/Info.plist +@@ -34,6 +34,7 @@ + <string>0x04E6</string> + <string>0x04E6</string> + <string>0x04E6</string> ++ <string>0x04E6</string> + </array> + + <key>ifdProductID</key> +@@ -42,6 +43,7 @@ + <string>0x5291</string> + <string>0x5290</string> + <string>0x5293</string> ++ <string>0x5292</string> + </array> + + <key>ifdFriendlyName</key> +@@ -50,6 +52,7 @@ + <string>SCL010 Contactless Reader</string> + <string>SCR331CL-NTTCom</string> + <string>SCL011G Contactless Reader</string> ++ <string>SCM Microsystems, Inc. SCL011 RFID reader</string> + </array> + + </dict> diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 3a6c09b9291..3126dd2b4fa 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radamsa-${version}"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "http://haltp.org/download/${name}.tar.gz"; - sha256 = "1xs9dsrq6qrf104yi9x21scpr73crfikbi8q9njimiw5c1y6alrv"; + url = "https://github.com/aoh/radamsa/releases/download/v${version}/${name}.tar.gz"; + sha256 = "1d2chp45fbdb2v5zpsx6gh3bv8fhcjv0zijz10clcznadnm8c6p2"; }; patchPhase = '' diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 2d18edeb44d..e60ead5bc8f 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "LanguageTool-${version}"; - version = "4.0"; + version = "4.1"; src = fetchzip { url = "https://www.languagetool.org/download/${name}.zip"; - sha256 = "0nfqn04fb5kvxvpsc6xbgj03rmqcsn8vy2xj0zazijhvbxaf0zfb"; + sha256 = "0qc4z5rl9239lqfi2jrggzmjkx4f33n0arlqm5xgfaqgi8wypz0l"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 797ad7a5950..4fec9d928c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -202,6 +202,7 @@ mapAliases (rec { sshfs = sshfs-fuse; # added 2017-08-14 sshfsFuse = sshfs-fuse; # added 2016-09 surf-webkit2 = surf; # added 2017-04-02 + tahoelafs = tahoe-lafs; # added 2018-03-26 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_farstream = telepathy-farstream; # added 2018-02-25 telepathy_gabble = telepathy-gabble; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71f2a508840..7fb8e467d42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1053,6 +1053,8 @@ with pkgs; cri-tools = callPackage ../tools/virtualization/cri-tools {}; + crip = callPackage ../applications/audio/crip { }; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; @@ -1603,7 +1605,7 @@ with pkgs; with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; }; - clementineFree = clementine.free; + clementineUnfree = clementine.unfree; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -2035,6 +2037,8 @@ with pkgs; duo-unix = callPackage ../tools/security/duo-unix { }; + duplicati = callPackage ../tools/backup/duplicati { }; + duplicity = callPackage ../tools/backup/duplicity { gnupg = gnupg1; }; @@ -4236,6 +4240,8 @@ with pkgs; pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; + pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { }; + pdd = python3Packages.callPackage ../tools/misc/pdd { }; pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; @@ -13100,6 +13106,8 @@ with pkgs; gpm-ncurses = gpm.override { inherit ncurses; }; + gpu-switch = callPackage ../os-specific/linux/gpu-switch { }; + gradm = callPackage ../os-specific/linux/gradm { flex = flex_2_5_35; }; @@ -14446,6 +14454,8 @@ with pkgs; shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { }; + scheherazade = callPackage ../data/fonts/scheherazade { }; + signwriting = callPackage ../data/fonts/signwriting { }; soundfont-fluid = callPackage ../data/soundfonts/fluid { }; @@ -14797,6 +14807,8 @@ with pkgs; backintime = backintime-qt4; + balsa = callPackage ../applications/networking/mailreaders/balsa { }; + bandwidth = callPackage ../tools/misc/bandwidth { }; baresip = callPackage ../applications/networking/instant-messengers/baresip { @@ -16565,6 +16577,11 @@ with pkgs; flavour = "git"; }; + luakit = callPackage ../applications/networking/browsers/luakit { + inherit (lua51Packages) luafilesystem; + lua5 = lua5_1; + }; + looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; lumail = callPackage ../applications/networking/mailreaders/lumail { @@ -17857,7 +17874,7 @@ with pkgs; tagainijisho = callPackage ../applications/office/tagainijisho {}; - tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; + tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs {}; tailor = callPackage ../applications/version-management/tailor {}; @@ -17967,6 +17984,8 @@ with pkgs; tnef = callPackage ../applications/misc/tnef { }; + todiff = callPackage ../applications/misc/todiff { }; + todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; tomahawk = callPackage ../applications/audio/tomahawk { @@ -18898,6 +18917,8 @@ with pkgs; endless-sky = callPackage ../games/endless-sky { }; + enyo-doom = libsForQt5.callPackage ../games/enyo-doom { }; + eternity = callPackage ../games/eternity-engine { }; extremetuxracer = callPackage ../games/extremetuxracer { @@ -20273,6 +20294,8 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; + click = callPackage ../applications/networking/cluster/click { }; + cups = callPackage ../misc/cups { libusb = libusb1; }; @@ -20526,6 +20549,8 @@ with pkgs; nix-index = callPackage ../tools/package-management/nix-index { }; + nix-pin = callPackage ../tools/package-management/nix-pin { }; + inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) nix-prefetch-bzr nix-prefetch-cvs diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5208cb6f2ed..8ab8def15c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1747,6 +1747,21 @@ let self = _self // overrides; _self = with self; { }; }; + CDDB_get = buildPerlPackage rec { + name = "CDDB_get-2.28"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FO/FONKIE/${name}.tar.gz"; + sha256 = "1jfrwvfasylcafbvb0jjm94ad4v6k99a7rf5i4qwzhg4m0gvmk5x"; + }; + meta = { + homepage = https://metacpan.org/module/CDDB_get; + description = "Get the CDDB info for an audio cd"; + license = stdenv.lib.licenses.artistic1; + platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.endgame ]; + }; + }; + CGI = buildPerlPackage rec { name = "CGI-4.38"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b694e72735..6dde323e925 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4494,34 +4494,7 @@ in { }; - py3status = buildPythonPackage rec { - version = "3.7"; - name = "py3status-${version}"; - src = pkgs.fetchFromGitHub { - owner = "ultrabug"; - repo = "py3status"; - rev = version; - sha256 = "1khrvxjjcm1bsswgrdgvyrdrimxx92yhql4gmji6a0kpp59dp541"; - }; - doCheck = false; - propagatedBuildInputs = with self; [ requests ]; - buildInputs = with pkgs; [ file ]; - prePatch = '' - sed -i -e "s|'file|'${pkgs.file}/bin/file|" py3status/parse_config.py - sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py - sed -i -e "s|notify-send|${pkgs.libnotify}/bin/notify-send|" py3status/modules/battery_level.py - sed -i -e "s|/usr/bin/whoami|${pkgs.coreutils}/bin/whoami|" py3status/modules/external_script.py - sed -i -e "s|'amixer|'${pkgs.alsaUtils}/bin/amixer|" py3status/modules/volume_status.py - sed -i -e "s|'i3-nagbar|'${pkgs.i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py - sed -i -e "s|'free|'${pkgs.procps}/bin/free|" py3status/modules/sysdata.py - sed -i -e "s|'sensors|'${pkgs.lm_sensors}/bin/sensors|" py3status/modules/sysdata.py - sed -i -e "s|'setxkbmap|'${pkgs.xorg.setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py - sed -i -e "s|'xset|'${pkgs.xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py - ''; - meta = { - maintainers = with maintainers; [ garbas ]; - }; - }; + py3status = callPackage ../development/python-modules/py3status {}; multi_key_dict = buildPythonPackage rec { name = "multi_key_dict-${version}"; @@ -10059,7 +10032,11 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; - kmsxx = callPackage ../development/libraries/kmsxx { }; + kmsxx = (callPackage ../development/libraries/kmsxx { + inherit (pkgs.kmsxx) stdenv; + }).overrideAttrs (oldAttrs: { + name = "${python.libPrefix}-${pkgs.kmsxx.name}"; + }); pybase64 = callPackage ../development/python-modules/pybase64 { }; |